Skip to content
Permalink
Browse files

merge debian downstream patches

  • Loading branch information
jef-n committed Jan 23, 2016
1 parent 1f77694 commit d872f063e66e4b6979a45d588513ed62ea549d87
Showing with 1,070 additions and 1,055 deletions.
  1. +4 −1 debian/control.in
  2. +2 −0 debian/qgis-common.links
  3. +2 −0 debian/qgis-common.lintian-overrides
  4. +6 −0 debian/rules
  5. +21 −21 i18n/qgis_ar.ts
  6. +22 −22 i18n/qgis_bs.ts
  7. +21 −21 i18n/qgis_ca.ts
  8. +21 −21 i18n/qgis_cs.ts
  9. +21 −21 i18n/qgis_da.ts
  10. +21 −21 i18n/qgis_de.ts
  11. +21 −21 i18n/qgis_el.ts
  12. +43 −43 i18n/qgis_en.ts
  13. +21 −21 i18n/qgis_es.ts
  14. +21 −21 i18n/qgis_et.ts
  15. +21 −21 i18n/qgis_eu.ts
  16. +21 −21 i18n/qgis_fa.ts
  17. +21 −21 i18n/qgis_fi.ts
  18. +23 −23 i18n/qgis_fr.ts
  19. +21 −21 i18n/qgis_gl.ts
  20. +21 −21 i18n/qgis_hi.ts
  21. +21 −21 i18n/qgis_hr.ts
  22. +21 −21 i18n/qgis_hu.ts
  23. +21 −21 i18n/qgis_id.ts
  24. +21 −21 i18n/qgis_is.ts
  25. +21 −21 i18n/qgis_it.ts
  26. +21 −21 i18n/qgis_ja.ts
  27. +21 −21 i18n/qgis_km.ts
  28. +21 −21 i18n/qgis_ko.ts
  29. +21 −21 i18n/qgis_lt.ts
  30. +21 −21 i18n/qgis_lv.ts
  31. +21 −21 i18n/qgis_mn.ts
  32. +21 −21 i18n/qgis_nb.ts
  33. +21 −21 i18n/qgis_nl.ts
  34. +21 −21 i18n/qgis_pl.ts
  35. +21 −21 i18n/qgis_pt_BR.ts
  36. +21 −21 i18n/qgis_pt_PT.ts
  37. +21 −21 i18n/qgis_ro.ts
  38. +21 −21 i18n/qgis_ru.ts
  39. +21 −21 i18n/qgis_sk.ts
  40. +21 −21 i18n/qgis_sl.ts
  41. +21 −21 i18n/qgis_sr.ts
  42. +21 −21 i18n/qgis_sr@latin.ts
  43. +21 −21 i18n/qgis_sv.ts
  44. +23 −23 i18n/qgis_th.ts
  45. +21 −21 i18n/qgis_tr.ts
  46. +21 −21 i18n/qgis_uk.ts
  47. +21 −21 i18n/qgis_vi.ts
  48. +21 −21 i18n/qgis_zh-Hans.ts
  49. +21 −21 i18n/qgis_zh_CN.ts
  50. +21 −21 i18n/qgis_zh_TW.ts
  51. +1 −1 python/analysis/interpolation/DualEdgeTriangulation.sip
  52. +1 −1 python/core/qgscoordinatetransform.sip
  53. +1 −1 python/core/qgssnapper.sip
  54. +1 −1 python/core/qgssnappingutils.sip
  55. +2 −2 python/plugins/db_manager/ui/DlgDbError.ui
  56. +1 −1 python/plugins/processing/algs/qgis/FieldsCalculator.py
  57. +1 −1 python/plugins/processing/algs/qgis/SplitLinesWithLines.py
  58. +1 −1 python/utils.py
  59. +1 −1 resources/function_help/regexp_replace
  60. +3 −3 scripts/fix_allows_to.sh
  61. +2 −0 scripts/spelling.dat
  62. +8 −8 src/analysis/interpolation/DualEdgeTriangulation.cc
  63. +1 −1 src/analysis/interpolation/DualEdgeTriangulation.h
  64. +2 −2 src/analysis/interpolation/NormVecDecorator.cc
  65. +1 −1 src/app/main.cpp
  66. +1 −1 src/app/nodetool/qgsmaptoolnodetool.h
  67. +5 −5 src/app/qgisapp.cpp
  68. +1 −1 src/app/qgisapp.h
  69. +1 −1 src/app/qgsattributetabledialog.cpp
  70. +1 −1 src/app/qgsfieldcalculator.cpp
  71. +2 −2 src/app/qgsmaptooladdring.cpp
  72. +2 −2 src/app/qgsmaptoolfillring.cpp
  73. +1 −1 src/app/qgsmaptoolsplitfeatures.cpp
  74. +1 −1 src/app/qgsmaptoolsplitparts.cpp
  75. +3 −3 src/app/qgsvectorlayerproperties.cpp
  76. +1 −1 src/core/qgscoordinatetransform.h
  77. +1 −1 src/core/qgsgeometry.cpp
  78. +1 −1 src/core/qgsmaprenderer.cpp
  79. +1 −1 src/core/qgsmaprendererjob.cpp
  80. +1 −1 src/core/qgssnapper.h
  81. +1 −1 src/core/qgssnappingutils.h
  82. +1 −1 src/core/qgsvectorlayer.cpp
  83. +1 −1 src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp
  84. +1 −1 src/plugins/evis/evis.cpp
  85. +1 −1 src/plugins/plugin_builder.py
  86. +1 −1 src/plugins/spit/qgsspit.cpp
  87. +1 −1 src/providers/grass/qgsgrass.h
  88. +2 −2 src/python/qgspythonutils.h
  89. +1 −1 src/python/qgspythonutilsimpl.cpp
  90. +2 −2 src/python/qgspythonutilsimpl.h
  91. +1 −1 src/ui/qgscomposerlegendwidgetbase.ui
@@ -89,7 +89,10 @@ Description: Geographic Information System (GIS)

Package: qgis-common
Architecture: all
Depends: ${misc:Depends}
Depends:
libjs-jquery,
libjs-leaflet,
${misc:Depends}
Description: QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
@@ -1 +1,3 @@
usr/share/common-licenses/GPL-2 usr/share/qgis/doc/LICENSE
usr/share/javascript/jquery/jquery.js usr/share/qgis/doc/jquery-min.js
usr/share/javascript/leaflet usr/share/qgis/doc/leaflet
@@ -0,0 +1,2 @@
qgis-common: package-contains-broken-symlink usr/share/qgis/doc/LICENSE ../../common-licenses/GPL-2
qgis-common: package-contains-broken-symlink usr/share/qgis/doc/leaflet ../../javascript/leaflet
@@ -261,6 +261,12 @@ override_dh_install:
# remove unwanted files
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/html/jquery.js
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js

# replace leaflet and jquery urls
perl -i -p \
-e 's#http://.*/leaflet.css#leaflet/leaflet.css#;s#http://.*/leaflet.js#leaflet/leaflet.js#;s#http://.*/jquery-.*.min.js#jquery-min.js#' \
$(CURDIR)/debian/tmp/usr/share/qgis/doc/developersmap.html

# Don't include a copy of the world.tif also included in osgearth-data
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif
@@ -1665,11 +1665,11 @@ Query:
<translation>خطأ فى قواعد البيانات</translation>
</message>
<message>
<source>An error occured:</source>
<source>An error occurred:</source>
<translation>حدث خطأ</translation>
</message>
<message>
<source>An error occured when executing a query:</source>
<source>An error occurred when executing a query:</source>
<translation>حدث خطأ أتناء تنفيذ التساؤل</translation>
</message>
<message>
@@ -4271,7 +4271,7 @@ geometry column - column with unique integer values</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>An error occured while evaluating the calculation string:
<source>An error occurred while evaluating the calculation string:
%s</source>
<translation type="unfinished"></translation>
</message>
@@ -11036,7 +11036,7 @@ Please check the configuration in the Processing settings dialog.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>An error has occured while executing Python code:</source>
<source>An error has occurred while executing Python code:</source>
<translation>حدث خطأ أثناء تنفيذ كود بايثون:</translation>
</message>
<message>
@@ -13791,7 +13791,7 @@ SQL: %1</source>
<translation>لم يمكن تحميل إستعمالات QGIS.</translation>
</message>
<message>
<source>An error occured during execution of following code:</source>
<source>An error occurred during execution of following code:</source>
<translation>حدث خطأ أثناء تنفيذ التعليمات البرمجية التالية:</translation>
</message>
<message>
<translation type="unfinished"></translation>
</message>
<message>
<source>An error occured during the merge operation</source>
<source>An error occurred during the merge operation</source>
<translation type="unfinished"></translation>
</message>
<message>
<translation type="unfinished"></translation>
</message>
<message>
<source>SSL errors occured accessing URL %1:</source>
<source>SSL errors occurred accessing URL %1:</source>
<translation type="unfinished"></translation>
</message>
<message>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<source>%n SSL errors occured</source>
<source>%n SSL errors occurred</source>
<comment>number of errors</comment>
<translation type="unfinished">
<numerusform></numerusform>
<translation type="unfinished"></translation>
</message>
<message>
<source>A problem occured during deletion of %1 feature(s)</source>
<source>A problem occurred during deletion of %1 feature(s)</source>
<translation type="unfinished"></translation>
</message>
</context>
<translation>خطأ</translation>
</message>
<message>
<source>An error occured while evaluating the calculation string:
<source>An error occurred while evaluating the calculation string:
%1</source>
<translation>حدث خطأ أثناء تقييم السلسلة الحسابية:
1%</translation>
<translation>خطأ</translation>
</message>
<message>
<source>An error occured while evaluating the calculation string:
<source>An error occurred while evaluating the calculation string:
%1</source>
<translation>حدث خطأ أثناء تقييم السلسلة الحسابية:
1%</translation>
<translation>إضافة حلقة</translation>
</message>
<message>
<source>a problem with geometry type occured</source>
<source>a problem with geometry type occurred</source>
<translation type="unfinished"></translation>
</message>
<message>
<translation type="unfinished"></translation>
</message>
<message>
<source>an unknown error occured</source>
<source>an unknown error occurred</source>
<translation type="unfinished"></translation>
</message>
<message>
<translation>أضيفت الحلقة و عبئت</translation>
</message>
<message>
<source>a problem with geometry type occured</source>
<source>a problem with geometry type occurred</source>
<translation type="unfinished"></translation>
</message>
<message>
<translation type="unfinished"></translation>
</message>
<message>
<source>an unknown error occured</source>
<source>an unknown error occurred</source>
<translation type="unfinished"></translation>
</message>
<message>
<translation>لم يتم تقسيم الميزة</translation>
</message>
<message>
<source>An error occured during splitting.</source>
<source>An error occurred during splitting.</source>
<translation>حدث خطأ أثناء تنفيذ التقسيم.</translation>
</message>
<message>
<translation>لم يتم تقسيم الأجزاء</translation>
</message>
<message>
<source>An error occured during splitting.</source>
<source>An error occurred during splitting.</source>
<translation>حدث خطأ أثناء تنفيذ التقسيم.</translation>
</message>
<message>
<translation>استيراد الخطأ</translation>
</message>
<message>
<source>An error occured during import:
<source>An error occurred during import:
%1</source>
<translation>حدث خطأ أثناء الاستيراد:
%1</translation>
<translation>النمط المحفوظ</translation>
</message>
<message>
<source>Error occured retrieving styles from database</source>
<source>Error occurred retrieving styles from database</source>
<translation>حدث خطأ أثناء استرجاع الأنماط من قاعدة بيانات</translation>
</message>
<message>
<translation>إنشاء طبقة من استعلام قاعدة بيانات</translation>
</message>
<message>
<source>Open an Event Browers and display the selected feature</source>
<source>Open an Event Browser and display the selected feature</source>
<translation>فتح مستعرضات الحدث وعرض الميزة المحددة</translation>
</message>
<message>
&lt;!-- List args for functions here--&gt;
&lt;i&gt; string&lt;/i&gt; &amp;rarr; is string. The start string.&lt;br&gt;
&lt;i&gt; regex&lt;/i&gt; &amp;rarr; is string. The regular expression to replace. Backslash characters must be double escaped (eg &quot;&amp;#92;&amp;#92;s&quot; to match a white space character). Non-greedy regular expressions are not supported.&lt;br&gt;
&lt;i&gt; after&lt;/i&gt; &amp;rarr; is string. The string that will replace any matching occurences of the supplied regular expression. Captured groups can be inserted into the replacement string using &amp;#92;&amp;#92;1, &amp;#92;&amp;#92;2, etc. &lt;br&gt;&lt;/p&gt;
&lt;i&gt; after&lt;/i&gt; &amp;rarr; is string. The string that will replace any matching occurrences of the supplied regular expression. Captured groups can be inserted into the replacement string using &amp;#92;&amp;#92;1, &amp;#92;&amp;#92;2, etc. &lt;br&gt;&lt;/p&gt;

&lt;p&gt;&lt;h4&gt;Example&lt;/h4&gt;
&lt;!-- Show example of function.--&gt;

0 comments on commit d872f06

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