[reactos] 01/01: [NET][MC] Replace the last string resource by a message from netmsg.dll. - Ros-diffs

1 May 2020

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16d136a63e9b63a2353b7…

commit 16d136a63e9b63a2353b75e8914f83a38e0600a6
Author:     Eric Kohl &lt;eric.kohl(a)reactos.org&gt;
AuthorDate: Fri May 1 09:40:37 2020 +0200
Commit:     Eric Kohl &lt;eric.kohl(a)reactos.org&gt;
CommitDate: Fri May 1 10:27:26 2020 +0200

    [NET][MC] Replace the last string resource by a message from netmsg.dll.
    
    - Move translations to netmsg.dll.
    - Keep italian translation as a comment because netmsg.dll does not have an italian
translation yet.
    - Remove obsolete resource files.
---
 base/applications/network/net/cmdUse.c      |  2 +-
 base/applications/network/net/lang/en-US.rc |  6 ------
 base/applications/network/net/lang/es-ES.rc |  9 --------
 base/applications/network/net/lang/it-IT.rc |  6 ------
 base/applications/network/net/lang/pl-PL.rc |  5 -----
 base/applications/network/net/lang/ro-RO.rc | 12 -----------
 base/applications/network/net/lang/ru-RU.rc |  8 -------
 base/applications/network/net/lang/tr-TR.rc |  8 -------
 base/applications/network/net/lang/zh-CN.rc |  8 -------
 base/applications/network/net/lang/zh-TW.rc |  8 -------
 base/applications/network/net/net.h         |  1 -
 base/applications/network/net/net.rc        | 33 -----------------------------
 base/applications/network/net/resource.h    |  3 ---
 sdk/include/reactos/mc/netmsgmsg.mc         | 14 +++++++-----
 14 files changed, 10 insertions(+), 113 deletions(-)

