Skip to content

Commit d22b95a

Browse files
doc: Update translation status and sort locale files
1 parent 1faa3b1 commit d22b95a

15 files changed

Lines changed: 54 additions & 40 deletions

TRANSLATION.md

Lines changed: 54 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This document shows the translation status of each locale file in the repository
66

77
### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
88

9-
### ![de__DE](https://img.shields.io/badge/de__DE-93.45%25-yellow)
9+
### ![de__DE](https://img.shields.io/badge/de__DE-93.15%25-yellow)
1010

1111
<details>
1212
<summary>Missing keys in de_DE.axaml</summary>
@@ -56,6 +56,9 @@ This document shows the translation status of each locale file in the repository
5656
- Text.Init.CommandTip
5757
- Text.Init.ErrorMessageTip
5858
- Text.InteractiveRebase.NoVerify
59+
- Text.Merge.Test
60+
- Text.Merge.Test.Conflicts
61+
- Text.Merge.Test.OK
5962
- Text.OpenLocalRepository
6063
- Text.OpenLocalRepository.Bookmark
6164
- Text.OpenLocalRepository.Group
@@ -79,40 +82,49 @@ This document shows the translation status of each locale file in the repository
7982

8083
</details>
8184

82-
### ![es__ES](https://img.shields.io/badge/es__ES-99.70%25-yellow)
85+
### ![es__ES](https://img.shields.io/badge/es__ES-99.40%25-yellow)
8386

8487
<details>
8588
<summary>Missing keys in es_ES.axaml</summary>
8689

8790
- Text.CommitCM.CopyAuthorTime
8891
- Text.CommitCM.CopyCommitterTime
92+
- Text.Merge.Test
93+
- Text.Merge.Test.Conflicts
94+
- Text.Merge.Test.OK
8995
- Text.Preferences.General.UseCompactBranchNames
9096

9197
</details>
9298

93-
### ![fr__FR](https://img.shields.io/badge/fr__FR-99.70%25-yellow)
99+
### ![fr__FR](https://img.shields.io/badge/fr__FR-99.40%25-yellow)
94100

95101
<details>
96102
<summary>Missing keys in fr_FR.axaml</summary>
97103

98104
- Text.CommitCM.CopyAuthorTime
99105
- Text.CommitCM.CopyCommitterTime
106+
- Text.Merge.Test
107+
- Text.Merge.Test.Conflicts
108+
- Text.Merge.Test.OK
100109
- Text.Preferences.General.UseCompactBranchNames
101110

102111
</details>
103112

104-
### ![he__IL](https://img.shields.io/badge/he__IL-99.70%25-yellow)
113+
### ![he__IL](https://img.shields.io/badge/he__IL-99.40%25-yellow)
105114

106115
<details>
107116
<summary>Missing keys in he_IL.axaml</summary>
108117

109118
- Text.CommitCM.CopyAuthorTime
110119
- Text.CommitCM.CopyCommitterTime
120+
- Text.Merge.Test
121+
- Text.Merge.Test.Conflicts
122+
- Text.Merge.Test.OK
111123
- Text.Preferences.General.UseCompactBranchNames
112124

113125
</details>
114126

115-
### ![id__ID](https://img.shields.io/badge/id__ID-86.09%25-yellow)
127+
### ![id__ID](https://img.shields.io/badge/id__ID-85.80%25-yellow)
116128

117129
<details>
118130
<summary>Missing keys in id_ID.axaml</summary>
@@ -195,6 +207,9 @@ This document shows the translation status of each locale file in the repository
195207
- Text.InteractiveRebase.NoVerify
196208
- Text.Launcher.Commands
197209
- Text.Launcher.OpenRepository
210+
- Text.Merge.Test
211+
- Text.Merge.Test.Conflicts
212+
- Text.Merge.Test.OK
198213
- Text.MergeConflictEditor.AcceptBoth.MineFirst
199214
- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
200215
- Text.MergeConflictEditor.UseBoth
@@ -258,7 +273,7 @@ This document shows the translation status of each locale file in the repository
258273

259274
</details>
260275

