The following commit has been merged in the master branch:
commit a37600e66cd7613f1bc11a207d2f00b1725740db
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri Jan 17 16:43:08 2014 +0100

    Merge Italian translation changes into single patch.

diff --git a/debian/patches/fix-tag-it-translation.patch 
b/debian/patches/fix-tag-it-translation.patch
deleted file mode 100644
index dd9c645..0000000
--- a/debian/patches/fix-tag-it-translation.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Fix tag IT translation
-Origin: 
https://github.com/qgis/QGIS/commit/2b0ab72a09a4aa7c615179976c512614e383eead
---- a/i18n/qgis_it.ts
-+++ b/i18n/qgis_it.ts
-@@ -35847,7 +35847,7 @@ Ulteriori informazioni sull&apos;errore:
-         <location filename="../src/ui/qgsosmexportdialog.ui" line="84"/>
-         <source>Exported tags</source>
-         <translatorcomment>#dubbio#</translatorcomment>
--        <translation>Tag esportati</translation>
-+        <translation>Etichette esportate</translation>
-     </message>
-     <message>
-         <location filename="../src/ui/qgsosmexportdialog.ui" line="92"/>
-@@ -35864,7 +35864,7 @@ Ulteriori informazioni sull&apos;errore:
-         <source>Tag</source>
-         <translatorcomment>Etichetta?
- #dubbio#</translatorcomment>
--        <translation>Tag</translation>
-+        <translation>Etichetta</translation>
-     </message>
-     <message>
-         <location filename="../src/app/openstreetmap/qgsosmexportdialog.cpp" 
line="45"/>
-@@ -41683,7 +41683,7 @@ p, li { white-space: pre-wrap; }
-         <location filename="../src/app/pluginmanager/qgspluginmanager.cpp" 
line="713"/>
-         <source>Tags</source>
-         <translatorcomment>#dubbio#</translatorcomment>
--        <translation>Tags</translation>
-+        <translation>Etichette</translation>
-     </message>
-     <message>
-         <location filename="../src/app/pluginmanager/qgspluginmanager.cpp" 
line="736"/>
-@@ -50880,7 +50880,7 @@ C&apos;è stato un problema con il tuo d
-     <message>
-         <location filename="../src/ui/qgsstylev2managerdialogbase.ui" 
line="287"/>
-         <source>Tags</source>
--        <translation>Tag</translation>
-+        <translation>Etichette</translation>
-     </message>
-     <message>
-         <location filename="../src/ui/qgsstylev2managerdialogbase.ui" 
line="328"/>
diff --git a/debian/patches/series b/debian/patches/series
index d5b90a7..fba6b68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,11 +16,7 @@ spatialite-provider-longlong.patch
 osm-64bit-id.patch
 fix-osm-unit-test.patch
 loading-composer-item-frame-thickness.patch
-typo-in-it-translation.patch
-fix-tag-it-translation.patch
-translation-update-it.patch
-translation-update-it-2.patch
-translation-update-it-3.patch
+translation-it.patch
 composer-fix-crash-when-removing-item-group.patch
 translation-update-id.patch
 composer-fix-python-bindings-for-attribute-table.patch
