diff --git a/base/shell/cmd/date.c b/base/shell/cmd/date.c index c562638fc87..185e5fdee1f 100644 --- a/base/shell/cmd/date.c +++ b/base/shell/cmd/date.c @@ -203,9 +203,11 @@ INT cmd_date(LPTSTR param) nDateString = i; } - // TODO: Should prepend a "Current date is: " prompt, as done with TIME. if (nDateString == -1) + { + ConOutResPuts(STRING_DATE_NOW); ConOutPrintf(_T("%s\n"), GetDateString()); + } if (!bPrompt) { diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index fd9ca4fad6d..c9f7bd2994c 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -249,6 +249,7 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "Current time is: " STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc index 8161adc2e4e..333a11a9681 100644 --- a/base/shell/cmd/lang/de-DE.rc +++ b/base/shell/cmd/lang/de-DE.rc @@ -243,6 +243,7 @@ Variable1==Variable2\n\ EXIST Dateiname Bedingung ist erfüllt, wenn die angegebene Datei existiert.\n\ DEFINED Variable Bedingung ist erfüllt, wenn die angegebene Datei definiert\n\ wurde." + STRING_DATE_NOW "Aktuelles Datum: " STRING_TIME_NOW "Aktuelle Zeit: " STRING_MKDIR_HELP "Erzeugt ein Verzeichnis.\n\n\ MKDIR [Laufwerk:]Pfad\nMD [Laufwerk:]Pfad" diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc index 0ca39f952eb..52837f1fb7c 100644 --- a/base/shell/cmd/lang/el-GR.rc +++ b/base/shell/cmd/lang/el-GR.rc @@ -248,6 +248,7 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "Current time is: " STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc index 7da733078e6..dee65da16f2 100644 --- a/base/shell/cmd/lang/en-US.rc +++ b/base/shell/cmd/lang/en-US.rc @@ -244,6 +244,7 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "Current time is: " STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc index 1fef20801ec..95546b78c6e 100644 --- a/base/shell/cmd/lang/es-ES.rc +++ b/base/shell/cmd/lang/es-ES.rc @@ -247,6 +247,7 @@ comando Especifica el comando a ejecutar si se cumple la condición.\n string1==string2 Especifica una condición verdadera si las cadenas de texto coinciden.\n\ EXIST archivo Especifica una condición verdadera si existe el archivo especificado.\n\ DEFINED variable Especifica una condición verdadera si la variable está definida.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "La hora actual es: " STRING_MKDIR_HELP "Crea un directorio.\n\n\ MKDIR [unidad:]ruta\nMD [unidad:]ruta" diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc index 7e2998698a9..bca7a0889be 100644 --- a/base/shell/cmd/lang/fr-FR.rc +++ b/base/shell/cmd/lang/fr-FR.rc @@ -258,6 +258,7 @@ commande Indique la commande à lancer si la condition est vérifiée.\ chaine1==chaine2 La condition sera vraie si les deux chaines sont identiques.\n\ EXIST nomfichier La condition sera vraie si le fichier spécifié existe.\n\ DEFINED variable La condition sera vraie si la variable indiquée est définie." + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "L'heure actuelle est : " STRING_MKDIR_HELP "Crée un répertoire.\n\n\ MKDIR [lecteur:]chemin\nMD [lecteur:]chemin" diff --git a/base/shell/cmd/lang/hu-HU.rc b/base/shell/cmd/lang/hu-HU.rc index 8d54454e382..c8190db99e8 100644 --- a/base/shell/cmd/lang/hu-HU.rc +++ b/base/shell/cmd/lang/hu-HU.rc @@ -239,6 +239,7 @@ parancs Ezt a parancsot hajtsa végre, ha igaz a feltétel.\n\ string1==string2 Igaz a feltétel, ha a megadott sztringek egyenlőek.\n\ EXIST fájlnév Igaz a feltétel, ha a megadott fájl létezik.\n\ DEFINED változó Igaz a feltétel, ha a megadott változó definiálva van.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "Az aktuális idő: " STRING_MKDIR_HELP "Létrehoz egy új mappát.\n\n\ MKDIR [meghajtó:]útvonal\nMD [meghajtó:]útvonal" diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index a9cad666cef..5a40d420875 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -245,6 +245,7 @@ string1==string2 Menetapkan kondisi benar jika string teks yang ditetapkan\n\ sama.\n\ EXIST filename Menetapkan kondisi benar jika nama file ada.\n\ DEFINED variable Menetapkan kondisi benar jika variabel didefinisikan.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "Waktu saat ini: " STRING_MKDIR_HELP "Membuat direktori.\n\n\ MKDIR [drive:]path\nMD [drive:]path" diff --git a/base/shell/cmd/lang/it-IT.rc b/base/shell/cmd/lang/it-IT.rc index deb3fc9fe10..b77f99cedcc 100644 --- a/base/shell/cmd/lang/it-IT.rc +++ b/base/shell/cmd/lang/it-IT.rc @@ -245,6 +245,7 @@ command E' il comando da eseguire se la condizione è verificata.\n\ string1==string2 E' verificata se sono uguali le due stringhe\n\ EXIST nomefile E' verificata se il file esiste.\n\ DEFINED variabile E' verificata se la variabile è definita.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "L'ora attuale è: " STRING_MKDIR_HELP "Crea una cartella.\n\n\ MKDIR [disco:]percorso\nMD [disco:]percorso" diff --git a/base/shell/cmd/lang/ja-JP.rc b/base/shell/cmd/lang/ja-JP.rc index b203c2a1f2e..5f49fca4930 100644 --- a/base/shell/cmd/lang/ja-JP.rc +++ b/base/shell/cmd/lang/ja-JP.rc @@ -251,6 +251,7 @@ EXIST ファイル名 指定したファイル名が存在するときに条件 指定します。\n\ DEFINED 変数 指定した変数が定義されているときに条件が真になるように\n\ 指定します。\n" + STRING_DATE_NOW "現在の日付は: " STRING_TIME_NOW "現在時刻は: " STRING_MKDIR_HELP "ディレクトリを作成します。\n\n\ MKDIR [ドライブ:]パス\n\ diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc index 69a7581c032..902fee5a81e 100644 --- a/base/shell/cmd/lang/no-NO.rc +++ b/base/shell/cmd/lang/no-NO.rc @@ -243,6 +243,7 @@ streng1==streng2 Angir et oppfylt vilkår hvis tekststrengene er like\n\ EXIST filnavn Angir et oppfylt vilkår hvis spesifisert filnavn eksisterer.\n\ DEFINED variabel Angir et oppfylt vilkår hvis spesifisert variabel er\n\ definert.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "Gjeldende tid er: " STRING_MKDIR_HELP "Oppretter en mappe.\n\n\ MKDIR [stasjon:]mappe\nMD [stasjon:]mappe" diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index 43889947464..a3d79d450d0 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -251,6 +251,7 @@ komenda Komenda do wykonania, gdy warunek będzie spełniony.\n\ ciąg1==ciąg2 Zwraca PRAWDA, gdy oba ciągi znaków są identyczne\n\ EXIST plik Zwraca PRAWDA, jeśli podany plik istnieje.\n\ DEFINED zmienna Zwraca PRAWDA, jeśli podana zmienna została zdefiniowana\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "Czas bieżący: " STRING_MKDIR_HELP "Tworzy katalog.\n\n\ MKDIR [napęd:]ścieżka\nMD [napęd:]ścieżka" diff --git a/base/shell/cmd/lang/pt-BR.rc b/base/shell/cmd/lang/pt-BR.rc index a53e3132da6..4b26977b826 100644 --- a/base/shell/cmd/lang/pt-BR.rc +++ b/base/shell/cmd/lang/pt-BR.rc @@ -267,6 +267,7 @@ EXIST arquivo Especifica uma condição verdadeira se o nome do arquivo\n\ especificado existir.\n\ DEFINED variável Especifica uma condição verdadeira se a variável especificada\n\ for definida.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "A hora atual é: " STRING_MKDIR_HELP "Cria um diretório.\n\n\ MKDIR [unidade:] caminho\nMD [unidade:] caminho" diff --git a/base/shell/cmd/lang/pt-PT.rc b/base/shell/cmd/lang/pt-PT.rc index 25a2fca6639..9540563f8fb 100644 --- a/base/shell/cmd/lang/pt-PT.rc +++ b/base/shell/cmd/lang/pt-PT.rc @@ -260,6 +260,7 @@ EXIST ficheiro Especifica uma condição verdadeira se o nome do ficheiro\n\ especificado existir.\n\ DEFINED variável Especifica uma condição verdadeira se a variável especificada\n\ for definida.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "A hora actual é: " STRING_MKDIR_HELP "Cria um directório.\n\n\ MKDIR [unidade:] caminho\nMD [unidade:] caminho" diff --git a/base/shell/cmd/lang/ro-RO.rc b/base/shell/cmd/lang/ro-RO.rc index 3587bc741cf..1ae279476a6 100644 --- a/base/shell/cmd/lang/ro-RO.rc +++ b/base/shell/cmd/lang/ro-RO.rc @@ -280,6 +280,7 @@ O etichetă va fi definită pe un rând întreg, începând cu două puncte (:). fișierului specificat.\n\ DEFINED variablă Determină o condiție satisfăcută dacă «variabilă»\n\ a fost anterior definită.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "Ora curentă este: " STRING_MKDIR_HELP "Crează un director.\n\n\ MD [disc:]cale\nMKDIR [disc:]cale\n" diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc index ff81a58e475..363a472eadc 100644 --- a/base/shell/cmd/lang/ru-RU.rc +++ b/base/shell/cmd/lang/ru-RU.rc @@ -257,6 +257,7 @@ GOTO метка\n\n\ За этой командой может следовать ключевое слово ELSE,\n\ служащее для указания команды, которая должна\n\ выполняться в том случае, если условие ложно.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "Текущее время: " STRING_MKDIR_HELP "Создание каталога.\n\n\ MKDIR [диск:]путь\nMD [диск:]путь" diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index 0a6a4b61a7c..05dfe693e76 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -250,6 +250,7 @@ string1==string2 Specifies a true condition if the specified text strings\n\ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "Aktuálny čas je: " STRING_MKDIR_HELP "Creates a directory.\n\n\ MKDIR [drive:]path\nMD [drive:]path" diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc index f6429eb9fa9..01c7c37c8c9 100644 --- a/base/shell/cmd/lang/sq-AL.rc +++ b/base/shell/cmd/lang/sq-AL.rc @@ -248,6 +248,7 @@ string1==string2 Përcakton një kusht të vërtetë nëse vargjet e specifikua EXIST filename Përcakton një kusht të vërtetë, nëse ekziston dokumenti i specifikuar.\n\ DEFINED variable Përcakton një kusht të vërtetë nëse variabli është specifikuar\n\ dhe karakterizuar.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "Koha e tanishme është: " STRING_MKDIR_HELP "Krijon një skedë.\n\n\ MKDIR [drive:]rrugë\nMD [drive:]rrugë" diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc index 1a29a9ba2ce..92c4a6d2d0c 100644 --- a/base/shell/cmd/lang/sv-SE.rc +++ b/base/shell/cmd/lang/sv-SE.rc @@ -243,6 +243,7 @@ sträng1==sträng2 Anger ett uppfyllt villkor om textsträngarna är lika\n\ EXIST filnamn Anger ett uppfyllt villkor om angivet filnamn existerar.\n\ DEFINED variabel Anger ett uppfyllt villkor om angiven variabel är\n\ definerad.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "Aktuell tid är: " STRING_MKDIR_HELP "Skapar en mapp.\n\n\ MKDIR [enhet:]mapp\nMD [enhet:]mapp" diff --git a/base/shell/cmd/lang/tr-TR.rc b/base/shell/cmd/lang/tr-TR.rc index 4808f8e98d3..106e8ee13b0 100644 --- a/base/shell/cmd/lang/tr-TR.rc +++ b/base/shell/cmd/lang/tr-TR.rc @@ -244,6 +244,7 @@ command Koşul karşılanırsa yürütülecek komutu belirtir.\n\ dizi1==dizi2 Belirtilen metin dizeleri eşleşirse doğru bir koşul belirtir\n\ EXIST dosya_adi Belirtilen dosya adı mevcutsa doğru bir koşul belirtir.\n\ DEFINED variable Belirtilen değişken tanımlanmışsa doğru bir koşul belirtir\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "Şimdiki zaman: " STRING_MKDIR_HELP "Bir dizin oluşturur.\n\n\ MKDIR [sürücü:]yol\nMD [sürücü:]yol" diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc index 091d6640c8e..deb3304bd1d 100644 --- a/base/shell/cmd/lang/uk-UA.rc +++ b/base/shell/cmd/lang/uk-UA.rc @@ -255,6 +255,7 @@ ERRORLEVEL число Ця умова є iстинною, якщо код, що EXIST iм'я_файлу Умова є iстинною, якщо файл з вказаним iменем iснує.\n\ DEFINED змiнна Ця умова є iстинною, якщо вказана змiнна\n\ задана.\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "Поточний час: " STRING_MKDIR_HELP "Створення каталогу.\n\n\ MKDIR [диск:]шлях\nMD [диск:]шлях" diff --git a/base/shell/cmd/lang/zh-CN.rc b/base/shell/cmd/lang/zh-CN.rc index d37fef06eb2..5cf10e5fe99 100644 --- a/base/shell/cmd/lang/zh-CN.rc +++ b/base/shell/cmd/lang/zh-CN.rc @@ -237,6 +237,7 @@ ERRORLEVEL 数字 当上一个程序返回一个大于或等于指定数字 字符串1==字符串2 当所指定的字符串相匹配时为真。\n\ EXIST 文件名 当指定的文件名存在时为真。\n\ DEFINED 变量 当指定的变量已被定义时为真。\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "当前时间是: " STRING_MKDIR_HELP "创建一个目录。\n\n\ MKDIR [驱动器:]路径\nMD [驱动器:]路径" diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc index 3da18fa1449..23b2f62c87c 100644 --- a/base/shell/cmd/lang/zh-TW.rc +++ b/base/shell/cmd/lang/zh-TW.rc @@ -237,6 +237,7 @@ ERRORLEVEL 數字 當上一個程式返回一個大於或等於指定數字 字元串1==字元串2 當所指定的字元串相匹配時為 TRUE。\n\ EXIST 檔案名稱 當指定的檔案名稱存在時為 TRUE。\n\ DEFINED 變數 當指定的變數已被定義時為 TRUE。\n" + STRING_DATE_NOW "The current date is: " STRING_TIME_NOW "目前的時間是: " STRING_MKDIR_HELP "建立一個目錄。\n\n\ MKDIR [磁碟機:]路徑\nMD [磁碟機:]路徑" diff --git a/base/shell/cmd/resource.h b/base/shell/cmd/resource.h index 934109b51b9..21330391a7c 100644 --- a/base/shell/cmd/resource.h +++ b/base/shell/cmd/resource.h @@ -128,6 +128,7 @@ #define STRING_GOTO_HELP1 659 +#define STRING_DATE_NOW 665 #define STRING_TIME_NOW 666 #define STRING_MKDIR_HELP 667