diff options
| author | Danilo M. <danix@danix.xyz> | 2026-11-04 18:45:38 +0100 |
|---|---|---|
| committer | Danilo M. <danix@danix.xyz> | 2026-11-04 18:45:38 +0100 |
| commit | 136ee43d6080da288afae8ec133727962ea60640 (patch) | |
| tree | e89dfbf1d75108900d44e9014098a7f5616b1ebb /app/src/main/java | |
| parent | ca69bd81057fc8a9f65ff7e2f1d874697df8a6cc (diff) | |
| download | HardenedPass-136ee43d6080da288afae8ec133727962ea60640.tar.gz HardenedPass-136ee43d6080da288afae8ec133727962ea60640.zip | |
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>
Diffstat (limited to 'app/src/main/java')
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/settings/GitConfigScreen.kt | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |