Improve company translations, thanks to Roland

diff --git a/galette/lang/en_US.po b/galette/lang/en_US.po
index 6782ff19bea3792c6ca3061a3a0ada27d0993657..44ca2176a5b8cc686137f36c450bac4d4c9bd33a 100644 (file)
--- a/galette/lang/en_US.po
+++ b/galette/lang/en_US.po
@@ -882,6 +882,10 @@ msgstr "- Unknown payment type"
 msgid "SELECT operation not allowed"
 msgstr "SELECT operation not allowed"
 
+#: ../templates/default/configurer_fiche_content.tpl:54
+msgid "There is not yet any dynamic field configured for '%formname'"
+msgstr "There is not yet any dynamic field configured for '%formname'"
+
 #: ../ajouter_contribution.php:137
 msgid "An error occured checking overlaping fees :("
 msgstr "An error occured checking overlaping fees :("
@@ -2190,6 +2194,10 @@ msgstr "New password:"
 msgid "Title"
 msgstr "Title"
 
+#: ../templates/default/member.tpl:81
+msgid "Company name:"
+msgstr "Company name:"
+
 #: ../includes/i18n.inc.php:350
 msgid "french"
 msgstr "french"
@@ -2578,9 +2586,9 @@ msgstr "Check above errors to know what went wrong."
 msgid "Not a GIF file "
 msgstr "Not a GIF file "
 
-#: ../lib/Galette/Entity/Adherent.php:859
-msgid "- This E-Mail address is already used by another member!"
-msgstr "- This E-Mail address is already used by another member!"
+#: ../lib/Galette/Filters/MembersList.php:295
+msgid "Company name"
+msgstr "Company name"
 
 #: ../lib/Galette/Entity/Contribution.php:132
 #: ../templates/default/ajouter_contribution.tpl:92
@@ -3888,8 +3896,7 @@ msgstr "Send a mail"
 msgid "MSN"
 msgstr "MSN"
 
-#: ../includes/members_fields.php:77 ../templates/default/member.tpl:81
-#: ../templates/default/voir_adherent.tpl:67
+#: ../includes/members_fields.php:77 ../templates/default/voir_adherent.tpl:67
 msgid "Company:"
 msgstr "Company:"
 
@@ -4898,10 +4905,6 @@ msgstr "Missing required modules"
 msgid "Remove criteria"
 msgstr "Remove criteria"
 
-#: ../lib/Galette/Filters/MembersList.php:295
-msgid "Company"
-msgstr "Company"
-
 #: ../install/index.php:388
 msgid "PHP version %version"
 msgstr "PHP version %version"
@@ -5136,9 +5139,9 @@ msgstr "Default texts were successfully stored."
 msgid "Unable to attach contribution to transaction"
 msgstr "Unable to attach contribution to transaction"
 
-#: ../templates/default/configurer_fiche_content.tpl:54
-msgid "There is not yet any dynamic field configured for '%formname'"
-msgstr "There is not yet any dynamic field configured for '%formname'"
+#: ../lib/Galette/Entity/Adherent.php:859
+msgid "- This E-Mail address is already used by another member!"
+msgstr "- This E-Mail address is already used by another member!"
 
 #: ../templates/default/change_passwd.tpl:19
 msgid "Change my password"
@@ -5243,6 +5246,9 @@ msgstr "An error has occured while looking if status is already in use."
 msgid "Login %s does not exist"
 msgstr "Login %s does not exist"
 
+#~ msgid "Company"
+#~ msgstr "Company"
+
 #~ msgid "Mrs"
 #~ msgstr "Mrs"
 
@@ -5267,15 +5273,9 @@ msgstr "Login %s does not exist"
 #~ msgid "HTML display is not yet available. Sorry."
 #~ msgstr "HTML display is not yet available. Sorry."
 
-#~ msgid "Company name:"
-#~ msgstr "Company name:"
-
 #~ msgid "Miss."
 #~ msgstr "Miss."
 
-#~ msgid "Company name"
-#~ msgstr "Company name"
-
 #~ msgid "HTML display"
 #~ msgstr "HTML display"
 

diff --git a/galette/lang/en_US/LC_MESSAGES/galette.mo b/galette/lang/en_US/LC_MESSAGES/galette.mo
index 6014063fb79c3a33d9af00ea2e8163790f112310..a7e3b17893fb31b432d0a5833e876d7ae2843a61 100644 (file)
Binary files a/galette/lang/en_US/LC_MESSAGES/galette.mo and b/galette/lang/en_US/LC_MESSAGES/galette.mo differ

