From 136ee43d6080da288afae8ec133727962ea60640 Mon Sep 17 00:00:00 2001 From: "Danilo M." 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 --- app/src/main/java/app/passwordstore/ui/settings/GitConfigScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/main/java') diff --git a/app/src/main/java/app/passwordstore/ui/settings/GitConfigScreen.kt b/app/src/main/java/app/passwordstore/ui/settings/GitConfigScreen.kt index 872fcd8b..d008eea3 100644 --- a/app/src/main/java/app/passwordstore/ui/settings/GitConfigScreen.kt +++ b/app/src/main/java/app/passwordstore/ui/settings/GitConfigScreen.kt @@ -83,7 +83,7 @@ fun GitConfigScreen( modifier = modifier, topBar = { TopAppBar( - title = { Text(stringResource(R.string.title_activity_git_config)) }, + title = { Text(stringResource(R.string.pref_edit_git_config)) }, navigationIcon = { IconButton(onClick = onBack) { Icon(Icons.AutoMirrored.Filled.ArrowBack, stringResource(R.string.entry_back)) -- cgit v1.2.3