translation files updated with script (old one)

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12332 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 3, 2009 · 8d3d28a · 8d3d28a
1 parent 51265a5
commit 8d3d28a
Show file tree

Hide file tree

Showing 33 changed files with 8,532 additions and 131,943 deletions.
diff --git a/i18n/qgis_ar.ts b/i18n/qgis_ar.ts
diff --git a/i18n/qgis_cs_CZ.ts b/i18n/qgis_cs_CZ.ts
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/i18n/qgis_el_GR.ts b/i18n/qgis_el_GR.ts
diff --git a/i18n/qgis_es.ts b/i18n/qgis_es.ts
diff --git a/i18n/qgis_fr.ts b/i18n/qgis_fr.ts
diff --git a/i18n/qgis_he.ts b/i18n/qgis_he.ts
diff --git a/i18n/qgis_hu.ts b/i18n/qgis_hu.ts
diff --git a/i18n/qgis_id.ts b/i18n/qgis_id.ts
diff --git a/i18n/qgis_it.ts b/i18n/qgis_it.ts
diff --git a/i18n/qgis_ja.ts b/i18n/qgis_ja.ts
diff --git a/i18n/qgis_ka_GE.ts b/i18n/qgis_ka_GE.ts
diff --git a/i18n/qgis_lo.ts b/i18n/qgis_lo.ts
diff --git a/i18n/qgis_lt.ts b/i18n/qgis_lt.ts
diff --git a/i18n/qgis_lv.ts b/i18n/qgis_lv.ts
diff --git a/i18n/qgis_mn.ts b/i18n/qgis_mn.ts
diff --git a/i18n/qgis_nl.ts b/i18n/qgis_nl.ts
diff --git a/i18n/qgis_pl_PL.ts b/i18n/qgis_pl_PL.ts
diff --git a/i18n/qgis_pt_BR.ts b/i18n/qgis_pt_BR.ts
diff --git a/i18n/qgis_ro.ts b/i18n/qgis_ro.ts
diff --git a/i18n/qgis_ru.ts b/i18n/qgis_ru.ts
diff --git a/i18n/qgis_sk.ts b/i18n/qgis_sk.ts
diff --git a/i18n/qgis_sq_AL.ts b/i18n/qgis_sq_AL.ts
diff --git a/i18n/qgis_sv.ts b/i18n/qgis_sv.ts
diff --git a/i18n/qgis_th.ts b/i18n/qgis_th.ts
diff --git a/i18n/qgis_tr.ts b/i18n/qgis_tr.ts
diff --git a/i18n/qgis_uk.ts b/i18n/qgis_uk.ts
diff --git a/i18n/qgis_vi.ts b/i18n/qgis_vi.ts
diff --git a/i18n/qgis_xh.ts b/i18n/qgis_xh.ts
diff --git a/i18n/qgis_zh_CN.ts b/i18n/qgis_zh_CN.ts
diff --git a/i18n/qgis_zh_TW.ts b/i18n/qgis_zh_TW.ts
diff --git a/scripts/update_ts_files.sh b/scripts/update_ts_files.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Update the translation files with strings used in QGIS
 # 1. create a clean Qt .pro file for the project
 # 2. run lupdate using the .pro file from step 1
@@ -7,53 +7,18 @@
 # name is reserved for the Windows qmake project file
 # update_ts_files.sh,v 1.3 2004/07/14 18:16:24 gsherman Exp
 
-set -e
-
 PATH=$QTDIR/bin:$PATH
 
 #first tar the qt_xx.ts files in i18n folder such that lupdate does not 
 #merge the qgis strings to them
 echo Creating qt_ts.tar
-tar --remove-files -cvf i18n/qt_ts.tar i18n/qt_*.ts
-exclude=
-opts=
-for i in "$@"; do
-  if [ -f "i18n/qgis_$i.ts" ]; then
-    exclude="$exclude --exclude i18n/qgis_$i.ts"
-  else
-    opts=" $i"
-  fi
-done
-if [ -n "$exclude" ]; then
-  tar --remove-files -cvf i18n/qgis_ts.tar i18n/qgis_*.ts$exclude
-fi
-echo Updating python translations
-cd python
-pylupdate4 utils.py -ts python-i18n.ts
-perl ../scripts/ts2cpp.pl python-i18n.ts python-i18n.cpp
-rm python-i18n.ts
-cd ..
-for i in python/plugins/*/CMakeLists.txt; do
-	cd ${i%/*}
-	pylupdate4 $(find . -name "*.py" -o -name "*.ui") -ts python-i18n.ts
-	perl ../../../scripts/ts2cpp.pl python-i18n.ts python-i18n.cpp
-	rm python-i18n.ts
-	cd ../../..
-done
+tar -cvf i18n/qt_ts.tar i18n/qt_*.ts
+rm i18n/qt_*.ts
 echo Creating qmake project file
-qmake -project -o qgis_ts.pro -nopwd src python i18n
+qmake -project -o qgis_ts.pro
 echo Updating translation files
-lupdate$opts -verbose qgis_ts.pro
-echo Removing temporary python translation files
-perl -i.bak -ne 'print unless /^\s+<location.*python-i18n\.cpp.*$/;' i18n/qgis_*.ts
-rm python/python-i18n.cpp python/plugins/*/python-i18n.cpp i18n/qgis_*.ts.bak
+lupdate -verbose qgis_ts.pro
 echo Removing qmake project file
 rm qgis_ts.pro
 echo Unpacking qt_ts.tar
-tar -xvf i18n/qt_ts.tar 
-rm i18n/qt_ts.tar
-if [ -f i18n/qgis_ts.tar ]; then
-  echo Unpacking i18n/qgis_ts.tar
-  tar -xvf i18n/qgis_ts.tar 
-  rm i18n/qgis_ts.tar
-fi
+tar -xvf i18n/qt_ts.tar
diff --git a/src/ui/qgspgsourceselectbase.ui b/src/ui/qgspgsourceselectbase.ui
@@ -165,7 +165,7 @@
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Open</set>
      </property>
     </widget>
    </item>
@@ -195,12 +195,28 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>353</x>
-     <y>446</y>
+     <x>265</x>
+     <y>449</y>
     </hint>
     <hint type="destinationlabel">
-     <x>404</x>
-     <y>421</y>
+     <x>399</x>
+     <y>310</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>QgsPgSourceSelectBase</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>368</x>
+     <y>450</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>401</x>
+     <y>377</y>
     </hint>
    </hints>
   </connection>