cleanup after consolidating chinese

qgis · Nov 5, 2015 · bc042a5 · bc042a5
1 parent f982c84
commit bc042a5
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 77 deletions.
diff --git a/.tx/config b/.tx/config
@@ -3,73 +3,47 @@ host = https://www.transifex.com
 
 [QGIS.qgis-application]
 file_filter = i18n/qgis_<lang>.ts
+minimum_perc = 35
 source_file = i18n/qgis_en.ts
 source_lang = en
-trans.af = i18n/qgis_af.ts
 trans.ar = i18n/qgis_ar.ts
-trans.bg = i18n/qgis_bg.ts
-trans.bn = i18n/qgis_bn.ts
 trans.bs = i18n/qgis_bs.ts
 trans.ca = i18n/qgis_ca.ts
 trans.cs = i18n/qgis_cs.ts
 trans.da = i18n/qgis_da.ts
 trans.de = i18n/qgis_de.ts
 trans.el = i18n/qgis_el.ts
-trans.en = i18n/qgis_en.ts
 trans.es = i18n/qgis_es.ts
 trans.et = i18n/qgis_et.ts
 trans.eu = i18n/qgis_eu.ts
-trans.fa = i18n/qgis_fa.ts
 trans.fi = i18n/qgis_fi.ts
 trans.fr = i18n/qgis_fr.ts
 trans.gl = i18n/qgis_gl.ts
-trans.he = i18n/qgis_he.ts
 trans.hi = i18n/qgis_hi.ts
 trans.hr = i18n/qgis_hr.ts
 trans.hu = i18n/qgis_hu.ts
 trans.id = i18n/qgis_id.ts
-trans.is = i18n/qgis_is.ts
 trans.it = i18n/qgis_it.ts
 trans.ja = i18n/qgis_ja.ts
-trans.ka = i18n/qgis_ka.ts
 trans.km = i18n/qgis_km.ts
-trans.kn = i18n/qgis_kn.ts
 trans.ko = i18n/qgis_ko.ts
-trans.ku = i18n/qgis_ku.ts
-trans.ku_IQ = i18n/qgis_ku_IQ.ts
-trans.lo = i18n/qgis_lo.ts
 trans.lt = i18n/qgis_lt.ts
 trans.lv = i18n/qgis_lv.ts
-trans.mk = i18n/qgis_mk.ts
-trans.ml = i18n/qgis_ml.ts
-trans.mn = i18n/qgis_mn.ts
-trans.mr = i18n/qgis_mr.ts
-trans.my = i18n/qgis_my.ts
 trans.nb = i18n/qgis_nb.ts
 trans.nl = i18n/qgis_nl.ts
-trans.pam = i18n/qgis_pam.ts
 trans.pl = i18n/qgis_pl.ts
 trans.pt_BR = i18n/qgis_pt_BR.ts
 trans.pt_PT = i18n/qgis_pt_PT.ts
 trans.ro = i18n/qgis_ro.ts
 trans.ru = i18n/qgis_ru.ts
-trans.si = i18n/qgis_si.ts
 trans.sk = i18n/qgis_sk.ts
 trans.sl = i18n/qgis_sl.ts
-trans.sq = i18n/qgis_sq.ts
 trans.sr = i18n/qgis_sr.ts
-trans.sr@latin = i18n/qgis_sr@latin.ts
+trans.sr@latin =/qgis_sr@latin.ts
 trans.sv = i18n/qgis_sv.ts
-trans.sw = i18n/qgis_sw.ts
-trans.ta = i18n/qgis_ta.ts
-trans.te = i18n/qgis_te.ts
-trans.th = i18n/qgis_th.ts
-trans.tl = i18n/qgis_tl.ts
 trans.tr = i18n/qgis_tr.ts
-trans.uk = i18n/qgis_uk.ts
 trans.vi = i18n/qgis_vi.ts
-trans.xh = i18n/qgis_xh.ts
-trans.zh_CN = i18n/qgis_zh_CN.ts
-trans.zh_TW = i18n/qgis_zh_TW.ts
+trans.zh-Hans = i18n/qgis_zh-Hans.ts
+trans.zh-Hant = i18n/qgis_zh-Hant.ts
 type = QT
 
diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt
@@ -22,7 +22,7 @@ ENDMACRO(ADD_TRANSLATION_FILES)
 # make sure the output directory exists
 file(MAKE_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/i18n)
 