261-
### ![it__IT](https://img.shields.io/badge/it__IT-92.84%25-yellow)
276+
### ![it__IT](https://img.shields.io/badge/it__IT-92.55%25-yellow)
262277

263278
<details>
264279
<summary>Missing keys in it_IT.axaml</summary>
@@ -312,6 +327,9 @@ This document shows the translation status of each locale file in the repository
312327
- Text.Init.CommandTip
313328
- Text.Init.ErrorMessageTip
314329
- Text.InteractiveRebase.NoVerify
330+
- Text.Merge.Test
331+
- Text.Merge.Test.Conflicts
332+
- Text.Merge.Test.OK
315333
- Text.OpenLocalRepository
316334
- Text.OpenLocalRepository.Bookmark
317335
- Text.OpenLocalRepository.Group
@@ -337,7 +355,7 @@ This document shows the translation status of each locale file in the repository
337355

338356
</details>
339357

340-
### ![ja__JP](https://img.shields.io/badge/ja__JP-93.75%25-yellow)
358+
### ![ja__JP](https://img.shields.io/badge/ja__JP-93.45%25-yellow)
341359

342360
<details>
343361
<summary>Missing keys in ja_JP.axaml</summary>
@@ -385,6 +403,9 @@ This document shows the translation status of each locale file in the repository
385403
- Text.Init.CommandTip
386404
- Text.Init.ErrorMessageTip
387405
- Text.InteractiveRebase.NoVerify
406+
- Text.Merge.Test
407+
- Text.Merge.Test.Conflicts
408+
- Text.Merge.Test.OK
388409
- Text.OpenLocalRepository
389410
- Text.OpenLocalRepository.Bookmark
390411
- Text.OpenLocalRepository.Group
@@ -407,7 +428,7 @@ This document shows the translation status of each locale file in the repository
407428

408429
</details>
409430

410-
### ![ko__KR](https://img.shields.io/badge/ko__KR-85.99%25-yellow)
431+
### ![ko__KR](https://img.shields.io/badge/ko__KR-85.70%25-yellow)
411432

412433
<details>
413434
<summary>Missing keys in ko_KR.axaml</summary>
@@ -489,6 +510,9 @@ This document shows the translation status of each locale file in the repository
489510
- Text.InteractiveRebase.NoVerify
490511
- Text.Launcher.Commands
491512
- Text.Launcher.OpenRepository
513+
- Text.Merge.Test
514+
- Text.Merge.Test.Conflicts
515+
- Text.Merge.Test.OK
492516
- Text.MergeConflictEditor.AcceptBoth.MineFirst
493517
- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
494518
- Text.MergeConflictEditor.UseBoth
@@ -554,7 +578,7 @@ This document shows the translation status of each locale file in the repository
554578

555579
</details>
556580

557-
### ![pt__BR](https://img.shields.io/badge/pt__BR-65.52%25-red)
581+
### ![pt__BR](https://img.shields.io/badge/pt__BR-65.36%25-red)
558582

559583
<details>
560584
<summary>Missing keys in pt_BR.axaml</summary>
@@ -604,7 +628,6 @@ This document shows the translation status of each locale file in the repository
604628
- Text.CommitCM.InteractiveRebase.Manually
605629
- Text.CommitCM.InteractiveRebase.Reword
606630
- Text.CommitCM.InteractiveRebase.Squash
607-
- Text.CommitCM.Merge
608631
- Text.CommitCM.MergeMultiple
609632
- Text.CommitCM.PushRevision
610633
- Text.CommitCM.Rebase
@@ -735,6 +758,9 @@ This document shows the translation status of each locale file in the repository
735758
- Text.Launcher.Workspaces
736759
- Text.Merge.Edit
737760
- Text.Merge.Source
761+
- Text.Merge.Test
762+
- Text.Merge.Test.Conflicts
763+
- Text.Merge.Test.OK
738764
- Text.MergeConflictEditor.AcceptBoth.MineFirst
739765
- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
740766
- Text.MergeConflictEditor.UseBoth
@@ -904,9 +930,18 @@ This document shows the translation status of each locale file in the repository
904930

905931
</details>
906932

907-
### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
933+
### ![ru__RU](https://img.shields.io/badge/ru__RU-99.70%25-yellow)
908934

909-
### ![ta__IN](https://img.shields.io/badge/ta__IN-67.54%25-red)
935+
<details>
936+
<summary>Missing keys in ru_RU.axaml</summary>
937+
938+
- Text.Merge.Test
939+
- Text.Merge.Test.Conflicts
940+
- Text.Merge.Test.OK
941+
942+
</details>
943+
944+
### ![ta__IN](https://img.shields.io/badge/ta__IN-67.27%25-red)
910945

911946
<details>
912947
<summary>Missing keys in ta_IN.axaml</summary>
@@ -1094,6 +1129,9 @@ This document shows the translation status of each locale file in the repository
10941129
- Text.Launcher.Pages
10951130
- Text.Launcher.Workspaces
10961131
- Text.Merge.Edit
1132+
- Text.Merge.Test
1133+
- Text.Merge.Test.Conflicts
1134+
- Text.Merge.Test.OK
10971135
- Text.MergeConflictEditor.AcceptBoth.MineFirst
10981136
- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
10991137
- Text.MergeConflictEditor.UseBoth
@@ -1236,7 +1274,7 @@ This document shows the translation status of each locale file in the repository
12361274

12371275
</details>
12381276

1239-
### ![uk__UA](https://img.shields.io/badge/uk__UA-68.35%25-red)
1277+
### ![uk__UA](https://img.shields.io/badge/uk__UA-68.08%25-red)
12401278

12411279
<details>
12421280
<summary>Missing keys in uk_UA.axaml</summary>
@@ -1420,6 +1458,9 @@ This document shows the translation status of each locale file in the repository
14201458
- Text.Launcher.Pages
14211459
- Text.Launcher.Workspaces
14221460
- Text.Merge.Edit
1461+
- Text.Merge.Test
1462+
- Text.Merge.Test.Conflicts
1463+
- Text.Merge.Test.OK
14231464
- Text.MergeConflictEditor.AcceptBoth.MineFirst
14241465
- Text.MergeConflictEditor.AcceptBoth.TheirsFirst
14251466
- Text.MergeConflictEditor.UseBoth

src/Resources/Locales/de_DE.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@
153153
<x:String x:Key="Text.CommitCM.InteractiveRebase.Manually" xml:space="preserve">Interaktives Rebase von ${0}$ auf ${1}$</x:String>
154154
<x:String x:Key="Text.CommitCM.InteractiveRebase.Reword" xml:space="preserve">Umformulieren…</x:String>
155155
<x:String x:Key="Text.CommitCM.InteractiveRebase.Squash" xml:space="preserve">Squash in den Vorgänger…</x:String>
156-
<x:String x:Key="Text.CommitCM.Merge" xml:space="preserve">Merge in ${0}$ hinein</x:String>
157156
<x:String x:Key="Text.CommitCM.MergeMultiple" xml:space="preserve">Merge…</x:String>
158157
<x:String x:Key="Text.CommitCM.PushRevision" xml:space="preserve">Push ${0}$ zu ${1}$</x:String>
159158
<x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">Rebase ${0}$ auf ${1}$</x:String>
@@ -872,7 +871,6 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
872871
<x:String x:Key="Text.TagCM.CustomAction" xml:space="preserve">Benutzerdefinierte Aktion</x:String>
873872
<x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Lösche ${0}$…</x:String>
874873
<x:String x:Key="Text.TagCM.DeleteMultiple" xml:space="preserve">Lösche ausgewählte {0} Tags…</x:String>
875-
<x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Merge ${0}$ in ${1}$ hinein…</x:String>
876874
<x:String x:Key="Text.TagCM.Push" xml:space="preserve">Pushe ${0}$…</x:String>
877875
<x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Submodule aktualisieren</x:String>
878876
<x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Alle Submodule</x:String>

