Skip to content

/ QGIS

Permalink
Browse files

Merge branch 'master' into slovak

  • Loading branch information
@imincik
imincik committed May 28, 2013
2 parents 2fcb8b2 + 20c729a commit 21a884b758903c2fed02c5e5daa84c0b8da94802
Unified Split
Showing with 57,495 additions and 58,940 deletions.
  1. +20 −20 doc/TRANSLATORS
  2. +887 −650 i18n/qgis_de.ts
  3. +17,748 −11,492 i18n/{qgis_eu_ES.ts → qgis_eu.ts}
  4. +20 −14 i18n/qgis_it.ts
  5. +30,975 −40,777 i18n/qgis_ja.ts
  6. +1,526 −1,424 i18n/qgis_nl.ts
  7. +205 −199 i18n/qgis_pt_PT.ts
  8. +4,874 −3,719 i18n/qgis_sv.ts
  9. BIN images/flags/bn.png
  10. BIN images/flags/{eu_ES.png → eu.png}
  11. +2 −4 images/images.qrc
  12. BIN images/themes/default/console/iconAboutConsole.png
  13. BIN images/themes/default/console/iconCloseTabEditorConsole.png
  14. BIN images/themes/default/console/iconFileTabsMenuConsole.png
  15. BIN images/themes/default/console/iconIfaceConsole.png
  16. BIN images/themes/default/console/iconNewTabEditorConsole.png
  17. +1 −1 python/console/console.py
  18. +11 −6 python/console/console_editor.py
  19. +2 −3 python/console/console_sci.py
  20. +3 −31 python/console/console_settings.py
  21. +104 −148 python/console/console_settings.ui
  22. +12 −12 python/core/qgsdiagramrendererv2.sip
  23. +3 −2 python/gui/qgisinterface.sip
  24. +11 −5 python/plugins/db_manager/db_plugins/plugin.py
  25. +6 −2 python/plugins/db_manager/db_plugins/postgis/plugin.py
  26. +3 −3 python/plugins/db_manager/dlg_db_error.py
  27. +14 −6 python/plugins/db_manager/dlg_import_vector.py
  28. +1 −3 python/plugins/db_manager/dlg_sql_window.py
  29. +0 −6 python/plugins/fTools/fTools.py
  30. +1 −1 python/pyspatialite/CMakeLists.txt
  31. +18 −2 resources/context_help/QgsDelimitedTextSourceSelect-en_US
  32. +1 −0 scripts/spelling.dat
  33. +3 −3 scripts/tsstat.pl
  34. +60 −4 src/app/legend/qgslegend.cpp
  35. +3 −1 src/app/legend/qgslegend.h
  36. +5 −5 src/app/main.cpp
  37. +2 −3 src/app/nodetool/qgsmaptoolnodetool.cpp
  38. +6 −6 src/app/nodetool/qgsselectedfeature.cpp
  39. +12 −11 src/app/qgisapp.cpp
  40. +4 −3 src/app/qgisapp.h
  41. +3 −2 src/app/qgisappinterface.cpp
  42. +3 −2 src/app/qgisappinterface.h
  43. +1 −1 src/app/qgsconfigureshortcutsdialog.cpp
  44. +105 −60 src/app/qgsfieldsproperties.cpp
  45. +23 −9 src/app/qgsfieldsproperties.h
  46. +2 −0 src/app/qgsmaptoolcapture.cpp
  47. +0 −2 src/core/CMakeLists.txt
  48. +64 −48 src/core/qgsdiagramrendererv2.cpp
  49. +14 −12 src/core/qgsdiagramrendererv2.h
  50. +18 −0 src/core/qgslogger.h
  51. +14 −14 src/core/qgsmaplayerregistry.cpp
  52. +15 −16 src/core/qgsmaplayerregistry.h
  53. +35 −23 src/core/qgsmaprenderer.cpp
  54. +50 −23 src/core/qgsofflineediting.cpp
  55. +2 −0 src/core/qgsofflineediting.h
  56. +13 −15 src/core/qgspallabeling.cpp
  57. +0 −1 src/core/qgspallabeling.h
  58. +15 −15 src/core/qgsvectorlayer.cpp
  59. +1 −1 src/core/raster/qgsrasterprojector.cpp
  60. +1 −1 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  61. +5 −1 src/gui/qgisinterface.h
  62. +2 −2 src/gui/qgsexpressionbuilderwidget.cpp
  63. +2 −2 src/gui/qgsoptionsdialogbase.cpp
  64. +4 −0 src/gui/qgsprojectionselector.cpp
  65. +1 −1 src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
  66. +3 −3 src/mapserver/qgswmsserver.cpp
  67. +1 −1 src/plugins/spatialquery/qgsspatialquery.cpp
  68. +1 −1 src/providers/delimitedtext/qgsdelimitedtextfile.cpp
  69. +124 −12 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  70. +9 −1 src/providers/delimitedtext/qgsdelimitedtextprovider.h
  71. +24 −3 src/providers/mssql/qgsmssqlprovider.cpp
  72. +2 −1 src/providers/postgres/qgscolumntypethread.cpp
  73. +5 −3 src/providers/postgres/qgspgtablemodel.cpp
  74. +12 −4 src/providers/postgres/qgspostgresconn.cpp
  75. +3 −2 src/providers/postgres/qgspostgresdataitems.cpp
  76. +27 −31 src/providers/postgres/qgspostgresfeatureiterator.cpp
  77. +36 −18 src/providers/postgres/qgspostgresprovider.cpp
  78. +1 −0 src/providers/postgres/qgspostgresprovider.h
  79. +3 −3 src/ui/qgisapp.ui
  80. +1 −1 src/ui/qgscompositionwidgetbase.ui
  81. +2 −2 src/ui/qgsoraclenewconnectionbase.ui
  82. +43 −19 src/ui/qgsprojectionselectorbase.ui
  83. +13 −4 tests/src/core/testqgsblendmodes.cpp
  84. +10 −5 tests/src/python/test_qgsblendmodes.py
  85. +43 −5 tests/src/python/test_qgsdelimitedtextprovider.py
  86. +170 −3 tests/src/python/test_qgsdelimitedtextprovider_wanted.py
  87. BIN tests/testdata/control_images/expected_vector_blendmodes/expected_vector_blendmodes.png
  88. BIN ...s/testdata/control_images/expected_vector_featureblendmodes/expected_vector_featureblendmodes.png
  89. BIN ...s/testdata/control_images/expected_vector_layertransparency/expected_vector_layertransparency.png
  90. +4 −0 tests/testdata/delimitedtext/testcsvt.csv
  91. +1 −0 tests/testdata/delimitedtext/testcsvt.csvt
  92. +4 −0 tests/testdata/delimitedtext/testcsvt2.txt
  93. +1 −0 tests/testdata/delimitedtext/testcsvt2.txtt
  94. +4 −0 tests/testdata/delimitedtext/testcsvt3.csv
  95. +5 −0 tests/testdata/delimitedtext/testcsvt3.csvt
  96. +4 −0 tests/testdata/delimitedtext/testcsvt4.csv
  97. +2 −0 tests/testdata/delimitedtext/testcsvt4.csvt
  98. +1 −1 tests/testdata/delimitedtext/testpt.csv
