diff --git a/.gitignore b/.gitignore
index bd87d9b4f..ee987b848 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ out/
 /captures
 
 gradle.properties
+crowdin.properties
 
 #Crashlytics
 
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index f593b1675..7ccf20003 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -16,58 +16,58 @@
  limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="title_create_account">إنشاء حساب</string>
-  <string name="title_edit_account">تعديل الحساب</string>
-  <string name="description_add_transaction_icon">إضافة حركة جديدة لحساب</string>
-  <string name="description_view_account_icon">عرض تفاصيل الحساب</string>
-  <string name="label_no_accounts">لا توجد حسابات للعرض</string>
-  <string name="label_account_name">اسم الحساب</string>
-  <string name="btn_cancel">إلغاء</string>
-  <string name="btn_save">حفظ</string>
-  <string name="btn_test">اختبار</string>
-  <string name="label_passcode">أدخل رمز المرور</string>
-  <string name="toast_wrong_passcode">رمز المرور خطأ؛ من فضلك حاول مُجددًا</string>
-  <string name="toast_passcode_set">إعداد رمز المرور</string>
-  <string name="label_confirm_passcode">الرجاء تأكيد كلمة المرور الخاصة بك</string>
-  <string name="toast_invalid_passcode_confirmation">تأكيد رمز المرور غير صحيح. الرجاء المحاولة مرة أخرى</string>
-  <string name="label_transaction_name">الوصف</string>
-  <string name="label_transaction_amount">المبلغ</string>
-  <string name="title_add_transaction">معاملة جديدة</string>
-  <string name="label_no_transactions">لا معاملات لعرض</string>
-  <string name="label_debit">الخصم</string>
-  <string name="label_credit">الائتمان</string>
-  <string name="title_accounts">الحسابات</string>
-  <string name="title_transactions">المعاملات</string>
-  <string name="menu_delete">حذف</string>
-  <string name="alert_dialog_ok_delete">حذف</string>
-  <string name="alert_dialog_cancel">إلغاء</string>
-  <string name="toast_account_deleted">تم حذف الحساب</string>
-  <string name="title_confirm_delete">تأكيد الحذف</string>
-  <string name="title_edit_transaction">تحرير المعاملات</string>
-  <string name="label_transaction_description">إضافة ملاحظة</string>
-  <string name="title_selected">%1$d محدد</string>
-  <string name="label_account_balance">الرصيد:</string>
-  <string name="label_export_destination">التصدير إلى:</string>
-  <string name="title_export_dialog">تصدير المعاملات</string>
-  <string name="hint_export_choice">بشكل افتراضي، سيتم تصدير المعاملات الجديدة فقط منذ آخر تصدير. حدد هذا الخيار لتصدير جميع المعاملات</string>
-  <string name="toast_export_error">خطأ في تصدير ملف %1$s</string>
-  <string name="btn_export">تصدير</string>
-  <string name="option_delete_after_export">حذف الحركات بعد التصدير</string>
-  <string name="hint_delete_after_export">سيتم حذف كافة المعاملات المصدرة عند اكتمال التصدير</string>
-  <string name="title_settings">إعدادات</string>
+  <string name="title_create_account">Create Account</string>
+  <string name="title_edit_account">Edit Account</string>
+  <string name="description_add_transaction_icon">Add a new transaction to an account</string>
+  <string name="description_view_account_icon">View account details</string>
+  <string name="label_no_accounts">No accounts to display</string>
+  <string name="label_account_name">Account name</string>
+  <string name="btn_cancel">Cancel</string>
+  <string name="btn_save">Save</string>
+  <string name="btn_test">Test</string>
+  <string name="label_passcode">Enter Passcode</string>
+  <string name="toast_wrong_passcode">Wrong passcode, please try again</string>
+  <string name="toast_passcode_set">Passcode set</string>
+  <string name="label_confirm_passcode">Please confirm your passcode</string>
+  <string name="toast_invalid_passcode_confirmation">Invalid passcode confirmation. Please try again</string>
+  <string name="label_transaction_name">Description</string>
+  <string name="label_transaction_amount">Amount</string>
+  <string name="title_add_transaction">New transaction</string>
+  <string name="label_no_transactions">No transactions to display</string>
+  <string name="label_debit">DEBIT</string>
+  <string name="label_credit">CREDIT</string>
+  <string name="title_accounts">Accounts</string>
+  <string name="title_transactions">Transactions</string>
+  <string name="menu_delete">Delete</string>
+  <string name="alert_dialog_ok_delete">Delete</string>
+  <string name="alert_dialog_cancel">Cancel</string>
+  <string name="toast_account_deleted">Account deleted</string>
+  <string name="title_confirm_delete">Confirm delete</string>
+  <string name="title_edit_transaction">Edit Transaction</string>
+  <string name="label_transaction_description">Add note</string>
+  <string name="title_selected">%1$d selected</string>
+  <string name="label_account_balance">Balance:</string>
+  <string name="label_export_destination">Export To:</string>
+  <string name="title_export_dialog">Export Transactions</string>
+  <string name="hint_export_choice">By default, only new transactions since last export will be exported. Check this option to export all transactions</string>
+  <string name="toast_export_error">Error exporting %1$s file</string>
+  <string name="btn_export">Export</string>
+  <string name="option_delete_after_export">Delete transactions after export</string>
+  <string name="hint_delete_after_export">All exported transactions will be deleted when exporting is completed</string>
+  <string name="title_settings">Settings</string>
   <string-array name="export_destinations">
-    <item>حفظ باسم&#8230;</item>
+    <item>Save As&#8230;</item>
     <item>Dropbox</item>
     <item>ownCloud</item>
-    <item>إرسال إلى&#8230;</item>
+    <item>Send to&#8230;</item>
   </string-array>
-  <string name="btn_move">نقل</string>
-  <string name="title_move_transactions">نقل %1$d معاملات</string>
+  <string name="btn_move">Move</string>
+  <string name="title_move_transactions">Move %1$d transaction(s)</string>
   <string name="label_move_destination">Destination Account</string>
   <string name="toast_incompatible_currency">Cannot move transactions.\nThe destination account uses a different currency from origin account</string>
-  <string name="header_general_settings">عام</string>
-  <string name="header_about_gnucash">حول</string>
-  <string name="title_choose_currency">اختار عملة إفتراضية</string>
+  <string name="header_general_settings">General</string>
+  <string name="header_about_gnucash">About</string>
+  <string name="title_choose_currency">Choose default currency</string>
   <string name="title_default_currency">Default currency</string>
   <string name="summary_default_currency">Default currency to assign to new accounts</string>
   <string name="label_permission_record_transactions">Enables recording transactions in GnuCash for Android</string>
@@ -124,9 +124,9 @@
         - Multiple bug fixes and improvements\n
 	</string>
   <string name="label_dismiss">Dismiss</string>
-  <string name="toast_transanction_amount_required">أدخل مبلغ لحفظ الحركة</string>
-  <string name="toast_error_importing_accounts">حدث خطأ أثناء استيراد حسابات GnuCash</string>
-  <string name="toast_success_importing_accounts">تم إستيراد حسابات GnuCash بنجاح</string>
+  <string name="toast_transanction_amount_required">Enter an amount to save the transaction</string>
+  <string name="toast_error_importing_accounts">An error occurred while importing the GnuCash accounts</string>
+  <string name="toast_success_importing_accounts">GnuCash Accounts successfully imported</string>
   <string name="summary_import_accounts">Import account structure exported from GnuCash desktop</string>
   <string name="title_import_accounts">Import GnuCash XML</string>
   <string name="summary_delete_all_accounts">Delete all accounts in the database. All transactions will be deleted as
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index cf674c732..49f40617d 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -206,10 +206,10 @@
   <string name="hint_split_memo">Memo</string>
   <string name="label_spend">Spend</string>
   <string name="label_receive">Receive</string>
-  <string name="label_withdrawal">Ανάληψη</string>
-  <string name="label_deposit">Κατάθεση</string>
-  <string name="label_payment">Πληρωμή</string>
-  <string name="label_charge">Χρέωση</string>
+  <string name="label_withdrawal">Withdrawal</string>
+  <string name="label_deposit">Deposit</string>
+  <string name="label_payment">Payment</string>
+  <string name="label_charge">Charge</string>
   <string name="label_decrease">Decrease</string>
   <string name="label_increase">Increase</string>
   <string name="label_income">Income</string>
@@ -217,8 +217,8 @@
   <string name="label_expense">Expense</string>
   <string name="label_bill">Bill</string>
   <string name="label_invoice">Invoice</string>
-  <string name="label_buy">Αγορά</string>
-  <string name="label_sell">Πώληση</string>
+  <string name="label_buy">Buy</string>
+  <string name="label_sell">Sell</string>
   <string name="account_name_opening_balances">Αρχικά υπόλοιπα</string>
   <string name="account_name_equity">Καθαρή Θέση</string>
   <string name="summary_save_opening_balances">Enable to save the current account balance (before deleting transactions) as new opening balance after deleting transactions
@@ -228,14 +228,14 @@
   <string name="export_warning_qif">Generates separate QIF files per currency</string>
   <string name="label_imbalance">Imbalance:</string>
   <string name="btn_add_split">Add split</string>
-  <string name="menu_title_favorite">Αγαπημένο</string>
+  <string name="menu_title_favorite">Favorite</string>
   <string name="drawer_open">Navigation drawer opened</string>
   <string name="drawer_close">Navigation drawer closed</string>
-  <string name="title_reports">Αναφορές</string>
+  <string name="title_reports">Reports</string>
   <string name="title_pie_chart">Pie Chart</string>
   <string name="title_line_chart">Line Chart</string>
   <string name="title_bar_chart">Bar Chart</string>
-  <string name="title_report_prefs">Προτιμήσεις αναφοράς</string>
+  <string name="title_report_prefs">Report Preferences</string>
   <string name="title_use_account_color">Account color in reports</string>
   <string name="summary_use_account_color">Use account color in the bar/pie chart</string>
   <string name="menu_order_by_size">Order by size</string>
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index a6dddb325..1d8d70660 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -52,7 +52,7 @@
   <string name="hint_export_choice">Por defecto solo las nuevas transacciones desde la última exportación serán exportadas. Seleccione esta opción para exportar todas las transacciones</string>
   <string name="toast_export_error">Error exportando datos %1$s</string>
   <string name="btn_export">Exportar</string>
-  <string name="option_delete_after_export">Borrar transacciones después de exportar</string>
+  <string name="option_delete_after_export">Borrar transacciones despues de exportar</string>
   <string name="hint_delete_after_export">Todas las transacciones exportadas serán borradas cuando la exportación haya terminado</string>
   <string name="title_settings">Ajustes</string>
   <string-array name="export_destinations">
@@ -226,7 +226,7 @@
   <string name="menu_toggle_legend">Mostrar leyenda</string>
   <string name="menu_toggle_labels">Mostrar etiquetas</string>
   <string name="menu_toggle_percentage_mode">Mostrar porcentaje</string>
-  <string name="menu_toggle_average_lines">Mostrar líneas de media</string>
+  <string name="menu_toggle_average_lines">Mostar lineas de media</string>
   <string name="menu_group_smaller_slices">Agrupar porciones pequeñas</string>
   <string name="label_chart_no_data">Datos del gráfico no disponibles</string>
   <string name="label_chart_total">Total</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index e83540caf..994bd4661 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -38,7 +38,7 @@
   <string name="label_credit">ABONO</string>
   <string name="title_accounts">Cuentas</string>
   <string name="title_transactions">Transacciones</string>
