diff options
| author | Mohamed Zenadi <mohamed@zenadi.com> | 2015-04-19 20:27:30 +0200 |
|---|---|---|
| committer | Mohamed Zenadi <mohamed@zenadi.com> | 2015-04-19 20:27:30 +0200 |
| commit | 771d8a9415831b5d6fe9cebf574fbf7e5eacd373 (patch) | |
| tree | 3c74a84dce73e1e19b93839b803f509feabe36df /app/src/main/res | |
| parent | 6983ef4f82a85cae1e7f83638ce2f5ec37e96ef0 (diff) | |
Add a Sync command that calls Pull then Push
Fixes #78
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/menu/main_menu.xml (renamed from app/src/main/res/menu/pwdstore.xml) | 6 | ||||
| -rw-r--r-- | app/src/main/res/values-cs/strings.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/app/src/main/res/menu/pwdstore.xml b/app/src/main/res/menu/main_menu.xml index 220bd49b..6f391460 100644 --- a/app/src/main/res/menu/pwdstore.xml +++ b/app/src/main/res/menu/main_menu.xml @@ -17,10 +17,12 @@ <!--<item android:id="@+id/menu_add_category"--> <!--android:title="New category"/>--> + <item android:id="@+id/git_sync" + android:title="@string/git_sync"/> <item android:id="@+id/git_pull" - android:title="Pull from remote"/> + android:title="@string/git_pull"/> <item android:id="@+id/git_push" - android:title="Push to remote"/> + android:title="@string/git_push"/> <item android:id="@+id/refresh" android:title="Refresh list" diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index c1dc6ae0..f789b8a9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -121,5 +121,8 @@ <string name="dialog_negative">Ne... později</string> <string name="dialog_oops">Ajaj...</string> <string name="dialog_cancel">Zrušit</string> + <string name="git_sync">Syncronize repository</string> + <string name="git_pull">Pull from remote</string> + <string name="git_push">Push to remote</string> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8cf8d140..b6793849 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -122,5 +122,8 @@ <string name="dialog_negative">Nah... later</string> <string name="dialog_oops">Oops...</string> <string name="dialog_cancel">Cancel</string> + <string name="git_sync">Syncronize repository</string> + <string name="git_pull">Pull from remote</string> + <string name="git_push">Push to remote</string> </resources> |