Misc i18n fixes: mark default encoding and encoding autodetector in the

2003-06-22  Christian Persch  <chpe@cvs.gnome.org>

* data/epiphany.schemas.in:
* src/prefs-dialog.c:
* embed/mozilla/mozilla-notifiers.cpp: (get_system_language):

Misc i18n fixes: mark default encoding and encoding autodetector in
the schema as translatable, and instroduce a translatable string for
the locale-dependent http-accept-language list. Add simplified and
traditional chinese to the available languages list, and add the
universal encoding detector to the autodetectors list.

6 files changed, 217 insertions, 158 deletions

diff --git a/ChangeLog b/ChangeLog
index b020e7eeb..3cb950a36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-06-22  Christian Persch  <chpe@cvs.gnome.org>
+
+	* data/epiphany.schemas.in:
+	* src/prefs-dialog.c:
+	* embed/mozilla/mozilla-notifiers.cpp: (get_system_language):
+
+	Misc i18n fixes: mark default encoding and encoding autodetector in
+	the schema as translatable, and instroduce a translatable string for
+	the locale-dependent http-accept-language list. Add simplified and
+	traditional chinese to the available languages list, and add the
+	universal encoding detector to the autodetectors list.
+
 2003-06-20  Marco Pesenti Gritti  <marco@it.gnome.org>
 
 	* lib/ephy-string.c:
diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in
index 9aa896518..95769c1ee 100644
--- a/data/epiphany.schemas.in
+++ b/data/epiphany.schemas.in
@@ -147,8 +147,8 @@
         <applyto>/apps/epiphany/web/default_encoding</applyto>
         <owner>epiphany</owner>
         <type>string</type>
-        <default>ISO-8859-1</default>
         <locale name="C">
+        <default>ISO-8859-1</default>
         <short>Default encoding</short>
         <long>Default encoding. Accepted values are: armscii-8, Big5,
 	Big5-HKSCS, EUC-JP, EUC-KR, gb18030, GB2312, geostd8, HZ-GB-2312,
@@ -388,18 +388,19 @@
         <applyto>/apps/epiphany/web/autodetect_encoding</applyto>
         <owner>epiphany</owner>
         <type>string</type>
-        <default></default>
         <locale name="C">
+        <default></default>
 	<short>The encoding autodetector. Empty string means autodetect is off</short>
 	<long>