-  <string name="menu_delete">Borrar</string>
+  <string name="menu_delete">BORRAR</string>
   <string name="alert_dialog_ok_delete">Borrar</string>
   <string name="alert_dialog_cancel">Cancelar</string>
   <string name="toast_account_deleted">Cuenta borrada</string>
@@ -226,7 +226,7 @@
   <string name="menu_toggle_legend">Mostrar leyenda</string>
   <string name="menu_toggle_labels">Mostrar etiquetas</string>
   <string name="menu_toggle_percentage_mode">Mostrar porcentaje</string>
-  <string name="menu_toggle_average_lines">Mostrar líneas de media</string>
+  <string name="menu_toggle_average_lines">Mostar lineas de media</string>
   <string name="menu_group_smaller_slices">Agrupar porciones pequeñas</string>
   <string name="label_chart_no_data">Datos del gráfico no disponibles</string>
   <string name="label_chart_total">Total</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
new file mode 100644
index 000000000..3e7ff0211
--- /dev/null
+++ b/app/src/main/res/values-hr/strings.xml
@@ -0,0 +1,501 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+ Copyright (c) 2012 - 2014 Ngewi Fet <ngewif@gmail.com>
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+    http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="title_create_account">Stvori konto</string>
+    <string name="title_edit_account">Uredi konto</string>
+    <string name="description_add_transaction_icon">Dodaj novu transakciju jednom kontu</string>
+    <string name="description_view_account_icon">Prikaži detalje konta</string>
+    <string name="label_no_accounts">Nema konta</string>
+    <string name="label_account_name">Ime konta</string>
+    <string name="btn_cancel">Odustani</string>
+    <string name="btn_save">Spremi</string>
+    <string name="btn_test">Ispitaj</string>
+    <string name="label_passcode">Unesi lozinku</string>
+    <string name="toast_wrong_passcode">Kriva lozinka, pokušaj ponovo</string>
+    <string name="toast_passcode_set">Lozinka je postavljena</string>
+    <string name="label_confirm_passcode">Potvrdi lozinku</string>
+    <string name="toast_invalid_passcode_confirmation">Nevaljana potvrda lozinke. Pokušaj ponovo</string>
+    <string name="label_transaction_name">Opis</string>
+    <string name="label_transaction_amount">Iznos</string>
+    <string name="title_add_transaction">Nova transakcija</string>
+    <string name="label_no_transactions">Nema transakcija</string>
+    <string name="label_debit">DUGUJE</string>
+    <string name="label_credit">POTRAŽUJE</string>
+    <string name="title_accounts">Konti</string>
+    <string name="title_transactions">Transakcije</string>
+    <string name="menu_delete">Izbriši</string>
+    <string name="alert_dialog_ok_delete">Izbriši</string>
+    <string name="alert_dialog_cancel">Odustani</string>
+    <string name="toast_account_deleted">Konto je izbrisan</string>
+    <string name="title_confirm_delete">Potvrdi brisanje</string>
+    <string name="title_edit_transaction">Uredi transakciju</string>
+    <string name="label_transaction_description">Dodaj napomenu</string>
+    <string name="title_selected">Odabrano: %1$d</string>
+    <string name="label_account_balance">Saldo:</string>
+    <string name="label_export_destination">Izvezi u:</string>
+    <string name="title_export_dialog">Izvezi transakcije</string>
+    <string name="hint_export_choice">Standardno se izvoze samo nove transakcije, učinjene nakon zadnjeg izvoza. Uključi ovu opciju za izvoz svih transakcija</string>
+    <string name="toast_export_error">Greška prilikom izvoza datoteke %1$s</string>
+    <string name="btn_export">Izvezi</string>
+    <string name="option_delete_after_export">Izbriši transakcije nakon izvoza</string>
+    <string name="hint_delete_after_export">Sve izvezene transakcije će biti izbrisane nakon završetka izvoza</string>
+    <string name="title_settings">Postavke</string>
+    <string-array name="export_destinations">
+        <item>Spremi pod &#8230;</item>
+        <item>Dropbox</item>
+        <item>ownCloud</item>
+        <item>Pošalji na &#8230;</item>
+    </string-array>
+    <string name="btn_move">Premjesti</string>
+    <string name="title_move_transactions">Premjesti %1$d transakcije(a)</string>
+    <string name="label_move_destination">Odredišni konto</string>
+    <string name="toast_incompatible_currency">Prijenos transakcije nije moguć.\nOdredišni konto koristi drugačiju valutu od izvornog konta</string>
+    <string name="header_general_settings">Općenito</string>
+    <string name="header_about_gnucash">O programu</string>
+    <string name="title_choose_currency">Odaberi standardnu valutu</string>
+    <string name="title_default_currency">Standardna valuta</string>
+    <string name="summary_default_currency">Standardna valuta za nova konta</string>
+    <string name="label_permission_record_transactions">Omogućava spremanje transakcija u GnuCash za Android</string>
+    <string name="label_permission_create_accounts">Omogućava stvaranje konta u GnuCashu za Android</string>
+    <string name="label_permission_group">Tvoji GnuCash podaci</string>
+    <string name="description_permission_group">Čitaj i promijeni GnuCash podatke</string>
+    <string name="label_permission_record_transaction">Spremi transakcije u GnuCashu</string>
+    <string name="label_permission_create_account">Stvori transakcije u GnuCashu</string>
+    <string name="label_display_account">Prikaži konto</string>
+    <string name="label_hide_account_balance">Sakrij saldo konta u alatnom bloku</string>
+    <string name="btn_create_accounts">Stvori konta</string>
+    <string name="error_no_accounts">U GnuCashu nema konta.\nStvori konto prije dodavanja alatnog bloka</string>
+    <string name="title_license">Licenca</string>
+    <string name="summary_licence_details">Apache License v2.0. Za detalje, klikni</string>
+    <string name="title_general_prefs">Opće postavke</string>
+    <string name="label_widget_configuration">Odaberi konto</string>
+    <string name="toast_no_transactions_to_export">Nema transakcija za izvoz</string>
+    <string name="title_passcode_preferences">Postavke za lozinku</string>
+    <string name="title_enable_passcode">Aktiviraj lozinku</string>
+    <string name="title_change_passcode">Promijeni lozinku</string>
+    <string name="title_about_gnucash">O programu GnuCash</string>
+    <string name="title_export_email">GnuCash Android %1$s izvoz</string>
+    <string name="description_export_email">GnuCash Android izvoz iz </string>
+    <string name="header_transaction_settings">Transakcije</string>
+    <string name="title_transaction_preferences">Postavke za transakcije</string>
+    <string name="title_account_preferences">Postavke za konta</string>
+    <string name="title_default_transaction_type">Standardna vrsta transakcije</string>
+    <string name="summary_default_transaction_type">Standardno korištena vrsta transakcije, POTRAŽUJE ili DUGUJE</string>
+    <string-array name="transaction_types">
+        <item>POTRAŽUJE</item>
+        <item>DUGUJE</item>
+    </string-array>
+    <string name="msg_delete_all_transactions_confirmation">Zaista želiš izbrisati SVE transakcije?</string>
+    <string name="msg_delete_transaction_confirmation">Zaista želiš izbrisati ovu transakciju?</string>
+    <string name="title_export_preference_category">Izvoz</string>
+    <string name="title_export_all_transactions">Izvezi sve transakcije</string>
+    <string name="title_always_delete_exported_transactions">Izbriši izvezene transakcije</string>
+    <string name="title_default_export_email">Standardna e-pošta za izvoz</string>
+    <string name="summary_default_export_email">Standardna adresa e-pošte, na koju se šalju datoteke izvoza. Adresu možeš promijeniti i prilikom izvoza.</string>
+    <string name="summary_use_double_entry">Sve transakcije će se prenijeti s jednog konta na drugi konto</string>
+    <string name="title_use_double_entry">Aktiviraj dvojno knjigovodstvo</string>
+    <string name="account_balance">Saldo</string>
+    <string name="toast_no_account_name_entered">Za stvaranje konta, unesi ime konta</string>
+    <string name="label_account_currency">Valuta</string>
+    <string name="label_parent_account">Matični konto</string>
+    <string name="title_xml_ofx_header">Koristi XML OFX zaglavlje</string>
+    <string name="summary_xml_ofx_header">Aktiviraj ovu opciju za izvoz u neki drugi program, koji nije desktop verzija GnuCasha</string>
+    <string name="title_whats_new">Što je novo</string>
+    <string name="whats_new">        - Podržava format za CSV-izvoz \n
+        - Poboljšana kompatibilnost s datotekama desktop verzije GnuCasha\n
+        - Ograničavanje slobodnog mjesta za sigurnosne kopije \n
+        - Razne ispravke grešaka i poboljšanja\n</string>
+    <string name="label_dismiss">Odbaci</string>
+    <string name="toast_transanction_amount_required">Za spremanje transakcije, unesi iznos</string>
+    <string name="toast_error_importing_accounts">Došlo je do greške prilikom uvoza GnuCash konta</string>
+    <string name="toast_success_importing_accounts">GnuCash konti su uspješno uvezeni</string>
+    <string name="summary_import_accounts">Uvezi kontni plan iz GnuCash XML-a</string>
+    <string name="title_import_accounts">Uvezi GnuCash XML</string>
+    <string name="summary_delete_all_accounts">Izbriši sva konta iz baze podataka. Istovremeno se brišu sve transakcije.
+        
+    </string>
+    <string name="title_delete_all_accounts">Izbriši sva konta</string>
+    <string name="header_account_settings">Konti</string>
+    <string name="toast_all_accounts_deleted">Svi konti su uspješno izbrisani</string>
+    <string name="confirm_delete_all_accounts">Zaista želiš izbrisati sva konta i sve transakcije?\n\n
+        Ovo je nepovratna operacija!
+    </string>
+    <string name="summary_delete_all_transactions">Izbrisat će se sve transakcije svih konta!</string>
+    <string name="title_delete_all_transactions">Izbriši sve transakcije</string>
+    <string name="toast_all_transactions_deleted">Sve transakcije su uspješno izbrisane!</string>
+    <string name="title_progress_importing_accounts">Uvoz konta</string>
+    <string name="section_header_transactions">Transakcije</string>
+    <string name="section_header_subaccounts">Podkonta</string>
+    <string name="menu_search_accounts">Traži</string>
+    <string name="title_default_export_format">Standardni format za izvoz</string>
+    <string name="summary_default_export_format">Format koji će se standardno koristiti za izvoz transakcija</string>
+    <string name="label_recurring_transaction">Ponavljanje</string>
+    <!-- This should be the same name used by GnuCash desktop for imbalance accounts -->
+    <string name="imbalance_account_name">Debalans</string>
+    <string name="title_progress_exporting_transactions">Izvoz transakcija</string>
+    <string name="label_no_recurring_transactions">Nema ponavljajućih transakcija.</string>
+    <string name="toast_recurring_transaction_deleted">Ponavljajuće transakcije su uspješno izbrisane</string>
+    <string name="label_placeholder_account">Rezervirani konto</string>
+    <string name="label_default_transfer_account">Standardni konto za prijenos</string>
+    <plurals name="label_sub_accounts">
+        <item quantity="one">%d podkonto</item>
+        <item quantity="few">%d podkonta</item>
+        <item quantity="other">%d podkonta</item>
+    </plurals>
+    <string-array name="account_type_entry_values">
+        <item>GOTOVINA</item>
+        <item>BANKA</item>
+        <item>KREDITNA KARTICA</item>
+        <item>IMOVINA</item>
+        <item>OBVEZE</item>
+        <item>PRIHOD</item>
+        <item>RASHOD</item>
+        <item>DUGOVANJA</item>
+        <item>POTRAŽIVANJA</item>
+        <item>KAPITAL</item>
+        <item>VALUTA</item>
+        <item>DIONICE</item>
+        <item>INVESTICIJSKI FOND</item>
+        <item>TRGOVANJE</item>
+    </string-array>
+    <string-array name="export_formats">
+        <item>CSV</item>
+        <item>QIF</item>
+        <item>OFX</item>
+        <item>XML</item>
+    </string-array>
+    <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
+    <string name="color_picker_default_title">Odaberi boju</string>
+    <!-- Content description for a color square. -->
+    <!-- Content description for a selected color square. -->
+    <string name="label_account_color_and_type">Boja i vrsta konta</string>
+    <string name="label_delete_sub_accounts">Izbriši podkonta</string>
+    <string name="title_recent_accounts">Nedavna</string>
+    <string name="title_favorite_accounts">Favoriti</string>
+    <string name="title_all_accounts">Sva</string>
+    <string name="summary_create_default_accounts">Stvara standardnu, u GnuCashu često korištenu strukturu konta</string>
+    <string name="title_create_default_accounts">Stvori standardna konta</string>
+    <string name="msg_confirm_create_default_accounts_setting">Otvorit će se nova knjiga sa standardnim kontima\n\nTvoji postojeći konti i transakcije se neće dirati!</string>
+    <string name="title_scheduled_transactions">Transakcije</string>
+    <string name="title_select_export_destination">Odaberi odredište za izvoz</string>
+    <string name="hint_split_memo">Zabilješka</string>
+    <string name="label_spend">Izdatak</string>
+    <string name="label_receive">Primitak</string>
+    <string name="label_withdrawal">Isplata</string>
+    <string name="label_deposit">Uplata</string>
+    <string name="label_payment">Plaćanje</string>
+    <string name="label_charge">Terećenje</string>
+    <string name="label_decrease">Smanjenje</string>
+    <string name="label_increase">Povećanje</string>
+    <string name="label_income">Prihod</string>
+    <string name="label_rebate">Popust</string>
+    <string name="label_expense">Rashod</string>
+    <string name="label_bill">Ulazni račun</string>
+    <string name="label_invoice">izlazni račun</string>
+    <string name="label_buy">Kupovina</string>
+    <string name="label_sell">Prodaja</string>
+    <string name="account_name_opening_balances">Početni saldo</string>
+    <string name="account_name_equity">Kapital</string>
+    <string name="summary_save_opening_balances">Aktiviraj, kako bi se trenutačni saldo konta preuzeo kao novi početni saldo nakon brisanja transakcija
+    </string>
+    <string name="title_save_opening_balances">Spremi početni saldo konta</string>
+    <string name="export_warning_ofx">OFX ne pordžava dvojno knjigovodstvo</string>
+    <string name="export_warning_qif">Za svaku valutu stvara pojedinačnu QIF datoteku</string>
+    <string name="label_imbalance">Debalans:</string>
+    <string name="btn_add_split">Dodaj podjelu</string>
+    <string name="menu_title_favorite">Favorit</string>
+    <string name="drawer_open">Navigacijska traka je otvorena</string>
+    <string name="drawer_close">Navigacijska traka je zatvorena</string>
+    <string name="title_reports">Izvještaji</string>
+    <string name="title_pie_chart">Kružni dijagram</string>
+    <string name="title_line_chart">Linijski dijagram</string>
+    <string name="title_bar_chart">Stupčani dijagram</string>
+    <string name="title_report_prefs">Postavke za izvještaje</string>
+    <string name="title_use_account_color">Boja konta u izvještajima</string>
+    <string name="summary_use_account_color">Koristi boje konta u stupčanom/kružnom dijagramu</string>
+    <string name="menu_order_by_size">Razvrstaj prema veličini</string>
+    <string name="menu_toggle_legend">Prikaži legendu</string>
+    <string name="menu_toggle_labels">Prikaži oznake</string>
+    <string name="menu_toggle_percentage_mode">Prikaži postotke</string>
+    <string name="menu_toggle_average_lines">Prikaži linije prosjeka</string>
+    <string name="menu_group_smaller_slices">Grupiraj manje odsječke</string>
+    <string name="label_chart_no_data">Nema podataka za izradu dijagrama</string>
+    <string name="label_chart_total">Ukupno</string>
+    <string name="label_other_slice">Ostali</string>
+    <string name="toast_chart_percentage_mode_total">Postotak za odabranu vrijednost u odnosu na ukupni iznos</string>
+    <string name="toast_chart_percentage_mode_current_bar">Postotak za odabranu vrijednost u odnosu na iznos trenutačnog složenog stupca</string>
+    <string name="label_save_template">Spremi kao predložak</string>
+    <string name="label_delete_account_transactions_description">Ovaj konto sadržava transakcije. \nŠto želiš uraditi s tim transakcijama?</string>
+    <string name="label_delete_account_subaccounts_description">Ovaj konto sadržava podkonta. \nŠto želiš uraditi s tim podkontima?</string>
+    <string name="label_delete_transactions">Izbriši transakcije</string>
+    <string name="toast_disable_double_entry_to_save_transaction">Za spremanje transakcije, stvori i odredi konto za prijenos ILI deaktiviraj dvojno knjigovodstvo u postavkama</string>
+    <string name="label_tap_to_create_schedule">Stvori termine</string>
+    <string name="title_restore_backup">Učitaj sigurnosnu kopiju &#8230;</string>
+    <string name="header_backup_and_export_settings">Stvori sigurnosnu kopiju i izvezi</string>
+    <string name="title_dropbox_sync_preference">Aktiviraj DropBox</string>
+    <string name="title_owncloud_sync_preference">Aktiviraj ownCloud </string>
+    <string name="title_backup_preference_category">Sigurnosna kopija</string>
+    <string name="summary_dropbox_sync">Aktiviraj izvoz u DropBox</string>
+    <string name="summary_owncloud_sync">Aktiviraj izvoz u ownCloud</string>
+    <string name="title_backup_prefs">Postavke za sigurnosnu kopiju</string>
+    <string name="title_create_backup_pref">Stvori sigurnosnu kopiju</string>
+    <string name="summary_create_backup_pref">Stvori sigurnosnu kopiju aktivne knjige</string>
+    <string name="summary_restore_backup_pref">Učitaj najnoviju sigurnosnu kopiju aktivne knjige</string>
+    <string name="toast_backup_successful">Sigurnosna kopija je uspješno stvorena</string>
+    <string name="toast_backup_failed">Sigurnosna kopija nije stvorena</string>
+    <string name="export_warning_xml">Izvozi sva konta i sve transakcije</string>
+    <string name="toast_install_file_manager">Instaliraj upravitelja datotekama za odabir datoteka</string>
+    <string name="title_select_backup_to_restore">Odaberi sigurnosnu kopiju, koju želiš ponovo učitati</string>
+    <string name="nav_menu_favorites">Favoriti</string>
+    <string name="nav_menu_open">Otvori &#8230;</string>
+    <string name="nav_menu_reports">Izvještaji</string>
+    <string name="nav_menu_export">Izvezi &#8230;</string>
+    <string name="nav_menu_settings">Postavke</string>
+    <string name="username">Korisničko ime</string>
+    <string name="password">Lozinka</string>
+    <string name="owncloud_pref">owncloud</string>
+    <string name="owncloud_server">https://</string>
+    <string name="owncloud_server_invalid">OC server nije nađen</string>
+    <string name="owncloud_user_invalid">OC korisničko ime/lozinka ne valja</string>
+    <string name="owncloud_dir_invalid">Nevaljani slovni znakovi: \\ &lt; &gt; : \&quot; | * ? </string>
+    <string name="owncloud_server_ok">OC server je u redu</string>
+    <string name="owncloud_user_ok">OC korisničko ime/lozinka je u redu</string>
+    <string name="owncloud_dir_ok">Dir ime je u redu</string>
+    <plurals name="label_every_x_hours">
+        <item quantity="one">Svaki sat</item>
+        <item quantity="few">Svaka %d sata</item>
+        <item quantity="other">Svakih %d sati</item>
+    </plurals>
+    <plurals name="label_every_x_days">
+        <item quantity="one">Dnevno</item>
+        <item quantity="few">Svaka %d dana</item>
+        <item quantity="other">Svakih %d dana</item>
+    </plurals>
+    <plurals name="label_every_x_weeks">
+        <item quantity="one">Tjedno</item>
+        <item quantity="few">Svaka %d tjedna</item>
+        <item quantity="other">Svakih %d tjedana</item>
+    </plurals>
+    <plurals name="label_every_x_months">
+        <item quantity="one">Mjesečno</item>
+        <item quantity="few">Svaka %d mjeseca</item>
+        <item quantity="other">Svakih %d mjeseci</item>
+    </plurals>
+    <plurals name="label_every_x_years">
+        <item quantity="one">Godišnje</item>
+        <item quantity="few">Svake %d godine</item>
+        <item quantity="other">Svakih %d godina</item>
+    </plurals>
+    <string name="title_enable_crashlytics">Aktiviraj dnevnik urušavanja programa</string>
+    <string name="msg_enable_crashlytics">Automatski šalji informacije o aplikacijskim greškama razvijateljima.</string>
+    <string name="label_export_format"> Format</string>
+    <string name="label_old_passcode">Unesi staru lozinku</string>
+    <string name="label_new_passcode">Unesi novu lozinku</string>
+    <string name="title_scheduled_exports">Izvozi</string>
+    <string name="label_no_scheduled_exports_to_display">Nema terminiranih izvoza</string>
+    <string name="title_create_export_schedule">Stvori terminirane izvoze</string>
+    <string name="toast_exported_to">Izvezeno u: %1$s</string>
+    <string name="toast_legend_too_long">Legenda je pre dugačka</string>
+    <string name="hint_account_description">Opis konta</string>
+    <string name="label_no_recent_accounts">Nema nedavno korištenih konta</string>
+    <string name="label_no_favorite_accounts">Nema favoriziranih konta</string>
+    <string name="nav_menu_scheduled_actions">Terminirane radnje</string>
+    <string name="label_scheduled_action_ended">"Završeno. Zadnje izvođenje %1$s"</string>
+    <string name="btn_wizard_next">Sljedeće</string>
+    <string name="btn_wizard_finish">Gotovo</string>
+    <string name="wizard_title_default_currency">Standardna valuta</string>
+    <string name="wizard_title_account_setup">Postavke konta</string>
+    <string name="wizard_title_select_currency">Odaberi valutu</string>
+    <string name="wizard_title_feedback_options">Opcije za feedback</string>
+    <string name="wizard_option_create_default_accounts">Stvori standardna konta</string>
+    <string name="wizard_option_import_my_accounts">Uvezi moja konta</string>
+    <string name="wizard_option_let_me_handle_it">Dozvoli da ja to obavim</string>
+    <string name="wizard_option_currency_other">Ostalo &#8230;</string>
+    <string name="wizard_option_auto_send_crash_reports">Automatski pošalji izvještaj o urušavanju programa</string>
+    <string name="wizard_option_disable_crash_reports">Deaktiviraj izvještavanje o urušavanju programa</string>
+    <string name="wizard_btn_back">Natrag</string>
+    <string name="title_setup_gnucash">Postavi GnuCash</string>
+    <string name="wizard_title_welcome_to_gnucash">Dobro došla, dobro došao u GnuCash</string>
+    <string name="msg_wizard_welcome_page">Prije nego što kreneš s radom, \nnajprije namjesti par stvari\n\nZa nastavak, pritisni Sljedeće</string>
+    <string name="title_split_editor">Uređivač podjela</string>
+    <string name="toast_error_check_split_amounts">Prije spremanja, provjeri da sve stavke podjele imaju valjani iznos!</string>
+    <string name="label_error_invalid_expression">Nevaljani izraz!</string>
+    <string name="toast_scheduled_recurring_transaction">Terminirana ponavljajuća transakcija</string>
+    <string name="title_transfer_funds">Prenesi sredstva</string>
+    <string name="nav_menu_help"><![CDATA[Pomoć i feedback]]></string>
+    <string name="label_select_pie_slice_to_see_details">Za prikaz detalja, odaberi jedan odsječak</string>
+    <string name="label_report_period">Razdoblje:</string>
+    <string name="label_convert_from">Iz:</string>
+    <string name="label_convert_to">U:</string>
+    <string name="msg_provide_exchange_rate">Za prijenos sredstava, zadaj konvertiranu vrijednost ili tečaj</string>
+    <string name="hint_exchange_rate">Tečaj</string>
+    <string name="btn_fetch_quote">Dohvati tečaj</string>
+    <string name="hint_converted_amount">Konvertirani iznos</string>
+    <string name="title_report_sheet">Bilanca</string>
+    <string name="label_last_3_months_expenses">Rashod zadnjih tri mjeseca</string>
+    <string name="label_total_assets">Ukupno imovina</string>
+    <string name="label_total_liabilities">Ukupno obveze</string>
+    <string name="label_net_worth">Neto vrijednost</string>
+    <string name="label_assets">Imovina</string>
+    <string name="label_liabilities">Obveze</string>
+    <string name="label_equity">Kapital</string>
+    <string name="label_move_to">Premjesti u:</string>
+    <string name="menu_group_by">Grupiraj po</string>
+    <string name="menu_group_by_month">Mjesecu</string>
+    <string name="menu_group_by_quarter">Kvartalu</string>
+    <string name="menu_group_by_year">Godini</string>
+    <string name="title_balance_sheet_report">Bilanca</string>
+    <string name="label_balance_sheet_total">Ukupno:</string>
+    <string name="title_google_plus_community">Google+ zajednica</string>
+    <string name="title_translate_gnucash">Prevedi GnuCash</string>
+    <string name="summary_google_plus">Izmijeni ideje, diskutiraj o promjenama ili prijavi greške</string>
+    <string name="summary_translate_gnucash">Prevodi ili ispravljaj prijevode na CrowdIn</string>
+    <string name="toast_no_compatible_apps_to_receive_export">Nema kompatibilne aplikacije za prihvaćanje izvezenih transakcija!</string>
+    <string name="menu_move_transaction">Premjesti &#8230;</string>
+    <string name="menu_duplicate_transaction">Dupliciraj</string>
+    <string name="title_cash_flow_report">Novčani tijek</string>
+    <string name="title_budgets">Proračuni</string>
+    <string name="title_use_compact_list">Aktiviraj kompaktni prikaz</string>
+    <string name="summary_use_compact_list">Aktiviraj stalni prikaz kompaktnog popisa transakcija</string>
+    <string name="error_invalid_exchange_rate">Nevaljani tečaj</string>
+    <string name="sample_exchange_rate">npr. 1 %1$s = x.xx %2$s</string>
+    <string name="error_invalid_amount">Nevaljani iznos</string>
+    <string-array name="report_time_range">
+        <item>Tekući mjesec</item>
+        <item>Zadnja 3 mjeseca</item>
+        <item>Zadnjih 6 mjeseci</item>
+        <item>Zadnjih 12 mjeseci</item>
+        <item>Svo vrijeme</item>
+        <item>Proizvoljno razdoblje &#8230;</item>
+    </string-array>
+    <!-- Passcode lock -->
+    <string name="digit_one">1</string>
+    <!-- In the English locale, digit 1 has no text on it. This is simply empty space. If your locale has text on digit 1, then translate-->
+    <string name="digit_one_text">​</string>
+    <string name="digit_two">2</string>
+    <string name="digit_two_text">ABC</string>
+    <string name="digit_three">3</string>
+    <string name="digit_three_text">DEF</string>
+    <string name="digit_four">4</string>
+    <string name="digit_four_text">GHI</string>
+    <string name="digit_five">5</string>
+    <string name="digit_five_text">JKL</string>
+    <string name="digit_six">6</string>
+    <string name="digit_six_text">MNO</string>
+    <string name="digit_seven">7</string>
+    <string name="digit_seven_text">PQRS</string>
+    <string name="digit_eight">8</string>
+    <string name="digit_eight_text">TUV</string>
+    <string name="digit_nine">9</string>
+    <string name="digit_nine_text">WXYZ</string>
+    <string name="digit_zero">0</string>
+    <string name="digit_zero_text">+</string>
+    <string name="title_manage_books">Upravljaj knjigama</string>
+    <string name="menu_manage_books">Upravljaj knjigama &#8230;</string>
+    <string name="select_chart_to_view_details">Za prikaz detalja, odaberi bilo koji dio dijagrama</string>
+    <string name="title_confirm_delete_book">Potvrdi brisanje knjige</string>
+    <string name="msg_all_book_data_will_be_deleted">Svi konti i sve transakcije ove knjige će biti izbrisane!</string>
+    <string name="btn_delete_book">Izbriši knjigu</string>
+    <string name="label_last_export_time">Zadnji izvoz:</string>
+    <string name="menu_title_enable_sync">Aktiviraj sinkronizaciju</string>
+    <string name="menu_title_new_book">Nova knjiga</string>
+    <string name="toast_transaction_has_no_splits_and_cannot_open">Odabrana transakcija nije podijeljena i ne može se otvoriti</string>
+    <string name="label_split_count">Broj podjela: %1$d</string>
+    <string name="label_inside_account_with_name">u %1$s</string>
+    <plurals name="book_account_stats">
+        <item quantity="one">%d konto</item>
+        <item quantity="few">%d konta</item>
+        <item quantity="other">%d konti</item>
+    </plurals>
+    <plurals name="book_transaction_stats">
+        <item quantity="one">%d transakcija</item>
+        <item quantity="few">%d transakcije</item>
+        <item quantity="other">%d transakcija</item>
+    </plurals>
+    <string-array name="report_account_types">
+        <item>RASHOD</item>
+        <item>PRIHOD</item>
+    </string-array>
+    <string name="toast_connected_to_google_drive">Spoji se s Google Drive</string>
+    <string name="toast_unable_to_connect_to_google_drive">Spajanje s Google Drive nije moguće</string>
+    <string name="toast_enter_amount_to_split">Unesi iznos u podjelu</string>
+    <string name="label_export_target_external_service">vanjska usluga</string>
+    <string name="toast_updated_transaction_recurring_schedule">Aktualiziraj ponavljanja terminiranih transakcija</string>
+    <string name="label_export_transactions_since_date">Od</string>
+    <string name="switch_export_transactions_from_all_time">Svo vrijeme</string>
+    <string name="label_recommend_app">Preporuči na Play Store stranici</string>
+    <string name="repeat_until_date">do %1$s</string>
+    <string name="repeat_on_weekday">na %1$s</string>
+    <string name="repeat_x_times">%1$d puta</string>
+    <string name="menu_show_compact_view">Kompaktni prikaz</string>
+    <string name="book_default_name">Knjiga %1$d</string>
+    <string name="last_export_time_never">nikad</string>
+    <string name="title_rename_book">Preimenuj knjigu</string>
+    <string name="btn_rename">Preimenuj</string>
+    <string name="menu_rename">Preimenuj</string>
+    <string name="title_select_backup_file">Odaberi sigurnosnu kopiju</string>
+    <string name="summary_select_backup_file">Odaberi datoteku za spremanje sigurnosne kopije</string>
+    <string name="title_confirm_restore_backup">Potvrdi ponovo učitavanje sigurnosne kopije</string>
+    <string name="msg_confirm_restore_backup_into_new_book">Otvorit će se nova knjiga sa sadržajem ove sigurnosne kopije. Želiš li nastaviti?</string>
+    <string name="btn_restore">Učitaj sigurnosnu kopiju</string>
+    <string name="title_no_backups_found">Nema sigurnosnih kopija</string>
+    <string name="msg_no_backups_to_restore_from">Ne postoje sigurnosne kopije, koje bi se mogle učitati.</string>
+    <!-- This is the filename for default backups. So use only simple characters and no spaces. Do not change the extension -->
+    <string name="label_backup_filename">gnucash_android_backup.gnca</string>
+    <string name="label_select_destination_after_export">Odaberi odredište nakon što izvoz završi.</string>
+    <string name="label_dropbox_export_destination">Izvezi u Dropbox mapu pod „/Apps/GnuCash Android/„</string>
+    <string name="title_section_preferences">Postavke</string>
+    <string name="yes_sure">Da, želim</string>
+    <string name="key_export_accounts_csv">export_accounts_csv_key</string>
+    <string name="summary_export_accounts_csv">Izvezi sva konta (bez transakcija) u CSV</string>
+    <string name="title_export_accounts_csv">Izvezi kao CSV</string>
+    <string name="label_csv_separator">Razdvojnik</string>
+    <string name="export_notice_csv">Izvezi transakcije kao CSV</string>
+    <string-array name="csv_transaction_headers">
+        <item>Datum</item>
+        <item>ID transakcije</item>
+        <item>Broj</item>
+        <item>Opis</item>
+        <item>Napomene</item>
+        <item>Roba/Valuta</item>
+        <item>Razlog storniranja</item>
+        <item>Radnja</item>
+        <item>Zabilješka</item>
+        <item>Cjelokupno ime konta</item>
+        <item>Ime konta</item>
+        <item>Iznos s oznakom</item>
+        <item>Numerički iznos</item>
+        <item>Uskladi</item>
+        <item>Datum usklađivanja</item>
+        <item>Tečaj/cijena</item>
+    </string-array>
+    <string-array name="csv_account_headers">
+        <item>Vrsta</item>
+        <item>Cjelokupno ime</item>
+        <item>Ime</item>
+        <item>Šifra</item>
+        <item>Opis</item>
+        <item>Boja</item>
+        <item>Napomene</item>
+        <item>robam</item>
+        <item>roban</item>
+        <item>Skriveno</item>
+        <item>Porez</item>
+        <item>Rezervirano mjesto</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index 8f9d8d940..32e24d46f 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -20,15 +20,15 @@
   <string name="title_edit_account">Ubah Akun</string>
   <string name="description_add_transaction_icon">Tambah transaksi baru ke akun</string>
   <string name="description_view_account_icon">Lihat rincian akun</string>
