diff --git a/CHANGELOG.md b/CHANGELOG.md
index 230e565fb..0e7fb0f76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 Change Log
 ===============================================================================
-Version 2.4.0 *(2018-06-06)*
+Version 2.4.0 *(2018-06-xx)*
 ----------------------------
 * Feature #665: Adds CSV export format
 * Feature #544: Add extra checkbox confirmation for irreversible actions
diff --git a/README.md b/README.md
index 245c2fb20..03dee803e 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Accounts            |  Transactions          |  Reports
 :-------------------------:|:-------------------------:|:-------------------------:
 ![Accounts List](docs/images/v2.0.0_home.png)  |  ![Transactions List](docs/images/v2.0.0_transactions_list.png) |  ![Reports](docs/images/v2.0.0_reports.png)
 
-The application supports Android 4.4 KitKat (API level 19) and above.
+The application supports Android 4.4 KitKat (API level 19) and above.
 
 Features include:
 
@@ -90,9 +90,10 @@ There are several ways you could contribute to the development.
 
 * Pull requests are always welcome! You could contribute code by fixing bugs, adding new features or automated tests. 
 Take a look at the [bug tracker](https://github.com/codinguser/gnucash-android/issues?state=open)
-for ideas where to start. Also make sure to read our [contribution guidlines](https://github.com/codinguser/gnucash-android/blob/master/.github/CONTRIBUTING.md)
+for ideas where to start. It is also preferable to target issues in the current [milestone](https://github.com/codinguser/gnucash-android/milestones). 
+* Make sure to read our [contribution guidelines](https://github.com/codinguser/gnucash-android/blob/master/.github/CONTRIBUTING.md) before starting to code. 
 
-* One way is providing translations for locales which are not yet available, or improving translations.
+* Another way to contribute is by providing translations for languages, or improving translations.
 Please visit [CrowdIn](https://crowdin.com/project/gnucash-android) in order to update and create new translations
 
 For development, it is recommended to use the Android Studio for development which is available for free.
diff --git a/app/build.gradle b/app/build.gradle
index 9fa3e96da..3d03548c3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'io.fabric'
 def versionMajor = 2
 def versionMinor = 4
 def versionPatch = 0
-def versionBuild = 1
+def versionBuild = 2
 
 static def buildTime() {
     def df = new SimpleDateFormat("yyyyMMdd HH:mm 'UTC'")
diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index 6ebabab18..8bc5253ca 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -179,8 +179,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-accounts</item>
-    <item>CSV-transactions</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Select a Color</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 9b5220b13..f593b1675 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -183,8 +183,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-accounts</item>
-    <item>CSV-transactions</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Select a Color</string>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index e0759fc47..c5bc4eb4a 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -177,8 +177,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-comptes</item>
-    <item>CSV-transaccions</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Seleccioneu un color</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 474479365..dc5b11a03 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -176,8 +176,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-účty</item>
-    <item>CSV-transakcí</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Select a Color</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0a5c06f49..a9529b883 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -176,8 +176,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-Konten</item>
-    <item>CSV-Transaktionen</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Farbe auswählen</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index db79ae430..cf674c732 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -188,8 +188,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-λογαριασμούς</item>
-    <item>CSV-συναλλαγών</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Επιλογή χρώματος</string>
@@ -208,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">Withdrawal</string>
-  <string name="label_deposit">Deposit</string>
-  <string name="label_payment">Payment</string>
-  <string name="label_charge">Charge</string>
+  <string name="label_withdrawal">Ανάληψη</string>
+  <string name="label_deposit">Κατάθεση</string>
+  <string name="label_payment">Πληρωμή</string>
+  <string name="label_charge">Χρέωση</string>
   <string name="label_decrease">Decrease</string>
   <string name="label_increase">Increase</string>
   <string name="label_income">Income</string>
@@ -219,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">Buy</string>
-  <string name="label_sell">Sell</string>
+  <string name="label_buy">Αγορά</string>
+  <string name="label_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
@@ -230,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">Favorite</string>
+  <string name="menu_title_favorite">Αγαπημένο</string>
   <string name="drawer_open">Navigation drawer opened</string>
   <string name="drawer_close">Navigation drawer closed</string>
-  <string name="title_reports">Reports</string>
+  <string name="title_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">Report Preferences</string>
+  <string name="title_report_prefs">Προτιμήσεις αναφοράς</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-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index dafd6ff32..1715b6f83 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -179,8 +179,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-accounts</item>
-    <item>CSV-transactions</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Select a Color</string>
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index 91042cbbb..a6dddb325 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -172,8 +172,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-cuentas</item>
-    <item>CSV-actas</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Seleccionar un color</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 11c424eb9..e83540caf 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>
@@ -172,8 +172,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-cuentas</item>
-    <item>CSV-actas</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Seleccione un color</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
new file mode 100644
index 000000000..7fec943b9
--- /dev/null
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -0,0 +1,457 @@
+<?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">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>Save As&#8230;</item>
+    <item>Dropbox</item>
+    <item>ownCloud</item>
+    <item>Send to&#8230;</item>
+  </string-array>
+  <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">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>
+  <string name="label_permission_create_accounts">Enables creation of accounts in GnuCash for Android</string>
+  <string name="label_permission_group">Your GnuCash data</string>
+  <string name="description_permission_group">Read and modify GnuCash data</string>
+  <string name="label_permission_record_transaction">Record transactions in GnuCash</string>
+  <string name="label_permission_create_account">Create accounts in GnuCash</string>
+  <string name="label_display_account">Display account</string>
+  <string name="label_hide_account_balance">Hide account balance in widget</string>
+  <string name="btn_create_accounts">Create Accounts</string>
+  <string name="error_no_accounts">No accounts exist in GnuCash.\nCreate an account before adding a widget</string>
+  <string name="title_license">License</string>
+  <string name="summary_licence_details">Apache License v2.0. Click for details</string>
+  <string name="title_general_prefs">General Preferences</string>
+  <string name="label_widget_configuration">Select Account</string>
+  <string name="toast_no_transactions_to_export">There are no transactions available to export</string>
+  <string name="title_passcode_preferences">Passcode Preferences</string>
+  <string name="title_enable_passcode">Enable passcode</string>
+  <string name="title_change_passcode">Change Passcode</string>
+  <string name="title_about_gnucash">About GnuCash</string>
+  <string name="title_export_email">GnuCash Android %1$s export</string>
+  <string name="description_export_email">GnuCash Android Export from </string>
+  <string name="header_transaction_settings">Transactions</string>
+  <string name="title_transaction_preferences">Transaction Preferences</string>
+  <string name="title_account_preferences">Account Preferences</string>
+  <string name="title_default_transaction_type">Default Transaction Type</string>
+  <string name="summary_default_transaction_type">The type of transaction to use by default, CREDIT or DEBIT</string>
+  <string-array name="transaction_types">
+    <item>CREDIT</item>
+    <item>DEBIT</item>
+  </string-array>
+  <string name="msg_delete_all_transactions_confirmation">Are you sure you want to delete ALL transactions?</string>
+  <string name="msg_delete_transaction_confirmation">Are you sure you want to delete this transaction?</string>
+  <string name="title_export_preference_category">Export</string>
+  <string name="title_export_all_transactions">Export all transactions</string>
+  <string name="title_always_delete_exported_transactions">Delete exported transactions</string>
+  <string name="title_default_export_email">Default export email</string>
+  <string name="summary_default_export_email">The default email address to send exports to. You can still change this when you export.</string>
+  <string name="summary_use_double_entry">All transactions will be a transfer from one account to another</string>
+  <string name="title_use_double_entry">Activate Double Entry</string>
+  <string name="account_balance">Balance</string>
+  <string name="toast_no_account_name_entered">Enter an account name to create an account</string>
+  <string name="label_account_currency">Currency</string>
+  <string name="label_parent_account">Parent account</string>
+  <string name="title_xml_ofx_header">Use XML OFX header</string>
+  <string name="summary_xml_ofx_header">Enable this option when exporting to third-party application other than GnuCash for desktop</string>
+  <string name="title_whats_new">What\'s New</string>
+  <string name="whats_new">
+        - Added ability to export to any service which supports the Storage Access Framework \n
+        - Added option to set the location for regular automatic backups (See backup settings)\n
+        - Added Bitcoin currency support\n
+        - Added support for renaming books\n
+        - Multiple bug fixes and improvements\n
+	</string>
+  <string name="label_dismiss">Dismiss</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
+        well.
+    </string>
+  <string name="title_delete_all_accounts">Delete all accounts</string>
+  <string name="header_account_settings">Accounts</string>
+  <string name="toast_all_accounts_deleted">All accounts have been successfully deleted</string>
+  <string name="confirm_delete_all_accounts">Are you sure you want to delete all accounts and transactions?\n\nThis
+        operation cannot be undone!
+    </string>
+  <string name="summary_delete_all_transactions">All transactions in all accounts will be deleted!</string>
+  <string name="title_delete_all_transactions">Delete all transactions</string>
+  <string name="toast_all_transactions_deleted">All transactions successfully deleted!</string>
+  <string name="title_progress_importing_accounts">Importing accounts</string>
+  <string name="section_header_transactions">Transactions</string>
+  <string name="section_header_subaccounts">Sub-Accounts</string>
+  <string name="menu_search_accounts">Search</string>
+  <string name="title_default_export_format">Default Export Format</string>
+  <string name="summary_default_export_format">File format to use by default when exporting transactions</string>
+  <string name="label_recurring_transaction">Recurrence</string>
+  <!-- This should be the same name used by GnuCash desktop for imbalance accounts -->
+  <string name="imbalance_account_name">Imbalance</string>
+  <string name="title_progress_exporting_transactions">Exporting transactions</string>
+  <string name="label_no_recurring_transactions">No recurring transactions to display.</string>
+  <string name="toast_recurring_transaction_deleted">Successfully deleted recurring transaction</string>
+  <string name="label_placeholder_account">Placeholder account</string>
+  <string name="label_default_transfer_account">Default Transfer Account</string>
+  <plurals name="label_sub_accounts">
+    <item quantity="one">%d sub-account</item>
+    <item quantity="other">%d sub-accounts</item>
+  </plurals>
+  <string-array name="account_type_entry_values">
+    <item>CASH</item>
+    <item>BANK</item>
+    <item>CREDIT CARD</item>
+    <item>ASSET</item>
+    <item>LIABILITY</item>
+    <item>INCOME</item>
+    <item>EXPENSE</item>
+    <item>PAYABLE</item>
+    <item>RECEIVABLE</item>
+    <item>EQUITY</item>
+    <item>CURRENCY</item>
+    <item>STOCK</item>
+    <item>MUTUAL FUND</item>
+    <item>TRADING</item>
+  </string-array>
+  <string-array name="export_formats">
+    <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">Select a Color</string>
+  <!-- Content description for a color square. -->
+  <!-- Content description for a selected color square. -->
+  <string name="label_account_color_and_type">Account Color &amp; Type</string>
+  <string name="label_delete_sub_accounts">Delete sub-accounts</string>
+  <string name="title_recent_accounts">Recent</string>
+  <string name="title_favorite_accounts">Favorites</string>
+  <string name="title_all_accounts">All</string>
+  <string name="summary_create_default_accounts">Creates default GnuCash commonly-used account structure</string>
+  <string name="title_create_default_accounts">Create default accounts</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">Transactions</string>
+  <string name="title_select_export_destination">Select destination for export</string>
+  <string name="hint_split_memo">Memo</string>
+  <string name="label_spend">Spend</string>
+  <string name="label_receive">Receive</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>
+  <string name="label_rebate">Rebate</string>
+  <string name="label_expense">Expense</string>
+  <string name="label_bill">Bill</string>
+  <string name="label_invoice">Invoice</string>
+  <string name="label_buy">Buy</string>
+  <string name="label_sell">Sell</string>
+  <string name="account_name_opening_balances">Opening Balances</string>
+  <string name="account_name_equity">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
+    </string>
+  <string name="title_save_opening_balances">Save account opening balances</string>
+  <string name="export_warning_ofx">OFX does not support double-entry transactions</string>
+  <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">Favorite</string>
+  <string name="drawer_open">Navigation drawer opened</string>
+  <string name="drawer_close">Navigation drawer closed</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">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>
+  <string name="menu_toggle_legend">Show legend</string>
+  <string name="menu_toggle_labels">Show labels</string>
+  <string name="menu_toggle_percentage_mode">Show percentage</string>
+  <string name="menu_toggle_average_lines">Show average lines</string>
+  <string name="menu_group_smaller_slices">Group Smaller Slices</string>
+  <string name="label_chart_no_data">No chart data available</string>
+  <string name="label_chart_total">Total</string>
+  <string name="label_other_slice">Other</string>
+  <string name="toast_chart_percentage_mode_total">The percentage of selected value calculated from the total amount</string>
+  <string name="toast_chart_percentage_mode_current_bar">The percentage of selected value calculated from the current stacked bar amount</string>
+  <string name="label_save_template">Save as template</string>
+  <string name="label_delete_account_transactions_description">This account contains transactions. \nWhat would you like to do with these transactions</string>
+  <string name="label_delete_account_subaccounts_description">This account contains sub-accounts. \nWhat would you like to do with these sub-accounts</string>
+  <string name="label_delete_transactions">Delete transactions</string>
+  <string name="toast_disable_double_entry_to_save_transaction">Create and specify a transfer account OR disable double-entry in settings to save the transaction</string>
+  <string name="label_tap_to_create_schedule">Tap to create schedule</string>
+  <string name="title_restore_backup">Restore Backup&#8230;</string>
+  <string name="header_backup_and_export_settings">Backup &amp; export</string>
+  <string name="title_dropbox_sync_preference">Enable DropBox</string>
+  <string name="title_owncloud_sync_preference">Enable ownCloud </string>
+  <string name="title_backup_preference_category">Backup</string>
+  <string name="summary_dropbox_sync">Enable exporting to DropBox</string>
+  <string name="summary_owncloud_sync">Enable exporting to ownCloud</string>
+  <string name="title_backup_prefs">Backup Preferences</string>
+  <string name="title_create_backup_pref">Create Backup</string>
+  <string name="summary_create_backup_pref">Create a backup of the active book</string>
+  <string name="summary_restore_backup_pref">Restore most recent backup of active book</string>
+  <string name="toast_backup_successful">Backup successful</string>
+  <string name="toast_backup_failed">Backup failed</string>
+  <string name="export_warning_xml">Exports all accounts and transactions</string>
+  <string name="toast_install_file_manager">Install a file manager to select files</string>
+  <string name="title_select_backup_to_restore">Select backup to restore</string>
+  <string name="nav_menu_favorites">Favorites</string>
+  <string name="nav_menu_open">Open&#8230;</string>
+  <string name="nav_menu_reports">Reports</string>
+  <string name="nav_menu_export">Export&#8230;</string>
+  <string name="nav_menu_settings">Settings</string>
+  <string name="username">User Name</string>
+  <string name="password">Password</string>
+  <string name="owncloud_pref">owncloud</string>
+  <string name="owncloud_server">https://</string>
+  <string name="owncloud_server_invalid">OC server not found</string>
+  <string name="owncloud_user_invalid">OC username/password invalid</string>
+  <string name="owncloud_dir_invalid">Invalid chars: \\ &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="one">Hourly</item>
+    <item quantity="other">Every %d hours</item>
+  </plurals>
+  <plurals name="label_every_x_days">
+    <item quantity="one">Daily</item>
+    <item quantity="other">Every %d days</item>
+  </plurals>
+  <plurals name="label_every_x_weeks">
+    <item quantity="one">Weekly</item>
+    <item quantity="other">Every %d weeks</item>
+  </plurals>
+  <plurals name="label_every_x_months">
+    <item quantity="one">Monthly</item>
+    <item quantity="other">Every %d months</item>
+  </plurals>
+  <plurals name="label_every_x_years">
+    <item quantity="one">Yearly</item>
+    <item quantity="other">Every %d years</item>
+  </plurals>
+  <string name="title_enable_crashlytics">Enable Crash Logging</string>
+  <string name="msg_enable_crashlytics">Automatically send information about app malfunction to the developers.</string>
+  <string name="label_export_format"> Format</string>
+  <string name="label_old_passcode">Enter your old passcode</string>
+  <string name="label_new_passcode">Enter your new passcode</string>
+  <string name="title_scheduled_exports">Exports</string>
+  <string name="label_no_scheduled_exports_to_display">No scheduled exports to display</string>
+  <string name="title_create_export_schedule">Create export schedule</string>
+  <string name="toast_exported_to">Exported to: %1$s</string>
+  <string name="toast_legend_too_long">The legend is too long</string>
+  <string name="hint_account_description">Account description</string>
+  <string name="label_no_recent_accounts">No recent accounts</string>
+  <string name="label_no_favorite_accounts">No favorite accounts</string>
+  <string name="nav_menu_scheduled_actions">Scheduled Actions</string>
+  <string name="label_scheduled_action_ended">"Ended, last executed on %1$s"</string>
+  <string name="btn_wizard_next">Next</string>
+  <string name="btn_wizard_finish">Done</string>
+  <string name="wizard_title_default_currency">Default Currency</string>
+  <string name="wizard_title_account_setup">Account Setup</string>
+  <string name="wizard_title_select_currency">Select Currency</string>
+  <string name="wizard_title_feedback_options">Feedback Options</string>
+  <string name="wizard_option_create_default_accounts">Create default accounts</string>
+  <string name="wizard_option_import_my_accounts">Import my accounts</string>
+  <string name="wizard_option_let_me_handle_it">Let me handle it</string>
+  <string name="wizard_option_currency_other">Other&#8230;</string>
+  <string name="wizard_option_auto_send_crash_reports">Automatically send crash reports</string>
+  <string name="wizard_option_disable_crash_reports">Disable crash reports</string>
+  <string name="wizard_btn_back">Back</string>
+  <string name="title_setup_gnucash">Setup GnuCash</string>
+  <string name="wizard_title_welcome_to_gnucash">Welcome to GnuCash</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">Invalid expression!</string>
+  <string name="toast_scheduled_recurring_transaction">Scheduled recurring transaction</string>
+  <string name="title_transfer_funds">Transfer Funds</string>
+  <string name="nav_menu_help"><![CDATA[Help & Feedback]]></string>
+  <string name="label_select_pie_slice_to_see_details">Select a slice to see details</string>
+  <string name="label_report_period">Period:</string>
+  <string name="label_convert_from">From:</string>
+  <string name="label_convert_to">To:</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>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>
+  <!-- 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">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="one">%d account</item>
+    <item quantity="other">%d accounts</item>
+  </plurals>
+  <plurals name="book_transaction_stats">
+    <item quantity="one">%d transaction</item>
+    <item quantity="other">%d transactions</item>
+  </plurals>
+  <string-array name="report_account_types">
+    <item>EXPENSE</item>
+    <item>INCOME</item>
+  </string-array>
+  <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">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-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 6a033bf2b..202c16fd2 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -179,8 +179,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-tilit</item>
-    <item>CSV-liiketoimet</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Select a Color</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ac18b6f6a..9ab498501 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -171,8 +171,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-comptes</item>
-    <item>CSV-transactions</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Sélectionnez une couleur</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index f52f03d47..6fb7cee73 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -179,8 +179,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-fiókok</item>
-    <item>CSV-ügyletek</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Select a Color</string>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index 9a4b3fa39..8f9d8d940 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">Tidak ada akun untuk ditampilkan</string>
+  <string name="label_no_accounts">Tak 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">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="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="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>
@@ -171,8 +171,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-accounts</item>
-    <item>CSV-transactions</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Pilih Warna</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index be47b1120..421590559 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -176,8 +176,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-conti</item>
-    <item>CSV-transazioni</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Seleziona un colore</string>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 222a5b9ac..2dd55c1a7 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -181,8 +181,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-accounts</item>
-    <item>CSV-transactions</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Select a Color</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 2518fb141..b5d7e1c9e 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -173,8 +173,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-アカウント</item>
-    <item>CSV-取引</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">色を選択</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 78d95474e..f20d6f229 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -175,8 +175,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-계정</item>
-    <item>CSV-업무</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">색상 선택</string>
diff --git a/app/src/main/res/values-lv-rLV/strings.xml b/app/src/main/res/values-lv-rLV/strings.xml
index 405e89843..3deabdcda 100644
--- a/app/src/main/res/values-lv-rLV/strings.xml
+++ b/app/src/main/res/values-lv-rLV/strings.xml
@@ -180,8 +180,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-accounts</item>
-    <item>CSV-transactions</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Select a Color</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index c8b3c83c2..84f2daf11 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -170,8 +170,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-kontoer</item>
-    <item>CSV-transaksjoner</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Velg en farge</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index a8e998ae1..3da93b9d5 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -179,8 +179,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-rekeningen</item>
-    <item>CSV-transacties</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Kies een kleur</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index abc690a6e..f4b098eec 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -175,8 +175,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-kontoer</item>
-    <item>CSV-transaksjoner</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Velg en farge</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 8788b4e6d..079d66f5c 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -177,8 +177,6 @@ Konto docelowe używa innej waluty niż konto wyjściowe</string>
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-konta</item>
-    <item>CSV-transakcje</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Wybierz kolor</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 839ae4abf..37681f758 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">Sub-Contas</string>
+  <string name="section_header_subaccounts">Subcontas</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 sub-conta</item>
-    <item quantity="other">%d sub-contas</item>
+    <item quantity="one">%d subconta</item>
+    <item quantity="other">%d subconta</item>
   </plurals>
   <string-array name="account_type_entry_values">
     <item>DINHEIRO</item>
@@ -174,17 +174,15 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-contas</item>
-    <item>CSV-transações</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Selecione uma Cor</string>
   <!-- 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 sub-contas</string>
+  <string name="label_delete_sub_accounts">Apagar subcontas</string>
   <string name="title_recent_accounts">Recentes</string>
-  <string name="title_favorite_accounts">Favoritos</string>
+  <string name="title_favorite_accounts">Favoritas</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>
@@ -224,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">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="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="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>
@@ -430,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">Recomendado na Play Store</string>
+  <string name="label_recommend_app">Recomendar 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 a0f5cda62..eedcb017a 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -174,8 +174,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-contas</item>
-    <item>CSV-transações</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Escolha uma côr</string>
@@ -430,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">Recomendado na Play Store</string>
+  <string name="label_recommend_app">Recomendar 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-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 3e86e8fd9..ff9007834 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -180,8 +180,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-conturi</item>
-    <item>CSV-tranzacții</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Select a Color</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c388ec91e..1b625cc34 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -154,6 +154,7 @@
   <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">
@@ -176,8 +177,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-счета</item>
-    <item>CSV-транзакции</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Выберите цвет</string>
@@ -226,7 +225,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>
@@ -279,26 +278,31 @@
   <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>
@@ -420,11 +424,13 @@
   <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">
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index 0c264592e..d7eb355dc 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -180,8 +180,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-рачуне</item>
-    <item>CSV-трансакције</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Select a Color</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index b2d675059..71645393c 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -170,8 +170,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-konton</item>
-    <item>CSV-transaktioner</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Välj en färg</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index e3b8f243a..2c93676fd 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -179,8 +179,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-hesapları</item>
-    <item>CSV-işlemler</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Renk Seçin</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 0d919a5d2..b4aa3b352 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -176,8 +176,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-счета</item>
-    <item>CSV-транзакции</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Оберіть колір</string>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index d8a21f5bd..082e3fac1 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -178,8 +178,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-tài khoản</item>
-    <item>CSV-giao dịch</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">Select a Color</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9b7eaebe4..40fcb6920 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -19,7 +19,7 @@
   <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="description_view_account_icon">查看帐户详细信息</string>
   <string name="label_no_accounts">没有可以显示的科目</string>
   <string name="label_account_name">科目名称</string>
   <string name="btn_cancel">取消</string>
@@ -175,8 +175,6 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-账户</item>
-    <item>CSV-交易</item>
   </string-array>
   <!-- Default title for color picker dialog [CHAR LIMIT=30] -->
   <string name="color_picker_default_title">选择一种颜色</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index aee1a58c3..8b502ea05 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>
@@ -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>
@@ -175,11 +175,9 @@
     <item>QIF</item>
     <item>OFX</item>
     <item>XML</item>
-    <item>CSV-账户</item>
-    <item>CSV-交易</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>
@@ -189,7 +187,7 @@
   <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">這將用預設科目來建立新的帳簿\n\n目前擁有的科目與交易不會受影響</string>
   <string name="title_scheduled_transactions">交易</string>
   <string name="title_select_export_destination">選擇儲存的位置</string>
   <string name="hint_split_memo">描述</string>
@@ -198,7 +196,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>
@@ -222,10 +220,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>
@@ -281,7 +279,7 @@
     <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>
@@ -313,13 +311,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>
@@ -345,7 +343,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>
@@ -354,13 +352,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）</string>
+  <string name="summary_translate_gnucash">在CrowdIn上協助翻譯或校對GnuCash</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>
@@ -395,18 +393,18 @@ 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">管理帐簿</string>
+  <string name="title_manage_books">管理帳簿</string>
+  <string name="menu_manage_books">管理帳簿&#8230;</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>
   </plurals>
@@ -421,15 +419,15 @@ 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="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>
diff --git a/crowdin.yml b/crowdin.yml
index be4fb23ca..57f6ea49d 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -5,7 +5,7 @@
 # Choose file structure in crowdin
 # e.g. true or false
 #
-"preserve_hierarchy": true
+"preserve_hierarchy": false
 
 #
 # Files configuration
@@ -13,19 +13,16 @@
 files: [
  {
   #
-  # Source files filter
-  # e.g. "/resources/en/*.json"
-  #
+  # Source files
   "source" : "/app/src/main/res/values/strings.xml",
 
   #
   # where translations live
-  # e.g. "/resources/%two_letters_code%/%original_file_name%"
-  #
   "translation" : "/app/src/main/res/values-%android_code%/%original_file_name%",
 
   #
-  # Often software projects have custom names for locale directories. crowdin-cli allows you to map your own languages to be understandable by Crowdin.
+  # Often software projects have custom names for locale directories.
+  # crowdin-cli allows you to map your own languages to be understandable by Crowdin.
   #
   "languages_mapping" : {
     "android_code": {
@@ -61,66 +58,9 @@ files: [
   #
   #"update_option" : "",
 
-  #
-  # Start block only for XML
-  #
-
-  #
-  # Defines whether to translate tags attributes.
-  # e.g. 0 or 1  (Default is 1)
-  #
-  # "translate_attributes" : 1,
-
-  #
-  # Defines whether to translate texts placed inside the tags.
-  # e.g. 0 or 1 (Default is 1)
-  #
-  # "translate_content" : 1,
-
-  #
-  # This is an array of strings, where each item is the XPaths to DOM element that should be imported
-  # e.g. ["/content/text", "/content/text[@value]"]
-  #
-  # "translatable_elements" : [],
-
-  #
-  # Defines whether to split long texts into smaller text segments.
-  # e.g. 0 or 1 (Default is 1)
-  #
-  # "content_segmentation" : 1,
-
-  #
-  # End block only for XML
-  #
-
-  #
-  # Start .properties block
-  #
-
-  #
-  # Defines whether single quote should be escaped by another single quote or backslash in exported translations.
-  # e.g. 0 or 1 or 2 or 3 (Default is 3)
-  # 0 - do not escape single quote;
-  # 1 - escape single quote by another single quote;
-  # 2 - escape single quote by backslash;
-  # 3 - escape single quote by another single quote only in strings containing variables ( {0} ).
-  #
-  # "escape_quotes" : 3,
-
-  #
-  # End .properties block
-  #
-
-  #
-  # Is first line contains header?
-  # e.g. true or false
-  #
-  #"first_line_contains_header" : true,
-
-  #
-  # for spreadsheets
-  # e.g. "identifier,source_phrase,context,uk,ru,fr"
-  #
-  # "scheme" : "",
+ },
+ {
+     "source" : "/resources/playstore/play_store_description.txt",
+     "translation": "/resources/playstore/play_store_description_i18n/play_store_description_%android_code%.txt"
  }
 ]
\ No newline at end of file
diff --git a/play_store_description.txt b/resources/playstore/play_store_description.txt
similarity index 69%
rename from play_store_description.txt
rename to resources/playstore/play_store_description.txt
index 45e63bf94..b40f0cde8 100644
--- a/play_store_description.txt
+++ b/resources/playstore/play_store_description.txt
@@ -1,8 +1,9 @@
-GnuCash is a mobile finance expense tracker application for Android.
+GnuCash is a mobile finance manager for Android.
 
-It is a companion application for GnuCash for the desktop and enables flexible tracking of expenses on-the-go which can be exported to QIF or OFX formats.
+It is a companion application for GnuCash on the desktop, and enables flexible tracking of expenses on-the-go.
+Recorded transactions can be exported back to the desktop GnuCash via several formats (CSV / QIF / OFX).
 
-Some of feature highlights  include:
+Some of feature highlights include:
 
 <b>&bull; An easy-to-use interface.</b>
 
@@ -26,10 +27,3 @@ You can also import an existing account hierarchy from GnuCash desktop.
 
 <br/><b><u>NOTE</u></b>: that the app does not offer full compatibility with GnuCash for the desktop. You cannot synchronize between the desktop app and this one. But you can import your accounts and transactions from GnuCash XML files.
 
-<br/><small>
-<i><u>What does the app use the requested permissions for? </u></i>
-&bull; VIBRATE: Used to provide haptic feedback when entering some inputs
-&bull; WAKE_LOCK: Used for keeping device active when exporting scheduled transactions in the background service
-&bull; RECEIVE_BOOT_COMPLETED: Used to restart service for scheduled transactions or exports after device is rebooted
-&bull; INTERNET/ACCESS_NETWORK_STATE: Used when exporting accounts/transactions to 3rd-party service like DropBox or ownCloud
-</small>
diff --git a/resources/playstore/play_store_description_i18n/.keep b/resources/playstore/play_store_description_i18n/.keep
new file mode 100644
index 000000000..e69de29bb