Skip to content
Permalink
Browse files

Merge remote-tracking branch 'upstream/master' into newTips

  • Loading branch information
yjacolin committed Oct 4, 2014
2 parents 6922e45 + ec64e1d commit 1cd543a66496a42bd90eb1b5da6e3c30aa41a8fe
Showing with 144,121 additions and 66,447 deletions.
  1. +58 −58 doc/TRANSLATORS
  2. +2,428 −1,131 i18n/qgis_af.ts
  3. +2,434 −1,137 i18n/qgis_ar.ts
  4. +2,445 −1,136 i18n/qgis_bg.ts
  5. +2,422 −1,125 i18n/qgis_bn.ts
  6. +2,444 −1,123 i18n/qgis_bs.ts
  7. +2,432 −1,135 i18n/qgis_ca.ts
  8. +2,548 −1,248 i18n/qgis_cs.ts
  9. +2,603 −1,310 i18n/qgis_da.ts
  10. +2,506 −1,118 i18n/qgis_de.ts
  11. +2,432 −1,135 i18n/qgis_el.ts
  12. +2,428 −1,131 i18n/qgis_en.ts
  13. +1,330 −15 i18n/qgis_es.ts
  14. +2,443 −1,130 i18n/qgis_et.ts
  15. +2,563 −1,267 i18n/qgis_eu.ts
  16. +2,431 −1,134 i18n/qgis_fa.ts
  17. +2,434 −1,141 i18n/qgis_fi.ts
  18. +2,478 −1,176 i18n/qgis_fr.ts
  19. +2,435 −1,150 i18n/qgis_gl.ts
  20. +2,432 −1,135 i18n/qgis_he.ts
  21. +2,436 −1,127 i18n/qgis_hi.ts
  22. +2,432 −1,135 i18n/qgis_hr.ts
  23. +2,449 −1,120 i18n/qgis_hu.ts
  24. +2,432 −1,139 i18n/qgis_id.ts
  25. +2,431 −1,134 i18n/qgis_is.ts
  26. +3,151 −1,358 i18n/qgis_it.ts
  27. +2,454 −1,121 i18n/qgis_ja.ts
  28. +2,445 −1,136 i18n/qgis_ka.ts
  29. +2,694 −1,377 i18n/qgis_km.ts
  30. +2,433 −1,140 i18n/qgis_ko.ts
  31. +2,435 −1,134 i18n/qgis_lo.ts
  32. +2,449 −1,120 i18n/qgis_lt.ts
  33. +1,325 −22 i18n/qgis_lv.ts
  34. +2,428 −1,131 i18n/qgis_ml.ts
  35. +2,433 −1,136 i18n/qgis_mn.ts
  36. +2,424 −1,127 i18n/qgis_mr.ts
  37. +2,434 −1,149 i18n/qgis_nb.ts
  38. +2,466 −1,152 i18n/qgis_nl.ts
  39. +2,454 −1,121 i18n/qgis_pl.ts
  40. +2,509 −1,213 i18n/qgis_pt_BR.ts
  41. +2,573 −1,224 i18n/qgis_pt_PT.ts
  42. +2,447 −1,150 i18n/qgis_ro.ts
  43. +2,454 −1,121 i18n/qgis_ru.ts
  44. +2,448 −1,127 i18n/qgis_sk.ts
  45. +2,448 −1,127 i18n/qgis_sl.ts
  46. +2,445 −1,136 i18n/qgis_sq.ts
  47. +2,446 −1,133 i18n/qgis_sr_Cyrl.ts
  48. +2,446 −1,133 i18n/qgis_sr_Latn.ts
  49. +2,478 −1,159 i18n/qgis_sv.ts
  50. +2,428 −1,131 i18n/qgis_sw.ts
  51. +2,428 −1,131 i18n/qgis_ta.ts
  52. +2,424 −1,127 i18n/qgis_te.ts
  53. +2,445 −1,136 i18n/qgis_th.ts
  54. +2,433 −1,132 i18n/qgis_tl.ts
  55. +2,448 −1,127 i18n/qgis_tr.ts
  56. +2,442 −1,137 i18n/qgis_uk.ts
  57. +2,445 −1,136 i18n/qgis_vi.ts
  58. +2,432 −1,135 i18n/qgis_xh.ts
  59. +2,433 −1,136 i18n/qgis_zh_CN.ts
  60. +2,433 −1,140 i18n/qgis_zh_TW.ts
  61. +1 −1 python/gui/qgsattributedialog.sip
  62. +10 −8 python/plugins/processing/algs/qgis/Grid.py
  63. +1 −1 python/plugins/processing/algs/taudem/TauDEMAlgorithm.py
  64. +8 −3 python/plugins/processing/core/AlgorithmProvider.py
  65. +19 −14 python/plugins/processing/core/GeoAlgorithm.py
  66. +17 −7 python/plugins/processing/core/Processing.py
  67. +18 −6 python/plugins/processing/core/outputs.py
  68. +19 −12 python/plugins/processing/core/parameters.py
  69. +26 −21 python/plugins/processing/gui/AlgorithmExecutionDialog.py
  70. +7 −3 python/plugins/processing/gui/AlgorithmExecutor.py
  71. +4 −4 python/plugins/processing/gui/BatchInputSelectionPanel.py
  72. +1 −1 python/plugins/processing/gui/BatchOutputSelectionPanel.py
  73. +19 −23 python/plugins/processing/gui/BatchProcessingDialog.py
  74. +2 −2 python/plugins/processing/gui/ConfigDialog.py
  75. +7 −0 python/plugins/processing/gui/ContextAction.py
  76. +2 −2 python/plugins/processing/gui/CouldNotLoadResultsDialog.py
  77. +1 −1 python/plugins/processing/gui/CreateNewScriptAction.py
  78. +7 −5 python/plugins/processing/gui/DeleteScriptAction.py
  79. +1 −1 python/plugins/processing/gui/EditScriptAction.py
  80. +4 −4 python/plugins/processing/gui/ExtentSelectionPanel.py
  81. +3 −3 python/plugins/processing/gui/FileSelectionPanel.py
  82. +4 −4 python/plugins/processing/gui/FixedTableDialog.py
  83. +2 −3 python/plugins/processing/gui/FixedTablePanel.py
  84. +41 −36 python/plugins/processing/gui/GetScriptsAndModels.py
  85. +11 −6 python/plugins/processing/gui/Help2Html.py
  86. +16 −15 python/plugins/processing/gui/HelpEditionDialog.py
  87. +1 −1 python/plugins/processing/gui/HistoryDialog.py
  88. +1 −1 python/plugins/processing/gui/InputLayerSelectorPanel.py
  89. +8 −4 python/plugins/processing/gui/MessageBarProgress.py
  90. +4 −5 python/plugins/processing/gui/MissingDependencyDialog.py
  91. +3 −2 python/plugins/processing/gui/MultipleFileInputDialog.py
  92. +4 −4 python/plugins/processing/gui/MultipleFileInputPanel.py
  93. +5 −2 python/plugins/processing/gui/ParametersDialog.py
  94. +9 −9 python/plugins/processing/gui/ParametersPanel.py
  95. +2 −1 python/plugins/processing/gui/Postprocessing.py
  96. +2 −2 python/plugins/processing/gui/RangePanel.py
  97. +2 −2 python/plugins/processing/gui/RenderingStyleFilePanel.py
  98. +7 −4 python/plugins/processing/gui/TestTools.py
  99. +7 −1 python/plugins/processing/gui/ToolboxAction.py
  100. +12 −7 python/plugins/processing/modeler/AddModelFromFileAction.py
  101. +14 −16 python/plugins/processing/modeler/CalculatorModelerAlgorithm.py
  102. +2 −2 python/plugins/processing/modeler/CreateNewModelAction.py
  103. +4 −3 python/plugins/processing/modeler/DeleteModelAction.py
  104. +1 −1 python/plugins/processing/modeler/EditModelAction.py
  105. +19 −21 python/plugins/processing/modeler/ModelerAlgorithm.py
  106. +4 −5 python/plugins/processing/modeler/ModelerAlgorithmProvider.py
  107. +10 −12 python/plugins/processing/modeler/ModelerDialog.py
  108. +1 −1 python/plugins/processing/modeler/ModelerOnlyAlgorithmProvider.py
  109. +41 −41 python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py
  110. +12 −12 python/plugins/processing/modeler/ModelerParametersDialog.py
  111. +0 −3 python/plugins/processing/modeler/ModelerScene.py
  112. +1 −1 python/plugins/processing/modeler/MultilineTextPanel.py
  113. +8 −9 python/plugins/processing/modeler/RasterLayerBoundsAlgorithm.py
  114. +8 −8 python/plugins/processing/modeler/VectorLayerBoundsAlgorithm.py
  115. +10 −7 python/plugins/processing/script/AddScriptFromFileAction.py
  116. +13 −15 python/plugins/processing/script/ScriptAlgorithm.py
  117. +3 −5 python/plugins/processing/script/ScriptAlgorithmProvider.py
  118. +13 −0 resources/function_help/IN
  119. +1 −1 src/gui/qgsattributedialog.cpp
  120. +1 −0 src/gui/qgsexpressionbuilderwidget.cpp
  121. +2 −0 src/gui/qgsfieldexpressionwidget.cpp
  122. +7 −3 src/mapserver/qgswmsserver.cpp
  123. +1 −1 src/plugins/grass/modules/v.kernel.qgm
  124. +2 −2 src/ui/qgsdxfexportdialogbase.ui
  125. +46 −73 src/ui/qgsidentifyresultsbase.ui
  126. +163 −169 src/ui/qgsrasterlayerpropertiesbase.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.

0 comments on commit 1cd543a

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