-  <string name="label_no_accounts">Tak ada akun untuk ditampilkan</string>
+  <string name="label_no_accounts">Tidak ada akun untuk ditampilkan</string>
   <string name="label_account_name">Nama akun</string>
   <string name="btn_cancel">Batal</string>
   <string name="btn_save">Simpan</string>
-  <string name="btn_test">Uji coba</string>
-  <string name="label_passcode">Masukkan sandi</string>
-  <string name="toast_wrong_passcode">Sandi salah, silakan coba lagi</string>
-  <string name="toast_passcode_set">Sandi dibuat</string>
-  <string name="label_confirm_passcode">Harap konfirmasi sandi Anda</string>
+  <string name="btn_test">Tes</string>
+  <string name="label_passcode">Masukkan Kode akses</string>
+  <string name="toast_wrong_passcode">Kode akses salah, silakan coba lagi</string>
+  <string name="toast_passcode_set">Kode akses dibuat</string>
+  <string name="label_confirm_passcode">Harap konfirmasi kode akses Anda</string>
   <string name="toast_invalid_passcode_confirmation">Konfirmasi kode akses tidak valid. Silakan cobalagi</string>
   <string name="label_transaction_name">Deskripsi</string>
   <string name="label_transaction_amount">Jumlah</string>
@@ -183,7 +183,7 @@
   <string name="title_all_accounts">Semua</string>
   <string name="summary_create_default_accounts">Buat struktur akun yang paling sering digunakan di GnuCash secara default</string>
   <string name="title_create_default_accounts">Buat akun default</string>
