https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8f7d4c56dcc872a5efcd…
commit b8f7d4c56dcc872a5efcd9517f32bd2dde58a056
Author: Kyle Katarn <contact(a)kcsoftwares.com>
AuthorDate: Wed May 20 15:45:47 2020 +0200
Commit: GitHub <noreply(a)github.com>
CommitDate: Wed May 20 15:45:47 2020 +0200
[TIMEDATE] French translation (#2811)
---
dll/cpl/timedate/lang/fr-FR.rc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dll/cpl/timedate/lang/fr-FR.rc b/dll/cpl/timedate/lang/fr-FR.rc
index 6cc76bcabcd..595e05158e0 100644
--- a/dll/cpl/timedate/lang/fr-FR.rc
+++ b/dll/cpl/timedate/lang/fr-FR.rc
@@ -54,6 +54,6 @@ BEGIN
IDS_INETTIMENEXTSYNC "Prochaine synchronisation: %s à %s"
IDS_INETTIMESYNCING "Veuillez patienter pendant que ReactOS synchronise l'heure avec %s"
IDS_INETTIMEERROR "Une erreur a eu lieu pendant que ReactOS synchronisait avec %s"
- IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time"
- IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time"
+ IDS_INETTIMESUCFILL "Veuillez saisir un nom de serveur NTP pour synchroniser le temps"
+ IDS_INETTIMEWELCOME "Sélectionnez un serveur NTP dans la liste ou saisissez un nom de serveur NTP pour synchroniser le temps de l'ordinateur"
END
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce543fbb72f2c4d9c4da4…
commit ce543fbb72f2c4d9c4da4fe71c4cf0cf9c7882dd
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun May 17 20:13:32 2020 +0200
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Mon May 18 02:21:57 2020 +0200
[CMD] Fix the stop-batch prompt appearance: do not display it more than once in a row.
---
base/shell/cmd/misc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/base/shell/cmd/misc.c b/base/shell/cmd/misc.c
index bcefe215002..8d5239949b6 100644
--- a/base/shell/cmd/misc.c
+++ b/base/shell/cmd/misc.c
@@ -151,10 +151,9 @@ BOOL CheckCtrlBreak(INT mode)
LoadString(CMD_ModuleHandle, STRING_COPY_OPTION, options, ARRAYSIZE(options));
- /* we need to be sure the string arrives on the screen! */
+ ConOutResPuts(STRING_CANCEL_BATCH_FILE);
do
{
- ConOutResPuts(STRING_CANCEL_BATCH_FILE);
c = _totupper(cgetchar());
} while (!(_tcschr(options, c) || c == _T('\3')) || !c);