diff --git a/po/ar.po b/po/ar.po index a489c563fa6..225c172fc98 100644 --- a/po/ar.po +++ b/po/ar.po @@ -102,7 +102,7 @@ msgstr "معلومات الدّعم" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -16309,11 +16309,11 @@ msgstr "تم إيقاف الخدمة %1 بنجاح.\n" msgid "The %1 service failed to stop.\n" msgstr "فشل إيقاف الخدمة %1 .\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "لا يوجد مدخلات قي القائمة .\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -16323,27 +16323,27 @@ msgstr "" "الحالة محلي بعيد\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "ــ %1 %2 %3 المصادر المفتوحة: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "متوقف" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "مفصول" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "حدث خطأ في الشبكة" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "يجري إنشاء الاتصال" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "إعادة الاتصال" @@ -16351,6 +16351,10 @@ msgstr "إعادة الاتصال" msgid "The following services are running:\n" msgstr "يجري تشغيل الخدمات التالية:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "الاتصالات النشطة" diff --git a/po/ast.po b/po/ast.po index a806290ba0a..e18b601b575 100644 --- a/po/ast.po +++ b/po/ast.po @@ -101,7 +101,7 @@ msgstr "" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15100,38 +15100,38 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "El seriviciu %1 falló al parar.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Nun hai entraes na llista.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -15139,6 +15139,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "Los servicios de darréu tán n'execución:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Conexones actives" diff --git a/po/bg.po b/po/bg.po index 35452bdcfe7..c798765a223 100644 --- a/po/bg.po +++ b/po/bg.po @@ -103,7 +103,7 @@ msgstr "Информация" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14979,42 +14979,42 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "Оставащ размер" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 #, fuzzy msgid "Paused" msgstr "Преустановено; " -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 #, fuzzy msgid "Disconnected" msgstr "Файлът не е намерен" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 #, fuzzy msgid "A network error occurred" msgstr "Появи се грешка при печатането." -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 #, fuzzy msgid "Connection is being made" msgstr "LAN връзка" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -15022,6 +15022,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 #, fuzzy #| msgid "LAN Connection" diff --git a/po/ca.po b/po/ca.po index 79d6cdd5201..84ad6ed4f59 100644 --- a/po/ca.po +++ b/po/ca.po @@ -100,7 +100,7 @@ msgstr "Informació de suport" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15111,11 +15111,11 @@ msgstr "S'ha aturat el servei %1 amb èxit.\n" msgid "The %1 service failed to stop.\n" msgstr "El servei %1 ha fallat en aturar.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "No hi ha cap entrada en la llista.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15125,27 +15125,27 @@ msgstr "" "Estat Local Remot\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Recursos oberts: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "En pausa" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Desconnectat" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Ha ocorregut un error de xarxa" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "S'està fent la connexió" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "S'està reconnectant" @@ -15153,6 +15153,10 @@ msgstr "S'està reconnectant" msgid "The following services are running:\n" msgstr "Els següents serveis s'estan executant:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Connexions actives" diff --git a/po/cs.po b/po/cs.po index 9ab8de9960e..c7b17fb6095 100644 --- a/po/cs.po +++ b/po/cs.po @@ -105,7 +105,7 @@ msgstr "Informace o podpoře" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15811,11 +15811,11 @@ msgstr "Zastavení služby %1 skončilo úspěšně.\n" msgid "The %1 service failed to stop.\n" msgstr "Zastavení služby %1 skončilo chybou.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Seznam neobsahuje žádné položky.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15825,27 +15825,27 @@ msgstr "" "Stav Místní Vzdálené\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Otevřené zdroje: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Pozastaveno" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Odpojeno" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Nastala chyba sítě" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Probíhá navazování spojení" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Probíhá opětovné navázání spojení" @@ -15853,6 +15853,10 @@ msgstr "Probíhá opětovné navázání spojení" msgid "The following services are running:\n" msgstr "Následující služby jsou spuštěny:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Aktivní připojení" diff --git a/po/da.po b/po/da.po index 6f37e81908a..5f3b60d6bb5 100644 --- a/po/da.po +++ b/po/da.po @@ -104,7 +104,7 @@ msgstr "Support information" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -16223,11 +16223,11 @@ msgstr "Tjenesten «%1» stoppede vellykket.\n" msgid "The %1 service failed to stop.\n" msgstr "Kunne ikke stoppe tjenesten «%1».\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Det er ingen elementer i listen.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -16237,27 +16237,27 @@ msgstr "" "Status Lokal Fjern\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Åbne resourser: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "&Pauset" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Forbindelse mistet" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Der opstod en netværks fejl" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Forbindelse etableres" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Genskaber forbindelse" @@ -16265,6 +16265,10 @@ msgstr "Genskaber forbindelse" msgid "The following services are running:\n" msgstr "Følgende tjenester kører:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 #, fuzzy #| msgid "LAN Connection" diff --git a/po/de.po b/po/de.po index c8825862c4b..a72c65ca9db 100644 --- a/po/de.po +++ b/po/de.po @@ -99,7 +99,7 @@ msgstr "Informationen" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15063,11 +15063,11 @@ msgstr "Der Dienst %1 wurde erfolgreich beendet.\n" msgid "The %1 service failed to stop.\n" msgstr "Der Dienst %1 konnte nicht beendet werden.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Es sind keine Einträge in der Liste.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15077,27 +15077,27 @@ msgstr "" "Status Lokal Entfernt\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Offene Ressourcen: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Angehalten" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Getrennt" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Ein Netzwerkfehler ist aufgetreten" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Verbindung wird hergestellt" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Erneuter Verbindungsaufbau" @@ -15105,6 +15105,10 @@ msgstr "Erneuter Verbindungsaufbau" msgid "The following services are running:\n" msgstr "Die folgenden Dienste laufen:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Aktive Verbindungen" diff --git a/po/el.po b/po/el.po index 3b8d073a275..b6c5fff0b58 100644 --- a/po/el.po +++ b/po/el.po @@ -98,7 +98,7 @@ msgstr "" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14723,41 +14723,41 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 #, fuzzy msgid "Paused" msgstr "Σταματημένος; " -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 #, fuzzy msgid "Disconnected" msgstr "Το αρχείο δε βρέθηκε" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 #, fuzzy msgid "A network error occurred" msgstr "Προκλήθηκε σφάλμα εκτυπωτή." -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -14765,6 +14765,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 #, fuzzy msgid "Active Connections" diff --git a/po/en.po b/po/en.po index 00aae7c0b7a..0404c08bff0 100644 --- a/po/en.po +++ b/po/en.po @@ -98,7 +98,7 @@ msgstr "Support Information" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14980,11 +14980,11 @@ msgstr "The %1 service was stopped successfully.\n" msgid "The %1 service failed to stop.\n" msgstr "The %1 service failed to stop.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "There are no entries in the list.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -14994,27 +14994,27 @@ msgstr "" "Status Local Remote\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Open resources: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Paused" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Disconnected" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "A network error occurred" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Connection is being made" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Reconnecting" @@ -15022,6 +15022,10 @@ msgstr "Reconnecting" msgid "The following services are running:\n" msgstr "The following services are running:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "A command was used with conflicting switches.\n" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Active Connections" diff --git a/po/en_US.po b/po/en_US.po index 10a5336e461..dc8e78e3e4f 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -98,7 +98,7 @@ msgstr "Support Information" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14980,11 +14980,11 @@ msgstr "The %1 service was stopped successfully.\n" msgid "The %1 service failed to stop.\n" msgstr "The %1 service failed to stop.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "There are no entries in the list.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -14994,27 +14994,27 @@ msgstr "" "Status Local Remote\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Open resources: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Paused" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Disconnected" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "A network error occurred" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Connection is being made" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Reconnecting" @@ -15022,6 +15022,10 @@ msgstr "Reconnecting" msgid "The following services are running:\n" msgstr "The following services are running:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "A command was used with conflicting switches.\n" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Active Connections" diff --git a/po/eo.po b/po/eo.po index f7f5a11351f..873826f5fa7 100644 --- a/po/eo.po +++ b/po/eo.po @@ -109,7 +109,7 @@ msgstr "Informoj pri Helpo" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15346,38 +15346,38 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "La servo %1 malsukcesis ĉesi.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Paŭzinta" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Malkonektita" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Okazis reta eraro" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Konekto fariĝas" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Rekonektante" @@ -15385,6 +15385,10 @@ msgstr "Rekonektante" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 #, fuzzy #| msgid "LAN Connection" diff --git a/po/es.po b/po/es.po index 24782dfd5e6..eb50db4c67f 100644 --- a/po/es.po +++ b/po/es.po @@ -99,7 +99,7 @@ msgstr "Información de Soporte" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15671,11 +15671,11 @@ msgstr "El servicio %1 se paró con éxito.\n" msgid "The %1 service failed to stop.\n" msgstr "El servicio %1 no se ha podido parar.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "No hay entradas en el listado.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15685,27 +15685,27 @@ msgstr "" "Estado Local Remoto\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Recursos abiertos: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Pausado" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Desconectado" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Ha ocurrido un error de red" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Se está realizando la conexión" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Reconectando" @@ -15713,6 +15713,10 @@ msgstr "Reconectando" msgid "The following services are running:\n" msgstr "Los siguientes servicios están en ejecución:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Conexiones Activas" diff --git a/po/fa.po b/po/fa.po index f758a88b28d..07095e307bd 100644 --- a/po/fa.po +++ b/po/fa.po @@ -97,7 +97,7 @@ msgstr "اطلاعات" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14907,38 +14907,38 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -14946,6 +14946,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 #, fuzzy msgid "Active Connections" diff --git a/po/fi.po b/po/fi.po index a76bd0695f8..334ab64e0c5 100644 --- a/po/fi.po +++ b/po/fi.po @@ -97,7 +97,7 @@ msgstr "Tukitietoja" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14954,11 +14954,11 @@ msgstr "Palvelu %1 pysähtyi onnistuneesti.\n" msgid "The %1 service failed to stop.\n" msgstr "Palvelun %1 pysähtyminen epäonnistui.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Listalla ei ole jäseniä.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -14968,27 +14968,27 @@ msgstr "" "Tila Paikallinen Etä\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Avoimia resursseja: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Pysäytetty" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Yhteys katkaistu" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Verkkovirhe" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Yhteyttä muodostetaan" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Yhdistetään uudelleen" @@ -14996,6 +14996,10 @@ msgstr "Yhdistetään uudelleen" msgid "The following services are running:\n" msgstr "Seuraavat palvelut ovat toiminnassa:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Aktiiviset yhteydet" diff --git a/po/fr.po b/po/fr.po index 011476d3fbf..a014fc6f7c8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -98,7 +98,7 @@ msgstr "Informations de support" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15595,11 +15595,11 @@ msgstr "Le service %1 a été arrêté avec succès.\n" msgid "The %1 service failed to stop.\n" msgstr "Le service %1 n'a pas pu être arrêté.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Il n'y a aucune entrée dans la liste.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15609,27 +15609,27 @@ msgstr "" "Statut Local Distant\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Ressources ouvertes : %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "En pause" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Déconnecté" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Une erreur réseau s'est produite" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Connexion en cours" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Reconnexion" @@ -15637,6 +15637,10 @@ msgstr "Reconnexion" msgid "The following services are running:\n" msgstr "Les services suivants sont en cours d'exécution :\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Connexions actives" diff --git a/po/he.po b/po/he.po index 01d7713a7b1..cab489116e6 100644 --- a/po/he.po +++ b/po/he.po @@ -110,7 +110,7 @@ msgstr "פרטי תמיכה" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15769,11 +15769,11 @@ msgstr "The %1 service was stopped successfully.\n" msgid "The %1 service failed to stop.\n" msgstr "The %1 service failed to stop.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "There are no entries in the list.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15783,27 +15783,27 @@ msgstr "" "Status Local Remote\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Open resources: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Paused" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Disconnected" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "A network error occurred" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Connection is being made" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Reconnecting" @@ -15811,6 +15811,10 @@ msgstr "Reconnecting" msgid "The following services are running:\n" msgstr "The following services are running:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Active Connections" diff --git a/po/hi.po b/po/hi.po index 3a758abb92e..635e4f623b3 100644 --- a/po/hi.po +++ b/po/hi.po @@ -95,7 +95,7 @@ msgstr "" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14450,38 +14450,38 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -14489,6 +14489,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "" diff --git a/po/hr.po b/po/hr.po index 5df33c8c389..8bc8d9a00af 100644 --- a/po/hr.po +++ b/po/hr.po @@ -104,7 +104,7 @@ msgstr "Informacije o podršci" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15773,11 +15773,11 @@ msgstr "Servis %1 je uspješno zaustavljen.\n" msgid "The %1 service failed to stop.\n" msgstr "Servis %1 nije uspješno zaustavljen.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Nema unosa u listi.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15787,27 +15787,27 @@ msgstr "" "Status Lokalno Udaljeno\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Otvoreni resursi: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Pauzirano" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Odspojeno" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Dogodila se mrežna pogreška" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Veza se stvara" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Ponovno povezivanje" @@ -15815,6 +15815,10 @@ msgstr "Ponovno povezivanje" msgid "The following services are running:\n" msgstr "Sljedeći servisi se izvode:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Aktivne veze" diff --git a/po/hu.po b/po/hu.po index d71ed0fcb71..da9ea17f9ff 100644 --- a/po/hu.po +++ b/po/hu.po @@ -104,7 +104,7 @@ msgstr "Támogatási információ" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -16216,11 +16216,11 @@ msgstr "%1 szervíz sikeresen leállt.\n" msgid "The %1 service failed to stop.\n" msgstr "%1 szervíz leállítása sikertelen.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Nincsenek elemek a listában.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -16230,27 +16230,27 @@ msgstr "" "Állapot Hely Távoli\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Megnyitottak : %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Felfüggesztve" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Lecsatlakozott" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Hálózati hiba történt" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "LAN kapcsolat" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Újrakapcsolódás" @@ -16258,6 +16258,10 @@ msgstr "Újrakapcsolódás" msgid "The following services are running:\n" msgstr "A következő szolgáltatások futnak:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 #, fuzzy #| msgid "LAN Connection" diff --git a/po/it.po b/po/it.po index 47823913200..76b8ddd271c 100644 --- a/po/it.po +++ b/po/it.po @@ -109,7 +109,7 @@ msgstr "Informazioni di supporto" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -16295,11 +16295,11 @@ msgstr "Il servizio %1 è stato fermato con successo.\n" msgid "The %1 service failed to stop.\n" msgstr "Impossibile fermare il servizio %1.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Non ci sono elementi nell'elenco.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -16309,27 +16309,27 @@ msgstr "" "Stato Locale Remoto\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Risorse aperte: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "In pausa" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Disconnesso" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Errore di rete" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Connessione in corso" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Riconnessione" @@ -16337,6 +16337,10 @@ msgstr "Riconnessione" msgid "The following services are running:\n" msgstr "I seguenti servizi sono in esecuzione:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 #, fuzzy #| msgid "LAN Connection" diff --git a/po/ja.po b/po/ja.po index 2bbce3ca80d..72038f62c0c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -99,7 +99,7 @@ msgstr "サポート情報" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15001,11 +15001,11 @@ msgstr "%1 サービスは停止しました。\n" msgid "The %1 service failed to stop.\n" msgstr "%1 サービスの停止に失敗しました。\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "一覧にエントリがありません。\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15015,27 +15015,27 @@ msgstr "" "状態 ローカル リモート\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 リソース数: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "中断" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "切断" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "ネットワーク エラーが発生しました" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "接続を確立中です" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "再接続中です" @@ -15043,6 +15043,10 @@ msgstr "再接続中です" msgid "The following services are running:\n" msgstr "以下のサービスが実行中です:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "アクティブな接続" diff --git a/po/ka.po b/po/ka.po index 56f747640e3..63ea8c38e87 100644 --- a/po/ka.po +++ b/po/ka.po @@ -101,7 +101,7 @@ msgstr "მხარდაჭერის ინფორმაცია" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14571,11 +14571,11 @@ msgstr "სერვისი %1 წარმატებით გაჩერ msgid "The %1 service failed to stop.\n" msgstr "სერვისის %1 გაჩერებს შეცდომა.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "სიაში ჩანაწერები არ არსებობს.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -14585,27 +14585,27 @@ msgstr "" "სტატუსი ლოკალური დაშორებული\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 ღია რესურსები: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "დაპაუზებულია" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "გათიშულია" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "აღმოჩენილია ქსელური შეცდომა" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "მიმდინარეობს დაკავშირება" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "თავიდან დაკავშირება" @@ -14613,6 +14613,10 @@ msgstr "თავიდან დაკავშირება" msgid "The following services are running:\n" msgstr "გაშვებულია შემდეგი სერვისები:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "აქტიური შეერთებები" diff --git a/po/ko.po b/po/ko.po index 29e505a073f..069c88d4d3e 100644 --- a/po/ko.po +++ b/po/ko.po @@ -97,7 +97,7 @@ msgstr "지원 정보" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14957,11 +14957,11 @@ msgstr "%1 서비스를 중지했습니다.\n" msgid "The %1 service failed to stop.\n" msgstr "%1 서비스를 중지하지 못했습니다.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "목록에 항목이 없습니다.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -14971,27 +14971,27 @@ msgstr "" "상태 로컬 원격\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 열린 리소스: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "일지 중지" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "연결 끊김" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "네트워크 오류 발생" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "연결 중" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "다시 연결 중" @@ -14999,6 +14999,10 @@ msgstr "다시 연결 중" msgid "The following services are running:\n" msgstr "실행 중인 서비스:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "활성 연결" diff --git a/po/lt.po b/po/lt.po index a995ab7846c..a3b8ab368b0 100644 --- a/po/lt.po +++ b/po/lt.po @@ -100,7 +100,7 @@ msgstr "Priežiūros informacija" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14986,11 +14986,11 @@ msgstr "Tarnyba %1 sėkmingai sustabdyta.\n" msgid "The %1 service failed to stop.\n" msgstr "Tarnyba %1 nesustojo.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Sąraše nėra elementų.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15000,27 +15000,27 @@ msgstr "" "Būsena Vietinė Nutolusi\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Atverti ištekliai: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Pristabdyta" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Atjungta" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Įvyko tinklo klaida" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Jungiamasi" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Jungiamasi iš naujo" @@ -15028,6 +15028,10 @@ msgstr "Jungiamasi iš naujo" msgid "The following services are running:\n" msgstr "Šios tarnybos vykdomos:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Aktyvūs ryšiai" diff --git a/po/ml.po b/po/ml.po index 93ae0c8028e..bbe4e784282 100644 --- a/po/ml.po +++ b/po/ml.po @@ -99,7 +99,7 @@ msgstr "പിന്തുണ വിവരം" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14449,38 +14449,38 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -14488,6 +14488,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index ee861986d6d..5b4cbe68db7 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -99,7 +99,7 @@ msgstr "Støtteinformasjon" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15788,11 +15788,11 @@ msgstr "Tjenesten \"%1\" ble stoppet.\n" msgid "The %1 service failed to stop.\n" msgstr "Klarte ikke stoppe tjenesten \"%1\".\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Det er ingen oppføringer på listen.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15802,27 +15802,27 @@ msgstr "" "Status Lokal Remote\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Åpne ressurser: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Satt på pause" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Frakoblet" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "En nettverksfeil oppstod" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Kobler til" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Kobler til på nytt" @@ -15830,6 +15830,10 @@ msgstr "Kobler til på nytt" msgid "The following services are running:\n" msgstr "Følgende tjenester kjører:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Aktive tilkoblinger" diff --git a/po/nl.po b/po/nl.po index 77e258ed624..b08199cf7c7 100644 --- a/po/nl.po +++ b/po/nl.po @@ -98,7 +98,7 @@ msgstr "Ondersteuning" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15036,11 +15036,11 @@ msgstr "Service %1 is succesvol gestopt.\n" msgid "The %1 service failed to stop.\n" msgstr "Stoppen van service %1 is mislukt.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "De opgegeven lijst is leeg.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15050,27 +15050,27 @@ msgstr "" "Status Lokaal Op afstand\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Open bronnen: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Onderbroken" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Verbinding verbroken" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Er is een netwerkfout opgetreden" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "De verbinding wordt gemaakt" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Opnieuw verbinden" @@ -15078,6 +15078,10 @@ msgstr "Opnieuw verbinden" msgid "The following services are running:\n" msgstr "De volgende services draaien:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Actieve verbindingen" diff --git a/po/or.po b/po/or.po index 112b39e66c3..4cd4c248e29 100644 --- a/po/or.po +++ b/po/or.po @@ -95,7 +95,7 @@ msgstr "" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14435,38 +14435,38 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -14474,6 +14474,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "" diff --git a/po/pa.po b/po/pa.po index 6b2f84d57e7..5d91da53555 100644 --- a/po/pa.po +++ b/po/pa.po @@ -95,7 +95,7 @@ msgstr "" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14435,38 +14435,38 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -14474,6 +14474,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "" diff --git a/po/pl.po b/po/pl.po index e040d1b473b..4a540bd6ac9 100644 --- a/po/pl.po +++ b/po/pl.po @@ -103,7 +103,7 @@ msgstr "Szczegóły wsparcia" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15145,11 +15145,11 @@ msgstr "Pomyślne zatrzymanie usługi %1.\n" msgid "The %1 service failed to stop.\n" msgstr "Nieudane zatrzymanie usługi %1.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Brak pozycji na liście.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15159,27 +15159,27 @@ msgstr "" "Status Lokalny Zdalny\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Otwarte zasoby: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Wstrzymano" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Rozłączono" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Wystąpił błąd sieci" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Połączenie jest nawiązywane" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Ponowne łączenie" @@ -15187,6 +15187,10 @@ msgstr "Ponowne łączenie" msgid "The following services are running:\n" msgstr "Uruchomione są następujące usługi:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Aktywne połączenia" diff --git a/po/pt_BR.po b/po/pt_BR.po index 71a03eae70d..b38b3b5815f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -99,7 +99,7 @@ msgstr "Informação de Suporte" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15199,11 +15199,11 @@ msgstr "O serviço %1 parou com sucesso.\n" msgid "The %1 service failed to stop.\n" msgstr "Falha ao parar o serviço %1.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Não há entradas na lista.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15213,27 +15213,27 @@ msgstr "" "Estado Local Remoto\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Recursos disponíveis: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Pausado" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Desconectado" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Ocorreu um erro na rede" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "A conexão está sendo estabelecida" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Reconectando" @@ -15241,6 +15241,10 @@ msgstr "Reconectando" msgid "The following services are running:\n" msgstr "Os seguintes serviços estão rodando:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Conexões Ativas" diff --git a/po/pt_PT.po b/po/pt_PT.po index 97ba467de42..2266f13e9d2 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -115,7 +115,7 @@ msgstr "Informação de Suporte" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15968,11 +15968,11 @@ msgstr "O serviço %1 foi parado com sucesso.\n" msgid "The %1 service failed to stop.\n" msgstr "O serviço %1 falhou a parar.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Não há entradas na lista.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15982,27 +15982,27 @@ msgstr "" "Estado Local Remoto\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Recursos disponíveis: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Pausado" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Desligado" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Ocorreu um erro na rede" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "A ligação está a ser estabelecida" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "A religar" @@ -16010,6 +16010,10 @@ msgstr "A religar" msgid "The following services are running:\n" msgstr "Os serviços seguintes estão em operação:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Conexões Ativas" diff --git a/po/rm.po b/po/rm.po index d2dca85b6ef..d4315d90cbe 100644 --- a/po/rm.po +++ b/po/rm.po @@ -99,7 +99,7 @@ msgstr "INFUORMAZIUN" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14526,38 +14526,38 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -14565,6 +14565,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "" diff --git a/po/ro.po b/po/ro.po index 1619c3384d3..c479d38157c 100644 --- a/po/ro.po +++ b/po/ro.po @@ -104,7 +104,7 @@ msgstr "Informații de asistență" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -16042,11 +16042,11 @@ msgstr "Serviciul %1 a fost oprit cu succes.\n" msgid "The %1 service failed to stop.\n" msgstr "Oprirea serviciului %1 a eșuat.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Nu există nici un element în listă.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -16056,27 +16056,27 @@ msgstr "" "Stare Local Distant\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Resurse deschise: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Pauzat" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Deconectat" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "S-a produs o eroare de rețea" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Se stabilește conexiunea" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Reconectare" @@ -16084,6 +16084,10 @@ msgstr "Reconectare" msgid "The following services are running:\n" msgstr "Următoarele servicii rulează:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Conexiuni active" diff --git a/po/ru.po b/po/ru.po index 54ffb548b19..9bc5310b569 100644 --- a/po/ru.po +++ b/po/ru.po @@ -105,7 +105,7 @@ msgstr "Сведения о поддержке" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15420,11 +15420,11 @@ msgstr "Служба %1 успешно остановлена.\n" msgid "The %1 service failed to stop.\n" msgstr "Ошибка при остановке службы %1.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Список пуст.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15434,27 +15434,27 @@ msgstr "" "Статус Локальный Удалённый\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Открытых ресурсов: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Приостановлена" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Отключено" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Произошла сетевая ошибка" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Соединение было установлено" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Переподключение" @@ -15462,6 +15462,10 @@ msgstr "Переподключение" msgid "The following services are running:\n" msgstr "Запущены следующие службы:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Активные подключения" diff --git a/po/si.po b/po/si.po index 948aff813b9..ee5696651f1 100644 --- a/po/si.po +++ b/po/si.po @@ -106,7 +106,7 @@ msgstr "තොරතුරු සඳහා සහාය" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15085,11 +15085,11 @@ msgstr "%1 සේවාව හරියට නැවතුනා.\n" msgid "The %1 service failed to stop.\n" msgstr "%1 සේවාව නවත්තන්න බැරි උනා.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15099,27 +15099,27 @@ msgstr "" "තත්වය පෙදෙසි දුරස්ථ\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "විසන්ධි කර ඇත" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "ජාල දෝෂයක් උනා" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "සබැඳුම දැන් හදනවා" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -15127,6 +15127,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "" diff --git a/po/sk.po b/po/sk.po index 8a00f9e9e10..d9e152a889f 100644 --- a/po/sk.po +++ b/po/sk.po @@ -109,7 +109,7 @@ msgstr "Informácie o podpore" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15502,40 +15502,40 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "Veľkosť k dispozícii" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 #, fuzzy msgid "Paused" msgstr "Pozastavená; " -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 #, fuzzy msgid "Disconnected" msgstr "Súbor nenájdený" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -15543,6 +15543,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 #, fuzzy #| msgid "Activation" diff --git a/po/sl.po b/po/sl.po index df6c0267d9f..c91a3347edc 100644 --- a/po/sl.po +++ b/po/sl.po @@ -109,7 +109,7 @@ msgstr "Podporni podatki" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -16247,11 +16247,11 @@ msgstr "Storitev %1 je bila uspešno zaustavljena.\n" msgid "The %1 service failed to stop.\n" msgstr "Zaustavitev storitve %1 je spodletela.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Na seznamu ni vnosov.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -16261,27 +16261,27 @@ msgstr "" "Stanje Krajevno Oddaljeno\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Odprti viri: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "V premoru" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Povezava je bila prekinjena" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Prišlo je do omrežne napake" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Povezava se vzpostavlja" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Ponovno povezovanje" @@ -16289,6 +16289,10 @@ msgstr "Ponovno povezovanje" msgid "The following services are running:\n" msgstr "Izvajajo se naslednje storitve:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 #, fuzzy #| msgid "LAN Connection" diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index 04c84ce4409..ab208650fb3 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -104,7 +104,7 @@ msgstr "Подршка" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15542,42 +15542,42 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "Неисправни акредитиви" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 #, fuzzy msgid "Paused" msgstr "Паузирано; " -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 #, fuzzy msgid "Disconnected" msgstr "Датотека није пронађена" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 #, fuzzy msgid "A network error occurred" msgstr "Дошло је до грешке у штампачу." -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 #, fuzzy msgid "Connection is being made" msgstr "LAN веза" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 #, fuzzy msgid "Reconnecting" msgstr "Повезивање на %s" @@ -15586,6 +15586,10 @@ msgstr "Повезивање на %s" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 #, fuzzy #| msgid "LAN Connection" diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index c2aa89cdf43..9d0a78eb2f7 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -104,7 +104,7 @@ msgstr "Podrška" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15697,42 +15697,42 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "Neispravni akreditivi" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 #, fuzzy msgid "Paused" msgstr "Pauzirano; " -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 #, fuzzy msgid "Disconnected" msgstr "Datoteka nije pronađena" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 #, fuzzy msgid "A network error occurred" msgstr "Došlo je do greške u štampaču." -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 #, fuzzy msgid "Connection is being made" msgstr "LAN veza" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 #, fuzzy msgid "Reconnecting" msgstr "Povezivanje na %s" @@ -15741,6 +15741,10 @@ msgstr "Povezivanje na %s" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 #, fuzzy #| msgid "LAN Connection" diff --git a/po/sv.po b/po/sv.po index 320d0529c6f..518e3fd2202 100644 --- a/po/sv.po +++ b/po/sv.po @@ -105,7 +105,7 @@ msgstr "Supportinformation" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15922,11 +15922,11 @@ msgstr "Tjänsten %1 har stoppats.\n" msgid "The %1 service failed to stop.\n" msgstr "Tjänsten %1 kunde inte stoppas.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Det finns inga poster i listan.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15936,27 +15936,27 @@ msgstr "" "Status Lokal Fjärransluten\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Öppna resurser: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Pausad" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Kopplat ifrån" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Ett nätverksfel inträffade" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Anslutning upprättas" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Ansluter igen" @@ -15964,6 +15964,10 @@ msgstr "Ansluter igen" msgid "The following services are running:\n" msgstr "Följande tjänster körs:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Aktiva anslutningar" diff --git a/po/ta.po b/po/ta.po index be405183f43..7cc420c3634 100644 --- a/po/ta.po +++ b/po/ta.po @@ -102,7 +102,7 @@ msgstr "ஆதரவு தகவல்" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14425,38 +14425,38 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -14464,6 +14464,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "" diff --git a/po/te.po b/po/te.po index 831746b3e22..7e735a395e1 100644 --- a/po/te.po +++ b/po/te.po @@ -95,7 +95,7 @@ msgstr "" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14435,38 +14435,38 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -14474,6 +14474,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "" diff --git a/po/th.po b/po/th.po index 96ede016d18..37edc0bd1d7 100644 --- a/po/th.po +++ b/po/th.po @@ -100,7 +100,7 @@ msgstr "รายละเอียด" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15002,41 +15002,41 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "ประตูเครื่องพิมพ์เปิด; " -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 #, fuzzy msgid "Paused" msgstr "ชะลอ; " -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 #, fuzzy msgid "Disconnected" msgstr "ไม่พบแฟ้ม" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 #, fuzzy msgid "A network error occurred" msgstr "ความปิดเครื่องพิมพ์" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -15044,6 +15044,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 #, fuzzy msgid "Active Connections" diff --git a/po/tr.po b/po/tr.po index e89a42e60e0..6ff95e07e20 100644 --- a/po/tr.po +++ b/po/tr.po @@ -100,7 +100,7 @@ msgstr "Destek Bilgisi" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15017,11 +15017,11 @@ msgstr "%1 hizmeti başarıyla durduruldu.\n" msgid "The %1 service failed to stop.\n" msgstr "%1 hizmeti durdurulamadı.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Listede herhangi bir girdi yok.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15031,27 +15031,27 @@ msgstr "" "Durum Yerel Uzak\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Açık kaynaklar: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Duraklatıldı" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Bağlantı kesildi" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Bir ağ hatası oluştu" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "Bağlantı kuruluyor" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Tekrar bağlanılıyor" @@ -15059,6 +15059,10 @@ msgstr "Tekrar bağlanılıyor" msgid "The following services are running:\n" msgstr "Aşağıdaki hizmetler çalışıyor:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Etkin Bağlantılar" diff --git a/po/uk.po b/po/uk.po index 73c8f82709a..529b23edacf 100644 --- a/po/uk.po +++ b/po/uk.po @@ -97,7 +97,7 @@ msgstr "Дані підтримки" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -15293,11 +15293,11 @@ msgstr "Служба %1 успішно зупинена.\n" msgid "The %1 service failed to stop.\n" msgstr "Помилка зупинки служби %1.\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "Список порожній.\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -15307,27 +15307,27 @@ msgstr "" "Статус Локальний Віддалений\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 Відкритих ресурсів: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "Призупинено" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "Від'єднано" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "Виникла помилка мережі" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "З'єднання здійснене" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "Повторне з’єднання" @@ -15335,6 +15335,10 @@ msgstr "Повторне з’єднання" msgid "The following services are running:\n" msgstr "Запущені наступні служби:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "Активні Підключення" diff --git a/po/wa.po b/po/wa.po index 374e7114d5c..307581c1522 100644 --- a/po/wa.po +++ b/po/wa.po @@ -100,7 +100,7 @@ msgstr "Informåcion" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14894,38 +14894,38 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -14933,6 +14933,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "" diff --git a/po/wine.pot b/po/wine.pot index b9bc9cc8bd0..f724d0809ba 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -90,7 +90,7 @@ msgstr "" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14348,38 +14348,38 @@ msgstr "" msgid "The %1 service failed to stop.\n" msgstr "" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "" @@ -14387,6 +14387,10 @@ msgstr "" msgid "The following services are running:\n" msgstr "" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 435cb4ac3b2..fcd8951e5da 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -96,7 +96,7 @@ msgstr "技术支持信息" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14793,11 +14793,11 @@ msgstr "服务 %1 停止成功。\n" msgid "The %1 service failed to stop.\n" msgstr "服务 %1 停止失败。\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "列表中没有内容。\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -14807,27 +14807,27 @@ msgstr "" "状态 本地 远程\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 打开资源: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "已暂停" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "连接断开" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "网络错误" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "正在发起连接" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "正在重新连接" @@ -14835,6 +14835,10 @@ msgstr "正在重新连接" msgid "The following services are running:\n" msgstr "下列服务正在运行:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "活跃连接" diff --git a/po/zh_TW.po b/po/zh_TW.po index 315bcb7c23b..5a1f4e6acc7 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -96,7 +96,7 @@ msgstr "技術支援資訊" #: dlls/shlwapi/shlwapi.rc:44 dlls/twain_32/twain.rc:32 #: dlls/user32/user32.rc:94 dlls/user32/user32.rc:109 dlls/user32/user32.rc:73 #: dlls/wininet/wininet.rc:62 dlls/wininet/wininet.rc:82 -#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:47 +#: dlls/winspool.drv/winspool.rc:42 programs/net/net.rc:48 #: programs/notepad/notepad.rc:124 programs/oleview/oleview.rc:161 #: programs/oleview/oleview.rc:174 programs/progman/progman.rc:106 #: programs/progman/progman.rc:124 programs/progman/progman.rc:142 @@ -14849,11 +14849,11 @@ msgstr "%1 服務已成功停止。\n" msgid "The %1 service failed to stop.\n" msgstr "無法停止 %1 服務。\n" -#: programs/net/net.rc:44 +#: programs/net/net.rc:45 msgid "There are no entries in the list.\n" msgstr "在清單中沒有項目。\n" -#: programs/net/net.rc:45 +#: programs/net/net.rc:46 msgid "" "\n" "Status Local Remote\n" @@ -14863,27 +14863,27 @@ msgstr "" "狀態 本機 遠端\n" "---------------------------------------------------------------\n" -#: programs/net/net.rc:46 +#: programs/net/net.rc:47 msgid "%1 %2 %3 Open resources: %4!u!\n" msgstr "%1 %2 %3 開啟資源: %4!u!\n" -#: programs/net/net.rc:48 +#: programs/net/net.rc:49 msgid "Paused" msgstr "已暫停" -#: programs/net/net.rc:49 +#: programs/net/net.rc:50 msgid "Disconnected" msgstr "已離線" -#: programs/net/net.rc:50 +#: programs/net/net.rc:51 msgid "A network error occurred" msgstr "網路發生了錯誤" -#: programs/net/net.rc:51 +#: programs/net/net.rc:52 msgid "Connection is being made" msgstr "正在連線" -#: programs/net/net.rc:52 +#: programs/net/net.rc:53 msgid "Reconnecting" msgstr "正在重新連線" @@ -14891,6 +14891,10 @@ msgstr "正在重新連線" msgid "The following services are running:\n" msgstr "下列服務正在執行:\n" +#: programs/net/net.rc:44 +msgid "A command was used with conflicting switches.\n" +msgstr "" + #: programs/netstat/netstat.rc:30 msgid "Active Connections" msgstr "作用中的連線" diff --git a/programs/net/net.c b/programs/net/net.c index 758c667dd49..db0933ae78f 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -291,6 +291,31 @@ static BOOL arg_is(const WCHAR* str1, const WCHAR* str2) int __cdecl wmain(int argc, const WCHAR* argv[]) { + BOOL switch_yes = FALSE; + BOOL switch_no = FALSE; + int i; + + for (i = 1; i < argc; i++) + { + if (arg_is(argv[i], L"/y") || arg_is(argv[i], L"/ye") || arg_is(argv[i], L"/yes")) + switch_yes = TRUE; + else if (arg_is(argv[i], L"/n") || arg_is(argv[i], L"/no")) + switch_no = TRUE; + else + continue; + + /* remove the argument */ + memmove( &argv[i], &argv[i + 1], (argc - i) * sizeof(*argv) ); + i--; + argc--; + } + + if (switch_yes && switch_no) + { + output_string(STRING_CONFLICT_SWITCHES); + return 1; + } + if (argc < 2) { output_string(STRING_USAGE); diff --git a/programs/net/net.rc b/programs/net/net.rc index d9c918328d1..c404a67061b 100644 --- a/programs/net/net.rc +++ b/programs/net/net.rc @@ -40,6 +40,7 @@ STRINGTABLE STRING_STOP_SVC_SUCCESS, "The %1 service was stopped successfully.\n" STRING_STOP_SVC_FAIL, "The %1 service failed to stop.\n" STRING_RUNNING_HEADER, "The following services are running:\n" + STRING_CONFLICT_SWITCHES, "A command was used with conflicting switches.\n" STRING_NO_ENTRIES, "There are no entries in the list.\n" STRING_USE_HEADER, "\nStatus Local Remote\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%1 %2 %3 Open resources: %4!u!\n" diff --git a/programs/net/resources.h b/programs/net/resources.h index ad7214206d1..fb14a6542fe 100644 --- a/programs/net/resources.h +++ b/programs/net/resources.h @@ -41,3 +41,4 @@ #define STRING_CONN 122 #define STRING_RECONN 123 #define STRING_RUNNING_HEADER 124 +#define STRING_CONFLICT_SWITCHES 125