diff options
| author | Danilo M. <danix@danix.xyz> | 2026-11-03 18:42:00 +0100 |
|---|---|---|
| committer | Danilo M. <danix@danix.xyz> | 2026-11-03 18:42:00 +0100 |
| commit | d6b0c910e065fd51481eea1ab5819d7c8f57438e (patch) | |
| tree | 2b101c2b91feab396ce70c16eee26364d9db6f2e /app/src/main/res | |
| parent | 9b4ba97d02a27fac4452f75427cbb79d311c28f4 (diff) | |
| download | HardenedPass-d6b0c910e065fd51481eea1ab5819d7c8f57438e.tar.gz HardenedPass-d6b0c910e065fd51481eea1ab5819d7c8f57438e.zip | |
feat(app): add the Compose git config and commit log screens
Author name and email, HEAD status, commit log, abort rebase, hard
reset and gc. The hard reset now warns and prefills the current branch;
a finished reset or gc stays on the screen with a snackbar, and a
failed operation keeps the screen too. The commit log is read off the
main thread. BreakOutOfDetached's not-rebasing dialog no longer
finishes the calling activity.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/values-it/strings.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 50566188..28a38301 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -380,5 +380,7 @@ <string name="store_delete_failed">Impossibile eliminare tutto il contenuto della cartella dell\'archivio.</string> <string name="clear_saved_secret_message">Verrà chiesto di nuovo alla prossima operazione Git.</string> <string name="invalid_proxy_port">Inserisci una porta da 1 a 65535, oppure niente</string> + <string name="git_reset_confirm_message">I commit e le modifiche locali che non sono su questo remote branch vengono scartati.</string> + <string name="git_tool_done">%1$s: completato</string> <string name="store_delete_confirm">Eliminare l\'archivio locale? Le voci di cui non è stato fatto il push sul remote vanno perse.</string> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 02f02e18..403ee2ae 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -415,5 +415,7 @@ <string name="store_delete_failed">Could not delete everything in the store folder.</string> <string name="clear_saved_secret_message">It will be asked again at the next Git operation.</string> <string name="invalid_proxy_port">Enter a port from 1 to 65535, or nothing</string> + <string name="git_reset_confirm_message">Local commits and changes that are not on this remote branch are discarded.</string> + <string name="git_tool_done">%1$s: done</string> <string name="store_delete_confirm">Delete the local store? Entries not pushed to the remote are lost.</string> </resources> |