Skip to content

Commit

Permalink
Merge pull request #441 from maks/fix-translation-lint-errors
Browse files Browse the repository at this point in the history 
Fix translation lint errors
  • Loading branch information
@maks
maks authored Feb 24, 2019
2 parents e35e1e0 + cfa3d7e commit 38109e5
Show file tree
Hide file tree
Showing 20 changed files with 282 additions and 58 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ build
# generated files
bin/
gen/
release
/*/release

# Local configuration file (sdk path, etc)
local.properties
Expand Down
8 changes: 8 additions & 0 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ android {
}
}

configurations {
all {
exclude module: 'httpclient'
}
}



dependencies {
def supportLib_version = "27.1.1"
def lifecycle_version = "1.1.1"
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
13 changes: 12 additions & 1 deletion app/src/main/res/values-de/strings_dialog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
</resources>
26 changes: 25 additions & 1 deletion app/src/main/res/values-fr/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
</resources>
3 changes: 1 addition & 2 deletions app/src/main/res/values-fr/strings_dialog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
</resources>
12 changes: 12 additions & 0 deletions app/src/main/res/values-iw/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
64 changes: 38 additions & 26 deletions app/src/main/res/values-iw/strings_dialog.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
12 changes: 12 additions & 0 deletions app/src/main/res/values-ja/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
15 changes: 14 additions & 1 deletion app/src/main/res/values-ja/strings_dialog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,17 @@
<string name="dialog_create_external_msg">このディレクトリにGitリポジトリを作成してよろしいですか?</string>
<string name="dialog_create_external_positive_label">作成</string>

</resources>
<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>
55 changes: 55 additions & 0 deletions app/src/main/res/values-ko/arrays.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
11 changes: 11 additions & 0 deletions app/src/main/res/values-ko/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
15 changes: 14 additions & 1 deletion app/src/main/res/values-ko/strings_dialog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,17 @@
<string name="dialog_fetch_positive_button">Fetch</string>
<string name="dialog_fetch_all_button">Fetch All</string>

</resources>
<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>
Loading

0 comments on commit 38109e5

Please sign in to comment.