diff --git a/base/applications/network/net/cmdUse.c
b/base/applications/network/net/cmdUse.c
index 71c03803c7a..2219df44086 100644
--- a/base/applications/network/net/cmdUse.c
+++ b/base/applications/network/net/cmdUse.c
@@ -232,7 +232,7 @@ cmdUse(
 
         Status = WNetUseConnection(NULL, &lpNet, NULL, NULL, CONNECT_REDIRECT |
(Persist ? CONNECT_UPDATE_PROFILE : 0), Access, &Size, &OutFlags);
         if (argv[2][0] == L'*' && Status == NO_ERROR && OutFlags
== CONNECT_LOCALDRIVE)
-            ConResPrintf(StdOut, IDS_USE_NOW_CONNECTED, argv[3], Access);
+            PrintMessageStringV(3919, argv[3], Access);
         else if (Status != NO_ERROR)
             PrintError(Status);
 
diff --git a/base/applications/network/net/lang/en-US.rc
b/base/applications/network/net/lang/en-US.rc
deleted file mode 100644
index 38ae6cab44b..00000000000
--- a/base/applications/network/net/lang/en-US.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-STRINGTABLE
-BEGIN
-    IDS_USE_NOW_CONNECTED "%s is now connected to %s\n"
-END
diff --git a/base/applications/network/net/lang/es-ES.rc
b/base/applications/network/net/lang/es-ES.rc
deleted file mode 100644
index dbafe64de68..00000000000
--- a/base/applications/network/net/lang/es-ES.rc
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Spanish Language resource file.
- * Translated by: Ismael Ferreras Morezuelas <2014-11-07> */
-
-LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-
-STRINGTABLE
-BEGIN
-    IDS_USE_NOW_CONNECTED "%s is now connected to %s\n"
-END
diff --git a/base/applications/network/net/lang/it-IT.rc
b/base/applications/network/net/lang/it-IT.rc
deleted file mode 100644
index 75895b3de2a..00000000000
--- a/base/applications/network/net/lang/it-IT.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-
-STRINGTABLE
-BEGIN
-    IDS_USE_NOW_CONNECTED "%s è ora connesso con %s\n"
-END
diff --git a/base/applications/network/net/lang/pl-PL.rc
b/base/applications/network/net/lang/pl-PL.rc
deleted file mode 100644
index 8a09e17ef98..00000000000
--- a/base/applications/network/net/lang/pl-PL.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-STRINGTABLE
-BEGIN
-    IDS_USE_NOW_CONNECTED "%s jest obecnie podłączony do %s\n"
-END
diff --git a/base/applications/network/net/lang/ro-RO.rc
b/base/applications/network/net/lang/ro-RO.rc
deleted file mode 100644
index 094ecb1fece..00000000000
--- a/base/applications/network/net/lang/ro-RO.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-/* 
- * FILE:       base/applications/network/net/lang/ro-RO.rc
- *             ReactOS Project (http://www.reactos.org)
- * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com)
- */
-
-LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-
-STRINGTABLE
-BEGIN
-    IDS_USE_NOW_CONNECTED "Conectarea %s la %s a fost realizată.\n"
-END
diff --git a/base/applications/network/net/lang/ru-RU.rc
b/base/applications/network/net/lang/ru-RU.rc
deleted file mode 100644
index 453eade937d..00000000000
--- a/base/applications/network/net/lang/ru-RU.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Russian language resource file by Kudratov Olimjon (olim98(a)bk.ru) */
-
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-
-STRINGTABLE
-BEGIN
-    IDS_USE_NOW_CONNECTED "%s сейчас подключен к %s\n"
-END
diff --git a/base/applications/network/net/lang/tr-TR.rc
b/base/applications/network/net/lang/tr-TR.rc
deleted file mode 100644
index d2e8689ca12..00000000000
--- a/base/applications/network/net/lang/tr-TR.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */
-
-LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
-
-STRINGTABLE
-BEGIN
-    IDS_USE_NOW_CONNECTED "%s şuna bağlandı: %s\n"
-END
diff --git a/base/applications/network/net/lang/zh-CN.rc
b/base/applications/network/net/lang/zh-CN.rc
deleted file mode 100644
index 7b04b492c62..00000000000
--- a/base/applications/network/net/lang/zh-CN.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Simplified Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-
-STRINGTABLE
-BEGIN
-    IDS_USE_NOW_CONNECTED "%s 现在连接到 %s\n"
-END
diff --git a/base/applications/network/net/lang/zh-TW.rc
b/base/applications/network/net/lang/zh-TW.rc
deleted file mode 100644
index 51fddd57f96..00000000000
--- a/base/applications/network/net/lang/zh-TW.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
-
-STRINGTABLE
-BEGIN
-    IDS_USE_NOW_CONNECTED "%s is now connected to %s\n"
-END
diff --git a/base/applications/network/net/net.h b/base/applications/network/net/net.h
index b5d53e32657..96f1d24b60d 100644
--- a/base/applications/network/net/net.h
+++ b/base/applications/network/net/net.h
@@ -25,7 +25,6 @@
 #include <conutils.h>
 
 #include <net_msg.h>
-#include "resource.h"
 
 extern HMODULE hModuleNetMsg;
 
diff --git a/base/applications/network/net/net.rc b/base/applications/network/net/net.rc
index d026529c233..725ae3c5fe6 100644
--- a/base/applications/network/net/net.rc
+++ b/base/applications/network/net/net.rc
@@ -1,7 +1,5 @@
 #include <windef.h>
 
-#include "resource.h"
-
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 #define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Net Command"
@@ -10,34 +8,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include <reactos/version.rc>
 
 #include <net_msg.rc>
-
-/* UTF-8 */
-#pragma code_page(65001)
-
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_TR_TR
-    #include "lang/tr-TR.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif
diff --git a/base/applications/network/net/resource.h
b/base/applications/network/net/resource.h
deleted file mode 100644
index 6ce68808356..00000000000
--- a/base/applications/network/net/resource.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define IDS_USE_NOW_CONNECTED          500
diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc
index 3a90d20850b..1c39aa3001d 100644
--- a/sdk/include/reactos/mc/netmsgmsg.mc
+++ b/sdk/include/reactos/mc/netmsgmsg.mc
@@ -20272,27 +20272,31 @@ Language=English
 Drive %1 is now connected to %2.
 .
 Language=Polish
-Drive %1 is now connected to %2.
+%1 jest obecnie podłączony do %2.
 .
 Language=Romanian
-Drive %1 is now connected to %2.
+Conectarea %1 la %2 a fost realizată.
 .
 Language=Russian
-Drive %1 is now connected to %2.
+%1 сейчас подключен к %2.
 .
 Language=Spanish
 Drive %1 is now connected to %2.
 .
 Language=Turkish
-Drive %1 is now connected to %2.
+%1 şuna bağlandı: %2
 .
 Language=Chinese
-Drive %1 is now connected to %2.
+%1 现在连接到 %2.
 .
 Language=Taiwanese
 Drive %1 is now connected to %2.
 .
 
+; Language=Italian
+; %1 è ora connesso con %2.
+; .
+
 MessageId=3920
 Severity=Success
 Facility=System


    