diff options
| author | Danilo M. <danix@danix.xyz> | 2026-11-02 19:39:14 +0100 |
|---|---|---|
| committer | Danilo M. <danix@danix.xyz> | 2026-11-02 19:39:14 +0100 |
| commit | cf20fc113c4f27241c34902d52012bcecb13bcdf (patch) | |
| tree | 06cbe485d55f463688133733e272c5cd32580a7a /app/src/main/res/values/strings.xml | |
| parent | 29d6a9205b15ec56387a35caa58894459e37bb24 (diff) | |
| download | HardenedPass-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/strings.xml')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 45afc227..24a1b660 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -321,7 +321,7 @@ <!-- GitException messages --> <string name="git_unknown_error">Unknown error</string> <string name="git_pull_rebase_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_pull_merge_fail_error">Merge has failed, you\'re in a conflicting state. TODO: Add a recovery method.</string> + <string name="git_pull_merge_fail_error">Merge has failed, you\'re in a conflicting state.</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> |