diff --git a/galette/lang/fr_FR.utf8.po b/galette/lang/fr_FR.utf8.po
index daa08602996d28356dd519c1646031538611705f..a6c6c44dd9079e1f0387dfcdc4e529676dc09e88 100644 (file)
--- a/galette/lang/fr_FR.utf8.po
+++ b/galette/lang/fr_FR.utf8.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2013-02-22 22:40+0100\n"
+"PO-Revision-Date: 2013-02-22 22:58+0100\n"
 "Last-Translator: \n"
 "Language-Team: French <kde-i18n-doc@kde.org>\n"
 "Language: fr\n"
@@ -899,6 +899,10 @@ msgstr "- Type de paiement inconnu"
 msgid "SELECT operation not allowed"
 msgstr "Opération SELECT non autorisée"
 
+#: ../templates/default/configurer_fiche_content.tpl:54
+msgid "There is not yet any dynamic field configured for '%formname'"
+msgstr "Il n'y a pas encore de champ dynamique configuré pour « %formname »"
+
 #: ../ajouter_contribution.php:137
 msgid "An error occured checking overlaping fees :("
 msgstr ""
@@ -2236,6 +2240,10 @@ msgstr "Nouveau mot de passe&nbsp;:"
 msgid "Title"
 msgstr "Titre"
 
+#: ../templates/default/member.tpl:81
+msgid "Company name:"
+msgstr "Raison sociale :"
+
 #: ../includes/i18n.inc.php:350
 msgid "french"
 msgstr "français"
@@ -2625,10 +2633,9 @@ msgstr "Consultez les erreurs ci-dessous pour savoir ce qui n'a pas été."
 msgid "Not a GIF file "
 msgstr "Pas un fichier GIF"
 
-#: ../lib/Galette/Entity/Adherent.php:859
-msgid "- This E-Mail address is already used by another member!"
-msgstr ""
-"- Cette adresse de courriel est déjà utilisée par un autre adhérent&nbsp;!"
+#: ../lib/Galette/Filters/MembersList.php:295
+msgid "Company name"
+msgstr "Raison sociale"
 
 #: ../lib/Galette/Entity/Contribution.php:132
 #: ../templates/default/ajouter_contribution.tpl:92
@@ -3948,10 +3955,9 @@ msgstr "Envoyer un courriel"
 msgid "MSN"
 msgstr "MSN"
 
-#: ../includes/members_fields.php:77 ../templates/default/member.tpl:81
-#: ../templates/default/voir_adherent.tpl:67
+#: ../includes/members_fields.php:77 ../templates/default/voir_adherent.tpl:67
 msgid "Company:"
-msgstr "Raison sociale"
+msgstr "Personne morale&nbsp;:"
 
 #: ../change_passwd.php:79
 msgid "Password changed for member '%s'."
@@ -4973,10 +4979,6 @@ msgstr "Modules requis manquants"
 msgid "Remove criteria"
 msgstr "Supprimer le critère"
 
-#: ../lib/Galette/Filters/MembersList.php:295
-msgid "Company"
-msgstr "Entreprise"
-
 #: ../install/index.php:388
 msgid "PHP version %version"
 msgstr "PHP version %version"
@@ -5213,9 +5215,10 @@ msgstr "Les textes par défaut ont été sauvegardés avec succès."
 msgid "Unable to attach contribution to transaction"
 msgstr "Impossible d'attacher la contribution à la transaction"
 
-#: ../templates/default/configurer_fiche_content.tpl:54
-msgid "There is not yet any dynamic field configured for '%formname'"
-msgstr "Il n'y a pas encore de champ dynamique configuré pour « %formname »"
+#: ../lib/Galette/Entity/Adherent.php:859
+msgid "- This E-Mail address is already used by another member!"
+msgstr ""
+"- Cette adresse de courriel est déjà utilisée par un autre adhérent&nbsp;!"
 
 #: ../templates/default/change_passwd.tpl:19
 msgid "Change my password"
@@ -5321,6 +5324,9 @@ msgstr ""
 msgid "Login %s does not exist"
 msgstr "L'identifiant %s n'existe pas"
 
+#~ msgid "Company"
+#~ msgstr "Entreprise"
+
 #~ msgid "Mrs"
 #~ msgstr "Madame"
 
