Skip to content

Commit ead94ea

Browse files
doc: Update translation status and sort locale files
1 parent 0b15451 commit ead94ea

File tree

14 files changed

+13
-86
lines changed

14 files changed

+13
-86
lines changed

TRANSLATION.md

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

4343
</details>
4444

45-
### ![fr__FR](https://img.shields.io/badge/fr__FR-92.09%25-yellow)
45+
### ![fr__FR](https://img.shields.io/badge/fr__FR-92.06%25-yellow)
4646

4747
<details>
4848
<summary>Missing keys in fr_FR.axaml</summary>
@@ -127,7 +127,7 @@ This document shows the translation status of each locale file in the repository
127127

128128
</details>
129129

130-
### ![id__ID](https://img.shields.io/badge/id__ID-90.03%25-yellow)
130+
### ![id__ID](https://img.shields.io/badge/id__ID-89.90%25-yellow)
131131

132132
<details>
133133
<summary>Missing keys in id_ID.axaml</summary>
@@ -160,6 +160,7 @@ This document shows the translation status of each locale file in the repository
160160
- Text.Configure.Git.ConventionalTypesOverride
161161
- Text.ConfigureCustomActionControls.StringValue.Tip
162162
- Text.ConfirmEmptyCommit.StageSelectedThenCommit
163+
- Text.DealWithLocalChanges.DoNothing
163164
- Text.DropHead
164165
- Text.DropHead.Commit
165166
- Text.DropHead.NewHead
@@ -232,7 +233,7 @@ This document shows the translation status of each locale file in the repository
232233

233234
</details>
234235

235-
### ![it__IT](https://img.shields.io/badge/it__IT-97.64%25-yellow)
236+
### ![it__IT](https://img.shields.io/badge/it__IT-97.63%25-yellow)
236237

237238
<details>
238239
<summary>Missing keys in it_IT.axaml</summary>
@@ -263,7 +264,7 @@ This document shows the translation status of each locale file in the repository
263264

264265
</details>
265266

266-
### ![ja__JP](https://img.shields.io/badge/ja__JP-98.66%25-yellow)
267+
### ![ja__JP](https://img.shields.io/badge/ja__JP-98.56%25-yellow)
267268

268269
<details>
269270
<summary>Missing keys in ja_JP.axaml</summary>
@@ -274,6 +275,7 @@ This document shows the translation status of each locale file in the repository
274275
- Text.CommandPalette.RepositoryActions
275276
- Text.CommandPalette.RevisionFiles
276277
- Text.ConfirmEmptyCommit.StageSelectedThenCommit
278+
- Text.DealWithLocalChanges.DoNothing
277279
- Text.Hotkeys.Repo.CreateBranch
278280
- Text.Init.CommandTip
279281
- Text.Init.ErrorMessageTip
@@ -284,7 +286,7 @@ This document shows the translation status of each locale file in the repository
284286

285287
</details>
286288

287-
### ![ko__KR](https://img.shields.io/badge/ko__KR-90.34%25-yellow)
289+
### ![ko__KR](https://img.shields.io/badge/ko__KR-90.21%25-yellow)
288290

289291
<details>
290292
<summary>Missing keys in ko_KR.axaml</summary>
@@ -315,6 +317,7 @@ This document shows the translation status of each locale file in the repository
315317
- Text.Configure.Git.ConventionalTypesOverride
316318
- Text.ConfigureCustomActionControls.StringValue.Tip
317319
- Text.ConfirmEmptyCommit.StageSelectedThenCommit
320+
- Text.DealWithLocalChanges.DoNothing
318321
- Text.EditBranchDescription
319322
- Text.EditBranchDescription.Target
320323
- Text.FileCM.CustomAction
@@ -386,7 +389,7 @@ This document shows the translation status of each locale file in the repository
386389

387390
</details>
388391

389-
### ![pt__BR](https://img.shields.io/badge/pt__BR-68.35%25-red)
392+
### ![pt__BR](https://img.shields.io/badge/pt__BR-68.25%25-red)
390393

391394
<details>
392395
<summary>Missing keys in pt_BR.axaml</summary>
@@ -704,7 +707,7 @@ This document shows the translation status of each locale file in the repository
704707

