diff options
| author | zeapo <mohamed@zenadi.com> | 2017-08-10 14:19:24 +0200 |
|---|---|---|
| committer | zeapo <mohamed@zenadi.com> | 2017-08-10 14:19:24 +0200 |
| commit | 24a77b90284ee6a0832245c7f8d1d432b9db3710 (patch) | |
| tree | 44ffcc402cd6c6dc3737267565e1c18539629ed1 /app/src/main/res | |
| parent | d284e292377e152768c264a807325f98206312ae (diff) | |
detect error during push
fix #280
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0641385c..7805ad08 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -204,4 +204,8 @@ <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_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> </resources> |