src/Resources/Locales/es_ES.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@
167167
<x:String x:Key="Text.CommitCM.InteractiveRebase.Manually" xml:space="preserve">Hacer Rebase interactivamente ${0}$ en ${1}$</x:String>
168168
<x:String x:Key="Text.CommitCM.InteractiveRebase.Reword" xml:space="preserve">Reescribir...</x:String>
169169
<x:String x:Key="Text.CommitCM.InteractiveRebase.Squash" xml:space="preserve">Squash en el Padre...</x:String>
170-
<x:String x:Key="Text.CommitCM.Merge" xml:space="preserve">Merge a ${0}$</x:String>
171170
<x:String x:Key="Text.CommitCM.MergeMultiple" xml:space="preserve">Merge ...</x:String>
172171
<x:String x:Key="Text.CommitCM.PushRevision" xml:space="preserve">Push ${0}$ a ${1}$</x:String>
173172
<x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">Rebase ${0}$ en ${1}$</x:String>
@@ -931,7 +930,6 @@
931930
<x:String x:Key="Text.TagCM.CustomAction" xml:space="preserve">Acción Personalizada</x:String>
932931
<x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Eliminar ${0}$...</x:String>
933932
<x:String x:Key="Text.TagCM.DeleteMultiple" xml:space="preserve">Eliminar {0} etiquetas seleccionadas...</x:String>
934-
<x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Merge ${0}$ en ${1}$...</x:String>
935933
<x:String x:Key="Text.TagCM.Push" xml:space="preserve">Push ${0}$...</x:String>
936934
<x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Actualizar Submódulos</x:String>
937935
<x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Todos los submódulos</x:String>

src/Resources/Locales/fr_FR.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@
167167
<x:String x:Key="Text.CommitCM.InteractiveRebase.Manually" xml:space="preserve">Rebaser Interactivement ${0}$ sur ${1}$</x:String>
168168
<x:String x:Key="Text.CommitCM.InteractiveRebase.Reword" xml:space="preserve">Reformuler...</x:String>
169169
<x:String x:Key="Text.CommitCM.InteractiveRebase.Squash" xml:space="preserve">Squash dans le Parent...</x:String>
170-
<x:String x:Key="Text.CommitCM.Merge" xml:space="preserve">Fusionner dans ${0}$</x:String>
171170
<x:String x:Key="Text.CommitCM.MergeMultiple" xml:space="preserve">Fusionner ...</x:String>
172171
<x:String x:Key="Text.CommitCM.PushRevision" xml:space="preserve">Pousser ${0}$ vers ${1}$</x:String>
173172
<x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">Rebaser ${0}$ sur ${1}$</x:String>
@@ -931,7 +930,6 @@
931930
<x:String x:Key="Text.TagCM.CustomAction" xml:space="preserve">Action personnalisée</x:String>
932931
<x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Supprimer ${0}$...</x:String>
933932
<x:String x:Key="Text.TagCM.DeleteMultiple" xml:space="preserve">Supprimer les {0} tags sélectionnés...</x:String>
934-
<x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Fusionner ${0}$ dans ${1}$...</x:String>
935933
<x:String x:Key="Text.TagCM.Push" xml:space="preserve">Pousser ${0}$...</x:String>
936934
<x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Actualiser les sous-modules</x:String>
937935
<x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Tous les sous-modules</x:String>

src/Resources/Locales/he_IL.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@
167167
<x:String x:Key="Text.CommitCM.InteractiveRebase.Manually" xml:space="preserve">Interactive Rebase של ${0}$ על ${1}$</x:String>
168168
<x:String x:Key="Text.CommitCM.InteractiveRebase.Reword" xml:space="preserve">Reword...</x:String>
169169
<x:String x:Key="Text.CommitCM.InteractiveRebase.Squash" xml:space="preserve">Squash לתוך ההורה...</x:String>
170-
<x:String x:Key="Text.CommitCM.Merge" xml:space="preserve">Merge אל ${0}$</x:String>
171170
<x:String x:Key="Text.CommitCM.MergeMultiple" xml:space="preserve">Merge ...</x:String>
172171
<x:String x:Key="Text.CommitCM.PushRevision" xml:space="preserve">Push של ${0}$ אל ${1}$</x:String>
173172
<x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">Rebase של ${0}$ על ${1}$</x:String>
@@ -931,7 +930,6 @@
931930
<x:String x:Key="Text.TagCM.CustomAction" xml:space="preserve">פעולה מותאמת אישית</x:String>
932931
<x:String x:Key="Text.TagCM.Delete" xml:space="preserve">מחק ${0}$...</x:String>
933932
<x:String x:Key="Text.TagCM.DeleteMultiple" xml:space="preserve">מחק {0} ה־tags שנבחרו...</x:String>
934-
<x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Merge של ${0}$ אל ${1}$...</x:String>
935933
<x:String x:Key="Text.TagCM.Push" xml:space="preserve">Push ${0}$...</x:String>
936934
<x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">עדכון Submodules</x:String>
937935
<x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">כל ה־submodules</x:String>

