translation update:

- update_ts_files.sh: add -f flag ('fast' mode; only update specified languages and don't run tsstat.pl) - tsstat.pl: cut off latin1 & cyrillic suffix and use only one serbian flag - unify flag image permission - german translation update
qgis · Jun 6, 2013 · b005f10 · b005f10
1 parent 6b0ce08
commit b005f10
Show file tree

Hide file tree

Showing 56 changed files with 261 additions and 555 deletions.
diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/images/flags/af.png b/images/flags/af.png
diff --git a/images/flags/ar.png b/images/flags/ar.png
diff --git a/images/flags/bg.png b/images/flags/bg.png
diff --git a/images/flags/bn.png b/images/flags/bn.png
diff --git a/images/flags/cs_CZ.png b/images/flags/cs_CZ.png
diff --git a/images/flags/da_DK.png b/images/flags/da_DK.png
diff --git a/images/flags/de.png b/images/flags/de.png
diff --git a/images/flags/el_GR.png b/images/flags/el_GR.png
diff --git a/images/flags/es.png b/images/flags/es.png
diff --git a/images/flags/et_EE.png b/images/flags/et_EE.png
diff --git a/images/flags/fa.png b/images/flags/fa.png
diff --git a/images/flags/fi.png b/images/flags/fi.png
diff --git a/images/flags/fr.png b/images/flags/fr.png
diff --git a/images/flags/gl_ES.png b/images/flags/gl_ES.png
diff --git a/images/flags/he.png b/images/flags/he.png
diff --git a/images/flags/hr_HR.png b/images/flags/hr_HR.png
diff --git a/images/flags/hu.png b/images/flags/hu.png
diff --git a/images/flags/id.png b/images/flags/id.png
diff --git a/images/flags/is.png b/images/flags/is.png
diff --git a/images/flags/it.png b/images/flags/it.png
diff --git a/images/flags/ja.png b/images/flags/ja.png
diff --git a/images/flags/ka_GE.png b/images/flags/ka_GE.png
diff --git a/images/flags/km.png b/images/flags/km.png
diff --git a/images/flags/ko_KR.png b/images/flags/ko_KR.png
diff --git a/images/flags/lo.png b/images/flags/lo.png
diff --git a/images/flags/lt.png b/images/flags/lt.png
diff --git a/images/flags/lv.png b/images/flags/lv.png
diff --git a/images/flags/ml_IN.png b/images/flags/ml_IN.png
diff --git a/images/flags/mn.png b/images/flags/mn.png
diff --git a/images/flags/nl.png b/images/flags/nl.png
diff --git a/images/flags/no.png b/images/flags/no.png
diff --git a/images/flags/pl_PL.png b/images/flags/pl_PL.png
diff --git a/images/flags/pt_BR.png b/images/flags/pt_BR.png
diff --git a/images/flags/pt_PT.png b/images/flags/pt_PT.png
diff --git a/images/flags/ro.png b/images/flags/ro.png
diff --git a/images/flags/ru.png b/images/flags/ru.png
diff --git a/images/flags/sk.png b/images/flags/sk.png
diff --git a/images/flags/sl_SI.png b/images/flags/sl_SI.png
diff --git a/images/flags/sq_AL.png b/images/flags/sq_AL.png
diff --git a/images/flags/sr_Cyrl.png → images/flags/sr.png b/images/flags/sr_Cyrl.png → images/flags/sr.png
diff --git a/images/flags/sr_Latn.png b/images/flags/sr_Latn.png
diff --git a/images/flags/sv.png b/images/flags/sv.png
diff --git a/images/flags/sw.png b/images/flags/sw.png
diff --git a/images/flags/ta.png b/images/flags/ta.png
diff --git a/images/flags/th.png b/images/flags/th.png
diff --git a/images/flags/tr.png b/images/flags/tr.png
diff --git a/images/flags/uk.png b/images/flags/uk.png
diff --git a/images/flags/vi.png b/images/flags/vi.png
diff --git a/images/flags/xh.png b/images/flags/xh.png
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
@@ -41,8 +41,7 @@
         <file>flags/sk.png</file>
         <file>flags/sl_SI.png</file>
         <file>flags/sq_AL.png</file>
-        <file>flags/sr_Cyrl.png</file>
-        <file>flags/sr_Latn.png</file>
+        <file>flags/sr.png</file>
         <file>flags/sv.png</file>
         <file>flags/sw.png</file>
         <file>flags/ta.png</file>

diff --git a/scripts/tsstat.pl b/scripts/tsstat.pl
@@ -15,6 +15,7 @@
 ###########################################################################
 
 use strict;
+use warnings;
 use Locale::Language;
 use Locale::Country;
 
@@ -73,8 +74,8 @@
 	sk => 'Lubos Balazovic, Jana Kormanikova, Ivan Mincik',
 	sl_SI => 'Jože Detečnik, Dejan Gregor',
 	sq_AL => '',
-	sr_Cyrl => 'Goran Ivanković',
 	sr_Latn => 'Goran Ivanković',
+	sr_Cyrl => 'Goran Ivanković',
 	sv => 'Lars Luthman, Magnus Homann, Victor Axbom',
 	sw => 'Yohana Mapala',
 	th => 'Man Chao',
@@ -91,6 +92,18 @@
 	my ($langcode) = $i =~ /i18n\/qgis_(.*).ts/;
 	next if $langcode eq "en";
 
+	my $translator = $translators->{$langcode} || "(orphaned)";
+
+	my $charset = "";
+	my $lc = $langcode;
+	if( $langcode =~ /(.*)_Latn/ ) {
+		$charset = " (latin)";
+		$langcode = $1;
+	} elsif( $langcode =~ /(.*)_Cyrl/ ) {
+		$charset = " (cyrillic)";
+		$langcode = $1;
+	}
+
 	my $name;
 	if($langcode =~ /(.*)_(.*)/) {
 		my $lang = code2language(lc $1);
@@ -100,10 +113,12 @@
 		$name = code2language(lc $langcode);
 	}
 
+	$name .= $charset;
 
 	open F, "lrelease $i|";
 
-	my($translations,$finished,$unfinished,$untranslated);
+	my($translations,$finished,$unfinished);
+	my $untranslated=0;
 
 	while(<F>) {
 		if(/Generated (\d+) translation\(s\) \((\d+) finished and (\d+) unfinished\)/) {
@@ -125,15 +140,24 @@
 		$maxn = $n;
 	}
 
-	push @lang, { code=>$langcode, name=>$name, n=>$n, translations=>$translations, finished=>$finished, unfinished=>$unfinished, untranslated=>$untranslated, };
+	push @lang, {
+		code=>$langcode,
+		name=>$name, n=>$n,
+		translations=>$translations,
+		finished=>$finished,
+		unfinished=>$unfinished,
+		untranslated=>$untranslated,
+		translator=>$translator
+	};
 }
 
 foreach my $l (@lang) {
 	$l->{diff}       = $l->{n}-$maxn;
 	$l->{percentage} = ($l->{finished}+$l->{unfinished}/2)/$maxn*100;
 }
 
-if ($ARGV[0] eq "site") {
+
+if ( @ARGV && $ARGV[0] eq "site") {
 	print "<html><body>";
 	print "<head>";
 	print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"/>";
@@ -157,7 +181,7 @@
 			$l->{diff}==0 ? $l->{n} : "$l->{n} ($l->{diff})",
 			$l->{finished}, $l->{unfinished}, $l->{untranslated},
 			$l->{percentage}, $l->{percentage},
-			$translators->{$l->{code}};
+			$l->{translator};
 	}
 	print "</table></body></html>\n";
 } else {
@@ -178,7 +202,7 @@
 			$l->{code}, $l->{name},
 			$l->{finished}, $l->{unfinished}, $l->{untranslated},
 			$l->{percentage}, $l->{percentage},
-			$translators->{$l->{code}};
+			$l->{translator};
 	}
 	print "</table>\n";
 }
