From cf20fc113c4f27241c34902d52012bcecb13bcdf Mon Sep 17 00:00:00 2001
From: "Danilo M." <danix@danix.xyz>
Date: Mon, 2 Nov 2026 19:39:14 +0100
Subject: 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>
---
 app/src/main/res/values-zh-rCN/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/res/values-zh-rCN')

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1ea847f3..b20749b3 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -286,7 +286,7 @@ personal.com</string>
   <string name="new_folder_set_gpg_key">为目录设置GPG密钥</string>
   <!-- GitException messages -->
   <string name="git_unknown_error">未知错误</string>
-  <string name="git_pull_merge_fail_error">合并失败，你处于冲突状态。TODO：添加恢复方法。</string>
+  <string name="git_pull_merge_fail_error">合并失败，你处于冲突状态。</string>
   <string name="git_push_nff_error">推送被远端拒绝，在推送前运行拉取。您可以使用同步而不是拉取/推送，因为它实现了这两种功能。</string>
   <string name="git_push_generic_error">推送被远程拒绝,原因: %1$s</string>
   <string name="git_push_other_error">远端拒绝了非快进推送。检查目标仓库配置文件中的 receive.denyNonFastForwards 变量。</string>
-- 
cgit v1.2.3