Skip site navigation (1) Skip section navigation (2)

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: 2010-08-26 15:08:03
Message-ID: 201008261508.o7QF83se050582@gothos.postgresql.org (view raw or flat)
Thread:
Lists: pgadmin-hackers
Commit: http://git.postgresql.org/gitweb?p=pgadmin3.git;a=commitdiff;h=a8e2fe3f2ded194af153fc382bc6dfdf1824c257

Log Message
-----------
Automatic merge using stringmerge script.

Branch
------
REL-1_12_0_PATCHES

Modified Files
--------------
i18n/af_ZA/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/ar_SA/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/bg_BG/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/ca_ES/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/cs_CZ/pgadmin3.po |   75 +++++++++++++++++++++++++-----------------
i18n/da_DK/pgadmin3.po |   85 ++++++++++++++++++++++++++++-------------------
i18n/de_CH/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/de_DE/pgadmin3.po |   73 +++++++++++++++++++++++++----------------
i18n/el_GR/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/es_ES/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/fa_IR/pgadmin3.po |   83 +++++++++++++++++++++++++++-------------------
i18n/fi_FI/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/fr_FR/pgadmin3.po |   74 +++++++++++++++++++++++++----------------
i18n/gl_ES/pgadmin3.po |   83 +++++++++++++++++++++++++++--------------------
i18n/gu_IN/pgadmin3.po |   58 ++++++++++++++++----------------
i18n/hi_IN/pgadmin3.po |   58 ++++++++++++++++----------------
i18n/hr_HR/pgadmin3.po |   84 ++++++++++++++++++++++++++++-------------------
i18n/hu_HU/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/id_ID/pgadmin3.po |   83 +++++++++++++++++++++++++++-------------------
i18n/is_IS/pgadmin3.po |   58 ++++++++++++++++----------------
i18n/it_IT/pgadmin3.po |   73 +++++++++++++++++++++++++----------------
i18n/ja_JP/pgadmin3.po |   81 +++++++++++++++++++++++++++------------------
i18n/ko_KR/pgadmin3.po |   85 ++++++++++++++++++++++++++++--------------------
i18n/lt_LT/pgadmin3.po |   77 ++++++++++++++++++++++++-------------------
i18n/lv_LV/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/mk_MK/pgadmin3.po |   58 ++++++++++++++++----------------
i18n/nb_NO/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/nl_NL/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/pl_PL/pgadmin3.po |   82 +++++++++++++++++++++++++++-------------------
i18n/pt_BR/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/pt_PT/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/ro_RO/pgadmin3.po |   83 +++++++++++++++++++++++++++-------------------
i18n/ru_RU/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/sk_SK/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/sl_SI/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/sr_RS/pgadmin3.po |   73 +++++++++++++++++++++++++----------------
i18n/sv_SE/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/te_IN/pgadmin3.po |   58 ++++++++++++++++----------------
i18n/tl_PH/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/tr_TR/pgadmin3.po |   84 ++++++++++++++++++++++++++++-------------------
i18n/uk_UA/pgadmin3.po |   58 ++++++++++++++++----------------
i18n/ur_PK/pgadmin3.po |   81 ++++++++++++++++++++++++++-------------------
i18n/vi_VN/pgadmin3.po |   58 ++++++++++++++++----------------
i18n/zh_CN/pgadmin3.po |   74 +++++++++++++++++++++++++----------------
i18n/zh_TW/pgadmin3.po |   82 +++++++++++++++++++++++++++-------------------
45 files changed, 1994 insertions(+), 1466 deletions(-)

pgadmin-hackers by date

Next:From: Steffen KuhnDate: 2010-08-26 15:40:11
Subject: Ticket #223
Previous:From: Guillaume LelargeDate: 2010-08-26 15:01:57
Subject: pgAdmin III commit: Back to Unix endlines

Privacy Policy | About PostgreSQL
Copyright © 1996-2014 The PostgreSQL Global Development Group