From: Arun Persaud Date: Fri, 10 Feb 2012 07:33:24 +0000 (-0800) Subject: Merge branch 'master' into v4.6.x; updated to correct version number for v4.6.0 branch X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=5e0403d88fc0c96cfcc246ddb7f08462b584ae62 Merge branch 'master' into v4.6.x; updated to correct version number for v4.6.0 branch Conflicts: configure.ac po/da.po po/de.po po/es.po po/it.po po/ru.po po/tr.po po/vi.po po/xboard.pot po/zh_CN.po po/zh_HK.po po/zh_TW.po winboard/config.h updated to correct version number for v4.6.x and ran update-po --- 5e0403d88fc0c96cfcc246ddb7f08462b584ae62 diff --cc configure.ac index e1c7746,9cd34c6..b581738 --- a/configure.ac +++ b/configure.ac @@@ -28,7 -28,7 +28,7 @@@ dnl| to regenerate configure. Then sub dnl| the standard version of xboard. dnl| define second argument as VERSION.PATCHLEVEL. e.g. 4.4.0j - AC_INIT([xboard],[4.6.0.20111203],[bug-xboard@gnu.org]) -AC_INIT([xboard],[master-20120209],[bug-xboard@gnu.org]) ++AC_INIT([xboard],[4.6.0.20120209],[bug-xboard@gnu.org]) dnl| need this to be able to compile some files in a subdir (filebrowser) AM_INIT_AUTOMAKE([subdir-objects]) diff --cc po/da.po index 56a0237,9c2ee9f..f53d2f6 --- a/po/da.po +++ b/po/da.po @@@ -9,9 -9,9 +9,9 @@@ # Byrial Ole Jensen , 2011. msgid "" msgstr "" --"Project-Id-Version: GNU xboard 4.6.0.20111101\n" ++"Project-Id-Version: GNU xboard 4.6.0.20120209\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" - "POT-Creation-Date: 2011-12-03 08:20-0800\n" -"POT-Creation-Date: 2012-02-09 23:01-0800\n" ++"POT-Creation-Date: 2012-02-09 23:31-0800\n" "PO-Revision-Date: 2011-12-03 00:55+0100\n" "Last-Translator: Byrial Ole Jensen \n" "Language-Team: Danish \n" diff --cc po/de.po index d516f1a,1c7eea4..df98d83 --- a/po/de.po +++ b/po/de.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: XBoard 4.2.7\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" - "POT-Creation-Date: 2011-12-03 08:20-0800\n" -"POT-Creation-Date: 2012-02-09 23:01-0800\n" ++"POT-Creation-Date: 2012-02-09 23:31-0800\n" "PO-Revision-Date: 2011-04-24 12:00-0700\n" "Last-Translator: Arun Persaud \n" "Language-Team: German\n" diff --cc po/es.po index 18fcbcf,0e7f7b8..e0b9a6e --- a/po/es.po +++ b/po/es.po @@@ -9,7 -9,7 +9,7 @@@ msgid " msgstr "" "Project-Id-Version: GNU xboard master-20110411\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" - "POT-Creation-Date: 2011-12-03 08:20-0800\n" -"POT-Creation-Date: 2012-02-09 23:01-0800\n" ++"POT-Creation-Date: 2012-02-09 23:31-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --cc po/it.po index 4bd569d,899f77c..41ab6ad --- a/po/it.po +++ b/po/it.po @@@ -9,7 -9,7 +9,7 @@@ msgid " msgstr "" "Project-Id-Version: GNU xboard master-20110411\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" - "POT-Creation-Date: 2011-12-03 08:20-0800\n" -"POT-Creation-Date: 2012-02-09 23:01-0800\n" ++"POT-Creation-Date: 2012-02-09 23:31-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --cc po/ru.po index d14f01b,0e04daf..5bf8759 --- a/po/ru.po +++ b/po/ru.po @@@ -9,7 -9,7 +9,7 @@@ msgid " msgstr "" "Project-Id-Version: GNU xboard master-20110507\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" - "POT-Creation-Date: 2011-12-03 08:20-0800\n" -"POT-Creation-Date: 2012-02-09 23:01-0800\n" ++"POT-Creation-Date: 2012-02-09 23:31-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --cc po/tr.po index 5dd65fb,4719c88..7914463 --- a/po/tr.po +++ b/po/tr.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: XBoard 4.2.7\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" - "POT-Creation-Date: 2011-12-03 08:20-0800\n" -"POT-Creation-Date: 2012-02-09 23:01-0800\n" ++"POT-Creation-Date: 2012-02-09 23:31-0800\n" "PO-Revision-Date: 2003-12-26 16:38+0200\n" "Last-Translator: A. Alper Atýcý \n" "Language-Team: Turkish \n" diff --cc po/uk.po index 27ce55a,df35c2b..73960e9 --- a/po/uk.po +++ b/po/uk.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: GNU xboard 4.6.0.20111203\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" - "POT-Creation-Date: 2011-12-03 08:20-0800\n" -"POT-Creation-Date: 2012-02-09 23:01-0800\n" ++"POT-Creation-Date: 2012-02-09 23:31-0800\n" "PO-Revision-Date: 2011-12-08 18:41+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" diff --cc po/vi.po index 6b89ec7,86279ee..e0e25df --- a/po/vi.po +++ b/po/vi.po @@@ -9,7 -9,7 +9,7 @@@ msgid " msgstr "" "Project-Id-Version: GNU xboard master-20110507\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" - "POT-Creation-Date: 2011-12-03 08:20-0800\n" -"POT-Creation-Date: 2012-02-09 23:01-0800\n" ++"POT-Creation-Date: 2012-02-09 23:31-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --cc po/xboard.pot index ce54905,b37b2c4..20ba140 --- a/po/xboard.pot +++ b/po/xboard.pot @@@ -6,9 -6,9 +6,9 @@@ #, fuzzy msgid "" msgstr "" - "Project-Id-Version: GNU xboard 4.6.0.20111203\n" -"Project-Id-Version: GNU xboard master-20110822\n" ++"Project-Id-Version: GNU xboard 4.6.0.20120209\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" - "POT-Creation-Date: 2011-12-03 08:20-0800\n" -"POT-Creation-Date: 2012-02-09 23:01-0800\n" ++"POT-Creation-Date: 2012-02-09 23:31-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --cc po/zh_CN.po index e373649,3ff9ba8..5e54319 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@@ -9,7 -9,7 +9,7 @@@ msgid " msgstr "" "Project-Id-Version: GNU xboard master-20110507\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" - "POT-Creation-Date: 2011-12-03 08:20-0800\n" -"POT-Creation-Date: 2012-02-09 23:01-0800\n" ++"POT-Creation-Date: 2012-02-09 23:31-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --cc po/zh_HK.po index 26a0811,4672371..9b8912b --- a/po/zh_HK.po +++ b/po/zh_HK.po @@@ -9,7 -9,7 +9,7 @@@ msgid " msgstr "" "Project-Id-Version: GNU xboard master-20110411\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" - "POT-Creation-Date: 2011-12-03 08:20-0800\n" -"POT-Creation-Date: 2012-02-09 23:01-0800\n" ++"POT-Creation-Date: 2012-02-09 23:31-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --cc po/zh_TW.po index 6ea6adf,5843d87..789028a --- a/po/zh_TW.po +++ b/po/zh_TW.po @@@ -9,7 -9,7 +9,7 @@@ msgid " msgstr "" "Project-Id-Version: GNU xboard master-20110507\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" - "POT-Creation-Date: 2011-12-03 08:20-0800\n" -"POT-Creation-Date: 2012-02-09 23:01-0800\n" ++"POT-Creation-Date: 2012-02-09 23:31-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --cc winboard/config.h index f2ec24e,6b85243..13af943 --- a/winboard/config.h +++ b/winboard/config.h @@@ -46,16 -46,16 +46,16 @@@ #define PACKAGE_NAME "WinBoard" /* Define to the full name and version of this package. */ - #define PACKAGE_STRING "WinBoard 4.6.0.20111203" -#define PACKAGE_STRING "WinBoard master-20120209" ++#define PACKAGE_STRING "WinBoard 4.6.0.20120209" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "winboard" /* Define to the version of this package. */ - #define PACKAGE_VERSION "4.6.0.20111203" -#define PACKAGE_VERSION "master-20120209" ++#define PACKAGE_VERSION "4.6.0.20120209" /* Define the Windows-specific FILE version info. this *MUST* be four comma separated 16-bit integers */ - #define PACKAGE_FILEVERSION 4,5,1,7 + #define PACKAGE_FILEVERSION 4,6,0,0 #define PTY_ITERATION