diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2021-01-12 21:42:53 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 21:42:53 +0530 |
| commit | 1e9e5686afc2a6515f871c5f2ad4dc2ddc4731c4 (patch) | |
| tree | 3cce3972dd01f6c5cc4884e5c7b99c5e2db7eae5 /app/src/main/res/values-gl | |
| parent | 8bd156dea6e87eb667f76f4738fde992323ce0cf (diff) | |
| download | HardenedPass-1e9e5686afc2a6515f871c5f2ad4dc2ddc4731c4.tar.gz HardenedPass-1e9e5686afc2a6515f871c5f2ad4dc2ddc4731c4.zip | |
Allow configuring pull behaviour (#1276)
Diffstat (limited to 'app/src/main/res/values-gl')
| -rw-r--r-- | app/src/main/res/values-gl/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 5de9af33..7b45182b 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -314,7 +314,7 @@ a app desde unha fonte de confianza, como a Play Store, Amazon Appstore, F-Droid <string name="new_folder_set_gpg_key">Establece chave GPG para o directorio</string> <!-- GitException messages --> <string name="git_unknown_error">Fallo descoñecido</string> - <string name="git_pull_fail_error">Fallou a acción pull, estás nun head diferente. Utiliza \"axustes > utilidades git\", garda os cambios no remoto nunha nova rama e resolve o conflicto nun ordenador.</string> + <string name="git_pull_rebase_fail_error">Fallou a acción pull, estás nun head diferente. Utiliza \"axustes > utilidades git\", garda os cambios no remoto nunha nova rama e resolve o conflicto nun ordenador.</string> <string name="git_push_nff_error">O push foi rexeitado polo remoto, executa pull antes de voltar a subilos de novo. Podes usar Sincronizar mellor que push/pull xa que inclú ambos.</string> <string name="git_push_generic_error">O push foi rexeitado polo remoto, razón:</string> <string name="git_push_other_error">O remoto rexeitou o push non-fast-forward. Comproba a variable receive.denyNonFastForwards no ficheiro de configuración do repositorio de destino.</string> |