src/Resources/Locales/id_ID.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@
139139
<x:String x:Key="Text.CommitCM.InteractiveRebase.Manually" xml:space="preserve">Rebase ${0}$ pada ${1}$ secara Interaktif</x:String>
140140
<x:String x:Key="Text.CommitCM.InteractiveRebase.Reword" xml:space="preserve">Reword...</x:String>
141141
<x:String x:Key="Text.CommitCM.InteractiveRebase.Squash" xml:space="preserve">Squash ke Parent...</x:String>
142-
<x:String x:Key="Text.CommitCM.Merge" xml:space="preserve">Merge ke ${0}$</x:String>
143142
<x:String x:Key="Text.CommitCM.MergeMultiple" xml:space="preserve">Merge ...</x:String>
144143
<x:String x:Key="Text.CommitCM.PushRevision" xml:space="preserve">Push ${0}$ ke ${1}$</x:String>
145144
<x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">Rebase ${0}$ pada ${1}$</x:String>
@@ -795,7 +794,6 @@
795794
<x:String x:Key="Text.TagCM.CustomAction" xml:space="preserve">Aksi Kustom</x:String>
796795
<x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Hapus ${0}$...</x:String>
797796
<x:String x:Key="Text.TagCM.DeleteMultiple" xml:space="preserve">Hapus {0} tag yang dipilih...</x:String>
798-
<x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Merge ${0}$ ke ${1}$...</x:String>
799797
<x:String x:Key="Text.TagCM.Push" xml:space="preserve">Push ${0}$...</x:String>
800798
<x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Perbarui Submodule</x:String>
801799
<x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Semua submodule</x:String>

src/Resources/Locales/it_IT.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@
152152
<x:String x:Key="Text.CommitCM.InteractiveRebase.Manually" xml:space="preserve">Ribasare interattivamente ${0}$ su ${1}$</x:String>
153153
<x:String x:Key="Text.CommitCM.InteractiveRebase.Reword" xml:space="preserve">Riformula...</x:String>
154154
<x:String x:Key="Text.CommitCM.InteractiveRebase.Squash" xml:space="preserve">Compatta nel Genitore...</x:String>
155-
<x:String x:Key="Text.CommitCM.Merge" xml:space="preserve">Unisci a ${0}$</x:String>
156155
<x:String x:Key="Text.CommitCM.MergeMultiple" xml:space="preserve">Unisci ...</x:String>
157156
<x:String x:Key="Text.CommitCM.PushRevision" xml:space="preserve">Invia ${0}$ a ${1}$</x:String>
158157
<x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">Ribasa ${0}$ su ${1}$</x:String>
@@ -866,7 +865,6 @@ ${pure_files:N} Come ${files:N}, ma senza cartelle</x:String>
866865
<x:String x:Key="Text.TagCM.CustomAction" xml:space="preserve">Azione Personalizzata</x:String>
867866
<x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Elimina ${0}$...</x:String>
868867
<x:String x:Key="Text.TagCM.DeleteMultiple" xml:space="preserve">Elimina i {0} tag selezionati...</x:String>
869-
<x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Unisci ${0}$ in ${1}$...</x:String>
870868
<x:String x:Key="Text.TagCM.Push" xml:space="preserve">Invia ${0}$...</x:String>
871869
<x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Aggiorna Sottomoduli</x:String>
872870
<x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Tutti i sottomoduli</x:String>

