Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hillel Coren 2016-04-30 21:41:14 +03:00
commit ca377bc0d2
2 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/Http/routes.php
View File

@ -552,25 +552,25 @@ if (!defined('CONTACT_EMAIL')) {
define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h'); define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');
define('NINJA_GATEWAY_ID', GATEWAY_STRIPE); define('NINJA_GATEWAY_ID', GATEWAY_STRIPE);
define('NINJA_GATEWAY_CONFIG', 'NINJA_GATEWAY_CONFIG'); define('NINJA_GATEWAY_CONFIG', 'NINJA_GATEWAY_CONFIG');
define('NINJA_WEB_URL', 'https://www.invoiceninja.com'); define('NINJA_WEB_URL', env('NINJA_WEB_URL', 'https://www.invoiceninja.com'));
define('NINJA_APP_URL', 'https://app.invoiceninja.com'); define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com'));
define('NINJA_DATE', '2000-01-01'); define('NINJA_DATE', '2000-01-01');
define('NINJA_VERSION', '2.5.1.3'); define('NINJA_VERSION', '2.5.1.3' . env('NINJA_VERSION_SUFFIX'));
define('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja'); define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja'));
define('SOCIAL_LINK_TWITTER', 'https://twitter.com/invoiceninja'); define('SOCIAL_LINK_TWITTER', env('SOCIAL_LINK_TWITTER', 'https://twitter.com/invoiceninja'));
define('SOCIAL_LINK_GITHUB', 'https://github.com/invoiceninja/invoiceninja/'); define('SOCIAL_LINK_GITHUB', env('SOCIAL_LINK_GITHUB', 'https://github.com/invoiceninja/invoiceninja/'));
define('NINJA_FROM_EMAIL', 'maildelivery@invoiceninja.com'); define('NINJA_FROM_EMAIL', env('NINJA_FROM_EMAIL', 'maildelivery@invoiceninja.com'));
define('RELEASES_URL', 'https://trello.com/b/63BbiVVe/invoice-ninja'); define('RELEASES_URL', env('RELEASES_URL', 'https://trello.com/b/63BbiVVe/invoice-ninja'));
define('ZAPIER_URL', 'https://zapier.com/zapbook/invoice-ninja'); define('ZAPIER_URL', env('ZAPIER_URL', 'https://zapier.com/zapbook/invoice-ninja'));
define('OUTDATE_BROWSER_URL', 'http://browsehappy.com/'); define('OUTDATE_BROWSER_URL', env('OUTDATE_BROWSER_URL', 'http://browsehappy.com/'));
define('PDFMAKE_DOCS', 'http://pdfmake.org/playground.html'); define('PDFMAKE_DOCS', env('PDFMAKE_DOCS', 'http://pdfmake.org/playground.html'));
define('PHANTOMJS_CLOUD', 'http://api.phantomjscloud.com/api/browser/v2/'); define('PHANTOMJS_CLOUD', env('PHANTOMJS_CLOUD', 'http://api.phantomjscloud.com/api/browser/v2/'));
define('PHP_DATE_FORMATS', 'http://php.net/manual/en/function.date.php'); define('PHP_DATE_FORMATS', env('PHP_DATE_FORMATS', 'http://php.net/manual/en/function.date.php'));
define('REFERRAL_PROGRAM_URL', 'https://www.invoiceninja.com/referral-program/'); define('REFERRAL_PROGRAM_URL', env('REFERRAL_PROGRAM_URL', 'https://www.invoiceninja.com/referral-program/'));
define('EMAIL_MARKUP_URL', 'https://developers.google.com/gmail/markup'); define('EMAIL_MARKUP_URL', env('EMAIL_MARKUP_URL', 'https://developers.google.com/gmail/markup'));
define('OFX_HOME_URL', 'http://www.ofxhome.com/index.php/home/directory/all'); define('OFX_HOME_URL', env('OFX_HOME_URL', 'http://www.ofxhome.com/index.php/home/directory/all'));
define('BLANK_IMAGE', 'data:image/png;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs='); define('BLANK_IMAGE', 'data:image/png;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=');
@ -584,13 +584,13 @@ if (!defined('CONTACT_EMAIL')) {
define('INVOICE_DESIGNS_AFFILIATE_KEY', 'T3RS74'); define('INVOICE_DESIGNS_AFFILIATE_KEY', 'T3RS74');
define('SELF_HOST_AFFILIATE_KEY', '8S69AD'); define('SELF_HOST_AFFILIATE_KEY', '8S69AD');
define('PRO_PLAN_PRICE', 50); define('PRO_PLAN_PRICE', env('PRO_PLAN_PRICE', 50));
define('PLAN_PRICE_PRO_MONTHLY', 5); define('PLAN_PRICE_PRO_MONTHLY', env('PLAN_PRICE_PRO_MONTHLY', 5));
define('PLAN_PRICE_PRO_YEARLY', 50); define('PLAN_PRICE_PRO_YEARLY', env('PLAN_PRICE_PRO_YEARLY', 50));
define('PLAN_PRICE_ENTERPRISE_MONTHLY', 10); define('PLAN_PRICE_ENTERPRISE_MONTHLY', env('PLAN_PRICE_ENTERPRISE_MONTHLY', 10));
define('PLAN_PRICE_ENTERPRISE_YEARLY', 100); define('PLAN_PRICE_ENTERPRISE_YEARLY', env('PLAN_PRICE_ENTERPRISE_YEARLY', 100));
define('WHITE_LABEL_PRICE', 20); define('WHITE_LABEL_PRICE', env('WHITE_LABEL_PRICE', 20));
define('INVOICE_DESIGNS_PRICE', 10); define('INVOICE_DESIGNS_PRICE', env('INVOICE_DESIGNS_PRICE', 10));
define('USER_TYPE_SELF_HOST', 'SELF_HOST'); define('USER_TYPE_SELF_HOST', 'SELF_HOST');
define('USER_TYPE_CLOUD_HOST', 'CLOUD_HOST'); define('USER_TYPE_CLOUD_HOST', 'CLOUD_HOST');
@ -600,8 +600,8 @@ if (!defined('CONTACT_EMAIL')) {
define('TEST_PASSWORD', 'password'); define('TEST_PASSWORD', 'password');
define('API_SECRET', 'API_SECRET'); define('API_SECRET', 'API_SECRET');
define('IOS_PRODUCTION_PUSH','ninjaIOS'); define('IOS_PRODUCTION_PUSH', env('IOS_PRODUCTION_PUSH', 'ninjaIOS'));
define('IOS_DEV_PUSH','devNinjaIOS'); define('IOS_DEV_PUSH', env('IOS_DEV_PUSH', 'devNinjaIOS'));
define('TOKEN_BILLING_DISABLED', 1); define('TOKEN_BILLING_DISABLED', 1);
define('TOKEN_BILLING_OPT_IN', 2); define('TOKEN_BILLING_OPT_IN', 2);
@ -770,4 +770,4 @@ if (Utils::isNinjaDev())
//ini_set('memory_limit','1024M'); //ini_set('memory_limit','1024M');
//Auth::loginUsingId(1); //Auth::loginUsingId(1);
} }
*/ */

102
resources/lang/de/texts.php
View File

@ -1118,8 +1118,8 @@ return array(
'first_page' => 'Erste Seite', 'first_page' => 'Erste Seite',
'all_pages' => 'Alle Seiten', 'all_pages' => 'Alle Seiten',
'last_page' => 'Letzte Seite', 'last_page' => 'Letzte Seite',
'all_pages_header' => 'Show header on', 'all_pages_header' => 'Zeige Header auf',
'all_pages_footer' => 'Show footer on', 'all_pages_footer' => 'Zeige Footer auf',
'invoice_currency' => 'Rechnungs-Währung', 'invoice_currency' => 'Rechnungs-Währung',
'enable_https' => 'Wir empfehlen dringend HTTPS zu verwenden, um Kreditkarten online zu akzeptieren.', 'enable_https' => 'Wir empfehlen dringend HTTPS zu verwenden, um Kreditkarten online zu akzeptieren.',
'quote_issued_to' => 'Quote issued to', 'quote_issued_to' => 'Quote issued to',
@ -1133,72 +1133,72 @@ return array(
'white_label_text' => 'Purchase a ONE YEAR white label license for $'.WHITE_LABEL_PRICE.' to remove the Invoice Ninja branding from the client portal and help support our project.', 'white_label_text' => 'Purchase a ONE YEAR white label license for $'.WHITE_LABEL_PRICE.' to remove the Invoice Ninja branding from the client portal and help support our project.',
'navigation' => 'Navigation', 'navigation' => 'Navigation',
'list_invoices' => 'List Invoices', 'list_invoices' => 'Rechnungen Auflisten',
'list_clients' => 'List Clients', 'list_clients' => 'Kunden Auflisten',
'list_quotes' => 'List Quotes', 'list_quotes' => 'Angebote Auflisten',
'list_tasks' => 'List Tasks', 'list_tasks' => 'Aufgaben Auflisten',
'list_expenses' => 'List Expenses', 'list_expenses' => 'Ausgaben Auflisten',
'list_recurring_invoices' => 'List Recurring Invoices', 'list_recurring_invoices' => 'Wiederkehrende Rechnungen Auflisten',
'list_payments' => 'List Payments', 'list_payments' => 'Zahlungen Aufllisten',
'list_credits' => 'List Credits', 'list_credits' => 'List Credits',
'tax_name' => 'Tax Name', 'tax_name' => 'Steuer-Name',
'report_settings' => 'Report Settings', 'report_settings' => 'Bericht-Einstellungen',
'search_hotkey' => 'shortcut is /', 'search_hotkey' => 'shortcut is /',
'new_user' => 'New User', 'new_user' => 'Neuer Benutzer',
'new_product' => 'New Product', 'new_product' => 'Neues Produkt',
'new_tax_rate' => 'New Tax Rate', 'new_tax_rate' => 'Neue Steuersatz',
'invoiced_amount' => 'Invoiced Amount', 'invoiced_amount' => 'Invoiced Amount',
'invoice_item_fields' => 'Invoice Item Fields', 'invoice_item_fields' => 'Invoice Item Fields',
'custom_invoice_item_fields_help' => 'Add a field when creating an invoice item and display the label and value on the PDF.', 'custom_invoice_item_fields_help' => 'Feld bei Erstellung eines Rechnungs-Elements hinzufügen, und dessen Bezeichnung und Wert im PDF anzeigen.',
'recurring_invoice_number' => 'Recurring Invoice Number', 'recurring_invoice_number' => 'Wiederkehrende Rechnungsnummer',
'recurring_invoice_number_prefix_help' => 'Speciy a prefix to be added to the invoice number for recurring invoices. The default value is \'R\'.', 'recurring_invoice_number_prefix_help' => 'Speciy a prefix to be added to the invoice number for recurring invoices. The default value is \'R\'.',
'enable_client_portal' => 'Dashboard', 'enable_client_portal' => 'Dashboard',
'enable_client_portal_help' => 'Show/hide the dashboard page in the client portal.', 'enable_client_portal_help' => 'Dashboard-Seite im Kunden-Portal anzeigen/verbergen.',
// Client Passwords // Client Passwords
'enable_portal_password'=>'Password protect invoices', 'enable_portal_password'=>'Sichere Rechnungen mit einem Passwort ab',
'enable_portal_password_help'=>'Allows you to set a password for each contact. If a password is set, the contact will be required to enter a password before viewing invoices.', 'enable_portal_password_help'=>'Erlaubt, ein Passwort für jeden Kontakt zu setzen. Wenn ein Passwort gesetzt ist, wird dieses vom Kontakt benötigt, um Rechnungen anzusehen.',
'send_portal_password'=>'Generate password automatically', 'send_portal_password'=>'Passwort automatisch generieren',
'send_portal_password_help'=>'If no password is set, one will be generated and sent with the first invoice.', 'send_portal_password_help'=>'Wenn kein Passwort gesetzt ist, wird eines erstellt und mit der ersten Rechnung mit versendet.',
'expired' => 'Expired', 'expired' => 'Abgelaufen',
'invalid_card_number' => 'The credit card number is not valid.', 'invalid_card_number' => 'Die Kreditkartennummer ist nicht gültig.',
'invalid_expiry' => 'The expiration date is not valid.', 'invalid_expiry' => 'Das Ablaufdatum ist nicht gültig.',
'invalid_cvv' => 'The CVV is not valid.', 'invalid_cvv' => 'Das CVV ist nicht gültig.',
'cost' => 'Cost', 'cost' => 'Kosten',
'create_invoice_for_sample' => 'Note: create your first invoice to see a preview here.', 'create_invoice_for_sample' => 'Info: Erstelle deine erste Rechnung, um hier eine Voransicht zu sehen.',
// User Permissions // User Permissions
'owner' => 'Owner', 'owner' => 'Eigentümer',
'administrator' => 'Administrator', 'administrator' => 'Administrator',
'administrator_help' => 'Allow user to manage users, change settings and modify all records', 'administrator_help' => 'Erlaube Benutzern, andere Benutzer zu administrieren, Einstellungen und alle Einträge zu verändern',
'user_create_all' => 'Create clients, invoices, etc.', 'user_create_all' => 'Kunden, Rechnungen, etc. erstellen',
'user_view_all' => 'View all clients, invoices, etc.', 'user_view_all' => 'Kunden, Rechnungen, etc. ansehen',
'user_edit_all' => 'Edit all clients, invoices, etc.', 'user_edit_all' => 'Kunden, Rechnungen, etc. bearbeiten',
'gateway_help_20' => ':link to sign up for Sage Pay.', 'gateway_help_20' => ':link um sich bei Sage Pay zu registrieren.',
'gateway_help_21' => ':link to sign up for Sage Pay.', 'gateway_help_21' => ':link um sich bei Sage Pay zu registrieren.',
'partial_due' => 'Partial Due', 'partial_due' => 'Offener Teilbetrag',
'restore_vendor' => 'Restore Vendor', 'restore_vendor' => 'Anbieter Wiederherstellen',
'restored_vendor' => 'Successfully restored vendor', 'restored_vendor' => 'Anbieter erfolgreich wiederhergestellt',
'restored_expense' => 'Successfully restored expense', 'restored_expense' => 'Ausgabe erfolgreich wiederhergestellt',
'permissions' => 'Permissions', 'permissions' => 'Berechtigungen',
'create_all_help' => 'Allow user to create and modify records', 'create_all_help' => 'Erlaube Benutzer, Einträge zu erstellen und zu verändern',
'view_all_help' => 'Allow user to view records they didn\'t create', 'view_all_help' => 'Erlaube Benutzer, Einträge zu sehen, die er nicht selbst erstellt hat',
'edit_all_help' => 'Allow user to modify records they didn\'t create', 'edit_all_help' => 'Erlaube Benutzer, Einträge zu verändern, die er nicht selbst erstellt hat',
'view_payment' => 'View Payment', 'view_payment' => 'Zahlung Ansehen',
'january' => 'January', 'january' => 'Jänner',
'february' => 'February', 'february' => 'Februar',
'march' => 'March', 'march' => 'März',
'april' => 'April', 'april' => 'April',
'may' => 'May', 'may' => 'Mai',
'june' => 'June', 'june' => 'Juni',
'july' => 'July', 'july' => 'Juli',
'august' => 'August', 'august' => 'August',
'september' => 'September', 'september' => 'September',
'october' => 'October', 'october' => 'Oktober',
'november' => 'November', 'november' => 'November',
'december' => 'December', 'december' => 'Dezember',
); );