aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS12
-rw-r--r--configure.in6
-rw-r--r--po/ChangeLog4
-rw-r--r--po/pa.po2
-rw-r--r--po/vi.po2
5 files changed, 21 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index a3fba06ed..3b643755c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+==============
+Epiphany 1.2.2
+==============
+
+Translations:
+ * Amanpreet Singh Alam (pa)
+ * Duarte Loreto (pt)
+ * Åsmund Skjævelan (nn)
+ * Gujarati team at Magnet-i (gu)
+ * Trinh Minh Thanh (vi)
+
+
===============
Epiphany 1.2.1
===============
diff --git a/configure.in b/configure.in
index ae5748cc9..1a99bf5dc 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(epiphany, 1.2.1,
+AC_INIT(epiphany, 1.2.2,
[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany])
EPIPHANY_MAJOR=1.2
@@ -18,8 +18,8 @@ AC_PROG_INTLTOOL([0.29])
dnl put the ACLOCAL flags in the Makefile
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-GLIB_REQUIRED=2.3.5
-GTK_REQUIRED=2.3.5
+GLIB_REQUIRED=2.4.0
+GTK_REQUIRED=2.4.0
LIBBONOBOUI_REQUIRED=2.1.1
LIBXML_REQUIRED=2.6.6
LIBGNOMEVFS_REQUIRED=2.3.1
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