Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:qgis/Quantum-GIS

  • Loading branch information
blazek committed May 25, 2011
2 parents 4070354 + 21fa438 commit 2670283b06637e1d753bd2ee9076ce505d92792d
Showing with 229 additions and 197 deletions.
  1. +2 −2 debian/control.hardy
  2. +2 −2 debian/control.intrepid
  3. +2 −2 debian/control.jaunty
  4. +2 −2 debian/control.karmic
  5. +2 −2 debian/control.lenny
  6. +2 −2 debian/control.lucid
  7. +2 −2 debian/control.maverick
  8. +2 −2 debian/control.natty
  9. +2 −2 debian/control.sid
  10. +2 −2 debian/control.squeeze
  11. +1 −0 debian/python-qgis.lintian-overrides.in
  12. +0 −1 debian/qgis-plugin-grass.lintian-overrides
  13. +2 −0 debian/qgis-sqlanywhere{QGIS_ABI}.lintian-overrides
  14. +5 −1 debian/rules
  15. +4 −4 i18n/qgis_af.ts
  16. +4 −4 i18n/qgis_ar.ts
  17. +4 −4 i18n/qgis_bg.ts
  18. +4 −4 i18n/qgis_ca_ES.ts
  19. +5 −5 i18n/qgis_cs_CZ.ts
  20. +4 −4 i18n/qgis_de.ts
  21. +4 −4 i18n/qgis_el_GR.ts
  22. +4 −4 i18n/qgis_es.ts
  23. +4 −4 i18n/qgis_fa.ts
  24. +4 −4 i18n/qgis_fi.ts
  25. +4 −4 i18n/qgis_fr.ts
  26. +4 −4 i18n/qgis_he.ts
  27. +4 −4 i18n/qgis_hr_HR.ts
  28. +4 −4 i18n/qgis_hu.ts
  29. +4 −4 i18n/qgis_id.ts
  30. +4 −4 i18n/qgis_is.ts
  31. +4 −4 i18n/qgis_it.ts
  32. +4 −4 i18n/qgis_ja.ts
  33. +4 −4 i18n/qgis_ka_GE.ts
  34. +4 −4 i18n/qgis_lo.ts
  35. +4 −4 i18n/qgis_lt.ts
  36. +4 −4 i18n/qgis_lv.ts
  37. +4 −4 i18n/qgis_mn.ts
  38. +4 −4 i18n/qgis_nl.ts
  39. +4 −4 i18n/qgis_pl_PL.ts
  40. +4 −4 i18n/qgis_pt_BR.ts
  41. +4 −4 i18n/qgis_pt_PT.ts
  42. +4 −4 i18n/qgis_ro.ts
  43. +4 −4 i18n/qgis_ru.ts
  44. +4 −4 i18n/qgis_sk.ts
  45. +4 −4 i18n/qgis_sl_SI.ts
  46. +4 −4 i18n/qgis_sq_AL.ts
  47. +4 −4 i18n/qgis_sr_CS-Latn.ts
  48. +4 −4 i18n/qgis_sv.ts
  49. +4 −4 i18n/qgis_ta.ts
  50. +4 −4 i18n/qgis_th.ts
  51. +4 −4 i18n/qgis_tr.ts
  52. +4 −4 i18n/qgis_uk.ts
  53. +4 −4 i18n/qgis_vi.ts
  54. +4 −4 i18n/qgis_xh.ts
  55. +4 −4 i18n/qgis_zh_CN.ts
  56. +4 −4 i18n/qgis_zh_TW.ts
  57. +1 −0 ms-windows/osgeo4w/package-nightly.cmd
  58. +1 −0 ms-windows/osgeo4w/package.cmd
  59. +17 −0 qbrowser.1
  60. +1 −1 src/app/qgisapp.cpp
  61. +1 −1 src/app/qgstipfactory.cpp
  62. +9 −2 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  63. +1 −1 src/ui/qgsattributetypeedit.ui
  64. +1 −1 src/ui/qgsvectorlayersaveasdialogbase.ui
