pgAdmin III commit: Automatic merge using stringmerge script.

Automatic merge using stringmerge script.

Branch
------
master

Details
-------
http://git.postgresql.org/gitweb?p=pgadmin3.git;a=commitdiff;h=3bd766c7015c49e4232c7c240f3c1de25f0cb27f

Modified Files
--------------
i18n/af_ZA/pgadmin3.po | 2935 ++++++++++++++++++++++------------------
i18n/ar_SA/pgadmin3.po | 2983 +++++++++++++++++++++++------------------
i18n/bg_BG/pgadmin3.po | 2876 ++++++++++++++++++++++------------------
i18n/ca_ES/pgadmin3.po | 2842 +++++++++++++++++++++------------------
i18n/cs_CZ/pgadmin3.po | 2861 +++++++++++++++++++++------------------
i18n/da_DK/pgadmin3.po | 3147 +++++++++++++++++++++++++------------------
i18n/de_CH/pgadmin3.po | 2861 +++++++++++++++++++++------------------
i18n/de_DE/pgadmin3.po | 2931 ++++++++++++++++++++++------------------
i18n/el_GR/pgadmin3.po | 2863 +++++++++++++++++++++------------------
i18n/es_ES/pgadmin3.po | 2708 ++++++++++++++++++++-----------------
i18n/fa_IR/pgadmin3.po | 2855 +++++++++++++++++++++------------------
i18n/fi_FI/pgadmin3.po | 2841 +++++++++++++++++++++------------------
i18n/fr_FR/pgadmin3.po | 2888 ++++++++++++++++++++++------------------
i18n/gl_ES/pgadmin3.po | 2861 +++++++++++++++++++++------------------
i18n/gu_IN/pgadmin3.po | 2787 ++++++++++++++++++++------------------
i18n/hi_IN/pgadmin3.po | 2817 +++++++++++++++++++++------------------
i18n/hr_HR/pgadmin3.po | 3455 +++++++++++++++++++++++++++++-------------------
i18n/hu_HU/pgadmin3.po | 2880 ++++++++++++++++++++++------------------
i18n/id_ID/pgadmin3.po | 2993 +++++++++++++++++++++++------------------
i18n/is_IS/pgadmin3.po | 2787 ++++++++++++++++++++------------------
i18n/it_IT/pgadmin3.po | 2935 ++++++++++++++++++++++------------------
i18n/ja_JP/pgadmin3.po | 2956 +++++++++++++++++++++++------------------
i18n/ko_KR/pgadmin3.po | 2929 ++++++++++++++++++++++------------------
i18n/lt_LT/pgadmin3.po | 2868 ++++++++++++++++++++++------------------
i18n/lv_LV/pgadmin3.po | 2856 +++++++++++++++++++++------------------
i18n/mk_MK/pgadmin3.po | 2787 ++++++++++++++++++++------------------
i18n/nb_NO/pgadmin3.po | 2999 +++++++++++++++++++++++------------------
i18n/nl_NL/pgadmin3.po | 2860 +++++++++++++++++++++------------------
i18n/pl_PL/pgadmin3.po | 2888 ++++++++++++++++++++++------------------
i18n/pt_BR/pgadmin3.po | 2955 +++++++++++++++++++++++------------------
i18n/pt_PT/pgadmin3.po | 2949 +++++++++++++++++++++++------------------
i18n/ro_RO/pgadmin3.po | 2984 +++++++++++++++++++++++------------------
i18n/ru_RU/pgadmin3.po | 2951 +++++++++++++++++++++++------------------
i18n/sk_SK/pgadmin3.po | 2860 +++++++++++++++++++++------------------
i18n/sl_SI/pgadmin3.po | 2862 +++++++++++++++++++++------------------
i18n/sr_RS/pgadmin3.po | 2860 +++++++++++++++++++++------------------
i18n/sv_SE/pgadmin3.po | 2865 +++++++++++++++++++++------------------
i18n/te_IN/pgadmin3.po | 2787 ++++++++++++++++++++------------------
i18n/tl_PH/pgadmin3.po | 2894 ++++++++++++++++++++++------------------
i18n/tr_TR/pgadmin3.po | 3137 +++++++++++++++++++++++++------------------
i18n/uk_UA/pgadmin3.po | 2788 ++++++++++++++++++++------------------
i18n/ur_PK/pgadmin3.po | 2842 +++++++++++++++++++++------------------
i18n/vi_VN/pgadmin3.po | 2786 ++++++++++++++++++++------------------
i18n/zh_CN/pgadmin3.po | 2869 ++++++++++++++++++++++------------------
i18n/zh_TW/pgadmin3.po | 2870 ++++++++++++++++++++++------------------
45 files changed, 73990 insertions(+), 56518 deletions(-)