diff options
| author | Mohamed Zenadi <zeapo@users.noreply.github.com> | 2019-05-15 11:22:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-15 11:22:07 +0200 |
| commit | 064a3fad99d5852d50634a98023cb92c4a915606 (patch) | |
| tree | d99160440eed728662d588d547e7b05f5ebe749d /app/src/main/res | |
| parent | 127a8b8c8a10d9c93bfc7e91e94b4bcb252eddeb (diff) | |
Allow the user to push local master to a new branch in case of conflict (#508)
* detect that we're in a detached head and show the message
* add a new way to clean local repo in case of failed rebase
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 675c5ca9..52f631c1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -238,6 +238,7 @@ <string name="autofill_ins_1_hint">Screenshot of accessibility services</string> <string name="autofill_ins_2_hint">Screenshot of toggle in accessibility services</string> <string name="autofill_ins_3_hint">Screenshot of autofill service in action</string> + <string name="git_pull_fail_error">Pull has failed, you\'re in a detached head. Using "settings > git utils", save your changes to the remote in a new branch and resolve the conflict on your computer.</string> <string name="git_push_nff_error">Push was rejected by remote, run pull before pushing again. You can use Synchronize rather than pull/push as it implements both</string> <string name="git_push_generic_error">Push was rejected by remote, reason:</string> <string name="git_push_other_error">Remote rejected non-fast-forward push. Check receive.denyNonFastForwards variable in config file of destination repository.</string> @@ -246,7 +247,7 @@ <string name="hotp_remember_clear_choice">Clear saved preference for HOTP incrementing</string> <string name="remember_the_passphrase">Remember the passphrase in the app configuration (insecure)</string> <string name="hackish_tools">Hackish tools</string> - <string name="abort_rebase">Abort rebase</string> + <string name="abort_rebase">Abort rebase and push new branch</string> <string name="commit_hash">Commit hash</string> <string name="crypto_password_edit_hint" translatable="false">p@ssw0rd!</string> <string name="crypto_extra_edit_hint">username: something other extra content</string> @@ -258,4 +259,5 @@ <string name="ssh_api_unknown_error">Unknown SSH API Error</string> <string name="sdcard_root_warning_title">SD-Card root selected</string> <string name="sdcard_root_warning_message">You have selected the root of your sdcard for the store. This is extremely dangerous and you will lose your data as its content will, eventually, be deleted</string> + <string name="git_abort_and_push_title">Abort and Push</string> </resources> |