Merge branch '3.7-transifex' of github.com:GPCsolutions/dolibarr into

GPCsolutions-3.7-transifex

Conflicts:
	htdocs/langs/pt_BR/oscommerce.lang

.tx/config

@@ -218,12 +218,6 @@ source_file = htdocs/langs/en_US/orders.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.oscommerce]
-file_filter = htdocs/langs/<lang>/oscommerce.lang
-source_file = htdocs/langs/en_US/oscommerce.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.other]
 file_filter = htdocs/langs/<lang>/other.lang
 source_file = htdocs/langs/en_US/other.lang
@@ -242,9 +236,9 @@ source_file = htdocs/langs/en_US/paypal.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.products]
-file_filter = htdocs/langs/<lang>/products.lang
-source_file = htdocs/langs/en_US/products.lang
+[dolibarr.printipp]
+file_filter = htdocs/langs/<lang>/printipp.lang
+source_file = htdocs/langs/en_US/printipp.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
@@ -254,6 +248,12 @@ source_file = htdocs/langs/en_US/productbatch.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.products]
+file_filter = htdocs/langs/<lang>/products.lang
+source_file = htdocs/langs/en_US/products.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.projects]
 file_filter = htdocs/langs/<lang>/projects.lang
 source_file = htdocs/langs/en_US/projects.lang
@@ -325,4 +325,3 @@ file_filter = htdocs/langs/<lang>/workflow.lang
 source_file = htdocs/langs/en_US/workflow.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
-

htdocs/langs/ar_SA/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=نظام التشغيل والتجارة
-OSCommerceSetup=نظام تشغيل وحدة التجارة الإعداد
-OSCommerceSetupSaved=التجارة إعداد نظام التشغيل الموفرة
-OSCommerceServer=نظام تشغيل الخادم المضيف التجارة / الملكية الفكرية
-OSCommerceDatabaseName=اسم قاعدة بيانات نظام التشغيل والتجارة
-OSCommercePrefix=نظام التشغيل التجاري بادئة الجداول
-OSCommerceUser=قاعدة بيانات التجارة ادخل نظام التشغيل

htdocs/langs/bg_BG/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce модул за настройка
-OSCommerceSetupSaved=OS Commerce настройка спаси
-OSCommerceServer=OS Commerce хост сървъра / IP
-OSCommerceDatabaseName=OS Commerce името на базата данни
-OSCommercePrefix=OS Commerce таблици префикс
-OSCommerceUser=OS Commerce база данни за вход

htdocs/langs/bs_BA/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce podešavanje modula
-OSCommerceSetupSaved=OS Commerce postavke snimljene
-OSCommerceServer=OS Commerce server host / IP
-OSCommerceDatabaseName=OS Commerce ime baze podataka
-OSCommercePrefix=OS Commerce prefiks tabela
-OSCommerceUser=OS Commerce login baze podataka

htdocs/langs/ca_ES/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=Configuració del mòdul OS Commerce
-OSCommerceSetupSaved=Configuració OS Commerce desada
-OSCommerceServer=Nom/IP servidor de la base de dades OS commerce
-OSCommerceDatabaseName=Nom de la base de dades OS Commerce
-OSCommercePrefix=Prefix taules OS Commerce
-OSCommerceUser=Usuari de la base de dades OS Commerce

htdocs/langs/cs_CZ/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce modul nastavení
-OSCommerceSetupSaved=OS Commerce nastavení uloží
-OSCommerceServer=OS Commerce Server host / ip
-OSCommerceDatabaseName=OS Commerce název databáze
-OSCommercePrefix=OS Commerce tabulky prefix
-OSCommerceUser=OS Commerce databáze login

htdocs/langs/da_DK/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce modul opsætning
-OSCommerceSetupSaved=OS Commerce opsætning gemmes
-OSCommerceServer=OS Commerce Server host / ip
-OSCommerceDatabaseName=OS Commerce databasenavn
-OSCommercePrefix=OS Commerce tabeller præfiks
-OSCommerceUser=OS Commerce database login

htdocs/langs/de_AT/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce

htdocs/langs/de_DE/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OSCommerce
-OSCommerceSetup=OSCommerce-Modul Einstellungen
-OSCommerceSetupSaved=OSCommerce-Einstellungen gespeichert
-OSCommerceServer=OSCommerce Server Host/IP
-OSCommerceDatabaseName=OSCommerce Datenbankname
-OSCommercePrefix=OSCommerce Tabellen-Präfix
-OSCommerceUser=OSCommerce Datenbank Login

htdocs/langs/el_GR/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce εγκατάσταση μονάδας
-OSCommerceSetupSaved=OS Commerce setup saved
-OSCommerceServer=OS Commerce server host/ip
-OSCommerceDatabaseName=OS Commerce database name
-OSCommercePrefix=OS Commerce tables prefix
-OSCommerceUser=OS Commerce database login

htdocs/langs/en_US/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce module setup
-OSCommerceSetupSaved=OS Commerce setup saved
-OSCommerceServer=OS Commerce server host/ip
-OSCommerceDatabaseName=OS Commerce database name
-OSCommercePrefix=OS Commerce tables prefix
-OSCommerceUser=OS Commerce database login

htdocs/langs/es_ES/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=Configuración del módulo OS Commerce
-OSCommerceSetupSaved=Configuración OS Commerce guardada
-OSCommerceServer=Nombre/IP servidor de la base de datos OS commerce
-OSCommerceDatabaseName=Nombre de la base de datos OS Commerce
-OSCommercePrefix=Prefijo tablas OS Commerce
-OSCommerceUser=Usuario de la base de datos OS Commerce

htdocs/langs/et_EE/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OSCommerce
-OSCommerceSetup=OSCommerce mooduli seadistamine
-OSCommerceSetupSaved=OSCommercei seadistus salvestatud
-OSCommerceServer=OSCommerce serveri host/IP
-OSCommerceDatabaseName=OSCommercei andmebaasi nimi
-OSCommercePrefix=OSCommercei tabelite prefiks
-OSCommerceUser=OSCommercei andmebaasi kasutajanimi

htdocs/langs/eu_ES/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-# OSCommerce=OS Commerce
-# OSCommerceSetup=OS Commerce module setup
-# OSCommerceSetupSaved=OS Commerce setup saved
-# OSCommerceServer=OS Commerce server host/ip
-# OSCommerceDatabaseName=OS Commerce database name
-# OSCommercePrefix=OS Commerce tables prefix
-# OSCommerceUser=OS Commerce database login

htdocs/langs/fa_IR/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=نظام التشغيل والتجارة
-OSCommerceSetup=نظام تشغيل وحدة التجارة الإعداد
-OSCommerceSetupSaved=التجارة إعداد نظام التشغيل الموفرة
-OSCommerceServer=نظام تشغيل الخادم المضيف التجارة / الملكية الفكرية
-OSCommerceDatabaseName=اسم قاعدة بيانات نظام التشغيل والتجارة
-OSCommercePrefix=نظام التشغيل التجاري بادئة الجداول
-OSCommerceUser=قاعدة بيانات التجارة ادخل نظام التشغيل

htdocs/langs/fi_FI/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce moduulin asetukset
-OSCommerceSetupSaved=OS Commerce asetukset tallennetaan
-OSCommerceServer=OS Commerce Server isännän / ip
-OSCommerceDatabaseName=OS Commerce tietokannan nimi
-OSCommercePrefix=OS Commerce taulukot etuliite
-OSCommerceUser=OS Commerce tietokanta sisäänkirjoittautumissivuksesi

htdocs/langs/fr_FR/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=Configuration du module OS Commerce
-OSCommerceSetupSaved=Configuration OS Commerce sauvegardée
-OSCommerceServer=Nom d'hôte / adresse IP serveur base de données OS Commerce
-OSCommerceDatabaseName=Nom base de données OS Commerce
-OSCommercePrefix=Préfixe tables base de données OS Commerce
-OSCommerceUser=Identifiant d'accès base de données OS Commerce

htdocs/langs/he_IL/oscommerce.lang

-# Dolibarr language file - Source file is en_US - oscommerce
-# OSCommerce=OS Commerce
-# OSCommerceSetup=OS Commerce module setup
-# OSCommerceSetupSaved=OS Commerce setup saved
-# OSCommerceServer=OS Commerce server host/ip
-# OSCommerceDatabaseName=OS Commerce database name
-# OSCommercePrefix=OS Commerce tables prefix
-# OSCommerceUser=OS Commerce database login