-  <string name="msg_confirm_create_default_accounts_setting">Sebuah buku baru akan dibuka dengan akun default\n\nakun dan transaksi Anda saat ini tidak akan diubah!</string>
+  <string name="msg_confirm_create_default_accounts_setting">A new book will be opened with the default accounts\n\nYour current accounts and transactions will not be modified!</string>
   <string name="title_scheduled_transactions">Transaksi</string>
   <string name="title_select_export_destination">Pilih tujuan untuk ekspor</string>
   <string name="hint_split_memo">Memo</string>
@@ -209,13 +209,10 @@
   <string name="export_warning_ofx">OFX tidak mendukung transaksi double-entry</string>
   <string name="export_warning_qif">Menghasilkan file QIF terpisah per mata uang</string>
   <string name="label_imbalance">Tidak seimbang:</string>
-  <string name="btn_add_split">Tambahkan split
- </string>
+  <string name="btn_add_split">Add split</string>
   <string name="menu_title_favorite">Favorit</string>
-  <string name="drawer_open">Laci navigasi dibuka
- </string>
-  <string name="drawer_close">Laci navigasi tertutup
- </string>
+  <string name="drawer_open">Navigation drawer opened</string>
+  <string name="drawer_close">Navigation drawer closed</string>
   <string name="title_reports">Laporan</string>
   <string name="title_pie_chart">Bagan Pai</string>
   <string name="title_line_chart">Bagan Garis</string>
