From 01869d852cf525055a497577019c9f18e95e6221 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 10 May 2016 12:31:28 +0300 Subject: [PATCH 1/8] Merge fix #794 --- resources/views/header.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php index bcf8df4ccf16..7546f9f82b3e 100644 --- a/resources/views/header.blade.php +++ b/resources/views/header.blade.php @@ -785,11 +785,11 @@

{{ trans('texts.before') }}

- before + before

{{ trans('texts.after') }}

- after + after
From ee579f91f3ac6516d542449ea36b9cd2232f7c49 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 10 May 2016 21:17:46 +0300 Subject: [PATCH 2/8] Added plan help text --- resources/lang/en/texts.php | 4 +++- resources/views/accounts/management.blade.php | 3 ++- resources/views/invoices/view.blade.php | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index c00d38f9e6c7..624a472f8ac9 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -1179,7 +1179,9 @@ $LANG = array( 'preview' => 'Preview', 'list_vendors' => 'List Vendors', 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', - + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); return $LANG; diff --git a/resources/views/accounts/management.blade.php b/resources/views/accounts/management.blade.php index cfb7b6eb28ee..ac57cf737dd6 100644 --- a/resources/views/accounts/management.blade.php +++ b/resources/views/accounts/management.blade.php @@ -128,7 +128,8 @@ @endif {!! Former::select('plan_term') ->addOption(trans('texts.plan_term_yearly'), PLAN_TERM_YEARLY) - ->addOption(trans('texts.plan_term_monthly'), PLAN_TERM_MONTHLY)!!} + ->addOption(trans('texts.plan_term_monthly'), PLAN_TERM_MONTHLY) + ->inlineHelp(trans('texts.enterprise_plan_features')) !!}
diff --git a/resources/views/invoices/view.blade.php b/resources/views/invoices/view.blade.php index 13d83c3746cf..3e5310ea40a6 100644 --- a/resources/views/invoices/view.blade.php +++ b/resources/views/invoices/view.blade.php @@ -25,7 +25,10 @@ @include('partials.checkout_com_payment') @else
- @if ($invoice->is_quote) + @if (Session::get('trackEventAction') === '/buy_pro_plan') + {!! Button::normal(trans('texts.download_pdf'))->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!}   + {!! Button::primary(trans('texts.return_to_app'))->asLinkTo(URL::to('/dashboard'))->large() !!} + @elseif ($invoice->is_quote) {!! Button::normal(trans('texts.download_pdf'))->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!}   @if ($showApprove) {!! Button::success(trans('texts.approve'))->asLinkTo(URL::to('/approve/' . $invitation->invitation_key))->large() !!} From a503697152bf354e821e97f6a6580db74c077660 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 10 May 2016 21:25:57 +0300 Subject: [PATCH 3/8] Updated lang files --- resources/lang/cs/texts.php | 88 +++++++++++++++++++++++++++++++++ resources/lang/da/texts.php | 88 +++++++++++++++++++++++++++++++++ resources/lang/de/texts.php | 88 +++++++++++++++++++++++++++++++++ resources/lang/es/texts.php | 88 +++++++++++++++++++++++++++++++++ resources/lang/es_ES/texts.php | 88 +++++++++++++++++++++++++++++++++ resources/lang/fr/texts.php | 88 +++++++++++++++++++++++++++++++++ resources/lang/fr_CA/texts.php | 89 ++++++++++++++++++++++++++++++++++ resources/lang/it/texts.php | 88 +++++++++++++++++++++++++++++++++ resources/lang/ja/texts.php | 89 ++++++++++++++++++++++++++++++++++ resources/lang/lt/texts.php | 88 +++++++++++++++++++++++++++++++++ resources/lang/nb_NO/texts.php | 88 +++++++++++++++++++++++++++++++++ resources/lang/nl/texts.php | 88 +++++++++++++++++++++++++++++++++ resources/lang/pl/texts.php | 7 ++- resources/lang/pt_BR/texts.php | 88 +++++++++++++++++++++++++++++++++ resources/lang/sv/texts.php | 88 +++++++++++++++++++++++++++++++++ 15 files changed, 1240 insertions(+), 1 deletion(-) diff --git a/resources/lang/cs/texts.php b/resources/lang/cs/texts.php index 5ef292cdc179..97771446b40e 100644 --- a/resources/lang/cs/texts.php +++ b/resources/lang/cs/texts.php @@ -1099,6 +1099,94 @@ $LANG = array( 'november' => 'Listopad', 'december' => 'Prosinec', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); return $LANG; diff --git a/resources/lang/da/texts.php b/resources/lang/da/texts.php index 2b9e21c2415a..af939b8f7a39 100644 --- a/resources/lang/da/texts.php +++ b/resources/lang/da/texts.php @@ -1199,5 +1199,93 @@ return array( 'october' => 'October', 'november' => 'November', 'december' => 'December', + + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); \ No newline at end of file diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php index 4bb50425823d..64c2222bab14 100644 --- a/resources/lang/de/texts.php +++ b/resources/lang/de/texts.php @@ -1201,4 +1201,92 @@ return array( 'november' => 'November', 'december' => 'Dezember', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); diff --git a/resources/lang/es/texts.php b/resources/lang/es/texts.php index f5f68bc527f8..eccabaf4a620 100644 --- a/resources/lang/es/texts.php +++ b/resources/lang/es/texts.php @@ -1177,4 +1177,92 @@ return array( 'november' => 'November', 'december' => 'December', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); diff --git a/resources/lang/es_ES/texts.php b/resources/lang/es_ES/texts.php index 55c38f712352..d6aa9f0aa6b6 100644 --- a/resources/lang/es_ES/texts.php +++ b/resources/lang/es_ES/texts.php @@ -1197,4 +1197,92 @@ return array( 'november' => 'November', 'december' => 'December', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); diff --git a/resources/lang/fr/texts.php b/resources/lang/fr/texts.php index 89f323a6f6e7..10d994d8d894 100644 --- a/resources/lang/fr/texts.php +++ b/resources/lang/fr/texts.php @@ -1192,4 +1192,92 @@ return array( 'november' => 'Novembre', 'december' => 'Décembre', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); diff --git a/resources/lang/fr_CA/texts.php b/resources/lang/fr_CA/texts.php index e6e4c79f0fe2..3661ad15b1c0 100644 --- a/resources/lang/fr_CA/texts.php +++ b/resources/lang/fr_CA/texts.php @@ -1190,4 +1190,93 @@ return array( 'november' => 'November', 'december' => 'December', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + + ); \ No newline at end of file diff --git a/resources/lang/it/texts.php b/resources/lang/it/texts.php index 526ce14013ba..01edae395357 100644 --- a/resources/lang/it/texts.php +++ b/resources/lang/it/texts.php @@ -1195,4 +1195,92 @@ return array( 'november' => 'Novembre', 'december' => 'Dicembre', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); diff --git a/resources/lang/ja/texts.php b/resources/lang/ja/texts.php index 1bfa46e4749a..3875de243544 100644 --- a/resources/lang/ja/texts.php +++ b/resources/lang/ja/texts.php @@ -1096,6 +1096,95 @@ $LANG = array( 'october' => 'October', 'november' => 'November', 'december' => 'December', + + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); diff --git a/resources/lang/lt/texts.php b/resources/lang/lt/texts.php index dc6c18154c6c..75cb494ca986 100644 --- a/resources/lang/lt/texts.php +++ b/resources/lang/lt/texts.php @@ -1202,4 +1202,92 @@ return array( 'november' => 'November', 'december' => 'December', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); \ No newline at end of file diff --git a/resources/lang/nb_NO/texts.php b/resources/lang/nb_NO/texts.php index d9b2158ac3a9..a06e7c60d679 100644 --- a/resources/lang/nb_NO/texts.php +++ b/resources/lang/nb_NO/texts.php @@ -1200,4 +1200,92 @@ return array( 'november' => 'November', 'december' => 'December', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); \ No newline at end of file diff --git a/resources/lang/nl/texts.php b/resources/lang/nl/texts.php index d3b0b045dfe3..6d19485ff8e8 100644 --- a/resources/lang/nl/texts.php +++ b/resources/lang/nl/texts.php @@ -1192,4 +1192,92 @@ return array( 'november' => 'november', 'december' => 'december', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); \ No newline at end of file diff --git a/resources/lang/pl/texts.php b/resources/lang/pl/texts.php index 19b0253937db..9b91d00cfdd6 100644 --- a/resources/lang/pl/texts.php +++ b/resources/lang/pl/texts.php @@ -1176,7 +1176,12 @@ $LANG = array( 'page_size' => 'Rozmiar strony', 'live_preview_disabled' => 'Podgląd obrazu na żywo został wyłączony w celu wsparcia wybranej czcionki', 'invoice_number_padding' => 'Padding', - + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); return $LANG; diff --git a/resources/lang/pt_BR/texts.php b/resources/lang/pt_BR/texts.php index 4db4e84b9fee..3791e5b0e68e 100644 --- a/resources/lang/pt_BR/texts.php +++ b/resources/lang/pt_BR/texts.php @@ -1189,4 +1189,92 @@ return array( 'november' => 'Novembro', 'december' => 'Dezembro', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); \ No newline at end of file diff --git a/resources/lang/sv/texts.php b/resources/lang/sv/texts.php index 745313fd14fd..634a5bbe15a4 100644 --- a/resources/lang/sv/texts.php +++ b/resources/lang/sv/texts.php @@ -1197,4 +1197,92 @@ return array( 'november' => 'November', 'december' => 'December', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); From ee7dbc710cc88498f9fe27105484aaa737483b8c Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 10 May 2016 21:27:17 +0300 Subject: [PATCH 4/8] Updated version --- app/Http/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/routes.php b/app/Http/routes.php index 3e63864564d0..c46f71067350 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -552,7 +552,7 @@ if (!defined('CONTACT_EMAIL')) { define('NINJA_WEB_URL', env('NINJA_WEB_URL', 'https://www.invoiceninja.com')); define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com')); define('NINJA_DATE', '2000-01-01'); - define('NINJA_VERSION', '2.5.1.3' . env('NINJA_VERSION_SUFFIX')); + define('NINJA_VERSION', '2.5.2' . env('NINJA_VERSION_SUFFIX')); define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja')); define('SOCIAL_LINK_TWITTER', env('SOCIAL_LINK_TWITTER', 'https://twitter.com/invoiceninja')); From 1a4984cb2d95161c70e463f1a921acbb5814d05b Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 10 May 2016 21:30:48 +0300 Subject: [PATCH 5/8] Bumped version number to 2.5.2 --- app/Http/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/routes.php b/app/Http/routes.php index c46f71067350..5b383c0822c8 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -745,4 +745,4 @@ if (Utils::isNinjaDev()) //ini_set('memory_limit','1024M'); //Auth::loginUsingId(1); } -*/ +*/ \ No newline at end of file From 3c21179e4e50a5ae0aa6a301a6cd0c713ec768c1 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 10 May 2016 21:42:50 +0300 Subject: [PATCH 6/8] Fixed white label after image --- resources/views/header.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php index 7546f9f82b3e..e3bdf5f5be28 100644 --- a/resources/views/header.blade.php +++ b/resources/views/header.blade.php @@ -789,7 +789,7 @@

{{ trans('texts.after') }}

- after + after
From 147c51f6f9d94a84020e837d27db68c16994f05e Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 10 May 2016 22:39:54 +0300 Subject: [PATCH 7/8] Clean up diffs between branches --- app/Http/routes.php | 1 + composer.lock | 2 +- resources/views/public/header.blade.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/routes.php b/app/Http/routes.php index 5b383c0822c8..15f0b247a144 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -1,5 +1,6 @@ Date: Tue, 10 May 2016 22:41:30 +0300 Subject: [PATCH 8/8] Clean up diffs between branches --- resources/views/header.blade.php | 2 +- resources/views/public/header.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php index e3bdf5f5be28..7b4fe014e71f 100644 --- a/resources/views/header.blade.php +++ b/resources/views/header.blade.php @@ -812,4 +812,4 @@

 

-@stop \ No newline at end of file +@stop diff --git a/resources/views/public/header.blade.php b/resources/views/public/header.blade.php index 017570e5f919..4f753b4a8d3e 100644 --- a/resources/views/public/header.blade.php +++ b/resources/views/public/header.blade.php @@ -189,4 +189,4 @@ - @stop \ No newline at end of file + @stop