Skip to content

Commit 4a970e6

Browse files
authored
fix: remove stray placeholder in de_DE MergeConflictEditor.Title translation (#2601)
1 parent 4ade74d commit 4a970e6

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/Resources/Locales/de_DE.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
607607
<x:String x:Key="Text.MergeConflictEditor.Result" xml:space="preserve">ERGEBNIS</x:String>
608608
<x:String x:Key="Text.MergeConflictEditor.SaveAndStage" xml:space="preserve">SPEICHERN &amp; STAGEN</x:String>
609609
<x:String x:Key="Text.MergeConflictEditor.Theirs" xml:space="preserve">DEREN</x:String>
610-
<x:String x:Key="Text.MergeConflictEditor.Title" xml:space="preserve">Merge-Konflikt – {0}</x:String>
610+
<x:String x:Key="Text.MergeConflictEditor.Title" xml:space="preserve">Merge-Konflikte</x:String>
611611
<x:String x:Key="Text.MergeConflictEditor.UnsavedChanges" xml:space="preserve">Ungespeicherte Änderungen verwerfen?</x:String>
612612
<x:String x:Key="Text.MergeConflictEditor.UseMine" xml:space="preserve">MEINE VERWENDEN</x:String>
613613
<x:String x:Key="Text.MergeConflictEditor.UseTheirs" xml:space="preserve">DEREN VERWENDEN</x:String>

0 commit comments

Comments
 (0)