Merge remote-tracking branch 'upstream/master'

qgis · Aug 18, 2014 · f9ba32a · f9ba32a
2 parents 8888c5f + 8105545
commit f9ba32a
Show file tree

Hide file tree

Showing 137 changed files with 143,734 additions and 126,876 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.ts b/i18n/qgis_bs.ts
diff --git a/i18n/qgis_ca.ts b/i18n/qgis_ca.ts
diff --git a/i18n/qgis_cs.ts b/i18n/qgis_cs.ts
diff --git a/i18n/qgis_da.ts b/i18n/qgis_da.ts
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/i18n/qgis_el.ts b/i18n/qgis_el.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.ts b/i18n/qgis_et.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.ts b/i18n/qgis_gl.ts