https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e627c3b00e7109b5110b9…
commit e627c3b00e7109b5110b94fb8253859a29f35d42
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Fri Nov 3 22:56:58 2023 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Fri Nov 3 22:56:58 2023 +0900
[W32TIME] Remember date/time sync settings (#5866)
Based on KRosUser's patch.
- In the W32TmServiceMain function, the
time check loop does check the registry value.
CORE-19292
---
base/services/w32time/w32time.c | 63 +++++++++++++++++++++++++----------------
1 file changed, 39 insertions(+), 24 deletions(-)
diff --git a/base/services/w32time/w32time.c b/base/services/w32time/w32time.c
index 69c6bd15abe..0d5508a7b2c 100644
--- a/base/services/w32time/w32time.c
+++ b/base/services/w32time/w32time.c
@@ -230,8 +230,6 @@ ControlHandler(DWORD request)
default:
break;
}
-
- return;
}
@@ -239,8 +237,12 @@ VOID
WINAPI
W32TmServiceMain(DWORD argc, LPWSTR *argv)
{
- int result;
+ LONG error;
DWORD dwInterval;
+ HKEY hKey;
+ WCHAR szData[8];
+ DWORD cbData;
+ BOOL bNoSync;
UNREFERENCED_PARAMETER(argc);
UNREFERENCED_PARAMETER(argv);
@@ -279,29 +281,44 @@ W32TmServiceMain(DWORD argc, LPWSTR *argv)
ServiceStatus.dwCurrentState = SERVICE_RUNNING;
SetServiceStatus(hStatus, &ServiceStatus);
- /* The worker loop of a service */
+ /* The service's worker loop */
for (;;)
{
- result = SetTime();
-
- if (result)
- DPRINT("W32Time Service failed to set clock.\n");
- else
- DPRINT("W32Time Service successfully set clock.\n");
+ /* The default is NoSync */
+ bNoSync = TRUE;
+
+ /* TODO: Use RegNotifyChangeKeyValue() when implemented */
+ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+ L"SYSTEM\\CurrentControlSet\\Services\\W32Time\\Parameters",
+ 0,
+ KEY_QUERY_VALUE,
+ &hKey) == ERROR_SUCCESS)
+ {
+ cbData = sizeof(szData);
+ RegQueryValueExW(hKey, L"Type", NULL, NULL, (LPBYTE)szData, &cbData);
+ szData[ARRAYSIZE(szData) - 1] = UNICODE_NULL; /* Avoid buffer overrun */
+ bNoSync = (_wcsicmp(szData, L"NoSync") == 0);
+ RegCloseKey(hKey);
+ }
- if (result)
+ if (!bNoSync)
{
- /* In general we do not want to stop this service for a single
- * Internet read failure but there may be other reasons for which
- * we really might want to stop it.
- * Therefore this code is left here to make it easy to stop this
- * service when the correct conditions can be determined, but it
- * is left commented out.
- ServiceStatus.dwCurrentState = SERVICE_STOPPED;
- ServiceStatus.dwWin32ExitCode = result;
- SetServiceStatus(hStatus, &ServiceStatus);
- return;
- */
+ error = SetTime();
+ if (error != ERROR_SUCCESS)
+ {
+ DPRINT("W32Time Service failed to set clock: 0x%08lX\n", error);
+#if 0
+ /*
+ * In general, we do not want to stop this service for a single
+ * Internet read failure but there may be other reasons for which
+ * we really might want to stop it. Therefore this code is left here.
+ */
+ ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+ ServiceStatus.dwWin32ExitCode = error;
+ SetServiceStatus(hStatus, &ServiceStatus);
+ return;
+#endif
+ }
}
if (WaitForSingleObject(hStopEvent, dwInterval * 1000) == WAIT_OBJECT_0)
@@ -317,11 +334,9 @@ W32TmServiceMain(DWORD argc, LPWSTR *argv)
return;
}
}
- return;
}
-
BOOL WINAPI
DllMain(HINSTANCE hinstDLL,
DWORD fdwReason,
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32b883ef2f7ddc64db9e4…
commit 32b883ef2f7ddc64db9e4b72d30048ca375198ce
Author: Joachim Henze <Joachim.Henze(a)reactos.org>
AuthorDate: Fri Nov 3 02:13:37 2023 +0100
Commit: Joachim Henze <Joachim.Henze(a)reactos.org>
CommitDate: Fri Nov 3 02:19:34 2023 +0100
[NOTEPAD] de-DE.rc: Fix CMD_HELP_ABOUT_NOTEPAD, all rc: strip bloat-spaces before \n and ?
---
base/applications/notepad/lang/bg-BG.rc | 2 +-
base/applications/notepad/lang/cs-CZ.rc | 8 ++++----
base/applications/notepad/lang/da-DK.rc | 4 ++--
base/applications/notepad/lang/de-DE.rc | 17 ++++++++---------
base/applications/notepad/lang/el-GR.rc | 2 +-
base/applications/notepad/lang/en-US.rc | 12 ++++++------
base/applications/notepad/lang/es-ES.rc | 2 +-
base/applications/notepad/lang/et-EE.rc | 7 +++----
base/applications/notepad/lang/fi-FI.rc | 8 ++++----
base/applications/notepad/lang/he-IL.rc | 6 +++---
base/applications/notepad/lang/hr-HR.rc | 6 +++---
base/applications/notepad/lang/hu-HU.rc | 2 +-
base/applications/notepad/lang/hy-AM.rc | 8 ++++----
base/applications/notepad/lang/id-ID.rc | 5 ++---
base/applications/notepad/lang/it-IT.rc | 6 +++---
base/applications/notepad/lang/ja-JP.rc | 4 ++--
base/applications/notepad/lang/lt-LT.rc | 4 ++--
base/applications/notepad/lang/ms-MY.rc | 4 ++--
base/applications/notepad/lang/nl-NL.rc | 4 ++--
base/applications/notepad/lang/no-NO.rc | 7 +++----
base/applications/notepad/lang/pl-PL.rc | 10 +++++-----
base/applications/notepad/lang/pt-BR.rc | 2 +-
base/applications/notepad/lang/pt-PT.rc | 2 +-
base/applications/notepad/lang/ro-RO.rc | 6 +++---
base/applications/notepad/lang/ru-RU.rc | 4 ++--
base/applications/notepad/lang/sk-SK.rc | 12 +++---------
base/applications/notepad/lang/sl-SI.rc | 6 +++---
base/applications/notepad/lang/sq-AL.rc | 12 +++++-------
base/applications/notepad/lang/sv-SE.rc | 4 ++--
base/applications/notepad/lang/th-TH.rc | 4 ++--
base/applications/notepad/lang/tr-TR.rc | 4 ++--
base/applications/notepad/lang/uk-UA.rc | 8 ++++----
32 files changed, 90 insertions(+), 102 deletions(-)
diff --git a/base/applications/notepad/lang/bg-BG.rc b/base/applications/notepad/lang/bg-BG.rc
index 9d45a9f5d1d..478f854596b 100644
--- a/base/applications/notepad/lang/bg-BG.rc
+++ b/base/applications/notepad/lang/bg-BG.rc
@@ -154,7 +154,7 @@ BEGIN
STRING_TEXT_FILES_TXT "Словесни файлове (*.txt)"
STRING_TOOLARGE "Файлът '%s' е твърде голям за бележника.\n\
Използвайте друг обработчик."
- STRING_NOTEXT "Не сте въвел текст. \
+ STRING_NOTEXT "Не сте въвел текст.\
\nНапишете нещо и опитайте пак."
STRING_DOESNOTEXIST "Файлът '%s'\nне съществува\n\n\
Искате ли да създадете нов файл?"
diff --git a/base/applications/notepad/lang/cs-CZ.rc b/base/applications/notepad/lang/cs-CZ.rc
index 874854b9cf4..11cf195af20 100644
--- a/base/applications/notepad/lang/cs-CZ.rc
+++ b/base/applications/notepad/lang/cs-CZ.rc
@@ -154,14 +154,14 @@ BEGIN
STRING_TEXT_FILES_TXT "Textové soubory (*.txt)"
STRING_TOOLARGE "Soubor '%s' je pro notepad příliš velký.\n\
Použijte jiný editor, prosím."
- STRING_NOTEXT "Nebyl zadán žádný text. \
+ STRING_NOTEXT "Nebyl zadán žádný text.\
\nVložte nějaký text a zkuste to znovu."
STRING_DOESNOTEXIST "Soubor '%s'\nneexistuje.\n\n\
-Chcete ho vytvořit ?"
+Chcete ho vytvořit?"
STRING_NOTSAVED "Soubor '%s'\nbyl změněn.\n\n\
-Chcete uložit změny ?"
+Chcete uložit změny?"
STRING_NOTFOUND "'%s' nebyl nalezen."
- STRING_OUT_OF_MEMORY "Není dost paměti na dokončení této úlohy. \
+ STRING_OUT_OF_MEMORY "Není dost paměti na dokončení této úlohy.\
\nUzavřete jednu či více aplikací, abyste získali více\nvolné \
paměti."
STRING_CANNOTFIND "Nelze nalézt '%s'"
diff --git a/base/applications/notepad/lang/da-DK.rc b/base/applications/notepad/lang/da-DK.rc
index dc637207806..c632169f151 100644
--- a/base/applications/notepad/lang/da-DK.rc
+++ b/base/applications/notepad/lang/da-DK.rc
@@ -152,9 +152,9 @@ BEGIN
STRING_UNTITLED "Ikke-navngivet"
STRING_ALL_FILES "Alle filer (*.*)"
STRING_TEXT_FILES_TXT "Tekst filer (*.txt)"
- STRING_TOOLARGE "Filen '%s' er for stor til Notesblok. \
+ STRING_TOOLARGE "Filen '%s' er for stor til Notesblok.\
\nBrug en anden editor til at redigere filen."
- STRING_NOTEXT "Du har ikke skrevet noget tekst. \
+ STRING_NOTEXT "Du har ikke skrevet noget tekst.\
\nSkriv noget tekst, og prøv så igen"
STRING_DOESNOTEXIST "Filen '%s'\neksistere ikke\n\n\
Ønkser du at oprette en ny fil?"
diff --git a/base/applications/notepad/lang/de-DE.rc b/base/applications/notepad/lang/de-DE.rc
index 8220a475df4..24bc433fbf4 100644
--- a/base/applications/notepad/lang/de-DE.rc
+++ b/base/applications/notepad/lang/de-DE.rc
@@ -65,7 +65,7 @@ BEGIN
BEGIN
MENUITEM "&Inhalt", CMD_HELP_CONTENTS
MENUITEM SEPARATOR
- MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD
+ MENUITEM "Inf&o", CMD_HELP_ABOUT_NOTEPAD
END
END
@@ -154,17 +154,16 @@ BEGIN
STRING_TEXT_FILES_TXT "Textdateien (*.txt)"
STRING_TOOLARGE "Die Datei '%s' ist zu groß für den Editor.\n\
Benutzen Sie bitte einen anderen Editor, um diese Datei zu bearbeiten."
- STRING_NOTEXT "Sie haben keinen Text eingegeben, der \
-gespeichert\n werden könnte. Geben Sie Text ein, und versuchen Sie es \
-\nerneut."
+ STRING_NOTEXT "Sie haben keinen Text eingegeben, der gespeichert\n\
+werden könnte. Geben Sie Text ein, und versuchen Sie es\nerneut."
STRING_DOESNOTEXIST "Die Datei '%s'\nexistiert nicht.\n\n\
-Möchten Sie eine neue Datei erstellen ?"
+Möchten Sie eine neue Datei erstellen?"
STRING_NOTSAVED "Datei %s\n wurde geändert.\n\n\
-Möchten Sie die Änderungen speichern ?"
+Möchten Sie die Änderungen speichern?"
STRING_NOTFOUND "'%s' kann nicht gefunden werden."
- STRING_OUT_OF_MEMORY "Nicht genügend Arbeitsspeicher, \
-um diese Funktion\nabzuschließen. Beenden Sie eine oder mehrere \
-\nAnwendungen, um den verfügbaren Arbeitsspeicher zu\nerhöhen."
+ STRING_OUT_OF_MEMORY "Nicht genügend Arbeitsspeicher, um diese Funktion\n\
+abzuschließen. Beenden Sie eine oder mehrere\n\
+Anwendungen, um den verfügbaren Arbeitsspeicher zu\nerhöhen."
STRING_CANNOTFIND "'%s' wurde nicht gefunden."
STRING_ANSI "ANSI"
STRING_UNICODE "Unicode"
diff --git a/base/applications/notepad/lang/el-GR.rc b/base/applications/notepad/lang/el-GR.rc
index 4d8cb846c65..86e75214323 100644
--- a/base/applications/notepad/lang/el-GR.rc
+++ b/base/applications/notepad/lang/el-GR.rc
@@ -154,7 +154,7 @@ BEGIN
STRING_TEXT_FILES_TXT "Αρχεία κειμένου (*.txt)"
STRING_TOOLARGE "Το αρχείο '%s' είναι πολύ μεγάλο για το notepad.\n\
Παρακαλώ χρησιμοποιείστε άλλο πρόγραμμα επεξεργασίας κειμένου."
- STRING_NOTEXT "Δεν πληκτρολογήσατε κάτι. \
+ STRING_NOTEXT "Δεν πληκτρολογήσατε κάτι.\
\nΠαρακαλώ πληκτρολογείστε κάτι και προσπαθείστε ξανά"
STRING_DOESNOTEXIST "Το αρχείο '%s'\nδεν υπάρχει\n\n\
Θέλετε να δημιουργήσετε ένα νέο αρχείο;"
diff --git a/base/applications/notepad/lang/en-US.rc b/base/applications/notepad/lang/en-US.rc
index a3444ea81b6..64b250ba8dd 100644
--- a/base/applications/notepad/lang/en-US.rc
+++ b/base/applications/notepad/lang/en-US.rc
@@ -154,15 +154,15 @@ BEGIN
STRING_TEXT_FILES_TXT "Text files (*.txt)"
STRING_TOOLARGE "File '%s' is too large for notepad.\n\
Please use a different editor."
- STRING_NOTEXT "You didn't enter any text. \
-\nPlease type something and try again"
+ STRING_NOTEXT "You didn't enter any text.\n\
+Please type something and try again"
STRING_DOESNOTEXIST "File '%s'\ndoes not exist\n\n\
-Do you want to create a new file ?"
+Do you want to create a new file?"
STRING_NOTSAVED "File '%s'\nhas been modified\n\n\
-Would you like to save the changes ?"
+Would you like to save the changes?"
STRING_NOTFOUND "'%s' can not be found."
- STRING_OUT_OF_MEMORY "Not enough memory to complete this \
-task.\nClose one or more applications to increase the amount of\nfree memory."
+ STRING_OUT_OF_MEMORY "Not enough memory to complete this task.\n\
+Close one or more applications to increase the amount of\nfree memory."
STRING_CANNOTFIND "Cannot find '%s'"
STRING_ANSI "ANSI"
STRING_UNICODE "Unicode"
diff --git a/base/applications/notepad/lang/es-ES.rc b/base/applications/notepad/lang/es-ES.rc
index 541fdfbad63..b6e7f3b3c27 100644
--- a/base/applications/notepad/lang/es-ES.rc
+++ b/base/applications/notepad/lang/es-ES.rc
@@ -1,4 +1,4 @@
-/* Spanish translation by Ismael Ferreras Morezuelas (Swyter), Catalin Gabriel Draghita (jeffbox12) */
+// COPYRIGHT: Ismael Ferreras Morezuelas (Swyter), Catalin Gabriel Draghita (jeffbox12)
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
diff --git a/base/applications/notepad/lang/et-EE.rc b/base/applications/notepad/lang/et-EE.rc
index 8b1171328fa..7d31ceb9ec6 100644
--- a/base/applications/notepad/lang/et-EE.rc
+++ b/base/applications/notepad/lang/et-EE.rc
@@ -1,7 +1,6 @@
/*
* PROJECT: NOTEPAD for ReactOS
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
- * FILE: base/applications/notepad/lang/et-EE.rc
* PURPOSE: Estonian Language resource file
* TRANSLATOR: Joann Mõndresku (joannmondresku at gmail dot com)
*/
@@ -162,12 +161,12 @@ BEGIN
STRING_TEXT_FILES_TXT "Tekstifailid (*.txt)"
STRING_TOOLARGE "Fail '%s' on liiga suur Notepad'i jaoks.\n\
Palun kasuta erinevat redigeerijat."
- STRING_NOTEXT "Sa ei sisestanud midagi. \
+ STRING_NOTEXT "Sa ei sisestanud midagi.\
\nPalun kirjuta midagi ja proovi uuesti."
STRING_DOESNOTEXIST "Faili '%s'\nei ole olemas\n\n\
-Kas soovid uut faili koostada ?"
+Kas soovid uut faili koostada?"
STRING_NOTSAVED "Faili '%s'\non redigeeritud\n\n\
-Kas soovid muudatused salvestada ?"
+Kas soovid muudatused salvestada?"
STRING_NOTFOUND "'%s' ei suudetud leida."
STRING_OUT_OF_MEMORY "Pole piisavalt mälu selle \
käsu lõpetamiseks.\nSulge üks või enam rakendust, et suurendada\nvaba mälu hulka."
diff --git a/base/applications/notepad/lang/fi-FI.rc b/base/applications/notepad/lang/fi-FI.rc
index 6cc2f9a1a0c..6b4a58d4878 100644
--- a/base/applications/notepad/lang/fi-FI.rc
+++ b/base/applications/notepad/lang/fi-FI.rc
@@ -154,14 +154,14 @@ BEGIN
STRING_TEXT_FILES_TXT "Teksti tiedostot (*.txt)"
STRING_TOOLARGE "Tiedosto '%s' on liian suuri.\n\
Please use a different editor."
- STRING_NOTEXT "Et syöttänyt lainkaan tekstiä. \
+ STRING_NOTEXT "Et syöttänyt lainkaan tekstiä.\
\nKirjoita jotain ja yritä uudelleen"
STRING_DOESNOTEXIST "File '%s'\ndoes not exist\n\n\
-Do you want to create a new file ?"
+Do you want to create a new file?"
STRING_NOTSAVED "File '%s'\nhas been modified\n\n\
-Would you like to save the changes ?"
+Would you like to save the changes?"
STRING_NOTFOUND "'%s' ei löydy."
- STRING_OUT_OF_MEMORY "Muistia ei ole riittävästi tämän \
+ STRING_OUT_OF_MEMORY "Muistia ei ole riittävästi tämän\
\ntehtävän tekemiseksi. Sulje jokin sovellus vapauttaaksesi\n\
muistia."
STRING_CANNOTFIND "Cannot find '%s'"
diff --git a/base/applications/notepad/lang/he-IL.rc b/base/applications/notepad/lang/he-IL.rc
index afcdd1a9e81..c3312dfa326 100644
--- a/base/applications/notepad/lang/he-IL.rc
+++ b/base/applications/notepad/lang/he-IL.rc
@@ -157,12 +157,12 @@ BEGIN
STRING_TEXT_FILES_TXT "קבצי טקסט (*.txt)"
STRING_TOOLARGE "File '%s' is too large for notepad.\n\
Please use a different editor."
- STRING_NOTEXT "You didn't enter any text. \
+ STRING_NOTEXT "You didn't enter any text.\
\nPlease type something and try again"
STRING_DOESNOTEXIST "File '%s'\ndoes not exist\n\n\
-Do you want to create a new file ?"
+Do you want to create a new file?"
STRING_NOTSAVED "File '%s'\nhas been modified\n\n\
-Would you like to save the changes ?"
+Would you like to save the changes?"
STRING_NOTFOUND "'%s' לא נמצא."
STRING_OUT_OF_MEMORY "Not enough memory to complete this \
task.\nClose one or more applications to increase the amount of\nfree memory."
diff --git a/base/applications/notepad/lang/hr-HR.rc b/base/applications/notepad/lang/hr-HR.rc
index dea66511d0a..e316cb2354f 100644
--- a/base/applications/notepad/lang/hr-HR.rc
+++ b/base/applications/notepad/lang/hr-HR.rc
@@ -161,12 +161,12 @@ BEGIN
STRING_TEXT_FILES_TXT "Tekstne datoteke (*.txt)"
STRING_TOOLARGE "Datoteka '%s' je prevelik za program Blok za pisanje.\n\
Molimo Vas da koristite drugu aplikaciju."
- STRING_NOTEXT "Niste unijeli tekst. \
+ STRING_NOTEXT "Niste unijeli tekst.\
\nMolimo Vas da nešto unesete i ponovo pokušate."
STRING_DOESNOTEXIST "Datoteka '%s'\nne postoji\n\n\
-Želite li stvoriti novu datoteku ?"
+Želite li stvoriti novu datoteku?"
STRING_NOTSAVED "Datoteka '%s'\nje bila promijenjena\n\n\
-Želite li spremiti te promjene ?"
+Želite li spremiti te promjene?"
STRING_NOTFOUND "'%s' ne može biti pronađena."
STRING_OUT_OF_MEMORY "Nema dovoljno memorije da se dovrši \
zadatak.\nZatvorite jednu ili više aplikacija da povećate\nslobodnu memoriju."
diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc
index 1f419e614c7..4f09de0433d 100644
--- a/base/applications/notepad/lang/hu-HU.rc
+++ b/base/applications/notepad/lang/hu-HU.rc
@@ -154,7 +154,7 @@ BEGIN
STRING_TEXT_FILES_TXT "Szövegfájlok (*.txt)"
STRING_TOOLARGE "'%s' fájl túl nagy méretű.\n\
Kérem használjon másik szövegszerkesztő programot."
- STRING_NOTEXT "A szöveg nem tartalmaz karaktert! \
+ STRING_NOTEXT "A szöveg nem tartalmaz karaktert!\
\nKérem gépeljen be néhány karaktert és próbálja újra!"
STRING_DOESNOTEXIST "A megadott '%s'\nfájl nem létezik!\n\n\
Kíván létrehozni új fájlt?"
diff --git a/base/applications/notepad/lang/hy-AM.rc b/base/applications/notepad/lang/hy-AM.rc
index c1b866313b4..b273e56cbbf 100644
--- a/base/applications/notepad/lang/hy-AM.rc
+++ b/base/applications/notepad/lang/hy-AM.rc
@@ -157,11 +157,11 @@ Please use a different editor."
STRING_NOTEXT "Դուք տեքստ չեք ներմուծել \
\nPlease type something and try again"
STRING_DOESNOTEXIST "Ֆայլը '%s'\n գոյութնուն չունի\n\n\
-Do you want to create a new file ?"
+Do you want to create a new file?"
STRING_NOTSAVED "Ֆայլը '%s'\n ենթարկվել է փոփոխման\n\n\
-Would you like to save the changes ?"
- STRING_NOTFOUND "'%s' չի գտնվել."
- STRING_OUT_OF_MEMORY "Կա հիծողությոն անբավարարվախույուն. \
+Would you like to save the changes?"
+ STRING_NOTFOUND "'%s' չի գտնվել."
+ STRING_OUT_OF_MEMORY "Կա հիծողությոն անբավարարվախույուն.\
\nՓակեք մի կամ մի քանի ծրագիր."
STRING_CANNOTFIND "Չի գտնվել '%s'"
STRING_ANSI "ANSI"
diff --git a/base/applications/notepad/lang/id-ID.rc b/base/applications/notepad/lang/id-ID.rc
index 8405f0f0abf..bbd4256c956 100644
--- a/base/applications/notepad/lang/id-ID.rc
+++ b/base/applications/notepad/lang/id-ID.rc
@@ -154,7 +154,7 @@ BEGIN
STRING_TEXT_FILES_TXT "Berkas teks (*.txt)"
STRING_TOOLARGE "Berkas '%s' terlalu besar untuk notepad.\n\
Mohon gunakan editor teks yang berbeda."
- STRING_NOTEXT "Anda belum memasukkan teks apapun. \
+ STRING_NOTEXT "Anda belum memasukkan teks apapun.\
\nMohon ketik sesuatu dan coba lagi."
STRING_DOESNOTEXIST "Berkas '%s'\ntidak ada\n\n\
Ingin membuat berkas baru?"
@@ -162,8 +162,7 @@ Ingin membuat berkas baru?"
Ingin menyimpan perubahan?"
STRING_NOTFOUND "'%s' tidak bisa ditemukan."
STRING_OUT_OF_MEMORY "Memori tidak cukup untuk menyelesaikan tugas \
-ini.\nTutup satu atau lebih aplikasi untuk meningkatkan jumlah\nmemori \
-bebas."
+ini.\nTutup satu atau lebih aplikasi untuk meningkatkan jumlah\nmemori bebas."
STRING_CANNOTFIND "Tidak bisa menemukan '%s'"
STRING_ANSI "ANSI"
STRING_UNICODE "Unicode"
diff --git a/base/applications/notepad/lang/it-IT.rc b/base/applications/notepad/lang/it-IT.rc
index a22a1586762..1402e2cca32 100644
--- a/base/applications/notepad/lang/it-IT.rc
+++ b/base/applications/notepad/lang/it-IT.rc
@@ -154,12 +154,12 @@ BEGIN
STRING_TEXT_FILES_TXT "File di testo (*.txt)"
STRING_TOOLARGE "Il file '%s' è troppo grande per il blocco note.\n\
Per favore usare un altro programma."
- STRING_NOTEXT "Non è stato inserito alcun testo. \
+ STRING_NOTEXT "Non è stato inserito alcun testo.\
\nPer favore digitare qualcosa e riprovare"
STRING_DOESNOTEXIST "Il file '%s'\nnon esiste\n\n\
-Creare un nuovo file ?"
+Creare un nuovo file?"
STRING_NOTSAVED "Il file '%s'\nè stato modificato\n\
-Salvare le modifiche ?"
+Salvare le modifiche?"
STRING_NOTFOUND "'%s' non è stato trovato."
STRING_OUT_OF_MEMORY "Memoria insufficente per completare \
questa operazione.\nChiudere una o più applicazioni per aumentare la quantità \
diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc
index e9df825c3ac..5feee62632d 100644
--- a/base/applications/notepad/lang/ja-JP.rc
+++ b/base/applications/notepad/lang/ja-JP.rc
@@ -157,9 +157,9 @@ BEGIN
STRING_NOTEXT "何も入力されていません。\
\n何か入力してから実行して下さい。"
STRING_DOESNOTEXIST "ファイル '%s'\nは存在しません\n\n\
-新しいファイルを作成しますか ?"
+新しいファイルを作成しますか?"
STRING_NOTSAVED "ファイル '%s'\nは変更されています\n\n\
-変更を保存しますか ?"
+変更を保存しますか?"
STRING_NOTFOUND "'%s' は見つかりませんでした"
STRING_OUT_OF_MEMORY "この操作を実行するためのメモリが\
足りません。\nメモリの空きを増やすためにいくつかのアプリケーションを\n終了して\
diff --git a/base/applications/notepad/lang/lt-LT.rc b/base/applications/notepad/lang/lt-LT.rc
index 3e474ed0041..08f847765b0 100644
--- a/base/applications/notepad/lang/lt-LT.rc
+++ b/base/applications/notepad/lang/lt-LT.rc
@@ -154,14 +154,14 @@ BEGIN
STRING_TEXT_FILES_TXT "Tekstinės bylos (*.txt)"
STRING_TOOLARGE "Byla '%s' yra perdidelė.\n\
Prašome naudotis kitu redaktoriumi."
- STRING_NOTEXT "Jūs neivedėte jokio teksto. \
+ STRING_NOTEXT "Jūs neivedėte jokio teksto.\
\nPrašome parašyti ką nors ir bandyti dar kartą"
STRING_DOESNOTEXIST "Byla '%s'\nneegzistuoja\n\n\
Ar norite sukurti naują bylą?"
STRING_NOTSAVED "Byla '%s'\nbuvo pakeista\n\n\
Ar norite išsaugoti pakeitimus?"
STRING_NOTFOUND "'%s' nerastas."
- STRING_OUT_OF_MEMORY "Nepakanka atminties užduoties užbaigimui. \
+ STRING_OUT_OF_MEMORY "Nepakanka atminties užduoties užbaigimui.\
\nUžverkite vieną ar kelias programas, kad padidintumėte\nlaisvos atminties kiekį."
STRING_CANNOTFIND "Nepavyko rasti '%s'"
STRING_ANSI "ANSI"
diff --git a/base/applications/notepad/lang/ms-MY.rc b/base/applications/notepad/lang/ms-MY.rc
index b20afcc378f..23d34acde83 100644
--- a/base/applications/notepad/lang/ms-MY.rc
+++ b/base/applications/notepad/lang/ms-MY.rc
@@ -1,4 +1,4 @@
-/* Malay translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */
+// COPYRIGHT: 2016 Henry Tang Ih <henrytang2(a)hotmail.com>
LANGUAGE LANG_MALAY, SUBLANG_DEFAULT
@@ -156,7 +156,7 @@ BEGIN
STRING_TEXT_FILES_TXT "Fail teks (*.txt)"
STRING_TOOLARGE "Fail '%s' adalah terlalu besar untuk notepad.\n\
Sila gunakan editor yang berbeza."
- STRING_NOTEXT "Anda tidak memasukkan sebarang teks. \
+ STRING_NOTEXT "Anda tidak memasukkan sebarang teks.\
\nSila taip sesuatu dan cuba lagi"
STRING_DOESNOTEXIST "Fail '%s'\ntidak wujud\n\n\
Adakah anda mahu mencipta fail baru?"
diff --git a/base/applications/notepad/lang/nl-NL.rc b/base/applications/notepad/lang/nl-NL.rc
index 066028754f9..2a41af6b02c 100644
--- a/base/applications/notepad/lang/nl-NL.rc
+++ b/base/applications/notepad/lang/nl-NL.rc
@@ -154,14 +154,14 @@ BEGIN
STRING_TEXT_FILES_TXT "Tekstbestanden (*.txt)"
STRING_TOOLARGE "Het bestand '%s' is te groot voor Kladblok.\n\
Gebruik een andere editor."
- STRING_NOTEXT "U heeft geen tekst ingevoerd. \
+ STRING_NOTEXT "U heeft geen tekst ingevoerd.\
\nType uw tekst en probeer het nogmaals"
STRING_DOESNOTEXIST "Het bestand '%s'\nbestaat niet\n\n\
Wilt u een nieuw bestand maken?"
STRING_NOTSAVED "Het bestand '%s'\nis gewijzigd\n\n\
Wilt u de wijzigingen opslaan?"
STRING_NOTFOUND "'%s' kan niet worden gevonden."
- STRING_OUT_OF_MEMORY "Onvoldoende geheugen. \
+ STRING_OUT_OF_MEMORY "Onvoldoende geheugen.\
\nSluit een of meer applicaties om de hoeveelheid\nbeschikbaar geheugen te vergroten."
STRING_CANNOTFIND "Cannot find '%s'"
STRING_ANSI "ANSI"
diff --git a/base/applications/notepad/lang/no-NO.rc b/base/applications/notepad/lang/no-NO.rc
index 8df8d4c00b2..fc907a5a743 100644
--- a/base/applications/notepad/lang/no-NO.rc
+++ b/base/applications/notepad/lang/no-NO.rc
@@ -154,16 +154,15 @@ BEGIN
STRING_TEXT_FILES_TXT "Tekst filer (*.txt)"
STRING_TOOLARGE "Filen '%s' er for stor for notisblokk.\n\
Vennligst bruk en annen editor."
- STRING_NOTEXT "Du utfører innskrivet tekst. \
+ STRING_NOTEXT "Du utfører innskrivet tekst.\
\nVennligst skriv noe og pr?jen"
STRING_DOESNOTEXIST "Filen '%s'\n eksistere ikke\n\n\
Vil du opprette en ny fil?"
STRING_NOTSAVED "Filen '%s'\nhar ikke blitt lagret\n\n\
Vil du lagre endringen?"
STRING_NOTFOUND "'%s' ble ikke funnet."
- STRING_OUT_OF_MEMORY "Ikke nok minne for å åpne \
-oppgaven.\nAvslutt en eller mere applikasjoner for øke mengden av\nledig \
-minne."
+ STRING_OUT_OF_MEMORY "Ikke nok minne for å åpne oppgaven.\n\
+Avslutt en eller mere applikasjoner for øke mengden av\nledig minne."
STRING_CANNOTFIND "Kan ikke finne '%s'"
STRING_ANSI "ANSI"
STRING_UNICODE "Unicode"
diff --git a/base/applications/notepad/lang/pl-PL.rc b/base/applications/notepad/lang/pl-PL.rc
index 97874362419..883f661e0e5 100644
--- a/base/applications/notepad/lang/pl-PL.rc
+++ b/base/applications/notepad/lang/pl-PL.rc
@@ -152,12 +152,12 @@ BEGIN
STRING_UNTITLED "Bez tytułu"
STRING_ALL_FILES "Wszystkie pliki (*.*)"
STRING_TEXT_FILES_TXT "Pliki tekstowe (*.txt)"
- STRING_TOOLARGE "Plik '%s' jest za duży dla Notatnika.\n Proszę użyć innego edytora."
- STRING_NOTEXT "Nie wprowadziłeś żadnego tekstu.\n Proszę coś wpisać i spróbować ponownie."
- STRING_DOESNOTEXIST "Plik '%s' nie istnieje\n\n Czy chcesz utworzyć nowy plik?"
- STRING_NOTSAVED "Plik '%s'\nzostał zmodyfikowany\n\n Czy chcesz zachować zmiany?"
+ STRING_TOOLARGE "Plik '%s' jest za duży dla Notatnika.\nProszę użyć innego edytora."
+ STRING_NOTEXT "Nie wprowadziłeś żadnego tekstu.\nProszę coś wpisać i spróbować ponownie."
+ STRING_DOESNOTEXIST "Plik '%s' nie istnieje\n\nCzy chcesz utworzyć nowy plik?"
+ STRING_NOTSAVED "Plik '%s'\nzostał zmodyfikowany\n\nCzy chcesz zachować zmiany?"
STRING_NOTFOUND "Nie można odnaleźć '%s'."
- STRING_OUT_OF_MEMORY "Za mało pamięci do wykonania tego zadania.\n Zamknij jedną lub więcej aplikacji, by zwiększyć ilość wolnej pamięci."
+ STRING_OUT_OF_MEMORY "Za mało pamięci do wykonania tego zadania.\nZamknij jedną lub więcej aplikacji, by zwiększyć ilość wolnej pamięci."
STRING_CANNOTFIND "Nie można odnaleźć '%s'"
STRING_ANSI "ANSI"
STRING_UNICODE "Unicode"
diff --git a/base/applications/notepad/lang/pt-BR.rc b/base/applications/notepad/lang/pt-BR.rc
index 5ff0071c77a..202130aa474 100644
--- a/base/applications/notepad/lang/pt-BR.rc
+++ b/base/applications/notepad/lang/pt-BR.rc
@@ -154,7 +154,7 @@ BEGIN
STRING_TEXT_FILES_TXT "Arquivos texto (*.txt)"
STRING_TOOLARGE "Arquivo '%s' é muito longo para o notepad.\n\
Por favor use um editor diferente."
- STRING_NOTEXT "Você não digitou nenhum texto. \
+ STRING_NOTEXT "Você não digitou nenhum texto.\
\nPor favor digite alguma coisa e tente novamente"
STRING_DOESNOTEXIST "Arquivo '%s'\nnão existe\n\n\
Você deseja criar um novo arquivo?"
diff --git a/base/applications/notepad/lang/pt-PT.rc b/base/applications/notepad/lang/pt-PT.rc
index 13f0c79f1f5..adc7ab342c6 100644
--- a/base/applications/notepad/lang/pt-PT.rc
+++ b/base/applications/notepad/lang/pt-PT.rc
@@ -154,7 +154,7 @@ BEGIN
STRING_TEXT_FILES_TXT "Arquivos texto (*.txt)"
STRING_TOOLARGE "Arquivo '%s' é muito longo para o notepad.\n\
Por favor use um editor diferente."
- STRING_NOTEXT "Você não digitou nenhum texto. \
+ STRING_NOTEXT "Você não digitou nenhum texto.\
\nPor favor digite alguma coisa e tente novamente"
STRING_DOESNOTEXIST "Arquivo '%s'\nnão existe\n\n\
Você deseja criar um novo arquivo?"
diff --git a/base/applications/notepad/lang/ro-RO.rc b/base/applications/notepad/lang/ro-RO.rc
index 7564a109a27..84f86a00aa9 100644
--- a/base/applications/notepad/lang/ro-RO.rc
+++ b/base/applications/notepad/lang/ro-RO.rc
@@ -163,14 +163,14 @@ BEGIN
STRING_TEXT_FILES_TXT "Fișiere text (*.txt)"
STRING_TOOLARGE "Fișierul „%s” este prea mare.\n\
Încercați un alt editor."
- STRING_NOTEXT "Nu ați scris nimic. \
+ STRING_NOTEXT "Nu ați scris nimic.\
\nScrieți ceva apoi încercați din nou."
STRING_DOESNOTEXIST "Fișierul „%s”\nnu există.\n\n\
-Creați un nou fișier ?"
+Creați un nou fișier?"
STRING_NOTSAVED "Fișierul „%s” a fost modificat!\n\n\
Păstrați modificările aduse?"
STRING_NOTFOUND "„%s” nu poate fi găsit."
- STRING_OUT_OF_MEMORY "Nu există suficientă memorie pentru a efectua această operație. \
+ STRING_OUT_OF_MEMORY "Nu există suficientă memorie pentru a efectua această operație.\
\nÎnchideți una sau mai multe aplicații pentru a elibera memorie."
STRING_CANNOTFIND "„%s” nu poate fi găsit"
STRING_ANSI "ANSI"
diff --git a/base/applications/notepad/lang/ru-RU.rc b/base/applications/notepad/lang/ru-RU.rc
index 9867f769f3e..d6d49297d1e 100644
--- a/base/applications/notepad/lang/ru-RU.rc
+++ b/base/applications/notepad/lang/ru-RU.rc
@@ -161,8 +161,8 @@ BEGIN
STRING_NOTSAVED "Файл '%s'\nбыл изменен\n\n\
Хотите сохранить изменения?"
STRING_NOTFOUND "'%s' не найден."
- STRING_OUT_OF_MEMORY "Недостаточно памяти для завершения этой операции. \
-\nЗакройте одно или несколько приложений и повторите попытку."
+ STRING_OUT_OF_MEMORY "Недостаточно памяти для завершения этой операции.\n\
+Закройте одно или несколько приложений и повторите попытку."
STRING_CANNOTFIND "Невозможно найти '%s'"
STRING_ANSI "ANSI"
STRING_UNICODE "Unicode"
diff --git a/base/applications/notepad/lang/sk-SK.rc b/base/applications/notepad/lang/sk-SK.rc
index cead9a46f5e..45084fe8061 100644
--- a/base/applications/notepad/lang/sk-SK.rc
+++ b/base/applications/notepad/lang/sk-SK.rc
@@ -1,10 +1,4 @@
-/*
- * Notepad (Slovak resources)
- *
- * TRANSLATOR : Mário Kačmár /Mario Kacmar/ aka Kario (kario(a)szm.sk)
- * DATE OF TR.: xx-xx-2007
- * LAST CHANGE: 27-12-2008
- */
+// COPYRIGHT: 2007-2008 Mario Kacmar <kario(a)szm.sk>
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
@@ -162,8 +156,8 @@ BEGIN
STRING_TEXT_FILES_TXT "Textové súbory (*.txt)"
STRING_TOOLARGE "Súbor '%s' je pre Poznámkový blok príliš veľký.\n\
Na otvorenie súboru použite iný editor."
- STRING_NOTEXT "Nevložili ste žiadny text. \
-\nProsím, napíšte niečo a skúste to znova."
+ STRING_NOTEXT "Nevložili ste žiadny text.\n\
+Prosím, napíšte niečo a skúste to znova."
STRING_DOESNOTEXIST "Nie je možné nájsť súbor '%s'\n\n\
Chcete vytvoriť nový súbor?"
STRING_NOTSAVED "Text súboru '%s'\nsa zmenil.\n\n\
diff --git a/base/applications/notepad/lang/sl-SI.rc b/base/applications/notepad/lang/sl-SI.rc
index 0031fd14997..11b869dfda7 100644
--- a/base/applications/notepad/lang/sl-SI.rc
+++ b/base/applications/notepad/lang/sl-SI.rc
@@ -154,15 +154,15 @@ BEGIN
STRING_TEXT_FILES_TXT "Datoteke z besedilom (*.txt)"
STRING_TOOLARGE "Datoteka '%s' je prevelika za Beležnico.\n\
Uporabite drug urejevalnik."
- STRING_NOTEXT "Niste vnesli besedila. \
-\nVnesite besedilo in poskusite znova."
+ STRING_NOTEXT "Niste vnesli besedila.\n\
+Vnesite besedilo in poskusite znova."
STRING_DOESNOTEXIST "Datoteka '%s' ne obstaja.\n\n\
Ali želite ustvariti novo datoteko?"
STRING_NOTSAVED "Vsebina datoteke '%s'je bila spremenjena.\n\n\
Ali želite shraniti spremembe?"
STRING_NOTFOUND "Ni mogoèe najti '%s'."
STRING_OUT_OF_MEMORY "Na voljo ni dovolj pomnilnika, da bi bilo mogoèe dokonèati to \
-operacijo.\nÈe ga želite sprostiti, konèajte enega ali veè programov in poskusite znova. "
+operacijo.\nÈe ga želite sprostiti, konèajte enega ali veè programov in poskusite znova."
STRING_CANNOTFIND "Cannot find '%s'"
STRING_ANSI "ANSI"
STRING_UNICODE "Unicode"
diff --git a/base/applications/notepad/lang/sq-AL.rc b/base/applications/notepad/lang/sq-AL.rc
index 60d5a04da2e..79340ced5ad 100644
--- a/base/applications/notepad/lang/sq-AL.rc
+++ b/base/applications/notepad/lang/sq-AL.rc
@@ -1,6 +1,4 @@
-/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com)
-* DATE OF TR: 05-12-2013
-*/
+// COPYRIGHT: 2013 Ardit Dani (Ard1t) <ardit.dani(a)gmail.com>
LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
@@ -158,12 +156,12 @@ BEGIN
STRING_TEXT_FILES_TXT "Dokumenta teksti (*.txt)"
STRING_TOOLARGE "Dokumenti '%s' është shume i madh për notepad.\n\
Ju lutem perdorni editor tjeter."
- STRING_NOTEXT "Nuk keni shkruaj ndonje tekst. \
-\nJu lutem shkruani diqka dhe provoni perseri"
+ STRING_NOTEXT "Nuk keni shkruaj ndonje tekst.\n\
+Ju lutem shkruani diqka dhe provoni perseri"
STRING_DOESNOTEXIST "Dokumenti '%s'\nnuk ekziston\n\n\
-Doni te krijoni nje dokument te ri ?"
+Doni te krijoni nje dokument te ri?"
STRING_NOTSAVED "Dokumenti '%s'\nështë modifikuar\n\n\
-Doni te ruani ndryshimet ?"
+Doni te ruani ndryshimet?"
STRING_NOTFOUND "'%s' nuk gjindet."
STRING_OUT_OF_MEMORY "Nuk ka memorie te mjaftueshme per te kompletuar kete \
detyrë.\nMbyll nje ose me shume programe te rrisesh shumën e\nmemories."
diff --git a/base/applications/notepad/lang/sv-SE.rc b/base/applications/notepad/lang/sv-SE.rc
index 70b3e3a2baa..55ed5312c5a 100644
--- a/base/applications/notepad/lang/sv-SE.rc
+++ b/base/applications/notepad/lang/sv-SE.rc
@@ -154,8 +154,8 @@ BEGIN
STRING_TEXT_FILES_TXT "Textfiler (*.txt)"
STRING_TOOLARGE "Filen '%s' är för stor för Anteckningar.\n\
Använd en annan editor."
- STRING_NOTEXT "Du skrev inte in någon text. \
-\nSkriv något och försök sedan igen."
+ STRING_NOTEXT "Du skrev inte in någon text.\n\
+Skriv något och försök sedan igen."
STRING_DOESNOTEXIST "Filen '%s'\nexisterar inte.\n\n\
Vill du skapa en ny fil?"
STRING_NOTSAVED "Filen '%s'\nhar ändrats.\n\n\
diff --git a/base/applications/notepad/lang/th-TH.rc b/base/applications/notepad/lang/th-TH.rc
index 11fe1192792..3bf2b721583 100644
--- a/base/applications/notepad/lang/th-TH.rc
+++ b/base/applications/notepad/lang/th-TH.rc
@@ -154,8 +154,8 @@ BEGIN
STRING_TEXT_FILES_TXT "แฟ้มตํารา (*.txt)"
STRING_TOOLARGE "แฟ้ม '%s' ใหญ่เกินไป"
STRING_NOTEXT "คุณไม่ใดเขียนอะไร\nกรุณาลองใหม่"
- STRING_DOESNOTEXIST "ไม่พบแฟ้ม '%s' ที่ต้องการเปิด\nคุณต้องการสร้างใหม่ไม่ ?"
- STRING_NOTSAVED "มีการเปลี่ยนแปลงกับเอกสาร\n\n'%s'\n\nคุณต้องการบันทึกมันหรือไม่ ?"
+ STRING_DOESNOTEXIST "ไม่พบแฟ้ม '%s' ที่ต้องการเปิด\nคุณต้องการสร้างใหม่ไม่?"
+ STRING_NOTSAVED "มีการเปลี่ยนแปลงกับเอกสาร\n\n'%s'\n\nคุณต้องการบันทึกมันหรือไม่?"
STRING_NOTFOUND "ไม่พบข้อความ '%s' ที่ต้องการค้นหา"
STRING_OUT_OF_MEMORY "ความจําหมด\nกรุณาลองใหม่"
STRING_CANNOTFIND "Cannot find '%s'"
diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc
index 1f37825511e..be2ee95dc73 100644
--- a/base/applications/notepad/lang/tr-TR.rc
+++ b/base/applications/notepad/lang/tr-TR.rc
@@ -1,5 +1,5 @@
-/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu [at] gmail [dot] com)
- * 2013-2016, 2018-2019 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */
+// COPYRIGHT: 2012 Arda Tanrıkulu <ardatanrikulu(a)gmail.com>
+// 2013-2019 Erdem Ersoy
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
diff --git a/base/applications/notepad/lang/uk-UA.rc b/base/applications/notepad/lang/uk-UA.rc
index a914503457a..06afd58c11a 100644
--- a/base/applications/notepad/lang/uk-UA.rc
+++ b/base/applications/notepad/lang/uk-UA.rc
@@ -154,15 +154,15 @@ BEGIN
STRING_TEXT_FILES_TXT "Текстові файли (*.txt)"
STRING_TOOLARGE "Файл '%s' завеликий для блокнота.\n\
Будь ласка, використайте інший редактор."
- STRING_NOTEXT "Ви не ввели ніякого тексту. \
-\nБудь ласка, введіть що-небудь і спробуйте ще раз"
+ STRING_NOTEXT "Ви не ввели ніякого тексту.\n\
+Будь ласка, введіть що-небудь і спробуйте ще раз"
STRING_DOESNOTEXIST "Файл '%s'\nне існує\n\n\
Хочете створити новий файл?"
STRING_NOTSAVED "Файл '%s'\nбув змінений\n\n\
Хочете зберегти зміни?"
STRING_NOTFOUND "'%s' не знайдено."
- STRING_OUT_OF_MEMORY "Недостатньо пам'яті для виконання операції.\
-\nЗакрийте один або декілька додатків і повторіть спробу."
+ STRING_OUT_OF_MEMORY "Недостатньо пам'яті для виконання операції.\n\
+Закрийте один або декілька додатків і повторіть спробу."
STRING_CANNOTFIND "Неможливо знайти '%s'"
STRING_ANSI "ANSI"
STRING_UNICODE "Юнікод"