pgAdmin III commit: Automatic merge using stringmerge script.

From: Guillaume Lelarge <guillaume(at)lelarge(dot)info>
To: pgadmin-hackers(at)postgresql(dot)org
Subject: pgAdmin III commit: Automatic merge using stringmerge script.
Date: 2012-03-02 15:38:31
Message-ID: E1S3UYx-0000xn-Qx@gothos.postgresql.org
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgadmin-hackers

Automatic merge using stringmerge script.

Branch
------
REL-1_14_0_PATCHES

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

Modified Files
--------------
i18n/af_ZA/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/ar_SA/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/bg_BG/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/ca_ES/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/cs_CZ/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/da_DK/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/de_CH/pgadmin3.po | 1854 ++++++++++++++++++++++++-----------------------
i18n/de_DE/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/el_GR/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/es_ES/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/fa_IR/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/fi_FI/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/fr_FR/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/gl_ES/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/gu_IN/pgadmin3.po | 1848 ++++++++++++++++++++++++-----------------------
i18n/hi_IN/pgadmin3.po | 1858 ++++++++++++++++++++++++-----------------------
i18n/hr_HR/pgadmin3.po | 1859 ++++++++++++++++++++++++-----------------------
i18n/hu_HU/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/id_ID/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/is_IS/pgadmin3.po | 1848 ++++++++++++++++++++++++-----------------------
i18n/it_IT/pgadmin3.po | 1861 ++++++++++++++++++++++++-----------------------
i18n/ja_JP/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/ko_KR/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/lt_LT/pgadmin3.po | 1854 ++++++++++++++++++++++++-----------------------
i18n/lv_LV/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/mk_MK/pgadmin3.po | 1848 ++++++++++++++++++++++++-----------------------
i18n/nb_NO/pgadmin3.po | 1856 ++++++++++++++++++++++++-----------------------
i18n/nl_NL/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/pl_PL/pgadmin3.po | 1888 +++++++++++++++++++++++++-----------------------
i18n/pt_BR/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/pt_PT/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/ro_RO/pgadmin3.po | 1856 ++++++++++++++++++++++++-----------------------
i18n/ru_RU/pgadmin3.po | 1857 ++++++++++++++++++++++++-----------------------
i18n/sk_SK/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/sl_SI/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/sr_RS/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/sv_SE/pgadmin3.po | 1854 ++++++++++++++++++++++++-----------------------
i18n/te_IN/pgadmin3.po | 1848 ++++++++++++++++++++++++-----------------------
i18n/tl_PH/pgadmin3.po | 1854 ++++++++++++++++++++++++-----------------------
i18n/tr_TR/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/uk_UA/pgadmin3.po | 1848 ++++++++++++++++++++++++-----------------------
i18n/ur_PK/pgadmin3.po | 1853 ++++++++++++++++++++++++-----------------------
i18n/vi_VN/pgadmin3.po | 1848 ++++++++++++++++++++++++-----------------------
i18n/zh_CN/pgadmin3.po | 1855 ++++++++++++++++++++++++-----------------------
i18n/zh_TW/pgadmin3.po | 1855 ++++++++++++++++++++++++-----------------------
45 files changed, 42865 insertions(+), 40562 deletions(-)

Browse pgadmin-hackers by date

  From Date Subject
Next Message Thom Brown 2012-03-02 15:53:58 Re: pgAdmin III commit: Update serbian translation
Previous Message Guillaume Lelarge 2012-03-02 13:22:50 pgAdmin III commit: Fix a few asserts with wxWidgets 2.9