[Pkg-isocodes-devel] [SCM] ISO language, territory, currency, script codes and their translations branch, debian, updated. debian/3.29-1-15-g03a01d8

[Tobias Quathamer]

The following commit has been merged in the debian branch:
commit dfcb00b7e7db25083ef090693f18396518fab0ab
Merge: daabb056ad58da57f8a353dfeebd5ab1ccf8f29d 3d5455241ace185edae349293ddc203356c5d7e2
Author: Tobias Quathamer <toddy at debian.org>
Date:   Thu Nov 3 23:05:18 2011 +0100

    Merge branch 'master' into debian

diff --combined iso_3166/sk.po
index b179a06,0c1ad94..bdb6ecc
--- a/iso_3166/sk.po
+++ b/iso_3166/sk.po
@@@ -19,7 -19,7 +19,7 @@@ msgstr "
  "Project-Id-Version: iso_3166\n"
  "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
  "debian.org>\n"
- "POT-Creation-Date: 2011-08-11 15:50+0200\n"
+ "POT-Creation-Date: 2011-10-31 07:45+0530\n"
  "PO-Revision-Date: 2010-12-29 03:26+0100\n"
  "Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
  "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@@ -1365,11 -1365,7 +1365,7 @@@ msgstr "Singapur
  msgid "Republic of Singapore"
  msgstr "Singapurská republika"
  
- #. name for SXM
- msgid "Sint Maarten"
- msgstr "Sint Maarten"
- 
- #. official_name for SXM
+ #. name for SXM, official_name for SXM
  msgid "Sint Maarten (Dutch part)"
  msgstr "Sint Maarten (holandská časť)"
  
@@@ -1644,7 -1640,7 +1640,7 @@@ msgid "Republic of Vanuatu
  msgstr "Vanuatská republika"
  
  #. name for VEN
- msgid "Venezuela, Bolivarian republic of"
+ msgid "Venezuela, Bolivarian Republic of"
  msgstr "Venezuelská bolívarovská republika"
  
  #. official_name for VEN
@@@ -1864,4 -1860,3 +1860,4 @@@ msgstr "Socialistická federatívna rep
  #. historic names for ZAR (withdrawn 1997-07-14)
  msgid "Zaire, Republic of"
  msgstr "Zairská republika"
 +

-- 
ISO language, territory, currency, script codes and their translations