add missing german localization for v8.37 #664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

love-linger merged 2 commits into sourcegit-scm:develop from Stern1710:localization

Nov 8, 2024

Contributor

Stern1710 commented Nov 7, 2024 •

edited

Loading

Add the missing keys in the German translation file.

Question: What do you deem the best way to truly test out where each of the individual keys is used inside the software (like which parts, where to access on theGUI, etc)?


          add missing german localization for v8.37

e2a4919

Add the missing keys in the German translation file.

NilsPvR reviewed

View reviewed changes

Contributor

NilsPvR left a comment

A couple of comments. Mostly to keep in line with other translations. If you feel like existing translations are incorrect, then changing those is also fine.

src/Resources/Locales/de_DE.axaml

    
                <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Lösche alle ausgewählten {0} Branches</x:String>

                <x:String x:Key="Text.BranchCM.DiscardAll" xml:space="preserve">Alle Änderungen verwerfen</x:String>

                <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">Fast-Forward zu ${0}$</x:String>

                <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">Fetche ${0}$ nach ${1}$...</x:String>

Contributor

NilsPvR Nov 7, 2024

I would go with "Fetche ${0}$ in ${1} hinein..." since we used a similar translation for Text.BranchCM.Merge and Text.BranchCM.PullInto

Suggested change

      
              <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">Fetche ${0}$ nach ${1}$...</x:String>
          
              <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">Fetche ${0}$ in ${1}$ hinein...</x:String>

src/Resources/Locales/de_DE.axaml

    
                <x:String x:Key="Text.Cancel" xml:space="preserve">ABBRECHEN</x:String>

                <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Auf diese Revision zurücksetzen</x:String>

                <x:String x:Key="Text.ChangeCM.CheckoutFirstParentRevision" xml:space="preserve">Auf Vorgänger-Revision zurücksetzen</x:String>

                  <x:String x:Key="Text.ChangeCM.GenerateCommitMessage" xml:space="preserve">Generiere Commit-Nachricht</x:String>

Contributor

NilsPvR Nov 7, 2024

Indentation

Suggested change

      
                <x:String x:Key="Text.ChangeCM.GenerateCommitMessage" xml:space="preserve">Generiere Commit-Nachricht</x:String>
          
              <x:String x:Key="Text.ChangeCM.GenerateCommitMessage" xml:space="preserve">Generiere Commit-Nachricht</x:String>

src/Resources/Locales/de_DE.axaml

    
                <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">TICKETSYSTEM</x:String>

                <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Beispiel für Github-Regel hinzufügen</x:String>

                <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Beispiel für Jira-Regel hinzufügen</x:String>

                <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Beispiel für eine Gitlab Issue Regel einfügen</x:String>

Contributor

NilsPvR Nov 7, 2024

Since the translation for Github is without "eine" aswell. Would also be fine if you add "eine" for the Github version.

Suggested change

      
              <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Beispiel für eine Gitlab Issue Regel einfügen</x:String>
          
              <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Beispiel für Gitlab Issue Regel einfügen</x:String>

src/Resources/Locales/de_DE.axaml

    
                <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Beispiel für Github-Regel hinzufügen</x:String>

                <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Beispiel für Jira-Regel hinzufügen</x:String>

                <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">Beispiel für eine Gitlab Issue Regel einfügen</x:String>

                <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Beispiel für einen Gitlab Merge Request einfügen</x:String>

Contributor

NilsPvR Nov 7, 2024

Same as the other one.

Suggested change

      
              <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Beispiel für einen Gitlab Merge Request einfügen</x:String>
          
              <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">Beispiel für Gitlab Merge Request einfügen</x:String>

src/Resources/Locales/de_DE.axaml

    
                <x:String x:Key="Text.Configure.IssueTracker.URLTemplate.Tip" xml:space="preserve">Verwende bitte $1, $2 um auf Regex-Gruppenwerte zuzugreifen.</x:String>

                <x:String x:Key="Text.Configure.OpenAI" xml:space="preserve">OPEN AI</x:String>

                <x:String x:Key="Text.Configure.OpenAI.Prefered" xml:space="preserve">Bevorzugter Service:</x:String>

                <x:String x:Key="Text.Configure.OpenAI.Prefered.Tip" xml:space="preserve">Wenn der 'Bevorzugte Service' aktiviert ist, wird SourceGit nur dieses Repository nutzen. Ansonsten wird, wenn mehrere Services verfügbar sind, eine Kontextmenü zur Auswahl angezeigt.</x:String>

Contributor

NilsPvR Nov 7, 2024

This seems a bit odd and also does not translate the "(...) use it in this repo(...)". I would translate this a bit more freely.

