From: Arun Persaud Date: Mon, 27 Feb 2012 03:38:01 +0000 (-0800) Subject: Merge branch 'master' into v4.6.x X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=665c4ef0f9740c9d8cdc7d52ff838b54605c66ab Merge branch 'master' into v4.6.x Conflicts: configure.ac 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 fixed version number for 4.6.0 and ran "make update-po" afterwards (first ./autogen.sh and configure) --- 665c4ef0f9740c9d8cdc7d52ff838b54605c66ab diff --cc configure.ac index 4f35fee,bed135b..1eb0d15 --- 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.20120212],[bug-xboard@gnu.org]) -AC_INIT([xboard],[master-20120226],[bug-xboard@gnu.org]) ++AC_INIT([xboard],[4.6.0-20120226],[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 c6182d5,99da847..ec04095 --- a/po/da.po +++ b/po/da.po @@@ -21,7 -21,7 +21,7 @@@ msgid " msgstr "" "Project-Id-Version: GNU xboard 4.6.0.20120212\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" - "POT-Creation-Date: 2012-02-12 22:36-0800\n" -"POT-Creation-Date: 2012-02-26 19:14-0800\n" ++"POT-Creation-Date: 2012-02-26 19:36-0800\n" "PO-Revision-Date: 2012-02-16 19:11+0100\n" "Last-Translator: Byrial Ole Jensen \n" "Language-Team: Danish \n" diff --cc po/de.po index ab24626,6c01ed7..6609b2a --- 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: 2012-02-12 22:36-0800\n" -"POT-Creation-Date: 2012-02-26 19:14-0800\n" ++"POT-Creation-Date: 2012-02-26 19:36-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 1918818,52b5d3a..42f6c6a --- 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: 2012-02-12 22:36-0800\n" -"POT-Creation-Date: 2012-02-26 19:14-0800\n" ++"POT-Creation-Date: 2012-02-26 19:36-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 5109d23,f6fd404..ee3660c --- 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: 2012-02-12 22:36-0800\n" -"POT-Creation-Date: 2012-02-26 19:14-0800\n" ++"POT-Creation-Date: 2012-02-26 19:36-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 0fe94ed,909e9af..9c0a35a --- 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: 2012-02-12 22:36-0800\n" -"POT-Creation-Date: 2012-02-26 19:14-0800\n" ++"POT-Creation-Date: 2012-02-26 19:36-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 5bf180b,9e455da..ff785e2 --- 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: 2012-02-12 22:36-0800\n" -"POT-Creation-Date: 2012-02-26 19:14-0800\n" ++"POT-Creation-Date: 2012-02-26 19:36-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 037a4c5,fc17e39..7a2a1c5 --- a/po/uk.po +++ b/po/uk.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: GNU xboard-4.6.0.20120212\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" - "POT-Creation-Date: 2012-02-12 22:36-0800\n" -"POT-Creation-Date: 2012-02-26 19:14-0800\n" ++"POT-Creation-Date: 2012-02-26 19:36-0800\n" "PO-Revision-Date: 2012-02-13 10:18+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" diff --cc po/vi.po index ed966d7,e55d1c5..a0225d8 --- 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: 2012-02-12 22:36-0800\n" -"POT-Creation-Date: 2012-02-26 19:14-0800\n" ++"POT-Creation-Date: 2012-02-26 19:36-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 0a3dae0,04b3c0f..4576dba --- 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.20120212\n" -"Project-Id-Version: GNU xboard master-20120212\n" ++"Project-Id-Version: GNU xboard 4.6.0-20120226\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" - "POT-Creation-Date: 2012-02-12 22:36-0800\n" -"POT-Creation-Date: 2012-02-26 19:14-0800\n" ++"POT-Creation-Date: 2012-02-26 19:36-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 c7b53be,27b8833..6cb9e68 --- 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: 2012-02-12 22:36-0800\n" -"POT-Creation-Date: 2012-02-26 19:14-0800\n" ++"POT-Creation-Date: 2012-02-26 19:36-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 871c28e,d87bca7..33ac20d --- 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: 2012-02-12 22:36-0800\n" -"POT-Creation-Date: 2012-02-26 19:14-0800\n" ++"POT-Creation-Date: 2012-02-26 19:36-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 5dd17fa,3fba722..f21bb58 --- 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: 2012-02-12 22:36-0800\n" -"POT-Creation-Date: 2012-02-26 19:14-0800\n" ++"POT-Creation-Date: 2012-02-26 19:36-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 bf05a22,d527433..a5827ff --- 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.20120212" -#define PACKAGE_STRING "WinBoard master-20120226" ++#define PACKAGE_STRING "WinBoard 4.6.0.20120226" /* 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.20120212" -#define PACKAGE_VERSION "master-20120226" ++#define PACKAGE_VERSION "4.6.0.20120226" /* Define the Windows-specific FILE version info. this *MUST* be four comma separated 16-bit integers */ - #define PACKAGE_FILEVERSION 4,6,0,1 + #define PACKAGE_FILEVERSION 4,6,0,2 #define PTY_ITERATION