Merge remote-tracking branch 'upstream/master' into CategorizedRender…

…erUpdate
qgis · Sep 24, 2014 · 5d18a2e · 5d18a2e
2 parents a5911e7 + 3f8a860
commit 5d18a2e
Show file tree

Hide file tree

Showing 79 changed files with 110,823 additions and 61,222 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
diff --git a/i18n/qgis_he.ts b/i18n/qgis_he.ts
diff --git a/i18n/qgis_hi.ts b/i18n/qgis_hi.ts
diff --git a/i18n/qgis_hr.ts b/i18n/qgis_hr.ts
diff --git a/i18n/qgis_hu.ts b/i18n/qgis_hu.ts
diff --git a/i18n/qgis_id.ts b/i18n/qgis_id.ts
diff --git a/i18n/qgis_is.ts b/i18n/qgis_is.ts