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/res/values | |
| 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/res/values')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a84f3358..f1a858fd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,7 +19,6 @@ <string name="dialog_delete">Delete directory</string> <string name="dialog_do_not_delete">Cancel</string> <string name="title_activity_git_clone">Repository information</string> - <string name="title_activity_git_config" translatable="false">Git configuration</string> <string name="title_activity_git_log">Commit log</string> <!-- Password Store --> @@ -304,7 +303,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_rebase_fail_error">Pull has failed, you\'re in a detached head. Using \"Settings > Repository > Local Git config & utilities\", 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.</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> |