@@ -250,8 +247,7 @@
   <string name="title_backup_prefs">Pengaturan Cadangan</string>
   <string name="title_create_backup_pref">Membuat Cadangan</string>
   <string name="summary_create_backup_pref">Buat cadangan dari pembukuan yang aktif</string>
-  <string name="summary_restore_backup_pref">Pulihkan cadangan terbaru buku aktif
- </string>
+  <string name="summary_restore_backup_pref">Restore most recent backup of active book</string>
   <string name="toast_backup_successful">Pencadangan berhasil</string>
   <string name="toast_backup_failed">Pencadangan gagal</string>
   <string name="export_warning_xml">Ekspor seluruh akun dan transaksi</string>
@@ -267,15 +263,13 @@
   <string name="owncloud_pref">owncloud</string>
   <string name="owncloud_server">https://</string>
   <string name="owncloud_server_invalid">Server OC tidak ditemukan</string>
-  <string name="owncloud_user_invalid">Username / kata kunci OC tidak valid
- </string>
+  <string name="owncloud_user_invalid">OC username/password invalid</string>
   <string name="owncloud_dir_invalid">Karakter tidak valid: \\ &lt; &gt; : \&quot; | * ? </string>
   <string name="owncloud_server_ok">Server OC OK</string>
-  <string name="owncloud_user_ok">OC username / password OK
- </string>
+  <string name="owncloud_user_ok">OC username/password OK</string>
   <string name="owncloud_dir_ok">Nama Dir OK</string>
   <plurals name="label_every_x_hours">
-    <item quantity="other">Per jam</item>
+    <item quantity="other">Every %d hours</item>
   </plurals>
   <plurals name="label_every_x_days">
     <item quantity="other">Setiap %d hari</item>
@@ -319,11 +313,9 @@
   <string name="wizard_btn_back">Kembali</string>
   <string name="title_setup_gnucash">Pengaturan GnuCash</string>
   <string name="wizard_title_welcome_to_gnucash">Selamat datang di GnuCash</string>
-  <string name="msg_wizard_welcome_page">Sebelum Anda menyelam, \nlmari kita siapkan beberapa hal yang pertama \n\n Untuk melanjutkan, tekan Next</string>
-  <string name="title_split_editor">Editor split
- </string>
-  <string name="toast_error_check_split_amounts">Periksa apakah semua split memiliki jumlah yang valid sebelum menyimpannya!
- !</string>
+  <string name="msg_wizard_welcome_page">Before you dive in, \nlet\'s setup a few things first\n\nTo continue, press Next</string>
+  <string name="title_split_editor">Split Editor</string>
+  <string name="toast_error_check_split_amounts">Check that all splits have valid amounts before saving!</string>
   <string name="label_error_invalid_expression">Ekspresi yang tidak valid!</string>
   <string name="toast_scheduled_recurring_transaction">Transaksi berulang yang dijadwalkan</string>
   <string name="title_transfer_funds">Transfer Dana</string>
@@ -332,53 +324,46 @@
   <string name="label_report_period">Periode:</string>
   <string name="label_convert_from">Dari:</string>
   <string name="label_convert_to">Ke:</string>
-  <string name="msg_provide_exchange_rate">Berikan nilai tukar atau nilai tukar yang dikonversi untuk mentransfer dana
- </string>
-  <string name="hint_exchange_rate">Kurs
- </string>
-  <string name="btn_fetch_quote">Ambil kutipan
- </string>
-  <string name="hint_converted_amount">Jumlah yang Dikonversi
- </string>
-  <string name="title_report_sheet">Lembar
- </string>
-  <string name="label_last_3_months_expenses">Biaya untuk 3 bulan terakhir
- </string>
-  <string name="label_total_assets">Total aset</string>
-  <string name="label_total_liabilities">Jumlah kewajiban</string>
-  <string name="label_net_worth">Kekayaan Bersih</string>
-  <string name="label_assets">Aset</string>
-  <string name="label_liabilities">Kewajiban</string>
-  <string name="label_equity">Ekuitas</string>
-  <string name="label_move_to">Pindah ke:</string>
-  <string name="menu_group_by">Kelompok dengan</string>
-  <string name="menu_group_by_month">Bulan</string>
-  <string name="menu_group_by_quarter">Kuartal</string>
-  <string name="menu_group_by_year">Tahun</string>
-  <string name="title_balance_sheet_report">Neraca keuangan
- </string>
-  <string name="label_balance_sheet_total">Jumlah:</string>
-  <string name="title_google_plus_community">Komunitas Google+</string>
-  <string name="title_translate_gnucash">Menerjemahkan GnuCash</string>
-  <string name="summary_google_plus">Berbagi ide-ide, mendiskusikan perubahan atau melaporkan masalah</string>
-  <string name="summary_translate_gnucash">Menerjemahkan atau bukti dibaca pada CrowdIn</string>
-  <string name="toast_no_compatible_apps_to_receive_export">Tidak ada aplikasi yang kompatibel untuk menerima transaksi diekspor!</string>
-  <string name="menu_move_transaction">Bergerak&#8230;</string>
-  <string name="menu_duplicate_transaction">Duplikat</string>
-  <string name="title_cash_flow_report">Arus Tunai</string>
-  <string name="title_budgets">Anggaran</string>
-  <string name="title_use_compact_list">Mengaktifkan tampilan kompak</string>
-  <string name="summary_use_compact_list">Memungkinkan untuk selalu menggunakan tampilan kompak untuk daftar transaksi</string>
-  <string name="error_invalid_exchange_rate">Edit nilai tukar</string>
-  <string name="sample_exchange_rate">misalnya 1 %1$s = x.xx %2$s</string>
-  <string name="error_invalid_amount">Nominal tidak sah</string>
+  <string name="msg_provide_exchange_rate">Provide either the converted amount or exchange rate in order to transfer funds</string>
+  <string name="hint_exchange_rate">Exchange rate</string>
+  <string name="btn_fetch_quote">Fetch quote</string>
+  <string name="hint_converted_amount">Converted Amount</string>
+  <string name="title_report_sheet">Sheet</string>
+  <string name="label_last_3_months_expenses">Expenses for last 3 months</string>
+  <string name="label_total_assets">Total Assets</string>
+  <string name="label_total_liabilities">Total Liabilities</string>
+  <string name="label_net_worth">Net Worth</string>
+  <string name="label_assets">Assets</string>
+  <string name="label_liabilities">Liabilities</string>
+  <string name="label_equity">Equity</string>
+  <string name="label_move_to">Move to:</string>
+  <string name="menu_group_by">Group By</string>
+  <string name="menu_group_by_month">Month</string>
+  <string name="menu_group_by_quarter">Quarter</string>
+  <string name="menu_group_by_year">Year</string>
+  <string name="title_balance_sheet_report">Balance Sheet</string>
+  <string name="label_balance_sheet_total">Total:</string>
+  <string name="title_google_plus_community">Google+ Community</string>
+  <string name="title_translate_gnucash">Translate GnuCash</string>
+  <string name="summary_google_plus">Share ideas, discuss changes or report problems</string>
+  <string name="summary_translate_gnucash">Translate or proof-read on CrowdIn</string>
+  <string name="toast_no_compatible_apps_to_receive_export">No compatible apps to receive the exported transactions!</string>
+  <string name="menu_move_transaction">Move&#8230;</string>
+  <string name="menu_duplicate_transaction">Duplicate</string>
+  <string name="title_cash_flow_report">Cash Flow</string>
+  <string name="title_budgets">Budgets</string>
+  <string name="title_use_compact_list">Enable compact view</string>
+  <string name="summary_use_compact_list">Enable to always use compact view for transactions list</string>
+  <string name="error_invalid_exchange_rate">Invalid exchange rate</string>
+  <string name="sample_exchange_rate">e.g. 1 %1$s = x.xx %2$s</string>
+  <string name="error_invalid_amount">Invalid amount</string>
   <string-array name="report_time_range">
-    <item>Bulan berjalan</item>
-    <item>3 bulan terakhir</item>
-    <item>6 bulan terakhir</item>
-    <item>12 bulan terakhir</item>
-    <item>Sepanjang waktu</item>
-    <item>Rentang ubahsuai&#8230;</item>
+    <item>Current month</item>
+    <item>Last 3 months</item>
+    <item>Last 6 months</item>
+    <item>Last 12 months</item>
+    <item>All time</item>
+    <item>Custom range&#8230;</item>
   </string-array>
   <!-- Passcode lock -->
   <string name="digit_one">1</string>
