dolibarr/htdocs/langs
Laurent Destailleur cf0f458a51 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/en_GB/bills.lang
	htdocs/langs/en_GB/main.lang
	htdocs/langs/en_GB/orders.lang
	htdocs/langs/es_AR/bills.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/main.lang
	htdocs/langs/es_ES/bills.lang
	htdocs/langs/es_ES/projects.lang
	htdocs/langs/fa_IR/categories.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/other.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/nb_NO/bills.lang
	htdocs/langs/pl_PL/bills.lang
	htdocs/langs/pl_PL/mails.lang
	htdocs/langs/pl_PL/projects.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/products.lang
	htdocs/langs/ro_RO/projects.lang
	htdocs/langs/ru_RU/bills.lang
	htdocs/langs/ru_RU/projects.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/tr_TR/bills.lang
	htdocs/langs/tr_TR/projects.lang
	htdocs/langs/vi_VN/bills.lang
2015-04-02 13:57:20 +02:00
..
ar_SA Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
bg_BG Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
bn_BD Sync transifex 2015-03-18 15:27:27 +01:00
bs_BA Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
ca_ES Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
cs_CZ Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
da_DK Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
de_AT Sync from transifex 2015-04-02 13:28:20 +02:00
de_CH Enhance tools to make transifex sync 2015-03-14 02:37:18 +01:00
de_DE Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
el_GR Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
en_AU Sync transifex 2015-03-18 15:27:27 +01:00
en_CA Sync transifex 2015-03-18 15:27:27 +01:00
en_GB Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
en_IN Sync transifex 2015-03-18 15:27:27 +01:00
en_NZ Sync transifex 2015-03-18 15:27:27 +01:00
en_SA Sync transifex 2015-03-18 15:27:27 +01:00
en_US Correct source lang 2015-04-02 12:55:44 +02:00
en_ZA Sync transifex 2015-03-18 15:27:27 +01:00
es_AR Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
es_CL Sync transifex 2015-03-13 22:02:53 +01:00
es_CO Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
es_DO Sync transifex 2015-03-13 22:02:53 +01:00
es_ES Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
es_HN Sync transifex 2015-03-13 22:02:53 +01:00
es_MX Sync transifex 2015-03-13 22:02:53 +01:00
es_PE Sync transifex 2015-03-13 22:02:53 +01:00
es_PR Sync transifex 2015-03-13 22:02:53 +01:00
es_PY Sync transifex 2015-03-13 22:02:53 +01:00
et_EE Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
eu_ES Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
fa_IR Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
fi_FI Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
fr_BE Sync transifex 2015-03-13 22:02:53 +01:00
fr_CA Sync transifex 2015-03-13 22:02:53 +01:00
fr_CH Sync transifex 2015-03-13 22:02:53 +01:00
fr_FR Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
fr_NC Sync transifex 2015-03-13 22:02:53 +01:00
he_IL Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
hr_HR Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
hu_HU Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
id_ID Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
is_IS Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
it_IT Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
ja_JP Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
ka_GE Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
kn_IN Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
ko_KR Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
lo_LA Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
lt_LT Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
lv_LV Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
mk_MK Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
nb_NO Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
nl_BE Enhance tools to make transifex sync 2015-03-14 02:37:18 +01:00
nl_NL Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
pl_PL Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
pt_BR Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
pt_PT Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
ro_RO Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
ru_RU Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
ru_UA Sync from transifex 2015-04-02 13:28:20 +02:00
sk_SK Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
sl_SI Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
sq_AL Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
sv_SE Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
sw_SW Sync from transifex 2015-04-02 13:28:20 +02:00
th_TH Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
tr_TR Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
uk_UA Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
uz_UZ Sync from transifex 2015-04-02 13:28:20 +02:00
vi_VN Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
zh_CN Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
zh_TW Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
HOWTO-Translation.txt Works on merge pdf with encryption 2011-11-12 09:23:54 +01:00