[Pkg-isocodes-devel] [SCM] ISO language, territory, currency, script codes and their translations branch, master, updated. 18cb5c5822521839759cf60aba4b52815d2eb950

[Christian PERRIER]

The following commit has been merged in the master branch:
commit 18cb5c5822521839759cf60aba4b52815d2eb950
Merge: 2873bc31f3e1e7baa647bc8e8e53af9e8d0d2f26 957840ccde98c6343692f5ec5c75c871d89da1fd
Author: Christian PERRIER <bubulle at debian.org>
Date:   Thu Feb 21 20:14:54 2013 +0100

    Merge conflict

diff --combined ChangeLog
index ae1ef82,d892eb3..960bf94
--- a/ChangeLog
+++ b/ChangeLog
@@@ -44,7 -44,10 +44,11 @@@ UNRELEASE
    * Lithuanian by Rimas Kudelis. Closes: #700698
    * Italian by Milo Casagrande.
    * Czech by Miroslav Kure.
 +  * Turkish by Atila KOÇ. Closes: #701066
+   * Latvian by Rihards PriedItis (TP)
+   * Chinese (traditional) by Wei-Lun Chao (TP)
+   * Icelandic by Sveinn í Felli (TP)
+   * Interlingua by Nik Kalach (TP)
  
    [ ISO 639-3 translations ]
    * German by Hendrik Knackstedt
@@@ -62,6 -65,9 +66,9 @@@
    * Italian by Milo Casagrande (TP)
    * Bulgarian by Roumen Petrov (TP)
    * Czech by Miroslav Kure
+   * Latvian by Rihards PriedItis (TP)
+   * Chinese (traditional) by Wei-Lun Chao (TP)
+   * Icelandic by Sveinn í Felli (TP)
  
    [ ISO 15924 translations ]
    * Ukrainian by Yuri Chornoivan (TP)
@@@ -71,11 -77,14 +78,14 @@@
    * Danish by Joe Hansen (TP)
    * Dutch by Freek de Kruijf (TP)
    * Esperanto by Felipe Castro (TP)
+   * Latvian by Rihards PriedItis (TP)
+   * Icelandic by Sveinn í Felli (TP)
  
    [ ISO 4217 translations ]
    * Croatian by Tomislav Krznar (TP)
    * Fix encoding for Mongolian. Closes: #695680
      Thanks to Jakub Wilk
+   * Chinese (traditional) by Wei-Lun Chao (TP)
  
    [ ISO 3166-2 translations ]
    * Danish by Joe Hansen (TP)

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