Suggested change

      
              <x:String x:Key="Text.Configure.OpenAI.Prefered.Tip" xml:space="preserve">Wenn der 'Bevorzugte Service' aktiviert ist, wird SourceGit nur dieses Repository nutzen. Ansonsten wird, wenn mehrere Services verfügbar sind, eine Kontextmenü zur Auswahl angezeigt.</x:String>
          
              <x:String x:Key="Text.Configure.OpenAI.Prefered.Tip" xml:space="preserve">Der ausgewählte 'Bevorzugte Service' wird nur in diesem Repository gesetzt und verwendet. Wenn keiner gesetzt ist und mehrere Servies verfügbar sind wird ein Kontextmenü zur Auswahl angezeigt.</x:String>

src/Resources/Locales/de_DE.axaml

    
                <x:String x:Key="Text.EditRepositoryNode.Target" xml:space="preserve">Ziel:</x:String>

                <x:String x:Key="Text.EditRepositoryNode.TitleForGroup" xml:space="preserve">Ausgewählte Gruppe bearbeiten</x:String>

                <x:String x:Key="Text.EditRepositoryNode.TitleForRepository" xml:space="preserve">Ausgewähltes Repository bearbeiten</x:String>

                <x:String x:Key="Text.ExecuteCustomAction" xml:space="preserve">Führe benutzerte Aktion aus</x:String>

Contributor

NilsPvR Nov 7, 2024

Did you mean it like this?

Suggested change

      
              <x:String x:Key="Text.ExecuteCustomAction" xml:space="preserve">Führe benutzerte Aktion aus</x:String>
          
              <x:String x:Key="Text.ExecuteCustomAction" xml:space="preserve">Führe benutzerdefinierte Aktion aus</x:String>

src/Resources/Locales/de_DE.axaml Show resolved Hide resolved

src/Resources/Locales/de_DE.axaml

    
                <x:String x:Key="Text.Start" xml:space="preserve">START</x:String>

                <x:String x:Key="Text.Stash" xml:space="preserve">Stash</x:String>

                <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">Inklusive nicht-verfolgter Dateien</x:String>

                <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">Behalte Dateien des Stages</x:String>

Contributor

NilsPvR Nov 7, 2024

We used "gestagte" before, e.g. Text.Hotkeys.Repo.Commit, Text.Stash.OnlyStagedChanges

Suggested change

      
              <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">Behalte Dateien des Stages</x:String>
          
              <x:String x:Key="Text.Stash.KeepIndex" xml:space="preserve">Behalte gestagte Dateien</x:String>

Stern1710 commented

View reviewed changes

Contributor Author

Stern1710 left a comment

Very nice comments!

Collaborator

love-linger commented Nov 8, 2024

Please resolve the conflicts with PR #665.


          Merge branch 'develop' into localization

3d59ec5

Contributor Author

Stern1710 commented Nov 8, 2024

Hi,
thanks for your comment. Hopefully I didn't mess things up, I am not used to Github's browser editor.

love-linger merged commit 3b4e037 into sourcegit-scm:develop

13 checks passed

love-linger self-assigned this

love-linger added the localization label

Stern1710 deleted the localization branch

November 8, 2024 15:31

Contributor

NilsPvR commented Nov 11, 2024

@Stern1710 were you planning to include my other suggestions? Otherwise I could also create a new PR for that.

Contributor Author

Stern1710 commented Nov 11, 2024 •

edited

Loading

@NilsPvR Hey, I am not 100% sure what you are exactly referring to. I have committed your changes to the source code already, but forgot (and/or didn't know) to mark them as resolved on Github. Sorry.
If you are referring to something else, please feel free to create a new PR and I will gladly help, when needed.

Obviously, I could be lost in translation and just don't get it how Github exactly works with their way of resolving issues.
Edit: Well, I think I somehow f-ed this up? Which I am somewhat unsure on how I did it, when I clearly remembered the browser editor having marked all the suggestions as asccepted. Guess I never stop learning :D

Contributor

NilsPvR commented Nov 11, 2024

@Stern1710 yee the merge commit looked good that's why I gave thumbs up. But the other suggestions seem to have gotten lost then 🤷‍♂️ 😅

NilsPvR added a commit to NilsPvR/sourcegit that referenced this pull request


          localization: improve de_DE keys

b84c8c1

- mostly code review suggestions from sourcegit-scm#664
- ClearAllCommitsFilter is not an action of deleting (löschen)

NilsPvR mentioned this pull request

Add and improve de_DE keys #709

Merged

love-linger pushed a commit that referenced this pull request


          Add and improve de_DE keys (#709)

6f256f6

* localization: add missing de_DE keys

added for #690

* localization: improve de_DE keys

- mostly code review suggestions from #664
- ClearAllCommitsFilter is not an action of deleting (löschen)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels