Skip to content
Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information
Marcel Dancak
Marcel Dancak committed Aug 18, 2014
2 parents 8888c5f + 8105545 commit f9ba32a9cd98b0b98aea49ef9d24c356ec56727c
Showing with 143,734 additions and 126,876 deletions.
  1. +58 −58 doc/TRANSLATORS
  2. +876 −751 i18n/qgis_af.ts
  3. +6,492 −6,009 i18n/qgis_ar.ts
  4. +873 −744 i18n/qgis_bg.ts
  5. +862 −737 i18n/qgis_bn.ts
  6. +956 −700 i18n/qgis_bs.ts
  7. +10,669 −10,332 i18n/qgis_ca.ts
  8. +3,016 −2,642 i18n/qgis_cs.ts
  9. +2,119 −1,741 i18n/qgis_da.ts
  10. +688 −382 i18n/qgis_de.ts
  11. +7,474 −7,176 i18n/qgis_el.ts
  12. +549 −411 i18n/qgis_en.ts
  13. +254 −23 i18n/qgis_es.ts
  14. +919 −727 i18n/qgis_et.ts
  15. +1,790 −1,419 i18n/qgis_eu.ts
  16. +9,887 −9,652 i18n/qgis_fa.ts
  17. +1,351 −960 i18n/qgis_fi.ts
  18. +1,627 −1,254 i18n/qgis_fr.ts
  19. +1,402 −1,027 i18n/qgis_gl.ts
  20. +885 −760 i18n/qgis_he.ts
  21. +849 −720 i18n/qgis_hi.ts
  22. +7,067 −6,727 i18n/qgis_hr.ts
  23. +935 −708 i18n/qgis_hu.ts
  24. +1,987 −1,662 i18n/qgis_id.ts
  25. +8,825 −8,549 i18n/qgis_is.ts
  26. +947 −1,404 i18n/qgis_it.ts
  27. +958 −702 i18n/qgis_ja.ts
  28. +900 −771 i18n/qgis_ka.ts
  29. +10,442 −10,149 i18n/qgis_km.ts
  30. +1,533 −1,067 i18n/qgis_ko.ts
  31. +881 −756 i18n/qgis_lo.ts
  32. +953 −705 i18n/qgis_lt.ts
  33. +221 −84 i18n/qgis_lv.ts
  34. +874 −745 i18n/qgis_ml.ts
  35. +9,738 −9,470 i18n/qgis_mn.ts
  36. +843 −718 i18n/qgis_mr.ts
  37. +1,667 −1,292 i18n/qgis_nb.ts
  38. +1,407 −1,028 i18n/qgis_nl.ts
  39. +955 −699 i18n/qgis_pl.ts
  40. +1,469 −1,094 i18n/qgis_pt_BR.ts
  41. +1,736 −1,069 i18n/qgis_pt_PT.ts
  42. +6,460 −6,099 i18n/qgis_ro.ts
  43. +958 −702 i18n/qgis_ru.ts
  44. +918 −713 i18n/qgis_sk.ts
  45. +903 −725 i18n/qgis_sl.ts
  46. +885 −760 i18n/qgis_sq.ts
  47. +909 −733 i18n/qgis_sr_Cyrl.ts
  48. +909 −733 i18n/qgis_sr_Latn.ts
  49. +3,771 −2,763 i18n/qgis_sv.ts
  50. +872 −747 i18n/qgis_sw.ts
  51. +885 −760 i18n/qgis_ta.ts
  52. +827 −702 i18n/qgis_te.ts
  53. +910 −742 i18n/qgis_th.ts
  54. +870 −745 i18n/qgis_tl.ts
  55. +890 −749 i18n/qgis_tr.ts
  56. +901 −746 i18n/qgis_uk.ts
  57. +898 −752 i18n/qgis_vi.ts
  58. +885 −760 i18n/qgis_xh.ts
  59. +3,140 −2,835 i18n/qgis_zh_CN.ts
  60. +6,312 −6,049 i18n/qgis_zh_TW.ts
  61. +1 −1 python/core/composer/qgsatlascomposition.sip
  62. +1 −1 python/core/composer/qgscomposerframe.sip
  63. +8 −8 python/core/composer/qgscomposerhtml.sip
  64. +10 −10 python/core/composer/qgscomposeritem.sip
  65. +1 −1 python/core/composer/qgscomposeritemgroup.sip
  66. +1 −1 python/core/composer/qgscomposerlabel.sip
  67. +1 −1 python/core/composer/qgscomposermap.sip
  68. +3 −3 python/core/composer/qgscomposermodel.sip
  69. +2 −2 python/core/composer/qgscomposermultiframe.sip
  70. +3 −3 python/core/composer/qgscomposermultiframecommand.sip
  71. +2 −2 python/core/composer/qgscomposerpicture.sip
  72. +1 −1 python/core/composer/qgscomposershape.sip
  73. +1 −1 python/core/composer/qgscomposerutils.sip
  74. +1 −1 python/core/layertree/qgslayertreenode.sip
  75. +50 −0 python/core/qgscolorscheme.sip
  76. +2 −2 python/core/qgsgeometrysimplifier.sip
  77. +2 −2 python/core/qgsmaplayerlegend.sip
  78. +2 −2 python/core/qgsmaptopixelgeometrysimplifier.sip
  79. +50 −3 python/core/symbology-ng/qgssymbollayerv2utils.sip
  80. +1 −0 python/gui/gui.sip
  81. +6 −6 python/gui/qgscolorbuttonv2.sip
  82. +164 −0 python/gui/qgscolorschemelist.sip
  83. +2 −2 python/gui/qgscolorswatchgrid.sip
  84. +3 −3 python/gui/qgscomposerview.sip
  85. +2 −2 python/gui/qgsmaplayeractionregistry.sip
  86. +1 −1 python/plugins/processing/algs/grass/GrassAlgorithm.py
  87. +1 −1 python/plugins/processing/algs/grass7/Grass7Algorithm.py
  88. +1 −1 python/plugins/processing/algs/otb/OTBAlgorithm.py
  89. +1 −1 python/plugins/processing/algs/qgis/scripts/Fill_holes.py
  90. +2 −2 python/plugins/processing/algs/qgis/scripts/Frequency_analysis.py
  91. +8 −8 src/app/qgsfieldsproperties.cpp
  92. +57 −94 src/app/qgsoptions.cpp
  93. +2 −4 src/app/qgsoptions.h
  94. +85 −0 src/app/qgsprojectproperties.cpp
  95. +4 −0 src/app/qgsprojectproperties.h
  96. +2 −2 src/core/composer/qgscomposermapgrid.cpp
  97. +6 −6 src/core/composer/qgscomposermapoverview.cpp
  98. +1 −1 src/core/composer/qgscomposermapoverview.h
  99. +8 −4 src/core/pal/feature.cpp
  100. +3 −0 src/core/pal/feature.h
  101. +1 −1 src/core/qgsattributeaction.cpp
  102. +120 −2 src/core/qgscolorscheme.cpp
  103. +44 −1 src/core/qgscolorscheme.h
  104. +1 −0 src/core/qgscolorschemeregistry.cpp
  105. +21 −0 src/core/qgscolorschemeregistry.h
  106. +4 −2 src/core/qgsfeatureiterator.cpp
  107. +1 −1 src/core/qgsfield.cpp
  108. +6 −14 src/core/qgsgeometrysimplifier.cpp
  109. +2 −2 src/core/qgsgeometrysimplifier.h
  110. +126 −112 src/core/qgsmaptopixelgeometrysimplifier.cpp
  111. +5 −2 src/core/qgsmaptopixelgeometrysimplifier.h
  112. +7 −7 src/core/qgsvectorlayer.cpp
  113. +1 −1 src/core/qgsvectorlayerfeatureiterator.cpp
  114. +4 −1 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  115. +4 −1 src/core/symbology-ng/qgssymbollayerv2.cpp
  116. +330 −11 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  117. +51 −2 src/core/symbology-ng/qgssymbollayerv2utils.h
  118. +3 −0 src/customwidgets/CMakeLists.txt
  119. +2 −2 src/customwidgets/qgscolorbuttonplugin.cpp
  120. +97 −0 src/customwidgets/qgscolorbuttonv2plugin.cpp
  121. +48 −0 src/customwidgets/qgscolorbuttonv2plugin.h
  122. +2 −0 src/gui/CMakeLists.txt
  123. +2 −2 src/gui/qgsattributeform.cpp
  124. +1 −1 src/gui/qgscodeeditorhtml.cpp
  125. +553 −0 src/gui/qgscolorschemelist.cpp
  126. +210 −0 src/gui/qgscolorschemelist.h
  127. +1 −1 src/gui/qgscolorswatchgrid.h
  128. +1 −1 src/gui/qgsmaplayeractionregistry.h
  129. +2 −2 src/mapserver/qgsserverprojectparser.cpp
  130. +1 −1 src/providers/ogr/qgsogrfeatureiterator.cpp
  131. +9 −4 src/providers/ogr/qgsogrgeometrysimplifier.cpp
  132. +5 −5 src/providers/ogr/qgsogrprovider.cpp
  133. +15 −6 src/ui/qgsexpressionbuilder.ui
  134. +232 −27 src/ui/qgsoptionsbase.ui
  135. +103 −42 src/ui/qgsprojectpropertiesbase.ui
  136. +58 −0 tests/src/core/testqgscolorschemeregistry.cpp
  137. +122 −0 tests/src/core/testqgsstylev2.cpp

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit f9ba32a

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