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

…e_pull_req_from_ja Conflicts: i18n/qgis_ja.ts
qgis · Jul 2, 2013 · a1d43e6 · a1d43e6
2 parents 03c1cec + ce1a9a8
commit a1d43e6
Show file tree

Hide file tree

Showing 68 changed files with 92,094 additions and 82,887 deletions.
diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
diff --git a/i18n/qgis_af.ts b/i18n/qgis_af.ts
diff --git a/i18n/qgis_ar.ts b/i18n/qgis_ar.ts
diff --git a/i18n/qgis_bg.ts b/i18n/qgis_bg.ts
diff --git a/i18n/qgis_bn.ts b/i18n/qgis_bn.ts
diff --git a/i18n/qgis_bs_BA.ts b/i18n/qgis_bs_BA.ts
diff --git a/i18n/qgis_ca_ES.ts b/i18n/qgis_ca_ES.ts
diff --git a/i18n/qgis_cs_CZ.ts b/i18n/qgis_cs_CZ.ts
diff --git a/i18n/qgis_da_DK.ts b/i18n/qgis_da_DK.ts
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/i18n/qgis_el_GR.ts b/i18n/qgis_el_GR.ts
diff --git a/i18n/qgis_en.ts b/i18n/qgis_en.ts
diff --git a/i18n/qgis_es.ts b/i18n/qgis_es.ts
diff --git a/i18n/qgis_et_EE.ts b/i18n/qgis_et_EE.ts
diff --git a/i18n/qgis_eu.ts b/i18n/qgis_eu.ts
diff --git a/i18n/qgis_fa.ts b/i18n/qgis_fa.ts
diff --git a/i18n/qgis_fi.ts b/i18n/qgis_fi.ts
diff --git a/i18n/qgis_fr.ts b/i18n/qgis_fr.ts
diff --git a/i18n/qgis_gl_ES.ts b/i18n/qgis_gl_ES.ts
diff --git a/i18n/qgis_he.ts b/i18n/qgis_he.ts