From 136ee43d6080da288afae8ec133727962ea60640 Mon Sep 17 00:00:00 2001
From: "Danilo M." <danix@danix.xyz>
Date: Wed, 4 Nov 2026 18:45:38 +0100
Subject: fix(app): point the rebase conflict error at the current settings
 path

The detached HEAD error sent users to "Settings > Git utils", a screen
the Compose settings no longer have. Every locale now names Settings >
Repository > Local Git config & utilities, and the English quotes are
escaped so they show. The git configuration screen's title reuses that
translated row label instead of an untranslatable English string.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 app/src/main/res/values-gl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/res/values-gl/strings.xml')

diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 11af77b1..f966230c 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -271,7 +271,7 @@ a app desde unha fonte de confianza, como a Play Store, Amazon Appstore, F-Droid
   <string name="invalid_filename_text">O nome do ficheiro non pode conter \'/\', establece un directorio superior</string>
   <!-- GitException messages -->
   <string name="git_unknown_error">Fallo descoñecido</string>
-  <string name="git_pull_rebase_fail_error">Fallou a acción pull, estás nun head diferente. Utiliza \"axustes &gt; 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 &gt; Repositorio &gt; Configuración e Utilidades locais Git\", garda os cambios no remoto nunha nova rama e resolve o conflicto nun ordenador.</string>
   <string name="git_pull_merge_fail_error">Fallou o merge, hai un conflito nos datos. TAREFA: engadir método de recuperación.</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: %1$s</string>
-- 
cgit v1.2.3