40 doc/TRANSLATORS
View file

Large diffs are not rendered by default.

1,537 i18n/qgis_de.ts
View file

Large diffs are not rendered by default.

29,240 i18n/qgis_eu_ES.ts → i18n/qgis_eu.ts
View file

Large diffs are not rendered by default.

34 i18n/qgis_it.ts
View file
@@ -2230,7 +2230,7 @@ Sicuro di voler proseguire?</translation>
<message>
<location filename="../python/plugins/sextante/ui/DlgModeler.ui" line="68"/>
<source>Algorithms</source>
<translation type="unfinished"></translation>
<translation>Algoritmi</translation>
</message>
<message>
<location filename="../python/plugins/sextante/ui/DlgModeler.ui" line="80"/>
@@ -2524,24 +2524,26 @@ colonna geometrica - colonna con valori interi univoci</translation>
<name>EditRScriptDialog</name>
<message>
<source>I/O error</source>
<translation type="unfinished"></translation>
<translation>Errore di I/O</translation>
</message>
<message>
<source>Unable to save edits. Reason:
%1</source>
<translation type="unfinished"></translation>
<translation>Impossibile salvare le modifiche. Causa:
%1</translation>
</message>
</context>
<context>
<name>EditScriptDialog</name>
<message>
<source>I/O error</source>
<translation type="unfinished"></translation>
<translation>Errore di I/O</translation>
</message>
<message>
<source>Unable to save edits. Reason:
%1</source>
<translation type="unfinished"></translation>
<translation>Impossibile salvare le modifiche. Causa:
%1</translation>
</message>
</context>
<context>
@@ -2731,7 +2733,7 @@ Installalo e riprova.</translation>
</message>
<message>
<source>QGIS version detected: </source>
<translation type="unfinished"></translation>
<translation>Versione di QGIS rilevata: </translation>
</message>
<message>
<source>Projections</source>
@@ -3070,11 +3072,11 @@ Vuoi comunque terminarlo?</translation>
</message>
<message>
<source>Output size or resolution required</source>
<translation type="unfinished"></translation>
<translation>Inserisci la dimensione o risoluzione di output</translation>
</message>
<message>
<source>The output file doesn&apos;t exist. You must set up the output size or resolution to create it.</source>
<translation type="unfinished"></translation>
<translation>Il file di output non esiste. Definisci la dimensione o risoluzione di output per crearlo.</translation>
</message>
<message>
<source>Select the files to analyse</source>
@@ -3314,7 +3316,11 @@ and python executables.

