Merge branch 'master' into v4.6.x
authorArun Persaud <arun@nubati.net>
Sat, 3 Dec 2011 16:14:43 +0000 (08:14 -0800)
committerArun Persaud <arun@nubati.net>
Sat, 3 Dec 2011 16:14:43 +0000 (08:14 -0800)
1  2 
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

diff --cc po/de.po
Simple merge
diff --cc po/es.po
Simple merge
diff --cc po/it.po
Simple merge
diff --cc po/ru.po
Simple merge
diff --cc po/tr.po
Simple merge
diff --cc po/vi.po
Simple merge
diff --cc po/xboard.pot
@@@ -6,9 -6,9 +6,9 @@@
  #, fuzzy
  msgid ""
  msgstr ""
 -"Project-Id-Version: GNU xboard master-20110822\n"
 +"Project-Id-Version: GNU xboard 4.6.0.20111101\n"
  "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n"
- "POT-Creation-Date: 2011-11-01 18:38-0700\n"
+ "POT-Creation-Date: 2011-12-03 08:07-0800\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
diff --cc po/zh_CN.po
Simple merge
diff --cc po/zh_HK.po
Simple merge
diff --cc po/zh_TW.po
Simple merge