1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00

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

This commit is contained in:
Hillel Coren 2015-11-15 08:39:44 +02:00
commit c17c4d5e40
2 changed files with 16 additions and 16 deletions

View File

@ -101,7 +101,7 @@ class PaymentLibrariesSeeder extends Seeder
['name' => 'Norske Kroner', 'code' => 'NOK', 'symbol' => 'kr ', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ','],
['name' => 'New Zealand Dollar', 'code' => 'NZD', 'symbol' => '$', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
['name' => 'Vietnamese Dong', 'code' => 'VND', 'symbol' => 'VND ', 'precision' => '0', 'thousand_separator' => '.', 'decimal_separator' => ','],
['name' => 'Swiss Franc', 'code' => 'CHF', 'symbol' => 'CHF ', 'precision' => '2', 'thousand_separator' => '\'', 'decimal_separator' => ','],
['name' => 'Swiss Franc', 'code' => 'CHF', 'symbol' => 'CHF ', 'precision' => '2', 'thousand_separator' => '\'', 'decimal_separator' => '.'],
['name' => 'Guatemalan Quetzal', 'code' => 'GTQ', 'symbol' => 'Q', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
['name' => 'Malaysian Ringgit', 'code' => 'MYR', 'symbol' => 'RM', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
['name' => 'Brazilian Real', 'code' => 'BRL', 'symbol' => 'R$', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ','],

View File

@ -841,7 +841,7 @@ return array(
'default_tax_rate_id' => 'Standard Steuersatz',
'tax_rate' => 'Steuersatz',
'recurring_hour' => 'Recurring Hour',
'recurring_hour' => 'Wiederholende Stunde',
'pattern' => 'Schema',
'pattern_help_title' => 'Schema-Hilfe',
'pattern_help_1' => 'Erstelle angepasste Rechnungs- und Angebotsnummern mittels Nummernschema',
@ -852,9 +852,9 @@ return array(
'quote_counter' => 'Angebotszähler',
'type' => 'Typ',
'activity_1' => ':user erstellte Klient :client',
'activity_2' => ':user archivierte Klient :client',
'activity_3' => ':user löschte Klient :client',
'activity_1' => ':user erstellte Kunde :client',
'activity_2' => ':user archivierte Kunde :client',
'activity_3' => ':user löschte Kunde :client',
'activity_4' => ':user erstellte Rechnung :invoice',
'activity_5' => ':user aktualisierte Rechnung :invoice',
'activity_6' => ':user mailte Rechnung :invoice an :contact',
@ -864,11 +864,11 @@ return array(
'activity_10' => ':contact gab Zahlungsinformation :payment für :invoice ein',
'activity_11' => ':user aktualisierte Zahlung :payment',
'activity_12' => ':user archivierte Zahlung :payment',
'activity_13' => ':user deleted Zahlung :payment',
'activity_14' => ':user entered :credit credit',
'activity_15' => ':user updated :credit credit',
'activity_16' => ':user archived :credit credit',
'activity_17' => ':user deleted :credit credit',
'activity_13' => ':user löschte Zahlung :payment',
'activity_14' => ':user gab :credit Guthaben ein',
'activity_15' => ':user aktualisierte :credit Guthaben',
'activity_16' => ':user archivierte :credit Guthaben',
'activity_17' => ':user löschte :credit Guthaben',
'activity_18' => ':user löschte Angebot :quote',
'activity_19' => ':user aktualisierte Angebot :quote',
'activity_20' => ':user mailte Angebot :quote an :contact',
@ -877,12 +877,12 @@ return array(
'activity_23' => ':user löschte Angebot :quote',
'activity_24' => ':user stellte Angebot :quote wieder her',
'activity_25' => ':user stellte Rechnung :invoice wieder her',
'activity_26' => ':user stellte Klient :client wieder her',
'activity_26' => ':user stellte Kunde :client wieder her',
'activity_27' => ':user stellte Zahlung :payment wieder her',
'activity_28' => ':user restored :credit credit',
'activity_29' => ':contact akzeptiert Angebot :quote',
'activity_28' => ':user stellte Guthaben :credit wieder her',
'activity_29' => ':contact akzeptierte Angebot :quote',
'payment' => 'Payment',
'payment' => 'Zahlung',
'system' => 'System',
'signature' => 'Email-Signatur',
'default_messages' => 'Standardnachrichten',
@ -895,7 +895,7 @@ return array(
'quote_is_approved' => 'This quote is approved',
'apply_credit' => 'Apply Credit',
'system_settings' => 'System Settings',
'system_settings' => 'Systemeinstellungen',
'archive_token' => 'Archive Token',
'archived_token' => 'Successfully archived token',
'archive_user' => 'Archive User',
@ -908,7 +908,7 @@ return array(
'deleted_recurring_invoice' => 'Successfully deleted recurring invoice',
'restore_recurring_invoice' => 'Restore Recurring Invoice',
'restored_recurring_invoice' => 'Successfully restored recurring invoice',
'archived' => 'Archived',
'archived' => 'Archiviert',
'untitled_account' => 'Untitled Company',
'before' => 'Before',