Automatic merge using stringmerge script.

git-svn-id: svn://svn.pgadmin.org/trunk@3631 a7884b65-44f6-0310-8a51-81a127f17b15
pgadmin-org · Sep 7, 2004 · b42b429 · b42b429
1 parent 3916e0a
commit b42b429
Show file tree

Hide file tree

Showing 89 changed files with 15,510 additions and 19,120 deletions.
diff --git a/src/ui/af_ZA/pgadmin3.mo b/src/ui/af_ZA/pgadmin3.mo
diff --git a/src/ui/af_ZA/pgadmin3.po b/src/ui/af_ZA/pgadmin3.po
diff --git a/src/ui/ar_SA/pgadmin3.po b/src/ui/ar_SA/pgadmin3.po
diff --git a/src/ui/bg_BG/pgadmin3.mo b/src/ui/bg_BG/pgadmin3.mo
diff --git a/src/ui/bg_BG/pgadmin3.po b/src/ui/bg_BG/pgadmin3.po
diff --git a/src/ui/ca_ES/pgadmin3.mo b/src/ui/ca_ES/pgadmin3.mo
diff --git a/src/ui/ca_ES/pgadmin3.po b/src/ui/ca_ES/pgadmin3.po
diff --git a/src/ui/cs_CZ/pgadmin3.mo b/src/ui/cs_CZ/pgadmin3.mo
diff --git a/src/ui/cs_CZ/pgadmin3.po b/src/ui/cs_CZ/pgadmin3.po
diff --git a/src/ui/da_DK/pgadmin3.mo b/src/ui/da_DK/pgadmin3.mo
diff --git a/src/ui/da_DK/pgadmin3.po b/src/ui/da_DK/pgadmin3.po
diff --git a/src/ui/de_CH/pgadmin3.mo b/src/ui/de_CH/pgadmin3.mo
diff --git a/src/ui/de_CH/pgadmin3.po b/src/ui/de_CH/pgadmin3.po
diff --git a/src/ui/de_DE/pgadmin3.mo b/src/ui/de_DE/pgadmin3.mo
diff --git a/src/ui/de_DE/pgadmin3.po b/src/ui/de_DE/pgadmin3.po
diff --git a/src/ui/el_GR/pgadmin3.mo b/src/ui/el_GR/pgadmin3.mo
diff --git a/src/ui/el_GR/pgadmin3.po b/src/ui/el_GR/pgadmin3.po
diff --git a/src/ui/es_ES/pgadmin3.mo b/src/ui/es_ES/pgadmin3.mo
diff --git a/src/ui/es_ES/pgadmin3.po b/src/ui/es_ES/pgadmin3.po
diff --git a/src/ui/fa_IR/pgadmin3.mo b/src/ui/fa_IR/pgadmin3.mo
diff --git a/src/ui/fa_IR/pgadmin3.po b/src/ui/fa_IR/pgadmin3.po
diff --git a/src/ui/fi_FI/pgadmin3.mo b/src/ui/fi_FI/pgadmin3.mo
diff --git a/src/ui/fi_FI/pgadmin3.po b/src/ui/fi_FI/pgadmin3.po
diff --git a/src/ui/fr_FR/pgadmin3.mo b/src/ui/fr_FR/pgadmin3.mo
diff --git a/src/ui/fr_FR/pgadmin3.po b/src/ui/fr_FR/pgadmin3.po
diff --git a/src/ui/gj_IN/pgadmin3.mo b/src/ui/gj_IN/pgadmin3.mo
diff --git a/src/ui/gj_IN/pgadmin3.po b/src/ui/gj_IN/pgadmin3.po
diff --git a/src/ui/gl_ES/pgadmin3.mo b/src/ui/gl_ES/pgadmin3.mo
diff --git a/src/ui/gl_ES/pgadmin3.po b/src/ui/gl_ES/pgadmin3.po
diff --git a/src/ui/gu_IN/pgadmin3.mo b/src/ui/gu_IN/pgadmin3.mo
diff --git a/src/ui/gu_IN/pgadmin3.po b/src/ui/gu_IN/pgadmin3.po
diff --git a/src/ui/hi_IN/pgadmin3.mo b/src/ui/hi_IN/pgadmin3.mo
diff --git a/src/ui/hi_IN/pgadmin3.po b/src/ui/hi_IN/pgadmin3.po
diff --git a/src/ui/hr_HR/pgadmin3.mo b/src/ui/hr_HR/pgadmin3.mo
diff --git a/src/ui/hr_HR/pgadmin3.po b/src/ui/hr_HR/pgadmin3.po
diff --git a/src/ui/hu_HU/pgadmin3.mo b/src/ui/hu_HU/pgadmin3.mo
diff --git a/src/ui/hu_HU/pgadmin3.po b/src/ui/hu_HU/pgadmin3.po
diff --git a/src/ui/id_ID/pgadmin3.mo b/src/ui/id_ID/pgadmin3.mo
diff --git a/src/ui/id_ID/pgadmin3.po b/src/ui/id_ID/pgadmin3.po
diff --git a/src/ui/is_IS/pgadmin3.mo b/src/ui/is_IS/pgadmin3.mo
diff --git a/src/ui/is_IS/pgadmin3.po b/src/ui/is_IS/pgadmin3.po
diff --git a/src/ui/it_IT/pgadmin3.mo b/src/ui/it_IT/pgadmin3.mo
diff --git a/src/ui/it_IT/pgadmin3.po b/src/ui/it_IT/pgadmin3.po
diff --git a/src/ui/ja_JP/pgadmin3.mo b/src/ui/ja_JP/pgadmin3.mo
diff --git a/src/ui/ja_JP/pgadmin3.po b/src/ui/ja_JP/pgadmin3.po
diff --git a/src/ui/lt_LT/pgadmin3.mo b/src/ui/lt_LT/pgadmin3.mo
diff --git a/src/ui/lt_LT/pgadmin3.po b/src/ui/lt_LT/pgadmin3.po
diff --git a/src/ui/lv_LV/pgadmin3.mo b/src/ui/lv_LV/pgadmin3.mo
diff --git a/src/ui/lv_LV/pgadmin3.po b/src/ui/lv_LV/pgadmin3.po
diff --git a/src/ui/nb_NO/pgadmin3.mo b/src/ui/nb_NO/pgadmin3.mo
diff --git a/src/ui/nb_NO/pgadmin3.po b/src/ui/nb_NO/pgadmin3.po
diff --git a/src/ui/nl_NL/pgadmin3.mo b/src/ui/nl_NL/pgadmin3.mo
diff --git a/src/ui/nl_NL/pgadmin3.po b/src/ui/nl_NL/pgadmin3.po
diff --git a/src/ui/pl_PL/pgadmin3.mo b/src/ui/pl_PL/pgadmin3.mo
diff --git a/src/ui/pl_PL/pgadmin3.po b/src/ui/pl_PL/pgadmin3.po
diff --git a/src/ui/pt_BR/pgadmin3.mo b/src/ui/pt_BR/pgadmin3.mo
diff --git a/src/ui/pt_BR/pgadmin3.po b/src/ui/pt_BR/pgadmin3.po
diff --git a/src/ui/pt_PT/pgadmin3.mo b/src/ui/pt_PT/pgadmin3.mo
diff --git a/src/ui/pt_PT/pgadmin3.po b/src/ui/pt_PT/pgadmin3.po
diff --git a/src/ui/ro_RO/pgadmin3.mo b/src/ui/ro_RO/pgadmin3.mo
diff --git a/src/ui/ro_RO/pgadmin3.po b/src/ui/ro_RO/pgadmin3.po
diff --git a/src/ui/ru_RU/pgadmin3.mo b/src/ui/ru_RU/pgadmin3.mo
diff --git a/src/ui/ru_RU/pgadmin3.po b/src/ui/ru_RU/pgadmin3.po
diff --git a/src/ui/sd_IN/pgadmin3.mo b/src/ui/sd_IN/pgadmin3.mo
diff --git a/src/ui/sd_IN/pgadmin3.po b/src/ui/sd_IN/pgadmin3.po
diff --git a/src/ui/sk_SK/pgadmin3.mo b/src/ui/sk_SK/pgadmin3.mo
diff --git a/src/ui/sk_SK/pgadmin3.po b/src/ui/sk_SK/pgadmin3.po
diff --git a/src/ui/sl_SI/pgadmin3.mo b/src/ui/sl_SI/pgadmin3.mo
diff --git a/src/ui/sl_SI/pgadmin3.po b/src/ui/sl_SI/pgadmin3.po
diff --git a/src/ui/sr_YU/pgadmin3.mo b/src/ui/sr_YU/pgadmin3.mo
diff --git a/src/ui/sr_YU/pgadmin3.po b/src/ui/sr_YU/pgadmin3.po
diff --git a/src/ui/sv_SE/pgadmin3.mo b/src/ui/sv_SE/pgadmin3.mo
diff --git a/src/ui/sv_SE/pgadmin3.po b/src/ui/sv_SE/pgadmin3.po
diff --git a/src/ui/te_IN/pgadmin3.mo b/src/ui/te_IN/pgadmin3.mo
diff --git a/src/ui/te_IN/pgadmin3.po b/src/ui/te_IN/pgadmin3.po
diff --git a/src/ui/tl_PH/pgadmin3.mo b/src/ui/tl_PH/pgadmin3.mo
diff --git a/src/ui/tl_PH/pgadmin3.po b/src/ui/tl_PH/pgadmin3.po
diff --git a/src/ui/tr_TR/pgadmin3.mo b/src/ui/tr_TR/pgadmin3.mo
diff --git a/src/ui/tr_TR/pgadmin3.po b/src/ui/tr_TR/pgadmin3.po
diff --git a/src/ui/uk_UA/pgadmin3.mo b/src/ui/uk_UA/pgadmin3.mo
diff --git a/src/ui/uk_UA/pgadmin3.po b/src/ui/uk_UA/pgadmin3.po
diff --git a/src/ui/ur_PK/pgadmin3.mo b/src/ui/ur_PK/pgadmin3.mo
diff --git a/src/ui/ur_PK/pgadmin3.po b/src/ui/ur_PK/pgadmin3.po
diff --git a/src/ui/vi_VN/pgadmin3.mo b/src/ui/vi_VN/pgadmin3.mo
diff --git a/src/ui/vi_VN/pgadmin3.po b/src/ui/vi_VN/pgadmin3.po
diff --git a/src/ui/zh_CN/pgadmin3.mo b/src/ui/zh_CN/pgadmin3.mo
diff --git a/src/ui/zh_CN/pgadmin3.po b/src/ui/zh_CN/pgadmin3.po
diff --git a/src/ui/zh_TW/pgadmin3.mo b/src/ui/zh_TW/pgadmin3.mo
diff --git a/src/ui/zh_TW/pgadmin3.po b/src/ui/zh_TW/pgadmin3.po