https://git.reactos.org/?p=reactos.git;a=commitdiff;h=20b915dab33f16895981e…
commit 20b915dab33f16895981e0214b48ca2be8b05866
Author: Robert Naumann <gonzomdx(a)gmail.com>
AuthorDate: Sat Oct 8 13:19:06 2022 +0200
Commit: GitHub <noreply(a)github.com>
CommitDate: Sat Oct 8 13:19:06 2022 +0200
[FC] Add German translation (#4760)
---
base/applications/cmdutils/fc/lang/de-DE.rc | 66 ++++++++++++++---------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/base/applications/cmdutils/fc/lang/de-DE.rc b/base/applications/cmdutils/fc/lang/de-DE.rc
index 58d6cbedd9a..fe6efaa79d9 100644
--- a/base/applications/cmdutils/fc/lang/de-DE.rc
+++ b/base/applications/cmdutils/fc/lang/de-DE.rc
@@ -2,40 +2,40 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
BEGIN
- IDS_USAGE "Compares two files or sets of files and displays the differences between\n\
-them\n\
+ IDS_USAGE "Vergleicht zwei Dateien oder Gruppen von Dateien und zeigt die\n\
+Unterschiede zwischen ihnen an.\n\
\n\
FC [/A] [/C] [/L] [/LBn] [/N] [/OFF[LINE]] [/T] [/U] [/W] [/nnnn]\n\
- [drive1:][path1]filename1 [drive2:][path2]filename2\n\
-FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\
+ [Laufwerk1:][Pfad1]Dateiname1 [Laufwerk2:][Pfad2]Dateiname2\n\
+FC /B [Laufwerk1:][Pfad1]Dateiname1 [Laufwerk2:][Pfad2]Dateiname2\n\
\n\
- /A Displays only first and last lines for each set of differences.\n\
- /B Performs a binary comparison.\n\
- /C Disregards the case of letters.\n\
- /L Compares files as ASCII text.\n\
- /LBn Sets the maximum consecutive mismatches to the specified\n\
- number of lines (default: 100).\n\
- /N Displays the line numbers on an ASCII comparison.\n\
- /OFF[LINE] Doesn't skip files with offline attribute set.\n\
- /T Doesn't expand tabs to spaces (default: expand).\n\
- /U Compare files as UNICODE text files.\n\
- /W Compresses white space (tabs and spaces) for comparison.\n\
- /nnnn Specifies the number of consecutive lines that must match\n\
- after a mismatch (default: 2).\n\
- [drive1:][path1]filename1\n\
- Specifies the first file or set of files to compare.\n\
- [drive2:][path2]filename2\n\
- Specifies the second file or set of files to compare.\n"
- IDS_NO_DIFFERENCE "FC: no differences encountered\n"
- IDS_LONGER_THAN "FC: %ls longer than %ls\n"
- IDS_COMPARING "Comparing files %ls and %ls\n"
- IDS_OUT_OF_MEMORY "FC: Out of memory\n"
- IDS_CANNOT_READ "FC: cannot read from %ls\n"
- IDS_INVALID_SWITCH "FC: Invalid Switch\n"
- IDS_CANNOT_OPEN "FC: cannot open %ls - No such file or folder\n"
- IDS_NEEDS_FILES "FC: Insufficient number of file specifications\n"
- IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n"
- IDS_DIFFERENT "FC: File %ls and %ls are different\n"
- IDS_TOO_LARGE "FC: File %ls too large\n"
- IDS_RESYNC_FAILED "Resync failed. Files are too different.\n"
+ /A Zeigt nur die erste und letzte Zeile für jeden Satz von Unterschieden an.\n\
+ /B Führt einen binären Vergleich durch.\n\
+ /C Groß- und Kleinschreibung wird nicht berücksichtigt.\n\
+ /L Vergleicht Dateien als ASCII-Text.\n\
+ /LBn Setzt die maximale Anzahl aufeinanderfolgender Abweichungen auf die\n\
+ angegebene Anzahl von Zeilen (Standard: 100).\n\
+ /N Zeigt die Zeilennummern im ASCII-Vergleich an.\n\
+ /OFF[LINE] Überspringt keine Dateien mit gesetztem Offline-Attribut.\n\
+ /T Erweitert Tabulatoren nicht zu Leerzeichen (Standard: erweitern).\n\
+ /U Dateien als UNICODE-Textdateien vergleichen.\n\
+ /W Komprimiert Tabulatoren und Leerzeichen beim Vergleich.\n\
+ /nnnn Gibt die Anzahl der aufeinanderfolgenden Zeilen an, die nach einem\n\
+ Unterschied übereinstimmen müssen (Standard: 2).\n\
+ [Laufwerk1:][Pfad1]Dateiname1\n\
+ Gibt die erste zu vergleichende Datei oder Gruppe von Dateien an.\n\
+ [Laufwerk2:][Pfad2]Dateiname2\n\
+ Gibt die zweite zu vergleichende Datei oder Gruppe von Dateien an.\n"
+ IDS_NO_DIFFERENCE "FC: keine Unterschiede festgestellt.\n"
+ IDS_LONGER_THAN "FC: %ls ist länger als %ls.\n"
+ IDS_COMPARING "Vergleiche Dateien %ls und %ls.\n"
+ IDS_OUT_OF_MEMORY "FC: Nicht genügend Speicherplatz.\n"
+ IDS_CANNOT_READ "FC: Lesen von %ls nicht möglich.\n"
+ IDS_INVALID_SWITCH "FC: Unzulässige Option.\n"
+ IDS_CANNOT_OPEN "FC: Öffnen von %ls nicht möglich - Datei oder Ordner nicht vorhanden.\n"
+ IDS_NEEDS_FILES "FC: Unzureichende Anzahl von Dateiangaben.\n"
+ IDS_CANT_USE_WILDCARD "Wildcards ('*' und '?') werden noch nicht unterstützt.\n"
+ IDS_DIFFERENT "FC: Die Dateien %ls und %ls sind unterschiedlich.\n"
+ IDS_TOO_LARGE "FC: Die Datei %ls ist zu groß.\n"
+ IDS_RESYNC_FAILED "Resync fehlgeschlagen. Die Dateien sind zu unterschiedlich.\n"
END
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19ab5fa3106a635a6cf2e…
commit 19ab5fa3106a635a6cf2e34db11b77af0bf2e59c
Author: Robert Naumann <gonzomdx(a)gmail.com>
AuthorDate: Sat Oct 8 13:18:18 2022 +0200
Commit: GitHub <noreply(a)github.com>
CommitDate: Sat Oct 8 13:18:18 2022 +0200
[GIT] Add .DS_Store files to .gitignore (#4762)
When working on macOS, the system creates a .DS_Store file in every accessed directory. They are marked as new files
in git, which is very annoying. This change will exclude these files.
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 9c45ec7853d..f14e4ccbe72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ modules/3rdparty
modules/[Aa][Hh][Kk]_[Tt]ests
.cache
.cproject
+.DS_Store
.project
.settings
.vscode
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d70791660539d69ec216e…
commit d70791660539d69ec216e70ac66c0b762ecf30b8
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Sat Oct 8 08:22:24 2022 +0900
Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
CommitDate: Sat Oct 8 08:22:24 2022 +0900
[USETUP][VGAFONTS] Improve Japanese character display
- Modify media/vgafonts/932-8x8.bin Japanese VGA font.
- Use special codepoints of new font 932-8x8.bin.
Appendum of #4750. Line connection bug still remains.
CORE-5052
---
base/setup/usetup/mui.c | 6 +-----
media/vgafonts/932-8x8.bin | Bin 2048 -> 2048 bytes
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/base/setup/usetup/mui.c b/base/setup/usetup/mui.c
index 9360cbf5554..7fab3ab131b 100644
--- a/base/setup/usetup/mui.c
+++ b/base/setup/usetup/mui.c
@@ -560,6 +560,7 @@ SetConsoleCodePage(VOID)
switch (wCodePage)
{
case 28606: /* Romanian */
+ case 932: /* Japanese */
/* Set special characters */
CharBullet = 0x07;
CharBlock = 0x01;
@@ -584,11 +585,6 @@ SetConsoleCodePage(VOID)
/* FIXME: Enter 640x400 video mode */
break;
- case 932: /* Japanese */
- /* FIXME: Set special characters */
- /* FIXME: Enter 640x400 video mode */
- break;
-
default: /* Other codepages */
/* Set special characters */
CharBullet = 0x07;
diff --git a/media/vgafonts/932-8x8.bin b/media/vgafonts/932-8x8.bin
index 18128a728a7..6d47b288c90 100644
Binary files a/media/vgafonts/932-8x8.bin and b/media/vgafonts/932-8x8.bin differ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0753202cf1098abfdfab2…
commit 0753202cf1098abfdfab2fcca9c20717559d72d6
Author: Mas Ahmad Muhammad <m.charly81(a)gmail.com>
AuthorDate: Fri Oct 7 02:44:46 2022 +0700
Commit: GitHub <noreply(a)github.com>
CommitDate: Thu Oct 6 22:44:46 2022 +0300
[TRANSLATION] Update Indonesian (id-ID) translation (#4585)
- [WRITE] Add Indonesian (id-ID) translation
- [WINLOGON] Update Indonesian (id-ID) translation
---
base/applications/write/lang/Id.rc | 28 ++++++++++++++++++++++++++++
base/applications/write/rsrc.rc | 3 +++
base/system/winlogon/lang/id-ID.rc | 4 ++--
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/base/applications/write/lang/Id.rc b/base/applications/write/lang/Id.rc
new file mode 100644
index 00000000000..a915e65ecb2
--- /dev/null
+++ b/base/applications/write/lang/Id.rc
@@ -0,0 +1,28 @@
+/*
+ * Indonesian language support
+ *
+ * Copyright (C) 2022 Mas Ahmad Muhammad
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "resources.h"
+
+LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+ IDS_FAILED, "Gagal memulai Wordpad"
+}
diff --git a/base/applications/write/rsrc.rc b/base/applications/write/rsrc.rc
index c5f4fd92c9c..744f1517e1e 100644
--- a/base/applications/write/rsrc.rc
+++ b/base/applications/write/rsrc.rc
@@ -48,6 +48,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#ifdef LANGUAGE_HE_IL
#include "lang/He.rc"
#endif
+#ifdef LANGUAGE_ID_ID
+ #include "lang/Id.rc"
+#endif
#ifdef LANGUAGE_IT_IT
#include "lang/It.rc"
#endif
diff --git a/base/system/winlogon/lang/id-ID.rc b/base/system/winlogon/lang/id-ID.rc
index cc3c2f744bf..8c5662b843a 100644
--- a/base/system/winlogon/lang/id-ID.rc
+++ b/base/system/winlogon/lang/id-ID.rc
@@ -46,8 +46,8 @@ BEGIN
IDS_RUNNINGLOGONSCRIPTS "Menjalankan naskah logon..."
IDS_LOADINGYOURPERSONALSETTINGS "Mengambil setelan personal anda..."
IDS_CLOSINGNETWORKCONNECTIONS "Menutup koneksi jaringan..."
- IDS_REACTOSISRESTARTING "Restarting..."
- IDS_REACTOSISSHUTTINGDOWN "Shutting down..."
+ IDS_REACTOSISRESTARTING "Memulai ulang..."
+ IDS_REACTOSISSHUTTINGDOWN "Mematikan..."
IDS_PREPARETOSTANDBY "Menyiapkan untuk Standby..."
IDS_PREPARETOHIBERNATE "Menyiapkan untuk Tidur..."
IDS_SAVEYOURSETTINGS "Menyimpan setelan anda..."