discover: status messages shouldn't have a trailing newline

Fix the status message, and remove the newline from our translations.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 9868e5112c419d2c8faad2ec34e9fdd25919830f..bfe5fffe033dac37b6d06c16886dc078e063d54e 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -897,7 +897,7 @@ out:
         * TRANSLATORS: the format specifier in this string is a Linux
         * device identifier, like 'sda1'
         */
         * TRANSLATORS: the format specifier in this string is a Linux
         * device identifier, like 'sda1'
         */

-       status->message = talloc_asprintf(status,_("Processing %s complete\n"),
+       status->message = talloc_asprintf(status,_("Processing %s complete"),

                                dev->device->id);
        boot_status(handler, status);
 
                                dev->device->id);
        boot_status(handler, status);
 


@@ -936,7 +936,7 @@ int device_handler_dhcp(struct device_handler *handler,
         * TRANSLATORS: this format specifier will be the name of a network
         * device, like 'eth0'.
         */
         * TRANSLATORS: this format specifier will be the name of a network
         * device, like 'eth0'.
         */

-       status->message = talloc_asprintf(status,_("Processing %s complete\n"),
+       status->message = talloc_asprintf(status,_("Processing %s complete"),

                                dev->device->id);
        boot_status(handler, status);
 
                                dev->device->id);
        boot_status(handler, status);
 

diff --git a/po/de.po b/po/de.po
index e3e378899fa308b765625b9d41c91db975445210..f7fda2857650784e3da80eba32ecd59546cc4e98 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -72,8 +72,8 @@ msgstr "Verarbeitung von %s Einheit %s"
 #. device, like 'eth0'.
 #.
 #, c-format
 #. device, like 'eth0'.
 #.
 #, c-format

-msgid "Processing %s complete\n"
-msgstr "Verarbeitung %s abgeschlossen\n"
+msgid "Processing %s complete"
+msgstr "Verarbeitung %s abgeschlossen"

 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.
 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.

diff --git a/po/en.po b/po/en.po
index 1dab29f8d7dada9cff6d2a6cf7c1a990013900ed..ce8f4d82fe3fba481c6decfd06747b8a935ea75e 100644 (file)
--- a/po/en.po
+++ b/po/en.po
@@ -72,7 +72,7 @@ msgstr ""
 #. device, like 'eth0'.
 #.
 #, c-format
 #. device, like 'eth0'.
 #.
 #, c-format

-msgid "Processing %s complete\n"
+msgid "Processing %s complete"

 msgstr ""
 
 #. TRANSLATORS: this format specifier will be the name of a network
 msgstr ""
 
 #. TRANSLATORS: this format specifier will be the name of a network

diff --git a/po/es.po b/po/es.po
index df2607cae6ecae70ba053fb7d4abf5c5a45bab68..dda7a318ad3cccae9335f37fdd28822c1b5014f4 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -72,8 +72,8 @@ msgstr "Procesando dispositivo %s %s"
 #. device, like 'eth0'.
 #.
 #, c-format
 #. device, like 'eth0'.
 #.
 #, c-format

-msgid "Processing %s complete\n"
-msgstr "Proceso de %s completado\n"
+msgid "Processing %s complete"
+msgstr "Proceso de %s completado"

 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.
 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.

diff --git a/po/fr.po b/po/fr.po
index db25111e8e481b972cc7209d91c8df692ccf5a73..2c8de564670bb8793c743a8d28af16e09a648c0e 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -72,8 +72,8 @@ msgstr "Traitement de %s, unité %s"
 #. device, like 'eth0'.
 #.
 #, c-format
 #. device, like 'eth0'.
 #.
 #, c-format

-msgid "Processing %s complete\n"
-msgstr "Traitement de %s terminé\n"
+msgid "Processing %s complete"
+msgstr "Traitement de %s terminé"

 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.
 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.

diff --git a/po/it.po b/po/it.po
index 6ead8908c83df4ad0f90af0190200be2d6e2cecd..3e90e658f60374cbe7a0b447729cd4dba48cf8ae 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -72,8 +72,8 @@ msgstr "Elaborazione dispositivo %s %s"
 #. device, like 'eth0'.
 #.
 #, c-format
 #. device, like 'eth0'.
 #.
 #, c-format

-msgid "Processing %s complete\n"
-msgstr "Elaborazione %s completata\n"
+msgid "Processing %s complete"
+msgstr "Elaborazione %s completata"

 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.
 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.

diff --git a/po/ja.po b/po/ja.po
index 9dddfdbc579cb2157407418af08c89206bc4412f..b8c7904e204ad62da50853467baa835ddb23df58 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -72,8 +72,8 @@ msgstr "処理 %s デバイス %s"
 #. device, like 'eth0'.
 #.
 #, c-format
 #. device, like 'eth0'.
 #.
 #, c-format

-msgid "Processing %s complete\n"
-msgstr "処理 %s 完了\n"
+msgid "Processing %s complete"
+msgstr "処理 %s 完了"

 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.
 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.

diff --git a/po/ko.po b/po/ko.po
index ea1fb37e8b924292d48bd7bb116c7e40df56661d..7e930c68aa0ec9044036d8b26c38bb575e5c4bc5 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -72,8 +72,8 @@ msgstr "%s 장치 처리 중 %s"
 #. device, like 'eth0'.
 #.
 #, c-format
 #. device, like 'eth0'.
 #.
 #, c-format

-msgid "Processing %s complete\n"
-msgstr "%s 처리 완료\n"
+msgid "Processing %s complete"
+msgstr "%s 처리 완료"

 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.
 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6c4b4c78abd9797582bc94dc31fd30c7328cdba7..b0bf5ca8fcf8cc207afb76dd786f73e4a423a3fd 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -72,8 +72,8 @@ msgstr "Processando %s dispositivo %s"
 #. device, like 'eth0'.
 #.
 #, c-format
 #. device, like 'eth0'.
 #.
 #, c-format

-msgid "Processing %s complete\n"
-msgstr "Processamento do %s foi concluído\n"
+msgid "Processing %s complete"
+msgstr "Processamento do %s foi concluído"

 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.
 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.

diff --git a/po/ru.po b/po/ru.po
index e71db6a31feb1abebb410f772198fa0e93cb9f47..5592cdee78cd0b4e90267e37141be4d6e3985186 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -73,8 +73,8 @@ msgstr "Выполняется обработка %s устройства %s"
 #. device, like 'eth0'.
 #.
 #, c-format
 #. device, like 'eth0'.
 #.
 #, c-format

-msgid "Processing %s complete\n"
-msgstr "Обработка %s завершена\n"
+msgid "Processing %s complete"
+msgstr "Обработка %s завершена"

 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.
 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.

diff --git a/po/zh_CN.po b/po/zh_CN.po
index f2a68ce1e926e99b451ce1dfb70ec3a2ed0e7353..a1b6f4e34f8eb5f8a59dfc62c4598c63cc7b009d 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -72,8 +72,8 @@ msgstr "处理 %s 设备 %s"
 #. device, like 'eth0'.
 #.
 #, c-format
 #. device, like 'eth0'.
 #.
 #, c-format

-msgid "Processing %s complete\n"
-msgstr "处理 %s 完成\n"
+msgid "Processing %s complete"
+msgstr "处理 %s 完成"

 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.
 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.

diff --git a/po/zh_TW.po b/po/zh_TW.po
index b4d85a79d4387c5010d015c9caa09d65c829b385..c7ac13e4b6d416ed8ac1a6782496784980645fe1 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -72,8 +72,8 @@ msgstr "處理 %s 裝置 %s"
 #. device, like 'eth0'.
 #.
 #, c-format
 #. device, like 'eth0'.
 #.
 #, c-format

-msgid "Processing %s complete\n"
-msgstr "處理 %s 完成\n"
+msgid "Processing %s complete"
+msgstr "處理 %s 完成"

 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.
 
 #. TRANSLATORS: this format specifier will be the name of a network
 #. device, like 'eth0'.