705708
### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
706709

707-
### ![ta__IN](https://img.shields.io/badge/ta__IN-70.61%25-red)
710+
### ![ta__IN](https://img.shields.io/badge/ta__IN-70.41%25-red)
708711

709712
<details>
710713
<summary>Missing keys in ta_IN.axaml</summary>
@@ -817,6 +820,7 @@ This document shows the translation status of each locale file in the repository
817820
- Text.ConfirmRestart.Title
818821
- Text.ConfirmRestart.Message
819822
- Text.CreateBranch.OverwriteExisting
823+
- Text.DealWithLocalChanges.DoNothing
820824
- Text.DeinitSubmodule
821825
- Text.DeinitSubmodule.Force
822826
- Text.DeinitSubmodule.Path
@@ -998,7 +1002,7 @@ This document shows the translation status of each locale file in the repository
9981002

9991003
</details>
10001004

1001-
### ![uk__UA](https://img.shields.io/badge/uk__UA-71.43%25-red)
1005+
### ![uk__UA](https://img.shields.io/badge/uk__UA-71.24%25-red)
10021006

10031007
<details>
10041008
<summary>Missing keys in uk_UA.axaml</summary>
@@ -1107,6 +1111,7 @@ This document shows the translation status of each locale file in the repository
11071111
- Text.ConfirmRestart.Title
11081112
- Text.ConfirmRestart.Message
11091113
- Text.CreateBranch.OverwriteExisting
1114+
- Text.DealWithLocalChanges.DoNothing
11101115
- Text.DeinitSubmodule
11111116
- Text.DeinitSubmodule.Force
11121117
- Text.DeinitSubmodule.Path

src/Resources/Locales/de_DE.axaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@
113113
<x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">Commit:</x:String>
114114
<x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Warnung: Durch Auschecken eines Commits wird dein HEAD losgelöst (detached)!</x:String>
115115
<x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Lokale Änderungen:</x:String>
116-
<x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Verwerfen</x:String>
117-
<x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
118116
<x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
119117
<x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">Dein aktueller HEAD enthält Commit(s) ohne Verbindung zu einem Branch / Tag. Möchtest du trotzdem fortfahren?</x:String>
120118
<x:String x:Key="Text.Checkout.WarnUpdatingSubmodules" xml:space="preserve">Die folgenden Submodule müssen aktualisiert werden:{0}Möchtest du sie aktualisieren?</x:String>
@@ -298,8 +296,6 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
298296
<x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basierend auf:</x:String>
299297
<x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Erstellten Branch auschecken</x:String>
300298
<x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Lokale Änderungen:</x:String>
301-
<x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Verwerfen</x:String>
302-
<x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReapply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
303299
<x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Neuer Branch-Name:</x:String>
304300
<x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Einen Branch-Namen eingeben</x:String>
305301
<x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">Lokalen Branch erstellen</x:String>
@@ -683,8 +679,6 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
683679
<x:String x:Key="Text.Pull.Branch" xml:space="preserve">Remote-Branch:</x:String>
684680
<x:String x:Key="Text.Pull.Into" xml:space="preserve">Lokaler Branch:</x:String>
685681
<x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Lokale Änderungen:</x:String>
686-
<x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Verwerfen</x:String>
687-
<x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
688682
<x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remote:</x:String>
689683
<x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; Merge)</x:String>
690684
<x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Rebase anstatt Merge verwenden</x:String>