MacOS users usually need to set it to something like
/Library/Frameworks/GDAL.framework/Versions/1.8/Programs</source>
<translation type="unfinished"></translation>
<translation>Una lista di path separati da virgola (Linux e MacOS) o
da punto e virgola (Windows) a eseguibili e moduli python.

Gli utenti MacOS di solito devono configurarlo con
/Library/Frameworks/GDAL.framework/Versions/1.8/Programs</translation>
</message>
<message>
<source>A list of colon-separated (Linux and MacOS) or
@@ -4904,12 +4910,12 @@ GEOS geoprocessing error: One or more input features have invalid geometry.</sou
<message>
<location filename="../src/plugins/heatmap/heatmapguibase.ui" line="29"/>
<source>Input point layer</source>
<translation type="unfinished">Vettore punti in input</translation>
<translation>Vettore punti in input</translation>
</message>
<message>
<location filename="../src/plugins/heatmap/heatmapguibase.ui" line="39"/>
<source>Output raster</source>
<translation type="unfinished"></translation>
<translation>Raster in output</translation>
</message>
<message>
<location filename="../src/plugins/heatmap/heatmapguibase.ui" line="52"/>
@@ -4941,7 +4947,7 @@ GEOS geoprocessing error: One or more input features have invalid geometry.</sou
<message>
<location filename="../src/plugins/heatmap/heatmapguibase.ui" line="130"/>
<source>Rows</source>
<translation type="unfinished">Righe</translation>
<translation>Righe</translation>
</message>
<message>
<location filename="../src/plugins/heatmap/heatmapguibase.ui" line="140"/>
@@ -4951,7 +4957,7 @@ GEOS geoprocessing error: One or more input features have invalid geometry.</sou
<message>
<location filename="../src/plugins/heatmap/heatmapguibase.ui" line="150"/>
<source>Columns</source>
<translation type="unfinished">Colonne</translation>
<translation>Colonne</translation>
</message>
<message>
<location filename="../src/plugins/heatmap/heatmapguibase.ui" line="160"/>
@@ -5358,7 +5364,7 @@ GEOS geoprocessing error: One or more input features have invalid geometry.</sou
<message>
<location filename="../src/ui/qgisapp.ui" line="1286"/>
<source>Save Selection as Vector File...</source>
<translation>Salva la selezione come vettore...</translation>
<translation>Salva la selezione con nome...</translation>
</message>
<message>
<location filename="../src/ui/qgisapp.ui" line="1311"/>

0 comments on commit 21a884b

Please sign in to comment.
You can’t perform that action at this time.