-SET(TS_FILES qgis_ar.ts qgis_bs.ts qgis_ca.ts qgis_cs.ts qgis_da.ts qgis_de.ts qgis_el.ts qgis_es.ts qgis_et.ts qgis_eu.ts qgis_fi.ts qgis_fr.ts qgis_gl.ts qgis_hi.ts qgis_hr.ts qgis_hu.ts qgis_id.ts qgis_it.ts qgis_ja.ts qgis_km.ts qgis_ko.ts qgis_lt.ts qgis_lv.ts qgis_nb.ts qgis_nl.ts qgis_pl.ts qgis_pt_BR.ts qgis_pt_PT.ts qgis_ro.ts qgis_ru.ts qgis_sk.ts qgis_sl.ts qgis_sr.ts qgis_sr@latin.ts qgis_sv.ts qgis_tr.ts qgis_vi.ts qgis_zh-Hans.ts qgis_zh_CN.ts qgis_zh_TW.ts)
+SET(TS_FILES qgis_ar.ts qgis_bs.ts qgis_ca.ts qgis_cs.ts qgis_da.ts qgis_de.ts qgis_el.ts qgis_es.ts qgis_et.ts qgis_eu.ts qgis_fi.ts qgis_fr.ts qgis_gl.ts qgis_hi.ts qgis_hr.ts qgis_hu.ts qgis_id.ts qgis_it.ts qgis_ja.ts qgis_km.ts qgis_ko.ts qgis_lt.ts qgis_lv.ts qgis_nb.ts qgis_nl.ts qgis_pl.ts qgis_pt_BR.ts qgis_pt_PT.ts qgis_ro.ts qgis_ru.ts qgis_sk.ts qgis_sl.ts qgis_sr.ts qgis_sr@latin.ts qgis_sv.ts qgis_tr.ts qgis_vi.ts qgis_zh-Hans.ts qgis_zh-Hant.ts)
 
 ADD_TRANSLATION_FILES (QM_FILES ${TS_FILES})
 

diff --git a/images/flags/zh_CN.png b/images/flags/zh_CN.png
diff --git a/images/flags/zh_TW.png b/images/flags/zh_TW.png
diff --git a/images/images.qrc b/images/images.qrc
@@ -35,8 +35,6 @@
         <file>flags/uk.png</file>
         <file>flags/vi.png</file>
         <file>flags/xh.png</file>
-        <file>flags/zh_CN.png</file>
-        <file>flags/zh_TW.png</file>
         <file>icons/qgis-icon-16x16.png</file>
         <file>icons/qgis-icon-60x60.png</file>
         <file>icons/qbrowser-icon-60x60.png</file>
@@ -515,12 +513,12 @@
         <file>themes/default/mIconSuccess.png</file>
         <file>themes/default/mIconClear.png</file>
         <file>themes/default/mIconWarning.svg</file>
-        <file>flags/zh.png</file>
         <file>themes/default/mIconPaintEffects.svg</file>
         <file>themes/default/mActionCircularStringCurvePoint.png</file>
         <file>themes/default/mActionCircularStringCurvePoint.svg</file>
         <file>themes/default/mActionCircularStringRadius.png</file>
         <file>themes/default/mActionCircularStringRadius.svg</file>
+        <file>flags/zh.png</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

diff --git a/scripts/create-transifex-resources.sh b/scripts/create-transifex-resources.sh
@@ -7,6 +7,7 @@
 #
 # Tim Sutton, March 2013
 
+# TODO: update script to consider qgis_sr@latin and qgis_zh-Han*
 
 LOCALES=`ls i18n/qgis_*.ts| grep -o "qgis_[a-z\_A-Z]*" | sed 's/qgis_//g' | sort | uniq`
 
@@ -16,7 +17,7 @@ RESOURCE='i18n/qgis_<lang>.ts'
 
 #qgis-application because no _ allowed in resource name
 set -x
-tx set -t QT --auto-local -r QGIS.qgis-application \
+tx set -t QT --minimum-perc=35 --auto-local -r QGIS.qgis-application \
   $RESOURCE \
   --source-lang en \
   --source $TSFILE \

diff --git a/scripts/tsstat.pl b/scripts/tsstat.pl
@@ -88,9 +88,8 @@
 	'tr' => 'Osman Yalçın YILMAZ, Omur Saygin',
 	'uk' => 'Alexander Bruy',
 	'vi' => 'Phùng Văn Doanh, Bùi Hữu Mạnh, Nguyễn Văn Thanh, Nguyễn Hữu Phúc, Cao Minh Tu',
-	'zh_CN' => 'Calvin Ngei, Zhang Jun, Richard Xie',
+	'zh-Hant' => 'Calvin Ngei, Zhang Jun, Richard Xie',
 	'zh-Hans' => 'Calvin Ngei, Lisashen',
-	'zh_TW' => 'Nung-yao Lin',
 };
 
 my $maxn;