aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/values
diff options
context:
space:
mode:
authorNosweh <62889203+Nosweh@users.noreply.github.com>2020-08-28 17:31:40 +0200
committerGitHub <noreply@github.com>2020-08-28 21:01:40 +0530
commit0f0d1994e589b4f2b2603c882f52c79e2307a4f7 (patch)
treeba6d5d5e80f9993ce8d21ea87d2ab687d1675ebb /app/src/main/res/values
parent88b1de2b509c007171b432da1d9b4b4761509def (diff)
Add Activity to view the Git commit log (#1056)
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r--app/src/main/res/values/strings.xml14
1 files changed, 9 insertions, 5 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a6e33047..72d4d5db 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,6 +20,7 @@
<string name="dialog_do_not_delete">Cancel</string>
<string name="title_activity_git_clone">Repository information</string>
<string name="title_activity_git_config" translatable="false">Git configuration</string>
+ <string name="title_activity_git_log">Commit log</string>
<!-- Password Store -->
<string name="creation_dialog_text">Please clone or create a new repository below before trying to add a password or running any synchronization operation.</string>
@@ -117,8 +118,8 @@
<!-- Preferences -->
<string name="pref_repository_title">Repository</string>
- <string name="pref_edit_server_info">Edit git server settings</string>
- <string name="pref_edit_git_config">Git utils</string>
+ <string name="pref_edit_server_info">Edit Git server settings</string>
+ <string name="pref_edit_git_config">Local Git config &amp; utilities</string>
<string name="pref_ssh_title">Import SSH key</string>
<string name="pref_ssh_keygen_title">Generate SSH key pair</string>
<string name="pref_ssh_see_key_title">View generated public SSH key</string>
@@ -217,6 +218,7 @@
<string name="git_pull">Pull from remote</string>
<string name="git_push">Push to remote</string>
<string name="git_push_up_to_date">Everything up-to-date</string>
+ <string name="git_log">Show commit log</string>
<string name="show_password_pref_title">Show the password</string>
<string name="show_password_pref_summary">Control the visibility of the passwords once decrypted. This does not disable copying to clipboard.</string>
<string name="show_extra_content_pref_title">Show extra content</string>
@@ -281,10 +283,12 @@
<string name="clear_saved_passphrase_ssh">Clear saved passphrase for local SSH key</string>
<string name="clear_saved_passphrase_https">Clear saved HTTPS password</string>
<string name="git_operation_remember_passphrase">Remember key passphrase</string>
- <string name="hackish_tools">Hackish tools</string>
+ <string name="git_tools">Utilities</string>
<string name="abort_rebase">Abort rebase and push new branch</string>
<string name="reset_to_remote">Hard reset to remote branch</string>
- <string name="commit_hash">Commit hash</string>
+ <string name="git_head_on_branch">On branch %1$s</string>
+ <string name="git_head_detached">HEAD detached at %1$s</string>
+ <string name="git_head_missing">Unable to locate HEAD</string>
<string name="openkeychain_ssh_api_connect_fail">Failed to connect to OpenKeychain SSH API service.</string>
<string name="no_ssh_api_provider">No SSH API provider found. Is OpenKeychain installed?</string>
<string name="ssh_api_pending_intent_failed">SSH API pending intent failed</string>
@@ -393,6 +397,6 @@
<!-- GPG key selection in folder creation -->
<string name="folder_creation_err_file_exists">A file by that name already exists</string>
<string name="folder_creation_err_folder_exists">A folder by that name already exists</string>
- <string name="xkpwgen_extrachars_label" >Digits/Symbols (d/s)</string>
+ <string name="xkpwgen_extrachars_label">Digits/Symbols (d/s)</string>
<string name="xk_numbers_symbols_append_default">ds</string>
</resources>