Skip to content

Commit f87fc72

Browse files
love-lingerlove-linger
committed
revert: PR #1177
Signed-off-by: leo <[email protected]>
1 parent 8611370 commit f87fc72

File tree

12 files changed

+12
-12
lines changed

12 files changed

+12
-12
lines changed

‎src/Commands/Diff.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public Diff(string repo, Models.DiffOption opt, int unified, bool ignoreWhitespa
3030
if (ignoreWhitespace)
3131
Args = $"-c core.autocrlf=false diff --no-ext-diff --patch --ignore-cr-at-eol --ignore-all-space --unified={unified} {opt}";
3232
else
33-
Args = $"-c core.autocrlf=false diff --no-ext-diff --patch --unified={unified} {opt}";
33+
Args = $"-c core.autocrlf=false diff --no-ext-diff --patch --ignore-cr-at-eol --unified={unified} {opt}";
3434
}
3535

3636
public Models.DiffResult Result()

‎src/Resources/Locales/de_DE.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
<x:String x:Key="Text.Diff.Binary.Old" xml:space="preserve">ALT</x:String>
237237
<x:String x:Key="Text.Diff.Copy" xml:space="preserve">Kopieren</x:String>
238238
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">Dateimodus geändert</x:String>
239-
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignoriere Leerzeichenänderungen und EOL</x:String>
239+
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignoriere Leerzeichenänderungen</x:String>
240240
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS OBJEKT ÄNDERUNG</x:String>
241241
<x:String x:Key="Text.Diff.Next" xml:space="preserve">Nächste Änderung</x:String>
242242
<x:String x:Key="Text.Diff.NoChange" xml:space="preserve">KEINE ÄNDERUNG ODER NUR ZEILEN-ENDE ÄNDERUNGEN</x:String>

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
<x:String x:Key="Text.Diff.Copy" xml:space="preserve">Copy</x:String>
247247
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">File Mode Changed</x:String>
248248
<x:String x:Key="Text.Diff.First" xml:space="preserve">First Difference</x:String>
249-
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignore Whitespace Change and EOL</x:String>
249+
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignore Whitespace Change</x:String>
250250
<x:String x:Key="Text.Diff.Last" xml:space="preserve">Last Difference</x:String>
251251
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS OBJECT CHANGE</x:String>
252252
<x:String x:Key="Text.Diff.Next" xml:space="preserve">Next Difference</x:String>

‎src/Resources/Locales/es_ES.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
<x:String x:Key="Text.Diff.Copy" xml:space="preserve">Copiar</x:String>
248248
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">Modo de Archivo Cambiado</x:String>
249249
<x:String x:Key="Text.Diff.First" xml:space="preserve">Primera Diferencia</x:String>
250-
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignorar Cambio de Espacios en Blanco y EOL</x:String>
250+
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignorar Cambio de Espacios en Blanco</x:String>
251251
<x:String x:Key="Text.Diff.Last" xml:space="preserve">Última Diferencia</x:String>
252252
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">CAMBIO DE OBJETO LFS</x:String>
253253
<x:String x:Key="Text.Diff.Next" xml:space="preserve">Siguiente Diferencia</x:String>

‎src/Resources/Locales/fr_FR.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
<x:String x:Key="Text.Diff.Copy" xml:space="preserve">Copier</x:String>
242242
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">Mode de fichier changé</x:String>
243243
<x:String x:Key="Text.Diff.First" xml:space="preserve">Première différence</x:String>
244-
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignorer les changements d'espaces et EOL</x:String>
244+
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignorer les changements d'espaces</x:String>
245245
<x:String x:Key="Text.Diff.Last" xml:space="preserve">Dernière différence</x:String>
246246
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">CHANGEMENT D'OBJET LFS</x:String>
247247
<x:String x:Key="Text.Diff.Next" xml:space="preserve">Différence suivante</x:String>