src/Resources/Locales/ja_JP.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@
153153
<x:String x:Key="Text.CommitCM.InteractiveRebase.Manually" xml:space="preserve">${0}$ を ${1}$ で対話式リベース</x:String>
154154
<x:String x:Key="Text.CommitCM.InteractiveRebase.Reword" xml:space="preserve">書き直す...</x:String>
155155
<x:String x:Key="Text.CommitCM.InteractiveRebase.Squash" xml:space="preserve">親コミットに記録付きで統合...</x:String>
156-
<x:String x:Key="Text.CommitCM.Merge" xml:space="preserve">${0}$ にマージ</x:String>
157156
<x:String x:Key="Text.CommitCM.MergeMultiple" xml:space="preserve">マージ...</x:String>
158157
<x:String x:Key="Text.CommitCM.PushRevision" xml:space="preserve">${0}$ を ${1}$ にプッシュ</x:String>
159158
<x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">${0}$ を ${1}$ でリベース</x:String>
@@ -875,7 +874,6 @@
875874
<x:String x:Key="Text.TagCM.CustomAction" xml:space="preserve">カスタムアクション</x:String>
876875
<x:String x:Key="Text.TagCM.Delete" xml:space="preserve">${0}$ を削除...</x:String>
877876
<x:String x:Key="Text.TagCM.DeleteMultiple" xml:space="preserve">選択した {0} 個のタグを削除...</x:String>
878-
<x:String x:Key="Text.TagCM.Merge" xml:space="preserve">${0}$ を ${1}$ にマージ...</x:String>
879877
<x:String x:Key="Text.TagCM.Push" xml:space="preserve">${0}$ をプッシュ...</x:String>
880878
<x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">サブモジュールを更新</x:String>
881879
<x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">すべてのサブモジュール</x:String>

src/Resources/Locales/ko_KR.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@
136136
<x:String x:Key="Text.CommitCM.InteractiveRebase.Manually" xml:space="preserve">${1}$을(를) 기반으로 ${0}$ 대화형 리베이스</x:String>
137137
<x:String x:Key="Text.CommitCM.InteractiveRebase.Reword" xml:space="preserve">메시지 수정(Reword)...</x:String>
138138
<x:String x:Key="Text.CommitCM.InteractiveRebase.Squash" xml:space="preserve">부모에 합치기(Squash)...</x:String>
139-
<x:String x:Key="Text.CommitCM.Merge" xml:space="preserve">${0}$(으)로 병합</x:String>
140139
<x:String x:Key="Text.CommitCM.MergeMultiple" xml:space="preserve">병합...</x:String>
141140
<x:String x:Key="Text.CommitCM.PushRevision" xml:space="preserve">${0}$을(를) ${1}$(으)로 푸시</x:String>
142141
<x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">${1}$을(를) 기반으로 ${0}$ 리베이스</x:String>
@@ -791,7 +790,6 @@
791790
<x:String x:Key="Text.TagCM.CustomAction" xml:space="preserve">사용자 지정 작업</x:String>
792791
<x:String x:Key="Text.TagCM.Delete" xml:space="preserve">${0}$ 삭제...</x:String>
793792
<x:String x:Key="Text.TagCM.DeleteMultiple" xml:space="preserve">선택한 {0}개의 태그 삭제...</x:String>
794-
<x:String x:Key="Text.TagCM.Merge" xml:space="preserve">${0}$을(를) ${1}$(으)로 병합...</x:String>
795793
<x:String x:Key="Text.TagCM.Push" xml:space="preserve">${0}$ 푸시...</x:String>
796794
<x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">서브모듈 업데이트</x:String>
797795
<x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">모든 서브모듈</x:String>

src/Resources/Locales/pt_BR.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,6 @@
600600
<x:String x:Key="Text.Submodule.Remove" xml:space="preserve">Excluir Submódulo</x:String>
601601
<x:String x:Key="Text.Sure" xml:space="preserve">OK</x:String>
602602
<x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Excluir ${0}$...</x:String>
603-
<x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Mesclar ${0}$ em ${1}$...</x:String>
604603
<x:String x:Key="Text.TagCM.Push" xml:space="preserve">Enviar ${0}$...</x:String>
605604
<x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Atualizar Submódulos</x:String>
606605
<x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Todos os submódulos</x:String>

0 commit comments

Comments
 (0)