From 16d77d2a0cd9644602bde1ddaf348dd34a36687d Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Mon, 29 Aug 2011 20:30:46 +0200 Subject: [PATCH] net: Remove an untranslatable string from the resources. Add some output_xxx() functions so we can print strings that don't come from resources. Also protect against buffer overflows in output_vprintf() and constify the output_xxx() functions. --- po/ar.po | 22 +++++++++------------- po/bg.po | 22 +++++++++------------- po/ca.po | 22 +++++++++------------- po/cs.po | 22 +++++++++------------- po/da.po | 22 +++++++++------------- po/de.po | 22 +++++++++------------- po/el.po | 22 +++++++++------------- po/en.po | 22 +++++++++------------- po/en_US.po | 22 +++++++++------------- po/eo.po | 22 +++++++++------------- po/es.po | 22 +++++++++------------- po/fa.po | 22 +++++++++------------- po/fi.po | 22 +++++++++------------- po/fr.po | 22 +++++++++------------- po/he.po | 22 +++++++++------------- po/hi.po | 22 +++++++++------------- po/hu.po | 22 +++++++++------------- po/it.po | 22 +++++++++------------- po/ja.po | 22 +++++++++------------- po/ko.po | 22 +++++++++------------- po/lt.po | 22 +++++++++------------- po/ml.po | 22 +++++++++------------- po/nb_NO.po | 22 +++++++++------------- po/nl.po | 22 +++++++++------------- po/or.po | 22 +++++++++------------- po/pa.po | 22 +++++++++------------- po/pl.po | 22 +++++++++------------- po/pt_BR.po | 22 +++++++++------------- po/pt_PT.po | 22 +++++++++------------- po/rm.po | 22 +++++++++------------- po/ro.po | 22 +++++++++------------- po/ru.po | 22 +++++++++------------- po/sk.po | 22 +++++++++------------- po/sl.po | 22 +++++++++------------- po/sr_RS@cyrillic.po | 22 +++++++++------------- po/sr_RS@latin.po | 22 +++++++++------------- po/sv.po | 22 +++++++++------------- po/te.po | 22 +++++++++------------- po/th.po | 22 +++++++++------------- po/tr.po | 22 +++++++++------------- po/uk.po | 22 +++++++++------------- po/wa.po | 22 +++++++++------------- po/wine.pot | 22 +++++++++------------- po/zh_CN.po | 22 +++++++++------------- po/zh_TW.po | 22 +++++++++------------- programs/net/net.c | 33 +++++++++++++++++++++++++++------ programs/net/net.rc | 1 - programs/net/resources.h | 1 - 48 files changed, 432 insertions(+), 593 deletions(-) diff --git a/po/ar.po b/po/ar.po index 576844d156a..56183748a36 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8240,42 +8240,42 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "" @@ -8283,10 +8283,6 @@ msgstr "" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&جديد\tCtrl+N" diff --git a/po/bg.po b/po/bg.po index 78517e9f5f3..f7a07812e3a 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8410,46 +8410,46 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "Преустановено; " -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Файлът не е намерен" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Появи се грешка при печатането." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "LAN връзка" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Default Settings" @@ -8458,10 +8458,6 @@ msgstr "Default Settings" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Нов\tCtrl+N" diff --git a/po/ca.po b/po/ca.po index 5d9aeff0fc7..1ff266da247 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8156,42 +8156,42 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "" @@ -8199,10 +8199,6 @@ msgstr "" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "" diff --git a/po/cs.po b/po/cs.po index dfae2aafd4c..bbc6b1f44cf 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8780,46 +8780,46 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "Pozastaven; " -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Soubor nebyl nalezen" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Nastala chyba tisku." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "Připojit &síťové zařízení" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Standardní nastavení" @@ -8828,10 +8828,6 @@ msgstr "Standardní nastavení" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Nový\tCtrl+N" diff --git a/po/da.po b/po/da.po index 7e6bf370803..195144e93df 100644 --- a/po/da.po +++ b/po/da.po @@ -8834,11 +8834,11 @@ msgstr "Tjenesten «%s» stoppede vellykket.\n" msgid "The %s service failed to stop.\n" msgstr "Kunne ikke stoppe tjenesten «%s».\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "Det er ingen indskrivning i listen.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8848,35 +8848,35 @@ msgstr "" "Status Lokal Remote\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Åbne resourser: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "&Pause" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Rør forbundet\n" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Der opstod en printer fejl." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "Forbindelsen er aktiv\n" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Tilslutter til %s" @@ -8886,10 +8886,6 @@ msgstr "Tilslutter til %s" msgid "The following services are running:\n" msgstr "Afhængige tjenester kører\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Ny\tCtrl+N" diff --git a/po/de.po b/po/de.po index 9d490ae921f..98510ac4881 100644 --- a/po/de.po +++ b/po/de.po @@ -8751,11 +8751,11 @@ msgstr "Der %s Dienst wurde erfolgreich beendet.\n" msgid "The %s service failed to stop.\n" msgstr "Der %s Dienst konnte nicht beendet werden.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "Es sind keine Einträge in der Liste.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8765,31 +8765,31 @@ msgstr "" "Status Lokal Entfernt\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Offene Ressourcen: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "OK" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "Angehalten" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "Getrennt" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "Ein Netzwerkfehler ist aufgetreten" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "Verbindung wird hergestellt" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "Erneuter Verbindungsaufbau" @@ -8798,10 +8798,6 @@ msgstr "Erneuter Verbindungsaufbau" msgid "The following services are running:\n" msgstr "Abhängige Dienste laufen\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Neu\tStrg+N" diff --git a/po/el.po b/po/el.po index aedd2aad27e..77c27411c0f 100644 --- a/po/el.po +++ b/po/el.po @@ -8289,45 +8289,45 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "Σταματημένος; " -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Το αρχείο δε βρέθηκε" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Προκλήθηκε σφάλμα εκτυπωτή." -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "" @@ -8335,10 +8335,6 @@ msgstr "" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "" diff --git a/po/en.po b/po/en.po index 39fe7c87626..1061b4b7300 100644 --- a/po/en.po +++ b/po/en.po @@ -8462,11 +8462,11 @@ msgstr "The %s service was stopped successfully.\n" msgid "The %s service failed to stop.\n" msgstr "The %s service failed to stop.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "There are no entries in the list.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8476,31 +8476,31 @@ msgstr "" "Status Local Remote\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Open resources: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "Disconnected" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "A network error occurred" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "Connection is being made" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "Reconnecting" @@ -8508,10 +8508,6 @@ msgstr "Reconnecting" msgid "The following services are running:\n" msgstr "The following services are running:\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "" diff --git a/po/en_US.po b/po/en_US.po index 2d03ae94def..ada5aff9829 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -8581,11 +8581,11 @@ msgstr "The %s service was stopped successfully.\n" msgid "The %s service failed to stop.\n" msgstr "The %s service failed to stop.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "There are no entries in the list.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8595,31 +8595,31 @@ msgstr "" "Status Local Remote\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Open resources: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "OK" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "Paused" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "Disconnected" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "A network error occurred" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "Connection is being made" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "Reconnecting" @@ -8627,10 +8627,6 @@ msgstr "Reconnecting" msgid "The following services are running:\n" msgstr "The following services are running:\n" -#: net.rc:41 -msgid " %s\n" -msgstr " %s\n" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&New\tCtrl+N" diff --git a/po/eo.po b/po/eo.po index d8f3b7041f9..fc70b636758 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8414,46 +8414,46 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "Paýse; " -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Dosiero ne estis trovita" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Okazis printila eroro." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "LAN Interkonekto" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Defaýltaj Agordoj" @@ -8462,10 +8462,6 @@ msgstr "Defaýltaj Agordoj" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Nova\tCtrl+N" diff --git a/po/es.po b/po/es.po index 8ccc0d85882..7c8a03ab756 100644 --- a/po/es.po +++ b/po/es.po @@ -8999,46 +8999,46 @@ msgstr "La operación finalizó con éxito\n" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "Pausada; " -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Archivo no encontrado" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Ocurrió un error en la impresora." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "Conexión LAN" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Conectando to %s" @@ -9047,10 +9047,6 @@ msgstr "Conectando to %s" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Nuevo\tCtrl+N" diff --git a/po/fa.po b/po/fa.po index cf5cf559f99..24681168e3c 100644 --- a/po/fa.po +++ b/po/fa.po @@ -8242,42 +8242,42 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "" @@ -8285,10 +8285,6 @@ msgstr "" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&ایجاد‌کردن\tCtrl+N" diff --git a/po/fi.po b/po/fi.po index 98dfe7f3ec9..add786374c7 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8490,46 +8490,46 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "Pysäytetty; " -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Tiedostoa ei löydy" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Tulostinvirhe." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "Lähiverkkoyhteys" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Default Settings" @@ -8538,10 +8538,6 @@ msgstr "Default Settings" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Uusi\tCtrl+N" diff --git a/po/fr.po b/po/fr.po index 7de24d2c509..125a0c3c153 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8664,11 +8664,11 @@ msgstr "Le service %s a été arrêté avec succès.\n" msgid "The %s service failed to stop.\n" msgstr "Le service %s n'a pas pu être arrêté.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "Il n'y a aucune entrée dans la liste.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8678,31 +8678,31 @@ msgstr "" "Statut Local Distant\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Ressources ouvertes : %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "OK" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "En pause" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "Déconnecté" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "Une erreur réseau s'est produite" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "Connexion en cours" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "Reconnexion" @@ -8711,10 +8711,6 @@ msgstr "Reconnexion" msgid "The following services are running:\n" msgstr "Les services dépendants sont en cours d'exécution\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Nouveau\tCtrl+N" diff --git a/po/he.po b/po/he.po index c1cd4e15f17..00a6eb658de 100644 --- a/po/he.po +++ b/po/he.po @@ -8670,11 +8670,11 @@ msgstr "The %s service was stopped successfully.\n" msgid "The %s service failed to stop.\n" msgstr "The %s service failed to stop.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "There are no entries in the list.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8684,31 +8684,31 @@ msgstr "" "Status Local Remote\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Open resources: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "Paused" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "Disconnected" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "A network error occurred" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "Connection is being made" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "Reconnecting" @@ -8717,10 +8717,6 @@ msgstr "Reconnecting" msgid "The following services are running:\n" msgstr "The %s service is starting.\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&חדש\tCtrl+N" diff --git a/po/hi.po b/po/hi.po index 6a4f1de16a1..1299513569f 100644 --- a/po/hi.po +++ b/po/hi.po @@ -8151,42 +8151,42 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "" @@ -8194,10 +8194,6 @@ msgstr "" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "" diff --git a/po/hu.po b/po/hu.po index 9f5a933e446..3707b5e892d 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8686,46 +8686,46 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "Szünet; " -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Fájl nem található" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Nyomtatási hiba történt." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "LAN kapcsolat" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Kapcsolódás: %s" @@ -8734,10 +8734,6 @@ msgstr "Kapcsolódás: %s" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "Ú&j\tCtrl+N" diff --git a/po/it.po b/po/it.po index fc7786c6281..a5c42bda8f8 100644 --- a/po/it.po +++ b/po/it.po @@ -8925,11 +8925,11 @@ msgstr "Il servizio %s è stato fermato con successo.\n" msgid "The %s service failed to stop.\n" msgstr "Impossibile fermare il servizio %s.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "Non ci sono elementi nella lista.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8939,35 +8939,35 @@ msgstr "" "Stato locale remoto\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Risorse aperte: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "&In pausa" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Pipe connessa\n" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Si è verificato un errore della stampante." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "Connessione attiva\n" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Connettendo a %s" @@ -8977,10 +8977,6 @@ msgstr "Connettendo a %s" msgid "The following services are running:\n" msgstr "Servizi dipendenti sono in esecuzione\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Nuovo\tCtrl+N" diff --git a/po/ja.po b/po/ja.po index 92a504c9e36..aa518481bc5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8560,11 +8560,11 @@ msgstr "%s サービスは停止しました。\n" msgid "The %s service failed to stop.\n" msgstr "%s サービスの停止に失敗しました。\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "一覧に項目がありません。\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8574,35 +8574,35 @@ msgstr "" "状態 ローカル リモート\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s リソース数: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "一時停止(&P)" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "パイプは接続されています。\n" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "プリンタ エラーが発生しました。" -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "接続はアクティブです。\n" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "%s に接続しています" @@ -8612,10 +8612,6 @@ msgstr "%s に接続しています" msgid "The following services are running:\n" msgstr "依存しているサービスが実行中です。\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "新規作成(&N)\tCtrl+N" diff --git a/po/ko.po b/po/ko.po index c8020d54fc6..d5ee367fbca 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8535,11 +8535,11 @@ msgstr "%s 서비스 정지 성공.\n" msgid "The %s service failed to stop.\n" msgstr "%s 서비스 정지 실패.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "리스트가 비어 있습니다.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8549,31 +8549,31 @@ msgstr "" "상태 로컬 원격\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s 열린 리소스: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "확인" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "정지됨" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "연결이 끊어짐" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "네트워크 오류가 발생함" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "연결이 활성화됨" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "다시 연결중" @@ -8582,10 +8582,6 @@ msgstr "다시 연결중" msgid "The following services are running:\n" msgstr "의존하고 있는 서비스가 실행중입니다\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "새로 만들기(&N)\tCtrl+N" diff --git a/po/lt.po b/po/lt.po index 7353a80a794..5938ea4b220 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8587,11 +8587,11 @@ msgstr "Tarnyba %s sėkmingai sustabdyta.\n" msgid "The %s service failed to stop.\n" msgstr "Tarnyba %s nesustojo.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "Sąraše nėra elementų.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8601,31 +8601,31 @@ msgstr "" "Būsena Vietinė Nutolusi\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Atverti ištekliai: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "Gerai" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "Pristabdyta" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "Atjungta" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "Įvyko tinklo klaida" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "Jungiamasi" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "Jungiamasi iš naujo" @@ -8634,10 +8634,6 @@ msgstr "Jungiamasi iš naujo" msgid "The following services are running:\n" msgstr "Priklausomos tarnybos yra vykdomos\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Naujas\tVald+N" diff --git a/po/ml.po b/po/ml.po index 378166bd5ff..9609858f3d2 100644 --- a/po/ml.po +++ b/po/ml.po @@ -8151,42 +8151,42 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "" @@ -8194,10 +8194,6 @@ msgstr "" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index c85a3a23139..e6710a6bdcd 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8841,11 +8841,11 @@ msgstr "Tjenesten «%s» ble stoppet vellykket.\n" msgid "The %s service failed to stop.\n" msgstr "Klarte ikke stoppe tjenesten «%s».\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "Det er ingen oppføringer på listen.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8855,35 +8855,35 @@ msgstr "" "Status Lokal Remote\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Åpne ressurser: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "&Pause" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Røret er tilkoblet\n" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "En skriverfeil har oppstått." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "Tilkoblingen er aktiv\n" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Kobler til %s" @@ -8893,10 +8893,6 @@ msgstr "Kobler til %s" msgid "The following services are running:\n" msgstr "Avhengige tjenester kjører\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Ny\tCtrl+N" diff --git a/po/nl.po b/po/nl.po index e85a00179b4..44797a699e8 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8727,11 +8727,11 @@ msgstr "De %s service was succesvol gestopt.\n" msgid "The %s service failed to stop.\n" msgstr "De %s service wilde niet stoppen.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "De opgegeven lijst is leeg.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8741,35 +8741,35 @@ msgstr "" "Status Lokaal Op afstand\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Open resources: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "&Pauze" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Pipe verbonden\n" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Er heeft zich een fout voorgedaan met de printer." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "Verbinding is actief\n" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Verbinden met %s" @@ -8779,10 +8779,6 @@ msgstr "Verbinden met %s" msgid "The following services are running:\n" msgstr "Afhankelijke services draaien al\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Nieuw" diff --git a/po/or.po b/po/or.po index 4a208320833..8d8dbe9e75d 100644 --- a/po/or.po +++ b/po/or.po @@ -8151,42 +8151,42 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "" @@ -8194,10 +8194,6 @@ msgstr "" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "" diff --git a/po/pa.po b/po/pa.po index 13c697b5b35..d318af940e0 100644 --- a/po/pa.po +++ b/po/pa.po @@ -8151,42 +8151,42 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "" @@ -8194,10 +8194,6 @@ msgstr "" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "" diff --git a/po/pl.po b/po/pl.po index 0927ac0562b..120ef103794 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8591,11 +8591,11 @@ msgstr "Serwis %s został pomyślnie zatrzymany.\n" msgid "The %s service failed to stop.\n" msgstr "Zatrzymanie serwisu %s nie powiodło się.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "Brak pozycji na liście.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8605,35 +8605,35 @@ msgstr "" "Status Lokalny Zdalny\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Otwarte zasoby: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "&Wstrzymana" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Symbol potoku podłączony\n" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Błąd drukowania." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "Połączenie jest aktywne\n" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Łączenie z %s" @@ -8643,10 +8643,6 @@ msgstr "Łączenie z %s" msgid "The following services are running:\n" msgstr "Zależne usługi są uruchomione\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Nowy\tCtrl+N" diff --git a/po/pt_BR.po b/po/pt_BR.po index 343817a185d..cdd4efb6b09 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8869,11 +8869,11 @@ msgstr "O serviço %s parou com sucesso.\n" msgid "The %s service failed to stop.\n" msgstr "O serviço %s falhou ao parar.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "Não há entradas na lista.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8883,35 +8883,35 @@ msgstr "" "Estado Local Remoto\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Recursos disponíveis: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "&Pausa" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Pipe conectado\n" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Ocorreu um erro de impressão." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "A conexão está ativa\n" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Conectando a %s" @@ -8921,10 +8921,6 @@ msgstr "Conectando a %s" msgid "The following services are running:\n" msgstr "Serviços dependentes estão rodando\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Novo\tCtrl+N" diff --git a/po/pt_PT.po b/po/pt_PT.po index 2dd2eccfe17..c27abadfa24 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -8917,11 +8917,11 @@ msgstr "O serviço %s foi parado com sucesso.\n" msgid "The %s service failed to stop.\n" msgstr "O serviço %s falhou a parar.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "Não há entradas na lista.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8931,35 +8931,35 @@ msgstr "" "Estado Local Remoto\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Recursos disponíveis: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "&Pausa" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Tubo ligado\n" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Ocorreu um erro de impressão." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "Ligação está activa\n" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "A ligar a %s" @@ -8969,10 +8969,6 @@ msgstr "A ligar a %s" msgid "The following services are running:\n" msgstr "Serviços dependentes estão a correr\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Novo..." diff --git a/po/rm.po b/po/rm.po index d5309ad4d95..6d7b1ca0d85 100644 --- a/po/rm.po +++ b/po/rm.po @@ -8204,42 +8204,42 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Default" @@ -8248,10 +8248,6 @@ msgstr "Default" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "" diff --git a/po/ro.po b/po/ro.po index ddd1cdfe6ab..04f1bbca451 100644 --- a/po/ro.po +++ b/po/ro.po @@ -9158,11 +9158,11 @@ msgstr "Serviciul %s a fost oprit cu succes.\n" msgid "The %s service failed to stop.\n" msgstr "Oprirea serviciului %s a eșuat.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "Nu există nici un element în listă.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -9172,35 +9172,35 @@ msgstr "" "Stare Local Distant\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Resurse deschise: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "&Pauzat" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Fișierul nu a fost găsit" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "S-a produs o eroare la tipărire." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "Conexiune LAN" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Conectez la %s" @@ -9210,10 +9210,6 @@ msgstr "Conectez la %s" msgid "The following services are running:\n" msgstr "Serviciul %s pornește.\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Nou\tCtrl+N" diff --git a/po/ru.po b/po/ru.po index efebb3cbb26..e09df08238d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8581,11 +8581,11 @@ msgstr "Служба %s успешно остановлена.\n" msgid "The %s service failed to stop.\n" msgstr "Ошибка при остановке службы %s.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "Список пуст.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8595,35 +8595,35 @@ msgstr "" "Статус Локальный Удалённый\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Открытых ресурсов: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "&Приостановить" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Канал уже подсоединён\n" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Произошла ошибка принтера" -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "Соединение активно\n" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Подключение к %s" @@ -8633,10 +8633,6 @@ msgstr "Подключение к %s" msgid "The following services are running:\n" msgstr "Работают зависимые службы\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "Созд&ать\tCtrl+N" diff --git a/po/sk.po b/po/sk.po index 69555bf9fcd..5be4584e812 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8448,45 +8448,45 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "Pozastavená; " -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Súbor nenájdený" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "A printer error occurred" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Default" @@ -8495,10 +8495,6 @@ msgstr "Default" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "" diff --git a/po/sl.po b/po/sl.po index ec25378ebcf..865675d9478 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8612,11 +8612,11 @@ msgstr "Ustavljanje storitve %s je uspelo.\n" msgid "The %s service failed to stop.\n" msgstr "Ustavljanje storitve %s ni uspelo.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "Na seznamu ni vnosov.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8626,35 +8626,35 @@ msgstr "" "Stanje Krajevno Oddaljeno\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Odprta sredstva: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "V &premoru" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Cev je povezana\n" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Prišlo je do napake tiskanja." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "Povezava je dejavna\n" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Povezovanje z %s" @@ -8664,10 +8664,6 @@ msgstr "Povezovanje z %s" msgid "The following services are running:\n" msgstr "Izvajajo se odvisne storitve\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Nova\tCtrl+N" diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index 467e4cdfee2..d6d9c59564e 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -8559,46 +8559,46 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "Паузирано; " -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Датотека није пронађена" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Дошло је до грешке у штампачу." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "LAN веза" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Повезивање на %s" @@ -8607,10 +8607,6 @@ msgstr "Повезивање на %s" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Ново\tCtrl+N" diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 5afe2a92cb8..cce7b08125d 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -8608,46 +8608,46 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "Pauzirano; " -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Datoteka nije pronađena" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Došlo je do greške u štampaču." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "LAN veza" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Povezivanje na %s" @@ -8656,10 +8656,6 @@ msgstr "Povezivanje na %s" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Novo\tCtrl+N" diff --git a/po/sv.po b/po/sv.po index 205901325f6..39a8ac15450 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8591,11 +8591,11 @@ msgstr "Tjänsten %s har stoppats.\n" msgid "The %s service failed to stop.\n" msgstr "Tjänsten %s kunde inte stoppas.\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "Det finns inga poster i listan.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8605,35 +8605,35 @@ msgstr "" "Status Lokal Fjärransluten\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Öppna resurser: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "&Pausad" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Pipa ansluten\n" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Ett skrivarfel inträffade." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "Anslutningen är aktiv\n" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Ansluter till %s" @@ -8643,10 +8643,6 @@ msgstr "Ansluter till %s" msgid "The following services are running:\n" msgstr "Beroende tjänster körs\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Ny\tCtrl+N" diff --git a/po/te.po b/po/te.po index 310425e1875..abff239b81b 100644 --- a/po/te.po +++ b/po/te.po @@ -8151,42 +8151,42 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "" @@ -8194,10 +8194,6 @@ msgstr "" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "" diff --git a/po/th.po b/po/th.po index e4ae4c6c5af..2ffb8e7909c 100644 --- a/po/th.po +++ b/po/th.po @@ -8298,45 +8298,45 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "ชะลอ; " -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "ไม่พบแฟ้ม" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "ความปิดเครื่องพิมพ์" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "" @@ -8344,10 +8344,6 @@ msgstr "" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "สร้างใหม่\tCtrl+N" diff --git a/po/tr.po b/po/tr.po index b30b9838a3c..4f87974a778 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8950,46 +8950,46 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "D&uraklamış" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Dosya bulunamadı" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Bir yazıcı hatası oluştu." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "LAN Bağlantısı" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Öntanımlı Ayarlar" @@ -8998,10 +8998,6 @@ msgstr "Öntanımlı Ayarlar" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Yeni\tCtrl+N" diff --git a/po/uk.po b/po/uk.po index 4fae1cb3fa5..82e446dc17b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8569,11 +8569,11 @@ msgstr "Служба %s успішно зупинена.\n" msgid "The %s service failed to stop.\n" msgstr "Помилка зупинки служби %s .\n" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "Список порожній.\n" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" @@ -8583,35 +8583,35 @@ msgstr "" "Статус Локальний Віддалений\n" "---------------------------------------------------------------\n" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "%s %s %s Відкритих ресурсів: %lu\n" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "&Призупинити" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "Pipe connected\n" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "Виникла помилка принтера." -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "З'єднання активне\n" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Під'єднуюсь до %s" @@ -8621,10 +8621,6 @@ msgstr "Під'єднуюсь до %s" msgid "The following services are running:\n" msgstr "Dependent services are running\n" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Новий\tCtrl+N" diff --git a/po/wa.po b/po/wa.po index abca33b2135..f637bda6a08 100644 --- a/po/wa.po +++ b/po/wa.po @@ -8264,42 +8264,42 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "Default" @@ -8308,10 +8308,6 @@ msgstr "Default" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "&Novea\tCtrl+N" diff --git a/po/wine.pot b/po/wine.pot index 015d32358be..956dda845f2 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -8127,42 +8127,42 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 msgid "Paused" msgstr "" -#: net.rc:47 +#: net.rc:46 msgid "Disconnected" msgstr "" -#: net.rc:48 +#: net.rc:47 msgid "A network error occurred" msgstr "" -#: net.rc:49 +#: net.rc:48 msgid "Connection is being made" msgstr "" -#: net.rc:50 +#: net.rc:49 msgid "Reconnecting" msgstr "" @@ -8170,10 +8170,6 @@ msgstr "" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 5413588cdb2..65ab815f97d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8543,46 +8543,46 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "暂停(&P)" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "找不到文件" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "打印机错误。" -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "局域网连接" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "正在连接到 %s" @@ -8591,10 +8591,6 @@ msgstr "正在连接到 %s" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "新建(&N)\tCtrl+N" diff --git a/po/zh_TW.po b/po/zh_TW.po index c7143bbf3e3..ed8d7e67715 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8601,46 +8601,46 @@ msgstr "" msgid "The %s service failed to stop.\n" msgstr "" -#: net.rc:42 +#: net.rc:41 msgid "There are no entries in the list.\n" msgstr "" -#: net.rc:43 +#: net.rc:42 msgid "" "\n" "Status Local Remote\n" "---------------------------------------------------------------\n" msgstr "" -#: net.rc:44 +#: net.rc:43 msgid "%s %s %s Open resources: %lu\n" msgstr "" -#: net.rc:45 +#: net.rc:44 msgid "OK" msgstr "" -#: net.rc:46 +#: net.rc:45 #, fuzzy msgid "Paused" msgstr "暫停(&P)" -#: net.rc:47 +#: net.rc:46 #, fuzzy msgid "Disconnected" msgstr "找不到檔案" -#: net.rc:48 +#: net.rc:47 #, fuzzy msgid "A network error occurred" msgstr "印表機錯誤。" -#: net.rc:49 +#: net.rc:48 #, fuzzy msgid "Connection is being made" msgstr "區域網路連線" -#: net.rc:50 +#: net.rc:49 #, fuzzy msgid "Reconnecting" msgstr "正在連接到 %s" @@ -8649,10 +8649,6 @@ msgstr "正在連接到 %s" msgid "The following services are running:\n" msgstr "" -#: net.rc:41 -msgid " %s\n" -msgstr "" - #: notepad.rc:27 msgid "&New\tCtrl+N" msgstr "新建(&N)\tCtrl+N" diff --git a/programs/net/net.c b/programs/net/net.c index ed26b43a6aa..de83ccdf0fa 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(net); #define NET_START 0001 #define NET_STOP 0002 -static int output_write(WCHAR* str, int len) +static int output_write(const WCHAR* str, int len) { DWORD ret, count; ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL); @@ -55,17 +55,37 @@ static int output_write(WCHAR* str, int len) return count; } +static int output_vprintf(const WCHAR* fmt, va_list va_args) +{ + WCHAR str[8192]; + int len; + + len = vsnprintfW(str, sizeof(str)/sizeof(*str), fmt, va_args); + if (len < 0) + WINE_FIXME("String too long.\n"); + else + output_write(str, len); + return 0; +} + +static int output_printf(const WCHAR* fmt, ...) +{ + va_list arguments; + + va_start(arguments, fmt); + output_vprintf(fmt, arguments); + va_end(arguments); + return 0; +} + static int output_string(int msg, ...) { WCHAR fmt[8192]; - WCHAR str[8192]; - int len; va_list arguments; LoadStringW(GetModuleHandleW(NULL), msg, fmt, sizeof(fmt)/sizeof(fmt[0])); va_start(arguments, msg); - len = vsprintfW(str, fmt, arguments); - output_write(str, len); + output_vprintf(fmt, arguments); va_end(arguments); return 0; } @@ -136,6 +156,7 @@ static BOOL net_use(int argc, const WCHAR* argv[]) static BOOL net_enum_services(void) { + static const WCHAR runningW[]={' ',' ',' ',' ','%','s','\n',0}; SC_HANDLE SCManager; LPENUM_SERVICE_STATUS_PROCESSW services; DWORD size, i, count, resume; @@ -164,7 +185,7 @@ static BOOL net_enum_services(void) output_string(STRING_RUNNING_HEADER); for(i = 0; i < count; i++) { - output_string(STRING_RUNNING, services[i].lpDisplayName); + output_printf(runningW, services[i].lpDisplayName); WINE_TRACE("service=%s state=%d controls=%x\n", wine_dbgstr_w(services[i].lpServiceName), services[i].ServiceStatusProcess.dwCurrentState, diff --git a/programs/net/net.rc b/programs/net/net.rc index 10bb6788ada..baadbfb7260 100644 --- a/programs/net/net.rc +++ b/programs/net/net.rc @@ -38,7 +38,6 @@ STRINGTABLE STRING_STOP_SVC_SUCCESS, "The %s service was stopped successfully.\n" STRING_STOP_SVC_FAIL, "The %s service failed to stop.\n" STRING_RUNNING_HEADER, "The following services are running:\n" - STRING_RUNNING, " %s\n" STRING_NO_ENTRIES, "There are no entries in the list.\n" STRING_USE_HEADER, "\nStatus Local Remote\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%s %s %s Open resources: %lu\n" diff --git a/programs/net/resources.h b/programs/net/resources.h index 35aebe32895..ad7214206d1 100644 --- a/programs/net/resources.h +++ b/programs/net/resources.h @@ -41,4 +41,3 @@ #define STRING_CONN 122 #define STRING_RECONN 123 #define STRING_RUNNING_HEADER 124 -#define STRING_RUNNING 125