From 8fbd67bc4a1edf0cdf23721aa66ec13d506d9db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Mon, 10 Oct 2016 19:11:15 +0000 Subject: [PATCH] [CMD] - Fix typo in STRING_MEMMORY_xxx symbols (memmory -> memory); - Remove the trailing newline for the STRING_MISC_HELP1 page prompt, as part of reworking it a bit (see next commit); - Code formatting in type.c as I'll touch it after. svn path=/trunk/; revision=72954 --- reactos/base/shell/cmd/lang/cs-CZ.rc | 6 +++--- reactos/base/shell/cmd/lang/de-DE.rc | 6 +++--- reactos/base/shell/cmd/lang/el-GR.rc | 6 +++--- reactos/base/shell/cmd/lang/en-US.rc | 6 +++--- reactos/base/shell/cmd/lang/es-ES.rc | 6 +++--- reactos/base/shell/cmd/lang/fr-FR.rc | 6 +++--- reactos/base/shell/cmd/lang/hu-HU.rc | 6 +++--- reactos/base/shell/cmd/lang/id-ID.rc | 6 +++--- reactos/base/shell/cmd/lang/it-IT.rc | 6 +++--- reactos/base/shell/cmd/lang/ja-JP.rc | 6 +++--- reactos/base/shell/cmd/lang/no-NO.rc | 6 +++--- reactos/base/shell/cmd/lang/pl-PL.rc | 6 +++--- reactos/base/shell/cmd/lang/ro-RO.rc | 6 +++--- reactos/base/shell/cmd/lang/ru-RU.rc | 6 +++--- reactos/base/shell/cmd/lang/sk-SK.rc | 6 +++--- reactos/base/shell/cmd/lang/sq-AL.rc | 6 +++--- reactos/base/shell/cmd/lang/sv-SE.rc | 6 +++--- reactos/base/shell/cmd/lang/tr-TR.rc | 6 +++--- reactos/base/shell/cmd/lang/uk-UA.rc | 6 +++--- reactos/base/shell/cmd/lang/zh-CN.rc | 6 +++--- reactos/base/shell/cmd/lang/zh-TW.rc | 6 +++--- reactos/base/shell/cmd/memory.c | 4 ++-- reactos/base/shell/cmd/resource.h | 4 ++-- reactos/base/shell/cmd/type.c | 24 ++++++++++++------------ 24 files changed, 79 insertions(+), 79 deletions(-) diff --git a/reactos/base/shell/cmd/lang/cs-CZ.rc b/reactos/base/shell/cmd/lang/cs-CZ.rc index 1527d655db7..c166ef6e303 100644 --- a/reactos/base/shell/cmd/lang/cs-CZ.rc +++ b/reactos/base/shell/cmd/lang/cs-CZ.rc @@ -259,15 +259,15 @@ MKLINK [/D | /H | /J] linkname target\n\n\ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% memory load.\n\n\ + STRING_MEMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% memory load.\n\n\ %13s bytes total physical RAM.\n\ %13s bytes available physical RAM.\n\n\ %13s bytes total page file.\n\ %13s bytes available page file.\n\n\ %13s bytes total virtual memory.\n\ %13s bytes available virtual memory.\n" - STRING_MISC_HELP1 "Press a key to continue...\n" + STRING_MISC_HELP1 "Press a key to continue..." STRING_MOVE_HELP1 "Overwrite %s (Yes/No/All)? " STRING_MOVE_HELP2 "Moves files and renames files and directories.\n\n\ To move one or more files:\n\ diff --git a/reactos/base/shell/cmd/lang/de-DE.rc b/reactos/base/shell/cmd/lang/de-DE.rc index 80e6498395b..fa9128b81a8 100644 --- a/reactos/base/shell/cmd/lang/de-DE.rc +++ b/reactos/base/shell/cmd/lang/de-DE.rc @@ -253,15 +253,15 @@ MKLINK [/D | /H | /J] Linkname Ziel\n\n\ /H Erzeugt einen Hardlink.\n\ /J Erzeugt einen Junction Point.\n\n\ Wenn weder /H noch /J angegeben werden, wird eine symbolische Verknüpfung angelegt." - STRING_MEMMORY_HELP1 "Zeigt die Größe des Systemspeicher an.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% Speicher geladen.\n\n\ + STRING_MEMORY_HELP1 "Zeigt die Größe des Systemspeicher an.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% Speicher geladen.\n\n\ %13s Bytes RAM (insgesamt)\n\ %13s Bytes verfügbarer RAM\n\n\ %13s Bytes Auslagerungsdatei (insgesamt)\n\ %13s Bytes verfügbare Auslagerungsdatei\n\n\ %13s Bytes Virtueller Speicher (insgesamt)\n\ %13s Bytes verfügbarer virtueller Speicher\n" - STRING_MISC_HELP1 "Drücken Sie eine beliebige Taste . . .\n" + STRING_MISC_HELP1 "Drücken Sie eine beliebige Taste . . ." STRING_MOVE_HELP1 "Überschreiben %s (Ja/Nein/Alle)? " STRING_MOVE_HELP2 "Verschiebt Dateien und benennt Dateien sowie Verzeichnisse um.\n\n\ Um eine oder mehrere Dateien zu verschieben:\n\ diff --git a/reactos/base/shell/cmd/lang/el-GR.rc b/reactos/base/shell/cmd/lang/el-GR.rc index a57eabb8987..87b853415ba 100644 --- a/reactos/base/shell/cmd/lang/el-GR.rc +++ b/reactos/base/shell/cmd/lang/el-GR.rc @@ -258,15 +258,15 @@ MKLINK [/D | /H | /J] linkname target\n\n\ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% memory load.\n\n\ + STRING_MEMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% memory load.\n\n\ %13s bytes total physical RAM.\n\ %13s bytes available physical RAM.\n\n\ %13s bytes total page file.\n\ %13s bytes available page file.\n\n\ %13s bytes total virtual memory.\n\ %13s bytes available virtual memory.\n" - STRING_MISC_HELP1 "Press a key to continue...\n" + STRING_MISC_HELP1 "Press a key to continue..." STRING_MOVE_HELP1 "Overwrite %s (Yes/No/All)? " STRING_MOVE_HELP2 "Moves files and renames files and directories.\n\n\ To move one or more files:\n\ diff --git a/reactos/base/shell/cmd/lang/en-US.rc b/reactos/base/shell/cmd/lang/en-US.rc index 79caba957c7..532fe6c37a0 100644 --- a/reactos/base/shell/cmd/lang/en-US.rc +++ b/reactos/base/shell/cmd/lang/en-US.rc @@ -254,15 +254,15 @@ MKLINK [/D | /H | /J] linkname target\n\n\ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% memory load.\n\n\ + STRING_MEMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% memory load.\n\n\ %13s bytes total physical RAM.\n\ %13s bytes available physical RAM.\n\n\ %13s bytes total page file.\n\ %13s bytes available page file.\n\n\ %13s bytes total virtual memory.\n\ %13s bytes available virtual memory.\n" - STRING_MISC_HELP1 "Press a key to continue...\n" + STRING_MISC_HELP1 "Press a key to continue..." STRING_MOVE_HELP1 "Overwrite %s (Yes/No/All)? " STRING_MOVE_HELP2 "Moves files and renames files and directories.\n\n\ To move one or more files:\n\ diff --git a/reactos/base/shell/cmd/lang/es-ES.rc b/reactos/base/shell/cmd/lang/es-ES.rc index 08cada4c80b..b30760c74a8 100644 --- a/reactos/base/shell/cmd/lang/es-ES.rc +++ b/reactos/base/shell/cmd/lang/es-ES.rc @@ -254,15 +254,15 @@ MKLINK [/D | /H | /J] linkname target\n\n\ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Muestra la cantidad de memoria del sistema.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% carga de memoria.\n\n\ + STRING_MEMORY_HELP1 "Muestra la cantidad de memoria del sistema.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% carga de memoria.\n\n\ %13s bytes totales de RAM física.\n\ %13s bytes libres de RAM física.\n\n\ %13s bytes totales del archivo de paginación.\n\ %13s bytes disponibles del archivo de paginación.\n\n\ %13s bytes totales de memoria virtual.\n\ %13s bytes disponibles de memoria virtual.\n" - STRING_MISC_HELP1 "Pulsa cualquier tecla para continuar...\n" + STRING_MISC_HELP1 "Pulsa cualquier tecla para continuar..." STRING_MOVE_HELP1 "¿Sobreescribir %s (Si/No/Todos)? " STRING_MOVE_HELP2 "Mueve archivos y renombra archivos y directorios.\n\n\ Para mover uno o más archivos:\n\ diff --git a/reactos/base/shell/cmd/lang/fr-FR.rc b/reactos/base/shell/cmd/lang/fr-FR.rc index 900ab928368..2932f6cbfe5 100644 --- a/reactos/base/shell/cmd/lang/fr-FR.rc +++ b/reactos/base/shell/cmd/lang/fr-FR.rc @@ -266,15 +266,15 @@ MKLINK [/D | /H | /J] linkname target\n\n\ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Affiche la quantité de mémoire système.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% de charge mémoire.\n\n\ + STRING_MEMORY_HELP1 "Affiche la quantité de mémoire système.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% de charge mémoire.\n\n\ %13s octets de RAM physique au total.\n\ %13s octets de RAM physique disponible.\n\n\ %13s octets de fichier d'échange au total.\n\ %13s octets de fichier d'échange disponible.\n\n\ %13s octets de mémoire virtuelle au total.\n\ %13s octets de mémoire virtuelle disponible.\n" - STRING_MISC_HELP1 "Appuyer sur une touche pour continuer...\n" + STRING_MISC_HELP1 "Appuyer sur une touche pour continuer..." STRING_MOVE_HELP1 "Ecraser %s (Oui/Non/Tous) ? " STRING_MOVE_HELP2 "Déplace des fichiers ou renomme des fichiers et des répertoires.\n\n\ Pouur déplacer un ou plusieurs fichiers:\n\ diff --git a/reactos/base/shell/cmd/lang/hu-HU.rc b/reactos/base/shell/cmd/lang/hu-HU.rc index 8aeae5f56ca..34b532551ea 100644 --- a/reactos/base/shell/cmd/lang/hu-HU.rc +++ b/reactos/base/shell/cmd/lang/hu-HU.rc @@ -241,15 +241,15 @@ MKLINK [/D | /H | /J] linkname target\n\n\ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Megjeleníti a memória statisztikát.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n A memória %12s%%-a foglalt.\n\n\ + STRING_MEMORY_HELP1 "Megjeleníti a memória statisztikát.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n A memória %12s%%-a foglalt.\n\n\ %13s bájtnyi teljes fizikai memória.\n\ %13s bájtnyi elérhetõ memória.\n\n\ %13s bájt a lapozóállomány.\n\ %13s bájtnyi elérhetõ a lapozóállományban.\n\n\ %13s bájt a teljes virtuális memória.\n\ %13s bájtnyi elérhetõ a virtuális memóriából.\n" - STRING_MISC_HELP1 "A folytatáshoz nyomj meg egy billentyût . . .\n" + STRING_MISC_HELP1 "A folytatáshoz nyomj meg egy billentyût . . ." STRING_MOVE_HELP1 "Felülírja %s (Igen/Nem/Mind)? " STRING_MOVE_HELP2 "Áthelyezi és átnevezi az állományokat a mappákban.\n\n\ Egy vagy több állomány áthelyezéséhez:\n\ diff --git a/reactos/base/shell/cmd/lang/id-ID.rc b/reactos/base/shell/cmd/lang/id-ID.rc index b6d78a5fa63..08915c69aed 100644 --- a/reactos/base/shell/cmd/lang/id-ID.rc +++ b/reactos/base/shell/cmd/lang/id-ID.rc @@ -255,15 +255,15 @@ MKLINK [/D | /H | /J] linkname target\n\n\ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Menampilkan jumlah memori sistem.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% beban memori.\n\n\ + STRING_MEMORY_HELP1 "Menampilkan jumlah memori sistem.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% beban memori.\n\n\ %13s byte total fisik RAM.\n\ %13s byte fisik RAM tersedia.\n\n\ %13s byte total file page.\n\ %13s byte file page tersedia.\n\n\ %13s byte total memori virtual.\n\ %13s byte memori virtual tersedia.\n" - STRING_MISC_HELP1 "Tekan tombol untuk melanjutkan...\n" + STRING_MISC_HELP1 "Tekan tombol untuk melanjutkan..." STRING_MOVE_HELP1 "Timpa %s (Ya/Tidak/Semua)? " STRING_MOVE_HELP2 "Memindahkan file dan mengganti nama file dan direktori.\n\n\ Untuk memindahkan satu atau lebih file:\n\ diff --git a/reactos/base/shell/cmd/lang/it-IT.rc b/reactos/base/shell/cmd/lang/it-IT.rc index 8b28dca7f65..cdf98bbc7fe 100644 --- a/reactos/base/shell/cmd/lang/it-IT.rc +++ b/reactos/base/shell/cmd/lang/it-IT.rc @@ -256,16 +256,16 @@ MKLINK [/D | /H | /J] nomelink target\n\n\ /H Crea un hard link.\n\ /J Crea una directory junction.\n\n\ Se non sono specificati ne /H ne /J verrà creato un link simbolico." - STRING_MEMMORY_HELP1 "Visualizza la quantità della memoria di sistema.\n\n\ + STRING_MEMORY_HELP1 "Visualizza la quantità della memoria di sistema.\n\n\ MEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% carico di memoria.\n\n\ + STRING_MEMORY_HELP2 "\n %12s%% carico di memoria.\n\n\ %13s byte RAM fisica totale.\n\ %13s byte RAM fisica disponibile.\n\n\ %13s byte file di paginazione totale.\n\ %13s byte file di paginazione disponibile.\n\n\ %13s byte memoria virtuale totale.\n\ %13s byte memoria virtuale totale disponibile.\n" - STRING_MISC_HELP1 "Premi un tasto per continuare...\n" + STRING_MISC_HELP1 "Premi un tasto per continuare..." STRING_MOVE_HELP1 "Sovrascrivi %s (Si/No/Tutti)? " STRING_MOVE_HELP2 "Sposta i file o cambia il nome a file e cartelle.\n\n\ Per spostare uno o più file:\n\ diff --git a/reactos/base/shell/cmd/lang/ja-JP.rc b/reactos/base/shell/cmd/lang/ja-JP.rc index 97f916e77b8..5d6afc13406 100644 --- a/reactos/base/shell/cmd/lang/ja-JP.rc +++ b/reactos/base/shell/cmd/lang/ja-JP.rc @@ -262,15 +262,15 @@ MKLINK [/D | /H | /J] linkname target\n\n\ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "システム メモリの量を表示します。\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% のメモリが使用されています。\n\n\ + STRING_MEMORY_HELP1 "システム メモリの量を表示します。\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% のメモリが使用されています。\n\n\ %13s バイト: 全物理メモリ\n\ %13s バイト: 利用可能な物理メモリ\n\n\ %13s バイト: 全ページファイル\n\ %13s バイト: 利用可能なページファイル\n\n\ %13s バイト: 全仮想メモリ\n\ %13s バイト: 利用可能な仮想メモリ\n" - STRING_MISC_HELP1 "続行するには何かキーを押してください ...\n" + STRING_MISC_HELP1 "続行するには何かキーを押してください ..." STRING_MOVE_HELP1 "%s を上書きしますがよろしいですか (Yes/No/All)? " STRING_MOVE_HELP2 "ファイルを移動およびファイルとディレクトリ名を変更します。\n\n\ 1 つまたは複数のファイルを移動するには:\n\ diff --git a/reactos/base/shell/cmd/lang/no-NO.rc b/reactos/base/shell/cmd/lang/no-NO.rc index 0b2c569e3f1..b9fd40b0e74 100644 --- a/reactos/base/shell/cmd/lang/no-NO.rc +++ b/reactos/base/shell/cmd/lang/no-NO.rc @@ -253,15 +253,15 @@ MKLINK [/D | /H | /J] linkname target\n\n\ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Vis mengde av system minne.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% benyttet minne.\n\n\ + STRING_MEMORY_HELP1 "Vis mengde av system minne.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% benyttet minne.\n\n\ %13s byte totalt fysisk RAM.\n\ %13s byte tilgjengelig fysisk RAM.\n\n\ %13s byte total sidevekslingsfil.\n\ %13s byte tilgjengelig sidevekslingsfil.\n\n\ %13s byte totalt virtuell minne.\n\ %13s byte tilgjengelig virtuell minne.\n" - STRING_MISC_HELP1 "Trykk en tast for å fortsette...\n" + STRING_MISC_HELP1 "Trykk en tast for å fortsette..." STRING_MOVE_HELP1 "Overskrive %s (Ja/Nei/Alle)? " STRING_MOVE_HELP2 "Flytt filer, og gi nytt navn på filer og mapper.\n\n\ For å flytte en eller flere filer:\n\ diff --git a/reactos/base/shell/cmd/lang/pl-PL.rc b/reactos/base/shell/cmd/lang/pl-PL.rc index 5834272d703..84bdb60cd65 100644 --- a/reactos/base/shell/cmd/lang/pl-PL.rc +++ b/reactos/base/shell/cmd/lang/pl-PL.rc @@ -260,15 +260,15 @@ MKLINK [/D | /H | /J] nazwa_linku element_docelowy\n\n\ /H Tworzy dowiązanie twarde.\n\ /J Tworzy punkt połączenia katalogów.\n\n\ Jeśli nie zostały użyte zarówno /H jak i /J, zostanie utworzone dowiązanie symboliczne." - STRING_MEMMORY_HELP1 "Wyświetla ilość pamięci systemowej.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% pamięci zajętej.\n\n\ + STRING_MEMORY_HELP1 "Wyświetla ilość pamięci systemowej.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% pamięci zajętej.\n\n\ %13s bajtów pamięci RAM ogółem.\n\ %13s bajtów pamięci RAM dostępne.\n\n\ %13s bajtów w pliku stronicowania ogółem.\n\ %13s bajtów dostępnych w pliku stronicowania.\n\n\ %13s bajtów pamięci wirtualnej ogółem.\n\ %13s bajtów pamięci wirtualnej dostępne.\n" - STRING_MISC_HELP1 "Naciśnij dowolny klawisz, aby kontynuować...\n" + STRING_MISC_HELP1 "Naciśnij dowolny klawisz, aby kontynuować..." STRING_MOVE_HELP1 "Nadpisać %s (Tak/Nie/Zawsze)? " STRING_MOVE_HELP2 "Przenosi, a także zmienia nazwy plików i katalogów.\n\n\ Aby przenieść jeden lub więcej plików:\n\ diff --git a/reactos/base/shell/cmd/lang/ro-RO.rc b/reactos/base/shell/cmd/lang/ro-RO.rc index 723eec214cc..1143642c731 100644 --- a/reactos/base/shell/cmd/lang/ro-RO.rc +++ b/reactos/base/shell/cmd/lang/ro-RO.rc @@ -287,15 +287,15 @@ MKLINK [/D | /H | /J] ținta numelui legăturii\n\n\ /J Crează o joncțiune de director.\n\n\ Dacă nu sunt specificate nici /H și nici /J ca argumente, va fi creată o\n\ legătură simbolică." - STRING_MEMMORY_HELP1 "Afișează cantitatea de memorie a sistemului.\n\nMEMORY\n" - STRING_MEMMORY_HELP2 "\n %12s%% nivel de uzilizare.\n\n\ + STRING_MEMORY_HELP1 "Afișează cantitatea de memorie a sistemului.\n\nMEMORY\n" + STRING_MEMORY_HELP2 "\n %12s%% nivel de uzilizare.\n\n\ %13s octeți în total în memoria fizică (RAM).\n\ %13s octeți disponibili în memorie fizică (RAM).\n\n\ %13s octeți în total în fișierul de paginare.\n\ %13s octeți disponibili în fișierul de paginare.\n\n\ %13s octeți în total în memoria virtuală.\n\ %13s octeți disponibili în memoria virtuală.\n" - STRING_MISC_HELP1 "Tastați pentru a continua...\n" + STRING_MISC_HELP1 "Tastați pentru a continua..." STRING_MOVE_HELP1 "Suprascrieți «%s»? (Da|Nu|Toate)" STRING_MOVE_HELP2 "Mută sau redenumește fișiere și directoare.\n\n\ Pentru a muta unul sau mai multe fișiere:\n\ diff --git a/reactos/base/shell/cmd/lang/ru-RU.rc b/reactos/base/shell/cmd/lang/ru-RU.rc index 6618304a157..ab6a3f13ed3 100644 --- a/reactos/base/shell/cmd/lang/ru-RU.rc +++ b/reactos/base/shell/cmd/lang/ru-RU.rc @@ -263,15 +263,15 @@ MKLINK [[/D] | [/H] | [/J]] ссылка назначение\n\n\ назначение Путь (относительный или абсолютный), на который ссылается\n\ новая ссылка.\n\n\ Если не указаны /H и /J, то будет создана символическая ссылка." - STRING_MEMMORY_HELP1 "Вывод объема системной памяти.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% загружено памяти.\n\n\ + STRING_MEMORY_HELP1 "Вывод объема системной памяти.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% загружено памяти.\n\n\ %13s байт всего физической памяти.\n\ %13s байт доступно физической памяти.\n\n\ %13s байт всего в файле подкачки.\n\ %13s байт доступно в файле подкачки.\n\n\ %13s байт всего виртуальной памяти.\n\ %13s байт доступно виртуально памяти.\n" - STRING_MISC_HELP1 "Нажмите клавишу для продолжения...\n" + STRING_MISC_HELP1 "Нажмите клавишу для продолжения..." STRING_MOVE_HELP1 "Перезаписать %s (Yes/No/All)? " STRING_MOVE_HELP2 "Перемещение файлов и переименование файлов и каталогов.\n\n\ Перемещение одного или более файлов:\n\ diff --git a/reactos/base/shell/cmd/lang/sk-SK.rc b/reactos/base/shell/cmd/lang/sk-SK.rc index a5fc2724846..cf2c678e164 100644 --- a/reactos/base/shell/cmd/lang/sk-SK.rc +++ b/reactos/base/shell/cmd/lang/sk-SK.rc @@ -260,15 +260,15 @@ MKLINK [/D | /H | /J] linkname target\n\n\ /H Create a hard link.\n\ /J Create a directory junction.\n\n\ If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% memory load.\n\n\ + STRING_MEMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% memory load.\n\n\ %13s bytes total physical RAM.\n\ %13s bytes available physical RAM.\n\n\ %13s bytes total page file.\n\ %13s bytes available page file.\n\n\ %13s bytes total virtual memory.\n\ %13s bytes available virtual memory.\n" - STRING_MISC_HELP1 "Press a key to continue...\n" + STRING_MISC_HELP1 "Press a key to continue..." STRING_MOVE_HELP1 "Overwrite %s (Yes/No/All)? " STRING_MOVE_HELP2 "Moves files and renames files and directories.\n\n\ To move one or more files:\n\ diff --git a/reactos/base/shell/cmd/lang/sq-AL.rc b/reactos/base/shell/cmd/lang/sq-AL.rc index 74514a559d9..68639b747b0 100644 --- a/reactos/base/shell/cmd/lang/sq-AL.rc +++ b/reactos/base/shell/cmd/lang/sq-AL.rc @@ -258,15 +258,15 @@ MKLINK [/D | /H | /J] objektivi i lidhjes së emrit\n\n\ /H Krijon një lidhjë të fortë.\n\ /J Krijo një kryqëzim në skedë.\n\n\ Nëse anjëra nga /H ose /J nuk speficikohet, një lidhje simboli do të krijohet." - STRING_MEMMORY_HELP1 "Paraqet sasinë e memories së sistemit.\n\nMEMORIA" - STRING_MEMMORY_HELP2 "\n %12s%% ngarkimi i memories.\n\n\ + STRING_MEMORY_HELP1 "Paraqet sasinë e memories së sistemit.\n\nMEMORIA" + STRING_MEMORY_HELP2 "\n %12s%% ngarkimi i memories.\n\n\ %13s bytes totali i RAM'it fizik.\n\ %13s bytes RAM'i fizik ne dispozicion.\n\n\ %13s bytes totali i faqeve i dokumentave.\n\ %13s bytes dokumentat dhe faqet ne dispozicion.\n\n\ %13s bytes memoria totale virtuale.\n\ %13s bytes memoria virtuale ne dispozicion.\n" - STRING_MISC_HELP1 "Shtypni një buton për të vazhduar...\n" + STRING_MISC_HELP1 "Shtypni një buton për të vazhduar..." STRING_MOVE_HELP1 "Mbishkruaj %s (Po/Jo/Të Gjith)? " STRING_MOVE_HELP2 "Lëviz dokumentet dhe emero ato dhe skedat.\n\n\ Për të lëvizur një ose më shumë dokumenta:\n\ diff --git a/reactos/base/shell/cmd/lang/sv-SE.rc b/reactos/base/shell/cmd/lang/sv-SE.rc index 4f475795268..ceea4a8a39d 100644 --- a/reactos/base/shell/cmd/lang/sv-SE.rc +++ b/reactos/base/shell/cmd/lang/sv-SE.rc @@ -253,15 +253,15 @@ MKLINK [/D | /H | /J] linknamn mål\n\n\ /H Skapar en hårdlänk i stället för en symbolisk länk.\n\ /J Skapar en knutpunkt för en mapp sk. junction.\n\n\ Om varken /H eller /J är angivna kommer en symbolisk länk att skapas." - STRING_MEMMORY_HELP1 "Visar mängd systemminne.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% använt minne.\n\n\ + STRING_MEMORY_HELP1 "Visar mängd systemminne.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% använt minne.\n\n\ %13s byte totalt fysisk RAM-minne.\n\ %13s byte tillgängligt fysisk RAM-minne.\n\n\ %13s byte total sidväxlingsfil.\n\ %13s byte tillgänglig sidväxlingsfil.\n\n\ %13s byte totalt virtuell minne.\n\ %13s byte tilgängeligt virtuellt minne.\n" - STRING_MISC_HELP1 "Tryck en knapp för att fortsätta...\n" + STRING_MISC_HELP1 "Tryck en knapp för att fortsätta..." STRING_MOVE_HELP1 "Skriv över %s (Ja/Nej/Alla)? " STRING_MOVE_HELP2 "Flyttar filer, och byter namn på filer och mappar.\n\n\ för att flytte en eller flera filer:\n\ diff --git a/reactos/base/shell/cmd/lang/tr-TR.rc b/reactos/base/shell/cmd/lang/tr-TR.rc index 7c71bfcb612..cd98194b9a6 100644 --- a/reactos/base/shell/cmd/lang/tr-TR.rc +++ b/reactos/base/shell/cmd/lang/tr-TR.rc @@ -261,15 +261,15 @@ MKLINK [/D | /H | /J] bağlantı adı varış\n\n\ /H Bir değişmez bağlantı oluştur.\n\ /J Bir dizin bağlantısı oluştur.\n\n\ /H ve /J belirtilmemişse bir simgelik bağlantı oluşmuştur." - STRING_MEMMORY_HELP1 "Dizge belleğinin niceliğini görüntüler.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n Bellek %%%12s yüklü.\n\n\ + STRING_MEMORY_HELP1 "Dizge belleğinin niceliğini görüntüler.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n Bellek %%%12s yüklü.\n\n\ %13s çoklu tüm fizîkî RAM.\n\ %13s çoklu kullanılabilir fizîkî RAM.\n\n\ %13s çoklu tüm sayfalama kütüğü.\n\ %13s çoklu kullanılabilir sayfalama kütüğü.\n\n\ %13s çoklu tüm farazî bellek.\n\ %13s çoklu kullanılabilir farazî bellek.\n" - STRING_MISC_HELP1 "Sürdürmek için bir düğmeye basınız...\n" + STRING_MISC_HELP1 "Sürdürmek için bir düğmeye basınız..." STRING_MOVE_HELP1 "Üzerine yaz: %s (Evet/Hayır/Tümü)? " STRING_MOVE_HELP2 "Kütükleri taşır ve kütükleri ve dizinleri yeniden adlandırır.\n\n\ Bir ya da daha çok kütüğü taşımak için:\n\ diff --git a/reactos/base/shell/cmd/lang/uk-UA.rc b/reactos/base/shell/cmd/lang/uk-UA.rc index cf86bb4f052..3fe137fda94 100644 --- a/reactos/base/shell/cmd/lang/uk-UA.rc +++ b/reactos/base/shell/cmd/lang/uk-UA.rc @@ -265,15 +265,15 @@ MKLINK [/D | /H | /J] назва_посилання цiль\n\n\ /H Створення жорсткого посилання.\n\ /J Створення з'єднання директорiй.\n\n\ Якщо не вказано нi /H нi /J , створюється символiчне посилання." - STRING_MEMMORY_HELP1 "Вiдображення об'єму системної пам'ятi.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% пам'ятi використовується.\n\n\ + STRING_MEMORY_HELP1 "Вiдображення об'єму системної пам'ятi.\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% пам'ятi використовується.\n\n\ %13s байт всього фiзичної RAM.\n\ %13s байт доступно фiзичної RAM.\n\n\ %13s байт всього в файлi довантаження.\n\ %13s байт доступно в файлi довантаження.\n\n\ %13s байт всього вiртуальної пам'ятi.\n\ %13s байт доступно вiртуальної пам'ятi.\n" - STRING_MISC_HELP1 "Натиснiть клавiшу для продовження...\n" + STRING_MISC_HELP1 "Натиснiть клавiшу для продовження..." STRING_MOVE_HELP1 "Переписати %s (Yes/No/All)? " STRING_MOVE_HELP2 "Перемiщення файлiв i перейменування файлiв i каталогiв.\n\n\ Перемiщення одного та бiльше файлiв:\n\ diff --git a/reactos/base/shell/cmd/lang/zh-CN.rc b/reactos/base/shell/cmd/lang/zh-CN.rc index 07239470e9a..9c229ebc576 100644 --- a/reactos/base/shell/cmd/lang/zh-CN.rc +++ b/reactos/base/shell/cmd/lang/zh-CN.rc @@ -239,15 +239,15 @@ MKLINK [/D | /H | /J] 链接名 目标\n\n\ /H 创建一个硬链接。\n\ /J 创建一个目录连接点。\n\n\ 如果 /H 或 /J 均未被指定，一个符号链接将被创建。" - STRING_MEMMORY_HELP1 "显示系统内存容量。\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% 内存已安装。\n\n\ + STRING_MEMORY_HELP1 "显示系统内存容量。\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% 内存已安装。\n\n\ %13s 字节 总物理内存。\n\ %13s 字节 可用物理内存。\n\n\ %13s 字节 总页面文件大小。\n\ %13s 字节 可用页面文件。\n\n\ %13s 字节 总虚拟内存。\n\ %13s 字节 可用虚拟内存。\n" - STRING_MISC_HELP1 "按任意键继续...\n" + STRING_MISC_HELP1 "按任意键继续..." STRING_MOVE_HELP1 "覆盖 %s 吗 (Yes/No/All)？" STRING_MOVE_HELP2 "移动文件并重命名文件和目录。\n\n\ 移动一个或多个文件：\n\ diff --git a/reactos/base/shell/cmd/lang/zh-TW.rc b/reactos/base/shell/cmd/lang/zh-TW.rc index e1aa897ff2b..1ba87cdddd7 100644 --- a/reactos/base/shell/cmd/lang/zh-TW.rc +++ b/reactos/base/shell/cmd/lang/zh-TW.rc @@ -239,15 +239,15 @@ MKLINK [/D | /H | /J] 連結名 目標\n\n\ /H 創建一個硬連結。\n\ /J 創建一個目錄連線點。\n\n\ 如果 /H 或 /J 均未被指定，一個符號連結將被創建。" - STRING_MEMMORY_HELP1 "顯示系統內存容量。\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% 內存已安裝。\n\n\ + STRING_MEMORY_HELP1 "顯示系統內存容量。\n\nMEMORY" + STRING_MEMORY_HELP2 "\n %12s%% 內存已安裝。\n\n\ %13s 位元組 總物理內存。\n\ %13s 位元組 可用物理內存。\n\n\ %13s 位元組 總頁面檔案大小。\n\ %13s 位元組 可用頁面檔案。\n\n\ %13s 位元組 總虛擬內存。\n\ %13s 位元組 可用虛擬內存。\n" - STRING_MISC_HELP1 "按任意鍵繼續...\n" + STRING_MISC_HELP1 "按任意鍵繼續..." STRING_MOVE_HELP1 "覆蓋 %s 嗎 (Yes/No/All)？" STRING_MOVE_HELP2 "移動檔案並重新命名檔案和目錄。\n\n\ 移動一個或多個檔案：\n\ diff --git a/reactos/base/shell/cmd/memory.c b/reactos/base/shell/cmd/memory.c index fc1b7a3921a..9280999d640 100644 --- a/reactos/base/shell/cmd/memory.c +++ b/reactos/base/shell/cmd/memory.c @@ -29,7 +29,7 @@ INT CommandMemory (LPTSTR param) if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPaging(TRUE,STRING_MEMMORY_HELP1); + ConOutResPaging(TRUE,STRING_MEMORY_HELP1); return 0; } @@ -62,7 +62,7 @@ INT CommandMemory (LPTSTR param) ConvertULargeInteger(msex.ullTotalVirtual, szTotalVirtual, 40, TRUE); ConvertULargeInteger(msex.ullAvailVirtual, szAvailVirtual, 40, TRUE); - ConOutResPrintf(STRING_MEMMORY_HELP2, + ConOutResPrintf(STRING_MEMORY_HELP2, szMemoryLoad, szTotalPhys, szAvailPhys, szTotalPageFile, szAvailPageFile, szTotalVirtual, szAvailVirtual); diff --git a/reactos/base/shell/cmd/resource.h b/reactos/base/shell/cmd/resource.h index 2040a33cc97..cf8579f65f9 100644 --- a/reactos/base/shell/cmd/resource.h +++ b/reactos/base/shell/cmd/resource.h @@ -147,8 +147,8 @@ #define STRING_MKDIR_HELP 667 -#define STRING_MEMMORY_HELP1 668 -#define STRING_MEMMORY_HELP2 669 +#define STRING_MEMORY_HELP1 668 +#define STRING_MEMORY_HELP2 669 #define STRING_MISC_HELP1 670 diff --git a/reactos/base/shell/cmd/type.c b/reactos/base/shell/cmd/type.c index 6b26eb54bd3..536578d31ae 100644 --- a/reactos/base/shell/cmd/type.c +++ b/reactos/base/shell/cmd/type.c @@ -31,7 +31,7 @@ #ifdef INCLUDE_CMD_TYPE -INT cmd_type (LPTSTR param) +INT cmd_type(LPTSTR param) { TCHAR buff[256]; HANDLE hFile, hConsoleOut; @@ -42,9 +42,9 @@ INT cmd_type (LPTSTR param) BOOL bPaging = FALSE; BOOL bFirstTime = TRUE; - hConsoleOut=GetStdHandle (STD_OUTPUT_HANDLE); + hConsoleOut = GetStdHandle(STD_OUTPUT_HANDLE); - if (!_tcsncmp (param, _T("/?"), 2)) + if (!_tcsncmp(param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_TYPE_HELP1); return 0; @@ -52,13 +52,13 @@ INT cmd_type (LPTSTR param) if (!*param) { - error_req_param_missing (); + error_req_param_missing(); return 1; } - argv = split (param, &argc, TRUE, FALSE); + argv = split(param, &argc, TRUE, FALSE); - for(i = 0; i < argc; i++) + for (i = 0; i < argc; i++) { if(*argv[i] == _T('/') && _tcslen(argv[i]) >= 2 && _totupper(argv[i][1]) == _T('P')) { @@ -77,12 +77,12 @@ INT cmd_type (LPTSTR param) nErrorLevel = 0; hFile = CreateFile(argv[i], - GENERIC_READ, - FILE_SHARE_READ,NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL,NULL); + GENERIC_READ, + FILE_SHARE_READ, NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); - if(hFile == INVALID_HANDLE_VALUE) + if (hFile == INVALID_HANDLE_VALUE) { FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS | @@ -101,7 +101,7 @@ INT cmd_type (LPTSTR param) if (bPaging) { - while (FileGetString (hFile, buff, sizeof(buff) / sizeof(TCHAR))) + while (FileGetString(hFile, buff, ARRAYSIZE(buff))) { if (ConOutPrintfPaging(bFirstTime, _T("%s"), buff) == 1) {