diff --git a/resources/assets/js/components/AkauntingModal.vue b/resources/assets/js/components/AkauntingModal.vue index 9caf432a6..16ce46188 100644 --- a/resources/assets/js/components/AkauntingModal.vue +++ b/resources/assets/js/components/AkauntingModal.vue @@ -23,11 +23,9 @@
- + -
@@ -98,14 +96,6 @@ export default { }; }, - created: function () { - if (this.show) { - let documentClasses = document.body.classList; - - documentClasses.add("modal-open"); - } - }, - methods: { closeModal() { this.$emit("update:show", false); @@ -119,10 +109,6 @@ export default { }, onCancel() { - let documentClasses = document.body.classList; - - documentClasses.remove("modal-open"); - this.$emit("cancel"); } }, diff --git a/resources/assets/js/components/AkauntingModalAddNew.vue b/resources/assets/js/components/AkauntingModalAddNew.vue index 24cce235f..b64a47d69 100644 --- a/resources/assets/js/components/AkauntingModalAddNew.vue +++ b/resources/assets/js/components/AkauntingModalAddNew.vue @@ -130,12 +130,6 @@ export default { }; }, - created: function () { - let documentClasses = document.body.classList; - - documentClasses.add("modal-open"); - }, - mounted() { if (this.is_component) { this.component = Vue.component('add-new-component', (resolve, reject) => { @@ -236,10 +230,6 @@ export default { }, onCancel() { - let documentClasses = document.body.classList; - - documentClasses.remove("modal-open"); - this.$emit("cancel"); } }, diff --git a/resources/assets/js/components/AkauntingRecurring.vue b/resources/assets/js/components/AkauntingRecurring.vue index 6b2553b15..58a97de4f 100644 --- a/resources/assets/js/components/AkauntingRecurring.vue +++ b/resources/assets/js/components/AkauntingRecurring.vue @@ -21,23 +21,22 @@ + name="recurring_interval" + type="number" + :value="0" + class="recurring-single" + :class="invertalClasses" + :error="intervalError" + v-model="recurring_interval" + > + name="recurring_custom_frequency" + class="recurring-single" + :class="customFrequencyClasses" + :error="customFrequencyError" + > + name="recurring_count" + type="number" + :value="0" + class="recurring-single" + :class="countClasses" + :error="countError" + v-model="recurring_count" + >
@@ -90,22 +89,14 @@ export default { frequencyValue: null, frequencyError: null, - intervalValue: { - type: [Number, String], - default: 0, - description: "Default interval value" - }, + intervalValue: null, intervalError: null, customFrequencyOptions: null, customFrequencyValue: null, customFrequencyError: null, - countValue: { - type: [Number, String], - default: 0, - description: "Default count value" - }, + countValue: null, countError: null, icon: { @@ -116,10 +107,10 @@ export default { data() { return { - recurring_frequency: null, - recurring_interval: null, - recurring_custom_frequency: null, - recurring_count: null, + recurring_frequency: this.frequencyValue, + recurring_interval: this.intervalValue, + recurring_custom_frequency: this.customFrequencyValue, + recurring_count: this.countValue, frequencyClasses: 'col-md-12', invertalClasses: 'col-md-2 d-none', customFrequencyClasses: 'col-md-4 d-none', @@ -127,13 +118,6 @@ export default { } }, - created() { - this.recurring_frequency = this.frequencyValue; - this.recurring_interval = this.intervalValue; - this.recurring_custom_frequency = this.customFrequencyValue; - this.recurring_count = this.countValue; - }, - mounted() { this.recurring_frequency = this.frequencyValue; diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index 836ee4c53..6e17406fa 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -10,763 +10,379 @@ formClasses ]" :error="formError"> - - -
-

- {{ noMatchingDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
-
-

- {{ noDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
+ +
+

+ {{ noMatchingDataText }} +

+
    +
  • +
    + + + {{ add_new_text }} + +
    +
    • +
+
- +
+

+ {{ noDataText }} +

+
    +
  • +
    + + + {{ add_new_text }} + +
    +
    • +
+
- - {{ option.value }} - {{ new_text }} - + - - - - {{ label }} - {{ new_text }} - - + + {{ label }} + {{ new_text }} + - -
- - - {{ add_new_text }} - -
- - - - -
-

- {{ noMatchingDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- -
-

- {{ noDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- - - - - {{ option.value }} - {{ new_text }} - - - - - {{ label }} - {{ new_text }} - - - - -
- - - {{ add_new_text }} - -
- - - - -
-

- {{ noMatchingDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- -
-

- {{ noDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- - - - - {{ option.value }} - {{ new_text }} - - - - - - {{ label }} - {{ new_text }} - - - - -
- - - {{ add_new_text }} - -
- - - - -
-

- {{ noMatchingDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- -
-

- {{ noDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- - - - - {{ option.value }} - {{ new_text }} - - - - - - {{ label }} - {{ new_text }} - - - - -
- - - {{ add_new_text }} - -
- - - - -
-

- {{ noMatchingDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- -
-

- {{ noDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- - - - - {{ option.value }} - {{ new_text }} - - - - - - {{ label }} - {{ new_text }} - - - - -
- - - {{ add_new_text }} - -
- - - - - - {{ new_text }} - - - - - - -
-

- {{ noMatchingDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- -
-

- {{ noDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- - - - + {{ label }} {{ new_text }} + - - - - {{ label }} - {{ new_text }} - - - - -
- - - {{ add_new_text }} - -
- - - - -
-

- {{ noMatchingDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- -
-

- {{ noDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- - + + + - +
+

+ {{ noMatchingDataText }} +

+
    +
  • +
    + + + {{ add_new_text }} + +
    +
    • +
+
+ +
+

+ {{ noDataText }} +

+
    +
  • +
    + + + {{ add_new_text }} + +
    +
    • +
+
+ + + + + {{ label }} + {{ new_text }} + + + + {{ label }} {{ new_text }} + - - - {{ label }} - {{ new_text }} - - - - -
- - - {{ add_new_text }} - -
- - - - -
-

- {{ noMatchingDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- -
-

- {{ noDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- - + + + - +
+

+ {{ noMatchingDataText }} +

+
    +
  • +
    + + + {{ add_new_text }} + +
    +
    • +
+
+ +
+

+ {{ noDataText }} +

+
    +
  • +
    + + + {{ add_new_text }} + +
    +
    • +
+
+ + + + + {{ label }} + {{ new_text }} + + + + {{ label }} {{ new_text }} + - - - - {{ label }} - {{ new_text }} - - - - -
- - - {{ add_new_text }} - -
- - - - -
-

- {{ noMatchingDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- -
-

- {{ noDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- - + + + - +
+

+ {{ noMatchingDataText }} +

+
    +
  • +
    + + + {{ add_new_text }} + +
    +
    • +
+
+ +
+

+ {{ noDataText }} +

+
    +
  • +
    + + + {{ add_new_text }} + +
    +
    • +
+
+ + + + + {{ label }} + {{ new_text }} + + + + {{ label }} {{ new_text }} + - - - - {{ label }} - {{ new_text }} - - - - -
- - - {{ add_new_text }} - -
- - - - -
-

- {{ noMatchingDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- -
-

- {{ noDataText }} -

-
    -
  • -
    - - - {{ add_new_text }} - -
    -
    • -
-
- - + + + - +
+

+ {{ noMatchingDataText }} +

+
    +
  • +
    + + + {{ add_new_text }} + +
    +
    • +
+
+ +
+

+ {{ noDataText }} +

+
    +
  • +
    + + + {{ add_new_text }} + +
    +
    • +
+
+ + + + + {{ label }} + {{ new_text }} + + + + {{ label }} {{ new_text }} + - - - - {{ label }} - {{ new_text }} - - + +
+ + + {{ add_new_text }} + +
+ + - -
- - - {{ add_new_text }} - -
- - + - + {{ new_text }} - {{ new_text }} - - - + @@ -835,12 +451,6 @@ export default { }, options: null, - option_sortable: { - type: String, - default: 'value', - description: "Option Sortable type (key|value)" - }, - model: { type: [String, Number, Array, Object], default: '', @@ -868,7 +478,7 @@ export default { description: "Selectbox Add New Item Feature" }, - group: { + group: { type: Boolean, default: false, description: "Selectbox option group status" @@ -927,39 +537,6 @@ export default { }, created() { - /* - if (this.group != true && Object.keys(this.options).length) { - let sortable = []; - let option_sortable = this.option_sortable; - - for (var option_key in this.options) { - sortable.push({ - 'key' : option_key, - 'value': this.options[option_key] - }); - } - - if (option_sortable == 'value') { - sortable.sort(function(a, b) { - var sortableA = a[option_sortable].toUpperCase(); - var sortableB = b[option_sortable].toUpperCase(); - - let comparison = 0; - - if (sortableA > sortableB) { - comparison = 1; - } else if (sortableA < sortableB) { - comparison = -1; - } - - return comparison; - }); - } - - this.options = sortable; - } - */ - this.new_options = {}; }, @@ -1238,4 +815,4 @@ export default { margin-right: 35px; position: relative; } - \ No newline at end of file + diff --git a/resources/assets/js/components/AkauntingWidget.vue b/resources/assets/js/components/AkauntingWidget.vue index 19a772d04..2ef92dabc 100644 --- a/resources/assets/js/components/AkauntingWidget.vue +++ b/resources/assets/js/components/AkauntingWidget.vue @@ -78,12 +78,12 @@
@@ -255,10 +255,6 @@ export default { }, onCancel() { - let documentClasses = document.body.classList; - - documentClasses.remove("modal-open"); - this.display = false; this.form.name = ''; this.form.enabled = 1; diff --git a/resources/assets/js/components/CreditCard/CardForm.vue b/resources/assets/js/components/CreditCard/CardForm.vue index 687ac7089..2a50b3772 100644 --- a/resources/assets/js/components/CreditCard/CardForm.vue +++ b/resources/assets/js/components/CreditCard/CardForm.vue @@ -113,7 +113,6 @@ @@ -263,9 +262,6 @@
- - - {{ textButton }} @@ -508,8 +504,6 @@ export default { invaildCard() { this.loading = true; - this.unMaskCardNumber(); - let number = this.formData.cardNumber; let sum = 0; let isOdd = true; diff --git a/resources/assets/js/views/install/Database.vue b/resources/assets/js/views/install/Database.vue index 5ab74d354..226bfe828 100644 --- a/resources/assets/js/views/install/Database.vue +++ b/resources/assets/js/views/install/Database.vue @@ -84,9 +84,6 @@ Next   - - - diff --git a/resources/assets/js/views/install/Language.vue b/resources/assets/js/views/install/Language.vue index f65c7e1d1..ae3fbf21a 100644 --- a/resources/assets/js/views/install/Language.vue +++ b/resources/assets/js/views/install/Language.vue @@ -32,9 +32,6 @@ Next   - - - diff --git a/resources/assets/js/views/install/Requirements.vue b/resources/assets/js/views/install/Requirements.vue index 1cfc7474d..312bcba0b 100644 --- a/resources/assets/js/views/install/Requirements.vue +++ b/resources/assets/js/views/install/Requirements.vue @@ -26,9 +26,6 @@ Refresh   - - - diff --git a/resources/assets/js/views/install/Settings.vue b/resources/assets/js/views/install/Settings.vue index 11aff8e13..f6975ce16 100644 --- a/resources/assets/js/views/install/Settings.vue +++ b/resources/assets/js/views/install/Settings.vue @@ -82,9 +82,6 @@ Next   - - - diff --git a/resources/assets/js/views/purchases/bills.js b/resources/assets/js/views/purchases/bills.js index 074161131..1a1fc8c61 100644 --- a/resources/assets/js/views/purchases/bills.js +++ b/resources/assets/js/views/purchases/bills.js @@ -69,9 +69,7 @@ const app = new Vue({ if (typeof bill_items !== 'undefined' && bill_items) { let items = []; - let item_backup = this.form.item_backup[0]; let currency_code = this.form.currency_code; - this.edit.status = true; bill_items.forEach(function(item) { @@ -121,18 +119,18 @@ const app = new Vue({ onCalculateTotal() { let sub_total = 0; let discount_total = 0; - let line_item_discount_total = 0; + let item_discount_total = 0; let tax_total = 0; let grand_total = 0; let items = this.form.items; let discount_in_totals = this.form.discount; + let discount = ''; if (items.length) { let index = 0; // get all items. for (index = 0; index < items.length; index++) { - let discount = 0; // get row item and set item variable. let item = items[index]; @@ -140,15 +138,6 @@ const app = new Vue({ let item_total = item.price * item.quantity; // item discount calculate. - let line_discount_amount = 0; - - if (item.discount) { - line_discount_amount = item_total * (item.discount / 100); - - item_discounted_total = item_total -= line_discount_amount; - discount = item.discount; - } - let item_discounted_total = item_total; if (discount_in_totals) { @@ -156,6 +145,14 @@ const app = new Vue({ discount = discount_in_totals; } + let discount_amount = 0; + + if (item.discount) { + discount_amount = item_total * (item.discount / 100); + item_discounted_total = item_total - discount_amount; + discount = item.discount; + } + // item tax calculate. let item_tax_total = 0; @@ -223,7 +220,7 @@ const app = new Vue({ } // calculate sub, tax, discount all items. - line_item_discount_total += line_discount_amount; + item_discount_total += discount_amount; sub_total += item_total; tax_total += item_tax_total; } @@ -232,7 +229,9 @@ const app = new Vue({ // set global total variable. this.totals.sub = sub_total; this.totals.tax = tax_total; - this.totals.item_discount = line_item_discount_total; + this.totals.item_discount = item_discount_total; + + sub_total -= item_discount_total; // Apply discount to total if (discount_in_totals) { diff --git a/resources/assets/js/views/sales/invoices.js b/resources/assets/js/views/sales/invoices.js index 5d98d9e13..f4c42462c 100644 --- a/resources/assets/js/views/sales/invoices.js +++ b/resources/assets/js/views/sales/invoices.js @@ -69,9 +69,7 @@ const app = new Vue({ if (typeof invoice_items !== 'undefined' && invoice_items) { let items = []; - let item_backup = this.form.item_backup[0]; let currency_code = this.form.currency_code; - this.edit.status = true; invoice_items.forEach(function(item) { @@ -121,18 +119,18 @@ const app = new Vue({ onCalculateTotal() { let sub_total = 0; let discount_total = 0; - let line_item_discount_total = 0; + let item_discount_total = 0; let tax_total = 0; let grand_total = 0; let items = this.form.items; let discount_in_totals = this.form.discount; + let discount = ''; if (items.length) { let index = 0; // get all items. for (index = 0; index < items.length; index++) { - let discount = 0; // get row item and set item variable. let item = items[index]; @@ -140,15 +138,6 @@ const app = new Vue({ let item_total = item.price * item.quantity; // item discount calculate. - let line_discount_amount = 0; - - if (item.discount) { - line_discount_amount = item_total * (item.discount / 100); - - item_discounted_total = item_total -= line_discount_amount; - discount = item.discount; - } - let item_discounted_total = item_total; if (discount_in_totals) { @@ -156,6 +145,14 @@ const app = new Vue({ discount = discount_in_totals; } + let discount_amount = 0; + + if (item.discount) { + discount_amount = item_total * (item.discount / 100); + item_discounted_total = item_total - discount_amount; + discount = item.discount; + } + // item tax calculate. let item_tax_total = 0; @@ -223,7 +220,7 @@ const app = new Vue({ } // calculate sub, tax, discount all items. - line_item_discount_total += line_discount_amount; + item_discount_total += discount_amount; sub_total += item_total; tax_total += item_tax_total; } @@ -232,7 +229,9 @@ const app = new Vue({ // set global total variable. this.totals.sub = sub_total; this.totals.tax = tax_total; - this.totals.item_discount = line_item_discount_total; + this.totals.item_discount = item_discount_total; + + sub_total -= item_discount_total; // Apply discount to total if (discount_in_totals) { diff --git a/resources/assets/js/views/wizard/currencies.js b/resources/assets/js/views/wizard/currencies.js index 32199e009..c487327ad 100644 --- a/resources/assets/js/views/wizard/currencies.js +++ b/resources/assets/js/views/wizard/currencies.js @@ -106,9 +106,5 @@ const app = new Vue({ .catch(error => { }); }, - - onSubmit() { - this.form.oldSubmit(); - }, } }); diff --git a/resources/assets/js/views/wizard/taxes.js b/resources/assets/js/views/wizard/taxes.js index 89f764a57..fa5ccfb4e 100644 --- a/resources/assets/js/views/wizard/taxes.js +++ b/resources/assets/js/views/wizard/taxes.js @@ -78,9 +78,5 @@ const app = new Vue({ this.show = true; }, - - onSubmit() { - this.form.oldSubmit(); - }, } }); diff --git a/resources/assets/sass/core/mixins/_background-variant.scss b/resources/assets/sass/core/mixins/_background-variant.scss index 779c934d1..a0fa4ff98 100644 --- a/resources/assets/sass/core/mixins/_background-variant.scss +++ b/resources/assets/sass/core/mixins/_background-variant.scss @@ -1,3 +1,16 @@ +// Contextual backgrounds +@mixin bg-variant($parent, $color) { + #{$parent} { + background-color: $color !important; + } + a#{$parent}, + button#{$parent} { + @include hover-focus { + background-color: darken($color, 10%) !important; + } + } +} + @mixin bg-gradient-variant($parent, $color) { #{$parent} { background: linear-gradient(87deg, $color 0, adjust-hue($color, 25%) 100%) !important; diff --git a/resources/assets/sass/core/navbars/_navbar-vertical.scss b/resources/assets/sass/core/navbars/_navbar-vertical.scss index 20e1c7017..63219761b 100644 --- a/resources/assets/sass/core/navbars/_navbar-vertical.scss +++ b/resources/assets/sass/core/navbars/_navbar-vertical.scss @@ -355,9 +355,7 @@ // Sidenav states .g-sidenav-show { - .sidenav { - .navbar-brand, .navbar-heading { display: block; diff --git a/resources/lang/bn-BD/install.php b/resources/lang/bn-BD/install.php index badf090b7..81255392a 100644 --- a/resources/lang/bn-BD/install.php +++ b/resources/lang/bn-BD/install.php @@ -21,7 +21,7 @@ return [ 'disabled' => ':feature নিষ্ক্রিয় করা আবশ্যক!', 'extension' => ':extension এক্সটেসনটি সংস্থাপন করে লোড করা আবশ্যক!', 'directory' => ':directory ডিরেক্টরিটি লিখনযোগ্য হওয়া আবশ্যক!', - 'executable' => 'PHP CLI ফাইলটি চালানো যাচ্ছে না কিংবা এটি সংজ্ঞায়িত নয় , অথবা এর ভার্সনটি :php_version কিংবা তার উর্দ্ধে নয় ! দয়া করে আপনার হোস্টিং কোম্পানিকে PHP_BINARY কিংবা PHP_PATH environment variable টি সঠিক ভাবে নির্ধারণ করে দিতে বলুন।', + 'executable' => 'PHP CLI ফাইলটি চালানো যাচ্ছে না ! দয়া করে আপনার হোস্টিং কোম্পানিকে PHP_BINARY কিংবা PHP_PATH environment variable টি সঠিক ভাবে নির্ধারল করে দিতে বলুন।', ], 'database' => [ diff --git a/resources/lang/de-DE/install.php b/resources/lang/de-DE/install.php index 77e7078c9..ac504eebe 100644 --- a/resources/lang/de-DE/install.php +++ b/resources/lang/de-DE/install.php @@ -21,7 +21,7 @@ return [ 'disabled' => ':feature muss deaktiviert sein!', 'extension' => ':extension Erweiterung muss installiert und geladen sein!', 'directory' => ':directory Verzeichnis muss schreibbar sein!', - 'executable' => 'Die ausführbare PHP-CLI-Datei ist nicht definiert oder funktioniert nicht oder ihre Version ist nicht :php_version oder höher! Bitten Sie Ihre Hosting-Firma, PHP_BINARY oder PHP_PATH Umgebungsvariable korrekt zu setzen.', + 'executable' => 'Die PHP-CLI Datei funktioniert nicht! Bitten Sie Ihre Hosting-Firma, PHP_BINARY oder PHP_PATH Umgebungsvariable korrekt zu setzen.', ], 'database' => [ diff --git a/resources/lang/en-GB/install.php b/resources/lang/en-GB/install.php index c6263be39..1a6b37dce 100644 --- a/resources/lang/en-GB/install.php +++ b/resources/lang/en-GB/install.php @@ -21,7 +21,7 @@ return [ 'disabled' => ':feature needs to be disabled!', 'extension' => ':extension extension needs to be installed and loaded!', 'directory' => ':directory directory needs to be writable!', - 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', + 'executable' => 'The PHP CLI executable file is not working! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', ], 'database' => [ diff --git a/resources/lang/hi-IN/bills.php b/resources/lang/hi-IN/bills.php index 366abac5d..18ce24336 100644 --- a/resources/lang/hi-IN/bills.php +++ b/resources/lang/hi-IN/bills.php @@ -13,7 +13,6 @@ return [ 'price' => 'मूल्य', 'sub_total' => 'पूर्ण योग', 'discount' => 'छूट', - 'item_discount' => 'Line Discount', 'tax_total' => 'कर राशि', 'total' => 'कुल', @@ -31,7 +30,6 @@ return [ 'add_payment' => 'भुगतान जोड़ें', 'mark_paid' => 'मार्क करे की भुगतान किया हुआ है', 'mark_received' => 'प्राप्त किए हुए में मार्क करे', - 'mark_cancelled' => 'Mark Cancelled', 'download_pdf' => 'डाउनलोड PDF', 'send_mail' => 'ईमेल भेजें', 'create_bill' => 'बिल बनाएं', @@ -45,13 +43,11 @@ return [ 'paid' => 'भुगतान किया', 'overdue' => 'समय पर भुगतान नहीं किया', 'unpaid' => 'भुगतान नहीं किया है', - 'cancelled' => 'Cancelled', ], 'messages' => [ - 'marked_received' => 'Bill marked as received!', + 'received' => 'बिल को सफलतापूर्वक प्राप्त किया गया!', 'marked_paid' => 'बिल भुगतान के रूप में मार्क किया गया!', - 'marked_cancelled' => 'Bill marked as cancelled!', 'draft' => 'यह एक ड्राफ्ट बिल है और इसे प्राप्त होने के बाद चार्ट पर प्रतिबिंबित किया जाएगा।', 'status' => [ diff --git a/resources/lang/hi-IN/bulk_actions.php b/resources/lang/hi-IN/bulk_actions.php index 4b86107f5..972a4cf47 100644 --- a/resources/lang/hi-IN/bulk_actions.php +++ b/resources/lang/hi-IN/bulk_actions.php @@ -15,7 +15,6 @@ return [ 'paid' => 'क्या आप वाकई चयनित चालान को भुगतान के रूप में चिह्नित करना चाहते हैं?|क्या आप सुनिश्चित हैं कि आप चयनित चालान को भुगतान के रूप में चिह्नित करना चाहते हैं?', 'sent' => 'क्या आप सुनिश्चित हैं कि आप चयनित चालान को भेजे गए के रूप में चिह्नित करना चाहते हैं?|क्या आप सुनिश्चित हैं कि आप चयनित चालान को भेजे गए के रूप में चिह्नित करना चाहते हैं?', 'received' => 'क्या आप वाकई चयनित बिल को प्राप्त किये गए के रूप में चिह्नित करना चाहते हैं?|क्या आप वाकई चयनित बिलों को प्राप्त किये गए के रूप में चिह्नित करना चाहते हैं?', - 'cancelled' => 'Are you sure you want to cancel selected invoice/bill?|Are you sure you want to cancel selected invoices/bills?', ], ]; diff --git a/resources/lang/hi-IN/install.php b/resources/lang/hi-IN/install.php index 2071ff424..1e4697de2 100644 --- a/resources/lang/hi-IN/install.php +++ b/resources/lang/hi-IN/install.php @@ -21,7 +21,6 @@ return [ 'disabled' => ':feature को निष्क्रिय करने की आवश्यकता है!', 'extension' => ':extension एक्सटेंशन को स्थापित करने और लोड करने की आवश्यकता है!', 'directory' => ':directory फ़ोल्डर को लिखने योग्य होना चाहिए!', - 'executable' => 'अगर PHP CLI एक्सेक्यूटबल फाइल परिभाषित नहीं है अथवा काम नहीं कर रही है अथवा उसका संस्करण php_version के समान या उससे अधिक नहीं है! तो कृपया, अपनी होस्टिंग कंपनी को PHP_BINARY या PHP_PATH ये एनवायरनमेंट वेरिएबल सही ढंग से सेट करने के लिए कहें।', ], 'database' => [ diff --git a/resources/lang/hi-IN/invoices.php b/resources/lang/hi-IN/invoices.php index 154c71561..82117afc9 100644 --- a/resources/lang/hi-IN/invoices.php +++ b/resources/lang/hi-IN/invoices.php @@ -13,7 +13,6 @@ return [ 'price' => 'कीमत', 'sub_total' => 'पूर्ण योग', 'discount' => 'छूट', - 'item_discount' => 'Line Discount', 'tax_total' => 'कुल कर', 'total' => 'कुल', @@ -31,7 +30,6 @@ return [ 'mark_paid' => 'मार्क करे की भुगतान किया हुआ है', 'mark_sent' => 'मार्क करे की भेजा गया', 'mark_viewed' => 'मार्क किया हुआ देखे', - 'mark_cancelled' => 'Mark Cancelled', 'download_pdf' => 'डाउनलोड PDF', 'send_mail' => 'ईमेल भेजें', 'all_invoices' => 'सभी चालान देखने के लिए लॉगिन करें', @@ -49,15 +47,12 @@ return [ 'paid' => 'भुगतान किया है', 'overdue' => 'समय पर भुगतान नहीं किया', 'unpaid' => 'भुगतान नहीं किया है', - 'cancelled' => 'Cancelled', ], 'messages' => [ 'email_sent' => 'चालान ईमेल भेजा गया है!', 'marked_sent' => 'भेजे गए के रूप में मार्क किया गया!', 'marked_paid' => 'चालान भुगतान के रूप में मार्क किया गया!', - 'marked_viewed' => 'Invoice marked as viewed!', - 'marked_cancelled' => 'Invoice marked as cancelled!', 'email_required' => 'इस ग्राहक के लिए कोई ईमेल पता नहीं!', 'draft' => 'यह एक ड्राफ्ट चालान है और इसे भेजे जाने के बाद चार्ट में प्रतिबिंबित होगा।', diff --git a/resources/lang/hi-IN/settings.php b/resources/lang/hi-IN/settings.php index 0dba551f3..ff7ea8d58 100644 --- a/resources/lang/hi-IN/settings.php +++ b/resources/lang/hi-IN/settings.php @@ -29,12 +29,6 @@ return [ 'before' => 'नंबर से पहले', 'after' => 'नंबर के बाद', ], - 'discount_location' => [ - 'name' => 'Discount Location', - 'item' => 'At line', - 'total' => 'At total', - 'both' => 'Both line and total', - ], ], 'invoice' => [ diff --git a/resources/lang/hr-HR/bills.php b/resources/lang/hr-HR/bills.php index e5e10fd64..ea27f4d9b 100644 --- a/resources/lang/hr-HR/bills.php +++ b/resources/lang/hr-HR/bills.php @@ -13,7 +13,6 @@ return [ 'price' => 'Cijena', 'sub_total' => 'Podzbroj', 'discount' => 'Popust', - 'item_discount' => 'Line Discount', 'tax_total' => 'Porez Ukupno', 'total' => 'Ukupno', @@ -29,9 +28,7 @@ return [ 'histories' => 'Povijesti', 'payments' => 'Plaćanja', 'add_payment' => 'Dodaj plaćanje', - 'mark_paid' => 'Mark Paid', 'mark_received' => 'Označi kao primljeno', - 'mark_cancelled' => 'Mark Cancelled', 'download_pdf' => 'Preuzmite PDF', 'send_mail' => 'Pošalji e-mail', 'create_bill' => 'Kreiraj fakturu', @@ -45,13 +42,10 @@ return [ 'paid' => 'Plaćeno', 'overdue' => 'Dospjelo', 'unpaid' => 'Neplaćeno', - 'cancelled' => 'Cancelled', ], 'messages' => [ - 'marked_received' => 'Bill marked as received!', - 'marked_paid' => 'Bill marked as paid!', - 'marked_cancelled' => 'Bill marked as cancelled!', + 'received' => 'Račun označen kao uspješno primljen!', 'draft' => 'Ovo je SKICA računa i odrazit će se na grafikone nakon što se zaprimi.', 'status' => [ diff --git a/resources/lang/hr-HR/bulk_actions.php b/resources/lang/hr-HR/bulk_actions.php index 47e7e7838..ef50a6728 100644 --- a/resources/lang/hr-HR/bulk_actions.php +++ b/resources/lang/hr-HR/bulk_actions.php @@ -2,9 +2,8 @@ return [ - 'bulk_actions' => 'Skupna akcija | Skupne akcije', - 'selected' => 'odabrano', - 'no_action' => 'No action available', + 'bulk_actions' => 'Skupna akcija | Skupne akcije', + 'selected' => 'odabrano', 'message' => [ 'duplicate' => 'Jeste li sigurni da želite duplicirati odabrani zapis?', @@ -15,7 +14,6 @@ return [ 'paid' => 'Jeste li sigurni da odabranu fakturu želite označiti kao plaćenu ? | Jeste li sigurni da odabrane račune želite označiti kao plaćene ?', 'sent' => 'Jeste li sigurni da odabranu fakturu želite označiti kao poslanu ? | Jeste li sigurni da odabrane račune želite označiti kao poslane ?', 'received' => 'Jeste li sigurni da odabrani račun želite označiti kao primljeni ? | Jeste li sigurni da odabrane račune želite označiti kao primljene ?', - 'cancelled' => 'Are you sure you want to cancel selected invoice/bill?|Are you sure you want to cancel selected invoices/bills?', ], ]; diff --git a/resources/lang/hr-HR/general.php b/resources/lang/hr-HR/general.php index 48b600614..a7bffb727 100644 --- a/resources/lang/hr-HR/general.php +++ b/resources/lang/hr-HR/general.php @@ -47,10 +47,10 @@ return [ 'charts' => 'Grafikon | Grafikoni', 'localisations' => 'Lokalizacija | lokalizacije', 'defaults' => 'Zadano | Zadana', - 'widgets' => 'Widget|Widgeti', - 'templates' => 'Predložak|Predlošci', - 'sales' => 'Prodaja|Prodaje', - 'purchases' => 'Kupnja|Kupnje', + 'widgets' => 'Widget | Widgeti', + 'templates' => 'Predložak| Predlošci', + 'sales' => 'Prodaja | Prodaje', + 'purchases' => 'Kupnja | Kupnje', 'welcome' => 'Dobrodošli', 'banking' => 'Bankarstvo', @@ -133,7 +133,7 @@ return [ 'frequency' => 'Frekvencija', 'start' => 'Početak', 'end' => 'Kraj', - 'clear' => 'Poništi', + 'clear' => 'Očisti', 'difference' => 'Razlika', 'footer' => 'Podnožje', 'start_date' => 'Datum početka', @@ -163,10 +163,10 @@ return [ 'title' => [ 'new' => 'Novo - :type', 'edit' => 'Uređivanje - :type', - 'delete' => 'Izbriši :tip', + 'delete' => 'Izbriši: tip', 'create' => 'Kreiraj :type', 'send' => 'Pošalji :tip', - 'get' => 'Dohvati :type', + 'get' => 'Dobijte: type', 'add' => 'Dodaj :type', 'manage' => 'Promijeni :type', ], diff --git a/resources/lang/hr-HR/install.php b/resources/lang/hr-HR/install.php index b53aef0fc..fb82b8f6e 100644 --- a/resources/lang/hr-HR/install.php +++ b/resources/lang/hr-HR/install.php @@ -21,7 +21,6 @@ return [ 'disabled' => ':feature mora biti onemogućeno!', 'extension' => ':extension proširenje mora biti instalirano i učitano!', 'directory' => ':directory direktorij mora biti omogućen za zapisivanje!', - 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', ], 'database' => [ diff --git a/resources/lang/hr-HR/invoices.php b/resources/lang/hr-HR/invoices.php index 26e482d90..93d8c774a 100644 --- a/resources/lang/hr-HR/invoices.php +++ b/resources/lang/hr-HR/invoices.php @@ -13,7 +13,6 @@ return [ 'price' => 'Cijena', 'sub_total' => 'Podzbroj', 'discount' => 'Popust', - 'item_discount' => 'Line Discount', 'tax_total' => 'Porez Ukupno', 'total' => 'Ukupno', @@ -31,7 +30,6 @@ return [ 'mark_paid' => 'Označi kao plaćeno', 'mark_sent' => 'Označi kao poslano', 'mark_viewed' => 'Označi pogledano', - 'mark_cancelled' => 'Mark Cancelled', 'download_pdf' => 'Preuzmite PDF', 'send_mail' => 'Pošalji e-mail', 'all_invoices' => 'Prijavite se za pregled svih faktura', @@ -49,15 +47,12 @@ return [ 'paid' => 'Plaćeno', 'overdue' => 'Kasne', 'unpaid' => 'Neplaćeno', - 'cancelled' => 'Cancelled', ], 'messages' => [ 'email_sent' => 'E-adresa s računom je poslana!', 'marked_sent' => 'Račun označen kao poslan!', 'marked_paid' => 'Račun označen kao plaćen!', - 'marked_viewed' => 'Invoice marked as viewed!', - 'marked_cancelled' => 'Invoice marked as cancelled!', 'email_required' => 'Nema e-mail adrese za ovog kupca!', 'draft' => 'This is a SKICA invoice and will be reflected to charts after it gets sent.', diff --git a/resources/lang/hr-HR/messages.php b/resources/lang/hr-HR/messages.php index 23ca7b2bc..a3b580037 100644 --- a/resources/lang/hr-HR/messages.php +++ b/resources/lang/hr-HR/messages.php @@ -28,8 +28,6 @@ return [ 'warning' => [ 'deleted' => 'Upozorenje: Nije vam dozvoljeno izbrisati :name jer postoji poveznica s :text.', 'disabled' => 'Upozorenje: Nije vam dozvoljeno onemogućiti :name jer postoji poveznica s :text.', - 'reconciled_tran' => 'Warning: You are not allowed to change/delete transaction because it is reconciled!', - 'reconciled_doc' => 'Warning: You are not allowed to change/delete :type because it has reconciled transactions!', 'disable_code' => 'Upozorenje: Nije vam dopušteno onesposobiti ili promijeniti valutu : ime jer je: tekst povezan.', 'payment_cancel' => 'Upozorenje: Otkazali ste nedavni: način plaćanja!', ], diff --git a/resources/lang/hr-HR/passwords.php b/resources/lang/hr-HR/passwords.php index 427e85241..a232ce26f 100644 --- a/resources/lang/hr-HR/passwords.php +++ b/resources/lang/hr-HR/passwords.php @@ -18,6 +18,5 @@ return [ 'sent' => 'Link za resetiranje lozinke je poslan na e-mail!', 'token' => 'Token za resetiranje lozinke nije važeći.', 'user' => "Ne možemo pronaći korisnika s tom e-mail adresom.", - 'throttle' => 'Please wait before retrying.', ]; diff --git a/resources/lang/hr-HR/reports.php b/resources/lang/hr-HR/reports.php index 73097cade..803d8d2db 100644 --- a/resources/lang/hr-HR/reports.php +++ b/resources/lang/hr-HR/reports.php @@ -12,7 +12,7 @@ return [ 'net_profit' => 'Neto dobit', 'total_expenses' => 'Ukupni troškovi', 'net' => 'Neto', - 'income_expense' => 'Prihod i rashod', + 'income_expense' => 'Prihodi i rashodi', 'summary' => [ 'income' => 'Sažetak prihoda', diff --git a/resources/lang/hr-HR/settings.php b/resources/lang/hr-HR/settings.php index ea597b648..10e74be26 100644 --- a/resources/lang/hr-HR/settings.php +++ b/resources/lang/hr-HR/settings.php @@ -29,12 +29,6 @@ return [ 'before' => 'Ispred broja', 'after' => 'Nakon broja', ], - 'discount_location' => [ - 'name' => 'Discount Location', - 'item' => 'At line', - 'total' => 'At total', - 'both' => 'Both line and total', - ], ], 'invoice' => [ diff --git a/resources/lang/hr-HR/validation.php b/resources/lang/hr-HR/validation.php index 7b338d4fa..eb6bb3fa3 100644 --- a/resources/lang/hr-HR/validation.php +++ b/resources/lang/hr-HR/validation.php @@ -100,11 +100,10 @@ return [ 'custom' => [ 'attribute-name' => [ - 'rule-name' => 'prilagođena-poruka', + 'rule-name' => 'prilagođena-poruka', ], - 'invalid_currency' => ': Atributni kod nije valjan.', - 'invalid_amount' => 'Iznos: atribut nije važeći.', - 'invalid_extension' => 'The file extension is invalid.', + 'invalid_currency' => ': Atributni kod nije valjan.', + 'invalid_amount' => 'Iznos: atribut nije važeći.', ], /* diff --git a/resources/lang/hr-HR/widgets.php b/resources/lang/hr-HR/widgets.php index 66beee487..2fc18a366 100644 --- a/resources/lang/hr-HR/widgets.php +++ b/resources/lang/hr-HR/widgets.php @@ -4,7 +4,7 @@ return [ 'total_income' => 'Ukupni prihodi', 'receivables' => 'Potraživanja', - 'open_invoices' => 'Otvorene fakture', + 'open_invoices' => 'Otvorite fakture', 'overdue_invoices' => 'Dospjele fakture', 'total_expenses' => 'Ukupni troškovi', 'payables' => 'Dugovanja', diff --git a/resources/lang/id-ID/auth.php b/resources/lang/id-ID/auth.php index e3a05b142..54151ac6d 100644 --- a/resources/lang/id-ID/auth.php +++ b/resources/lang/id-ID/auth.php @@ -13,7 +13,6 @@ return [ 'current_email' => 'Email saat ini', 'reset' => 'Atur Ulang', 'never' => 'jangan pernah', - 'landing_page' => 'Halaman Muka', 'password' => [ 'current' => 'Kata Sandi', diff --git a/resources/lang/id-ID/bills.php b/resources/lang/id-ID/bills.php index b3e75d5ef..a96efa23c 100644 --- a/resources/lang/id-ID/bills.php +++ b/resources/lang/id-ID/bills.php @@ -13,7 +13,6 @@ return [ 'price' => 'Harga', 'sub_total' => 'Subtotal', 'discount' => 'Diskon', - 'item_discount' => 'Potongan Harga', 'tax_total' => 'Total Pajak', 'total' => 'Total', @@ -29,9 +28,7 @@ return [ 'histories' => 'Riwayat', 'payments' => 'Pembayaran', 'add_payment' => 'Tambahkan Pembayaran', - 'mark_paid' => 'Tandai sudah dibayar', 'mark_received' => 'Tandai Diterima', - 'mark_cancelled' => 'Dibatalkan', 'download_pdf' => 'Unduh PDF', 'send_mail' => 'Kirim Email', 'create_bill' => 'Membuat Tagihan', @@ -43,15 +40,10 @@ return [ 'received' => 'Diterima', 'partial' => 'Sebagian', 'paid' => 'Dibayar', - 'overdue' => 'Jatuh Tempo', - 'unpaid' => 'Belum Dibayar', - 'cancelled' => 'Dibatalkan', ], 'messages' => [ - 'marked_received' => 'Tagihan sudah diterima', - 'marked_paid' => 'Tagihan sudah dibayar', - 'marked_cancelled' => 'Tagihan dibatalkan', + 'received' => 'Tagihan ditandai berhasil diterima!', 'draft' => 'Ini adalah DRAFT tagihan dan akan terlihat di grafik setelah dibayarkan.', 'status' => [ diff --git a/resources/lang/id-ID/bulk_actions.php b/resources/lang/id-ID/bulk_actions.php index 1e721694b..fee2d46a0 100644 --- a/resources/lang/id-ID/bulk_actions.php +++ b/resources/lang/id-ID/bulk_actions.php @@ -2,20 +2,18 @@ return [ - 'bulk_actions' => 'Tindakan Penting|Tindakan Penting', - 'selected' => 'dipilih', - 'no_action' => 'Tidak ada yang tersedia', + 'bulk_actions' => 'Tindakan Penting|Tindakan Penting', + 'selected' => 'dipilih', 'message' => [ - 'duplicate' => 'Yakin ingin menggandakan catatan yang dipilih?', - 'delete' => 'Yakin ingin menghapus data yang dipilih? | Yakin ingin menghapus data yang dipilih?', - 'export' => 'Yakin ingin mengekspor catatan yang dipilih? | Yakin ingin mengekspor catatan yang dipilih?', - 'enable' => 'Yakin ingin mengaktifkan catatan yang dipilih? | Yakin ingin mengaktifkan catatan yang dipilih?', - 'disable' => 'Yakin ingin mengaktifkan catatan yang dipilih? | Yakin ingin mengaktifkan catatan yang dipilih?', - 'paid' => 'Yakin ingin menandai faktur yang dipilih sebagai berbayar ? Apakah Anda yakin ingin menandai faktur yang dipilih sebagai berbayar ?', - 'sent' => 'Yakin ingin menandai faktur yang dipilih sebagai berbayar ? Apakah Anda yakin ingin menandai faktur yang dipilih sebagai berbayar ?', - 'received' => 'Yakin ingin menandai tagihan terpilih sebagai diterima ? Apakah Anda yakin ingin menandai tagihan terpilih sebagai diterima ?', - 'cancelled' => 'Yakin ingin membatalkan Faktur/ Tagihan yg dipilih?| Yakin ingin membatalkan Faktur/ Tagihan yg dipilih?', + 'duplicate' => 'Are you sure you want to duplicate selected record?', + 'delete' => 'Are you sure you want to delete selected record?|Are you sure you want to delete selected records?', + 'export' => 'Are you sure you want to export selected record?|Are you sure you want to export selected records?', + 'enable' => 'Are you sure you want to enable selected record?|Are you sure you want to enable selected records?', + 'disable' => 'Are you sure you want to disable selected record?|Are you sure you want to disable selected records?', + 'paid' => 'Are you sure you want to mark selected invoice as paid?|Are you sure you want to mark selected invoices as paid?', + 'sent' => 'Are you sure you want to mark selected invoice as sent?|Are you sure you want to mark selected invoices as sent?', + 'received' => 'Are you sure you want to mark selected bill as received?|Are you sure you want to mark selected bills as received?', ], ]; diff --git a/resources/lang/id-ID/companies.php b/resources/lang/id-ID/companies.php index 9ba585de4..488d112fd 100644 --- a/resources/lang/id-ID/companies.php +++ b/resources/lang/id-ID/companies.php @@ -4,11 +4,12 @@ return [ 'domain' => 'Domain', 'logo' => 'Logo', + 'manage' => 'Mengelola Perusahaan', + 'all' => 'Semua Perusahaan', 'error' => [ 'not_user_company' => 'Error: Anda tidak diperbolehkan merubah perusahaan ini!', - 'delete_active' => 'Kesalahan: kamu tidak dapat menghapus Perusahaan aktif, silahkan berpindah perusahaan terlebih dahulu!', - 'disable_active' => 'Kesalahan: Tidak dapat menonaktifkan perusahaan yang aktif. Silakan, beralih ke yang lain dulu!', + 'delete_active' => 'Error: Tidak dapat menghapus perusahaan aktif, silahkan, ubah status perusahaan terlebih dahulu!', ], ]; diff --git a/resources/lang/id-ID/customers.php b/resources/lang/id-ID/customers.php index a788b40d9..9a5cc0330 100644 --- a/resources/lang/id-ID/customers.php +++ b/resources/lang/id-ID/customers.php @@ -6,7 +6,7 @@ return [ 'user_created' => 'Pengguna Dibuat', 'error' => [ - 'email' => 'Email ini sudah dipakai.', + 'email' => 'Email ini sudah dipakai.' ], ]; diff --git a/resources/lang/id-ID/demo.php b/resources/lang/id-ID/demo.php index d41df6758..0a1c12341 100644 --- a/resources/lang/id-ID/demo.php +++ b/resources/lang/id-ID/demo.php @@ -2,33 +2,12 @@ return [ - 'accounts' => [ - 'cash' => 'Tunai', - ], - - 'categories' => [ - 'deposit' => 'Deposit', - 'sales' => 'Penjualan', - ], - - 'currencies' => [ - 'usd' => 'Dolar Amerika Serikat', - 'eur' => 'Euro', - 'gbp' => 'Pound sterling Inggris', - 'try' => 'Lira Turki', - ], - - 'offline_payments' => [ - 'cash' => 'Tunai', - 'bank' => 'Transfer Bank', - ], - - 'reports' => [ - 'income' => 'Ringkasan penghasilan bulanan berdasarkan kategori.', - 'expense' => 'Ringkasan pengeluaran bulanan berdasarkan kategori.', - 'income_expense' => 'Penghasilan bulanan vs biaya berdasarkan kategori.', - 'tax' => 'Ringkasan pajak triwulanan.', - 'profit_loss' => 'Laba & rugi triwulan menurut kategori.', - ], + 'accounts_cash' => 'Kas', + 'categories_deposit' => 'Deposit', + 'categories_sales' => 'Penjualan', + 'currencies_usd' => 'Dolar Amerika Serikat', + 'currencies_eur' => 'Euro', + 'currencies_gbp' => 'Pound sterling Inggris', + 'currencies_try' => 'Lira Turki', ]; diff --git a/resources/lang/id-ID/email_templates.php b/resources/lang/id-ID/email_templates.php index ff7d609e4..62b72048d 100644 --- a/resources/lang/id-ID/email_templates.php +++ b/resources/lang/id-ID/email_templates.php @@ -19,32 +19,32 @@ return [ 'invoice_recur_customer' => [ 'subject' => 'tagihan ulang nomor {invoice_number} dibuat', - 'body' => 'Kepada {customer_name},

Kami telah mempersiapkan tagihan kepada Anda sebagai berikut: {invoice_number}.

Anda dapat melihat rincian tagihan dan dilanjutkan dengan pembayaran dari link berikut ini: {invoice_number}.

Apabila ada pertanyaan harap hubungi kami.

Hormat Kami,,
{company_name}', + 'body' => 'Dear {customer_name},

Based on your recurring circle, we have prepared the following invoice for you: {invoice_number}.

You can see the invoice details and proceed with the payment from the following link: {invoice_number}.

Feel free to contact us for any question.

Best Regards,
{company_name}', ], 'invoice_recur_admin' => [ - 'subject' => 'tagihan ulang nomor {invoice_number} dibuat', - 'body' => 'Halo,

Berdasarkan lingkaran berulang {customer_name}, {invoice_number} faktur telah dibuat secara otomatis.

Anda dapat melihat detail faktur dari tautan berikut: {invoice_number} .

Salam,
{company_name}', + 'subject' => '{invoice_number} recurring invoice created', + 'body' => 'Hello,

Based on {customer_name} recurring circle, {invoice_number} invoice has been automatically created.

You can see the invoice details from the following link: {invoice_number}.

Best Regards,
{company_name}', ], 'invoice_payment_customer' => [ - 'subject' => 'Pembayaran diterima untuk faktur {invoice_number}', - 'body' => 'Dear {customer_name},

Terima kasih atas pembayarannya. Temukan detail pembayaran di bawah ini:

------------------------------------ -------------
Jumlah: {transaction_total}
Tanggal: {transaction_paid_date}
Faktur Nomor: {invoice_number}
---------------------------------- ---------------

Anda selalu dapat melihat detail faktur dari tautan berikut: {invoice_number} .

Jangan ragu untuk menghubungi kami jika ada pertanyaan.

Salam,
{company_name}', + 'subject' => 'Payment received for {invoice_number} invoice', + 'body' => 'Dear {customer_name},

Thank you for the payment. Find the payment details below:

-------------------------------------------------

Amount: {transaction_total}
Date: {transaction_paid_date}
Invoice Number: {invoice_number}

-------------------------------------------------

You can always see the invoice details from the following link: {invoice_number}.

Feel free to contact us for any question.

Best Regards,
{company_name}', ], 'invoice_payment_admin' => [ - 'subject' => 'Pembayaran diterima untuk faktur {invoice_number}', - 'body' => 'Halo,

Berdasarkan lingkaran berulang {customer_name}, {invoice_number} faktur telah dibuat secara otomatis.

Anda dapat melihat detail faktur dari tautan berikut: {invoice_number} .

Salam,
{company_name}', + 'subject' => 'Payment received for {invoice_number} invoice', + 'body' => 'Hello,

{customer_name} recorded a payment for {invoice_number} invoice.

You can see the invoice details from the following link: {invoice_number}.

Best Regards,
{company_name}', ], 'bill_remind_admin' => [ - 'subject' => '{bill_number} pemberitahuan pengingat tagihan', - 'body' => 'Halo,

Ini adalah pemberitahuan untuk tagihan {bill_number} ke {vendor_name}.

Total tagihan adalah {bill_total} dan sudah jatuh tempo {bill_due_date} .

Anda dapat melihat detail tagihan dari tautan berikut: {bill_number} .

Salam,
{company_name}', + 'subject' => '{bill_number} bill reminding notice', + 'body' => 'Hello,

This is a reminding notice for {bill_number} bill to {vendor_name}.

The bill total is {bill_total} and is due {bill_due_date}.

You can see the bill details from the following link: {bill_number}.

Best Regards,
{company_name}', ], 'bill_recur_admin' => [ - 'subject' => '{bill_number} tagihan berulang dibuat', - 'body' => 'Halo,

Berdasarkan lingkaran berulang {customer_name}, {invoice_number} faktur telah dibuat secara otomatis.

Anda dapat melihat detail faktur dari tautan berikut: {invoice_number} .

Salam,
{company_name}', + 'subject' => '{bill_number} recurring bill created', + 'body' => 'Hello,

Based on {vendor_name} recurring circle, {bill_number} invoice has been automatically created.

You can see the bill details from the following link: {bill_number}.

Best Regards,
{company_name}', ], ]; diff --git a/resources/lang/id-ID/errors.php b/resources/lang/id-ID/errors.php index e6fd24d3d..1b0b48112 100644 --- a/resources/lang/id-ID/errors.php +++ b/resources/lang/id-ID/errors.php @@ -2,22 +2,20 @@ return [ - 'title' => [ - '403' => 'Mohon maaf! Akses halaman ditolak', - '404' => 'Mohon maaf! Halaman tidak ditemukan', - '500' => 'Ups. Terjadi kesalahan', + 'forbidden_access' => 'Akses tidak diizinkan', + 'error_page' => 'Halaman error.', + 'page_not_found' => 'Halaman tidak ditemukan', + + 'body' => [ + 'forbidden_access' => 'Mohon maaf! Akses halaman ditolak.', + 'error_page' => 'Mohon maaf! Terdapat sesuatu yang salah.', + 'page_not_found' => 'Mohon maaf! Halaman tidak ditemukan.', ], - 'header' => [ - '403' => '403 Dilarang', - '404' => '404 Tidak ditemukan', - '500' => 'Kesalahan server internal 500', - ], - - 'message' => [ - '403' => 'Anda tidak dapat mengakses halaman ini.', - '404' => 'Kami tidak dapat menemukan halaman yang Anda cari.', - '500' => 'Kami akan segera memperbaikinya.', + 'messages' => [ + 'forbidden_access' => 'Anda tidak dapat mengakses halaman ini. Tetapi, mungkin Anda dapat kembali ke Beranda..', + 'error_page' => 'Kami akan memperbaikinya. Tetapi, mungkin Anda dapat kembali ke Beranda.', + 'page_not_found' => 'Kami tidak dapat menemukan halaman yang Anda maksud. Tetapi, mungkin Anda dapat kembali ke Beranda.', ], ]; diff --git a/resources/lang/id-ID/general.php b/resources/lang/id-ID/general.php index 953f01aae..72eab3dda 100644 --- a/resources/lang/id-ID/general.php +++ b/resources/lang/id-ID/general.php @@ -2,7 +2,7 @@ return [ - 'dashboards' => 'Dasbor|Dasbor', + 'dashboards' => 'Dashboard|Dashboards', 'items' => 'Item|Item', 'incomes' => 'Pendapatan| Pendapatan', 'invoices' => 'Faktur | faktur', @@ -42,17 +42,15 @@ return [ 'contacts' => 'Kontak', 'reconciliations' => 'Rekonsiliasi|Rekonsiliasi', 'developers' => 'Pengembang|Pengembang', - 'schedules' => 'Jadwal|Jadwal', - 'groups' => 'Grup|Grup', - 'charts' => 'Bagan|Bagan', - 'localisations' => 'Lokalisasi|Lokalisasi', + 'schedules' => 'Schedule|Schedules', + 'groups' => 'Group|Groups', + 'charts' => 'Chart|Charts', + 'localisations' => 'Localisation|Localisations', 'defaults' => 'Default|Defaults', - 'widgets' => 'Widget|Widget', - 'templates' => 'Templat|Templat', - 'sales' => 'Penjualan|Penjualan', - 'purchases' => 'Pembelian|Pembelian', + 'widgets' => 'Widget|Widgets', - 'welcome' => 'Selamat datang', + 'dashboard' => 'Dasbor', + 'welcome' => 'Welcome', 'banking' => 'Perbankan', 'general' => 'Umum', 'no_records' => 'Tidak ada catatan.', @@ -64,19 +62,16 @@ return [ 'no' => 'Tidak', 'na' => 'N/A', 'daily' => 'Harian', - 'weekly' => 'Mingguan', + 'weekly' => 'Weekly', 'monthly' => 'Bulanan', 'quarterly' => 'Tiga Bulan', 'yearly' => 'Tahunan', 'add' => 'Menambahkan', 'add_new' => 'Tambah Baru', - 'add_income' => 'Tambahkan pendapatan', - 'add_expense' => 'Tambahkan Biaya', 'show' => 'Menampilkan', 'edit' => 'Sunting', 'delete' => 'Hapus', 'send' => 'Kirim', - 'share' => 'Bagikan', 'download' => 'Unduh', 'delete_confirm' => 'Konfirmasi hapus :nama :jenis?', 'name' => 'Nama', @@ -94,11 +89,11 @@ return [ 'reference' => 'Referensi', 'attachment' => 'Lampiran', 'change' => 'Perubahan', - 'change_type' => 'Ubah tipe', + 'change_type' => 'Change :type', 'switch' => 'Beralih', 'color' => 'Warna', 'save' => 'Simpan', - 'confirm' => 'Konfirmasi', + 'confirm' => 'Confirm', 'cancel' => 'Batal', 'loading' => 'Sedang memuat...', 'from' => 'Dari', @@ -128,47 +123,30 @@ return [ 'disable' => 'Nonaktif', 'select_all' => 'Pilih Semua', 'unselect_all' => 'Batalkan Memilih Semua', + 'go_to' => 'Menuju ke :name', 'created_date' => 'Tanggal Dibuat', 'period' => 'Periode', - 'frequency' => 'Frekuensi', + 'frequency' => 'Frequency', 'start' => 'Mulai', 'end' => 'Selesai', 'clear' => 'Hapus', 'difference' => 'Perbedaan', 'footer' => 'Footer', - 'start_date' => 'Tanggal Mulai', - 'end_date' => 'Tanggal Akhir', + 'start_date' => 'Start Date', 'basis' => 'Basis', - 'accrual' => 'akrual', - 'cash' => 'Tunai', - 'group_by' => 'Kelompok', - 'accounting' => 'Akuntansi', - 'sort' => 'Urutkan', - 'width' => 'lebar', - 'month' => 'Bulan', - 'year' => 'tahun', - 'type_item_name' => 'Ketik nama item', - 'no_data' => 'Tidak ada data', - 'no_matching_data' => 'Tidak ada data yang cocok', - 'clear_cache' => 'Hapus Cache', - 'go_to_dashboard' => 'Buka dasbor', - - 'card' => [ - 'name' => 'Nama pada Kartu', - 'number' => 'Nomor Kartu', - 'expiration_date' => 'Tanggal Kadaluwarsa', - 'cvv' => 'Kartu CVV', - ], + 'accrual' => 'Accrual', + 'cash' => 'Cash', + 'group_by' => 'Group By', + 'accounting' => 'Accounting', 'title' => [ 'new' => 'Baru :type', 'edit' => 'Sunting :type', - 'delete' => 'Hapus: jenis', + 'delete' => 'Delete :type', 'create' => 'Buat :type', 'send' => 'Kirim :type', 'get' => 'Ambil :type', - 'add' => 'Tambahkan: jenis', - 'manage' => 'Mengelola: jenis', + 'add' => 'Add :type', ], 'form' => [ @@ -177,7 +155,7 @@ return [ 'field' => '-Pilih :field -', 'file' => 'Pilih Berkas', ], - 'add_new' => 'Tambah kolom baru', + 'add_new' => 'Add New :field', 'no_file_selected' => 'Tidak ada Berkas yang dipilih...', ], @@ -190,17 +168,14 @@ return [ ], 'empty' => [ - 'documentation' => 'Periksa dokumentasi untuk detail lebih lanjut.', - 'items' => 'Item dapat berupa produk atau layanan. Anda dapat menggunakan item saat membuat faktur dan tagihan untuk mengisi bidang harga, pajak, dll.', - 'invoices' => 'Faktur bisa sekali atau berulang. Anda dapat mengirimnya ke pelanggan dan mulai menerima pembayaran online.', - 'revenues' => 'Pendapatan adalah transaksi pendapatan yang dibayar. Itu bisa berupa catatan independen (mis. Setoran) atau dilampirkan pada faktur.', - 'customers' => 'Pelanggan diharuskan jika Anda ingin membuat faktur. Mereka juga dapat masuk ke Portal Klien dan melihat saldo mereka.', - 'bills' => 'Tagihan bisa sekali atau berulang. Mereka menunjukkan apa yang Anda berutang kepada vendor Anda untuk produk atau layanan yang Anda beli.', - 'payments' => 'Pembayaran adalah transaksi biaya yang dibayarkan. Itu bisa berupa catatan independen (mis. Kwitansi makanan) atau dilampirkan pada tagihan.', - 'vendors' => 'Vendor diperlukan jika Anda ingin membuat tagihan. Anda dapat melihat saldo Anda berutang dan memfilter laporan oleh vendor.', - 'transfers' => 'Transfer memungkinkan Anda untuk memindahkan uang dari satu akun ke akun lain, apakah mereka menggunakan mata uang yang sama atau tidak.', - 'taxes' => 'Pajak digunakan untuk menerapkan biaya tambahan untuk faktur dan tagihan. Keuangan Anda dipengaruhi oleh pajak pengaturan ini.', - 'reconciliations' => 'Rekonsiliasi bank adalah proses yang dilakukan untuk memastikan bahwa catatan bank perusahaan Anda juga benar.', + 'documentation' => 'Check out the documentation for more details.', + 'items' => 'Items can be products or services. You can use items when creating invoices and bills to have the price, tax etc fields populated.', + 'invoices' => 'Invoices can be one time or recurring. You can send them to customers and start accepting online payments.', + 'revenues' => 'Revenue is a paid income transaction. It can be an independent record (i.e. deposit) or attached to an invoice.', + 'customers' => 'Customers are required if you want to create invoices. They may also log in to Client Portal and see their balance.', + 'bills' => 'Bills can be one time or recurring. They indicate what you owe your vendors for the products or services you purchase.', + 'payments' => 'Payment is a paid expense transaction. It can be an independent record (i.e. food receipt) or attached to a bill.', + 'vendors' => 'Vendors are required if you want to create bills. You can see the balance you owe and filter reports by the vendor.', ], ]; diff --git a/resources/lang/id-ID/install.php b/resources/lang/id-ID/install.php index a5bab95b1..269702674 100644 --- a/resources/lang/id-ID/install.php +++ b/resources/lang/id-ID/install.php @@ -2,8 +2,8 @@ return [ - 'next' => 'Berikutnya', - 'refresh' => 'Muat Ulang', + 'next' => 'Selanjutnya', + 'refresh' => 'Menyegarkan', 'steps' => [ 'requirements' => 'Silakan meminta penyedia hosting Anda untuk memperbaiki kesalahan!', @@ -21,14 +21,13 @@ return [ 'disabled' => ':feature perlu dinonaktifkan!', 'extension' => ': ekstensi ekstensi perlu diinstal dan dimuat!', 'directory' => ':directory direktori perlu ditulis!', - 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', ], 'database' => [ 'hostname' => 'Nama host', 'username' => 'Nama pengguna', 'password' => 'Kata Sandi', - 'name' => 'Database', + 'name' => 'Basis data', ], 'settings' => [ diff --git a/resources/lang/id-ID/invoices.php b/resources/lang/id-ID/invoices.php index 9c2ff55c2..b699af51a 100644 --- a/resources/lang/id-ID/invoices.php +++ b/resources/lang/id-ID/invoices.php @@ -13,7 +13,6 @@ return [ 'price' => 'Harga', 'sub_total' => 'Subtotal', 'discount' => 'Diskon', - 'item_discount' => 'Potongan Harga', 'tax_total' => 'Total Pajak', 'total' => 'Total', @@ -30,8 +29,6 @@ return [ 'add_payment' => 'Tambahkan Pembayaran', 'mark_paid' => 'Ditandai Dibayar', 'mark_sent' => 'Tandai Dikirim', - 'mark_viewed' => 'Tandai Dilihat', - 'mark_cancelled' => 'Tandai dibatalkan', 'download_pdf' => 'Unduh PDF', 'send_mail' => 'Kirim Email', 'all_invoices' => 'Masuk untuk melihat seluruh faktur', @@ -42,28 +39,23 @@ return [ 'statuses' => [ 'draft' => 'Konsep', - 'sent' => 'Terkirim', - 'viewed' => 'Dilihat', + 'sent' => 'Mengirim', + 'viewed' => 'Lihat', 'approved' => 'Disetujui', 'partial' => 'Sebagian', 'paid' => 'Dibayar', - 'overdue' => 'Jatuh Tempo', - 'unpaid' => 'Belum Dibayar', - 'cancelled' => 'Dibatalkan', ], 'messages' => [ - 'email_sent' => 'Email faktur telah dikirim!', - 'marked_sent' => 'Faktur ditandai sebagai terkirim!', - 'marked_paid' => 'Faktur ditandai sebagai berbayar!', - 'marked_viewed' => 'Tagihan ditandai sudah dilihat', - 'marked_cancelled' => 'Tagihan ditandai sudah dibatalkan', + 'email_sent' => 'Invoice email has been sent!', + 'marked_sent' => 'Invoice marked as sent!', + 'marked_paid' => 'Invoice marked as paid!', 'email_required' => 'Tidak ada alamat email untuk pelanggan ini!', 'draft' => 'Faktur ini merupakan DRAFT dan akan terlihat pada grafik ketika sudah dibayarkan', 'status' => [ 'created' => 'Dibuat pada :date', - 'viewed' => 'Dilihat', + 'viewed' => 'Viewed', 'send' => [ 'draft' => 'Tidak terkirim', 'sent' => 'Terkirim pada :date', diff --git a/resources/lang/id-ID/maintenance.php b/resources/lang/id-ID/maintenance.php index eda6c79b4..08d595e60 100644 --- a/resources/lang/id-ID/maintenance.php +++ b/resources/lang/id-ID/maintenance.php @@ -2,10 +2,10 @@ return [ - 'title' => 'Dalam perbaikan', + 'title' => 'Maintenance Mode', - 'message' => 'Maaf, kami sedang dalam perbaikan. Silakan coba lagi nanti!', + 'message' => 'We\'re currently working on the site, please try again later!', - 'last-updated' => 'Pesan ini telah diperbarui: timestamp.', + 'last-updated' => 'This message was last updated :timestamp', -]; +]; \ No newline at end of file diff --git a/resources/lang/id-ID/messages.php b/resources/lang/id-ID/messages.php index 4bf78a464..826447821 100644 --- a/resources/lang/id-ID/messages.php +++ b/resources/lang/id-ID/messages.php @@ -8,7 +8,6 @@ return [ 'deleted' => ':type dihapus!', 'duplicated' => ':type duplikat!', 'imported' => ':type diimpor!', - 'exported' => ':type diimpor!', 'enabled' => ':type diaktifkan!', 'disabled' => ':type dinonaktifkan!', ], @@ -19,8 +18,8 @@ return [ 'customer' => 'Galat: Pengguna tidak dibuat! :name telah menggunakan alamat email ini.', 'no_file' => 'Kesalahan: Tidak ada file dipilih!', 'last_category' => 'Error: Tidak dapat menghapus kategori :type terakhir!', - 'change_type' => 'Kesalahan: Tidak dapat mengubah jenis karena memiliki: teks terkait!', - 'invalid_apikey' => 'Galat: Token yang dimasukkan tidak sah!', + 'change_type' => 'Error: Can not change the type because it has :text related!', + 'invalid_apikey' => 'Error: The API Key entered is invalid!', 'import_column' => 'Error: :message Nama sheet: :sheet. Baris ke :line.', 'import_sheet' => 'Error: Nama sheet tidak valid. Mohon untuk memeriksa contoh file yang tersedia.', ], @@ -28,10 +27,8 @@ return [ 'warning' => [ 'deleted' => 'PeringatanL: Anda tidak boleh menghapus :name karena memiliki :text terkaitan.', 'disabled' => 'Peringatan: Anda tidak boleh menonaktifkan:name karena memiliki :text terkaitan.', - 'reconciled_tran' => 'Perhatian: tidak diperbolehkan merubah/ menghapus transaksi karena sudah direkonsilasi', - 'reconciled_doc' => 'Perhatian: tidak diperbolehkan merubah/ menghapus :type karena transaksi sudah direkonsilasi', 'disable_code' => 'Peringatan: Anda tidak diizinkan untuk menonaktifkan atau mengubah kurs :name karena memiliki keterkaitan dengan :text.', - 'payment_cancel' => 'Peringatan: kamu tidak dapat membatalkan :metode pembayaran!', + 'payment_cancel' => 'Warning: You have cancelled your recent :method payment!', ], ]; diff --git a/resources/lang/id-ID/modules.php b/resources/lang/id-ID/modules.php index ca9036b47..e27efe768 100644 --- a/resources/lang/id-ID/modules.php +++ b/resources/lang/id-ID/modules.php @@ -2,7 +2,7 @@ return [ - 'api_key' => 'Kunci API', + 'api_key' => 'API Key', 'my_apps' => 'Aplikasi saya', 'pre_sale' => 'Pra Penjualan', 'top_paid' => 'Dibayar atas', @@ -12,9 +12,10 @@ return [ 'search' => 'Cari', 'install' => 'Pasang', 'buy_now' => 'Beli Sekarang', - 'get_api_key' => 'Klik disini untuk mendapatkan Kunci API.', + 'api_key_link' => 'Click here to get your API key.', 'no_apps' => 'Belum ada aplikasi dalam kategori ini.', - 'become_developer' => 'Apakah Anda seorang pengembang? Di Sini Anda dapat belajar cara membuat aplikasi dan mulai menjual hari ini!', + 'developer' => 'Are you a developer? Here you can learn how to create an app and start selling today!', + 'recommended_apps' => 'Aplikasi yang direkomendasikan', 'about' => 'Tentang', @@ -41,20 +42,20 @@ return [ 'installation' => [ 'header' => 'Instalasi Aplikasi', - 'download' => 'Mengunduh :module', - 'unzip' => 'Mengekstrak :module file.', - 'file_copy' => 'Menyalin file :module.', - 'finish' => 'Finalisasi: pemasangan modul', - 'redirect' => ': modul terpasang, mengarahkan ke halaman pembaruan', - 'install' => 'Memasang: modul', + 'download' => 'Downloading :module', + 'unzip' => 'Extracting :module files', + 'file_copy' => 'Copying :module files', + 'finish' => 'Finalizing :module installation', + 'redirect' => ':module installed, redirecting to updates page', + 'install' => 'Installing :module', ], 'errors' => [ - 'download' => 'Tidak dapat mengunduh: modul', - 'zip' => 'Tidak dapat membuat: file zip modul', - 'unzip' => 'Tidak dapat unzip: modul', - 'file_copy' => 'Tidak dapat menyalin: file modul', - 'finish' => 'Tidak dapat menyelesaikan: pemasangan modul', + 'download' => 'Not able to download :module', + 'zip' => 'Not able to create :module zip file', + 'unzip' => 'Not able to unzip :module', + 'file_copy' => 'Not able to copy :module files', + 'finish' => 'Not able to finalize :module installation', ], 'badge' => [ @@ -79,6 +80,5 @@ return [ ], 'na' => 'Tidak ada ulasan.' - ], - + ] ]; diff --git a/resources/lang/id-ID/pagination.php b/resources/lang/id-ID/pagination.php index 55e5d4721..363637bfd 100644 --- a/resources/lang/id-ID/pagination.php +++ b/resources/lang/id-ID/pagination.php @@ -2,9 +2,9 @@ return [ - 'previous' => 'Sebelumnya', - 'next' => 'Berikutnya', + 'previous' => '« Sebelumnya', + 'next' => 'Berikutnya »', 'showing' => ':first-:last of :total records.', - 'page' => 'per halaman.', + 'page' => 'per page.', ]; diff --git a/resources/lang/id-ID/passwords.php b/resources/lang/id-ID/passwords.php index 049fc45d9..074dc2a21 100644 --- a/resources/lang/id-ID/passwords.php +++ b/resources/lang/id-ID/passwords.php @@ -18,6 +18,5 @@ return [ 'sent' => 'Kami sudah mengirim email yang berisi tautan untuk mereset kata sandi Anda!', 'token' => 'Kata sandi token pengaturan ulang tidak sah.', 'user' => "Kami tidak dapat menemukan pengguna dengan alamat surel tersebut.", - 'throttle' => 'Please wait before retrying.', ]; diff --git a/resources/lang/id-ID/reconciliations.php b/resources/lang/id-ID/reconciliations.php index 737de2dbd..8d1ffd99c 100644 --- a/resources/lang/id-ID/reconciliations.php +++ b/resources/lang/id-ID/reconciliations.php @@ -6,7 +6,7 @@ return [ 'reconciled' => 'Terekonsiliasi', 'closing_balance' => 'Saldo Akhir', 'unreconciled' => 'Tidak Terekonsiliasi', - 'transactions' => 'Transaksi', + 'transactions' => 'Transactions', 'start_date' => 'Tanggal Mulai', 'end_date' => 'Tanggal Berakhir', 'cleared_amount' => 'Jumlah yang dihapus', diff --git a/resources/lang/id-ID/reports.php b/resources/lang/id-ID/reports.php index 85a44e2fe..bdb0b4b0f 100644 --- a/resources/lang/id-ID/reports.php +++ b/resources/lang/id-ID/reports.php @@ -12,7 +12,7 @@ return [ 'net_profit' => 'Laba Bersih', 'total_expenses' => 'Total Pengeluaran', 'net' => 'Laba Bersih', - 'income_expense' => 'Pendapatan & Pengeluaran', + 'income-expense' => 'Income & Expense', 'summary' => [ 'income' => 'Ringkasan Pendapatan', @@ -22,9 +22,9 @@ return [ ], 'charts' => [ - 'line' => 'Baris', - 'bar' => 'Batang', - 'pie' => 'Lingkaran', + 'line' => 'Line', + 'bar' => 'Bar', + 'pie' => 'Pie', ], ]; diff --git a/resources/lang/id-ID/settings.php b/resources/lang/id-ID/settings.php index 0d993ff92..2c6e97c5b 100644 --- a/resources/lang/id-ID/settings.php +++ b/resources/lang/id-ID/settings.php @@ -12,7 +12,7 @@ return [ ], 'localisation' => [ - 'description' => 'Tetapkan tahun fiskal, zona waktu, format tanggal dan lebih banyak penduduk lokal', + 'description' => 'Set fiscal year, time zone, date format and more locals', 'financial_start' => 'Waktu mulai Periode Keuangan', 'timezone' => 'Zona Waktu', 'date' => [ @@ -29,16 +29,10 @@ return [ 'before' => 'Sebelum Nomor', 'after' => 'Sesudah Nomor', ], - 'discount_location' => [ - 'name' => 'Lokasi Diskon', - 'item' => 'pada baris', - 'total' => 'Pada jumlah', - 'both' => 'Pada baris dan jumlah', - ], ], 'invoice' => [ - 'description' => 'Kustomisasi awalan faktur, nomor, syarat, catatan kaki dll', + 'description' => 'Customize invoice prefix, number, terms, footer etc', 'prefix' => 'Prefix Nomor', 'digit' => 'Digit nomor', 'next' => 'Nomor Berikutnya', @@ -58,20 +52,16 @@ return [ 'subheading' => 'Subjudul', 'due_receipt' => 'Jatuh tempo saat diterima', 'due_days' => 'Jatuh tempo dalam :days hari', - 'choose_template' => 'Pilih template faktur', - 'default' => 'Default', - 'classic' => 'Klasik', - 'modern' => 'Modern', ], 'default' => [ - 'description' => 'Akun default, mata uang, bahasa perusahaan Anda', - 'list_limit' => 'Data Per Laman', - 'use_gravatar' => 'Gunakan Gravatar', + 'description' => 'Default account, currency, language of your company', + 'list_limit' => 'Records Per Page', + 'use_gravatar' => 'Use Gravatar', ], 'email' => [ - 'description' => 'Ubah protokol pengiriman dan templat email', + 'description' => 'Change the sending protocol and email templates', 'protocol' => 'Protokol', 'php' => 'PHP Mail', 'smtp' => [ @@ -88,24 +78,24 @@ return [ 'log' => 'Log Email', 'templates' => [ - 'subject' => 'Subjek', - 'body' => 'Badan', - 'tags' => ' Tag yang Tersedia: : tag_list', - 'invoice_new_customer' => 'Templat Faktur Baru (dikirim ke pelanggan)', - 'invoice_remind_customer' => 'Templat Pengingat Faktur (dikirim ke pelanggan)', - 'invoice_remind_admin' => 'Templat Pengingat Faktur (dikirim ke admin)', - 'invoice_recur_customer' => 'Templat Berulang Faktur (dikirim ke pelanggan)', - 'invoice_recur_admin' => 'Templat Berulang Faktur (dikirim ke admin)', - 'invoice_payment_customer' => 'Template Penerimaan Pembayaran (dikirim ke pelanggan)', - 'invoice_payment_admin' => 'Template Penerimaan Pembayaran (dikirim ke admin)', - 'bill_remind_admin' => 'Templat Pengingat Tagihan (dikirim ke admin)', - 'bill_recur_admin' => 'Templat Perulangan Tagihan (dikirim ke admin)', + 'subject' => 'Subject', + 'body' => 'Body', + 'tags' => 'Available Tags: :tag_list', + 'invoice_new_customer' => 'New Invoice Template (sent to customer)', + 'invoice_remind_customer' => 'Invoice Reminder Template (sent to customer)', + 'invoice_remind_admin' => 'Invoice Reminder Template (sent to admin)', + 'invoice_recur_customer' => 'Invoice Recurring Template (sent to customer)', + 'invoice_recur_admin' => 'Invoice Recurring Template (sent to admin)', + 'invoice_payment_customer' => 'Payment Received Template (sent to customer)', + 'invoice_payment_admin' => 'Payment Received Template (sent to admin)', + 'bill_remind_admin' => 'Bill Reminder Template (sent to admin)', + 'bill_recur_admin' => 'Bill Recurring Template (sent to admin)', ], ], 'scheduling' => [ - 'name' => 'Penjadwalan', - 'description' => 'Pengingat dan perintah otomatis untuk berulang', + 'name' => 'Scheduling', + 'description' => 'Automatic reminders and command for recurring', 'send_invoice' => 'Kirim Pengingat Faktur', 'invoice_days' => 'Kirim Setelah Jatuh Tempo', 'send_bill' => 'Kirim Pengingat Tagihan', @@ -115,15 +105,15 @@ return [ ], 'categories' => [ - 'description' => 'Kategori tidak terbatas untuk penghasilan, pengeluaran, dan barang', + 'description' => 'Unlimited categories for income, expense, and item', ], 'currencies' => [ - 'description' => 'Buat dan kelola mata uang dan tetapkan nilainya', + 'description' => 'Create and manage currencies and set their rates', ], 'taxes' => [ - 'description' => 'Tarif pajak tetap, normal, inklusif, dan gabungan', + 'description' => 'Fixed, normal, inclusive, and compound tax rates', ], ]; diff --git a/resources/lang/id-ID/taxes.php b/resources/lang/id-ID/taxes.php index 1c66a265d..a50279638 100644 --- a/resources/lang/id-ID/taxes.php +++ b/resources/lang/id-ID/taxes.php @@ -7,5 +7,5 @@ return [ 'normal' => 'Normal', 'inclusive' => 'Inklusif', 'compound' => 'Campuran', - 'fixed' => 'Diperbaiki', + 'fixed' => 'Fixed', ]; diff --git a/resources/lang/id-ID/validation.php b/resources/lang/id-ID/validation.php index 5371b4a46..683b53e68 100644 --- a/resources/lang/id-ID/validation.php +++ b/resources/lang/id-ID/validation.php @@ -100,11 +100,10 @@ return [ 'custom' => [ 'attribute-name' => [ - 'rule-name' => 'kustomisasi-pesan', + 'rule-name' => 'kustomisasi-pesan', ], - 'invalid_currency' => ':attribute kode tidak valid.', - 'invalid_amount' => 'Jumlah :attribute tidak valid.', - 'invalid_extension' => 'Ekstensi file tidak valid', + 'invalid_currency' => ':attribute kode tidak valid.', + 'invalid_amount' => 'Jumlah :attribute tidak valid.', ], /* diff --git a/resources/lang/it-IT/install.php b/resources/lang/it-IT/install.php index fc6603a16..972e26c06 100644 --- a/resources/lang/it-IT/install.php +++ b/resources/lang/it-IT/install.php @@ -21,7 +21,7 @@ return [ 'disabled' => ':feature deve essere disabilitata!', 'extension' => ':extension estensione deve essere installata e caricata!', 'directory' => 'la cartella :directory deve essere scrivibile!', - 'executable' => 'Il file eseguibile PHP CLI non è definito/non funziona o la versione non è :php_version o superiore! Si prega di chiedere alla società di hosting di impostare correttamente la variabile d\'ambiente PHP_BINARY o PHP_PATH.', + 'executable' => 'Il file eseguibile PHP CLI non funziona! Si prega di chiedere alla società di hosting di impostare correttamente la variabile d\'ambiente PHP_BINARY o PHP_PATH.', ], 'database' => [ diff --git a/resources/lang/ja-JP/bills.php b/resources/lang/ja-JP/bills.php index d1d1eafc9..91b5fe4a8 100644 --- a/resources/lang/ja-JP/bills.php +++ b/resources/lang/ja-JP/bills.php @@ -13,7 +13,6 @@ return [ 'price' => '価格', 'sub_total' => '小計', 'discount' => '割引', - 'item_discount' => 'ライン割引', 'tax_total' => '税合計', 'total' => '合計', @@ -29,9 +28,7 @@ return [ 'histories' => '記録', 'payments' => '支払い', 'add_payment' => '支払いを追加', - 'mark_paid' => '有給マーク', 'mark_received' => '受信マーク', - 'mark_cancelled' => 'キャンセル済みとマーク', 'download_pdf' => 'PDFをダウンロード', 'send_mail' => 'メールを送る', 'create_bill' => '請求書を作成', @@ -45,14 +42,10 @@ return [ 'paid' => '支払済み', 'overdue' => '遅れた', 'unpaid' => '未払い', - 'cancelled' => 'キャンセル', ], 'messages' => [ - 'marked_received' => 'ビルは受領済みとしてマークされました！', - 'marked_paid' => '支払い済みとしてマークされたビル！', - 'marked_cancelled' => 'ビルはキャンセル済みとマークされました! -', + 'received' => '請求書は正常に受信されたとマークされました。', 'draft' => 'これはドラフト請求書で、受け取り後にチャートに反映されます。', 'status' => [ diff --git a/resources/lang/ja-JP/bulk_actions.php b/resources/lang/ja-JP/bulk_actions.php index dcdbadd03..7d3b70bf5 100644 --- a/resources/lang/ja-JP/bulk_actions.php +++ b/resources/lang/ja-JP/bulk_actions.php @@ -2,9 +2,8 @@ return [ - 'bulk_actions' => '一括アクション|一括アクション', - 'selected' => '選択中', - 'no_action' => '利用可能なアクションはありません', + 'bulk_actions' => '一括アクション|一括アクション', + 'selected' => '選択中', 'message' => [ 'duplicate' => '選択したレコードを複製してもよろしいですか?', @@ -15,8 +14,6 @@ return [ 'paid' => '選択した請求書にマークを付けてもよろしいですか 支払った?|選択した請求書にマークを付けてもよろしいですか支払った?', 'sent' => '選択した請求書にマークを付けてもよろしいですか 送った?|選択した請求書にマークを付けてもよろしいですか送った?', 'received' => '選択した請求書にマークを付けてもよろしいですか 受け取った?|選択した請求書にマークを付けてもよろしいですか受け取った?', - 'cancelled' => '本当によろしいですか キャンセル 選択された請求書/請求書?|本当によろしいですか キャンセル 選択された請求書/請求書? -', ], ]; diff --git a/resources/lang/ja-JP/install.php b/resources/lang/ja-JP/install.php index 8138ad440..ec447d749 100644 --- a/resources/lang/ja-JP/install.php +++ b/resources/lang/ja-JP/install.php @@ -21,7 +21,6 @@ return [ 'disabled' => ':feature 無効にする必要があります！', 'extension' => ':extension エクステンション 拡張機能をインストールしてロードする必要があります!', 'directory' => ':directory ディレクトリは書き込み可能である必要があります!', - 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', ], 'database' => [ diff --git a/resources/lang/ja-JP/invoices.php b/resources/lang/ja-JP/invoices.php index cf04788ba..af8096b07 100644 --- a/resources/lang/ja-JP/invoices.php +++ b/resources/lang/ja-JP/invoices.php @@ -13,7 +13,6 @@ return [ 'price' => '価格', 'sub_total' => '小計', 'discount' => '割引', - 'item_discount' => 'ライン割引', 'tax_total' => '税合計', 'total' => '合計', @@ -31,7 +30,6 @@ return [ 'mark_paid' => 'マークペイド', 'mark_sent' => '送信済みマーク', 'mark_viewed' => 'マーク済み', - 'mark_cancelled' => 'キャンセル済みとマーク', 'download_pdf' => 'PDFをダウンロード', 'send_mail' => 'メールを送る', 'all_invoices' => 'すべての請求書を表示するにはログインしてください', @@ -49,15 +47,12 @@ return [ 'paid' => '支払済み', 'overdue' => '遅れた', 'unpaid' => '未払い', - 'cancelled' => 'キャンセルしました', ], 'messages' => [ 'email_sent' => '請求書メールが送信されました！', 'marked_sent' => '請求書が送信済みとしてマークされました！', 'marked_paid' => '支払済みとしてマークされた請求書！', - 'marked_viewed' => '請求書は閲覧済みとしてマークされました！', - 'marked_cancelled' => 'キャンセル済みとしてマークされた請求書！', 'email_required' => 'この顧客のメールアドレスはありません。', 'draft' => 'これは ドラフト請求書で、送信後にチャートに反映されます。', diff --git a/resources/lang/ja-JP/messages.php b/resources/lang/ja-JP/messages.php index ecd252cdc..8d8fa1eda 100644 --- a/resources/lang/ja-JP/messages.php +++ b/resources/lang/ja-JP/messages.php @@ -28,8 +28,6 @@ return [ 'warning' => [ 'deleted' => '警告: 削除することはできません :name テキストに関連しているからです。 :text related.', 'disabled' => '警告: 無効にすることはできません :nameテキストに関連しているため :text related.', - 'reconciled_tran' => '警告：調整されているため、トランザクションを変更/削除することはできません！', - 'reconciled_doc' => '警告：トランザクションが調整されているため、:type を変更/削除することはできません！', 'disable_code' => '警告: 通貨を無効化または変更することはできません :name のため :text related.', 'payment_cancel' => '警告：最近キャンセルされた：お支払い方法！', ], diff --git a/resources/lang/ja-JP/passwords.php b/resources/lang/ja-JP/passwords.php index e8666e510..d1f081c8c 100644 --- a/resources/lang/ja-JP/passwords.php +++ b/resources/lang/ja-JP/passwords.php @@ -18,6 +18,5 @@ return [ 'sent' => 'パスワードリマインダーを送信しました。', 'token' => 'このパスワードリセットトークンは無効です。', 'user' => "このメールアドレスに一致するユーザーを見つけることが出来ませんでした。", - 'throttle' => '再試行する前にお待ちください。', ]; diff --git a/resources/lang/ja-JP/settings.php b/resources/lang/ja-JP/settings.php index a272cd827..41cc6cb47 100644 --- a/resources/lang/ja-JP/settings.php +++ b/resources/lang/ja-JP/settings.php @@ -29,12 +29,6 @@ return [ 'before' => '番号の前に', 'after' => '番号の後', ], - 'discount_location' => [ - 'name' => '割引の場所', - 'item' => 'ラインで', - 'total' => '合計で', - 'both' => 'ラインと合計の両方', - ], ], 'invoice' => [ diff --git a/resources/lang/ja-JP/validation.php b/resources/lang/ja-JP/validation.php index 52e3fb8ee..c1c0dd386 100644 --- a/resources/lang/ja-JP/validation.php +++ b/resources/lang/ja-JP/validation.php @@ -100,11 +100,10 @@ return [ 'custom' => [ 'attribute-name' => [ - 'rule-name' => 'カスタム メッセージ', + 'rule-name' => 'カスタム メッセージ', ], - 'invalid_currency' => '：属性コードが無効です。', - 'invalid_amount' => '総額：属性が無効です。', - 'invalid_extension' => 'ファイル拡張子が無効です。', + 'invalid_currency' => '：属性コードが無効です。', + 'invalid_amount' => '総額：属性が無効です。', ], /* diff --git a/resources/lang/pt-BR/install.php b/resources/lang/pt-BR/install.php index 565d53f4f..f6572a453 100644 --- a/resources/lang/pt-BR/install.php +++ b/resources/lang/pt-BR/install.php @@ -21,7 +21,7 @@ return [ 'disabled' => ':feature precisa esta desabilitado!', 'extension' => 'Extensão :extension precisa ser instalado e carregado!', 'directory' => 'O diretório :directory precisa de permissão para escrita!', - 'executable' => 'O arquivo executável do PHP CLI não está definido/funcionando ou sua versão não é :php_version ou superior! Por favor, peça à sua empresa de hospedagem que defina corretamente a variável de ambiente PHP_BINARY ou PHP_PATH.', + 'executable' => 'O arquivo executável PHP CLI não está funcionando! Por favor, peça à sua empresa de hospedagem para definir a variável PHP_BINARY ou PHP_PATH de ambiente corretamente.', ], 'database' => [ diff --git a/resources/lang/sq-AL/bills.php b/resources/lang/sq-AL/bills.php index 570cb7942..4f1401a74 100644 --- a/resources/lang/sq-AL/bills.php +++ b/resources/lang/sq-AL/bills.php @@ -13,7 +13,6 @@ return [ 'price' => 'Çmimi', 'sub_total' => 'Nëntotali', 'discount' => 'Skonto', - 'item_discount' => 'Linjë Zbritje', 'tax_total' => 'Tatimi Gjithsej', 'total' => 'Totali', @@ -31,7 +30,6 @@ return [ 'add_payment' => 'Shto Pagesë', 'mark_paid' => 'Shënoje të Paguar', 'mark_received' => 'Shënoje të Marrë', - 'mark_cancelled' => 'Shënoje të Anuluar', 'download_pdf' => 'Shkarko PDF', 'send_mail' => 'Dërgo Email', 'create_bill' => 'Krijo Faturë', @@ -45,13 +43,11 @@ return [ 'paid' => 'I paguar', 'overdue' => 'I vonuar', 'unpaid' => 'I papaguar', - 'cancelled' => 'Anuluar', ], 'messages' => [ - 'marked_received' => 'Fatura e shënuar si e marrë!', + 'received' => 'Fatura shënohet si i marrë me sukses!', 'marked_paid' => 'Fatura e shënuar si e paguar!', - 'marked_cancelled' => 'Fatura e shënuar si e anuluar!', 'draft' => 'Ky është një faturë DRAFT dhe do të pasqyrohet në skema pas marrjes së tij.', 'status' => [ diff --git a/resources/lang/sq-AL/bulk_actions.php b/resources/lang/sq-AL/bulk_actions.php index 46ec7e468..c4285e9e3 100644 --- a/resources/lang/sq-AL/bulk_actions.php +++ b/resources/lang/sq-AL/bulk_actions.php @@ -15,7 +15,6 @@ return [ 'paid' => 'Jeni i sigurt që doni të shënoni faturën e zgjedhur si të paguar?|Jeni i sigurt që doni të shënoni faturat e zgjedhura si të paguara?', 'sent' => 'Jeni i sigurt që doni të shënoni faturën e zgjedhur si të dërguar?|Jeni i sigurt që doni të shënoni faturat e zgjedhura si të dërguara?', 'received' => 'Jeni i sigurt që doni të shënoni faturën e zgjedhur si të pranuar?|Jeni i sigurt që doni të shënoni faturat e zgjedhura si të pranuara?', - 'cancelled' => 'Jeni i sigurt që doni të anuloni faturën e zgjedhur?|Jeni i sigurt që doni të anuloni faturat e zgjedhura?', ], ]; diff --git a/resources/lang/sq-AL/install.php b/resources/lang/sq-AL/install.php index c3ad2385c..b21629872 100644 --- a/resources/lang/sq-AL/install.php +++ b/resources/lang/sq-AL/install.php @@ -21,7 +21,6 @@ return [ 'disabled' => ':feature duhet të çaktivizohet!', 'extension' => ':extension shtesa duhet të instalohet dhe të ngarkohet!', 'directory' => ':directory lista duhet të jetë e shkrueshme!', - 'executable' => 'Skedari i ekzekutueshëm i PHP CLI nuk po funksionon ose versioni i tij nuk është :php_version ose më i lartë! Ju lutemi, pyetni kompaninë tuaj hosting që të vendosin në mënyrë korrekte vlerat e mjedisit PHP_BINARY ose PHP_PATH.', ], 'database' => [ diff --git a/resources/lang/sq-AL/invoices.php b/resources/lang/sq-AL/invoices.php index ec5bd5219..136f161dc 100644 --- a/resources/lang/sq-AL/invoices.php +++ b/resources/lang/sq-AL/invoices.php @@ -13,7 +13,6 @@ return [ 'price' => 'Çmimi', 'sub_total' => 'Nëntotali', 'discount' => 'Skonto', - 'item_discount' => 'Linjë Zbritje', 'tax_total' => 'Tatimi Gjithsej', 'total' => 'Totali', @@ -31,7 +30,6 @@ return [ 'mark_paid' => 'Shënoje të Paguar', 'mark_sent' => 'Shënoje të Dërguar', 'mark_viewed' => 'Shënoje të Shikuar', - 'mark_cancelled' => 'Shënoje të Anuluar', 'download_pdf' => 'Shkarko PDF', 'send_mail' => 'Dërgo Email', 'all_invoices' => 'Identifikohu për të parë të gjitha faturat', @@ -49,15 +47,12 @@ return [ 'paid' => 'I paguar', 'overdue' => 'I vonuar', 'unpaid' => 'I papaguar', - 'cancelled' => 'Anuluar', ], 'messages' => [ 'email_sent' => 'Emaili i faturës është dërguar!', 'marked_sent' => 'Fatura e shënuar si e dërguar!', 'marked_paid' => 'Fatura e shënuar si e paguar!', - 'marked_viewed' => 'Fatura e shënuar si e shikuar!', - 'marked_cancelled' => 'Fatura e shënuar si e anuluar!', 'email_required' => 'Ska adresë e-mail për këtë klient!', 'draft' => 'Kjo është një faturë DRAFT dhe do të pasqyrohet në skema pasi të jetë dërguar.', diff --git a/resources/lang/sq-AL/settings.php b/resources/lang/sq-AL/settings.php index ec711243a..d2622f9bf 100644 --- a/resources/lang/sq-AL/settings.php +++ b/resources/lang/sq-AL/settings.php @@ -29,12 +29,6 @@ return [ 'before' => 'Para Numrit', 'after' => 'Pas Numrit', ], - 'discount_location' => [ - 'name' => 'Vendndodhja e Zbritjes', - 'item' => 'Në rresht', - 'total' => 'Në total', - 'both' => 'Në rresht dhe në total', - ], ], 'invoice' => [ diff --git a/resources/lang/tr-TR/email_templates.php b/resources/lang/tr-TR/email_templates.php index cfc027526..f3cbb6452 100644 --- a/resources/lang/tr-TR/email_templates.php +++ b/resources/lang/tr-TR/email_templates.php @@ -3,7 +3,7 @@ return [ 'invoice_new_customer' => [ - 'subject' => '{invoice_number} fatura oluşturuldu', + 'subject' => '{invoice_number} fatura uluşturuldu', 'body' => 'Sayın {customer_name},

{invoice_number} numarası ile faturanızı hazırladık.

Aşağıdaki bağlantıdan faturanın detaylarını görüntüleyip ödemesini online olarak kredi/banka kartınızla yapabilirsiniz: {invoice_number}.

Herhangi bir sorunuz olursa lütfen bize yazın.

Kolay gelsin,
{company_name}', ], diff --git a/resources/lang/tr-TR/install.php b/resources/lang/tr-TR/install.php index ff9417118..61828ed29 100644 --- a/resources/lang/tr-TR/install.php +++ b/resources/lang/tr-TR/install.php @@ -21,7 +21,7 @@ return [ 'disabled' => ':feature devre dışı bırakılmalıdır!', 'extension' => ':extension eklendisi kurulmalı ve yüklenmelidir!', 'directory' => ':directory dizini yazılabilir olmalıdır!', - 'executable' => 'PHP CLI çalıştırıcısı bulunamadı veya çalışmıyor veya sürümü :php_version ve üstü değil. Lütfen, hosting firmanızdan PHP_BINARY veya PHP_PATH ortam değerlerini doğru ayarlamasını isteyin.', + 'executable' => 'PHP CLI çalıştırıcısı çalışmıyor. Lütfen, hosting firmanızdan PHP_BINARY veya PHP_PATH ortam değerlerini doğru ayarlamasını isteyin.', ], 'database' => [ diff --git a/resources/views/auth/permissions/index.blade.php b/resources/views/auth/permissions/index.blade.php index 706f7ed4e..6ea3f0687 100644 --- a/resources/views/auth/permissions/index.blade.php +++ b/resources/views/auth/permissions/index.blade.php @@ -4,7 +4,7 @@ @permission('create-auth-permissions') @section('new_button') -  {{ trans('general.add_new') }} + {{ trans('general.add_new') }} @endsection @endpermission diff --git a/resources/views/auth/roles/index.blade.php b/resources/views/auth/roles/index.blade.php index dc8229489..46632063e 100644 --- a/resources/views/auth/roles/index.blade.php +++ b/resources/views/auth/roles/index.blade.php @@ -4,7 +4,7 @@ @permission('create-auth-roles') @section('new_button') -  {{ trans('general.add_new') }} + {{ trans('general.add_new') }} @endsection @endpermission diff --git a/resources/views/auth/users/index.blade.php b/resources/views/auth/users/index.blade.php index 83f44bc26..ecce5dccd 100644 --- a/resources/views/auth/users/index.blade.php +++ b/resources/views/auth/users/index.blade.php @@ -4,7 +4,7 @@ @permission('create-auth-users') @section('new_button') -  {{ trans('general.add_new') }} + {{ trans('general.add_new') }} @endsection @endpermission diff --git a/resources/views/banking/accounts/index.blade.php b/resources/views/banking/accounts/index.blade.php index a3b30c3e0..3b93e416c 100644 --- a/resources/views/banking/accounts/index.blade.php +++ b/resources/views/banking/accounts/index.blade.php @@ -4,7 +4,7 @@ @section('new_button') @permission('create-banking-accounts') -  {{ trans('general.add_new') }} + {{ trans('general.add_new') }} @endpermission @endsection diff --git a/resources/views/banking/reconciliations/create.blade.php b/resources/views/banking/reconciliations/create.blade.php index 2dbb5c4f7..a5475ad20 100644 --- a/resources/views/banking/reconciliations/create.blade.php +++ b/resources/views/banking/reconciliations/create.blade.php @@ -25,7 +25,7 @@ {{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, request('account_id', setting('default.account')), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount'], 'col-xl-2') }}
- {!! Form::button('  ' . trans('reconciliations.transactions'), ['type' => 'button', '@click' => 'onReconcilition', 'class' => 'btn btn-success header-button-top']) !!} + {!! Form::button(trans('reconciliations.transactions'), ['type' => 'button', '@click' => 'onReconcilition', 'class' => 'btn btn-success header-button-top']) !!}
@@ -134,15 +134,15 @@
@if ($transactions->count())
-  {{ trans('general.cancel') }} + {{ trans('general.cancel') }} {!! Form::button( - '
' . ' ' . trans('reconciliations.reconcile') . '', - [':disabled' => 'reconcile || form.loading', '@click' => 'onReconcileSubmit', 'type' => 'button', 'class' => 'btn btn-icon btn-info header-button-top', 'data-loading-text' => trans('general.loading')]) !!} + ' ' . trans('reconciliations.reconcile') . '', + [':disabled' => 'reconcile || form.loading', '@click' => 'onReconcileSubmit', 'type' => 'button', 'class' => 'btn btn-icon btn-info header-button-top']) !!} {!! Form::button( - '
' . ' ' . trans('general.save') . '', - [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success header-button-top', 'data-loading-text' => trans('general.loading')]) !!} + ' ' . trans('general.save') . '', + [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success header-button-top']) !!}
@else
diff --git a/resources/views/banking/reconciliations/edit.blade.php b/resources/views/banking/reconciliations/edit.blade.php index b5227c98f..209a82034 100644 --- a/resources/views/banking/reconciliations/edit.blade.php +++ b/resources/views/banking/reconciliations/edit.blade.php @@ -107,15 +107,15 @@
@if ($transactions->count())
-  {{ trans('general.cancel') }} + {{ trans('general.cancel') }} {!! Form::button( - '
' . ' ' . trans('reconciliations.reconcile') . '', + ' ' . trans('reconciliations.reconcile') . '', [':disabled' => 'reconcile || form.loading', '@click' => 'onReconcileSubmit', 'type' => 'button', 'class' => 'btn btn-icon btn-info header-button-top', 'data-loading-text' => trans('general.loading')]) !!} {!! Form::button( - '
' . ' ' . trans('general.save') . '', - [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success header-button-top', 'data-loading-text' => trans('general.loading')]) !!} + ' ' . trans('general.save') . '', + [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success header-button-top']) !!}
@else
diff --git a/resources/views/banking/reconciliations/index.blade.php b/resources/views/banking/reconciliations/index.blade.php index 08cf8ec26..5b24ef6f6 100644 --- a/resources/views/banking/reconciliations/index.blade.php +++ b/resources/views/banking/reconciliations/index.blade.php @@ -4,7 +4,7 @@ @section('new_button') @permission('create-banking-reconciliations') -  {{ trans('general.add_new') }} + {{ trans('general.add_new') }} @endpermission @endsection diff --git a/resources/views/banking/transactions/index.blade.php b/resources/views/banking/transactions/index.blade.php index b9c749f35..eb6eac823 100644 --- a/resources/views/banking/transactions/index.blade.php +++ b/resources/views/banking/transactions/index.blade.php @@ -4,13 +4,13 @@ @section('new_button') @permission('create-sales-revenues') -  {{ trans('general.add_income') }} + {{ trans('general.add_income') }} @endpermission @permission('create-purchases-payments') -  {{ trans('general.add_expense') }} + {{ trans('general.add_expense') }} @endpermission -  {{ trans('import.import') }} -  {{ trans('general.export') }} + {{ trans('import.import') }} + {{ trans('general.export') }} @endsection @section('content') diff --git a/resources/views/banking/transfers/index.blade.php b/resources/views/banking/transfers/index.blade.php index cde2dc851..85a461b28 100644 --- a/resources/views/banking/transfers/index.blade.php +++ b/resources/views/banking/transfers/index.blade.php @@ -4,7 +4,7 @@ @permission('create-banking-transfers') @section('new_button') -  {{ trans('general.add_new') }} + {{ trans('general.add_new') }} @endsection @endpermission diff --git a/resources/views/common/companies/index.blade.php b/resources/views/common/companies/index.blade.php index 25e695001..3e7757cfe 100644 --- a/resources/views/common/companies/index.blade.php +++ b/resources/views/common/companies/index.blade.php @@ -4,7 +4,7 @@ @permission('create-common-companies') @section('new_button') -  {{ trans('general.add_new') }} + {{ trans('general.add_new') }} @endsection @endpermission diff --git a/resources/views/common/dashboards/index.blade.php b/resources/views/common/dashboards/index.blade.php index 15a1e7124..918e95913 100644 --- a/resources/views/common/dashboards/index.blade.php +++ b/resources/views/common/dashboards/index.blade.php @@ -4,7 +4,7 @@ @permission('create-common-dashboards') @section('new_button') -  {{ trans('general.add_new') }} + {{ trans('general.add_new') }} @endsection @endpermission diff --git a/resources/views/common/import/create.blade.php b/resources/views/common/import/create.blade.php index 50a032dd6..aab88ecb6 100644 --- a/resources/views/common/import/create.blade.php +++ b/resources/views/common/import/create.blade.php @@ -41,8 +41,8 @@
-  {{ trans('general.cancel') }} - {!! Form::button('  ' . trans('import.import'), ['type' => 'submit', 'class' => 'btn btn-success header-button-top']) !!} + {{ trans('general.cancel') }} + {!! Form::button(trans('import.import'), ['type' => 'submit', 'class' => 'btn btn-success']) !!}
diff --git a/resources/views/common/items/index.blade.php b/resources/views/common/items/index.blade.php index 945a1acd3..317a0a0bd 100644 --- a/resources/views/common/items/index.blade.php +++ b/resources/views/common/items/index.blade.php @@ -4,10 +4,10 @@ @section('new_button') @permission('create-common-items') -  {{ trans('general.add_new') }} -  {{ trans('import.import') }} + {{ trans('general.add_new') }} + {{ trans('import.import') }} @endpermission -  {{ trans('general.export') }} + {{ trans('general.export') }} @endsection @section('content') diff --git a/resources/views/common/reports/index.blade.php b/resources/views/common/reports/index.blade.php index a1df6af5d..5e4aa38c2 100644 --- a/resources/views/common/reports/index.blade.php +++ b/resources/views/common/reports/index.blade.php @@ -4,9 +4,9 @@ @section('new_button') @permission('create-common-reports') -  {{ trans('general.add_new') }} + {{ trans('general.add_new') }} @endpermission -  {{ trans('general.clear_cache') }} + {{ trans('general.clear_cache') }} @endsection @section('content') diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php index 832cc74df..f351f8df7 100644 --- a/resources/views/errors/403.blade.php +++ b/resources/views/errors/403.blade.php @@ -5,14 +5,17 @@ @section('content')
-

  {{ trans('errors.header.403') }}

+

+  {{ trans('errors.header.403') }} +

+

{{ trans('errors.message.403') }}

@php $landing_page = user() ? route(user()->landing_page) : route('login'); @endphp -  {{ trans('general.go_to_dashboard') }} + {{ trans('general.go_to_dashboard') }}
@endsection diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index 83ff8789e..3cf4cdeca 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -5,14 +5,17 @@ @section('content')
-

  {{ trans('errors.header.404') }}

+

+  {{ trans('errors.header.404') }} +

+

{{ trans('errors.message.404') }}

@php $landing_page = user() ? route(user()->landing_page) : route('login'); @endphp -  {{ trans('general.go_to_dashboard') }} + {{ trans('general.go_to_dashboard') }}
@endsection diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php index 047a69f42..301fef4cb 100644 --- a/resources/views/errors/500.blade.php +++ b/resources/views/errors/500.blade.php @@ -5,14 +5,17 @@ @section('content')
-

  {{ trans('errors.header.500') }}

+

+  {{ trans('errors.header.500') }} +

+

{{ trans('errors.message.500') }}

@php $landing_page = user() ? route(user()->landing_page) : route('login'); @endphp -  {{ trans('general.go_to_dashboard') }} + {{ trans('general.go_to_dashboard') }}
@endsection diff --git a/resources/views/install/updates/edit.blade.php b/resources/views/install/updates/edit.blade.php index 824b7ca28..50b349c66 100644 --- a/resources/views/install/updates/edit.blade.php +++ b/resources/views/install/updates/edit.blade.php @@ -3,7 +3,7 @@ @section('title', trans_choice('general.updates', 2)) @section('new_button') -  {{ trans('updates.check') }} + {{ trans('updates.check') }} @endsection @section('content') diff --git a/resources/views/install/updates/index.blade.php b/resources/views/install/updates/index.blade.php index 1c08c7872..29a72d4a7 100644 --- a/resources/views/install/updates/index.blade.php +++ b/resources/views/install/updates/index.blade.php @@ -3,7 +3,7 @@ @section('title', trans_choice('general.updates', 2)) @section('new_button') -  {{ trans('updates.check') }} + {{ trans('updates.check') }} @endsection @section('content') @@ -22,13 +22,14 @@
{{ trans('updates.new_core') }}
+
- -  {{ trans('updates.update', ['version' => $core]) }} + + {{ trans('updates.update', ['version' => $core]) }} +
@endif @@ -52,6 +53,7 @@ {{ trans('general.actions') }} + @if ($modules) @foreach($modules as $module) @@ -62,7 +64,7 @@ {{ $module->latest }} - {{ trans_choice('general.updates', 1) }} + {{ trans_choice('general.updates', 1) }} diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php index c5050f01e..ca10a00cf 100644 --- a/resources/views/layouts/admin.blade.php +++ b/resources/views/layouts/admin.blade.php @@ -2,11 +2,7 @@ @include('partials.admin.head') - @mobile - - @elsemobile - - @endmobile + @stack('body_start') @include('partials.admin.menu') diff --git a/resources/views/layouts/install.blade.php b/resources/views/layouts/install.blade.php index 50ca3ff80..e3fc92f79 100644 --- a/resources/views/layouts/install.blade.php +++ b/resources/views/layouts/install.blade.php @@ -40,18 +40,16 @@
@if (Request::is('install/requirements')) - {{ trans('install.refresh') }}   + {{ trans('install.refresh') }} @else {!! Form::button( ' ' . - trans('install.next') . - '  ', + trans('install.next'), [ ':disabled' => 'loading', 'type' => 'submit', 'id' => 'next-button', - 'class' => 'btn btn-success', - 'data-loading-text' => trans('general.loading') + 'class' => 'btn btn-success' ] ) !!} @endif diff --git a/resources/views/modules/home/index.blade.php b/resources/views/modules/home/index.blade.php index a0dc1c0fe..211e0eece 100644 --- a/resources/views/modules/home/index.blade.php +++ b/resources/views/modules/home/index.blade.php @@ -3,8 +3,8 @@ @section('title', trans_choice('general.modules', 2)) @section('new_button') -  {{ trans('modules.api_key') }} -  {{ trans('modules.my_apps') }} + {{ trans('modules.api_key') }} + {{ trans('modules.my_apps') }} @endsection @section('content') diff --git a/resources/views/modules/item/documentation.blade.php b/resources/views/modules/item/documentation.blade.php index 61b5ee508..dcaf827b5 100644 --- a/resources/views/modules/item/documentation.blade.php +++ b/resources/views/modules/item/documentation.blade.php @@ -3,8 +3,8 @@ @section('title', trans_choice('general.modules', 2)) @section('new_button') -  {{ trans('modules.api_key') }} -  {{ trans('modules.my_apps') }} + {{ trans('modules.api_key') }} + {{ trans('modules.my_apps') }} @endsection @section('content') @@ -22,7 +22,7 @@
-  {{ trans('modules.back') }} + {{ trans('modules.back') }}
diff --git a/resources/views/modules/item/pre_sale.blade.php b/resources/views/modules/item/pre_sale.blade.php index b41da218d..e31911bf4 100644 --- a/resources/views/modules/item/pre_sale.blade.php +++ b/resources/views/modules/item/pre_sale.blade.php @@ -3,8 +3,8 @@ @section('title', trans_choice('general.modules', 2)) @section('new_button') -  {{ trans('modules.api_key') }} -  {{ trans('modules.my_apps') }} + {{ trans('modules.api_key') }} + {{ trans('modules.my_apps') }} @endsection @section('content') diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php index e1a009b1b..c4e33dbe6 100644 --- a/resources/views/modules/item/show.blade.php +++ b/resources/views/modules/item/show.blade.php @@ -3,8 +3,8 @@ @section('title', trans_choice('general.modules', 2)) @section('new_button') -  {{ trans('modules.api_key') }} -  {{ trans('modules.my_apps') }} + {{ trans('modules.api_key') }} + {{ trans('modules.my_apps') }} @endsection @section('content') @@ -24,6 +24,7 @@ @for($i = 1; $i <= $module->vote; $i++) @endfor + @for($i = $module->vote; $i < 5; $i++) @endfor diff --git a/resources/views/modules/my/index.blade.php b/resources/views/modules/my/index.blade.php index 34b5dd6e8..80dbe48c3 100644 --- a/resources/views/modules/my/index.blade.php +++ b/resources/views/modules/my/index.blade.php @@ -3,8 +3,8 @@ @section('title', trans_choice('general.modules', 2)) @section('new_button') -  {{ trans('modules.api_key') }} -  {{ trans('modules.my_apps') }} + {{ trans('modules.api_key') }} + {{ trans('modules.my_apps') }} @endsection @section('content') diff --git a/resources/views/modules/tiles/index.blade.php b/resources/views/modules/tiles/index.blade.php index c7906cf4e..3384222e9 100644 --- a/resources/views/modules/tiles/index.blade.php +++ b/resources/views/modules/tiles/index.blade.php @@ -3,8 +3,8 @@ @section('title', trans_choice('general.modules', 2)) @section('new_button') -  {{ trans('modules.api_key') }} -  {{ trans('modules.my_apps') }} + {{ trans('modules.api_key') }} + {{ trans('modules.my_apps') }} @endsection @section('content') @@ -24,13 +24,13 @@
@if ($modules->current_page > 1) -  {!! trans('pagination.previous') !!} + {!! trans('pagination.previous') !!} @endif
@if ($modules->current_page < $modules->last_page) - {!! trans('pagination.next') !!}  + {!! trans('pagination.next') !!} @endif
@else diff --git a/resources/views/partials/admin/empty_page.blade.php b/resources/views/partials/admin/empty_page.blade.php index a0fc572c4..7925a2f9c 100644 --- a/resources/views/partials/admin/empty_page.blade.php +++ b/resources/views/partials/admin/empty_page.blade.php @@ -5,9 +5,11 @@
-

{!! trans('general.empty.' . $page) !!} {!! trans('general.empty.documentation', ['url' => 'https://akaunting.com/docs/user-manual/' . $docs_path]) !!}

+

+ {!! trans('general.empty.' . $page) !!} {!! trans('general.empty.documentation', ['url' => 'https://akaunting.com/docs/user-manual/' . $docs_path]) !!} +

+ - {{ trans('general.title.create', ['type' => trans_choice('general.' . $page, 1)]) }}
diff --git a/resources/views/partials/admin/header.blade.php b/resources/views/partials/admin/header.blade.php index 0381c8d74..c26777541 100644 --- a/resources/views/partials/admin/header.blade.php +++ b/resources/views/partials/admin/header.blade.php @@ -15,9 +15,7 @@ @permission('read-modules-home') @if (!empty($suggestion_modules)) @foreach($suggestion_modules as $s_module) - -  {{ $s_module->name }} - + {{ $s_module->name }} @endforeach @endif @endpermission diff --git a/resources/views/partials/admin/menu.blade.php b/resources/views/partials/admin/menu.blade.php index 2bcacf44f..80d88acc0 100644 --- a/resources/views/partials/admin/menu.blade.php +++ b/resources/views/partials/admin/menu.blade.php @@ -1,13 +1,14 @@ @stack('menu_start') -