@@ -402,61 +387,55 @@
   <string name="digit_nine_text">WXYZ</string>
   <string name="digit_zero">0</string>
   <string name="digit_zero_text">+</string>
-  <string name="title_manage_books">Mengelola buku</string>
-  <string name="menu_manage_books">Mengelola buku&#8230;</string>
-  <string name="select_chart_to_view_details">Memilih bagian dari tabel untuk melihat rincian</string>
-  <string name="title_confirm_delete_book">Konfirmasi penghapusan</string>
-  <string name="msg_all_book_data_will_be_deleted">Semua account dan transaksi dalam buku ini akan dihapus!</string>
-  <string name="btn_delete_book">Menghapus buku</string>
-  <string name="label_last_export_time">Terakhir Diekspor Di:</string>
-  <string name="menu_title_enable_sync">Mengaktifkan sinkronisasi</string>
-  <string name="menu_title_new_book">Buku baru</string>
-  <string name="toast_transaction_has_no_splits_and_cannot_open">Transaksi dipilih telah ada perpecahan dan tidak dapat dibuka</string>
-  <string name="label_split_count">perpecahan %1$d</string>
-  <string name="label_inside_account_with_name">di %1$s</string>
+  <string name="title_manage_books">Manage Books</string>
+  <string name="menu_manage_books">Manage Books&#8230;</string>
+  <string name="select_chart_to_view_details">Select any part of the chart to view details</string>
+  <string name="title_confirm_delete_book">Confirm delete Book</string>
+  <string name="msg_all_book_data_will_be_deleted">All accounts and transactions in this book will be deleted!</string>
+  <string name="btn_delete_book">Delete Book</string>
+  <string name="label_last_export_time">Last Exported:</string>
+  <string name="menu_title_enable_sync">Enable Sync</string>
+  <string name="menu_title_new_book">New Book</string>
+  <string name="toast_transaction_has_no_splits_and_cannot_open">The selected transaction has no splits and cannot be opened</string>
+  <string name="label_split_count">%1$d splits</string>
+  <string name="label_inside_account_with_name">in %1$s</string>
   <plurals name="book_account_stats">
-    <item quantity="other">%d sub-akun</item>
+    <item quantity="other">%d accounts</item>
   </plurals>
   <plurals name="book_transaction_stats">
-    <item quantity="other">transaksi%d</item>
+    <item quantity="other">%d transactions</item>
   </plurals>
   <string-array name="report_account_types">
-    <item>PENGELUARAN</item>
-    <item>PENDAPATAN</item>
+    <item>EXPENSE</item>
+    <item>INCOME</item>
   </string-array>
-  <string name="toast_connected_to_google_drive">Hubungakan ke Google play</string>
-  <string name="toast_unable_to_connect_to_google_drive">Tidak dapat tersambung ke server</string>
-  <string name="toast_enter_amount_to_split">Masukkan jumlah</string>
-  <string name="label_export_target_external_service">layanan Eksternal</string>
-  <string name="toast_updated_transaction_recurring_schedule">Diperbarui transaksi berkala jadwal</string>
-  <string name="label_export_transactions_since_date">Sejak</string>
-  <string name="switch_export_transactions_from_all_time">Sepanjang waktu</string>
-  <string name="label_recommend_app">Merekomendasikan di Play Store</string>
-  <string name="repeat_until_date">sampai %1$s</string>
-  <string name="repeat_on_weekday">di %1$s</string>
-  <string name="repeat_x_times">untuk %1$d kali</string>
-  <string name="menu_show_compact_view">Tampilan Sederhana</string>
-  <string name="book_default_name">Buku %1$d</string>
-  <string name="last_export_time_never">tdk pernah</string>
-  <string name="title_rename_book">Mengubah nama buku</string>
-  <string name="btn_rename">Ubah Nama</string>
-  <string name="menu_rename">Ubah Nama</string>
-  <string name="title_select_backup_file">Pilih file backup</string>
-  <string name="summary_select_backup_file">Pilih file untuk backup otomatis
- </string>
-  <string name="title_confirm_restore_backup">Yakin memulihkan dari backup</string>
-  <string name="msg_confirm_restore_backup_into_new_book">Sebuah buku baru akan dibuka dengan isi backup ini. Apakah Anda ingin melanjutkan?
- ?</string>
-  <string name="btn_restore">Mengembalikan</string>
-  <string name="title_no_backups_found">Backup tidak ditemukan</string>
-  <string name="msg_no_backups_to_restore_from">Tidak ada file cadangan yang ada untuk dipulihkan
- </string>
+  <string name="toast_connected_to_google_drive">Connected to Google Drive</string>
+  <string name="toast_unable_to_connect_to_google_drive">Unable to connect to Google Drive</string>
+  <string name="toast_enter_amount_to_split">Please enter an amount to split</string>
+  <string name="label_export_target_external_service">external service</string>
+  <string name="toast_updated_transaction_recurring_schedule">Updated transaction recurring schedule</string>
+  <string name="label_export_transactions_since_date">Since</string>
+  <string name="switch_export_transactions_from_all_time">All time</string>
+  <string name="label_recommend_app">Recommend in Play Store</string>
+  <string name="repeat_until_date">until %1$s</string>
+  <string name="repeat_on_weekday">on %1$s</string>
+  <string name="repeat_x_times">for %1$d times</string>
+  <string name="menu_show_compact_view">Compact View</string>
+  <string name="book_default_name">Book %1$d</string>
+  <string name="last_export_time_never">never</string>
+  <string name="title_rename_book">Rename Book</string>
+  <string name="btn_rename">Rename</string>
+  <string name="menu_rename">Rename</string>
+  <string name="title_select_backup_file">Select backup file</string>
+  <string name="summary_select_backup_file">Select a file for automatic backups</string>
+  <string name="title_confirm_restore_backup">Confirm restore from backup</string>
+  <string name="msg_confirm_restore_backup_into_new_book">A new book will be opened with the contents of this backup. Do you wish to proceed?</string>
+  <string name="btn_restore">Restore</string>
+  <string name="title_no_backups_found">No backups found</string>
+  <string name="msg_no_backups_to_restore_from">There are no existing backup files to restore from</string>
   <!-- This is the filename for default backups. So use only simple characters and no spaces. Do not change the extension -->
-  <string name="label_backup_filename">gnucash_android_backup.gnca
- </string>
-  <string name="label_select_destination_after_export">Pilih tujuan setelah ekspor selesai
- </string>
-  <string name="label_dropbox_export_destination">Ekspor ke folder \'/ Apps / GnuCash Android /\' di Dropbox
- </string>
-  <string name="title_section_preferences">Preferensi</string>
+  <string name="label_backup_filename">gnucash_android_backup.gnca</string>
+  <string name="label_select_destination_after_export">Select the destination after export is complete</string>
+  <string name="label_dropbox_export_destination">Export to \'/Apps/GnuCash Android/\' folder on Dropbox</string>
+  <string name="title_section_preferences">Preferences</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 37681f758..2f3bfca4f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -138,7 +138,7 @@
   <string name="toast_all_transactions_deleted">Todas as transações apagadas com sucesso!</string>
   <string name="title_progress_importing_accounts">Importando contas</string>
   <string name="section_header_transactions">Transações</string>
-  <string name="section_header_subaccounts">Subcontas</string>
+  <string name="section_header_subaccounts">Sub-Contas</string>
   <string name="menu_search_accounts">Procurar</string>
   <string name="title_default_export_format">Formato de Exportação padrão</string>
   <string name="summary_default_export_format">Formato de arquivo a ser usado por padrão ao exportar transações</string>
@@ -151,8 +151,8 @@
   <string name="label_placeholder_account">Conta não editável</string>
   <string name="label_default_transfer_account">Conta para transferências padrão</string>
   <plurals name="label_sub_accounts">
-    <item quantity="one">%d subconta</item>
-    <item quantity="other">%d subconta</item>
+    <item quantity="one">%d sub-conta</item>
+    <item quantity="other">%d sub-contas</item>
   </plurals>
   <string-array name="account_type_entry_values">
     <item>DINHEIRO</item>
@@ -180,9 +180,9 @@
   <!-- Content description for a color square. -->
   <!-- Content description for a selected color square. -->
   <string name="label_account_color_and_type">Cor de conta &amp; Tipo</string>
-  <string name="label_delete_sub_accounts">Apagar subcontas</string>
+  <string name="label_delete_sub_accounts">Apagar sub-contas</string>
   <string name="title_recent_accounts">Recentes</string>
-  <string name="title_favorite_accounts">Favoritas</string>
+  <string name="title_favorite_accounts">Favoritos</string>
   <string name="title_all_accounts">Todas</string>
   <string name="summary_create_default_accounts">Cria uma estrutura de contas GnuCash padrão</string>
   <string name="title_create_default_accounts">Cria contas padrão</string>
@@ -222,8 +222,8 @@
   <string name="title_line_chart">Gráfico de Linhas</string>
   <string name="title_bar_chart">Gráfico de Barras</string>
   <string name="title_report_prefs">Preferências de relatórios</string>
-  <string name="title_use_account_color">Cor da conta nos relatórios</string>
-  <string name="summary_use_account_color">Use cor da conta no gráfico de barras/linhas</string>
+  <string name="title_use_account_color">Côr da conta nos relatórios</string>
+  <string name="summary_use_account_color">Use côr da conta no gráfico de barras/linhas</string>
   <string name="menu_order_by_size">Ordenar por tamanho</string>
   <string name="menu_toggle_legend">Alterna visibilidade da legenda</string>
   <string name="menu_toggle_labels">Alterna visibilidade das etiquetas</string>
@@ -428,7 +428,7 @@ Neste processo não serão recolhidas informações do utilizador!</string>
   <string name="toast_updated_transaction_recurring_schedule">Agenda recorrente de transação atualizada</string>
   <string name="label_export_transactions_since_date">Desde</string>
   <string name="switch_export_transactions_from_all_time">Desde o início</string>
-  <string name="label_recommend_app">Recomendar na Play Store</string>
+  <string name="label_recommend_app">Recomendado na Play Store</string>
   <string name="repeat_until_date">até %1$s</string>
   <string name="repeat_on_weekday">em %1$s</string>
   <string name="repeat_x_times">por %1$d vezes</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index eedcb017a..fed5df41b 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -428,7 +428,7 @@ Neste processo não serão recolhidas informações do utilizador!</string>
   <string name="toast_updated_transaction_recurring_schedule">Transação atualizada agendamento recorrente</string>
   <string name="label_export_transactions_since_date">Desde</string>
   <string name="switch_export_transactions_from_all_time">Todo o tempo</string>
-  <string name="label_recommend_app">Recomendar na Play Store</string>
+  <string name="label_recommend_app">Recomendado na Play Store</string>
   <string name="repeat_until_date">desde%1$s</string>
   <string name="repeat_on_weekday">na %1$s</string>
   <string name="repeat_x_times">por %1$d vezes</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 1b625cc34..9ba4502df 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -154,7 +154,6 @@
   <plurals name="label_sub_accounts">
     <item quantity="one">%d дочерний счёт</item>
     <item quantity="few">%d шт. дочерних счетов</item>
