From fb4e02aa9026eb237c743b188dda45096712beaa Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sun, 11 Dec 2016 09:01:22 +0000 Subject: [PATCH] [NET/USE] Allow some strings to be translated svn path=/trunk/; revision=73447 --- .../base/applications/network/net/cmdUse.c | 4 ++-- .../applications/network/net/lang/en-US.rc | 3 +++ .../applications/network/net/lang/es-ES.rc | 3 +++ .../applications/network/net/lang/ro-RO.rc | 3 +++ .../applications/network/net/lang/ru-RU.rc | 3 +++ .../applications/network/net/lang/tr-TR.rc | 3 +++ .../applications/network/net/lang/zh-CN.rc | 3 +++ .../applications/network/net/lang/zh-TW.rc | 3 +++ .../base/applications/network/net/resource.h | 19 +++++++++++-------- 9 files changed, 34 insertions(+), 10 deletions(-) diff --git a/reactos/base/applications/network/net/cmdUse.c b/reactos/base/applications/network/net/cmdUse.c index 922da5fe631..2a383101458 100644 --- a/reactos/base/applications/network/net/cmdUse.c +++ b/reactos/base/applications/network/net/cmdUse.c @@ -192,12 +192,12 @@ 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) - ConPrintf(StdOut, L"%s is now connected to %s\n", argv[3], Access); + ConResPrintf(StdOut, IDS_USE_NOW_CONNECTED, argv[3], Access); else if (Status != NO_ERROR) { LPWSTR Buffer; - ConPrintf(StdErr, L"The system error %d happened.\n", Status); + ConResPrintf(StdErr, IDS_ERROR_SYSTEM_ERROR, Status); if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, Status, 0, (LPWSTR)&Buffer, 0, NULL)) { diff --git a/reactos/base/applications/network/net/lang/en-US.rc b/reactos/base/applications/network/net/lang/en-US.rc index 938bd000da9..e8914c15dd9 100644 --- a/reactos/base/applications/network/net/lang/en-US.rc +++ b/reactos/base/applications/network/net/lang/en-US.rc @@ -111,6 +111,8 @@ BEGIN IDS_USER_ENTER_PASSWORD2 "Enter the password again: " IDS_USER_NO_PASSWORD_MATCH "The passwords do not match!" + IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" + IDS_GENERIC_YES "Yes" IDS_GENERIC_NO "No" IDS_GENERIC_NEVER "Never" @@ -120,4 +122,5 @@ BEGIN IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" + IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" END diff --git a/reactos/base/applications/network/net/lang/es-ES.rc b/reactos/base/applications/network/net/lang/es-ES.rc index fc3e12f2106..4367d02b8d6 100644 --- a/reactos/base/applications/network/net/lang/es-ES.rc +++ b/reactos/base/applications/network/net/lang/es-ES.rc @@ -114,6 +114,8 @@ BEGIN IDS_USER_ENTER_PASSWORD2 "Vuelva a escribir la contraseña: " IDS_USER_NO_PASSWORD_MATCH "Las contraseñas no coinciden." + IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" + IDS_GENERIC_YES "Sí" IDS_GENERIC_NO "No" IDS_GENERIC_NEVER "Nunca" @@ -123,4 +125,5 @@ BEGIN IDS_ERROR_OPTION_NOT_SUPPORTED "La opción %s todavía no está disponible.\n" IDS_ERROR_INVALID_OPTION_VALUE "El valor para la opción %s no es válido.\n" + IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" END diff --git a/reactos/base/applications/network/net/lang/ro-RO.rc b/reactos/base/applications/network/net/lang/ro-RO.rc index d05d3b130a9..561ea62a11f 100644 --- a/reactos/base/applications/network/net/lang/ro-RO.rc +++ b/reactos/base/applications/network/net/lang/ro-RO.rc @@ -117,6 +117,8 @@ BEGIN IDS_USER_ENTER_PASSWORD2 "Introduceți din nou parola: " IDS_USER_NO_PASSWORD_MATCH "Parolele diferă!" + IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" + IDS_GENERIC_YES "Da" IDS_GENERIC_NO "Nu" IDS_GENERIC_NEVER "Niciodată" @@ -126,4 +128,5 @@ BEGIN IDS_ERROR_OPTION_NOT_SUPPORTED "Opţiunea %s încă nu este admisă.\n" IDS_ERROR_INVALID_OPTION_VALUE "Aţi introdus o valoare nevalidă pentru opţiunea %s.\n" + IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" END diff --git a/reactos/base/applications/network/net/lang/ru-RU.rc b/reactos/base/applications/network/net/lang/ru-RU.rc index 47e216328d1..60e66b19505 100644 --- a/reactos/base/applications/network/net/lang/ru-RU.rc +++ b/reactos/base/applications/network/net/lang/ru-RU.rc @@ -113,6 +113,8 @@ BEGIN IDS_USER_ENTER_PASSWORD2 "Повторите ввод пароля для подтверждения: " IDS_USER_NO_PASSWORD_MATCH "Пароли не совпадают!" + IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" + IDS_GENERIC_YES "Да" IDS_GENERIC_NO "Нет" IDS_GENERIC_NEVER "Никогда" @@ -122,4 +124,5 @@ BEGIN IDS_ERROR_OPTION_NOT_SUPPORTED "Опция %s в данный момент не поддерживается.\n" IDS_ERROR_INVALID_OPTION_VALUE "Вы ввели неверный данные для данной опции %s.\n" + IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" END diff --git a/reactos/base/applications/network/net/lang/tr-TR.rc b/reactos/base/applications/network/net/lang/tr-TR.rc index 246d48ab149..44de3db7430 100644 --- a/reactos/base/applications/network/net/lang/tr-TR.rc +++ b/reactos/base/applications/network/net/lang/tr-TR.rc @@ -113,6 +113,8 @@ BEGIN IDS_USER_ENTER_PASSWORD2 "Şifreyi yeniden giriniz: " IDS_USER_NO_PASSWORD_MATCH "Şifreler uyuşmuyor!" + IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" + IDS_GENERIC_YES "Evet" IDS_GENERIC_NO "Hayır" IDS_GENERIC_NEVER "Hiçbir Zaman" @@ -122,4 +124,5 @@ BEGIN IDS_ERROR_OPTION_NOT_SUPPORTED "%s seçeneği daha desteklenmiyor.\n" IDS_ERROR_INVALID_OPTION_VALUE "%s seçeneği için geçersiz bir değer girdiniz.\n" + IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" END diff --git a/reactos/base/applications/network/net/lang/zh-CN.rc b/reactos/base/applications/network/net/lang/zh-CN.rc index b6b544037c5..0f20d22afdc 100644 --- a/reactos/base/applications/network/net/lang/zh-CN.rc +++ b/reactos/base/applications/network/net/lang/zh-CN.rc @@ -113,6 +113,8 @@ BEGIN IDS_USER_ENTER_PASSWORD2 "再次输入密码: " IDS_USER_NO_PASSWORD_MATCH "密码不匹配!" + IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" + IDS_GENERIC_YES "是" IDS_GENERIC_NO "否" IDS_GENERIC_NEVER "永不" @@ -122,4 +124,5 @@ BEGIN IDS_ERROR_OPTION_NOT_SUPPORTED "尚不支持 %s 选项。\n" IDS_ERROR_INVALID_OPTION_VALUE "Y您输入了无效的值为 %s 选项。\n" + IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" END diff --git a/reactos/base/applications/network/net/lang/zh-TW.rc b/reactos/base/applications/network/net/lang/zh-TW.rc index d45ed3df8d7..b22d9ce910e 100644 --- a/reactos/base/applications/network/net/lang/zh-TW.rc +++ b/reactos/base/applications/network/net/lang/zh-TW.rc @@ -113,6 +113,8 @@ BEGIN IDS_USER_ENTER_PASSWORD2 "再次輸入密碼: " IDS_USER_NO_PASSWORD_MATCH "密碼不匹配!" + IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" + IDS_GENERIC_YES "是" IDS_GENERIC_NO "否" IDS_GENERIC_NEVER "永不" @@ -122,4 +124,5 @@ BEGIN IDS_ERROR_OPTION_NOT_SUPPORTED "尚不支援 %s 選項。\n" IDS_ERROR_INVALID_OPTION_VALUE "您輸入了無效的值為 %s 選項。\n" + IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" END diff --git a/reactos/base/applications/network/net/resource.h b/reactos/base/applications/network/net/resource.h index daedcefb289..a90a15d74b0 100644 --- a/reactos/base/applications/network/net/resource.h +++ b/reactos/base/applications/network/net/resource.h @@ -91,12 +91,15 @@ #define IDS_USER_ENTER_PASSWORD2 491 #define IDS_USER_NO_PASSWORD_MATCH 492 -#define IDS_GENERIC_YES 500 -#define IDS_GENERIC_NO 501 -#define IDS_GENERIC_NEVER 502 -#define IDS_GENERIC_NONE 503 -#define IDS_GENERIC_ALL 504 -#define IDS_GENERIC_LOCKED 505 +#define IDS_USE_NOW_CONNECTED 500 -#define IDS_ERROR_OPTION_NOT_SUPPORTED 600 -#define IDS_ERROR_INVALID_OPTION_VALUE 601 +#define IDS_GENERIC_YES 600 +#define IDS_GENERIC_NO 601 +#define IDS_GENERIC_NEVER 602 +#define IDS_GENERIC_NONE 603 +#define IDS_GENERIC_ALL 604 +#define IDS_GENERIC_LOCKED 605 + +#define IDS_ERROR_OPTION_NOT_SUPPORTED 700 +#define IDS_ERROR_INVALID_OPTION_VALUE 701 +#define IDS_ERROR_SYSTEM_ERROR 702