From 4f9172109d238acc211f2f3fb3dce44f4a7ed478 Mon Sep 17 00:00:00 2001
From: Maksim Lin <maks@manichord.com>
Date: Sun, 24 Feb 2019 18:06:41 +1100
Subject: [PATCH 1/4] add release files to gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 728814ba..25eb4fcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,8 @@ build
 # generated files
 bin/
 gen/
+release
+/*/release
 
 # Local configuration file (sdk path, etc)
 local.properties

From f6de81840d7303249bc84e3db56b852199fa6268 Mon Sep 17 00:00:00 2001
From: Maksim Lin <maks@manichord.com>
Date: Sun, 24 Feb 2019 18:07:12 +1100
Subject: [PATCH 2/4] fix errors in RU strings

---
 app/src/main/res/values-ru/strings.xml | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f4cac6b7..f1ce5fa7 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name" translatable="false">MGit</string>
     <string name="default_text">Стоковый текст</string>
     <string name="title_clone_repo">Скачать репозиторий</string>
-    <string name="preference_file_key" translatable="false">com.manichord.mgit</string>
 
     <!-- action -->
     <string name="action_search">Поиск</string>
@@ -145,7 +143,6 @@
     <string name="title_activity_explore_file">Иследовать файлыы</string>
     <string name="title_activity_settings">Настройки</string>
     <string name="title_config_repo">Настройки репозитория</string>
-    <string name="feedback_url" translatable="false">https://github.com/maks/MGit/issues/new</string>
 
     <!-- toast msg -->
     <string name="feedback_subject">Отзыв</string>
@@ -156,27 +153,21 @@
 
     <string name="preference_repo_location">Корневая папка для проектов</string>
     <string name="pref_category_title_general">Основные</string>
-    <string name="pref_key_repo_root_location" translatable="false">repo_root_path</string>
     <string name="action_select_root_dir">Выбрать как корневую папку</string>
     <string name="action_create_new_dir">Создать новую папку</string>
     <string name="pref_category_title_git_profile">Настройки профиля</string>
-    <string name="pref_key_git_user_name" translatable="false">user.name</string>
     <string name="preference_git_user_name">Имя пользователч</string>
-    <string name="pref_key_git_user_email" translatable="false">user.email</string>
     <string name="preference_git_user_email">Email</string>
     <string name="pref_category_title_about">О приложении</string>
     <string name="preference_send_feedback">Отзыв</string>
     <string name="preference_send_feedback_summary">Отправте отзыв, создав issue на GitHub</string>
-    <string name="preference_key_app_version" translatable="false">app_version</string>
     <string name="preference_app_version">Версия</string>
     <string name="preference_manage_ssh_keys_summary">Управления SSH ключами</string>
     <string name="preference_manage_ssh_keys">SSH Kлючи</string>
     <string name="preference_use_gravatar">Использовать аватарки из gravatar</string>
     <string name="preference_use_gravatar_summary">Загрузка аватарок с gravatar.com</string>
-    <string name="pref_key_use_gravatar" translatable="false">use.gravatar</string>
     <string name="pref_category_title_security">Безопасность</string>
     <string name="preference_use_theme">Тема</string>
-    <string name="pref_key_use_theme_id" translatable="false">color_theme_id</string>
     <string name="action_git_profile">Профиль Git</string>
     <string name="action_open_in_other_app">Открыть в другом приложении</string>
     <string name="action_add_private_key">Добавить приватный ключ</string>
@@ -189,16 +180,6 @@
     <string name="importing">Импорт … </string>
     <string name="clone_with_mgit">Клонированно с помощью MGit</string>
     <string name="invalid_url">Неверный URL!</string>
-    <string name="https" translatable="false">https</string>
-    <string name="http" translatable="false">http</string>
     <string name="initialising">Инализация … </string>
-    <string name="git" translatable="false">git</string>
-    <string name="git_extension" translatable="false">.git</string>
-    <string name="ending_with_git" translatable="false">.*\\.git</string>
-    <string name="ssh" translatable="false">ssh</string>
-    <string name="github.com" translatable="false">github.com</string>
-    <string name="gitlab.com" translatable="false">gitlab.com</string>
-    <string name="bitbucket.com" translatable="false">bitbucket.com</string>
-    <string name="notabug.org" translatable="false">notabug.org</string>
     <string name="repository_already_present">Репозиторий уже добавлен!</string>
 </resources>

From 4c2abe871660846d789fe67b388c8a120e6d65f8 Mon Sep 17 00:00:00 2001
From: Maksim Lin <maks@manichord.com>
Date: Sun, 24 Feb 2019 18:25:36 +1100
Subject: [PATCH 3/4] fix missing translations preventing release build

---
 app/src/main/res/values-de/strings.xml        |  8 +++
 app/src/main/res/values-de/strings_dialog.xml | 13 +++-
 app/src/main/res/values-fr/strings.xml        | 26 +++++++-
 app/src/main/res/values-fr/strings_dialog.xml |  3 +-
 app/src/main/res/values-iw/strings.xml        | 12 ++++
 app/src/main/res/values-iw/strings_dialog.xml | 64 +++++++++++--------
 app/src/main/res/values-ja/strings.xml        | 12 ++++
 app/src/main/res/values-ja/strings_dialog.xml | 15 ++++-
 app/src/main/res/values-ko/arrays.xml         | 55 ++++++++++++++++
 app/src/main/res/values-ko/strings.xml        | 11 ++++
 app/src/main/res/values-ko/strings_dialog.xml | 15 ++++-
 app/src/main/res/values-ko/strings_error.xml  | 50 +++++++++++++++
 .../res/values-ko/strings_success_msg.xml     | 17 +++++
 app/src/main/res/values-ru/strings_error.xml  |  2 +-
 app/src/main/res/values-zh-rCN/strings.xml    |  4 --
 .../main/res/values-zh-rCN/strings_error.xml  |  2 +-
 app/src/main/res/values/strings_error.xml     |  2 +-
 17 files changed, 272 insertions(+), 39 deletions(-)
 create mode 100644 app/src/main/res/values-ko/arrays.xml
 create mode 100644 app/src/main/res/values-ko/strings_error.xml
 create mode 100644 app/src/main/res/values-ko/strings_success_msg.xml

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 200e1d7c..6350a6cf 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -177,4 +177,12 @@
     <string name="clone_with_mgit">Mit MGit klonen</string>
     <string name="invalid_url">Ungültige URL!</string>
     <string name="repository_already_present">Repository existiert bereits!</string>
+    <string name="action_mode_edit_key_password">Edit key password</string>
+    <string name="action_send_report">Send report</string>
+    <string name="label_init">Init</string>
+    <string name="cloning">Cloning …</string>
+    <string name="importing">Importing …</string>
+    <string name="initialising">Initialising …</string>
+    <string name="dialog_edit_key_password_title">Key Password</string>
+    <string name="error_rebase_abort_failed_in_reset">Could not abort rebase while resetting repo</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings_dialog.xml b/app/src/main/res/values-de/strings_dialog.xml
index 34437109..d8891e63 100644
--- a/app/src/main/res/values-de/strings_dialog.xml
+++ b/app/src/main/res/values-de/strings_dialog.xml
@@ -41,9 +41,20 @@
     <string name="dialog_push_is_force_push">Veröffentlichung erzwingen?</string>
     <string name="dialog_push_result">Ergebnis der Veröffentlichung</string>
 
+    <string name="dialog_show_invalid_remote">Invalid remote report</string>
+    <string name="dialog_not_supported">Not Supported</string>
+    <string name="dialog_not_supported_msg">This feature is not supported on your device, please see the manual for more details.</string>
+    <string name="dialog_error_title">Error occurred</string>
+    <string name="dialog_keymap_title">Shortcut Keys</string>
+    <string name="dialog_keymap_mesg"> C - Commits\n F- Files\n S- Status\n ? - Help\n</string>
+    <string name="dialog_open_remote">Open remote url</string>
+    <string name="dialog_open_remote_title">Choose app to open %s remote</string>
+    <string name="dialog_open_remote_no_app_available">No Apps available to open the url</string>
+    <string name="dialog_permission_not_granted">MGit requires that you grant it write access to be able to write local git repos to your storage, until you do this MGit will NOT work properly.</string>
+
     <!-- Create External -->
     <string name="dialog_create_external_title">Externes Repository erzeugen</string>
     <string name="dialog_create_external_msg">Wirklich ein externes Repository in diesem Ordner erzeugen?</string>
     <string name="dialog_create_external_positive_label">Erzeugen</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6228f6e0..a3f97310 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -79,6 +79,18 @@
     <string name="dialog_prompt_for_password_title_auth_fail">Échec d\'authentification</string>
     <string name="dialog_prompt_for_password_checkbox">Sauvegarder le nom d\'utilisateur et le mot de passe</string>
     <string name="dialog_title_you_want_to">Vous voulez …</string>
+    <string name="dialog_show_invalid_remote">Invalid remote report</string>
+    <string name="dialog_not_supported">Not Supported</string>
+    <string name="dialog_not_supported_msg">This feature is not supported on your device, please see the manual for more details.</string>
+    <string name="dialog_error_title">Error occurred</string>
+    <string name="dialog_error_send_report">Send error report</string>
+    <string name="dialog_error_occurred_msg">An unexpected error occurred</string>
+    <string name="dialog_keymap_title">Shortcut Keys</string>
+    <string name="dialog_keymap_mesg"> C - Commits\n F- Files\n S- Status\n ? - Help\n</string>
+    <string name="dialog_open_remote">Open remote url</string>
+    <string name="dialog_open_remote_title">Choose app to open %s remote</string>
+    <string name="dialog_open_remote_no_app_available">No Apps available to open the url</string>
+    <string name="dialog_permission_not_granted">MGit requires that you grant it write access to be able to write local git repos to your storage, until you do this MGit will NOT work properly.</string>
 
     <!-- Others -->
     <string name="pull_msg_init">En tirant ...</string>
@@ -173,5 +185,17 @@
     <string name="dialog_push_is_force_push">Forcer pousser?</string>
     <string name="error_rename_repo_fail">Renommer repository échoué</string>
     <string name="success_remove_file">Fichier a été supprimé</string>
+    <string name="action_mode_edit_key_password">Edit key password</string>
+    <string name="action_send_report">Send report</string>
+    <string name="label_init">Init</string>
+    <string name="crash_toast_text">MGit error - gathering data to email a crash report</string>
+    <string name="clone_with_mgit">Clone with MGit</string>
+    <string name="invalid_url">Invalid URL!</string>
+    <string name="repository_already_present">Repository already present!</string>
+    <string name="cloning">Cloning …</string>
+    <string name="importing">Importing …</string>
+    <string name="initialising">Initialising …</string>
+    <string name="dialog_edit_key_password_title">Key Password</string>
+    <string name="error_rebase_abort_failed_in_reset">Could not abort rebase while resetting repo</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fr/strings_dialog.xml b/app/src/main/res/values-fr/strings_dialog.xml
index f4906317..0d035f39 100644
--- a/app/src/main/res/values-fr/strings_dialog.xml
+++ b/app/src/main/res/values-fr/strings_dialog.xml
@@ -42,7 +42,6 @@
 
     <!-- Create External -->
     <string name="dialog_create_external_title">Créer un dépôt externe</string>
-    <string name="dialog_create_external_title_msg">Voulez-vous créer un repository git dans ce dossier?</string>
     <string name="dialog_create_external_positive_label">Créer</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index f57126b8..05df57ac 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -161,4 +161,16 @@
   <string name="action_import_private_key">Import Key</string>
   <string name="action_add_private_key">Add Private Key</string>
   <string name="pref_category_title_git_profile">פרופיל git</string>
+    <string name="action_mode_edit_key_password">Edit key password</string>
+    <string name="action_send_report">Send report</string>
+    <string name="label_init">Init</string>
+    <string name="crash_toast_text">MGit error - gathering data to email a crash report</string>
+    <string name="clone_with_mgit">Clone with MGit</string>
+    <string name="invalid_url">Invalid URL!</string>
+    <string name="repository_already_present">Repository already present!</string>
+    <string name="cloning">Cloning …</string>
+    <string name="importing">Importing …</string>
+    <string name="initialising">Initialising …</string>
+    <string name="dialog_edit_key_password_title">Key Password</string>
+    <string name="error_rebase_abort_failed_in_reset">Could not abort rebase while resetting repo</string>
 </resources>
diff --git a/app/src/main/res/values-iw/strings_dialog.xml b/app/src/main/res/values-iw/strings_dialog.xml
index c86db0cc..8c2df0c9 100644
--- a/app/src/main/res/values-iw/strings_dialog.xml
+++ b/app/src/main/res/values-iw/strings_dialog.xml
@@ -1,29 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="dialog_cherrypick_msg_hint">Commit Hash (העתק מרשימת commit)</string>
-  <string name="dialog_rebase_title">בחר שלוחה</string>
-  <string name="dialog_commit_title">Commit שינויים</string>
-  <string name="dialog_commit_msg_hint">הודעת Commit</string>
-  <string name="dialog_commit_is_amend">לתקן Commit קודם</string>
-  <string name="dialog_commit_auto_stage">הוסף אוטומטית קבצים ששונו</string>
-  <string name="dialog_commit_positive_label">Commit</string>
-  <string name="dialog_import_local_path_hint">נתיב מקומי</string>
-  <string name="dialog_import_import_as_external_repo">יבא כמאגר חיצוני</string>
-  <string name="dialog_import_set_local_repo_title">קבע נתיב מקומי</string>
-  <string name="dialog_clone_local_path_hint">נתיב מקומי</string>
-  <string name="dialog_clone_neutral_label">צור מקומי</string>
-  <string name="dialog_init_local_path_hint">נתיב מקומי</string>
-  <string name="dialog_init_repo_title">נתיב מקומי</string>
-  <string name="dialog_init_repo_positive_label">צור</string>
-  <string name="dialog_add_remote_title">הוסף שרת</string>
-  <string name="dialog_add_remote_hint_name">שם שרת</string>
-  <string name="dialog_add_remote_hint_url">URL שרת</string>
-  <string name="dialog_add_remote_positive_label">הושלם</string>
-  <string name="dialog_push_repo_title">דחוף ל-...</string>
-  <string name="dialog_push_repo_msg">האם אתה בטוח שברצונך להעלות שינויים אחרונים?</string>
-  <string name="dialog_push_is_push_all">להעלות הכל?</string>
-  <string name="dialog_push_result">דחוף תוצאה</string>
-  <string name="dialog_create_external_title">צור מאגר חיצוני</string>
-  <string name="dialog_create_external_msg">האם ברצונך ליצור פרויקט git בתקייה זו?</string>
-  <string name="dialog_create_external_positive_label">יצירה</string>
+    <string name="dialog_cherrypick_msg_hint">Commit Hash (העתק מרשימת commit)</string>
+    <string name="dialog_rebase_title">בחר שלוחה</string>
+    <string name="dialog_commit_title">Commit שינויים</string>
+    <string name="dialog_commit_msg_hint">הודעת Commit</string>
+    <string name="dialog_commit_is_amend">לתקן Commit קודם</string>
+    <string name="dialog_commit_auto_stage">הוסף אוטומטית קבצים ששונו</string>
+    <string name="dialog_commit_positive_label">Commit</string>
+    <string name="dialog_import_local_path_hint">נתיב מקומי</string>
+    <string name="dialog_import_import_as_external_repo">יבא כמאגר חיצוני</string>
+    <string name="dialog_import_set_local_repo_title">קבע נתיב מקומי</string>
+    <string name="dialog_clone_local_path_hint">נתיב מקומי</string>
+    <string name="dialog_clone_neutral_label">צור מקומי</string>
+    <string name="dialog_init_local_path_hint">נתיב מקומי</string>
+    <string name="dialog_init_repo_title">נתיב מקומי</string>
+    <string name="dialog_init_repo_positive_label">צור</string>
+    <string name="dialog_add_remote_title">הוסף שרת</string>
+    <string name="dialog_add_remote_hint_name">שם שרת</string>
+    <string name="dialog_add_remote_hint_url">URL שרת</string>
+    <string name="dialog_add_remote_positive_label">הושלם</string>
+    <string name="dialog_push_repo_title">דחוף ל-...</string>
+    <string name="dialog_push_repo_msg">האם אתה בטוח שברצונך להעלות שינויים אחרונים?</string>
+    <string name="dialog_push_is_push_all">להעלות הכל?</string>
+    <string name="dialog_push_result">דחוף תוצאה</string>
+    <string name="dialog_create_external_title">צור מאגר חיצוני</string>
+    <string name="dialog_create_external_msg">האם ברצונך ליצור פרויקט git בתקייה זו?</string>
+    <string name="dialog_create_external_positive_label">יצירה</string>
+    <string name="dialog_show_invalid_remote">Invalid remote report</string>
+    <string name="dialog_not_supported">Not Supported</string>
+    <string name="dialog_not_supported_msg">This feature is not supported on your device, please see the manual for more details.</string>
+    <string name="dialog_error_title">Error occurred</string>
+    <string name="dialog_error_send_report">Send error report</string>
+    <string name="dialog_error_occurred_msg">An unexpected error occurred</string>
+    <string name="dialog_keymap_title">Shortcut Keys</string>
+    <string name="dialog_keymap_mesg"> C - Commits\n F- Files\n S- Status\n ? - Help\n</string>
+    <string name="dialog_open_remote">Open remote url</string>
+    <string name="dialog_open_remote_title">Choose app to open %s remote</string>
+    <string name="dialog_open_remote_no_app_available">No Apps available to open the url</string>
+    <string name="dialog_permission_not_granted">MGit requires that you grant it write access to be able to write local git repos to your storage, until you do this MGit will NOT work properly.</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4dd94582..26be2958 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -172,5 +172,17 @@
     <string name="title_config_repo">リポジトリ構成</string>
     <string name="action_import_private_key">キーをインポート</string>
     <string name="action_add_private_key">プライベートキーを追加</string>
+    <string name="action_mode_edit_key_password">Edit key password</string>
+    <string name="action_send_report">Send report</string>
+    <string name="label_init">Init</string>
+    <string name="crash_toast_text">MGit error - gathering data to email a crash report</string>
+    <string name="clone_with_mgit">Clone with MGit</string>
+    <string name="invalid_url">Invalid URL!</string>
+    <string name="repository_already_present">Repository already present!</string>
+    <string name="cloning">Cloning …</string>
+    <string name="importing">Importing …</string>
+    <string name="initialising">Initialising …</string>
+    <string name="dialog_edit_key_password_title">Key Password</string>
+    <string name="error_rebase_abort_failed_in_reset">Could not abort rebase while resetting repo</string>
 
 </resources>
diff --git a/app/src/main/res/values-ja/strings_dialog.xml b/app/src/main/res/values-ja/strings_dialog.xml
index ef6c8532..3ef3fc5d 100644
--- a/app/src/main/res/values-ja/strings_dialog.xml
+++ b/app/src/main/res/values-ja/strings_dialog.xml
@@ -45,4 +45,17 @@
     <string name="dialog_create_external_msg">このディレクトリにGitリポジトリを作成してよろしいですか?</string>
     <string name="dialog_create_external_positive_label">作成</string>
 
-</resources>
\ No newline at end of file
+    <string name="dialog_show_invalid_remote">Invalid remote report</string>
+    <string name="dialog_not_supported">Not Supported</string>
+    <string name="dialog_not_supported_msg">This feature is not supported on your device, please see the manual for more details.</string>
+    <string name="dialog_error_title">Error occurred</string>
+    <string name="dialog_error_send_report">Send error report</string>
+    <string name="dialog_error_occurred_msg">An unexpected error occurred</string>
+    <string name="dialog_keymap_title">Shortcut Keys</string>
+    <string name="dialog_keymap_mesg"> C - Commits\n F- Files\n S- Status\n ? - Help\n</string>
+    <string name="dialog_open_remote">Open remote url</string>
+    <string name="dialog_open_remote_title">Choose app to open %s remote</string>
+    <string name="dialog_open_remote_no_app_available">No Apps available to open the url</string>
+    <string name="dialog_permission_not_granted">MGit requires that you grant it write access to be able to write local git repos to your storage, until you do this MGit will NOT work properly.</string>
+
+</resources>
diff --git a/app/src/main/res/values-ko/arrays.xml b/app/src/main/res/values-ko/arrays.xml
new file mode 100644
index 00000000..ac2187ad
--- /dev/null
+++ b/app/src/main/res/values-ko/arrays.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="merge_ff_type">
+        <item>Fast Forward</item>
+        <item>Fast Forward Only</item>
+        <item>No Fast Forward</item>
+    </string-array>
+    <string-array name="repo_file_operations">
+        <item>Add to stage</item>
+        <item>Checkout (Reset Changes)</item>
+        <item>Delete</item>
+        <item>Remove cached from repository</item>
+        <item>Remove force from repository</item>
+    </string-array>
+    <string-array name="repo_operation_names">
+        <item>New Branch</item>
+        <item>Pull</item>
+        <item>Push</item>
+        <item>Add all to stage</item>
+        <item>Commit</item>
+        <item>Reset (HARD)</item>
+        <item>Merge</item>
+        <item>Fetch</item>
+        <item>Rebase</item>
+        <item>Cherry Pick</item>
+        <item>Diff</item>
+        <item>New File</item>
+        <item>New Directory</item>
+        <item>Add Remote</item>
+        <item>Remove Remote</item>
+        <item>Delete</item>
+        <item>Raw config</item>
+        <item>Config</item>
+    </string-array>
+    <string-array name="dialog_choose_repo_action_items">
+        <item>Rename</item>
+        <item>Delete</item>
+    </string-array>
+
+    <!-- MUST KEY theme_names and theme_ids in SYNC -->
+    <string-array name="theme_names">
+        <item>light</item>
+        <item>dark</item>
+    </string-array>
+    <string-array name="codemirror_theme_names">
+        <item>default</item>
+        <item>midnight</item>
+    </string-array>
+    <string-array name="theme_ids">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
+</resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 62ca8767..ad1bad26 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -156,4 +156,15 @@
     <string name="action_git_profile">Git 프로필</string>
     <string name="action_open_in_other_app">다른 앱에서 열기</string>
     <string name="action_add_private_key">Private Key 추가</string>
+    <string name="action_mode_edit_key_password">Edit key password</string>
+    <string name="action_send_report">Send report</string>
+    <string name="label_init">Init</string>
+    <string name="crash_toast_text">MGit error - gathering data to email a crash report</string>
+    <string name="clone_with_mgit">Clone with MGit</string>
+    <string name="invalid_url">Invalid URL!</string>
+    <string name="repository_already_present">Repository already present!</string>
+    <string name="cloning">Cloning …</string>
+    <string name="importing">Importing …</string>
+    <string name="initialising">Initialising …</string>
+    <string name="dialog_edit_key_password_title">Key Password</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings_dialog.xml b/app/src/main/res/values-ko/strings_dialog.xml
index 4fc420c5..cb4b6041 100644
--- a/app/src/main/res/values-ko/strings_dialog.xml
+++ b/app/src/main/res/values-ko/strings_dialog.xml
@@ -60,4 +60,17 @@
     <string name="dialog_fetch_positive_button">Fetch</string>
     <string name="dialog_fetch_all_button">Fetch All</string>
 
-</resources>
\ No newline at end of file
+    <string name="dialog_show_invalid_remote">Invalid remote report</string>
+    <string name="dialog_not_supported">Not Supported</string>
+    <string name="dialog_not_supported_msg">This feature is not supported on your device, please see the manual for more details.</string>
+    <string name="dialog_error_title">Error occurred</string>
+    <string name="dialog_error_send_report">Send error report</string>
+    <string name="dialog_error_occurred_msg">An unexpected error occurred</string>
+    <string name="dialog_keymap_title">Shortcut Keys</string>
+    <string name="dialog_keymap_mesg"> C - Commits\n F- Files\n S- Status\n ? - Help\n</string>
+    <string name="dialog_open_remote">Open remote url</string>
+    <string name="dialog_open_remote_title">Choose app to open %s remote</string>
+    <string name="dialog_open_remote_no_app_available">No Apps available to open the url</string>
+    <string name="dialog_permission_not_granted">MGit requires that you grant it write access to be able to write local git repos to your storage, until you do this MGit will NOT work properly.</string>
+
+</resources>
diff --git a/app/src/main/res/values-ko/strings_error.xml b/app/src/main/res/values-ko/strings_error.xml
new file mode 100644
index 00000000..b0705420
--- /dev/null
+++ b/app/src/main/res/values-ko/strings_error.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="error_invalid_remote">Invalid remote</string>
+    <string name="error_transport">Transport error</string>
+    <string name="error_clone_failed">Clone failed</string>
+    <string name="error_pull_failed_not_on_branch">Pull failed: not on branch</string>
+    <string name="error_pull_failed">Pull failed</string>
+    <string name="error_diff_failed">Diff failed</string>
+    <string name="error_out_of_memory">Out of memory</string>
+    <string name="error_no_edit_app">No apps can edit source file</string>
+    <string name="error_no_open_app">No apps can open source file</string>
+    <string name="error_can_not_edit_file">Can\'t edit this file in this device.</string>
+    <string name="error_can_not_open_file">Can\'t open this file in this device.</string>
+    <string name="error_unknown">An unknown error occurred</string>
+    <string name="error_task_running">A task for this repo is already running</string>
+    <string name="error_something_wrong">Something wrong happened</string>
+    <string name="error_repository_not_found">Repository not found (there may be something wrong with this repo)</string>
+
+    <string name="error_rename_repo_fail">Renaming repository failed</string>
+    <string name="error_invalid_author">Author is not of the form Name &lt;Email&gt;</string>
+    <string name="error_no_commit_msg">No commit message specified</string>
+
+    <string name="error_rebase_abort_failed_in_reset">Could not abort rebase while resetting repo</string>
+
+    <!-- alerts -->
+    <string name="alert_too_short_key_size">Keylength is too small (at least 1024 bits for RSA and DSA)</string>
+    <string name="alert_too_long_key_size">Keylength is too large</string>
+    <string name="alert_field_not_empty">Field should not be empty</string>
+    <string name="alert_remoteurl_required">Remote URL required</string>
+    <string name="alert_localpath_required">Repository name required</string>
+    <string name="alert_localpath_format">Repository name can\'t contain slash.</string>
+    <string name="alert_localpath_repo_exists">Repository already exists</string>
+    <string name="alert_new_filename_required">File name required</string>
+    <string name="alert_new_branchname_required">Branch name required</string>
+    <string name="alert_file_exists">File already exists</string>
+    <string name="alert_filename_format">File name format error</string>
+    <string name="alert_choose_two_items">You can only choose two items</string>
+    <string name="alert_no_items_selected">No items selected</string>
+    <string name="alert_no_older_commits">No older commits to compare with</string>
+    <string name="alert_please_wait_previous_op">Previous operation is still running</string>
+    <string name="alert_you_must_choose_one_commit_to_copy">Please choose exactly one commit to copy</string>
+    <string name="alert_you_should_input_something">You should input something</string>
+    <string name="alert_please_add_a_remote">Please add a remote first</string>
+    <string name="alert_is_already_a_git_repo">This directory is already a Git repository</string>
+    <string name="alert_save_failed">Save failed</string>
+    <string name="alert_file_creation_failure">Couldn\'t create file</string>
+    <string name="error_no_repository">No repository found</string>
+
+</resources>
diff --git a/app/src/main/res/values-ko/strings_success_msg.xml b/app/src/main/res/values-ko/strings_success_msg.xml
new file mode 100644
index 00000000..1b760511
--- /dev/null
+++ b/app/src/main/res/values-ko/strings_success_msg.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="success_add_to_stage">File has been added to stage</string>
+    <string name="success_remove_file">File has been removed</string>
+    <string name="success_commit">Changes have been committed</string>
+    <string name="success_reset">Changes have been discarded</string>
+    <string name="success_cherry_pick">Cherrypicked successfully</string>
+    <string name="success_rebase">Rebased successfully</string>
+    <string name="success_checkout_file">Checkout successfully</string>
+    <string name="success_remote_added">Remote added</string>
+    <string name="success_remote_removed">Remote removed</string>
+    <string name="success_save">File saved Successfully</string>
+    <string name="msg_now_you_can_edit">File can be edited</string>
+    <string name="msg_commit_str_has_copied">Commit hash has been copied</string>
+
+</resources>
diff --git a/app/src/main/res/values-ru/strings_error.xml b/app/src/main/res/values-ru/strings_error.xml
index 45fa66e1..3185e794 100644
--- a/app/src/main/res/values-ru/strings_error.xml
+++ b/app/src/main/res/values-ru/strings_error.xml
@@ -18,7 +18,7 @@
     <string name="error_repository_not_found">Репозиторий не найден(возможно с ним что-то не так)</string>
 
     <string name="error_rename_repo_fail">Ошибка переименования репозитория</string>
-    <string name="error_invalid_author">Author is not of the form Name &lt;Email&gt;</string>
+    <string name="error_invalid_author"><![CDATA[Author is not of the form Name <Email>]]></string>
     <string name="error_no_commit_msg">Нет сообщения к комиту</string>
 
     <string name="error_rebase_abort_failed_in_reset">Нельзя прирвать сброс</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a6057a33..9cedd239 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -184,9 +184,5 @@
     <string name="clone_with_mgit">使用 MGit 克隆</string>
     <string name="invalid_url">链接无效！</string>
     <string name="initialising">正在初始化…</string>
-    <string name="github.com" translatable="false">github.com</string>
-    <string name="gitlab.com" translatable="false">gitlab.com</string>
-    <string name="bitbucket.com" translatable="false">bitbucket.com</string>
-    <string name="notabug.org" translatable="false">notabug.org</string>
     <string name="repository_already_present">repo 已存在！</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings_error.xml b/app/src/main/res/values-zh-rCN/strings_error.xml
index d0746dd9..497635bc 100644
--- a/app/src/main/res/values-zh-rCN/strings_error.xml
+++ b/app/src/main/res/values-zh-rCN/strings_error.xml
@@ -18,7 +18,7 @@
     <string name="error_repository_not_found">没有发现仓库 (可能是仓库已损坏)</string>
 
     <string name="error_rename_repo_fail">重命名仓库失败</string>
-    <string name="error_invalid_author">作者名称歌手不符合 Name &lt;Email&gt;</string>
+    <string name="error_invalid_author"><![CDATA[作者名称歌手不符合 Name <Email>]]></string>
     <string name="error_no_commit_msg">未指定提交消息</string>
 
     <string name="error_rebase_abort_failed_in_reset">无法在重置 repo 时放弃重建数据库</string>
diff --git a/app/src/main/res/values/strings_error.xml b/app/src/main/res/values/strings_error.xml
index b0705420..791cc884 100644
--- a/app/src/main/res/values/strings_error.xml
+++ b/app/src/main/res/values/strings_error.xml
@@ -18,7 +18,7 @@
     <string name="error_repository_not_found">Repository not found (there may be something wrong with this repo)</string>
 
     <string name="error_rename_repo_fail">Renaming repository failed</string>
-    <string name="error_invalid_author">Author is not of the form Name &lt;Email&gt;</string>
+    <string name="error_invalid_author"><![CDATA[Author is not of the form Name <Email>]]></string>
     <string name="error_no_commit_msg">No commit message specified</string>
 
     <string name="error_rebase_abort_failed_in_reset">Could not abort rebase while resetting repo</string>

From cfa3d7e77432ffb075aff554814cf6b61698cca4 Mon Sep 17 00:00:00 2001
From: Maksim Lin <maks@manichord.com>
Date: Sun, 24 Feb 2019 18:34:03 +1100
Subject: [PATCH 4/4] fix build due to libs using dup system classes

---
 app/build.gradle | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index b720b6f1..0c35ec75 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,6 +27,14 @@ android {
     }
 }
 
+configurations {
+    all {
+        exclude module: 'httpclient'
+    }
+}
+
+
+
 dependencies {
     def supportLib_version = "27.1.1"
     def lifecycle_version = "1.1.1"