diff options
Diffstat (limited to 'app/src/main/res/values/strings.xml')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 46e85334..57af2db3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -147,6 +147,9 @@ <string name="pref_select_external_repository_summary_no_repo_selected">No external repository selected</string> <string name="prefs_export_passwords_title">Export passwords</string> <string name="prefs_export_passwords_summary">Exports the encrypted passwords to an external directory</string> + <string name="pref_rebase_on_pull_title">Rebase on pull</string> + <string name="pref_rebase_on_pull_summary">When pulling or syncing, create a merge commit with upstream changes</string> + <string name="pref_rebase_on_pull_summary_on">When pulling or syncing, rebase commits that are not present in the remote repository</string> <!-- PasswordGenerator fragment --> <string name="pwgen_title">Generate Password</string> @@ -345,7 +348,9 @@ <!-- GitException messages --> <string name="git_unknown_error">Unknown error</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_pull_rebase_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_pull_merge_fail_error">Merge has failed, you\'re in a conflicting state. TODO: Add a recovery method.</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: %1$s</string> <string name="git_push_other_error">Remote rejected non-fast-forward push. Check receive.denyNonFastForwards variable in config file of destination repository.</string> |