Merge branch 'master' of github.com:hillelcoren/invoice-ninja

app/lang/fr/texts.php

@@ -9,7 +9,7 @@ return array(
   'work_phone' => 'Téléphone',
   'address' => 'Adresse',
   'address1' => 'Rue',
-  'address2' => 'Appt/Batîment',
+  'address2' => 'Appt/Batiment',
   'city' => 'Ville',
   'state' => 'Région/Département',
   'postal_code' => 'Code Postal',
@@ -69,7 +69,7 @@ return array(
   'delete_invoice' => 'Supprimer la facture',
   'email_invoice' => 'Envoir la facture par email',
   'enter_payment' => 'Saisissez un paiement',
-  'tax_rates' => 'Taux d\'imposition',
+  'tax_rates' => 'Taux de taxe',
   'rate' => 'Taux',
   'settings' => 'Paramètres',
   'enable_invoice_tax' => 'Spécifier une <br>taxe pour la facture</b>',
@@ -123,41 +123,41 @@ return array(
   'average_invoice' => 'Moyenne de facturation',
   
   // list pages
-  'archive' => 'Archive',
-  'delete' => 'Delete',
-  'archive_client' => 'Archive client',
-  'delete_client' => 'Delete client',
-  'archive_payment' => 'Archive payment',
-  'delete_payment' => 'Delete payment',
-  'archive_credit' => 'Archive credit',
-  'delete_credit' => 'Delete credit',
-  'show_archived_deleted' => 'Show archived/deleted',
-  'filter' => 'Filter',
-  'new_client' => 'New Client',
-  'new_invoice' => 'New Invoice',
-  'new_payment' => 'New Payment',
-  'new_credit' => 'New Credit',
+  'archive' => 'Archiver',
+  'delete' => 'Supprimer',
+  'archive_client' => 'Archiver ce client',
+  'delete_client' => 'Supprimer ce client',
+  'archive_payment' => 'Archiver ce paiement',
+  'delete_payment' => 'Supprimer ce paiement',
+  'archive_credit' => 'Archiver ce crédit',
+  'delete_credit' => 'Supprimer ce crédit',
+  'show_archived_deleted' => 'Afficher archivés/supprimés',
+  'filter' => 'Filtrer',
+  'new_client' => 'Nouveau Client',
+  'new_invoice' => 'Nouvelle Facture',
+  'new_payment' => 'Nouveau Paiement',
+  'new_credit' => 'Nouveau Crédit',
   'contact' => 'Contact',
-  'date_created' => 'Date Created',
-  'last_login' => 'Last Login',
-  'balance' => 'Balance',
+  'date_created' => 'Date de création',
+  'last_login' => 'Dernière connexion',
+  'balance' => 'Solde',
   'action' => 'Action',
-  'status' => 'Status',
-  'invoice_total' => 'Invoice Total',
-  'frequency' => 'Frequency',
-  'start_date' => 'Start Date',
-  'end_date' => 'End Date',
-  'transaction_reference' => 'Transaction Reference',
-  'method' => 'Method',
+  'status' => 'Statut',
+  'invoice_total' => 'Montant Total',
+  'frequency' => 'Fréquence',
+  'start_date' => 'Date de début',
+  'end_date' => 'Date de fin',
+  'transaction_reference' => 'Référence de la transaction',
+  'method' => 'Méthode',
   'payment_amount' => 'Payment Amount',
   'payment_date' => 'Payment Date',
-  'credit_amount' => 'Credit Amount',
-  'credit_balance' => 'Credit Balance',
-  'credit_date' => 'Credit Date',
-  'empty_table' => 'No data available in table',
-  'select' => 'Select',
-  'edit_client' => 'Edit Client',
-  'edit_invoice' => 'Edit Invoice',
+  'credit_amount' => 'Montant du crédit',
+  'credit_balance' => 'Solde du crédit',
+  'credit_date' => 'Date de crédit',
+  'empty_table' => 'Aucune donnée disponible dans la table',
+  'select' => 'Sélectionner',
+  'edit_client' => 'Editer le Client',
+  'edit_invoice' => 'Editer la Facture',
 
   // client view page
   'create_invoice' => 'Créer une facture',
@@ -310,32 +310,32 @@ return array(
   'pro_plan_description' => 'Inscription d\'une durée d\'un an au Plan Pro d\'Invoice ninja',
   'pro_plan_success' => 'Merci pour votre inscription ! Une fois la facture réglée, votre adhésion au Plan Pro commencera.',
 
-  'unsaved_changes' => 'You have unsaved changes',
-  'custom_fields' => 'Custom fields',
-  'company_fields' => 'Company Fields',
-  'client_fields' => 'Client Fields',
-  'field_label' => 'Field Label',
-  'field_value' => 'Field Value',
-  'edit' => 'Edit',
-  'view_as_recipient' => 'View as recipient',    
+  'unsaved_changes' => 'Vous avez des modifications non enregistrées',
+  'custom_fields' => 'Champs personnalisés',
+  'company_fields' => 'Champs de société',
+  'client_fields' => 'Champs client',
+  'field_label' => 'Nom du champ',
+  'field_value' => 'Valeur du champ',
+  'edit' => 'Editer',
+  'view_as_recipient' => 'Voir en tant que destinataire',    
 
   // product management
-  'product_library' => 'Product Library',
-  'product' => 'Product',
-  'products' => 'Products',
-  'fill_products' => 'Auto-fill products',
+  'product_library' => 'Inventaire',
+  'product' => 'Produit',
+  'products' => 'Produits',
+  'fill_products' => 'Remplissage auto des produits',
   'fill_products_help' => 'Selecting a product will automatically <b>set the description and cost</b>',
-  'update_products' => 'Auto-update products',
+  'update_products' => 'Mise à jour auto des produits',
   'update_products_help' => 'Updating an invoice will automatically <b>update the products</b>',
-  'create_product' => 'Create Product',
-  'edit_product' => 'Edit Product',
-  'archive_product' => 'Archive Product',
-  'updated_product' => 'Successfully updated product',
-  'created_product' => 'Successfully created product',
+  'create_product' => 'Nouveau produit',
+  'edit_product' => 'Editer Produit',
+  'archive_product' => 'Archiver Produit',
+  'updated_product' => 'Produit mis à jour',
+  'created_product' => 'Produit créé',
   'archived_product' => 'Successfully archived product',
   'pro_plan_custom_fields' => ':link to enable custom fields by joining the Pro Plan',
 
-  'advanced_settings' => 'Advanced Settings',
+  'advanced_settings' => 'Paramètres avancés',
   'pro_plan_advanced_settings' => ':link to enable the advanced settings by joining the Pro Plan',
   'invoice_design' => 'Invoice Design',
   'specify_colors' => 'Specify colors',
@@ -346,24 +346,24 @@ return array(
   'go_pro' => 'Go Pro',
 
   // Quotes
-  'quote' => 'Quote',
-  'quotes' => 'Quotes',
-  'quote_number' => 'Quote Number',
-  'quote_number_short' => 'Quote #',
-  'quote_date' => 'Quote Date',
+  'quote' => 'Devis',
+  'quotes' => 'Devis',
+  'quote_number' => 'Devis numéro',
+  'quote_number_short' => 'Devis N°',
+  'quote_date' => 'Date du devis',
   'quote_total' => 'Quote Total',
-  'your_quote' => 'Your Quote',
+  'your_quote' => 'Votre Devis',
   'total' => 'Total',
-  'clone' => 'Clone',
+  'clone' => 'Dupliquer',
 
-  'new_quote' => 'New Quote',
-  'create_quote' => 'Create Quote',
+  'new_quote' => 'Nouveau devis',
+  'create_quote' => 'Créer devis',
   'edit_quote' => 'Edit Quote',
   'archive_quote' => 'Archive Quote',
   'delete_quote' => 'Delete Quote',
-  'save_quote' => 'Save Quote',
+  'save_quote' => 'Enregistrer le devis',
   'email_quote' => 'Email Quote',
-  'clone_quote' => 'Clone Quote',
+  'clone_quote' => 'Dupliquer le devis',
   'convert_to_invoice' => 'Convert to Invoice',
   'view_invoice' => 'View Invoice',
   'view_quote' => 'View Quote',
@@ -387,28 +387,28 @@ return array(
   'notification_quote_sent' => 'The following client :client was emailed Quote :invoice for :amount.',
   'notification_quote_viewed' => 'The following client :client viewed Quote :invoice for :amount.',  
 
-  'session_expired' => 'Your session has expired.',
+  'session_expired' => 'Votre session a expiré.',
 
   'invoice_fields' => 'Invoice Fields',
-  'invoice_options' => 'Invoice Options',
+  'invoice_options' => 'Options de facturation',
   'hide_quantity' => 'Hide quantity',
   'hide_quantity_help' => 'If your line items quantities are always 1, then you can declutter invoices by no longer displaying this field.',
   'hide_paid_to_date' => 'Hide paid to date',
   'hide_paid_to_date_help' => 'Only display the "Paid to Date" area on your invoices once a payment has been received.',
 
   'charge_taxes' => 'Charge taxes',
-  'user_management' => 'User Management',
-  'add_user' => 'Add User',
-  'send_invite' => 'Send invitation',
+  'user_management' => 'Gestion des utilisateurs',
+  'add_user' => 'Ajouter utilisateur',
+  'send_invite' => 'Envoyer invitation',
   'sent_invite' => 'Successfully sent invitation',
   'updated_user' => 'Successfully updated user',
   'invitation_message' => 'You\'ve been invited by :invitor. ',
   'register_to_add_user' => 'Please sign up to add a user',
-  'user_state' => 'State',
-  'edit_user' => 'Edit User',
-  'delete_user' => 'Delete User',
-  'active' => 'Active',
-  'pending' => 'Pending',
+  'user_state' => 'Etat',
+  'edit_user' => 'Editer l\'utilisateur',
+  'delete_user' => 'Supprimer l\'utilisateur',
+  'active' => 'Actif',
+  'pending' => 'En attente',
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
 
@@ -422,7 +422,7 @@ return array(
 
   'data_visualizations' => 'Data Visualizations',
   'sample_data' => 'Sample data shown',
-  'hide' => 'Hide',
+  'hide' => 'Cacher',
   'new_version_available' => 'A new version of :releases_link is available. You\'re running v:user_version, the latest is v:latest_version',
     
 

app/views/clients/edit.blade.php

@@ -61,10 +61,10 @@
 				<div class="form-group">
 					<div class="col-lg-8 col-lg-offset-4 bold">
 						<span class="redlink bold" data-bind="visible: $parent.contacts().length > 1">
-							{{ link_to('#', 'Remove contact -', array('data-bind'=>'click: $parent.removeContact')) }}
+							{{ link_to('#', trans('texts.remove_contact').' -', array('data-bind'=>'click: $parent.removeContact')) }}
 						</span>					
 						<span data-bind="visible: $index() === ($parent.contacts().length - 1)" class="pull-right greenlink bold">
-							{{ link_to('#', 'Add contact +', array('onclick'=>'return addContact()')) }}
+							{{ link_to('#', trans('texts.add_contact').' +', array('onclick'=>'return addContact()')) }}
 						</span>
 					</div>
 				</div>
@@ -157,10 +157,10 @@
 	</script>
 
 	<center class="buttons">
-		{{ Button::lg_primary_submit_success('Save')->append_with_icon('floppy-disk') }}
-    {{ Button::lg_default_link('clients/' . ($client ? $client->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
+		{{ Button::lg_primary_submit_success(trans('texts.save'))->append_with_icon('floppy-disk') }}
+    {{ Button::lg_default_link('clients/' . ($client ? $client->public_id : ''), trans('texts.cancel'))->append_with_icon('remove-circle'); }}
 	</center>
 
 	{{ Former::close() }}
 </div>
-@stop
+@stop