src/Resources/Locales/es_ES.axaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@
113113
<x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">Commit:</x:String>
114114
<x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Advertencia: Al hacer un checkout de commit, tu Head se separará</x:String>
115115
<x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Cambios Locales:</x:String>
116-
<x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
117-
<x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
118116
<x:String x:Key="Text.Checkout.Target" xml:space="preserve">Rama:</x:String>
119117
<x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">¡Tu HEAD actual contiene commit(s) que no están conectados a ningunas ramas/etiquetas! ¿Quieres continuar?</x:String>
120118
<x:String x:Key="Text.Checkout.WarnUpdatingSubmodules" xml:space="preserve">Los siguientes submódulos necesitan ser actualizados:{0} ¿Quieres actualizarlos?</x:String>
@@ -304,8 +302,6 @@
304302
<x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basado En:</x:String>
305303
<x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checkout de la rama creada</x:String>
306304
<x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Cambios Locales:</x:String>
307-
<x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
308-
<x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReapply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
309305
<x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Nombre de la Nueva Rama:</x:String>
310306
<x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Introduzca el nombre de la rama.</x:String>
311307
<x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">Crear Rama Local</x:String>
@@ -693,8 +689,6 @@
693689
<x:String x:Key="Text.Pull.Branch" xml:space="preserve">Rama Remota:</x:String>
694690
<x:String x:Key="Text.Pull.Into" xml:space="preserve">En:</x:String>
695691
<x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Cambios Locales:</x:String>
696-
<x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
697-
<x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
698692
<x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remoto:</x:String>
699693
<x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; Merge)</x:String>
700694
<x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Usar rebase en lugar de merge</x:String>

src/Resources/Locales/fr_FR.axaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@
104104
<x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">Commit :</x:String>
105105
<x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Avertissement: une récupération vers un commit aboutiera vers un HEAD détaché</x:String>
106106
<x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Changements locaux :</x:String>
107-
<x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Annuler</x:String>
108-
<x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">Mettre en stash et réappliquer</x:String>
109107
<x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branche :</x:String>
110108
<x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">Votre HEAD actuel contient un ou plusieurs commits non connectés à une branche/tag ! Voulez-vous continuer ?</x:String>
111109
<x:String x:Key="Text.Checkout.WithFastForward" xml:space="preserve">Récupérer &amp; Fast-Forward</x:String>
@@ -285,8 +283,6 @@
285283
<x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basé sur :</x:String>
286284
<x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Récupérer la branche créée</x:String>
287285
<x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Changements locaux :</x:String>
288-
<x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Rejeter</x:String>
289-
<x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReapply" xml:space="preserve">Stash &amp; Réappliquer</x:String>
290286
<x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Nom de la nouvelle branche :</x:String>
291287
<x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Entrez le nom de la branche.</x:String>
292288
<x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">Créer une branche locale</x:String>
@@ -636,8 +632,6 @@
636632
<x:String x:Key="Text.Pull.Branch" xml:space="preserve">Branche distante :</x:String>
637633
<x:String x:Key="Text.Pull.Into" xml:space="preserve">Dans :</x:String>
638634
<x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Changements locaux :</x:String>
639-
<x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Rejeter</x:String>
640-
<x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">Stash &amp; Réappliquer</x:String>
641635
<x:String x:Key="Text.Pull.Remote" xml:space="preserve">Dépôt distant :</x:String>
642636
<x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; Merge)</x:String>
643637
<x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Utiliser rebase au lieu de merge</x:String>

src/Resources/Locales/id_ID.axaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@
100100
<x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">Commit:</x:String>
101101
<x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Peringatan: Dengan melakukan checkout commit, Head akan terlepas</x:String>
102102
<x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Perubahan Lokal:</x:String>
103-
<x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Buang</x:String>
104-
<x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">Stash &amp; Terapkan Ulang</x:String>
105103
<x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
106104
<x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">HEAD saat ini mengandung commit yang tidak terhubung ke branch/tag manapun! Lanjutkan?</x:String>
107105
<x:String x:Key="Text.Checkout.WithFastForward" xml:space="preserve">Checkout &amp; Fast-Forward</x:String>
@@ -270,8 +268,6 @@
270268
<x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Berdasarkan:</x:String>
271269
<x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checkout branch yang dibuat</x:String>
272270
<x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Perubahan Lokal:</x:String>
273-
<x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Buang</x:String>
274-
<x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReapply" xml:space="preserve">Stash &amp; Terapkan Ulang</x:String>
275271
<x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Nama Branch Baru:</x:String>
276272
<x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Masukkan nama branch.</x:String>
277273
<x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">Buat Branch Lokal</x:String>
@@ -610,8 +606,6 @@
610606
<x:String x:Key="Text.Pull.Branch" xml:space="preserve">Remote Branch:</x:String>
611607
<x:String x:Key="Text.Pull.Into" xml:space="preserve">Ke:</x:String>
612608
<x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Perubahan Lokal:</x:String>
613-
<x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Buang</x:String>
614-
<x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">Stash &amp; Terapkan Ulang</x:String>
615609
<x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remote:</x:String>
616610
<x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; Merge)</x:String>
617611
<x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Gunakan rebase alih-alih merge</x:String>