-	The encoding autodetector. Valid entries are "" (empty string, autodetectors
-	off), cjk_parallel_state_machine (autodetect east asian encodings),
-	ja_parallel_state_machine (autodetect japanese encodings),
-	ko_parallel_state_machine (autodetect korean encodings), ruprob
-	(autodetect russian encodings), ukprob (autodetect ukrainian encodings),
-	zh_parallel_state_machine (autodetect chinese encodings),
-	zhcn_parallel_state_machine (autodetect simplified chinese encodings) and
-	zhtw_parallel_state_machine (autodetect traditional chinese encodings).
+	The encoding autodetector. Valid entries are "" (autodetectors
+	off), "cjk_parallel_state_machine" (autodetect east asian encodings),
+	"ja_parallel_state_machine" (autodetect japanese encodings),
+	"ko_parallel_state_machine" (autodetect korean encodings), "ruprob"
+	(autodetect russian encodings), "ukprob" (autodetect ukrainian encodings),
+	"zh_parallel_state_machine" (autodetect chinese encodings),
+	"zhcn_parallel_state_machine" (autodetect simplified chinese encodings),
+	"zhtw_parallel_state_machine" (autodetect traditional chinese encodings)
+	and "universal_charset_detector" (autodetect all encodings).
 	</long>
         </locale>
       </schema>
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index 761742573..bf06296f8 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -620,7 +620,21 @@ static char *
 get_system_language ()
 {
 	const GList *sys_langs;
-
+	const char *lang;
+
+	/**
+	 * translate this as the comma separated list of language ranges
+	 * for your locale, as specified by RFC 2616, 14.4. 
+	 * for example for en_NZ locale this could be "en-nz,en-au,en-gb,en"
+	 */
+	lang = _("system-language");
+	
+	if (strncmp (lang, "system-language", 15) != 0)
+	{
+		/* the l10n has it */
+		return g_strdup (lang);
+	}
+	
 	sys_langs = gnome_i18n_get_language_list ("LC_MESSAGES");
 
 	if (sys_langs)
diff --git a/po/ChangeLog b/po/ChangeLog
index 75a0c49fa..af39af76c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-22  Christian Persch  <chpe@cvs.gnome.org>
+
+	* en_GB.po: Update British English translation.
+
 2003-06-20  Christian Neumair  <chris@gnome-de.org>
 
 	* de.po: Updated German translation.
diff --git a/po/en_GB.po b/po/en_GB.po
index 009da3023..755376128 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Epiphany\n"
-"POT-Creation-Date: 2003-06-19 01:08+0200\n"
+"POT-Creation-Date: 2003-06-22 00:28+0200\n"
 "PO-Revision-Date: 2003-06-18 22:16+0200\n"
 "Last-Translator: Christian Persch <chpe@cvs.gnome.org>\n"
 "Language-Team: British English\n"
@@ -180,24 +180,28 @@ msgid "Home page"
 msgstr "Home page"
 
 #: data/epiphany.schemas.in.h:20
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: data/epiphany.schemas.in.h:21
 msgid "Languages"
 msgstr "Languages"
 
-#: data/epiphany.schemas.in.h:21
+#: data/epiphany.schemas.in.h:22
 msgid "Match case for find in page"
 msgstr "Match case for find in page"
 
-#: data/epiphany.schemas.in.h:22
+#: data/epiphany.schemas.in.h:23
 msgid "Match case for find in page."
 msgstr "Match case for find in page."
 
-#: data/epiphany.schemas.in.h:23
+#: data/epiphany.schemas.in.h:24
 msgid ""
 "Middle click to open the web page pointed to by the currently selected text"
 msgstr ""
 "Middle click to open the web page pointed to by the currently selected text"
 
-#: data/epiphany.schemas.in.h:24
+#: data/epiphany.schemas.in.h:25
 msgid ""
 "Middle clicking on the main view pane will open the web page pointed to by "
 "the currently selected text."
@@ -205,15 +209,15 @@ msgstr ""
 "Middle clicking on the main view pane will open the web page pointed to by "
 "the currently selected text."
 
-#: data/epiphany.schemas.in.h:25
+#: data/epiphany.schemas.in.h:26
 msgid "Open in tabs by default."
 msgstr "Open in tabs by default."
 
-#: data/epiphany.schemas.in.h:26
+#: data/epiphany.schemas.in.h:27
 msgid "Paper type"
 msgstr "Paper type"
 
-#: data/epiphany.schemas.in.h:27
+#: data/epiphany.schemas.in.h:28
 msgid ""
 "Paper type. Supported values are \"A4\", \"Letter\", \"Legal\" and "
 "\"Executive\"."
@@ -221,91 +225,91 @@ msgstr ""
 "Paper type. Supported values are \"A4\", \"Letter\", \"Legal\" and "
 "\"Executive\"."
 
-#: data/epiphany.schemas.in.h:28
+#: data/epiphany.schemas.in.h:29
 msgid "Preferred languages, two letter codes."
 msgstr "Preferred languages, two letter codes."
 
-#: data/epiphany.schemas.in.h:29
+#: data/epiphany.schemas.in.h:30
 msgid "Printer name"
 msgstr "Printer name"
 
-#: data/epiphany.schemas.in.h:30
+#: data/epiphany.schemas.in.h:31
 msgid "Printer name."
 msgstr "Printer name."
 
-#: data/epiphany.schemas.in.h:31
+#: data/epiphany.schemas.in.h:32
 msgid "Printing bottom margin"
 msgstr "Printing bottom margin"
 
-#: data/epiphany.schemas.in.h:32
+#: data/epiphany.schemas.in.h:33
 msgid "Printing bottom margin (in mm)."
 msgstr "Printing bottom margin (mm)."
 
-#: data/epiphany.schemas.in.h:33
+#: data/epiphany.schemas.in.h:34
 msgid "Printing left margin"
 msgstr "Printing left margin"
 
-#: data/epiphany.schemas.in.h:34
+#: data/epiphany.schemas.in.h:35
 msgid "Printing left margin (in mm)."
 msgstr "Printing left margin (mm)."
 
-#: data/epiphany.schemas.in.h:35
+#: data/epiphany.schemas.in.h:36
 msgid "Printing right margin"
 msgstr "Printing right margin"
 
-#: data/epiphany.schemas.in.h:36
+#: data/epiphany.schemas.in.h:37
 msgid "Printing right margin (in mm)."
 msgstr "Printing right margin (mm)."
 
-#: data/epiphany.schemas.in.h:37
+#: data/epiphany.schemas.in.h:38
 msgid "Printing top margin"
 msgstr "Printing top margin"
 
-#: data/epiphany.schemas.in.h:38
+#: data/epiphany.schemas.in.h:39
 msgid "Printing top margin (in mm)."
 msgstr "Printing top margin (mm)."
 
-#: data/epiphany.schemas.in.h:39
+#: data/epiphany.schemas.in.h:40
 msgid "Show bookmarks bar by default"
 msgstr "Show bookmarks bar by default"
 
-#: data/epiphany.schemas.in.h:40
+#: data/epiphany.schemas.in.h:41
 msgid "Show bookmarks bar by default."
 msgstr "Show bookmarks bar by default."
 
-#: data/epiphany.schemas.in.h:41
+#: data/epiphany.schemas.in.h:42
 msgid "Show download details"
 msgstr "Show download details"
 
-#: data/epiphany.schemas.in.h:42
+#: data/epiphany.schemas.in.h:43
 msgid "Show statusbar by default"
 msgstr "Show statusbar by default"
 
-#: data/epiphany.schemas.in.h:43
+#: data/epiphany.schemas.in.h:44
 msgid "Show statusbar by default."
 msgstr "Show statusbar by default."
 
-#: data/epiphany.schemas.in.h:44
+#: data/epiphany.schemas.in.h:45
 msgid "Show toolbars by default"
 msgstr "Show toolbars by default"
 
-#: data/epiphany.schemas.in.h:45
+#: data/epiphany.schemas.in.h:46
 msgid "Show toolbars by default."
 msgstr "Show toolbars by default."
 
-#: data/epiphany.schemas.in.h:46
+#: data/epiphany.schemas.in.h:47
 msgid "Size of disk cache"
 msgstr "Size of disk cache"
 
-#: data/epiphany.schemas.in.h:47
+#: data/epiphany.schemas.in.h:48
 msgid "Size of disk cache, in MB."
 msgstr "Size of disk cache, in MB."
 
-#: data/epiphany.schemas.in.h:48
+#: data/epiphany.schemas.in.h:49
 msgid "The currently selected fonts language"
 msgstr "The currently selected fonts language"
 
-#: data/epiphany.schemas.in.h:49
+#: data/epiphany.schemas.in.h:50
 msgid ""
 "The currently selected fonts language. Valid values are ar (arabic), x-"
 "baltic (baltic languages), x-central-euro (central european languages), x-"
@@ -322,20 +326,21 @@ msgstr ""
 "\"x-unicode\" (other languages) and \"x-western\" (languages written in "
 "latin script)."
 
-#: data/epiphany.schemas.in.h:50
+#: data/epiphany.schemas.in.h:51
 msgid "The encoding autodetector. Empty string means autodetect is off"
 msgstr "The encoding autodetector. Empty string means autodetect is off"
 
-#: data/epiphany.schemas.in.h:51
+#: data/epiphany.schemas.in.h:52
 msgid ""
-"The encoding autodetector. Valid entries are \"\" (empty string, "
-"autodetectors off), cjk_parallel_state_machine (autodetect east asian "
-"encodings), ja_parallel_state_machine (autodetect japanese encodings), "
-"ko_parallel_state_machine (autodetect korean encodings), ruprob (autodetect "
-"russian encodings), ukprob (autodetect ukrainian encodings), "
-"zh_parallel_state_machine (autodetect chinese encodings), "
-"zhcn_parallel_state_machine (autodetect simplified chinese encodings) and "
-"zhtw_parallel_state_machine (autodetect traditional chinese encodings)."
+"The encoding autodetector. Valid entries are \"\" (autodetectors off), "
+"\"cjk_parallel_state_machine\" (autodetect east asian encodings), "
+"\"ja_parallel_state_machine\" (autodetect japanese encodings), "
+"\"ko_parallel_state_machine\" (autodetect korean encodings), \"ruprob"
+"\" (autodetect russian encodings), \"ukprob\" (autodetect ukrainian "
+"encodings), \"zh_parallel_state_machine\" (autodetect chinese encodings), "
+"\"zhcn_parallel_state_machine\" (autodetect simplified chinese encodings), "
+"\"zhtw_parallel_state_machine\" (autodetect traditional chinese encodings) "
+"and \"universal_charset_detector\" (autodetect all encodings)."
 msgstr ""
 "The encoding autodetector. Valid entries are \"\" (autodetectors off), "
 "\"cjk_parallel_state_machine\" (autodetect east asian encodings), "
@@ -343,35 +348,35 @@ msgstr ""
 "\"ko_parallel_state_machine\" (autodetect korean encodings), \"ruprob"
 "\" (autodetect russian encodings), \"ukprob\" (autodetect ukrainian "
 "encodings), \"zh_parallel_state_machine\" (autodetect chinese encodings), "
-"\"zhcn_parallel_state_machine\" (autodetect simplified chinese encodings) "
-"and \"zhtw_parallel_state_machine\" (autodetect traditional chinese "
-"encodings)."
+"\"zhcn_parallel_state_machine\" (autodetect simplified chinese encodings) , "
+"\"zhtw_parallel_state_machine\" (autodetect traditional chinese encodings) "
+"and \"universal_charset_detector\" (autodetect all encodings)."
 
-#: data/epiphany.schemas.in.h:52
+#: data/epiphany.schemas.in.h:53
 msgid "Use own colors"
 msgstr "Use own colours"
 
-#: data/epiphany.schemas.in.h:53
+#: data/epiphany.schemas.in.h:54
 msgid "Use own fonts"
 msgstr "Use own fonts"
 
-#: data/epiphany.schemas.in.h:54
+#: data/epiphany.schemas.in.h:55
 msgid "Use tabs"
 msgstr "Use tabs"
 
-#: data/epiphany.schemas.in.h:55
+#: data/epiphany.schemas.in.h:56
 msgid "Use your own colors instead of the colors the page requests."
 msgstr "Use your own colours instead of the colours the page requests."
 
-#: data/epiphany.schemas.in.h:56
+#: data/epiphany.schemas.in.h:57
 msgid "Use your own fonts instead of the fonts the page requests."
 msgstr "Use your own fonts instead of the fonts the page requests."
 
-#: data/epiphany.schemas.in.h:57
+#: data/epiphany.schemas.in.h:58
 msgid "When to compare cached copy"
 msgstr "When to compare cached copy"
 
-#: data/epiphany.schemas.in.h:58
+#: data/epiphany.schemas.in.h:59
 msgid ""
 "When to compare cached copy to web copy. Possible values are once per "
 "session, every time, never, automatic."
@@ -379,7 +384,7 @@ msgstr ""
 "When to compare cached copy to web copy. Possible values are \"once per "
 "session\", \"every time\", \"never\", \"automatic\"."
 
-#: data/epiphany.schemas.in.h:59
+#: data/epiphany.schemas.in.h:60
 msgid ""
 "Where to accept cookies from. Possible values are anywhere, current site, "
 "nowhere"
@@ -387,23 +392,23 @@ msgstr ""
 "Where to accept cookies from. Possible values are \"anywhere\", \"current "
 "site\", and \"nowhere\""
 
-#: data/epiphany.schemas.in.h:60
+#: data/epiphany.schemas.in.h:61
 msgid "Whether to print the date in the footer."
 msgstr "Whether to print the date in the footer."
 
-#: data/epiphany.schemas.in.h:61
+#: data/epiphany.schemas.in.h:62
 msgid "Whether to print the page address in the header"
 msgstr "Whether to print the page address in the header"
 
-#: data/epiphany.schemas.in.h:62
+#: data/epiphany.schemas.in.h:63
 msgid "Whether to print the page numbers (x of total) in the footer."
 msgstr "Whether to print the page numbers (x of total) in the footer."
 
-#: data/epiphany.schemas.in.h:63
+#: data/epiphany.schemas.in.h:64
 msgid "Whether to print the page title in the header."
 msgstr "Whether to print the page title in the header."
 
-#: data/epiphany.schemas.in.h:64
+#: data/epiphany.schemas.in.h:65
 msgid "x-western"
 msgstr "x-western"
 
@@ -782,7 +787,7 @@ msgid "Paper"
 msgstr "Paper"
 
 #: data/glade/print.glade.h:26 data/ui/nautilus-epiphany-view.xml.in.h:23
-#: src/ephy-window.c:477
+#: src/ephy-window.c:660
 msgid "Print"
 msgstr "Print"
 
@@ -1012,7 +1017,7 @@ msgid "%s at %.1f KB/s"
 msgstr "%s at %.1f KB/s"
 
 #: embed/downloader-view.c:519 embed/downloader-view.c:537
-#: src/ephy-window.c:704
+#: src/ephy-window.c:887
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -1496,6 +1501,15 @@ msgstr "No"
 msgid "End of current session"
 msgstr "End of current session"
 
+#. *
+#. * translate this as the comma separated list of language ranges
+#. * for your locale, as specified by RFC 2616, 14.4.
+#. * for example for en_NZ locale this could be "en-nz,en-au,en-gb,en"
+#.
+#: embed/mozilla/mozilla-notifiers.cpp:630
+msgid "system-language"
+msgstr "en-gb,en"
+
 #: lib/eel-gconf-extensions.c:79
 #, c-format
 msgid ""
@@ -1570,23 +1584,23 @@ msgstr "Central European"
 msgid "Cyrillic"
 msgstr "Cyrillic"
 
-#: lib/ephy-langs.c:32 src/prefs-dialog.c:104
+#: lib/ephy-langs.c:32 src/prefs-dialog.c:106
 msgid "Greek"
 msgstr "Greek"
 
-#: lib/ephy-langs.c:33 src/prefs-dialog.c:105
+#: lib/ephy-langs.c:33 src/prefs-dialog.c:107
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: lib/ephy-langs.c:34 src/prefs-dialog.c:111 src/prefs-dialog.c:150
+#: lib/ephy-langs.c:34 src/prefs-dialog.c:113 src/prefs-dialog.c:152
 msgid "Japanese"
 msgstr "Japanese"
 
-#: lib/ephy-langs.c:35 src/prefs-dialog.c:112 src/prefs-dialog.c:151
+#: lib/ephy-langs.c:35 src/prefs-dialog.c:114 src/prefs-dialog.c:153
 msgid "Korean"
 msgstr "Korean"
 
-#: lib/ephy-langs.c:36 src/prefs-dialog.c:153
+#: lib/ephy-langs.c:36 src/prefs-dialog.c:155
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
@@ -1594,11 +1608,11 @@ msgstr "Simplified Chinese"
 msgid "Thai"
 msgstr "Thai"
 
-#: lib/ephy-langs.c:38 src/prefs-dialog.c:154
+#: lib/ephy-langs.c:38 src/prefs-dialog.c:156
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: lib/ephy-langs.c:39 src/prefs-dialog.c:132
+#: lib/ephy-langs.c:39 src/prefs-dialog.c:134
 msgid "Turkish"
 msgstr "Turkish"
 
@@ -1888,7 +1902,7 @@ msgstr "_Copy Address"
 msgid "_Search:"
 msgstr "_Search:"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1205 src/ephy-window.c:481
+#: src/bookmarks/ephy-bookmarks-editor.c:1205 src/ephy-window.c:664
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
@@ -2127,42 +2141,38 @@ msgstr ""
 "\n"
 "Bonobo couldn't locate the GNOME_Epiphany_Automation.server file."
 
-#: src/ephy-tab.c:309 src/ephy-tab.c:1098 src/ephy-tab.c:1271
+#: src/ephy-tab.c:310 src/ephy-tab.c:1145
 msgid "Blank page"
 msgstr "Blank page"
 
-#: src/ephy-tab.c:640
+#: src/ephy-tab.c:631
 msgid "site"
 msgstr "site"
 
-#: src/ephy-tab.c:664
+#: src/ephy-tab.c:655
 #, c-format
 msgid "Redirecting to %s..."
 msgstr "Redirecting to %s..."
 
-#: src/ephy-tab.c:668
+#: src/ephy-tab.c:659
 #, c-format
 msgid "Transferring data from %s..."
 msgstr "Transferring data from %s..."
 
-#: src/ephy-tab.c:672
+#: src/ephy-tab.c:663
 #, c-format
 msgid "Waiting for authorization from %s..."
 msgstr "Waiting for authorisation from %s..."
 
-#: src/ephy-tab.c:680
+#: src/ephy-tab.c:671
 #, c-format
 msgid "Loading %s..."
 msgstr "Loading %s..."
 
-#: src/ephy-tab.c:684
+#: src/ephy-tab.c:675
 msgid "Done."
 msgstr "Done."
 
-#: src/ephy-tab.c:1077
-msgid "Loading..."
-msgstr "Loading..."
-
 #: src/ephy-window.c:65
 msgid "_Bookmarks"
 msgstr "_Bookmarks"
@@ -2544,39 +2554,43 @@ msgstr "_Use Image As Background"
 msgid "Copy I_mage Address"
 msgstr "Copy I_mage Address"
 
-#: src/ephy-window.c:473
+#: src/ephy-window.c:556
+msgid "Exit Fullscreen"
+msgstr "Exit Full Screen"
+
+#: src/ephy-window.c:656
 msgid "Open"
 msgstr "Open"
 
-#: src/ephy-window.c:475
+#: src/ephy-window.c:658
 msgid "Save As"
 msgstr "Save As"
 
-#: src/ephy-window.c:479
+#: src/ephy-window.c:662
 msgid "Bookmark"
 msgstr "Bookmark"
 
-#: src/ephy-window.c:707
+#: src/ephy-window.c:890
 msgid "Insecure"
 msgstr "Insecure"
 
-#: src/ephy-window.c:710
+#: src/ephy-window.c:893
 msgid "Broken"
 msgstr "Broken"
 
-#: src/ephy-window.c:713
+#: src/ephy-window.c:896
 msgid "Medium"
 msgstr "Medium"
 
-#: src/ephy-window.c:717
+#: src/ephy-window.c:900
 msgid "Low"
 msgstr "Low"
 
-#: src/ephy-window.c:721
+#: src/ephy-window.c:904
 msgid "High"
 msgstr "High"
 
-#: src/ephy-window.c:731
+#: src/ephy-window.c:914
 #, c-format
 msgid ""
 "Security level: %s\n"
@@ -2585,48 +2599,44 @@ msgstr ""
 "Security level: %s\n"
 "%s"
 
-#: src/ephy-window.c:737
+#: src/ephy-window.c:920
 #, c-format
 msgid "Security level: %s"
 msgstr "Security level: %s"
 
-#: src/ephy-window.c:1336
-msgid "Exit Fullscreen"
-msgstr "Exit Full Screen"
-
-#: src/pdm-dialog.c:260
+#: src/pdm-dialog.c:246
 msgid "Host"
 msgstr "Host"
 
-#: src/pdm-dialog.c:272
+#: src/pdm-dialog.c:258
 msgid "User Name"
 msgstr "User Name"
 
-#: src/pdm-dialog.c:317
+#: src/pdm-dialog.c:303
 msgid "Domain"
 msgstr "Domain"
 
-#: src/pdm-dialog.c:329
+#: src/pdm-dialog.c:315
 msgid "Name"
 msgstr "Name"
 
-#: src/pdm-dialog.c:633
+#: src/pdm-dialog.c:619
 msgid "Cookie Properties"
 msgstr "Cookie Properties"
 
-#: src/pdm-dialog.c:646
+#: src/pdm-dialog.c:632
 msgid "Value:"
 msgstr "Value:"
 
-#: src/pdm-dialog.c:660
+#: src/pdm-dialog.c:646
 msgid "Path:"
 msgstr "Path:"
 
-#: src/pdm-dialog.c:674
+#: src/pdm-dialog.c:660
 msgid "Secure:"
 msgstr "Secure:"
 
-#: src/pdm-dialog.c:688
+#: src/pdm-dialog.c:674
 msgid "Expire:"
 msgstr "Expire:"
 
@@ -2690,175 +2700,187 @@ msgstr "Belorussian"
 msgid "Catalan"
 msgstr "Catalan"
 
-#: src/prefs-dialog.c:91 src/prefs-dialog.c:148
+#: src/prefs-dialog.c:91
+msgid "Chinese Simplified"
+msgstr "Chinese Simplified"
+
+#: src/prefs-dialog.c:92
+msgid "Chinese Traditional"
+msgstr "Chinese Traditional"
+
+#: src/prefs-dialog.c:93 src/prefs-dialog.c:150
 msgid "Chinese"
 msgstr "Chinese"
 
-#: src/prefs-dialog.c:92
+#: src/prefs-dialog.c:94
 msgid "Croatian"
 msgstr "Croatian"
 
-#: src/prefs-dialog.c:93
+#: src/prefs-dialog.c:95
 msgid "Czech"
 msgstr "Czech"
 
-#: src/prefs-dialog.c:94
+#: src/prefs-dialog.c:96
 msgid "Danish"
 msgstr "Danish"
 
-#: src/prefs-dialog.c:95
+#: src/prefs-dialog.c:97
 msgid "Dutch"
 msgstr "Dutch"
 
-#: src/prefs-dialog.c:96
+#: src/prefs-dialog.c:98
 msgid "English"
 msgstr "English"
 
-#: src/prefs-dialog.c:97
+#: src/prefs-dialog.c:99
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: src/prefs-dialog.c:98
+#: src/prefs-dialog.c:100
 msgid "Estonian"
 msgstr "Estonian"
 
-#: src/prefs-dialog.c:99
+#: src/prefs-dialog.c:101
 msgid "Faeroese"
 msgstr "Faeroese"
 
-#: src/prefs-dialog.c:100
+#: src/prefs-dialog.c:102
 msgid "Finnish"
 msgstr "Finnish"
 
-#: src/prefs-dialog.c:101
+#: src/prefs-dialog.c:103
 msgid "French"
 msgstr "French"
 
-#: src/prefs-dialog.c:102
+#: src/prefs-dialog.c:104
 msgid "Galician"
 msgstr "Galician"
 
-#: src/prefs-dialog.c:103
+#: src/prefs-dialog.c:105
 msgid "German"
 msgstr "German"
 
-#: src/prefs-dialog.c:106
+#: src/prefs-dialog.c:108
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: src/prefs-dialog.c:107
+#: src/prefs-dialog.c:109
 msgid "Icelandic"
 msgstr "Icelandic"
 
-#: src/prefs-dialog.c:108
+#: src/prefs-dialog.c:110
 msgid "Indonesian"
 msgstr "Indonesian"
 
-#: src/prefs-dialog.c:109
+#: src/prefs-dialog.c:111
 msgid "Irish"
 msgstr "Irish"
 
-#: src/prefs-dialog.c:110
+#: src/prefs-dialog.c:112
 msgid "Italian"
 msgstr "Italian"
 
-#: src/prefs-dialog.c:113
+#: src/prefs-dialog.c:115
 msgid "Latvian"
 msgstr "Latvian"
 
-#: src/prefs-dialog.c:114
+#: src/prefs-dialog.c:116
 msgid "Lithuanian"
 msgstr "Lithuanian"
 
-#: src/prefs-dialog.c:115
+#: src/prefs-dialog.c:117
 msgid "Macedonian"
 msgstr "Macedonian"
 
-#: src/prefs-dialog.c:116
+#: src/prefs-dialog.c:118
 msgid "Malay"
 msgstr "Malay"
 
-#: src/prefs-dialog.c:117
+#: src/prefs-dialog.c:119
 msgid "Norwegian/Nynorsk"
 msgstr "Norwegian/Nynorsk"
 
-#: src/prefs-dialog.c:118
+#: src/prefs-dialog.c:120
 msgid "Norwegian/Bokmaal"
 msgstr "Norwegian/Bokmål"
 
-#: src/prefs-dialog.c:119
+#: src/prefs-dialog.c:121
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: src/prefs-dialog.c:120
+#: src/prefs-dialog.c:122
 msgid "Polish"
 msgstr "Polish"
 
-#: src/prefs-dialog.c:121
+#: src/prefs-dialog.c:123
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: src/prefs-dialog.c:122
+#: src/prefs-dialog.c:124
 msgid "Portuguese of Brazil"
 msgstr "Portuguese of Brazil"
 
-#: src/prefs-dialog.c:123
+#: src/prefs-dialog.c:125
 msgid "Romanian"
 msgstr "Romanian"
 
-#: src/prefs-dialog.c:124 src/prefs-dialog.c:152
+#: src/prefs-dialog.c:126 src/prefs-dialog.c:154
 msgid "Russian"
 msgstr "Russian"
 
-#: src/prefs-dialog.c:125
+#: src/prefs-dialog.c:127
 msgid "Scottish"
 msgstr "Scottish"
 
-#: src/prefs-dialog.c:126
+#: src/prefs-dialog.c:128
 msgid "Serbian"
 msgstr "Serbian"
 
-#: src/prefs-dialog.c:127
+#: src/prefs-dialog.c:129
 msgid "Slovak"
 msgstr "Slovakian"
 
-#: src/prefs-dialog.c:128
+#: src/prefs-dialog.c:130
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: src/prefs-dialog.c:129
+#: src/prefs-dialog.c:131
 msgid "Spanish"
 msgstr "Spanish"
 
-#: src/prefs-dialog.c:130
+#: src/prefs-dialog.c:132
 msgid "Swedish"
 msgstr "Swedish"
 
-#: src/prefs-dialog.c:131
+#: src/prefs-dialog.c:133
 msgid "Tamil"
 msgstr "Tamil"
 
-#: src/prefs-dialog.c:133 src/prefs-dialog.c:155
+#: src/prefs-dialog.c:135 src/prefs-dialog.c:158
 msgid "Ukrainian"
 msgstr "Ukrainian"
 
-#: src/prefs-dialog.c:134
+#: src/prefs-dialog.c:136
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: src/prefs-dialog.c:135
+#: src/prefs-dialog.c:137
 msgid "Walloon"
 msgstr "Walloon"
 
-#: src/prefs-dialog.c:147
+#: src/prefs-dialog.c:149
 msgid "Off"
 msgstr "Off"
 
-#: src/prefs-dialog.c:149
+#: src/prefs-dialog.c:151
 msgid "East Asian"
 msgstr "East Asian"
 
-#: src/prefs-dialog.c:934
+#: src/prefs-dialog.c:157
+msgid "Universal"
+msgstr "Universal"
+
+#: src/prefs-dialog.c:937
 #, c-format
 msgid "Custom [%s]"
 msgstr "User Defined [%s]"
@@ -2913,15 +2935,15 @@ msgstr "Zoom"
 msgid "Favicon"
 msgstr "Icon"
 
-#: src/window-commands.c:145
+#: src/window-commands.c:149
 msgid "Check this out!"
 msgstr "Check this out!"
 
-#: src/window-commands.c:301
+#: src/window-commands.c:306
 msgid "Untitled"
 msgstr "Untitled"
 
-#: src/window-commands.c:346
+#: src/window-commands.c:352
 msgid "Select the file to open"
 msgstr "Select the file to open"
 
@@ -2942,6 +2964,9 @@ msgstr "Christian Persch"
 msgid "A GNOME browser based on Mozilla"
 msgstr "A GNOME web browser based on Mozilla"
 
+#~ msgid "Loading..."
+#~ msgstr "Loading..."
+
 #~ msgid "Ephy already running, using existing process"
 #~ msgstr "Epiphany already running, using existing process"
 
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 6a4830103..ad5a26c86 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -88,6 +88,8 @@ languages [] =
 	{ N_("Bulgarian"), "bg" },
 	{ N_("Byelorussian"), "be" },
 	{ N_("Catalan"), "ca" },
+	{ N_("Chinese Simplified"), "zh-cn" },
+	{ N_("Chinese Traditional"), "zh-tw" },
 	{ N_("Chinese"), "zh" },
 	{ N_("Croatian"), "hr" },
 	{ N_("Czech"), "cs" },
@@ -119,7 +121,7 @@ languages [] =
 	{ N_("Norwegian"), "no" },
 	{ N_("Polish"), "pl" },
 	{ N_("Portuguese"), "pt" },
-	{ N_("Portuguese of Brazil"), "pt-BR" },
+	{ N_("Portuguese of Brazil"), "pt-br" },
 	{ N_("Romanian"), "ro" },
 	{ N_("Russian"), "ru" },
 	{ N_("Scottish"), "gd" },
@@ -152,6 +154,7 @@ static EncodingAutodetectorInfo encoding_autodetector[] =
 	{ N_("Russian"),		"ruprob" },
 	{ N_("Simplified Chinese"),	"zhcn_parallel_state_machine" },
 	{ N_("Traditional Chinese"),	"zhtw_parallel_state_machine" },
+	{ N_("Universal"),		"universal_charset_detector" },
 	{ N_("Ukrainian"),		"ukprob" }
 };
 static guint n_encoding_autodetectors = G_N_ELEMENTS (encoding_autodetector);