diff options
| author | Fabian Henneke <FabianHenneke@users.noreply.github.com> | 2020-09-03 10:48:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-03 14:18:14 +0530 |
| commit | 3840f43fa0026b06b15913379761c1bf6b6a1c68 (patch) | |
| tree | 41a5d47c3ed3ef06430d2d045876301d4db416ad /app/src/main/res/values/strings.xml | |
| parent | 258ccc601605f3112d9310043b9a34bf6ca3c9e0 (diff) | |
| download | HardenedPass-3840f43fa0026b06b15913379761c1bf6b6a1c68.tar.gz HardenedPass-3840f43fa0026b06b15913379761c1bf6b6a1c68.zip | |
Refactor Git operations and auth (#1066)
Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app/src/main/res/values/strings.xml')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5c8b75cd..99ff2223 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -402,6 +402,8 @@ <string name="git_push_other_error">Remote rejected non-fast-forward push. Check receive.denyNonFastForwards variable in config file of destination repository.</string> <string name="git_unknown_host">Unknown host: %1$s</string> <string name="git_operation_running">Running git operation…</string> + <string name="git_break_out_of_detached_success">There was a conflict when trying to rebase. Your local %1$s branch was pushed to another branch named %2$s\n Use this branch to resolve conflict on your computer</string> + <string name="git_break_out_of_detached_unneeded">The repository is not rebasing, no need to push to another branch</string> <!-- OpenKeychain not installed --> <string name="openkeychain_not_installed_title">OpenKeychain not installed</string> |