Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · Apr 17, 2012 · 7702fd4 · 7702fd4
2 parents 205a4b3 + 506d829
commit 7702fd4
Show file tree

Hide file tree

Showing 187 changed files with 68,262 additions and 26,242 deletions.
diff --git a/debian/rules b/debian/rules
@@ -154,7 +154,7 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs CHANGELOG
+	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installexamples
 	dh_install --sourcedir=debian/tmp

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_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