src/Resources/Locales/it_IT.axaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@
112112
<x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">Commit:</x:String>
113113
<x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Avviso: Effettuando un checkout del commit, la tua HEAD sarà separata</x:String>
114114
<x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
115-
<x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
116-
<x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">Stasha e Ripristina</x:String>
117115
<x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String>
118116
<x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">Il tuo HEAD attuale contiene commit non connessi ad alcun branch/tag! Sicuro di voler continuare?</x:String>
119117
<x:String x:Key="Text.Checkout.WarnUpdatingSubmodules" xml:space="preserve">I seguenti sottomoduli devono essere aggiornati:{0}Vuoi aggiornarli?</x:String>
@@ -297,8 +295,6 @@ ${pure_files:N} Come ${files:N}, ma senza cartelle</x:String>
297295
<x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basato Su:</x:String>
298296
<x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checkout del Branch Creato</x:String>
299297
<x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
300-
<x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
301-
<x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReapply" xml:space="preserve">Stasha e Ripristina</x:String>
302298
<x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">Nome Nuovo Branch:</x:String>
303299
<x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Inserisci il nome del branch.</x:String>
304300
<x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">Crea Branch Locale</x:String>
@@ -679,8 +675,6 @@ ${pure_files:N} Come ${files:N}, ma senza cartelle</x:String>
679675
<x:String x:Key="Text.Pull.Branch" xml:space="preserve">Branch Remoto:</x:String>
680676
<x:String x:Key="Text.Pull.Into" xml:space="preserve">In:</x:String>
681677
<x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
682-
<x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
683-
<x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">Stasha e Riapplica</x:String>
684678
<x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remoto:</x:String>
685679
<x:String x:Key="Text.Pull.Title" xml:space="preserve">Scarica (Recupera e Unisci)</x:String>
686680
<x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Riallineare anziché unire</x:String>

src/Resources/Locales/ja_JP.axaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@
113113
<x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">コミット:</x:String>
114114
<x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">警告: コミットをチェックアウトすると、HEAD が切断されます</x:String>
115115
<x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">ローカルの変更:</x:String>
116-
<x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">破棄</x:String>
117-
<x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">スタッシュして再適用</x:String>
118116
<x:String x:Key="Text.Checkout.Target" xml:space="preserve">ブランチ:</x:String>
119117
<x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">現在の HEAD には、どのブランチやタグにも繋がっていないコミットが含まれています!それでも続行しますか?</x:String>
120118
<x:String x:Key="Text.Checkout.WarnUpdatingSubmodules" xml:space="preserve">これらのサブモジュールを更新する必要があります:{0}更新しますか?</x:String>
@@ -299,8 +297,6 @@
299297
<x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">派生元:</x:String>
300298
<x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">作成したブランチにチェックアウト</x:String>
301299
<x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">ローカルの変更:</x:String>
302-
<x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">破棄</x:String>
303-
<x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReapply" xml:space="preserve">スタッシュして再適用</x:String>
304300
<x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">新しいブランチ名:</x:String>
305301
<x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">ブランチの名前を入力</x:String>
306302
<x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">ローカルブランチを作成</x:String>
@@ -685,8 +681,6 @@
685681
<x:String x:Key="Text.Pull.Branch" xml:space="preserve">リモートブランチ:</x:String>
686682
<x:String x:Key="Text.Pull.Into" xml:space="preserve">プル先:</x:String>
687683
<x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">ローカルの変更:</x:String>
688-
<x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">破棄</x:String>
689-
<x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">スタッシュして再適用</x:String>
690684
<x:String x:Key="Text.Pull.Remote" xml:space="preserve">リモート:</x:String>
691685
<x:String x:Key="Text.Pull.Title" xml:space="preserve">プル (フェッチ &amp; マージ)</x:String>
692686
<x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">マージではなくリベースを使用</x:String>

0 commit comments

Comments
 (0)