diff --git a/scripts/update_ts_files.sh b/scripts/update_ts_files.sh
@@ -70,6 +70,7 @@ fi
 
 exclude=
 opts=
+fast=
 while (( $# > 0 )); do
   arg=$1
   shift
@@ -83,6 +84,8 @@ while (( $# > 0 )); do
     else
       add="$add $arg"
     fi
+  elif [ "$arg" = "-f" ]; then
+    fast=--remove-files
   elif [ -f "i18n/qgis_$arg.ts" ]; then
     exclude="$exclude --exclude i18n/qgis_$arg.ts"
   else
@@ -92,7 +95,7 @@ done
 
 if [ -n "$exclude" -o -n "$add" ]; then
   echo Saving excluded translations
-  tar -cf i18n/qgis_ts.tar i18n/qgis_*.ts$exclude
+  tar $fast -cf i18n/qgis_ts.tar i18n/qgis_*.ts$exclude
 fi
 echo Updating python translations
 cd python
@@ -127,8 +130,10 @@ fi
 echo Updating translations
 $LUPDATE$opts -verbose qgis_ts.pro
 
-echo Updating TRANSLATORS File
-./scripts/tsstat.pl > doc/TRANSLATORS
+if [ -z "$fast" ]; then
+	echo Updating TRANSLATORS File
+	./scripts/tsstat.pl >doc/TRANSLATORS
+fi
 
 cleanup