fix some translation strings

git-svn-id: http://svn.osgeo.org/qgis/trunk@11226 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: jef

python/plugins/osm/DlgDownloadOSM.py

@@ -6,7 +6,7 @@
 
 Note that OpenStreetMap server you are downloading OSM data from (~api.openstreetmap.org)
 has fixed limitations of how much data you can get. As written on wiki.openstreetmap.org
-neighter latitude nor longitude extent of downloaded region can be larger than 0.25 degree.
+neither latitude nor longitude extent of downloaded region can be larger than 0.25 degrees.
 
 Each error response from OSM server is caught by OSM Plugin and display to its user.
 """
@@ -32,7 +32,7 @@ class DlgDownloadOSM(QDialog, Ui_DlgDownloadOSM):
 
     Note that OpenStreetMap server you are downloading OSM data from (~api.openstreetmap.org)
     has fixed limitations of how much data you can get. As written on wiki.openstreetmap.org
-    neighter latitude nor longitude extent of downloaded region can be larger than 0.25 degree.
+    neither latitude nor longitude extent of downloaded region can be larger than 0.25 degrees.
 
     Each error response from OSM server is caught by OSM Plugin and display to its user.
     """
@@ -357,7 +357,7 @@ def showExtentHelp(self):
 
         mb=QMessageBox()
         mb.setMinimumWidth(390)
-        mb.information(self, self.tr("Getting data"),self.tr("The OpenStreetMap server you are downloading OSM data from (~ api.openstreetmap.org) has fixed limitations of how much data you can get. As written at <http://wiki.openstreetmap.org/wiki/Getting_Data> neighter latitude nor longitude extent of downloaded region can be larger than 0.25 degree. Note that Quantum GIS allows you to specify any extent you want, but OpenStreetMap server will reject all request that won't satisfy downloading limitations."))
+        mb.information(self, self.tr("Getting data"),self.tr("The OpenStreetMap server you are downloading OSM data from (~ api.openstreetmap.org) has fixed limitations of how much data you can get. As written at <http://wiki.openstreetmap.org/wiki/Getting_Data> neither latitude nor longitude extent of downloaded region can be larger than 0.25 degrees. Note that Quantum GIS allows you to specify any extent you want, but OpenStreetMap server will reject all request that won't satisfy downloading limitations."))
 
 
     def checkExtent(self):

python/plugins/osm/ui_files/DlgAddRelation.ui

@@ -273,7 +273,7 @@
         </size>
        </property>
        <property name="text" >
-        <string>Storno</string>
+        <string>Cancel</string>
        </property>
        <property name="autoDefault" >
         <bool>false</bool>

scripts/update_ts_files.sh

@@ -29,7 +29,7 @@ qmake -project -o qgis_ts.pro -nopwd src python i18n
 echo Updating translation files
 lupdate -verbose qgis_ts.pro
 echo Removing temporary python plugin translation files
-perl -i.bak -pe '$_="" if /^\s+<location.*python-i18n\.cpp.*$/;' i18n/qgis_*.ts
+perl -i.bak -ne 'print unless /^\s+<location.*python-i18n\.cpp.*$/;' i18n/qgis_*.ts
 rm python/plugins/*/python-i18n.cpp i18n/qgis_*.ts.bak
 echo Removing qmake project file
 rm qgis_ts.pro