Resolved conflict

This commit is contained in:
Hillel Coren 2015-02-16 18:15:56 +02:00
commit fbf7c235e8

View File

@ -489,17 +489,17 @@ return array(
'select_versiony' => 'Version auswählen',
'view_history' => 'Historie anzeigen',
'edit_payment' => 'Edit Payment',
'updated_payment' => 'Successfully updated payment',
'deleted' => 'Deleted',
'restore_user' => 'Restore User',
'restored_user' => 'Successfully restored user',
'show_deleted_users' => 'Show deleted users',
'email_templates' => 'Email Templates',
'invoice_email' => 'Invoice Email',
'payment_email' => 'Payment Email',
'quote_email' => 'Quote Email',
'reset_all' => 'Reset All',
'edit_payment' => 'Zahlung bearbeiten',
'updated_payment' => 'Zahlung erfolgreich aktualisiert',
'deleted' => 'Gelöscht',
'restore_user' => 'Benutzer wiederherstellen',
'restored_user' => 'Benutzer erfolgreich wiederhergestellt',
'show_deleted_users' => 'Zeige gelöschte Benutzer',
'email_templates' => 'E-Mail Vorlagen',
'invoice_email' => 'Rechnungsmail',
'payment_email' => 'Zahlungsmail',
'quote_email' => 'Angebotsmail',
'reset_all' => 'Alle zurücksetzen',
'approve' => 'Approve',
);