aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/res/values-de
diff options
context:
space:
mode:
authorDanilo M. <danix@danix.xyz>2026-11-02 19:39:14 +0100
committerDanilo M. <danix@danix.xyz>2026-11-02 19:39:14 +0100
commitcf20fc113c4f27241c34902d52012bcecb13bcdf (patch)
tree06cbe485d55f463688133733e272c5cd32580a7a /app/src/main/res/values-de
parent29d6a9205b15ec56387a35caa58894459e37bb24 (diff)
downloadHardenedPass-cf20fc113c4f27241c34902d52012bcecb13bcdf.tar.gz
HardenedPass-cf20fc113c4f27241c34902d52012bcecb13bcdf.zip
fix(i18n): revise the Italian translation
The Italian strings were largely machine-translated: "commit" became "conferma" (confirm), pull and push became "trascina" and "spingi" or "premi" (drag, push a button), rebase became "ricollocare", the store became "negozio" (a shop), "pretend" became "pretendere" (a false friend), and one string showed "/0" instead of "/". Autofill had five different spellings. Rewrite those, keep Git terms in English (remote, branch, push, pull, rebase, merge, commit, detached HEAD, fast-forward), use "compilazione automatica" as Android's Italian settings do, make "repository" masculine throughout, replace the "Sei pregato di" calque with plain imperatives, name the app HardenedPass, and translate the 52 strings that fell back to English. Also drop the "TODO: Add a recovery method" that the merge-failure message showed users, in English and every locale. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Diffstat (limited to 'app/src/main/res/values-de')
-rw-r--r--app/src/main/res/values-de/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1ca0e3a3..7499fe5e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -285,7 +285,7 @@
<!-- GitException messages -->
<string name="git_unknown_error">Unbekannter Fehler</string>
<string name="git_pull_rebase_fail_error">Pull fehlgeschlagen. Sie befinden sich in einem abgelösten Head. Speichern Sie die Änderungen in \"Einstellungen &gt; Lokale Git-Konfiguration &amp; Dienstprogramme\" auf das Remote-Repository in einem neuen Branch und lösen Sie den Konflikt auf Ihrem Computer auf.</string>
- <string name="git_pull_merge_fail_error">Merge fehlgeschlagen, Sie befinden sich in einem Konflikt. TODO: Wiederherstellungsmethode hinzufügen.</string>
+ <string name="git_pull_merge_fail_error">Merge fehlgeschlagen, Sie befinden sich in einem Konflikt.</string>
<string name="git_push_nff_error">Push wurde vom Remote abgelehnt. Führen Sie den Pull vor dem Push aus. Sie können \"Synchronisieren\" statt Pull/Push nutzen, da es beides implementiert</string>
<string name="git_push_generic_error">Push wurde von Remote abgelehnt, Grund: %1$s</string>
<string name="git_push_other_error">Remote hat den Push abgelehnt. Prüfen Sie die Variable receive.denyNonFastForwards in der Konfigurationsdatei des Ziel-Repositorys.</string>