@@ -5346,15 +5352,9 @@ msgstr "L'identifiant %s n'existe pas"
 #~ msgid "HTML display is not yet available. Sorry."
 #~ msgstr "La vue HTML n'est pas encore disponible. Désolés."
 
-#~ msgid "Company name:"
-#~ msgstr "Raison sociale :"
-
 #~ msgid "Miss."
 #~ msgstr "Mlle."
 
-#~ msgid "Company name"
-#~ msgstr "Raison sociale"
-
 #~ msgid "HTML display"
 #~ msgstr "Affichage HTML"
 

diff --git a/galette/lang/fr_FR.utf8/LC_MESSAGES/galette.mo b/galette/lang/fr_FR.utf8/LC_MESSAGES/galette.mo
index b5d21c90e6a9d483e489f8f0fc4e34ae11667e15..2a87cdfbf8fd2e9a28122745c6c310242393ee23 100644 (file)
Binary files a/galette/lang/fr_FR.utf8/LC_MESSAGES/galette.mo and b/galette/lang/fr_FR.utf8/LC_MESSAGES/galette.mo differ

diff --git a/galette/lang/lang_english.php b/galette/lang/lang_english.php
index a6bf03aa355407f0ad6e83aa926f5cb714509e63..6270999eada670f89ddf9635c64db48a96371847 100644 (file)
--- a/galette/lang/lang_english.php
+++ b/galette/lang/lang_english.php
@@ -1,10 +1,10 @@
 <?php
-// This file was automatically generated on Fri Feb 22 21:40:23 2013 (GMT)
+// This file was automatically generated on Fri Feb 22 21:58:41 2013 (GMT)
 // Don't modify it by hand, rather use the target lang from the Makefile.
 
 
-// ../lib/Galette/Core/Plugins.php:213 ../lib/Galette/Core/Plugins.php:217 
-$lang['Cannot deactivate plugin.'] = 'Cannot deactivate plugin.';
+// ../templates/default/member.tpl:81 
+$lang['Company name:'] = 'Company name:';
 
 // ../lib/Galette/Entity/DynamicFields.php:111 
 $lang['all'] = 'all';
@@ -693,6 +693,9 @@ $lang['Account activity'] = 'Account activity';
 // ../templates/default/voir_adherent.tpl:254 
 $lang['Last modification date:'] = 'Last modification date:';
 
+// ../lib/Galette/Filters/MembersList.php:295 
+$lang['Company name'] = 'Company name';
+
 // ../lib/Galette/IO/Pdf.php:184 
 $lang['Missing or incorrect image file '] = 'Missing or incorrect image file ';
 
@@ -1152,7 +1155,7 @@ $lang['-- Choose a staff member --'] = '-- Choose a staff member --';
 // ../templates/default/editer_champ.tpl:18 
 $lang['Required:'] = 'Required:';
 
-// ../includes/members_fields.php:77 ../templates/default/member.tpl:81 ../templates/default/voir_adherent.tpl:67 
+// ../includes/members_fields.php:77 ../templates/default/voir_adherent.tpl:67 
 $lang['Company:'] = 'Company:';
 
 // ../templates/default/advanced_search.tpl:182 
@@ -1221,6 +1224,9 @@ $lang['Member of \'%groupname\''] = 'Member of \'%groupname\'';
 // ../install/index.php:338 
 $lang['Your current Galette version is'] = 'Your current Galette version is';
 
+// ../lib/Galette/Core/Plugins.php:213 ../lib/Galette/Core/Plugins.php:217 
+$lang['Cannot deactivate plugin.'] = 'Cannot deactivate plugin.';
+
 // ../templates/default/preferences.tpl:227 
 $lang['Use TLS for SMTP?'] = 'Use TLS for SMTP?';
 