-    <item quantity="many">%d sub-accounts</item>
     <item quantity="other">%d шт. дочерних счетов</item>
   </plurals>
   <string-array name="account_type_entry_values">
@@ -225,7 +224,7 @@
   <string name="title_line_chart">График</string>
   <string name="title_bar_chart">Гистограмма</string>
   <string name="title_report_prefs">Настройки отчётов</string>
-  <string name="title_use_account_color">Цвет счёта в отчётах</string>
+  <string name="title_use_account_color">Цвет счёта в отчётых</string>
   <string name="summary_use_account_color">Использовать цвет счёта в отчётах</string>
   <string name="menu_order_by_size">Отсортировать по размеру</string>
   <string name="menu_toggle_legend">Показать легенду</string>
@@ -278,31 +277,26 @@
   <plurals name="label_every_x_hours">
     <item quantity="one">Каждый час</item>
     <item quantity="few">Каждые %d часа</item>
-    <item quantity="many">Every %d hours</item>
     <item quantity="other">Каждые %d часов</item>
   </plurals>
   <plurals name="label_every_x_days">
     <item quantity="one">Ежедневно</item>
     <item quantity="few">Каждые %d дня</item>
-    <item quantity="many">Every %d days</item>
     <item quantity="other">Каждые %d дней</item>
   </plurals>
   <plurals name="label_every_x_weeks">
     <item quantity="one">Еженедельно</item>
     <item quantity="few">Каждые %d недели</item>
-    <item quantity="many">Every %d weeks</item>
     <item quantity="other">Каждые %d недель</item>
   </plurals>
   <plurals name="label_every_x_months">
     <item quantity="one">Ежемесячно</item>
     <item quantity="few">Каждые %d месяца</item>
-    <item quantity="many">Every %d months</item>
     <item quantity="other">Каждые %d месяцев</item>
   </plurals>
   <plurals name="label_every_x_years">
     <item quantity="one">Ежегодно</item>
     <item quantity="few">Каждые %d года</item>
-    <item quantity="many">Every %d years</item>
     <item quantity="other">Каждые %d лет</item>
   </plurals>
   <string name="title_enable_crashlytics">Записывать отказы программы</string>
@@ -335,7 +329,7 @@
   <string name="wizard_btn_back">Назад</string>
   <string name="title_setup_gnucash">Настройка GnuCash</string>
   <string name="wizard_title_welcome_to_gnucash">Добро пожаловать в GnuCash</string>
-  <string name="msg_wizard_welcome_page">Прежде, чем вы начнёте,\nдавайте настроим некоторые вещи.\n\nДля продолжения нажмите «Далее».</string>
+  <string name="msg_wizard_welcome_page">Прежде, чем вы начныте,\nдавайте настроим некоторые вещи.\n\nДля продолжения нажмите «Далее».</string>
   <string name="title_split_editor">Редактор разбиения</string>
   <string name="toast_error_check_split_amounts">Проверьте, что все части корректно распределены перед сохранением!</string>
   <string name="label_error_invalid_expression">Неверное выражение!</string>
@@ -347,7 +341,7 @@
   <string name="label_convert_from">С:</string>
   <string name="label_convert_to">До:</string>
   <string name="msg_provide_exchange_rate">Заполните или обменянную сумму или курс обмена</string>
-  <string name="hint_exchange_rate">Курс обмена</string>
+  <string name="hint_exchange_rate">EКурс обмена</string>
   <string name="btn_fetch_quote">Получить котировки</string>
   <string name="hint_converted_amount">Обмененная сумма</string>
   <string name="title_report_sheet">Сводка</string>
@@ -424,13 +418,11 @@
   <plurals name="book_account_stats">
     <item quantity="one">%d счета</item>
     <item quantity="few">%d счета</item>
-    <item quantity="many">%d accounts</item>
     <item quantity="other">%d счетов</item>
   </plurals>
   <plurals name="book_transaction_stats">
     <item quantity="one">%d транзакция</item>
     <item quantity="few">%d транзакции</item>
-    <item quantity="many">%d transactions</item>
     <item quantity="other">%d транзакций</item>
   </plurals>
   <string-array name="report_account_types">
@@ -457,7 +449,7 @@
   <string name="title_select_backup_file">Выберите файл резервной копии</string>
   <string name="summary_select_backup_file">Выберите файл для автоматического резервного копирования</string>
   <string name="title_confirm_restore_backup">Подтвердите восстановление из резервной копии</string>
-  <string name="msg_confirm_restore_backup_into_new_book">Новая книга будет открыта с содержанием этой резервной копии. Хотите продолжить?</string>
+  <string name="msg_confirm_restore_backup_into_new_book">Новая книга будет открыта с содержанием этой резервной копии. Вы хотите продолжить?</string>
   <string name="btn_restore">Восстановить</string>
   <string name="title_no_backups_found">Резервные копии не найдены</string>
   <string name="msg_no_backups_to_restore_from">Нет существующих файлов резервных копий для восстановления</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 71645393c..be8308fd5 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -20,7 +20,7 @@
   <string name="title_edit_account">Redigera konto</string>
   <string name="description_add_transaction_icon">Lägg till en transaktion till ett konto</string>
   <string name="description_view_account_icon">Visa kontodetaljer</string>
-  <string name="label_no_accounts">Inga konton att visa</string>
+  <string name="label_no_accounts">Det finns inga konton att visa</string>
   <string name="label_account_name">Kontonamn</string>
   <string name="btn_cancel">Avbryt</string>
   <string name="btn_save">Spara</string>
@@ -33,7 +33,7 @@
   <string name="label_transaction_name">Beskrivning</string>
   <string name="label_transaction_amount">Belopp</string>
   <string name="title_add_transaction">Lägg till transaktion</string>
-  <string name="label_no_transactions">Inga transaktioner att visa</string>
+  <string name="label_no_transactions">Det finns inga transaktioner att visa</string>
   <string name="label_debit">DEBIT</string>
   <string name="label_credit">KREDIT</string>
   <string name="title_accounts">Konton</string>
@@ -79,7 +79,7 @@
   <string name="label_display_account">Visa konto</string>
   <string name="label_hide_account_balance">Dölja kontosaldo i widget</string>
   <string name="btn_create_accounts">Skapa konton</string>
-  <string name="error_no_accounts">Inga konton finns i GnuCash.\nSkapa ett konto innan du lägger till en gränssnittskomponent</string>
+  <string name="error_no_accounts">Inga konton finns i GnuCash.\nSkapa ett konto innan du lägger till en widget</string>
   <string name="title_license">Licens</string>
   <string name="summary_licence_details">Apache License v2.0. Klicka för Detaljer</string>
   <string name="title_general_prefs">Allmänna inställningar</string>
@@ -293,7 +293,7 @@
   <string name="label_old_passcode">Ange din gamla lösenkod</string>
   <string name="label_new_passcode">Ange din nya lösenkod</string>
   <string name="title_scheduled_exports">Exporter</string>
-  <string name="label_no_scheduled_exports_to_display">Inga schemalagda exporter att visa</string>
+  <string name="label_no_scheduled_exports_to_display">Ingen schemalagda exporter att Visa</string>
   <string name="title_create_export_schedule">Skapa exportschema</string>
   <string name="toast_exported_to">Exporterades till: %1$s</string>
   <string name="toast_legend_too_long">Förklaringen är för lång</string>
@@ -391,8 +391,8 @@
   <string name="digit_nine_text">WXYZ</string>
   <string name="digit_zero">0</string>
   <string name="digit_zero_text">+</string>
-  <string name="title_manage_books">Hantera bokföringar</string>
-  <string name="menu_manage_books">Hantera bokföringar&#8230;</string>
+  <string name="title_manage_books">Hantera böcker</string>
+  <string name="menu_manage_books">Hantera böcker&#8230;</string>
   <string name="select_chart_to_view_details">Välj någon del av diagrammet för att visa detaljer</string>
   <string name="title_confirm_delete_book">Bekräfta radera bokföring</string>
   <string name="msg_all_book_data_will_be_deleted">Alla konton och transaktioner i denna bokföring kommer att raderas!</string>
@@ -400,7 +400,7 @@
   <string name="label_last_export_time">Senast exporterad:</string>
   <string name="menu_title_enable_sync">Aktivera synkronisering</string>
   <string name="menu_title_new_book">Ny bokföring</string>
-  <string name="toast_transaction_has_no_splits_and_cannot_open">Valda transaktionen har inga delningar och kan inte öppnas</string>
+  <string name="toast_transaction_has_no_splits_and_cannot_open">Valda transaktionen har ingen delningar och kan inte öppnas</string>
   <string name="label_split_count">%1$d delar</string>
   <string name="label_inside_account_with_name">i %1$s</string>
   <plurals name="book_account_stats">
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 8b502ea05..70dd0e16b 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -18,9 +18,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="title_create_account">新增科目</string>
   <string name="title_edit_account">編輯科目</string>
-  <string name="description_add_transaction_icon">在科目中新增交易</string>
+  <string name="description_add_transaction_icon">给科目添加交易</string>
   <string name="description_view_account_icon">檢視帳戶詳細資訊</string>
-  <string name="label_no_accounts">沒有科目可顯示</string>
+  <string name="label_no_accounts">没有要显示的科目</string>
   <string name="label_account_name">科目名稱</string>
   <string name="btn_cancel">取消</string>
   <string name="btn_save">存檔</string>
@@ -59,7 +59,7 @@
     <item>另存為&#8230;</item>
     <item>Dropbox</item>
     <item>ownCloud</item>
-    <item>傳送到&#8230;</item>
+    <item>Send to&#8230;</item>
   </string-array>
   <string name="btn_move">移動</string>
   <string name="title_move_transactions">移動 %1$d 交易</string>
@@ -78,7 +78,7 @@
   <string name="label_permission_create_account">建立會計科目</string>
   <string name="label_display_account">顯示科目名字</string>
   <string name="label_hide_account_balance">小工具中隱藏帳戶餘額</string>
-  <string name="btn_create_accounts">建立科目</string>
+  <string name="btn_create_accounts">创建科目</string>
   <string name="error_no_accounts">GnuCash裡還没有會計科目信息。\n使用小部件前需要添加會計科目</string>
   <string name="title_license">授權許可</string>
   <string name="summary_licence_details">Apache License v2.0，點擊查看詳细（將打開網頁）。</string>
@@ -125,7 +125,7 @@
 	</string>
   <string name="label_dismiss">知道了</string>
   <string name="toast_transanction_amount_required">輸入金額才能保存交易</string>
-  <string name="toast_error_importing_accounts">匯入GnuCash科目時發生錯誤。</string>
+  <string name="toast_error_importing_accounts">匯入GnuCash科目时發生錯誤。</string>
   <string name="toast_success_importing_accounts">GnuCash科目資料匯入完成。</string>
   <string name="summary_import_accounts">匯入從GnuCash桌面版匯出的科目設置</string>
   <string name="title_import_accounts">匯入GnuCash科目</string>
@@ -177,7 +177,7 @@
     <item>XML</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
-  <string name="color_picker_default_title">選擇顏色</string>
+  <string name="color_picker_default_title">选择一种颜色</string>
   <!-- Content description for a color square. -->
   <!-- Content description for a selected color square. -->
   <string name="label_account_color_and_type">科目顏色和類型</string>
