diff options
| author | Mohamed Zenadi <zeapo@users.noreply.github.com> | 2015-01-04 21:49:56 +0100 |
|---|---|---|
| committer | Mohamed Zenadi <zeapo@users.noreply.github.com> | 2015-01-04 21:49:56 +0100 |
| commit | df8994d84f3923ba64cb36ecdad54aa29e28f2a0 (patch) | |
| tree | 7eb85fa141183222ca565cb8ee6d5c977cd88729 /app/src/main/res | |
| parent | 33689cefc7a429e4f51607a013f6adc9c01ede94 (diff) | |
| parent | 6922652173e05433bb9524b036baafb96c91ca1b (diff) | |
Merge pull request #57 from zeapo/feature/refactor-git
Refactoring of the git process
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_git_clone.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/menu/git_clone.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index 07d57934..d53a2201 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -6,7 +6,7 @@ android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin" - tools:context="com.zeapo.pwdstore.git.GitHandler" + tools:context="com.zeapo.pwdstore.git.GitActivity" android:background="@android:color/white"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/menu/git_clone.xml b/app/src/main/res/menu/git_clone.xml index 4a240712..092a8b2b 100644 --- a/app/src/main/res/menu/git_clone.xml +++ b/app/src/main/res/menu/git_clone.xml @@ -1,7 +1,7 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:pwstore="http://schemas.android.com/apk/res-auto" - tools:context="com.zeapo.pwdstore.git.GitHandler" > + tools:context="com.zeapo.pwdstore.git.GitActivity" > <item android:id="@+id/user_pref" android:title="@string/action_settings" android:orderInCategory="100" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 86885674..8cf8d140 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,7 +12,7 @@ <string name="dialog_delete_msg">Target directory already exist. Current version support only a single store. Do you want to delete the current password store directory?</string> <string name="dialog_delete">Delete directory</string> <string name="dialog_do_not_delete">Cancel</string> - <string name="title_activity_git_clone">Clone repository</string> + <string name="title_activity_git_clone">Repository information</string> <!-- Password Store --> <string name="creation_dialog_text">Please clone or create a new repository below before trying to add a password or any synchronization operation.</string> @@ -41,7 +41,7 @@ <!-- Git Async Task --> <string name="running_dialog_text">Running command...</string> <string name="jgit_error_dialog_title">Internal exception occurred</string> - <string name="jgit_error_dialog_text">Message from jgit: /n</string> + <string name="jgit_error_dialog_text">Message from jgit: \n</string> <!-- Git Handler --> <string name="read_only_dialog_text">You are about to use a read-only repository, you will not be able to push to it</string> @@ -108,6 +108,7 @@ <string name="pref_password_dialog_title">Set the time you want the password to be in clipboard</string> <string name="pref_copy_title">Automatically Copy Password</string> <string name="pref_copy_dialog_title">Automatically copy the password to the clipboard after decryption was successful.</string> + <string name="ssh_key_success_dialog_title" translatable="false">SSH-key imported</string> <string name="ssh_key_error_dialog_title">Error while trying to import the ssh-key</string> <string name="ssh_key_error_dialog_text">Message : \n</string> <string name="pref_recursive_filter">Recursive filtering</string> |