@@ -79,7 +79,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -104,7 +104,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
@@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -105,7 +105,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
@@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -105,7 +105,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
@@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -105,7 +105,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
@@ -109,7 +109,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -135,7 +135,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -110,7 +110,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -136,7 +136,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -111,7 +111,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -137,7 +137,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -111,7 +111,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -137,7 +137,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -111,7 +111,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -137,7 +137,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -110,7 +110,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -136,7 +136,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -1 +1,2 @@
python-qgis: package-name-doesnt-match-sonames
python-qgis: no-symbols-control-file
@@ -1,3 +1,2 @@
qgis-plugin-grass: binary-without-manpage
qgis-plugin-grass: package-name-doesnt-match-sonames
qgis-plugin-grass: no-symbols-control-file
@@ -0,0 +1,2 @@
qgis-sqlanywhere{QGIS_ABI}: package-name-doesnt-match-sonames
qgis-sqlanywhere{QGIS_ABI}: no-symbols-control-file
@@ -129,6 +129,10 @@ endif
# Add here commands to install the package into debian/tmp.
$(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/tmp

# remove unwanted files
rm debian/tmp/usr/share/qgis/doc/api/installdox
! [ -f debian/tmp/usr/share/qgis/doc/api/jquery.js ] || rm debian/tmp/usr/share/qgis/doc/api/jquery.js

# Install menu pixmap
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps
@@ -162,7 +166,7 @@ binary-arch: build install
ifneq (,$(findstring $(DISTRIBUTION),"lenny hardy"))
dh_desktop
endif
dh_installman -pqgis qgis.1
dh_installman -pqgis qgis.1 qbrowser.1
dh_installmime -pqgis
dh_link
if which dh_lintian >/dev/null; then dh_lintian; fi
@@ -7152,7 +7152,7 @@ This binary was compiled against Qt %1,and is currently running against Qt %2</s
</message>
<message>
<location filename="../src/app/qgisapp.cpp" line="2050"/>
<source>Removed ogr convertor plugin - use &apos;save as&apos; context menu rather.</source>
<source>Removed ogr converter plugin - use &apos;save as&apos; context menu rather.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8743,7 +8743,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../src/ui/qgsattributetypeedit.ui" line="150"/>
<source>Allows to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
<source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/app/qgstipfactory.cpp" line="100"/>
<source>In the print composer tool bar you can find two buttons for moving elements. The left one (a selection cursor with the hand symbol) selects and moves elements in the layout. After selecting the element with this tool you can also move them around with the arrow keys. For accurate positioning use the &lt;strong&gt;Position and Size&lt;/strong&gt; dialogue, which can be found in the tab &lt;strong&gt;Item &amp;rarr; General Options &amp;rarr; Position and Size&lt;/strong&gt;. For easier positioning you can also set specific anchor points of the element within this dialogue. The other move tool (the globe icon combined with the hand icon) allows to move the map content within a map frame.</source>
<source>In the print composer tool bar you can find two buttons for moving elements. The left one (a selection cursor with the hand symbol) selects and moves elements in the layout. After selecting the element with this tool you can also move them around with the arrow keys. For accurate positioning use the &lt;strong&gt;Position and Size&lt;/strong&gt; dialogue, which can be found in the tab &lt;strong&gt;Item &amp;rarr; General Options &amp;rarr; Position and Size&lt;/strong&gt;. For easier positioning you can also set specific anchor points of the element within this dialogue. The other move tool (the globe icon combined with the hand icon) allows one to move the map content within a map frame.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/ui/qgsvectorlayersaveasdialogbase.ui" line="139"/>
<source>This allows to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don&apos;t support it.</source>
<source>This allows one to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don&apos;t support it.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -7924,7 +7924,7 @@ QWT Version: %1.</source>
</message>
<message>
<location filename="../src/app/qgisapp.cpp" line="2050"/>
<source>Removed ogr convertor plugin - use &apos;save as&apos; context menu rather.</source>
<source>Removed ogr converter plugin - use &apos;save as&apos; context menu rather.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -9233,7 +9233,7 @@ Error was:%2</source>
</message>
<message>
<location filename="../src/ui/qgsattributetypeedit.ui" line="150"/>
<source>Allows to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
<source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/app/qgstipfactory.cpp" line="100"/>
<source>In the print composer tool bar you can find two buttons for moving elements. The left one (a selection cursor with the hand symbol) selects and moves elements in the layout. After selecting the element with this tool you can also move them around with the arrow keys. For accurate positioning use the &lt;strong&gt;Position and Size&lt;/strong&gt; dialogue, which can be found in the tab &lt;strong&gt;Item &amp;rarr; General Options &amp;rarr; Position and Size&lt;/strong&gt;. For easier positioning you can also set specific anchor points of the element within this dialogue. The other move tool (the globe icon combined with the hand icon) allows to move the map content within a map frame.</source>
<source>In the print composer tool bar you can find two buttons for moving elements. The left one (a selection cursor with the hand symbol) selects and moves elements in the layout. After selecting the element with this tool you can also move them around with the arrow keys. For accurate positioning use the &lt;strong&gt;Position and Size&lt;/strong&gt; dialogue, which can be found in the tab &lt;strong&gt;Item &amp;rarr; General Options &amp;rarr; Position and Size&lt;/strong&gt;. For easier positioning you can also set specific anchor points of the element within this dialogue. The other move tool (the globe icon combined with the hand icon) allows one to move the map content within a map frame.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/ui/qgsvectorlayersaveasdialogbase.ui" line="139"/>
<source>This allows to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don&apos;t support it.</source>
<source>This allows one to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don&apos;t support it.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8647,7 +8647,7 @@ This copy of QGIS writes debugging output.</source>
</message>
<message>
<location filename="../src/app/qgisapp.cpp" line="2050"/>
<source>Removed ogr convertor plugin - use &apos;save as&apos; context menu rather.</source>
<source>Removed ogr converter plugin - use &apos;save as&apos; context menu rather.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -10390,7 +10390,7 @@ Error was:%2</source>
</message>
<message>
<location filename="../src/ui/qgsattributetypeedit.ui" line="150"/>
<source>Allows to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
<source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/app/qgstipfactory.cpp" line="100"/>
<source>In the print composer tool bar you can find two buttons for moving elements. The left one (a selection cursor with the hand symbol) selects and moves elements in the layout. After selecting the element with this tool you can also move them around with the arrow keys. For accurate positioning use the &lt;strong&gt;Position and Size&lt;/strong&gt; dialogue, which can be found in the tab &lt;strong&gt;Item &amp;rarr; General Options &amp;rarr; Position and Size&lt;/strong&gt;. For easier positioning you can also set specific anchor points of the element within this dialogue. The other move tool (the globe icon combined with the hand icon) allows to move the map content within a map frame.</source>
<source>In the print composer tool bar you can find two buttons for moving elements. The left one (a selection cursor with the hand symbol) selects and moves elements in the layout. After selecting the element with this tool you can also move them around with the arrow keys. For accurate positioning use the &lt;strong&gt;Position and Size&lt;/strong&gt; dialogue, which can be found in the tab &lt;strong&gt;Item &amp;rarr; General Options &amp;rarr; Position and Size&lt;/strong&gt;. For easier positioning you can also set specific anchor points of the element within this dialogue. The other move tool (the globe icon combined with the hand icon) allows one to move the map content within a map frame.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/ui/qgsvectorlayersaveasdialogbase.ui" line="139"/>
<source>This allows to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don&apos;t support it.</source>
<source>This allows one to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don&apos;t support it.</source>
<translation type="unfinished"></translation>
</message>
<message>

0 comments on commit 2670283

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