diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9aaebf98..b5f1192d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -276,10 +276,6 @@ <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> <string name="jgit_error_push_dialog_text">Error occurred during the push operation:</string> <string name="clear_saved_passphrase_ssh">Clear saved passphrase for local SSH key</string> <string name="clear_saved_passphrase_https">Clear saved HTTPS password</string> @@ -371,4 +367,12 @@ <string name="short_key_ids_unsupported">A key ID in .gpg-id is too short, please use either long key IDs (16 characters) or fingerprints (40 characters)</string> <string name="invalid_filename_text">File name must not contain \'/\', set directory above</string> <string name="directory_hint">Directory</string> + + <!-- 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_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> + <string name="git_operation_running">Running git operation…</string> </resources> |