diff --git a/TRANSLATION.md b/TRANSLATION.md index b604acca..c7b37e8c 100644 --- a/TRANSLATION.md +++ b/TRANSLATION.md @@ -6,13 +6,15 @@ This document shows the translation status of each locale file in the repository ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen) -### ![de__DE](https://img.shields.io/badge/de__DE-98.73%25-yellow) +### ![de__DE](https://img.shields.io/badge/de__DE-98.48%25-yellow)
Missing keys in de_DE.axaml - Text.GitFlow.FinishWithPush - Text.GitFlow.FinishWithSquash +- Text.Hotkeys.Global.OpenWorkspaces +- Text.Hotkeys.Global.OpenWorkspaceAtIndex - Text.Hotkeys.TextEditor.OpenExternalMergeTool - Text.Repository.ShowSubmodulesAsTree - Text.Submodule.Status @@ -24,23 +26,17 @@ This document shows the translation status of each locale file in the repository
-### ![es__ES](https://img.shields.io/badge/es__ES-98.98%25-yellow) +### ![es__ES](https://img.shields.io/badge/es__ES-99.75%25-yellow)
Missing keys in es_ES.axaml -- Text.Hotkeys.TextEditor.OpenExternalMergeTool -- Text.Repository.ShowSubmodulesAsTree -- Text.Submodule.Status -- Text.Submodule.Status.Modified -- Text.Submodule.Status.NotInited -- Text.Submodule.Status.RevisionChanged -- Text.Submodule.Status.Unmerged -- Text.Submodule.URL +- Text.Hotkeys.Global.OpenWorkspaces +- Text.Hotkeys.Global.OpenWorkspaceAtIndex
-### ![fr__FR](https://img.shields.io/badge/fr__FR-94.53%25-yellow) +### ![fr__FR](https://img.shields.io/badge/fr__FR-94.29%25-yellow)
Missing keys in fr_FR.axaml @@ -64,6 +60,8 @@ This document shows the translation status of each locale file in the repository - Text.ConfirmEmptyCommit.WithLocalChanges - Text.GitFlow.FinishWithPush - Text.GitFlow.FinishWithSquash +- Text.Hotkeys.Global.OpenWorkspaces +- Text.Hotkeys.Global.OpenWorkspaceAtIndex - Text.Hotkeys.TextEditor.OpenExternalMergeTool - Text.Preferences.Git.IgnoreCRAtEOLInDiff - Text.Repository.BranchSort @@ -91,9 +89,17 @@ This document shows the translation status of each locale file in the repository
-### ![it__IT](https://img.shields.io/badge/it__IT-%E2%88%9A-brightgreen) +### ![it__IT](https://img.shields.io/badge/it__IT-99.75%25-yellow) -### ![ja__JP](https://img.shields.io/badge/ja__JP-94.27%25-yellow) +
+Missing keys in it_IT.axaml + +- Text.Hotkeys.Global.OpenWorkspaces +- Text.Hotkeys.Global.OpenWorkspaceAtIndex + +
+ +### ![ja__JP](https://img.shields.io/badge/ja__JP-94.04%25-yellow)
Missing keys in ja_JP.axaml @@ -117,6 +123,8 @@ This document shows the translation status of each locale file in the repository - Text.ConfirmEmptyCommit.WithLocalChanges - Text.GitFlow.FinishWithPush - Text.GitFlow.FinishWithSquash +- Text.Hotkeys.Global.OpenWorkspaces +- Text.Hotkeys.Global.OpenWorkspaceAtIndex - Text.Hotkeys.TextEditor.OpenExternalMergeTool - Text.Preferences.Git.IgnoreCRAtEOLInDiff - Text.Repository.BranchSort @@ -146,7 +154,7 @@ This document shows the translation status of each locale file in the repository
-### ![pt__BR](https://img.shields.io/badge/pt__BR-86.01%25-yellow) +### ![pt__BR](https://img.shields.io/badge/pt__BR-85.79%25-yellow)
Missing keys in pt_BR.axaml @@ -199,6 +207,8 @@ This document shows the translation status of each locale file in the repository - Text.GitFlow.FinishWithPush - Text.GitFlow.FinishWithSquash - Text.Hotkeys.Global.Clone +- Text.Hotkeys.Global.OpenWorkspaces +- Text.Hotkeys.Global.OpenWorkspaceAtIndex - Text.Hotkeys.TextEditor.OpenExternalMergeTool - Text.InProgress.CherryPick.Head - Text.InProgress.Merge.Operating @@ -264,16 +274,18 @@ This document shows the translation status of each locale file in the repository
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.87%25-yellow) +### ![ru__RU](https://img.shields.io/badge/ru__RU-99.62%25-yellow)
Missing keys in ru_RU.axaml +- Text.Hotkeys.Global.OpenWorkspaces +- Text.Hotkeys.Global.OpenWorkspaceAtIndex - Text.Repository.ShowSubmodulesAsTree
-### ![ta__IN](https://img.shields.io/badge/ta__IN-94.53%25-yellow) +### ![ta__IN](https://img.shields.io/badge/ta__IN-94.29%25-yellow)
Missing keys in ta_IN.axaml @@ -297,6 +309,8 @@ This document shows the translation status of each locale file in the repository - Text.ConfirmEmptyCommit.WithLocalChanges - Text.GitFlow.FinishWithPush - Text.GitFlow.FinishWithSquash +- Text.Hotkeys.Global.OpenWorkspaces +- Text.Hotkeys.Global.OpenWorkspaceAtIndex - Text.Hotkeys.TextEditor.OpenExternalMergeTool - Text.Preferences.Git.IgnoreCRAtEOLInDiff - Text.Repository.BranchSort @@ -324,7 +338,7 @@ This document shows the translation status of each locale file in the repository
-### ![uk__UA](https://img.shields.io/badge/uk__UA-95.67%25-yellow) +### ![uk__UA](https://img.shields.io/badge/uk__UA-95.43%25-yellow)
Missing keys in uk_UA.axaml @@ -344,6 +358,8 @@ This document shows the translation status of each locale file in the repository - Text.ConfigureWorkspace.Name - Text.GitFlow.FinishWithPush - Text.GitFlow.FinishWithSquash +- Text.Hotkeys.Global.OpenWorkspaces +- Text.Hotkeys.Global.OpenWorkspaceAtIndex - Text.Hotkeys.TextEditor.OpenExternalMergeTool - Text.Preferences.Git.IgnoreCRAtEOLInDiff - Text.Repository.BranchSort @@ -366,6 +382,22 @@ This document shows the translation status of each locale file in the repository
-### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen) +### ![zh__CN](https://img.shields.io/badge/zh__CN-99.75%25-yellow) -### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen) \ No newline at end of file +
+Missing keys in zh_CN.axaml + +- Text.Hotkeys.Global.OpenWorkspaces +- Text.Hotkeys.Global.OpenWorkspaceAtIndex + +
+ +### ![zh__TW](https://img.shields.io/badge/zh__TW-99.75%25-yellow) + +
+Missing keys in zh_TW.axaml + +- Text.Hotkeys.Global.OpenWorkspaces +- Text.Hotkeys.Global.OpenWorkspaceAtIndex + +
\ No newline at end of file diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml index 2f7c5c43..63c9815d 100644 --- a/src/Resources/Locales/en_US.axaml +++ b/src/Resources/Locales/en_US.axaml @@ -386,6 +386,8 @@ Go to previous page Create new page Open Preferences dialog + Open Workspaces dialog + Switch to corresponding workspace REPOSITORY Commit staged changes Commit and push staged changes diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml index b11d0e98..e2b16329 100644 --- a/src/Resources/Locales/es_ES.axaml +++ b/src/Resources/Locales/es_ES.axaml @@ -410,6 +410,7 @@ Cerrar panel de búsqueda Buscar siguiente coincidencia Buscar coincidencia anterior + Abrir con herramienta diff/merge externa Abrir panel de búsqueda Descartar Stage @@ -620,6 +621,7 @@ Mensaje SHA Rama Actual + Mostrar Submódulos como Árbol Mostrar Etiquetas como Árbol OMITIR Estadísticas @@ -708,6 +710,12 @@ Ruta Relativa: Carpeta relativa para almacenar este módulo. Eliminar Submódulo + ESTADO + modificado + no inicializado + revisión cambiada + unmerged + URL OK Copiar Nombre de la Etiqueta Copiar Mensaje de la Etiqueta diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs index d9425059..5eaca763 100644 --- a/src/ViewModels/Launcher.cs +++ b/src/ViewModels/Launcher.cs @@ -463,6 +463,14 @@ namespace SourceGit.ViewModels return menu; } + public void SwitchWorkspace(int idx) + { + var pref = Preferences.Instance; + if (idx >= pref.Workspaces.Count || pref.Workspaces[idx].IsActive) return; + + SwitchWorkspace(pref.Workspaces[idx]); + } + private string GetRepositoryGitDir(string repo) { var fullpath = Path.Combine(repo, ".git"); @@ -493,7 +501,7 @@ namespace SourceGit.ViewModels return new Commands.QueryGitDir(repo).Result(); } - + private void SwitchWorkspace(Workspace to) { foreach (var one in Pages) diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml index 87242793..b1d436a4 100644 --- a/src/Views/Hotkeys.axaml +++ b/src/Views/Hotkeys.axaml @@ -45,7 +45,7 @@ FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Increase}}" Margin="0,0,0,8"/> - + @@ -69,6 +69,12 @@ + + + + + + -