diff --git a/debian/patches/translation-it.patch 
b/debian/patches/translation-it.patch
new file mode 100644
index 0000000..1602b5f
--- /dev/null
+++ b/debian/patches/translation-it.patch
@@ -0,0 +1,98 @@
+Description: Translation updates for IT
+Origin: 
https://github.com/qgis/QGIS/commit/a865115e7fab72313793377e1404d64309336ba7
+Origin: 
https://github.com/qgis/QGIS/commit/2b0ab72a09a4aa7c615179976c512614e383eead
+Origin: 
https://github.com/qgis/QGIS/commit/43d15e9314efa92bbc535628799707c658e011f6
+Origin: 
https://github.com/qgis/QGIS/commit/c2d5400c737c120658af59d3a5c24c54be0f9a18
+Origin: 
https://github.com/qgis/QGIS/commit/f9d74cdd4d05a928b3e87f398eb776ce5554aae9
+--- a/i18n/qgis_it.ts
++++ b/i18n/qgis_it.ts
+@@ -16870,7 +16870,7 @@ Prova una risoluzione minore o una minor
+     <message>
+         <location filename="../src/ui/qgscomposerbase.ui" line="330"/>
+         <source>Bring to Front</source>
+-        <translation>Porta in cima</translation>
++        <translation>Sposta in cima</translation>
+     </message>
+     <message>
+         <location filename="../src/ui/qgscomposerbase.ui" line="333"/>
+@@ -17877,7 +17877,7 @@ Secondo me si (rospus)</translatorcommen
+     <message>
+         <location filename="../src/ui/qgscomposerlegendwidgetbase.ui" 
line="445"/>
+         <source>Count</source>
+-        <translation>Conteggio</translation>
++        <translation>Numero di colonne</translation>
+     </message>
+     <message>
+         <location filename="../src/ui/qgscomposerlegendwidgetbase.ui" 
line="465"/>
+@@ -24295,7 +24295,7 @@ p, li { white-space: pre-wrap; }
+     <message>
+         <location filename="../src/app/qgsfieldsproperties.cpp" line="750"/>
+         <source>Line edit</source>
+-        <translation>Modifica riga</translation>
++        <translation>Modifica valore</translation>
+     </message>
+     <message>
+         <location filename="../src/app/qgsfieldsproperties.cpp" line="751"/>
+@@ -35625,7 +35625,7 @@ Ulteriori informazioni sull&apos;errore:
+         <location filename="../src/ui/qgsnewvectorlayerdialogbase.ui" 
line="105"/>
+         <location filename="../src/ui/qgsnewvectorlayerdialogbase.ui" 
line="192"/>
+         <source>Width</source>
+-        <translation>Larghezza</translation>
++        <translation>Lunghezza</translation>
+     </message>
+     <message>
+         <location filename="../src/ui/qgsnewvectorlayerdialogbase.ui" 
line="118"/>
+@@ -35847,7 +35847,7 @@ Ulteriori informazioni sull&apos;errore:
+         <location filename="../src/ui/qgsosmexportdialog.ui" line="84"/>
+         <source>Exported tags</source>
+         <translatorcomment>#dubbio#</translatorcomment>
+-        <translation>Tag esportati</translation>
++        <translation>Etichette esportate</translation>
+     </message>
+     <message>
+         <location filename="../src/ui/qgsosmexportdialog.ui" line="92"/>
+@@ -35864,7 +35864,7 @@ Ulteriori informazioni sull&apos;errore:
+         <source>Tag</source>
+         <translatorcomment>Etichetta?
+ #dubbio#</translatorcomment>
+-        <translation>Tag</translation>
++        <translation>Etichetta</translation>
+     </message>
+     <message>
+         <location filename="../src/app/openstreetmap/qgsosmexportdialog.cpp" 
line="45"/>
+@@ -41683,7 +41683,7 @@ p, li { white-space: pre-wrap; }
+         <location filename="../src/app/pluginmanager/qgspluginmanager.cpp" 
line="713"/>
+         <source>Tags</source>
+         <translatorcomment>#dubbio#</translatorcomment>
+-        <translation>Tags</translation>
++        <translation>Etichette</translation>
+     </message>
+     <message>
+         <location filename="../src/app/pluginmanager/qgspluginmanager.cpp" 
line="736"/>
+@@ -42143,7 +42143,7 @@ p, li { white-space: pre-wrap; }
+     <message>
+         <location filename="../src/ui/qgspluginmanagerbase.ui" line="821"/>
+         <source>Reload repository</source>
+-        <translation>Ricarica depository</translation>
++        <translation>Ricarica repository</translation>
+     </message>
+     <message>
+         <location filename="../src/ui/qgspluginmanagerbase.ui" line="841"/>
+@@ -49420,7 +49420,7 @@ p, li { white-space: pre-wrap; }
+ &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; 
content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+ p, li { white-space: pre-wrap; }
+ &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans 
Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; 
margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span 
style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Se 
selezionato, l&apos;operazione considererà solo le entità selezionate del layer 
di output/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
++&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; 
margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span 
style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Se 
selezionato, l&apos;operazione considererà solo le entità selezionate del layer 
di output&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+     </message>
+     <message>
+         <location 
filename="../src/plugins/spatialquery/qgsspatialquerydialogbase.ui" line="74"/>
+@@ -50880,7 +50880,7 @@ C&apos;è stato un problema con il tuo d
+     <message>
+         <location filename="../src/ui/qgsstylev2managerdialogbase.ui" 
line="287"/>
+         <source>Tags</source>
+-        <translation>Tag</translation>
++        <translation>Etichette</translation>
+     </message>
+     <message>
+         <location filename="../src/ui/qgsstylev2managerdialogbase.ui" 
line="328"/>
diff --git a/debian/patches/translation-update-it-2.patch 
b/debian/patches/translation-update-it-2.patch
deleted file mode 100644
index 4e1005f..0000000
--- a/debian/patches/translation-update-it-2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Typo in IT GUI translation
-Origin: 
https://github.com/qgis/QGIS/commit/43d15e9314efa92bbc535628799707c658e011f6
---- a/i18n/qgis_it.ts
-+++ b/i18n/qgis_it.ts
-@@ -24295,7 +24295,7 @@ p, li { white-space: pre-wrap; }
-     <message>
-         <location filename="../src/app/qgsfieldsproperties.cpp" line="750"/>
-         <source>Line edit</source>
--        <translation>Modifica riga</translation>
-+        <translation>Modifica valore</translation>
-     </message>
-     <message>
-         <location filename="../src/app/qgsfieldsproperties.cpp" line="751"/>
diff --git a/debian/patches/translation-update-it-3.patch 
b/debian/patches/translation-update-it-3.patch
deleted file mode 100644
index 478c571..0000000
--- a/debian/patches/translation-update-it-3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Fixes to IT GUI translation
-Origin: 
https://github.com/qgis/QGIS/commit/c2d5400c737c120658af59d3a5c24c54be0f9a18
---- a/i18n/qgis_it.ts
-+++ b/i18n/qgis_it.ts
-@@ -16870,7 +16870,7 @@ Prova una risoluzione minore o una minor
-     <message>
-         <location filename="../src/ui/qgscomposerbase.ui" line="330"/>
-         <source>Bring to Front</source>
--        <translation>Porta in cima</translation>
-+        <translation>Sposta in cima</translation>
-     </message>
-     <message>
-         <location filename="../src/ui/qgscomposerbase.ui" line="333"/>
-@@ -17877,7 +17877,7 @@ Secondo me si (rospus)</translatorcommen
-     <message>
-         <location filename="../src/ui/qgscomposerlegendwidgetbase.ui" 
line="445"/>
-         <source>Count</source>
--        <translation>Conteggio</translation>
-+        <translation>Numero di colonne</translation>
-     </message>
-     <message>
-         <location filename="../src/ui/qgscomposerlegendwidgetbase.ui" 
line="465"/>
-@@ -35625,7 +35625,7 @@ Ulteriori informazioni sull&apos;errore:
-         <location filename="../src/ui/qgsnewvectorlayerdialogbase.ui" 
line="105"/>
-         <location filename="../src/ui/qgsnewvectorlayerdialogbase.ui" 
line="192"/>
-         <source>Width</source>
--        <translation>Larghezza</translation>
-+        <translation>Lunghezza</translation>
-     </message>
-     <message>
-         <location filename="../src/ui/qgsnewvectorlayerdialogbase.ui" 
line="118"/>
diff --git a/debian/patches/translation-update-it.patch 
b/debian/patches/translation-update-it.patch
deleted file mode 100644
index 60c8bfd..0000000
--- a/debian/patches/translation-update-it.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Translation update for: IT
-Origin: 
https://github.com/qgis/QGIS/commit/f9d74cdd4d05a928b3e87f398eb776ce5554aae9
---- a/i18n/qgis_it.ts
-+++ b/i18n/qgis_it.ts
-@@ -42143,7 +42143,7 @@ p, li { white-space: pre-wrap; }
-     <message>
-         <location filename="../src/ui/qgspluginmanagerbase.ui" line="821"/>
-         <source>Reload repository</source>
--        <translation>Ricarica depository</translation>
-+        <translation>Ricarica repository</translation>
-     </message>
-     <message>
-         <location filename="../src/ui/qgspluginmanagerbase.ui" line="841"/>
diff --git a/debian/patches/typo-in-it-translation.patch 
b/debian/patches/typo-in-it-translation.patch
deleted file mode 100644
index c34f8a6..0000000
--- a/debian/patches/typo-in-it-translation.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Typo in IT translation
-Origin: 
https://github.com/qgis/QGIS/commit/a865115e7fab72313793377e1404d64309336ba7
---- a/i18n/qgis_it.ts
-+++ b/i18n/qgis_it.ts
-@@ -49420,7 +49420,7 @@ p, li { white-space: pre-wrap; }
- &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; 
content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
- p, li { white-space: pre-wrap; }
- &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans 
Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
--&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; 
margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span 
style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Se 
selezionato, l&apos;operazione considererà solo le entità selezionate del layer 
di output/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; 
margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span 
style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Se 
selezionato, l&apos;operazione considererà solo le entità selezionate del layer 
di output&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-     </message>
-     <message>
-         <location 
filename="../src/plugins/spatialquery/qgsspatialquerydialogbase.ui" line="74"/>

-- 
The Quantum GIS in Debian project

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to