[Pkg-isocodes-devel] [SCM] ISO language, territory, currency, script codes and their translations branch, debian, updated. iso-codes/3.24-86-g8101c76

[Tobias Quathamer]

The following commit has been merged in the debian branch:
commit 34763b1bc5a357aba597a4faacb424d4a2dfc282
Merge: 52ecab94e3a658ad4b50569c6fbf5ab9b1f73b1d b24bfdc41bc790dfa0806d643bc30ac02a64d3b9
Author: Tobias Quathamer <toddy at debian.org>
Date:   Sun Jan 2 14:34:55 2011 +0100

    Merge branch 'master' into debian
    
    Conflicts:
    	iso_3166/sk.po

diff --combined iso_3166/sk.po
index 2528d7f,cdb244f..bc2a55d
mode 100644,100755..100755
--- a/iso_3166/sk.po
+++ b/iso_3166/sk.po
@@@ -17,7 -17,8 +17,8 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: iso_3166\n"
- "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth.debian.org>\n"
+ "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
+ "debian.org>\n"
  "POT-Creation-Date: 2010-12-23 20:09+0100\n"
  "PO-Revision-Date: 2010-12-29 03:26+0100\n"
  "Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
@@@ -1855,4 -1856,3 +1856,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