Skip to content
Permalink
Browse files
Merge branch 'master' of github.com:qgis/QGIS
  • Loading branch information
pcav committed Feb 14, 2014
2 parents a81befc + 2bd75b6 commit 38297cc9c71286a590b9218afd38aeb7da3e10cc
Showing with 109,489 additions and 101,706 deletions.
  1. +44 −44 doc/TRANSLATORS
  2. +2,056 −1,992 i18n/qgis_af.ts
  3. +2,064 −1,996 i18n/qgis_ar.ts
  4. +2,074 −1,986 i18n/qgis_bg.ts
  5. +2,043 −1,979 i18n/qgis_bn.ts
  6. +2,108 −1,960 i18n/qgis_bs.ts
  7. +2,052 −1,988 i18n/qgis_ca.ts
  8. +2,110 −1,966 i18n/qgis_cs.ts
  9. +1,014 −990 i18n/qgis_da.ts
  10. +1,606 −1,247 i18n/qgis_de.ts
  11. +1,970 −1,884 i18n/qgis_el.ts
  12. +2,056 −1,992 i18n/qgis_en.ts
  13. +594 −16 i18n/qgis_es.ts
  14. +2,095 −1,967 i18n/qgis_et.ts
  15. +2,109 −1,953 i18n/qgis_eu.ts
  16. +2,070 −1,978 i18n/qgis_fa.ts
  17. +2,524 −2,310 i18n/qgis_fi.ts
  18. +2,113 −1,961 i18n/qgis_fr.ts
  19. +2,108 −1,960 i18n/qgis_gl.ts
  20. +2,056 −1,992 i18n/qgis_he.ts
  21. +2,043 −1,979 i18n/qgis_hi.ts
  22. +2,095 −1,967 i18n/qgis_hr.ts
  23. +2,110 −1,954 i18n/qgis_hu.ts
  24. +2,107 −1,959 i18n/qgis_id.ts
  25. +2,085 −1,973 i18n/qgis_is.ts
  26. +2,113 −1,956 i18n/qgis_it.ts
  27. +1,429 −1,246 i18n/qgis_ja.ts
  28. +2,069 −1,969 i18n/qgis_ka.ts
  29. +168 −35 i18n/qgis_km.ts
  30. +2,107 −1,959 i18n/qgis_ko.ts
  31. +2,080 −1,988 i18n/qgis_lo.ts
  32. +2,162 −2,003 i18n/qgis_lt.ts
  33. +155 −39 i18n/qgis_lv.ts
  34. +2,064 −2,000 i18n/qgis_ml.ts
  35. +2,079 −1,975 i18n/qgis_mn.ts
  36. +2,043 −1,979 i18n/qgis_mr.ts
  37. +901 −895 i18n/qgis_nb.ts
  38. +522 −8 i18n/qgis_nl.ts
  39. +2,195 −1,985 i18n/qgis_pl.ts
  40. +2,479 −2,317 i18n/qgis_pt_BR.ts
  41. +2,113 −1,957 i18n/qgis_pt_PT.ts
  42. +2,097 −1,969 i18n/qgis_ro.ts
  43. +1,275 −1,255 i18n/qgis_ru.ts
  44. +2,104 −1,956 i18n/qgis_sk.ts
  45. +2,107 −1,967 i18n/qgis_sl.ts
  46. +2,069 −1,969 i18n/qgis_sq.ts
  47. +2,093 −1,973 i18n/qgis_sr_Cyrl.ts
  48. +2,095 −1,967 i18n/qgis_sr_Latn.ts
  49. +1,149 −1,125 i18n/qgis_sv.ts
  50. +2,064 −2,000 i18n/qgis_sw.ts
  51. +2,052 −1,988 i18n/qgis_ta.ts
  52. +1,413 −1,355 i18n/qgis_te.ts
  53. +2,092 −1,972 i18n/qgis_th.ts
  54. +2,093 −1,973 i18n/qgis_tr.ts
  55. +2,078 −1,982 i18n/qgis_uk.ts
  56. +2,081 −1,973 i18n/qgis_vi.ts
  57. +2,052 −1,988 i18n/qgis_xh.ts
  58. +2,111 −1,963 i18n/qgis_zh_CN.ts
  59. +2,101 −1,969 i18n/qgis_zh_TW.ts
  60. +1 −0 images/images.qrc
  61. BIN images/themes/default/mActionNewTableRow.png
  62. +5 −0 python/core/composer/qgscomposition.sip
  63. +2 −2 python/plugins/db_manager/dlg_sql_window.py
  64. +3 −0 python/plugins/processing/gui/ConfigDialog.py
  65. +1 −8 src/app/composer/qgscomposer.cpp
  66. +18 −5 src/app/qgisapp.cpp
  67. +1 −0 src/app/qgsattributetabledialog.cpp
  68. +21 −19 src/app/qgsidentifyresultsdialog.cpp
  69. +2 −0 src/app/qgsidentifyresultsdialog.h
  70. +18 −0 src/app/qgsmaptooladdfeature.cpp
  71. +1 −0 src/app/qgsmaptooladdfeature.h
  72. +11 −6 src/app/qgsmaptoolidentifyaction.cpp
  73. +12 −4 src/app/qgsmergeattributesdialog.cpp
  74. +79 −1 src/core/composer/qgscomposition.cpp
  75. +7 −0 src/core/composer/qgscomposition.h
  76. +91 −5 src/core/qgsgml.cpp
  77. +21 −1 src/core/qgsgml.h
  78. +11 −3 src/core/qgsgmlschema.cpp
  79. +1 −0 src/core/qgsgmlschema.h
  80. +6 −0 src/core/symbology-ng/qgsstylev2.cpp
  81. +3 −0 src/gui/qgshighlight.cpp
  82. +2 −0 src/gui/qgsmapcanvasitem.cpp
  83. +16 −0 src/providers/ogr/qgsogrprovider.cpp
  84. +23 −1 src/providers/wms/qgswmsprovider.cpp
  85. +7 −1 src/ui/qgsattributetabledialog.ui
  86. +15 −2 src/ui/qgscompositionwidgetbase.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.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit 38297cc

Please sign in to comment.