‎src/Resources/Locales/it_IT.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240
<x:String x:Key="Text.Diff.Copy" xml:space="preserve">Copia</x:String>
241241
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">Modalità File Modificata</x:String>
242242
<x:String x:Key="Text.Diff.First" xml:space="preserve">Prima differenza</x:String>
243-
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignora Modifiche agli Spazi e EOL</x:String>
243+
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignora Modifiche agli Spazi</x:String>
244244
<x:String x:Key="Text.Diff.Last" xml:space="preserve">Ultima differenza</x:String>
245245
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">MODIFICA OGGETTO LFS</x:String>
246246
<x:String x:Key="Text.Diff.Next" xml:space="preserve">Differenza Successiva</x:String>

‎src/Resources/Locales/ja_JP.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
<x:String x:Key="Text.Diff.Copy" xml:space="preserve">コピー</x:String>
242242
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">ファイルモードが変更されました</x:String>
243243
<x:String x:Key="Text.Diff.First" xml:space="preserve">先頭の差分</x:String>
244-
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">空白の変更とEOLを無視</x:String>
244+
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">空白の変更を無視</x:String>
245245
<x:String x:Key="Text.Diff.Last" xml:space="preserve">最後の差分</x:String>
246246
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFSオブジェクトの変更</x:String>
247247
<x:String x:Key="Text.Diff.Next" xml:space="preserve">次の差分</x:String>

‎src/Resources/Locales/pt_BR.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
<x:String x:Key="Text.Diff.Binary.Old" xml:space="preserve">ANTIGO</x:String>
218218
<x:String x:Key="Text.Diff.Copy" xml:space="preserve">Copiar</x:String>
219219
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">Modo de Arquivo Alterado</x:String>
220-
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignorar mudanças de espaço em branco e EOL</x:String>
220+
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignorar mudanças de espaço em branco</x:String>
221221
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">MUDANÇA DE OBJETO LFS</x:String>
222222
<x:String x:Key="Text.Diff.Next" xml:space="preserve">Próxima Diferença</x:String>
223223
<x:String x:Key="Text.Diff.NoChange" xml:space="preserve">SEM MUDANÇAS OU APENAS MUDANÇAS DE EOL</x:String>

‎src/Resources/Locales/ru_RU.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
<x:String x:Key="Text.Diff.Copy" xml:space="preserve">Копировать</x:String>
247247
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">Режим файла изменён</x:String>
248248
<x:String x:Key="Text.Diff.First" xml:space="preserve">Первое различие</x:String>
249-
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Игнорировать изменение пробелов и EOL</x:String>
249+
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Игнорировать изменение пробелов</x:String>
250250
<x:String x:Key="Text.Diff.Last" xml:space="preserve">Последнее различие</x:String>
251251
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">ИЗМЕНЕНИЕ ОБЪЕКТА LFS</x:String>
252252
<x:String x:Key="Text.Diff.Next" xml:space="preserve">Следующее различие</x:String>

‎src/Resources/Locales/ta_IN.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
<x:String x:Key="Text.Diff.Copy" xml:space="preserve">நகல்</x:String>
242242
<x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">கோப்பு முறை மாற்றப்பட்டது</x:String>
243243
<x:String x:Key="Text.Diff.First" xml:space="preserve">முதல் வேறுபாடு</x:String>
244-
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">வெள்ளைவெளி மாற்றத்தை மற்றும் EOL புறக்கணி</x:String>
244+
<x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">வெள்ளைவெளி மாற்றத்தை புறக்கணி</x:String>
245245
<x:String x:Key="Text.Diff.Last" xml:space="preserve">கடைசி வேறுபாடு</x:String>
246246
<x:String x:Key="Text.Diff.LFS" xml:space="preserve">பெகோஅ பொருள் மாற்றம்</x:String>
247247
<x:String x:Key="Text.Diff.Next" xml:space="preserve">அடுத்த வேறுபாடு</x:String>

0 commit comments

Comments
 (0)