2006-12-13 [paul] 2.6.1cvs28

	* src/main.c
		don't translate these strings

diff --git a/ChangeLog b/ChangeLog
index d841dbc5c8ace1d4c120c468f9358005b21bb27e..7f3c3b8c545c83695ebee2ab176ef28c7f100572 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-13 [paul]      2.6.1cvs28
+
+       * src/main.c
+               don't translate these strings
+

 2006-12-13 [paul]      2.6.1cvs27
 
        * po/en_GB.po
 2006-12-13 [paul]      2.6.1cvs27
 
        * po/en_GB.po

diff --git a/PATCHSETS b/PATCHSETS
index 00d9723e3a23058606352801e17edff106b97548..c7e57667407a044e2c4553e8c160c674c05cee94 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2135,3 +2135,4 @@
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 manual/es/advanced.xml;  cvs diff -u -r 1.60.2.38 -r 1.60.2.39 po/es.po;  ) > 2.6.1cvs25.patchset
 ( cvs diff -u -r 1.115.2.117 -r 1.115.2.118 src/main.c;  cvs diff -u -r 1.7.2.6 -r 1.7.2.7 src/main.h;  ) > 2.6.1cvs26.patchset
 ( cvs diff -u -r 1.12.2.11 -r 1.12.2.12 po/en_GB.po;  ) > 2.6.1cvs27.patchset
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 manual/es/advanced.xml;  cvs diff -u -r 1.60.2.38 -r 1.60.2.39 po/es.po;  ) > 2.6.1cvs25.patchset
 ( cvs diff -u -r 1.115.2.117 -r 1.115.2.118 src/main.c;  cvs diff -u -r 1.7.2.6 -r 1.7.2.7 src/main.h;  ) > 2.6.1cvs26.patchset
 ( cvs diff -u -r 1.12.2.11 -r 1.12.2.12 po/en_GB.po;  ) > 2.6.1cvs27.patchset

+( cvs diff -u -r 1.115.2.118 -r 1.115.2.119 src/main.c;  ) > 2.6.1cvs28.patchset

diff --git a/configure.ac b/configure.ac
index 9376b7555e0fa56003525b27bbaa4fb2018a1db9..8b499d07a45020077b29918306b0dd93ff958f01 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=27
+EXTRA_VERSION=28

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index 0c98552c2bf8353624953617a676b5e137b704af..8f75ea5064c2e08dd77460df687166a3429f6afe 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -607,11 +607,11 @@ int main(int argc, char *argv[])
                prefs_destroy_cache();
                gboolean r = FALSE;
                if (is_dir_exist(OLD_GTK2_RC_DIR))
                prefs_destroy_cache();
                gboolean r = FALSE;
                if (is_dir_exist(OLD_GTK2_RC_DIR))

-                       r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 2.6.0"));
+                       r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR, "Sylpheed-Claws 2.6.0");

                else if (is_dir_exist(OLDER_GTK2_RC_DIR))
                else if (is_dir_exist(OLDER_GTK2_RC_DIR))

-                       r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.9.15"));
+                       r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR, "Sylpheed-Claws 1.9.15");

                else if (is_dir_exist(OLD_GTK1_RC_DIR))
                else if (is_dir_exist(OLD_GTK1_RC_DIR))

-                       r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.0.5"));
+                       r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR, "Sylpheed-Claws 1.0.5");

                if (r == FALSE && !is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0)
                        exit(1);
        }
                if (r == FALSE && !is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0)
                        exit(1);
        }