From: Arun Persaud Date: Thu, 23 Feb 2012 07:19:04 +0000 (-0800) Subject: Merge branch 'master' into v4.6.x X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=2d0fb98e10ba964a18ff63ea67f5abd04c6df585;hp=5e903d5a09f39841135296770934169225fe72b6;p=xboard.git Merge branch 'master' into v4.6.x Conflicts: po/da.po po/uk.po used version from master --- diff --git a/configure.ac b/configure.ac index 21b46aa..4f35fee 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ dnl| to regenerate configure. Then submit your changes to be folded into dnl| the standard version of xboard. dnl| define second argument as VERSION.PATCHLEVEL. e.g. 4.4.0j -AC_INIT([xboard],[master-20120212],[bug-xboard@gnu.org]) +AC_INIT([xboard],[4.6.0.20120212],[bug-xboard@gnu.org]) dnl| need this to be able to compile some files in a subdir (filebrowser) AM_INIT_AUTOMAKE([subdir-objects]) diff --git a/po/de.po b/po/de.po index 4bfe492..ab24626 100644 --- a/po/de.po +++ b/po/de.po @@ -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:18-0800\n" +"POT-Creation-Date: 2012-02-12 22:36-0800\n" "PO-Revision-Date: 2011-04-24 12:00-0700\n" "Last-Translator: Arun Persaud \n" "Language-Team: German\n" diff --git a/po/es.po b/po/es.po index fe9f2ee..1918818 100644 --- a/po/es.po +++ b/po/es.po @@ -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:18-0800\n" +"POT-Creation-Date: 2012-02-12 22:36-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/it.po b/po/it.po index ac1c553..5109d23 100644 --- a/po/it.po +++ b/po/it.po @@ -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:18-0800\n" +"POT-Creation-Date: 2012-02-12 22:36-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ru.po b/po/ru.po index ef9c9ed..0fe94ed 100644 --- a/po/ru.po +++ b/po/ru.po @@ -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:18-0800\n" +"POT-Creation-Date: 2012-02-12 22:36-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/tr.po b/po/tr.po index 2fb5261..5bf180b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -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:18-0800\n" +"POT-Creation-Date: 2012-02-12 22: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 --git a/po/vi.po b/po/vi.po index 57054c7..ed966d7 100644 --- a/po/vi.po +++ b/po/vi.po @@ -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:18-0800\n" +"POT-Creation-Date: 2012-02-12 22:36-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/xboard.pot b/po/xboard.pot index c33756c..0a3dae0 100644 --- a/po/xboard.pot +++ b/po/xboard.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GNU xboard master-20120212\n" +"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:18-0800\n" +"POT-Creation-Date: 2012-02-12 22:36-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 5fe278d..c7b53be 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -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:18-0800\n" +"POT-Creation-Date: 2012-02-12 22:36-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/zh_HK.po b/po/zh_HK.po index 588320c..871c28e 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -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:18-0800\n" +"POT-Creation-Date: 2012-02-12 22:36-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 0ce2bab..5dd17fa 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -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:18-0800\n" +"POT-Creation-Date: 2012-02-12 22:36-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/winboard/config.h b/winboard/config.h index 99c45c2..bf05a22 100644 --- a/winboard/config.h +++ b/winboard/config.h @@ -46,13 +46,13 @@ #define PACKAGE_NAME "WinBoard" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "WinBoard master-20120212" +#define PACKAGE_STRING "WinBoard 4.6.0.20120212" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "winboard" /* Define to the version of this package. */ -#define PACKAGE_VERSION "master-20120212" +#define PACKAGE_VERSION "4.6.0.20120212" /* Define the Windows-specific FILE version info. this *MUST* be four comma separated 16-bit integers */ #define PACKAGE_FILEVERSION 4,6,0,1