Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/qgis/Quantum-GIS into mak…
Browse files Browse the repository at this point in the history
…e_pull_req_from_ja

Conflicts:
	i18n/qgis_ja.ts
  • Loading branch information
yoichigmf committed Jul 2, 2013
2 parents 03c1cec + ce1a9a8 commit a1d43e6
Show file tree
Hide file tree
Showing 68 changed files with 92,094 additions and 82,887 deletions.
52 changes: 26 additions & 26 deletions doc/TRANSLATORS

Large diffs are not rendered by default.

3,765 changes: 1,936 additions & 1,829 deletions i18n/qgis_af.ts

Large diffs are not rendered by default.

3,765 changes: 1,936 additions & 1,829 deletions i18n/qgis_ar.ts

Large diffs are not rendered by default.

3,757 changes: 1,932 additions & 1,825 deletions i18n/qgis_bg.ts

Large diffs are not rendered by default.

3,747 changes: 1,927 additions & 1,820 deletions i18n/qgis_bn.ts

Large diffs are not rendered by default.

3,749 changes: 1,987 additions & 1,762 deletions i18n/qgis_bs_BA.ts

Large diffs are not rendered by default.

3,765 changes: 1,936 additions & 1,829 deletions i18n/qgis_ca_ES.ts

Large diffs are not rendered by default.

3,749 changes: 1,987 additions & 1,762 deletions i18n/qgis_cs_CZ.ts

Large diffs are not rendered by default.

3,749 changes: 1,987 additions & 1,762 deletions i18n/qgis_da_DK.ts

Large diffs are not rendered by default.

312 changes: 160 additions & 152 deletions i18n/qgis_de.ts

Large diffs are not rendered by default.

3,764 changes: 1,947 additions & 1,817 deletions i18n/qgis_el_GR.ts

Large diffs are not rendered by default.

3,757 changes: 1,932 additions & 1,825 deletions i18n/qgis_en.ts

Large diffs are not rendered by default.

943 changes: 640 additions & 303 deletions i18n/qgis_es.ts

Large diffs are not rendered by default.

3,759 changes: 1,980 additions & 1,779 deletions i18n/qgis_et_EE.ts

Large diffs are not rendered by default.

3,741 changes: 1,991 additions & 1,750 deletions i18n/qgis_eu.ts

Large diffs are not rendered by default.

3,760 changes: 1,947 additions & 1,813 deletions i18n/qgis_fa.ts

Large diffs are not rendered by default.

2,368 changes: 1,255 additions & 1,113 deletions i18n/qgis_fi.ts

Large diffs are not rendered by default.

3,627 changes: 1,990 additions & 1,637 deletions i18n/qgis_fr.ts

Large diffs are not rendered by default.

320 changes: 161 additions & 159 deletions i18n/qgis_gl_ES.ts

Large diffs are not rendered by default.

3,765 changes: 1,936 additions & 1,829 deletions i18n/qgis_he.ts

Large diffs are not rendered by default.

3,760 changes: 1,956 additions & 1,804 deletions i18n/qgis_hr_HR.ts

Large diffs are not rendered by default.

3,760 changes: 1,977 additions & 1,783 deletions i18n/qgis_hu.ts

Large diffs are not rendered by default.

2,370 changes: 1,254 additions & 1,116 deletions i18n/qgis_id.ts

Large diffs are not rendered by default.

3,768 changes: 1,944 additions & 1,824 deletions i18n/qgis_is.ts

Large diffs are not rendered by default.

3,440 changes: 1,888 additions & 1,552 deletions i18n/qgis_it.ts

Large diffs are not rendered by default.

0 comments on commit a1d43e6

Please sign in to comment.