@@ -187,7 +187,8 @@
   <string name="title_all_accounts">所有</string>
   <string name="summary_create_default_accounts">建立通用的科目結構</string>
   <string name="title_create_default_accounts">建立預設科目</string>
-  <string name="msg_confirm_create_default_accounts_setting">這將用預設科目來建立新的帳簿\n\n目前擁有的科目與交易不會受影響</string>
+  <string name="msg_confirm_create_default_accounts_setting">将会创建新的账簿附带默认的科目
+现在这个账簿不会受到影响</string>
   <string name="title_scheduled_transactions">交易</string>
   <string name="title_select_export_destination">選擇儲存的位置</string>
   <string name="hint_split_memo">描述</string>
@@ -196,7 +197,7 @@
   <string name="label_withdrawal">提款</string>
   <string name="label_deposit">存款</string>
   <string name="label_payment">付款</string>
-  <string name="label_charge">費用</string>
+  <string name="label_charge">费用</string>
   <string name="label_decrease">減少</string>
   <string name="label_increase">增加</string>
   <string name="label_income">收入</string>
@@ -220,10 +221,10 @@
   <string name="title_reports">報表</string>
   <string name="title_pie_chart">圓形圖</string>
   <string name="title_line_chart">折線圖</string>
-  <string name="title_bar_chart">長條圖</string>
+  <string name="title_bar_chart">橫條圖</string>
   <string name="title_report_prefs">報表設置</string>
   <string name="title_use_account_color">用不同顏色区分科目</string>
-  <string name="summary_use_account_color">在圓餅圖中使用科目的顏色</string>
+  <string name="summary_use_account_color">在饼图中使用科目的颜色</string>
   <string name="menu_order_by_size">按數量排序</string>
   <string name="menu_toggle_legend">顯示圖例</string>
   <string name="menu_toggle_labels">顯示標籤</string>
@@ -266,20 +267,20 @@
   <string name="password">密碼</string>
   <string name="owncloud_pref">ownCloud</string>
   <string name="owncloud_server">https://</string>
-  <string name="owncloud_server_invalid">沒有找到 ownCloud 伺服器</string>
+  <string name="owncloud_server_invalid">伺服器找不到。</string>
   <string name="owncloud_user_invalid">帳號/密碼無效</string>
   <string name="owncloud_dir_invalid">無效字元: \\ &lt; &gt; : \&quot; | * ? </string>
   <string name="owncloud_server_ok">OC server OK</string>
   <string name="owncloud_user_ok">OC username/password OK</string>
   <string name="owncloud_dir_ok">Dir name OK</string>
   <plurals name="label_every_x_hours">
-    <item quantity="other">每 %d 個小時</item>
+    <item quantity="other">Every %d hours</item>
   </plurals>
   <plurals name="label_every_x_days">
     <item quantity="other">每 %d 天</item>
   </plurals>
   <plurals name="label_every_x_weeks">
-    <item quantity="other">每 %d 週</item>
+    <item quantity="other">每 %d 周</item>
   </plurals>
   <plurals name="label_every_x_months">
     <item quantity="other">每 %d 月</item>
@@ -311,13 +312,13 @@ No user-identifiable information will be collected as part of this process!
   <string name="wizard_title_select_currency">選擇幣種</string>
   <string name="wizard_title_feedback_options">回饋選項</string>
   <string name="wizard_option_create_default_accounts">建立預設科目</string>
-  <string name="wizard_option_import_my_accounts">匯入科目</string>
+  <string name="wizard_option_import_my_accounts">汇入科目</string>
   <string name="wizard_option_let_me_handle_it">稍后处理</string>
   <string name="wizard_option_currency_other">其他...</string>
   <string name="wizard_option_auto_send_crash_reports">自動發送故障報告</string>
   <string name="wizard_option_disable_crash_reports">禁用崩潰報告</string>
   <string name="wizard_btn_back">後退</string>
-  <string name="title_setup_gnucash">設定GnuCash</string>
+  <string name="title_setup_gnucash">设置GnuCash</string>
   <string name="wizard_title_welcome_to_gnucash">歡迎來到GnuCash</string>
   <string name="msg_wizard_welcome_page">在使用之前，需 \n要设置几个参数\n\n请点击“下一步”繼續</string>
   <string name="title_split_editor">拆分交易</string>
@@ -343,7 +344,7 @@ No user-identifiable information will be collected as part of this process!
   <string name="label_liabilities">負債</string>
   <string name="label_equity">財產淨值</string>
   <string name="label_move_to">移動至</string>
-  <string name="menu_group_by">分組方式</string>
+  <string name="menu_group_by">分组方式</string>
   <string name="menu_group_by_month">月</string>
   <string name="menu_group_by_quarter">季度</string>
   <string name="menu_group_by_year">年</string>
@@ -352,13 +353,13 @@ No user-identifiable information will be collected as part of this process!
   <string name="title_google_plus_community">Google+ 社群</string>
   <string name="title_translate_gnucash">翻譯GnuCash</string>
   <string name="summary_google_plus">在Google+上提交问题和建议</string>
-  <string name="summary_translate_gnucash">在CrowdIn上協助翻譯或校對GnuCash</string>
+  <string name="summary_translate_gnucash">帮忙翻譯或校對（ CrowdIn）</string>
   <string name="toast_no_compatible_apps_to_receive_export">没有合适的应用接收汇出的文档</string>
   <string name="menu_move_transaction">移動...</string>
   <string name="menu_duplicate_transaction">複製</string>
   <string name="title_cash_flow_report">現金流</string>
   <string name="title_budgets">預算</string>
-  <string name="title_use_compact_list">啟用緊湊視圖</string>
+  <string name="title_use_compact_list">啟用紧凑視圖</string>
   <string name="summary_use_compact_list">交易清單總是啟用緊湊視圖</string>
   <string name="error_invalid_exchange_rate">匯率不正確</string>
   <string name="sample_exchange_rate">例如 1 %1$s = x.xx %2$s</string>
@@ -393,23 +394,23 @@ No user-identifiable information will be collected as part of this process!
   <string name="digit_nine_text">WXYZ</string>
   <string name="digit_zero">0</string>
   <string name="digit_zero_text">+</string>
-  <string name="title_manage_books">管理帳簿</string>
-  <string name="menu_manage_books">管理帳簿&#8230;</string>
+  <string name="title_manage_books">管理帐簿</string>
+  <string name="menu_manage_books">管理帐簿</string>
   <string name="select_chart_to_view_details">選擇該圖表以查看詳細資訊的任何部分</string>
   <string name="title_confirm_delete_book">確認删除</string>
-  <string name="msg_all_book_data_will_be_deleted">帳簿中所有科目和交易都將被刪除 ！</string>
-  <string name="btn_delete_book">删除帳簿</string>
+  <string name="msg_all_book_data_will_be_deleted">帐簿中所有科目和交易都將被刪除 ！</string>
+  <string name="btn_delete_book">删除帐簿</string>
   <string name="label_last_export_time">最後匯出︰</string>
   <string name="menu_title_enable_sync">啟用同步</string>
   <string name="menu_title_new_book">新建帐簿</string>
   <string name="toast_transaction_has_no_splits_and_cannot_open">选择的交易没有拆分</string>
   <string name="label_split_count">%1$d 项分割</string>
-  <string name="label_inside_account_with_name">於 %1$s</string>
+  <string name="label_inside_account_with_name">于 %1$s</string>
   <plurals name="book_account_stats">
-    <item quantity="other">%d 個科目</item>
+    <item quantity="other">%d个科目</item>
   </plurals>
   <plurals name="book_transaction_stats">
-    <item quantity="other">%d 個交易</item>
+    <item quantity="other">%d个交易</item>
   </plurals>
   <string-array name="report_account_types">
     <item>費用</item>
@@ -419,29 +420,29 @@ No user-identifiable information will be collected as part of this process!
   <string name="toast_unable_to_connect_to_google_drive">無法連線到伺服器</string>
   <string name="toast_enter_amount_to_split">請輸入要拆分的金額</string>
   <string name="label_export_target_external_service">外部服務</string>
-  <string name="toast_updated_transaction_recurring_schedule">排程交易已經更新</string>
+  <string name="toast_updated_transaction_recurring_schedule">排程交易已经更新</string>
   <string name="label_export_transactions_since_date">自從</string>
   <string name="switch_export_transactions_from_all_time">全部時間</string>
   <string name="label_recommend_app">在 Play Store 推薦</string>
   <string name="repeat_until_date">直到%1$s</string>
   <string name="repeat_on_weekday">在%1$s</string>
-  <string name="repeat_x_times">%1$d 次</string>
-  <string name="menu_show_compact_view">緊湊視圖</string>
-  <string name="book_default_name">帳簿 %1$d</string>
-  <string name="last_export_time_never">從未</string>
-  <string name="title_rename_book">重新命名帳簿</string>
-  <string name="btn_rename">重新命名</string>
-  <string name="menu_rename">重新命名</string>
-  <string name="title_select_backup_file">選擇備份檔</string>
-  <string name="summary_select_backup_file">選擇自動備份時用的檔案</string>
-  <string name="title_confirm_restore_backup">確認恢復備份</string>
-  <string name="msg_confirm_restore_backup_into_new_book">將以這個備份的內容新建一本帳簿。確定要繼續？</string>
-  <string name="btn_restore">恢復</string>
-  <string name="title_no_backups_found">沒有找到備份</string>
-  <string name="msg_no_backups_to_restore_from">沒有能恢復的備份</string>
+  <string name="repeat_x_times">for %1$d times</string>
+  <string name="menu_show_compact_view">紧凑视图</string>
+  <string name="book_default_name">账簿 %1$d</string>
+  <string name="last_export_time_never">never</string>
+  <string name="title_rename_book">Rename Book</string>
+  <string name="btn_rename">Rename</string>
+  <string name="menu_rename">Rename</string>
+  <string name="title_select_backup_file">Select backup file</string>
+  <string name="summary_select_backup_file">Select a file for automatic backups</string>
+  <string name="title_confirm_restore_backup">Confirm restore from backup</string>
+  <string name="msg_confirm_restore_backup_into_new_book">A new book will be opened with the contents of this backup. Do you wish to proceed?</string>
+  <string name="btn_restore">Restore</string>
+  <string name="title_no_backups_found">No backups found</string>
+  <string name="msg_no_backups_to_restore_from">There are no existing backup files to restore from</string>
   <!-- This is the filename for default backups. So use only simple characters and no spaces. Do not change the extension -->
-  <string name="label_backup_filename">gnucash_android_備份.gnca</string>
-  <string name="label_select_destination_after_export">匯出後再選擇目的地</string>
-  <string name="label_dropbox_export_destination">匯出到 Dropbox 上的 \'/Apps/GnuCash Android/\' 資料夾</string>
-  <string name="title_section_preferences">偏好設定</string>
+  <string name="label_backup_filename">gnucash_android_backup.gnca</string>
+  <string name="label_select_destination_after_export">Select the destination after export is complete</string>
+  <string name="label_dropbox_export_destination">Export to \'/Apps/GnuCash Android/\' folder on Dropbox</string>
+  <string name="title_section_preferences">Preferences</string>
 </resources>
diff --git a/crowdin.yml b/crowdin.yml
index 57f6ea49d..b4389d4b2 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -7,6 +7,8 @@
 #
 "preserve_hierarchy": false
 
+"disable-branches": true
+
 #
 # Files configuration
 #