Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/qgis/Quantum-GIS into mak…

…e_pull_req_from_ja

Conflicts:
	i18n/qgis_ja.ts
  • Loading branch information
yoichigmf committed Jul 2, 2013
2 parents 03c1cec + ce1a9a8 commit a1d43e69cb02ec42b7c7513835f0ebc6ed4dfbc9
Showing with 92,094 additions and 82,887 deletions.
  1. +26 −26 doc/TRANSLATORS
  2. +1,936 −1,829 i18n/qgis_af.ts
  3. +1,936 −1,829 i18n/qgis_ar.ts
  4. +1,932 −1,825 i18n/qgis_bg.ts
  5. +1,927 −1,820 i18n/qgis_bn.ts
  6. +1,987 −1,762 i18n/qgis_bs_BA.ts
  7. +1,936 −1,829 i18n/qgis_ca_ES.ts
  8. +1,987 −1,762 i18n/qgis_cs_CZ.ts
  9. +1,987 −1,762 i18n/qgis_da_DK.ts
  10. +160 −152 i18n/qgis_de.ts
  11. +1,947 −1,817 i18n/qgis_el_GR.ts
  12. +1,932 −1,825 i18n/qgis_en.ts
  13. +640 −303 i18n/qgis_es.ts
  14. +1,980 −1,779 i18n/qgis_et_EE.ts
  15. +1,991 −1,750 i18n/qgis_eu.ts
  16. +1,947 −1,813 i18n/qgis_fa.ts
  17. +1,255 −1,113 i18n/qgis_fi.ts
  18. +1,990 −1,637 i18n/qgis_fr.ts
  19. +161 −159 i18n/qgis_gl_ES.ts
  20. +1,936 −1,829 i18n/qgis_he.ts
  21. +1,956 −1,804 i18n/qgis_hr_HR.ts
  22. +1,977 −1,783 i18n/qgis_hu.ts
  23. +1,254 −1,116 i18n/qgis_id.ts
  24. +1,944 −1,824 i18n/qgis_is.ts
  25. +1,888 −1,552 i18n/qgis_it.ts
  26. +86 −85 i18n/qgis_ja.ts
  27. +1,945 −1,826 i18n/qgis_ka_GE.ts
  28. +681 −467 i18n/qgis_km.ts
  29. +841 −783 i18n/qgis_ko_KR.ts
  30. +1,940 −1,825 i18n/qgis_lo.ts
  31. +1,936 −1,829 i18n/qgis_lt.ts
  32. +663 −503 i18n/qgis_lv.ts
  33. +1,932 −1,825 i18n/qgis_ml_IN.ts
  34. +1,953 −1,825 i18n/qgis_mn.ts
  35. +704 −461 i18n/qgis_nl.ts
  36. +1,936 −1,829 i18n/qgis_no.ts
  37. +1,708 −1,373 i18n/qgis_pl_PL.ts
  38. +1,889 −1,552 i18n/qgis_pt_BR.ts
  39. +1,984 −1,764 i18n/qgis_pt_PT.ts
  40. +1,952 −1,803 i18n/qgis_ro.ts
  41. +1,933 −1,577 i18n/qgis_ru.ts
  42. +2,090 −1,768 i18n/qgis_sk.ts
  43. +824 −766 i18n/qgis_sl_SI.ts
  44. +1,942 −1,827 i18n/qgis_sq_AL.ts
  45. +1,954 −1,808 i18n/qgis_sr_Cyrl.ts
  46. +1,954 −1,808 i18n/qgis_sr_Latn.ts
  47. +1,761 −1,585 i18n/qgis_sv.ts
  48. +1,932 −1,825 i18n/qgis_sw.ts
  49. +1,936 −1,829 i18n/qgis_ta.ts
  50. +1,956 −1,810 i18n/qgis_th.ts
  51. +1,953 −1,817 i18n/qgis_tr.ts
  52. +1,954 −1,816 i18n/qgis_uk.ts
  53. +1,944 −1,821 i18n/qgis_vi.ts
  54. +1,936 −1,829 i18n/qgis_xh.ts
  55. +1,989 −1,756 i18n/qgis_zh_CN.ts
  56. +753 −709 i18n/qgis_zh_TW.ts
  57. +1 −0 images/images.qrc
  58. BIN images/themes/default/mActionIdentify.png
  59. +422 −0 images/themes/default/mActionIdentify.svg
  60. +1 −1 python/plugins/sextante/algs/ftools/Dissolve.py
  61. +1 −1 python/plugins/sextante/algs/ftools/SinglePartsToMultiparts.py
  62. +1 −1 python/plugins/sextante/gui/FileSelectionPanel.py
  63. +2 −2 python/plugins/sextante/modeler/ModelerParametersDialog.py
  64. +1 −1 src/app/qgisapp.cpp
  65. +6 −6 src/plugins/heatmap/heatmapgui.cpp
  66. +3 −16 src/plugins/topology/checkDock.cpp
  67. +82 −57 src/providers/mssql/qgsmssqlprovider.cpp
  68. +1 −1 src/ui/qgisapp.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.

0 comments on commit a1d43e6

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