From d6984e713354848fa90f79135fd5d10e0a70e875 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 1 Jun 2010 21:39:38 +0000
Subject: [PATCH] A better label

---
 htdocs/contact/fiche.php          | 6 +++---
 htdocs/langs/en_US/companies.lang | 2 +-
 htdocs/langs/en_US/languages.lang | 3 ++-
 htdocs/langs/en_US/main.lang      | 2 +-
 htdocs/langs/fr_FR/companies.lang | 2 +-
 htdocs/langs/fr_FR/languages.lang | 3 ++-
 htdocs/langs/fr_FR/main.lang      | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 0dcf35d3f60..d591246b10b 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -110,7 +110,7 @@ if ($_POST["action"] == 'add' && $user->rights->societe->contact->creer)
 
     if (! $_POST["name"])
     {
-        array_push($error,$langs->trans("ErrorFieldRequired",$langs->trans("Lastname")));
+        array_push($error,$langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname").' / '.$langs->transnoentities("Label")));
         $_GET["action"]="create";
     }
 
@@ -270,8 +270,8 @@ if ($user->rights->societe->contact->creer)
 		print '<table class="border" width="100%">';
 
 		// Name
-		print '<tr><td width="15%" class="fieldrequired">'.$langs->trans("Lastname").'</td><td><input name="name" type="text" size="20" maxlength="80" value="'.$contact->name.'"></td>';
-		print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="25%"><input name="firstname" type="text" size="15" maxlength="80" value="'.$contact->firstname.'"></td></tr>';
+		print '<tr><td width="15%" class="fieldrequired">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</td><td><input name="name" type="text" size="30" maxlength="80" value="'.$contact->name.'"></td>';
+		print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="25%"><input name="firstname" type="text" size="30" maxlength="80" value="'.$contact->firstname.'"></td></tr>';
 
 		// Company
 		if ($socid)
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 025cdc80171..baa2ad70538 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -157,7 +157,7 @@ AvailableGlobalDiscounts=Absolute discounts available
 DiscountNone=None
 Supplier=Supplier
 CompanyList=Companie's list
-AddContact=Add contact
+AddContact=Add contact/address
 Contact=Contact
 NoContactDefined=No contact defined for this third party
 DefaultContact=Default contact
diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
index 178f62333ce..29c49cc7d69 100644
--- a/htdocs/langs/en_US/languages.lang
+++ b/htdocs/langs/en_US/languages.lang
@@ -23,4 +23,5 @@ Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
-Language_tr_TR=Turkish
\ No newline at end of file
+Language_tr_TR=Turkish
+Language_sl_SL=Slovenian
\ No newline at end of file
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 44166666ac5..fd0772f2aa6 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -313,7 +313,7 @@ ActionRunningNotStarted=Not started
 ActionRunningShort=Started
 ActionDoneShort=Finished
 CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts for this third party
+ContactsForCompany=Contacts/adresses for this third party
 ActionsOnCompany=Actions about this third party
 NActions=%s actions
 NActionsLate=%s late
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 46b3b0a3539..4da95b4e3af 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -162,7 +162,7 @@ AvailableGlobalDiscounts=Remises fixes disponibles
 DiscountNone=Aucune
 Supplier=Fournisseur
 CompanyList=Liste des sociétés
-AddContact=Créer contact
+AddContact=Créer contact/adresse
 Contact=Contact
 NoContactDefined=Aucun contact défini pour ce tiers
 DefaultContact=Contact par défaut
diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang
index 8a53ac4412c..21e8ab5f43d 100644
--- a/htdocs/langs/fr_FR/languages.lang
+++ b/htdocs/langs/fr_FR/languages.lang
@@ -23,4 +23,5 @@ Language_pt_BR=Portugais (Brésil)
 Language_pt_PT=Portugais
 Language_ro_RO=Roumain
 Language_ru_RU=Russe
-Language_tr_TR=Turque
\ No newline at end of file
+Language_tr_TR=Turque
+Language_sl_SL=Slovène
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 70e6fcc6f7f..3267ac3f2d3 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -311,7 +311,7 @@ ActionRunningNotStarted=Non commencé
 ActionRunningShort=En cours
 ActionDoneShort=Terminé
 CompanyFoundation=Société ou institution
-ContactsForCompany=Contacts de ce tiers
+ContactsForCompany=Contacts/adresses de ce tiers
 ActionsOnCompany=Actions vis à vis de ce tiers
 NActions=%s actions
 NActionsLate=%s en retard