@@ -1629,8 +1635,8 @@ $lang['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified
 // ../templates/default/preferences.tpl:238 
 $lang['SMTP (or GMail) password:'] = 'SMTP (or GMail) password:';
 
-// ../templates/default/ajax_plugins_initdb.tpl:14 
-$lang['You\'re installing \'%name\' plugin for the first time, or you wish to erase an older version of the plugin without keeping your data'] = 'You\'re installing \'%name\' plugin for the first time, or you wish to erase an older version of the plugin without keeping your data';
+// ../templates/default/ajouter_transaction.tpl:54 ../templates/default/gestion_contributions.tpl:138 
+$lang['Duration'] = 'Duration';
 
 // ../templates/default/gestion_adherents.tpl:32 ../templates/default/advanced_search.tpl:40 
 $lang['Without'] = 'Without';
@@ -2019,8 +2025,8 @@ $lang['Galette requires at least PHP version %ver!'] = 'Galette requires at leas
 // ../templates/default/voir_adherent.tpl:15 
 $lang['New password'] = 'New password';
 
-// ../lib/Galette/Entity/Adherent.php:859 
-$lang['- This E-Mail address is already used by another member!'] = '- This E-Mail address is already used by another member!';
+// ../templates/default/preferences.tpl:311 ../templates/default/preferences.tpl:312 ../templates/default/preferences.tpl:317 ../templates/default/preferences.tpl:318 ../templates/default/preferences.tpl:322 ../templates/default/preferences.tpl:323 ../templates/default/preferences.tpl:327 ../templates/default/preferences.tpl:328 
+$lang['Hexadecimal color notation: #RRGGBB'] = 'Hexadecimal color notation: #RRGGBB';
 
 // ../includes/i18n.inc.php:350 
 $lang['french'] = 'french';
@@ -2073,8 +2079,8 @@ $lang['Transactions'] = 'Transactions';
 // ../lib/Galette/IO/Charts.php:228 
 $lang['Up to date'] = 'Up to date';
 
-// ../templates/default/preferences.tpl:311 ../templates/default/preferences.tpl:312 ../templates/default/preferences.tpl:317 ../templates/default/preferences.tpl:318 ../templates/default/preferences.tpl:322 ../templates/default/preferences.tpl:323 ../templates/default/preferences.tpl:327 ../templates/default/preferences.tpl:328 
-$lang['Hexadecimal color notation: #RRGGBB'] = 'Hexadecimal color notation: #RRGGBB';
+// ../lib/Galette/Entity/Adherent.php:859 
+$lang['- This E-Mail address is already used by another member!'] = '- This E-Mail address is already used by another member!';
 
 // ../gestion_textes.php:89 
 $lang['Email: \'%s\' has been successfully modified.'] = 'Email: \'%s\' has been successfully modified.';
@@ -2544,8 +2550,8 @@ $lang['File upload stopped by extension'] = 'File upload stopped by extension';
 // ../includes/i18n.inc.php:351 
 $lang['english'] = 'english';
 
-// ../templates/default/ajouter_transaction.tpl:54 ../templates/default/gestion_contributions.tpl:138 
-$lang['Duration'] = 'Duration';
+// ../templates/default/configurer_fiche_content.tpl:54 
+$lang['There is not yet any dynamic field configured for \'%formname\''] = 'There is not yet any dynamic field configured for \'%formname\'';
 
 // ../templates/default/page.tpl:113 
 $lang['Perform advanced search into members list'] = 'Perform advanced search into members list';
@@ -2775,9 +2781,6 @@ $lang['Select contributor and contribution type'] = 'Select contributor and cont
 // ../templates/default/preferences.tpl:151 
 $lang['Self subscription enabled?'] = 'Self subscription enabled?';
 
-// ../templates/default/configurer_fiche_content.tpl:54 
-$lang['There is not yet any dynamic field configured for \'%formname\''] = 'There is not yet any dynamic field configured for \'%formname\'';
-
 // ../templates/default/preferences.tpl:6 
 $lang['Parameters'] = 'Parameters';
 
@@ -3093,9 +3096,6 @@ $lang['directory_name'] = 'directory_name';
 // ../templates/default/history.tpl:47 
 $lang['User'] = 'User';
 
-// ../lib/Galette/Filters/MembersList.php:295 
-$lang['Company'] = 'Company';
-
 // ../templates/default/gestion_mailings.tpl:91 
 $lang['Use mailing \'%subject\' as a template for a new one'] = 'Use mailing \'%subject\' as a template for a new one';
 
@@ -3213,6 +3213,9 @@ $lang['New member has been successfully added.'] = 'New member has been successf
 // ../includes/i18n.inc.php:346 
 $lang['Company cotisation'] = 'Company cotisation';
 
+// ../templates/default/ajax_plugins_initdb.tpl:14 
+$lang['You\'re installing \'%name\' plugin for the first time, or you wish to erase an older version of the plugin without keeping your data'] = 'You\'re installing \'%name\' plugin for the first time, or you wish to erase an older version of the plugin without keeping your data';
+
 // ../install/index.php:410 
 $lang['Date settings'] = 'Date settings';
 

diff --git a/galette/lang/lang_french.php b/galette/lang/lang_french.php
index 939fc88e8a557a2154aa2760f5e764f8997cc933..2b3e581d2508656d0862155a7c74242f900e41b9 100644 (file)
--- a/galette/lang/lang_french.php
+++ b/galette/lang/lang_french.php
@@ -1,10 +1,10 @@
 <?php
-// This file was automatically generated on Fri Feb 22 21:40:24 2013 (GMT)
+// This file was automatically generated on Fri Feb 22 21:58:42 2013 (GMT)
 // Don't modify it by hand, rather use the target lang from the Makefile.
 
 
-// ../lib/Galette/Core/Plugins.php:213 ../lib/Galette/Core/Plugins.php:217 
-$lang['Cannot deactivate plugin.'] = 'Impossible de désactiver le plugin.';
+// ../templates/default/member.tpl:81 
+$lang['Company name:'] = 'Raison sociale :';
 
 // ../lib/Galette/Entity/DynamicFields.php:111 
 $lang['all'] = 'tous';
@@ -693,6 +693,9 @@ $lang['Account activity'] = 'Activité du compte';
 // ../templates/default/voir_adherent.tpl:254 
 $lang['Last modification date:'] = 'Date de dernière modification&nbsp;:';
 
+// ../lib/Galette/Filters/MembersList.php:295 
+$lang['Company name'] = 'Raison sociale';
+
 // ../lib/Galette/IO/Pdf.php:184 
 $lang['Missing or incorrect image file '] = 'Fichier d\'image manquant ou incorrect ';
 
@@ -1152,8 +1155,8 @@ $lang['-- Choose a staff member --'] = '-- Choisissez un membre du bureau --';
 // ../templates/default/editer_champ.tpl:18 
 $lang['Required:'] = 'Obligatoire&nbsp;:';
 
-// ../includes/members_fields.php:77 ../templates/default/member.tpl:81 ../templates/default/voir_adherent.tpl:67 
-$lang['Company:'] = 'Raison sociale';
+// ../includes/members_fields.php:77 ../templates/default/voir_adherent.tpl:67 
+$lang['Company:'] = 'Personne morale&nbsp;:';
 
 // ../templates/default/advanced_search.tpl:182 
 $lang['starts with'] = 'commence par';
@@ -1221,6 +1224,9 @@ $lang['Member of \'%groupname\''] = 'Membre de « %groupname »';
 // ../install/index.php:338 
 $lang['Your current Galette version is'] = 'Votre version actuelle de Galette est la';
 
+// ../lib/Galette/Core/Plugins.php:213 ../lib/Galette/Core/Plugins.php:217 
+$lang['Cannot deactivate plugin.'] = 'Impossible de désactiver le plugin.';
+
 // ../templates/default/preferences.tpl:227 
 $lang['Use TLS for SMTP?'] = 'Utiliser TLS pour SMPT&nbsp;?';
 
@@ -1629,8 +1635,8 @@ $lang['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified
 // ../templates/default/preferences.tpl:238 
 $lang['SMTP (or GMail) password:'] = 'Mot de passe SMTP (ou GMail)&nbsp;:';
 
-// ../templates/default/ajax_plugins_initdb.tpl:14 
-$lang['You\'re installing \'%name\' plugin for the first time, or you wish to erase an older version of the plugin without keeping your data'] = 'Vous installez le plugin « %name » pour la première fois, ou vous souhaitez écraser une ancienne version du plugin sans conserver vos données';
+// ../templates/default/ajouter_transaction.tpl:54 ../templates/default/gestion_contributions.tpl:138 
+$lang['Duration'] = 'Durée';
 
 // ../templates/default/gestion_adherents.tpl:32 ../templates/default/advanced_search.tpl:40 
 $lang['Without'] = 'Sans';
@@ -2019,8 +2025,8 @@ $lang['Galette requires at least PHP version %ver!'] = 'Galette requiert PHP en
 // ../templates/default/voir_adherent.tpl:15 
 $lang['New password'] = 'Nouveau Mot de passe';
 
-// ../lib/Galette/Entity/Adherent.php:859 
-$lang['- This E-Mail address is already used by another member!'] = '- Cette adresse de courriel est déjà utilisée par un autre adhérent&nbsp;!';
+// ../templates/default/preferences.tpl:311 ../templates/default/preferences.tpl:312 ../templates/default/preferences.tpl:317 ../templates/default/preferences.tpl:318 ../templates/default/preferences.tpl:322 ../templates/default/preferences.tpl:323 ../templates/default/preferences.tpl:327 ../templates/default/preferences.tpl:328 
+$lang['Hexadecimal color notation: #RRGGBB'] = 'Notation de couleur hexadécimale : #RRVVBB';
 
 // ../includes/i18n.inc.php:350 
 $lang['french'] = 'français';
@@ -2073,8 +2079,8 @@ $lang['Transactions'] = 'Transactions';
 // ../lib/Galette/IO/Charts.php:228 
 $lang['Up to date'] = 'À jour';
 
-// ../templates/default/preferences.tpl:311 ../templates/default/preferences.tpl:312 ../templates/default/preferences.tpl:317 ../templates/default/preferences.tpl:318 ../templates/default/preferences.tpl:322 ../templates/default/preferences.tpl:323 ../templates/default/preferences.tpl:327 ../templates/default/preferences.tpl:328 
-$lang['Hexadecimal color notation: #RRGGBB'] = 'Notation de couleur hexadécimale : #RRVVBB';
+// ../lib/Galette/Entity/Adherent.php:859 
+$lang['- This E-Mail address is already used by another member!'] = '- Cette adresse de courriel est déjà utilisée par un autre adhérent&nbsp;!';
 
 // ../gestion_textes.php:89 
 $lang['Email: \'%s\' has been successfully modified.'] = 'Le courriel « %s » a été modifié avec succès.';
@@ -2544,8 +2550,8 @@ $lang['File upload stopped by extension'] = 'L\'envoi du fichier a été stoppé
 // ../includes/i18n.inc.php:351 
 $lang['english'] = 'anglais';
 
-// ../templates/default/ajouter_transaction.tpl:54 ../templates/default/gestion_contributions.tpl:138 
-$lang['Duration'] = 'Durée';
+// ../templates/default/configurer_fiche_content.tpl:54 
+$lang['There is not yet any dynamic field configured for \'%formname\''] = 'Il n\'y a pas encore de champ dynamique configuré pour « %formname »';
 
 // ../templates/default/page.tpl:113 
 $lang['Perform advanced search into members list'] = 'Effectuer une recherche avancée dans la liste des membres';
@@ -2775,9 +2781,6 @@ $lang['Select contributor and contribution type'] = 'Sélectionnez le contribute
 // ../templates/default/preferences.tpl:151 
 $lang['Self subscription enabled?'] = 'Auto-Enregistrement actif&nbsp;?';
 
-// ../templates/default/configurer_fiche_content.tpl:54 
-$lang['There is not yet any dynamic field configured for \'%formname\''] = 'Il n\'y a pas encore de champ dynamique configuré pour « %formname »';
-
 // ../templates/default/preferences.tpl:6 
 $lang['Parameters'] = 'Paramètres';
 
@@ -3093,9 +3096,6 @@ $lang['directory_name'] = 'nom_dossier';
 // ../templates/default/history.tpl:47 
 $lang['User'] = 'Utilisateur';
 
-// ../lib/Galette/Filters/MembersList.php:295 
-$lang['Company'] = 'Entreprise';
-
 // ../templates/default/gestion_mailings.tpl:91 
 $lang['Use mailing \'%subject\' as a template for a new one'] = 'Utiliser le mailing « %subject » comme template pour en créer un nouveau';
 
@@ -3213,6 +3213,9 @@ $lang['New member has been successfully added.'] = 'Le nouvel adhérent a été
 // ../includes/i18n.inc.php:346 
 $lang['Company cotisation'] = 'Cotisation personne morale';
 
+// ../templates/default/ajax_plugins_initdb.tpl:14 
+$lang['You\'re installing \'%name\' plugin for the first time, or you wish to erase an older version of the plugin without keeping your data'] = 'Vous installez le plugin « %name » pour la première fois, ou vous souhaitez écraser une ancienne version du plugin sans conserver vos données';
+
 // ../install/index.php:410 
 $lang['Date settings'] = 'Paramètres de date';
 

diff --git a/galette/lang/messages.po b/galette/lang/messages.po
index 1e7d23d70c683be45715fc4129dfbc640f2b0038..21ed22d5367cebfa182cf865fbd6e52261016ef6 100644 (file)
--- a/galette/lang/messages.po
+++ b/galette/lang/messages.po
@@ -788,6 +788,10 @@ msgstr ""
 msgid "SELECT operation not allowed"
 msgstr ""
 
+#: ../templates/default/configurer_fiche_content.tpl:54
+msgid "There is not yet any dynamic field configured for '%formname'"
+msgstr ""
+
 #: ../ajouter_contribution.php:137
 msgid "An error occured checking overlaping fees :("
 msgstr ""
@@ -1987,6 +1991,10 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
+#: ../templates/default/member.tpl:81
+msgid "Company name:"
+msgstr ""
+
 #: ../includes/i18n.inc.php:350
 msgid "french"
 msgstr ""
@@ -2351,8 +2359,8 @@ msgstr ""
 msgid "Not a GIF file "
 msgstr ""
 
-#: ../lib/Galette/Entity/Adherent.php:859
-msgid "- This E-Mail address is already used by another member!"
+#: ../lib/Galette/Filters/MembersList.php:295
+msgid "Company name"
 msgstr ""
 
 #: ../lib/Galette/Entity/Contribution.php:132 ../templates/default/ajouter_contribution.tpl:92
@@ -3505,8 +3513,7 @@ msgstr ""
 msgid "MSN"
 msgstr ""
 
-#: ../includes/members_fields.php:77 ../templates/default/member.tpl:81
-#: ../templates/default/voir_adherent.tpl:67
+#: ../includes/members_fields.php:77 ../templates/default/voir_adherent.tpl:67
 msgid "Company:"
 msgstr ""
 
@@ -4414,10 +4421,6 @@ msgstr ""
 msgid "Remove criteria"
 msgstr ""
 
-#: ../lib/Galette/Filters/MembersList.php:295
-msgid "Company"
-msgstr ""
-
 #: ../install/index.php:388
 msgid "PHP version %version"
 msgstr ""
@@ -4632,8 +4635,8 @@ msgstr ""
 msgid "Unable to attach contribution to transaction"
 msgstr ""
 
-#: ../templates/default/configurer_fiche_content.tpl:54
-msgid "There is not yet any dynamic field configured for '%formname'"
+#: ../lib/Galette/Entity/Adherent.php:859
+msgid "- This E-Mail address is already used by another member!"
 msgstr ""
 
 #: ../templates/default/change_passwd.tpl:19

diff --git a/galette/lib/Galette/Filters/MembersList.php b/galette/lib/Galette/Filters/MembersList.php
index b6afa299cfcb3d24722a5117df53b4accd2720a8..d1ca117562caf38d35c8483fde088f3d619d56cb 100644 (file)
--- a/galette/lib/Galette/Filters/MembersList.php
+++ b/galette/lib/Galette/Filters/MembersList.php
@@ -292,7 +292,7 @@ class MembersList extends Pagination
             'filter_field_options',
             array(
                 Members::FILTER_NAME            => _T("Name"),
-                Members::FILTER_COMPANY_NAME    => _T("Company"),
+                Members::FILTER_COMPANY_NAME    => _T("Company name"),
                 Members::FILTER_ADRESS          => _T("Address"),
                 Members::FILTER_MAIL            => _T("Email,URL,IM"),
                 Members::FILTER_JOB             => _T("Job"),

diff --git a/galette/templates/default/member.tpl b/galette/templates/default/member.tpl
index 9d46d0e4be782e9542d830d1e6d0e43b7b3151f5..3b7326ac5b3aca0a72634ce2bdbce124a0ff55f9 100644 (file)
--- a/galette/templates/default/member.tpl
+++ b/galette/templates/default/member.tpl
@@ -78,7 +78,7 @@
                         <input type="checkbox" name="is_company" id="is_company" value="1"{if $member->isCompany()} checked="checked"{/if}/>
                     </p>
                     <p id="company_field"{if !$member->isCompany()} class="hidden"{/if}>
-                        <label for="societe_adh" class="bline">{_T string="Company:"}</label>
+                        <label for="societe_adh" class="bline">{_T string="Company name:"}</label>
                         <input type="text" name="societe_adh" id="societe_adh" value="{$member->company_name}" maxlength="200"{if isset($disabled.societe_adh)} {$disabled.societe_adh}{/if}{if isset($required.societe_adh) and $required.societe_adh eq 1} required{/if}/>
                     </p>
     {else}