From 3a926ca11a9fae53a8b116b14c75dcd49bba9143 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 4 Jan 2011 00:10:57 +0000 Subject: [PATCH] Use semicolons rather than commas to separate size from model in debconf disk and partition descriptions; commas are too easily confused with the multiselect choice separator, and in particular make it impossible to answer questions properly in the editor frontend (closes: #608449). Unfuzzy all translations where possible. --- debian/changelog | 5 +++++ debian/grub-pc.templates.in | 4 ++-- debian/po/ar.po | 7 ++++--- debian/po/ast.po | 10 +++++----- debian/po/be.po | 10 +++++----- debian/po/bg.po | 8 ++++---- debian/po/ca.po | 8 ++++---- debian/po/cs.po | 8 ++++---- debian/po/da.po | 10 +++++----- debian/po/de.po | 8 ++++---- debian/po/dz.po | 7 ++++--- debian/po/eo.po | 10 +++++----- debian/po/es.po | 8 ++++---- debian/po/eu.po | 8 ++++---- debian/po/fa.po | 8 ++++---- debian/po/fi.po | 10 +++++----- debian/po/fr.po | 8 ++++---- debian/po/gl.po | 10 +++++----- debian/po/he.po | 10 +++++----- debian/po/hr.po | 10 +++++----- debian/po/id.po | 8 ++++---- debian/po/it.po | 10 +++++----- debian/po/ja.po | 8 ++++---- debian/po/ka.po | 4 ++-- debian/po/kk.po | 10 +++++----- debian/po/nb.po | 10 +++++----- debian/po/nl.po | 8 ++++---- debian/po/pt.po | 8 ++++---- debian/po/pt_BR.po | 10 +++++----- debian/po/ro.po | 10 +++++----- debian/po/ru.po | 8 ++++---- debian/po/sk.po | 8 ++++---- debian/po/sl.po | 8 ++++---- debian/po/sv.po | 8 ++++---- debian/po/ta.po | 4 ++-- debian/po/templates.pot | 4 ++-- debian/po/uk.po | 8 ++++---- debian/po/vi.po | 10 +++++----- debian/po/zh_CN.po | 8 ++++---- debian/po/zh_TW.po | 10 +++++----- 40 files changed, 168 insertions(+), 161 deletions(-) diff --git a/debian/changelog b/debian/changelog index 07c355c45..bf19ecce9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,11 @@ grub2 (1.98+20100804-12) UNRELEASED; urgency=low properly (closes: #605615). - Initialise next pointer when creating multiboot module (closes: #605567). + * Use semicolons rather than commas to separate size from model in debconf + disk and partition descriptions; commas are too easily confused with the + multiselect choice separator, and in particular make it impossible to + answer questions properly in the editor frontend (closes: #608449). + Unfuzzy all translations where possible. -- Colin Watson Tue, 21 Dec 2010 10:39:56 +0000 diff --git a/debian/grub-pc.templates.in b/debian/grub-pc.templates.in index 14ba8c4ab..b4a569681 100644 --- a/debian/grub-pc.templates.in +++ b/debian/grub-pc.templates.in @@ -65,12 +65,12 @@ Template: grub-pc/disk_description Type: text # Disk sizes are in decimal megabytes, to match how disk manufacturers # usually describe them. -_Description: ${DEVICE} (${SIZE} MB, ${MODEL}) +_Description: ${DEVICE} (${SIZE} MB; ${MODEL}) Template: grub-pc/partition_description Type: text # The "-" is used to indicate indentation. Leading spaces may not work. -_Description: - ${DEVICE} (${SIZE} MB, ${PATH}) +_Description: - ${DEVICE} (${SIZE} MB; ${PATH}) Template: grub-pc/install_devices_failed Type: boolean diff --git a/debian/po/ar.po b/debian/po/ar.po index 4da54292d..8ead01e75 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -140,7 +140,8 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" +#, fuzzy +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" msgstr "${DEVICE} (${SIZE} م.ب.، ${MODEL})" #. Type: text @@ -148,8 +149,8 @@ msgstr "${DEVICE} (${SIZE} م.ب.، ${MODEL})" #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" msgstr "${DEVICE} (${SIZE} م.ب.، ${MODEL})" #. Type: boolean diff --git a/debian/po/ast.po b/debian/po/ast.po index 455bbf757..f074f5727 100644 --- a/debian/po/ast.po +++ b/debian/po/ast.po @@ -140,17 +140,17 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: boolean #. Description diff --git a/debian/po/be.po b/debian/po/be.po index 1c7cba68f..db33cea26 100644 --- a/debian/po/be.po +++ b/debian/po/be.po @@ -144,17 +144,17 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: boolean #. Description diff --git a/debian/po/bg.po b/debian/po/bg.po index 1c47ff0aa..b6537f7e2 100644 --- a/debian/po/bg.po +++ b/debian/po/bg.po @@ -144,15 +144,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/ca.po b/debian/po/ca.po index c2c31d72a..ed44143b7 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -121,15 +121,15 @@ msgstr "El carregador GRUB estava instaŀlat a un disc que ja no és present, o #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/cs.po b/debian/po/cs.po index 291b369ad..5fc3051cc 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -143,15 +143,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/da.po b/debian/po/da.po index 9b68c3de0..5e928e5a8 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -152,17 +152,17 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: boolean #. Description diff --git a/debian/po/de.po b/debian/po/de.po index 13eff7911..87d35e8cf 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -148,15 +148,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/dz.po b/debian/po/dz.po index f4868eec0..32828f05c 100644 --- a/debian/po/dz.po +++ b/debian/po/dz.po @@ -139,7 +139,8 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" +#, fuzzy +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" msgstr "${DEVICE} (${SIZE} ཨེམ་བི་ ${MODEL})" #. Type: text @@ -147,8 +148,8 @@ msgstr "${DEVICE} (${SIZE} ཨེམ་བི་ ${MODEL})" #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" msgstr "${DEVICE} (${SIZE} ཨེམ་བི་ ${MODEL})" #. Type: boolean diff --git a/debian/po/eo.po b/debian/po/eo.po index c1549ec6e..a1bced85b 100644 --- a/debian/po/eo.po +++ b/debian/po/eo.po @@ -140,17 +140,17 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: boolean #. Description diff --git a/debian/po/es.po b/debian/po/es.po index e34aea8ad..89e8e1228 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -174,15 +174,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/eu.po b/debian/po/eu.po index 3722fa349..f2afee269 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -147,15 +147,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/fa.po b/debian/po/fa.po index 4227d5955..e1f931226 100644 --- a/debian/po/fa.po +++ b/debian/po/fa.po @@ -141,15 +141,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/fi.po b/debian/po/fi.po index a684fece8..8cc35c2d0 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -139,17 +139,17 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} Mt, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} Mt; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "${DEVICE} (${SIZE} Mt, ${MODEL})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "${DEVICE} (${SIZE} Mt; ${MODEL})" #. Type: boolean #. Description diff --git a/debian/po/fr.po b/debian/po/fr.po index 53f3c8ff2..b63e8c3ee 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -151,15 +151,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} Mo, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} Mo; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} Mo, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} Mo; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/gl.po b/debian/po/gl.po index 180ad11fe..79ac51c9a 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -141,17 +141,17 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: boolean #. Description diff --git a/debian/po/he.po b/debian/po/he.po index 84e162e3c..523c13a9b 100644 --- a/debian/po/he.po +++ b/debian/po/he.po @@ -141,17 +141,17 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: boolean #. Description diff --git a/debian/po/hr.po b/debian/po/hr.po index b298f40ec..7e1b972ba 100644 --- a/debian/po/hr.po +++ b/debian/po/hr.po @@ -138,17 +138,17 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: boolean #. Description diff --git a/debian/po/id.po b/debian/po/id.po index bfe60e6c9..0f457a7b9 100644 --- a/debian/po/id.po +++ b/debian/po/id.po @@ -147,15 +147,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/it.po b/debian/po/it.po index 021de9345..aeff5335c 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -140,17 +140,17 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: boolean #. Description diff --git a/debian/po/ja.po b/debian/po/ja.po index 588af771b..a26b752ea 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -143,15 +143,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/ka.po b/debian/po/ka.po index f59168777..3b600fc83 100644 --- a/debian/po/ka.po +++ b/debian/po/ka.po @@ -141,14 +141,14 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" msgstr "" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" msgstr "" #. Type: boolean diff --git a/debian/po/kk.po b/debian/po/kk.po index 89436b6a7..bccbfb235 100644 --- a/debian/po/kk.po +++ b/debian/po/kk.po @@ -139,17 +139,17 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} МБ, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} МБ; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "${DEVICE} (${SIZE} МБ, ${MODEL})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "${DEVICE} (${SIZE} МБ; ${MODEL})" #. Type: boolean #. Description diff --git a/debian/po/nb.po b/debian/po/nb.po index ebd25fefb..f6510ebd7 100644 --- a/debian/po/nb.po +++ b/debian/po/nb.po @@ -142,17 +142,17 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: boolean #. Description diff --git a/debian/po/nl.po b/debian/po/nl.po index cc49b1806..8940239a4 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -148,15 +148,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/pt.po b/debian/po/pt.po index fcff3eeae..4036de1db 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -149,15 +149,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index cedcf960e..28b192154 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -144,17 +144,17 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: boolean #. Description diff --git a/debian/po/ro.po b/debian/po/ro.po index 5c5bfa6e3..72384e238 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -146,17 +146,17 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MO, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MO; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "${DEVICE} (${SIZE} MO, ${MODEL})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "${DEVICE} (${SIZE} MO; ${MODEL})" #. Type: boolean #. Description diff --git a/debian/po/ru.po b/debian/po/ru.po index 4c85cb148..f96c01d0c 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -150,15 +150,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} МБ, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} МБ; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} МБ, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} МБ; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/sk.po b/debian/po/sk.po index 2a2d13745..e6c50f6cc 100644 --- a/debian/po/sk.po +++ b/debian/po/sk.po @@ -146,15 +146,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/sl.po b/debian/po/sl.po index f387d204d..769bcd860 100644 --- a/debian/po/sl.po +++ b/debian/po/sl.po @@ -144,15 +144,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/sv.po b/debian/po/sv.po index 7a3ea0981..68cb3650a 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -150,15 +150,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/ta.po b/debian/po/ta.po index 80da42ccb..2581dfceb 100644 --- a/debian/po/ta.po +++ b/debian/po/ta.po @@ -136,14 +136,14 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" msgstr "" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" msgstr "" #. Type: boolean diff --git a/debian/po/templates.pot b/debian/po/templates.pot index e99d14a9f..efbad3536 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -119,14 +119,14 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" msgstr "" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" msgstr "" #. Type: boolean diff --git a/debian/po/uk.po b/debian/po/uk.po index 338107846..9259f48bd 100644 --- a/debian/po/uk.po +++ b/debian/po/uk.po @@ -145,15 +145,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} МБ, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} МБ; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} МБ, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} МБ; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/vi.po b/debian/po/vi.po index bf1ee7107..29b1f7a01 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -141,8 +141,8 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" # Variable: don't translate; Biến: đừng dịch #. Type: text @@ -150,9 +150,9 @@ msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: boolean #. Description diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po index fe2a41b94..caa402d0d 100644 --- a/debian/po/zh_CN.po +++ b/debian/po/zh_CN.po @@ -137,15 +137,15 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "- ${DEVICE} (${SIZE} MB, ${PATH})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})" #. Type: boolean #. Description diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po index 763546b0d..f751c4486 100644 --- a/debian/po/zh_TW.po +++ b/debian/po/zh_TW.po @@ -135,17 +135,17 @@ msgstr "" #. Disk sizes are in decimal megabytes, to match how disk manufacturers #. usually describe them. #: ../grub-pc.templates.in:5001 -msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: text #. Description #. The "-" is used to indicate indentation. Leading spaces may not work. #: ../grub-pc.templates.in:6001 #, fuzzy -#| msgid "${DEVICE} (${SIZE} MB, ${MODEL})" -msgid "- ${DEVICE} (${SIZE} MB, ${PATH})" -msgstr "${DEVICE} (${SIZE} MB, ${MODEL})" +#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})" +msgid "- ${DEVICE} (${SIZE} MB; ${PATH})" +msgstr "${DEVICE} (${SIZE} MB; ${MODEL})" #. Type: boolean #. Description