Merging from release-1-2-1 branch

3 files changed, 6 insertions, 2 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index be78089b9..644cad4b8 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,5 +1,9 @@
 2004-03-29  Christian Persch  <chpe@cvs.gnome.org>
 
+	* pa.po: Fix translation of "system-language" string (bug #138406).
+
+2004-03-29  Christian Persch  <chpe@cvs.gnome.org>
+
 	* vi.po: Fix translation of "system-language" string (bug #134112).
 
 2004-03-23  Guntupalli Karunakar  <karunakar@freedomink.org>
diff --git a/po/pa.po b/po/pa.po
index 375b01b85..1a5740268 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1944,7 +1944,7 @@ msgstr ""
 #.
 #: embed/mozilla/mozilla-notifiers.cpp:737
 msgid "system-language"
-msgstr "ਸਿਸਟਮ ਦੀ ਭਾਸ਼ਾ"
+msgstr "pa"
 
 #: embed/print-dialog.c:289
 msgid "Print to"
diff --git a/po/vi.po b/po/vi.po
index 59919340b..5d9a1f84d 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1422,7 +1422,7 @@ msgstr "Phần cuối của phiên hiện thời"
 #.
 #: embed/mozilla/mozilla-notifiers.cpp:605
 msgid "system-language"
-msgstr "system-language"
+msgstr "vi"
 
 #: lib/eel-gconf-extensions.c:79
 #, c-format