Skip to content
Permalink
Browse files

Merge remote-tracking branch 'upstream/master' into CategorizedRender…

…erUpdate
  • Loading branch information
ccrook committed Sep 24, 2014
2 parents a5911e7 + 3f8a860 commit 5d18a2e759015482786bcece6ff7a3f3dc417b7e
Showing with 110,823 additions and 61,222 deletions.
  1. +58 −58 doc/TRANSLATORS
  2. +1,910 −1,058 i18n/qgis_af.ts
  3. +2,129 −1,267 i18n/qgis_ar.ts
  4. +1,910 −1,058 i18n/qgis_bg.ts
  5. +1,909 −1,057 i18n/qgis_bn.ts
  6. +1,907 −1,059 i18n/qgis_bs.ts
  7. +1,909 −1,057 i18n/qgis_ca.ts
  8. +1,909 −1,057 i18n/qgis_cs.ts
  9. +1,910 −1,058 i18n/qgis_da.ts
  10. +394 −198 i18n/qgis_de.ts
  11. +1,909 −1,057 i18n/qgis_el.ts
  12. +391 −207 i18n/qgis_en.ts
  13. +676 −10 i18n/qgis_es.ts
  14. +1,907 −1,059 i18n/qgis_et.ts
  15. +1,910 −1,058 i18n/qgis_eu.ts
  16. +1,909 −1,057 i18n/qgis_fa.ts
  17. +1,917 −1,065 i18n/qgis_fi.ts
  18. +1,959 −1,106 i18n/qgis_fr.ts
  19. +2,146 −1,080 i18n/qgis_gl.ts
  20. +1,910 −1,058 i18n/qgis_he.ts
  21. +1,909 −1,057 i18n/qgis_hi.ts
  22. +1,910 −1,058 i18n/qgis_hr.ts
  23. +1,909 −1,057 i18n/qgis_hu.ts
  24. +1,930 −1,077 i18n/qgis_id.ts
  25. +1,909 −1,057 i18n/qgis_is.ts
  26. +1,910 −1,058 i18n/qgis_it.ts
  27. +1,911 −1,055 i18n/qgis_ja.ts
  28. +1,910 −1,058 i18n/qgis_ka.ts
  29. +2,103 −1,244 i18n/qgis_km.ts
  30. +1,924 −1,072 i18n/qgis_ko.ts
  31. +1,910 −1,058 i18n/qgis_lo.ts
  32. +1,910 −1,058 i18n/qgis_lt.ts
  33. +757 −91 i18n/qgis_lv.ts
  34. +1,909 −1,057 i18n/qgis_ml.ts
  35. +1,909 −1,057 i18n/qgis_mn.ts
  36. +1,909 −1,057 i18n/qgis_mr.ts
  37. +2,094 −1,229 i18n/qgis_nb.ts
  38. +2,151 −1,080 i18n/qgis_nl.ts
  39. +1,909 −1,057 i18n/qgis_pl.ts
  40. +2,742 −1,466 i18n/qgis_pt_BR.ts
  41. +1,922 −1,058 i18n/qgis_pt_PT.ts
  42. +2,472 −1,617 i18n/qgis_ro.ts
  43. +1,909 −1,057 i18n/qgis_ru.ts
  44. +1,910 −1,058 i18n/qgis_sk.ts
  45. +1,908 −1,060 i18n/qgis_sl.ts
  46. +1,910 −1,058 i18n/qgis_sq.ts
  47. +1,911 −1,059 i18n/qgis_sr_Cyrl.ts
  48. +1,911 −1,059 i18n/qgis_sr_Latn.ts
  49. +1,965 −1,096 i18n/qgis_sv.ts
  50. +1,909 −1,057 i18n/qgis_sw.ts
  51. +1,910 −1,058 i18n/qgis_ta.ts
  52. +1,909 −1,057 i18n/qgis_te.ts
  53. +1,907 −1,059 i18n/qgis_th.ts
  54. +1,909 −1,057 i18n/qgis_tl.ts
  55. +1,908 −1,060 i18n/qgis_tr.ts
  56. +1,907 −1,059 i18n/qgis_uk.ts
  57. +1,910 −1,058 i18n/qgis_vi.ts
  58. +1,910 −1,058 i18n/qgis_xh.ts
  59. +1,910 −1,058 i18n/qgis_zh_CN.ts
  60. +1,910 −1,058 i18n/qgis_zh_TW.ts
  61. +2 −1 python/plugins/processing/ProcessingPlugin.py
  62. +8 −0 python/plugins/processing/core/ProcessingLog.py
  63. +29 −29 python/plugins/processing/gui/AlgorithmExecutionDialog.py
  64. +4 −0 python/plugins/processing/gui/Help2Html.py
  65. +17 −0 python/plugins/processing/gui/HistoryDialog.py
  66. +60 −50 python/plugins/processing/gui/ParametersPanel.py
  67. +2 −6 python/plugins/processing/modeler/ModelerAlgorithm.py
  68. +49 −50 python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py
  69. +48 −52 python/plugins/processing/modeler/ModelerParametersDialog.py
  70. +3 −1 src/app/qgsmaptoolidentifyaction.cpp
  71. +5 −1 src/gui/editorwidgets/qgstexteditwrapper.cpp
  72. +9 −5 src/gui/qgsfilterlineedit.cpp
  73. +1 −0 src/gui/qgsfilterlineedit.h
  74. +230 −160 src/plugins/heatmap/heatmap.cpp
  75. +14 −7 src/plugins/heatmap/heatmap.h
  76. +158 −187 src/plugins/heatmap/heatmapgui.cpp
  77. +38 −37 src/plugins/heatmap/heatmapgui.h
  78. +193 −164 src/plugins/heatmap/heatmapguibase.ui
  79. +32 −24 src/ui/qgsattributetabledialog.ui

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.

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 5d18a2e

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