From aeeda123b1185e6d6f6c975354fe567c4573502e Mon Sep 17 00:00:00 2001 From: Hugh McMaster Date: Thu, 3 Jun 2021 23:32:26 +1000 Subject: [PATCH] reg: Prompt the user to confirm whether they want to overwrite existing values when copying a key. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48000 Signed-off-by: Hugh McMaster Signed-off-by: Alexandre Julliard --- po/ar.po | 68 +++++++++++++++++++---------------- po/ast.po | 68 +++++++++++++++++++---------------- po/bg.po | 69 +++++++++++++++++++---------------- po/ca.po | 68 +++++++++++++++++++---------------- po/cs.po | 68 +++++++++++++++++++---------------- po/da.po | 68 +++++++++++++++++++---------------- po/de.po | 68 +++++++++++++++++++---------------- po/el.po | 69 +++++++++++++++++++---------------- po/en.po | 68 +++++++++++++++++++---------------- po/en_US.po | 68 +++++++++++++++++++---------------- po/eo.po | 68 +++++++++++++++++++---------------- po/es.po | 68 +++++++++++++++++++---------------- po/fa.po | 70 ++++++++++++++++++++---------------- po/fi.po | 68 +++++++++++++++++++---------------- po/fr.po | 68 +++++++++++++++++++---------------- po/he.po | 69 +++++++++++++++++++---------------- po/hi.po | 72 ++++++++++++++++++++----------------- po/hr.po | 68 +++++++++++++++++++---------------- po/hu.po | 68 +++++++++++++++++++---------------- po/it.po | 68 +++++++++++++++++++---------------- po/ja.po | 68 +++++++++++++++++++---------------- po/ko.po | 68 +++++++++++++++++++---------------- po/lt.po | 68 +++++++++++++++++++---------------- po/ml.po | 72 ++++++++++++++++++++----------------- po/nb_NO.po | 68 +++++++++++++++++++---------------- po/nl.po | 68 +++++++++++++++++++---------------- po/or.po | 72 ++++++++++++++++++++----------------- po/pa.po | 72 ++++++++++++++++++++----------------- po/pl.po | 68 +++++++++++++++++++---------------- po/pt_BR.po | 68 +++++++++++++++++++---------------- po/pt_PT.po | 68 +++++++++++++++++++---------------- po/rm.po | 72 ++++++++++++++++++++----------------- po/ro.po | 68 +++++++++++++++++++---------------- po/ru.po | 68 +++++++++++++++++++---------------- po/si.po | 68 +++++++++++++++++++---------------- po/sk.po | 72 +++++++++++++++++++++---------------- po/sl.po | 68 +++++++++++++++++++---------------- po/sr_RS@cyrillic.po | 69 +++++++++++++++++++---------------- po/sr_RS@latin.po | 69 +++++++++++++++++++---------------- po/sv.po | 68 +++++++++++++++++++---------------- po/ta.po | 72 ++++++++++++++++++++----------------- po/te.po | 72 ++++++++++++++++++++----------------- po/th.po | 74 ++++++++++++++++++++++---------------- po/tr.po | 68 +++++++++++++++++++---------------- po/uk.po | 68 +++++++++++++++++++---------------- po/wa.po | 72 ++++++++++++++++++++----------------- po/wine.pot | 72 ++++++++++++++++++++----------------- po/zh_CN.po | 68 +++++++++++++++++++---------------- po/zh_TW.po | 68 +++++++++++++++++++---------------- programs/reg/copy.c | 79 +++++++++++++++++++++++++++++++++++++++-- programs/reg/reg.rc | 5 ++- programs/reg/resource.h | 3 ++ 52 files changed, 1971 insertions(+), 1501 deletions(-) diff --git a/po/ar.po b/po/ar.po index 1ac5c954691..979379bbcd4 100644 --- a/po/ar.po +++ b/po/ar.po @@ -13986,12 +13986,12 @@ msgstr "" msgid "Are you sure?" msgstr "هل أنت متاكد ؟" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "Y" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -14062,7 +14062,7 @@ msgstr "فشل فتح '%1'\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "لم يتمكن من استدعاء هذا الاسم خارج المخطوطة\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -14131,11 +14131,11 @@ msgstr "القسم الموجود في المحرك %1!c! هو %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "القسم الموجود في المحرك %1!c! لا يملك اسمًا.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Yes|No)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Yes|No|All)" @@ -15510,17 +15510,17 @@ msgstr "ملفات الرموز" msgid "Icons (*.ico)" msgstr "الرموز (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid syntax. " msgstr "خطأ : اسم المفتاح غير سليم\n" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15533,13 +15533,13 @@ msgstr "خطأ : فشل النظام في العثور على المفتاح أ msgid "reg: The operation completed successfully\n" msgstr "تمت العملية بنجاح\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "Operation canceled by user.\n" msgid "reg: The registry operation was cancelled\n" msgstr "تم إلغاء العملية بواسطة المستخدم.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15553,11 +15553,11 @@ msgstr "خطأ : فشل النظام في العثور على المفتاح أ msgid "reg: Unable to find the specified registry value\n" msgstr "خطأ : فشل النظام في العثور على المفتاح أو القيمة المحددة\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(الافتراضي)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -15624,7 +15624,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15698,7 +15698,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15729,7 +15729,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15775,7 +15775,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15797,13 +15797,13 @@ msgstr "خطأ : اسم المفتاح غير سليم\n" msgid "reg: Unable to access remote machine\n" msgstr "خطأ : تعذر إضافة المفاتيح للجهاز البعيد\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid system key\n" msgstr "خطأ : اسم المفتاح غير سليم\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 #, fuzzy #| msgid "Error: Invalid option '%c'.\n" msgid "reg: Invalid option [%1]. " @@ -15817,7 +15817,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -15843,61 +15843,69 @@ msgstr "الملف المحدد موجود بالفعل ، هل ترغب باس msgid "reg: Invalid command line parameters\n" msgstr "خطأ : معاملات سطر الاوامر غير سليمة\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The specified file already exists. Do you want to replace it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "الملف المحدد موجود بالفعل ، هل ترغب باستبداله ؟" + +#: programs/reg/reg.rc:133 #, fuzzy #| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" msgstr "هل أنت متأكد من رغبتك في حذف هذه القيم ؟" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 #, fuzzy #| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "هل أنت متأكد من رغبتك في حذف القيمة '%s' ؟" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" msgstr "هل أنت متأكد من رغبتك في حذف '%1' ؟" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "خطأ : تعذر إضافة المفاتيح للجهاز البعيد\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy #| msgid "The specified file already exists. Do you want to replace it?" msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "الملف المحدد موجود بالفعل ، هل ترغب باستبداله ؟" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "خطأ : تعذر إضافة المفاتيح للجهاز البعيد\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy #| msgid "No command was specified." msgid "reg: The file '%1' was not found.\n" msgstr "لم يتم تحديد أي أمر." -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(القيمة غير مضبوطة)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/ast.po b/po/ast.po index ad767a29c6e..80aaf3102cc 100644 --- a/po/ast.po +++ b/po/ast.po @@ -12931,12 +12931,12 @@ msgstr "" msgid "Are you sure?" msgstr "¿De xuru?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "S" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13005,7 +13005,7 @@ msgstr "Fallu al abrir «%1»\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -13072,11 +13072,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Sí|Non)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14419,15 +14419,15 @@ msgstr "" msgid "Icons (*.ico)" msgstr "Iconos (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: La sintaxis nun ye válida. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "reg: Invalid syntax. " msgid "reg: Unable to access or create the specified registry key\n" @@ -14439,13 +14439,13 @@ msgstr "reg: La sintaxis nun ye válida. " msgid "reg: The operation completed successfully\n" msgstr "La operación completóse con ésitu\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "Thread not canceled.\n" msgid "reg: The registry operation was cancelled\n" msgstr "Nun s'encaboxó'l filu.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "reg: Invalid syntax. " msgid "reg: Unable to find the specified registry key\n" @@ -14457,11 +14457,11 @@ msgstr "reg: La sintaxis nun ye válida. " msgid "reg: Unable to find the specified registry value\n" msgstr "reg: La sintaxis nun ye válida. " -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14548,7 +14548,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14622,7 +14622,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14653,7 +14653,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14699,7 +14699,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14719,13 +14719,13 @@ msgstr "reg: La sintaxis nun ye válida. " msgid "reg: Unable to access remote machine\n" msgstr "reg: Nun pue accedese a la máquina remota\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "reg: Invalid syntax. " msgid "reg: Invalid system key\n" msgstr "reg: La sintaxis nun ye válida. " -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "" @@ -14739,7 +14739,7 @@ msgstr "reg: A la opción [/d] ha siguila un valor hexadecimal válidu\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg: A la opción [/d] ha siguila un valor hexadecimal válidu\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: A la opción [/d] ha siguila una cadena válida\n" @@ -14759,51 +14759,59 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "El ficheru «%1» yá esiste. ¿Quies sobrescribilu?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "reg: Invalid syntax. " msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "reg: La sintaxis nun ye válida. " -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "El ficheru «%1» yá esiste. ¿Quies sobrescribilu?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Nun se reconoz la secuencia d'escape [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "reg: Invalid syntax. " msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: La sintaxis nun ye válida. " -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: Nun s'alcontró'l ficheru «%1».\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(nun s'afitó'l valor)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/bg.po b/po/bg.po index b7592da568c..b25986f8c18 100644 --- a/po/bg.po +++ b/po/bg.po @@ -13156,12 +13156,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -13231,7 +13231,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -13299,11 +13299,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr "" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14714,16 +14714,16 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 #, fuzzy msgid "reg: Invalid syntax. " msgstr "Невалидни знаци в пътя.\n" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "reg: Unable to access or create the specified registry key\n" @@ -14733,12 +14733,12 @@ msgstr "Наистина ли искате да изтриете '%1'?" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy msgid "reg: The registry operation was cancelled\n" msgstr "Прекъснато от потребителя; .\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "reg: Unable to find the specified registry key\n" @@ -14750,11 +14750,11 @@ msgstr "Наистина ли искате да изтриете '%1'?" msgid "reg: Unable to find the specified registry value\n" msgstr "Наистина ли искате да изтриете '%1'?" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14821,7 +14821,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14895,7 +14895,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14926,7 +14926,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14972,7 +14972,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14991,12 +14991,12 @@ msgstr "Невалидни знаци в пътя.\n" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy msgid "reg: Invalid system key\n" msgstr "Невалидни знаци в пътя.\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 #, fuzzy msgid "reg: Invalid option [%1]. " msgstr "Невалидни знаци в пътя.\n" @@ -15009,7 +15009,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -15033,61 +15033,70 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "Невалидни знаци в пътя.\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "" +"Файлът вече съществува.\n" +"Искате ли да го замените?" + +#: programs/reg/reg.rc:133 #, fuzzy #| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Наистина ли искате да изтриете стойността '%s'?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 #, fuzzy #| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Наистина ли искате да изтриете стойността '%s'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Наистина ли искате да изтриете '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "Are you sure you want to delete value '%s'?" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "Наистина ли искате да изтриете стойността '%s'?" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "" "Файлът вече съществува.\n" "Искате ли да го замените?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "reg: Unable to import the registry key '%1'\n" msgstr "Наистина ли искате да изтриете '%1'?" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy msgid "reg: The file '%1' was not found.\n" msgstr "Файлът не е намерен.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/ca.po b/po/ca.po index 1417f153eff..3f4a036cb3e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -13362,12 +13362,12 @@ msgstr "" msgid "Are you sure?" msgstr "N'esteu segur?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "S" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13438,7 +13438,7 @@ msgstr "S'ha fallat en obrir '%1'\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "No es pot trucar a una etiqueta BAT fora d'un script BAT\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "T" @@ -13507,11 +13507,11 @@ msgstr "El volum en la unitat %1!c! és %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "El volum en la unitat %1!c! no té etiqueta.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Sí|No)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Sí|No|Tots)" @@ -14887,15 +14887,15 @@ msgstr "Fitxers d'icona" msgid "Icons (*.ico)" msgstr "Icones (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: La sintaxi no és vàlida. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Teclegeu \"REG %1 /?\" per ajuda.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -14910,13 +14910,13 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "L'operació s'ha acabat amb èxit\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" msgstr "S'ha cancel·lat l'operació de registre\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -14934,11 +14934,11 @@ msgstr "" "reg: El sistema no ha pogut trobar la clau de registre especificada o el " "valor de registre especificat\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Per defecte)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Teclegeu \"REG /?\" per ajuda.\n" @@ -15025,7 +15025,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15099,7 +15099,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15130,7 +15130,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15176,7 +15176,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15196,13 +15196,13 @@ msgstr "reg: Nom de clau no vàlid\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: No s'ha pogut accedir a la màquina remota\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" msgstr "reg: Nom de clau de sistema no vàlid [%1]\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: L'opció [%1] no és vàlida. " @@ -15216,7 +15216,7 @@ msgstr "reg: Un valor hexadecimal vàlid ha de seguir l'opció [/d]\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg: Un valor hexadecimal vàlid ha de seguir l'opció [/d]\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: Una cadena vàlida ha de seguir l'opció [/d]\n" @@ -15236,51 +15236,59 @@ msgstr "El valor de registre '%1' ja existeix. El voleu sobreescriure?" msgid "reg: Invalid command line parameters\n" msgstr "reg: Paràmetres de línia d'ordres no vàlids\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "El fitxer '%1' ja existeix. El voleu sobreescriure?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Esteu segur que voleu suprimir el valor de registre '%1'?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Esteu segur que voleu suprimir tots els valors de registre en '%1'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Esteu segur que voleu suprimir la clau de registre '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: No s'ha pogut suprimir la clau de registre '%1'.\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "El fitxer '%1' ja existeix. El voleu sobreescriure?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Seqüència d'escapada no reconeguda [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: No s'ha pogut obrir la clau de registre '%1'.\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: No s'ha trobat el fitxer '%1'.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(valor no definit)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "S'ha completat la cerca. Nombre de coincidències trobades: %1!d!\n" diff --git a/po/cs.po b/po/cs.po index 248fcec64e9..8a2721c8e35 100644 --- a/po/cs.po +++ b/po/cs.po @@ -13506,12 +13506,12 @@ msgstr "" msgid "Are you sure?" msgstr "Jste si jist(á)?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "A" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13580,7 +13580,7 @@ msgstr "Otevření „%1“ se nezdařilo\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Nelze volat označení dávky vně dávkového skriptu\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "V" @@ -13649,11 +13649,11 @@ msgstr "Svazek na disku %1!c! je %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Svazek na disku %1!c! není pojmenován.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Ano|Ne)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Ano|Ne|Vše)" @@ -15019,15 +15019,15 @@ msgstr "Soubory ikon" msgid "Icons (*.ico)" msgstr "Ikony (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Neplatná syntaxe. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15040,13 +15040,13 @@ msgstr "Chyba: Systém nemohl najít specifikovaný klíč registru nebo hodnotu msgid "reg: The operation completed successfully\n" msgstr "Operace byla úspěšně dokončena\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" msgstr "Operace registru byla přerušena\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15060,11 +15060,11 @@ msgstr "Chyba: Systém nemohl najít specifikovaný klíč registru nebo hodnotu msgid "reg: Unable to find the specified registry value\n" msgstr "Chyba: Systém nemohl najít specifikovaný klíč registru nebo hodnotu\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(výchozí)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -15131,7 +15131,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15205,7 +15205,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15236,7 +15236,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15282,7 +15282,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15304,13 +15304,13 @@ msgstr "Chyba: Neplatný název klíče\n" msgid "reg: Unable to access remote machine\n" msgstr "Chyba: Nepodařilo se přidat klíče na vzdálený stroj\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid system key\n" msgstr "Chyba: Neplatný název klíče\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 #, fuzzy #| msgid "Error: Invalid option '%c'.\n" msgid "reg: Invalid option [%1]. " @@ -15324,7 +15324,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -15346,53 +15346,61 @@ msgstr "Hodnota registru „%1“ již existuje. Chcete ji nahradit?" msgid "reg: Invalid command line parameters\n" msgstr "Chyba: Neplatné parametry příkazové řádky\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Soubor „%1“ již existuje. Chcete jej nahradit?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Opravdu chcete odstranit hodnotu registru „%1“?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Opravdu chcete smazat všechny hodnoty registru v „%1“?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Opravdu chcete odstranit klíč registru „%1“?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "Chyba: Nepodařilo se přidat klíče na vzdálený stroj\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Soubor „%1“ již existuje. Chcete jej nahradit?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "Chyba: Nepodařilo se přidat klíče na vzdálený stroj\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy #| msgid "No command was specified." msgid "reg: The file '%1' was not found.\n" msgstr "Nebyl zadán žádný příkaz." -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(hodnota nenastavena)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/da.po b/po/da.po index 81ecde4789d..c4f796f07e8 100644 --- a/po/da.po +++ b/po/da.po @@ -13901,12 +13901,12 @@ msgstr "" msgid "Are you sure?" msgstr "Er du sikker?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "J" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13975,7 +13975,7 @@ msgstr "Kunne ikke åbne «%1»\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Kan ikke kalde batch label udenfor batchfil\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -14044,11 +14044,11 @@ msgstr "Volume i drev %1!c! er %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Volume in drev %1!c! har intet navn.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Ja|Nej)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Ja|Nej|Alle)" @@ -15464,17 +15464,17 @@ msgstr "Ikon filer" msgid "Icons (*.ico)" msgstr "Ikoner (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid syntax. " msgstr "Fejl: Ugyldigt nøgle navn\n" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15489,13 +15489,13 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "Operationen blev afsluttet med succes\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "Operation canceled by user.\n" msgid "reg: The registry operation was cancelled\n" msgstr "Operation annulleret af bruger.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15513,11 +15513,11 @@ msgstr "" "Fejl: Systemet kunne ikke finde, den angivet registrerings nøgle eller " "værdi\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Standard)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -15584,7 +15584,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15658,7 +15658,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15689,7 +15689,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15735,7 +15735,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15757,13 +15757,13 @@ msgstr "Fejl: Ugyldigt nøgle navn\n" msgid "reg: Unable to access remote machine\n" msgstr "Fejl: Kunne ikke tilføje nøgler til fjern maskinen\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid system key\n" msgstr "Fejl: Ugyldigt nøgle navn\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 #, fuzzy #| msgid "Error: Invalid option '%c'.\n" msgid "reg: Invalid option [%1]. " @@ -15777,7 +15777,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -15803,61 +15803,69 @@ msgstr "Filen findes allerede. Vil du erstatte den?" msgid "reg: Invalid command line parameters\n" msgstr "Fejl: Ugyldige kommando linje parametre\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The specified file already exists. Do you want to replace it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Filen findes allerede. Vil du erstatte den?" + +#: programs/reg/reg.rc:133 #, fuzzy #| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Er du sikker på du vil slette disse værdier?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 #, fuzzy #| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Er du sikker på at ville slette værdien '%s'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Er du sikker på du vil slette '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "Fejl: Kunne ikke tilføje nøgler til fjern maskinen\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy #| msgid "The specified file already exists. Do you want to replace it?" msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Filen findes allerede. Vil du erstatte den?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "Fejl: Kunne ikke tilføje nøgler til fjern maskinen\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy #| msgid "No command was specified." msgid "reg: The file '%1' was not found.\n" msgstr "Der blev ikke specificeret nogen kommando." -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(værdi ikke sat)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/de.po b/po/de.po index 45e7ead4eca..bddba00cf89 100644 --- a/po/de.po +++ b/po/de.po @@ -13340,12 +13340,12 @@ msgstr "" msgid "Are you sure?" msgstr "Sind Sie sicher?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "J" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13416,7 +13416,7 @@ msgstr "'%1' konnte nicht geöffnet werden\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Kann kein Batch-Label außerhalb eines Batch-Skripts aufrufen\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -13485,11 +13485,11 @@ msgstr "Datenträger in Laufwerk %1!c! ist %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Datenträger in Laufwerk %1!c! hat keine Bezeichnung.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Ja|Nein)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Ja|Nein|Alle)" @@ -14861,15 +14861,15 @@ msgstr "Symboldateien" msgid "Icons (*.ico)" msgstr "Symbole (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Ungültige Syntax. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Geben Sie \"REG %1 /?\" ein, um Hilfe zu erhalten.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "reg: Unable to find the specified registry key\n" msgid "reg: Unable to access or create the specified registry key\n" @@ -14879,11 +14879,11 @@ msgstr "reg: Der angegebene Schlüssel wurde nicht gefunden\n" msgid "reg: The operation completed successfully\n" msgstr "reg: Der Vorgang wurde erfolgreich abgeschlossen\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "reg: Der Registrierungsvorgang wurde abgebrochen\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "reg: Der angegebene Schlüssel wurde nicht gefunden\n" @@ -14891,11 +14891,11 @@ msgstr "reg: Der angegebene Schlüssel wurde nicht gefunden\n" msgid "reg: Unable to find the specified registry value\n" msgstr "reg: Der angegebene Wert wurde nicht gefunden\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Standard)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Geben Sie \"REG /?\" ein, um Hilfe zu erhalten.\n" @@ -15032,7 +15032,7 @@ msgstr "" " Die Registrierung ohne weitere Bestätigung ändern.\n" "\n" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 #, fuzzy #| msgid "" #| "REG EXPORT [/y]\n" @@ -15200,7 +15200,7 @@ msgstr "" " Werte) ohne weitere Bestätigung.\n" "\n" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15259,7 +15259,7 @@ msgstr "" " ohne weitere Bestätigung überschreiben.\n" "\n" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15347,7 +15347,7 @@ msgstr "" " Listet alle Einträge unter und seinen Unterschlüsseln auf.\n" "\n" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15371,11 +15371,11 @@ msgstr "reg: Ungültiger Registrierungsschlüssel\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: Auf den Remoterechner kann nicht zugegriffen werden\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "reg: Ungültiger Systemschlüssel\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: Ungültige Option [%1]. " @@ -15389,7 +15389,7 @@ msgstr "reg: Auf die Option [/d] muss ein gültiger Hexadezimalwert folgen\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg: Auf die Option [/d] muss ein gültiger Hexadezimalwert folgen\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: Auf die Option [/d] muss eine gültige Zeichenkette folgen\n" @@ -15409,49 +15409,57 @@ msgstr "Der Wert '%1' existiert bereits. Möchten Sie ihn ersetzen?" msgid "reg: Invalid command line parameters\n" msgstr "reg: Ungültige Befehlszeilenargumente\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Die Datei '%1' existiert bereits. Möchten Sie sie ersetzen?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Sind Sie sicher, dass Sie den Wert '%1' löschen möchten?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Sind Sie sicher, dass Sie alle Werte in '%1' löschen möchten?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Sind Sie sicher, dass Sie den Schlüssel '%1' löschen möchten?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: Der Schlüssel '%1' konnte nicht gelöscht werden.\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Die Datei '%1' existiert bereits. Möchten Sie sie ersetzen?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Unbekannte Escape-Sequenz [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: Der Schlüssel '%1' konnte nicht importiert werden\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: Die Datei '%1' wurde nicht gefunden.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(Wert nicht gesetzt)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Suche abgeschlossen. Gefundene Übereinstimmungen: %1!d!\n" diff --git a/po/el.po b/po/el.po index 857a09133c3..738d5096d03 100644 --- a/po/el.po +++ b/po/el.po @@ -12927,12 +12927,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -13002,7 +13002,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -13069,11 +13069,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr "" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14436,16 +14436,16 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 #, fuzzy msgid "reg: Invalid syntax. " msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι.\n" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy msgid "reg: Unable to access or create the specified registry key\n" msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι.\n" @@ -14454,12 +14454,12 @@ msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπά msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy msgid "reg: The registry operation was cancelled\n" msgstr "Επιλογές.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy msgid "reg: Unable to find the specified registry key\n" msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι.\n" @@ -14469,11 +14469,11 @@ msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπά msgid "reg: Unable to find the specified registry value\n" msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι.\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14540,7 +14540,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14614,7 +14614,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14645,7 +14645,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14691,7 +14691,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14710,12 +14710,12 @@ msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπά msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy msgid "reg: Invalid system key\n" msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι.\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 #, fuzzy msgid "reg: Invalid option [%1]. " msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι.\n" @@ -14728,7 +14728,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -14753,53 +14753,62 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι.\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "" +"Το αρχείο υπάρχει ήδη.\n" +"Θέλετε να το αντικαταστήσετε;" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι.\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "" "Το αρχείο υπάρχει ήδη.\n" "Θέλετε να το αντικαταστήσετε;" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy msgid "reg: Unable to import the registry key '%1'\n" msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι.\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy msgid "reg: The file '%1' was not found.\n" msgstr "Το αρχείο δε βρέθηκε.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/en.po b/po/en.po index e14d6c366df..10c2e8ffc5a 100644 --- a/po/en.po +++ b/po/en.po @@ -13160,12 +13160,12 @@ msgstr "" msgid "Are you sure?" msgstr "Are you sure?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "Y" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13234,7 +13234,7 @@ msgstr "Failed to open '%1'\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Cannot call batch label outside of a batch script\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -13303,11 +13303,11 @@ msgstr "Volume in drive %1!c! is %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Volume in drive %1!c! has no label.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Yes|No)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Yes|No|All)" @@ -14676,15 +14676,15 @@ msgstr "Icon files" msgid "Icons (*.ico)" msgstr "Icons (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Invalid syntax. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Type \"REG %1 /?\" for help.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" msgstr "reg: Unable to access or create the specified registry key\n" @@ -14692,11 +14692,11 @@ msgstr "reg: Unable to access or create the specified registry key\n" msgid "reg: The operation completed successfully\n" msgstr "reg: The operation completed successfully\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "reg: The registry operation was cancelled\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "reg: Unable to find the specified registry key\n" @@ -14704,11 +14704,11 @@ msgstr "reg: Unable to find the specified registry key\n" msgid "reg: Unable to find the specified registry value\n" msgstr "reg: Unable to find the specified registry value\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Default)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Type \"REG /?\" for help.\n" @@ -14830,7 +14830,7 @@ msgstr "" " Modify the registry without prompting for confirmation.\n" "\n" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14970,7 +14970,7 @@ msgstr "" " prompting for confirmation.\n" "\n" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15028,7 +15028,7 @@ msgstr "" " Overwrite without prompting for confirmation.\n" "\n" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15112,7 +15112,7 @@ msgstr "" " List all registry entries under and its subkeys.\n" "\n" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15136,11 +15136,11 @@ msgstr "reg: Invalid registry key\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: Unable to access remote machine\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "reg: Invalid system key\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: Invalid option [%1]. " @@ -15152,7 +15152,7 @@ msgstr "reg: The option [/d] must be followed by a valid numeric value\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg: The option [/d] must be followed by a valid hexadecimal value\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: The option [/d] must be followed by a valid string\n" @@ -15172,47 +15172,55 @@ msgstr "The registry value '%1' already exists. Do you want to overwrite it?" msgid "reg: Invalid command line parameters\n" msgstr "reg: Invalid command line parameters\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "reg: The source and destination keys cannot be the same\n" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Are you sure you want to delete the registry value '%1'?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Are you sure you want to delete all registry values in '%1'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Are you sure you want to delete the registry key '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "reg: Unable to delete all registry values in '%1'\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "The file '%1' already exists. Do you want to overwrite it?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Unrecognized escape sequence [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: Unable to import the registry key '%1'\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: The file '%1' was not found.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(value not set)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Search complete. Number of matches found: %1!d!\n" diff --git a/po/en_US.po b/po/en_US.po index 7fff7d6de83..b4d1d4a81dd 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -13160,12 +13160,12 @@ msgstr "" msgid "Are you sure?" msgstr "Are you sure?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "Y" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13234,7 +13234,7 @@ msgstr "Failed to open '%1'\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Cannot call batch label outside of a batch script\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -13303,11 +13303,11 @@ msgstr "Volume in drive %1!c! is %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Volume in drive %1!c! has no label.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Yes|No)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Yes|No|All)" @@ -14676,15 +14676,15 @@ msgstr "Icon files" msgid "Icons (*.ico)" msgstr "Icons (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Invalid syntax. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Type \"REG %1 /?\" for help.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" msgstr "reg: Unable to access or create the specified registry key\n" @@ -14692,11 +14692,11 @@ msgstr "reg: Unable to access or create the specified registry key\n" msgid "reg: The operation completed successfully\n" msgstr "reg: The operation completed successfully\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "reg: The registry operation was cancelled\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "reg: Unable to find the specified registry key\n" @@ -14704,11 +14704,11 @@ msgstr "reg: Unable to find the specified registry key\n" msgid "reg: Unable to find the specified registry value\n" msgstr "reg: Unable to find the specified registry value\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Default)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Type \"REG /?\" for help.\n" @@ -14830,7 +14830,7 @@ msgstr "" " Modify the registry without prompting for confirmation.\n" "\n" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14970,7 +14970,7 @@ msgstr "" " prompting for confirmation.\n" "\n" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15028,7 +15028,7 @@ msgstr "" " Overwrite without prompting for confirmation.\n" "\n" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15112,7 +15112,7 @@ msgstr "" " List all registry entries under and its subkeys.\n" "\n" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15136,11 +15136,11 @@ msgstr "reg: Invalid registry key\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: Unable to access remote machine\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "reg: Invalid system key\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: Invalid option [%1]. " @@ -15152,7 +15152,7 @@ msgstr "reg: The option [/d] must be followed by a valid numeric value\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg: The option [/d] must be followed by a valid hexadecimal value\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: The option [/d] must be followed by a valid string\n" @@ -15172,47 +15172,55 @@ msgstr "The registry value '%1' already exists. Do you want to overwrite it?" msgid "reg: Invalid command line parameters\n" msgstr "reg: Invalid command line parameters\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "reg: The source and destination keys cannot be the same\n" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Are you sure you want to delete the registry value '%1'?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Are you sure you want to delete all registry values in '%1'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Are you sure you want to delete the registry key '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "reg: Unable to delete all registry values in '%1'\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "The file '%1' already exists. Do you want to overwrite it?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Unrecognized escape sequence [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: Unable to import the registry key '%1'\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: The file '%1' was not found.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(value not set)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Search complete. Number of matches found: %1!d!\n" diff --git a/po/eo.po b/po/eo.po index 9092a6c2c88..aea06ddc5d3 100644 --- a/po/eo.po +++ b/po/eo.po @@ -13066,12 +13066,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -13140,7 +13140,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -13207,11 +13207,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr "" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14578,17 +14578,17 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 #, fuzzy #| msgid "Invalid share name.\n" msgid "reg: Invalid syntax. " msgstr "Nevalida nomo de kunuzata aparato.\n" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "reg: Unable to access or create the specified registry key\n" @@ -14598,13 +14598,13 @@ msgstr "Ĉu vi estas certa pri forigo de '%1'?" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "Operation canceled by user.\n" msgid "reg: The registry operation was cancelled\n" msgstr "Operacio nuligita de uzanto.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "reg: Unable to find the specified registry key\n" @@ -14616,11 +14616,11 @@ msgstr "Ĉu vi estas certa pri forigo de '%1'?" msgid "reg: Unable to find the specified registry value\n" msgstr "Ĉu vi estas certa pri forigo de '%1'?" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Defaŭlta)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14687,7 +14687,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14761,7 +14761,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14792,7 +14792,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14838,7 +14838,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14858,13 +14858,13 @@ msgstr "Nevalida nomo de kunuzata aparato.\n" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "Invalid share name.\n" msgid "reg: Invalid system key\n" msgstr "Nevalida nomo de kunuzata aparato.\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 #, fuzzy #| msgid "Invalid version option.\n" msgid "reg: Invalid option [%1]. " @@ -14878,7 +14878,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -14902,61 +14902,69 @@ msgstr "Dosiero estas jam ekzistanta. Ĉu vi volas anstataŭi ĝin?" msgid "reg: Invalid command line parameters\n" msgstr "Nevalida komandlinio.\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The specified file already exists. Do you want to replace it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Dosiero estas jam ekzistanta. Ĉu vi volas anstataŭi ĝin?" + +#: programs/reg/reg.rc:133 #, fuzzy #| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Ĉu vi certas pri forigo de ĉi tiuj valoroj?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 #, fuzzy #| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Ĉu vi certas pri forigo de '%s'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Ĉu vi estas certa pri forigo de '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "Are you sure you want to delete these values?" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "Ĉu vi certas pri forigo de ĉi tiuj valoroj?" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy #| msgid "The specified file already exists. Do you want to replace it?" msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Dosiero estas jam ekzistanta. Ĉu vi volas anstataŭi ĝin?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "reg: Unable to import the registry key '%1'\n" msgstr "Ĉu vi estas certa pri forigo de '%1'?" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy #| msgid "Search string '%s' not found" msgid "reg: The file '%1' was not found.\n" msgstr "Mi ne trovis la ĉenon %s" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(valoro ne elektita)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/es.po b/po/es.po index f3faa06f8ec..f96bf0787c6 100644 --- a/po/es.po +++ b/po/es.po @@ -13589,12 +13589,12 @@ msgstr "" msgid "Are you sure?" msgstr "¿Está seguro?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "S" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13663,7 +13663,7 @@ msgstr "No se pudo abrir '%1'\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "No se puede llamar a una etiqueta fuera de un archivo de lotes\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "T" @@ -13732,11 +13732,11 @@ msgstr "El volumen en la unidad %1!c! es %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "El volumen en la unidad %1!c! no tiene etiqueta.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Sí|No)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Sí|No|Todo)" @@ -15110,15 +15110,15 @@ msgstr "Archivos de icono" msgid "Icons (*.ico)" msgstr "Iconos (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Sintaxis inválida. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -15133,13 +15133,13 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "La operación finalizó con éxito\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "Operation was cancelled.\n" msgid "reg: The registry operation was cancelled\n" msgstr "Operación cancelada.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -15157,11 +15157,11 @@ msgstr "" "reg: El sistema no pudo encontrar la clave o el valor del Registro " "especificado\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Por defecto)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -15228,7 +15228,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15302,7 +15302,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15333,7 +15333,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15379,7 +15379,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15399,13 +15399,13 @@ msgstr "reg: Nombre de clave inválido\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: No se puede acceder al equipo remoto\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" msgstr "reg: Nombre de clave inválido[%1]\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: Opción inválida[%1]. " @@ -15417,7 +15417,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -15439,51 +15439,59 @@ msgstr "El archivo ya existe. ¿Desea reemplazarlo?" msgid "reg: Invalid command line parameters\n" msgstr "reg: Parámetros de línea de comandos inválidos\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "El archivo '%1' ya existe. ¿Desea reemplazarlo?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "¿Está seguro que desea eliminar el valor de registro '%1'?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "¿Seguro que desea eliminar all registry values en '%1'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "¿Seguro que desea eliminar la clave de registro '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: No se puede borrar la clave de registro '%1'.\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "El archivo '%1' ya existe. ¿Desea reemplazarlo?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: No se puede abrir la clave de registro '%1'.\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: No se encontró el archivo '%1'.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(valor no definido)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/fa.po b/po/fa.po index 409d96ae924..207e115c77d 100644 --- a/po/fa.po +++ b/po/fa.po @@ -12886,12 +12886,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -12961,7 +12961,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -13029,11 +13029,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr "" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14393,15 +14393,15 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy msgid "reg: Unable to access or create the specified registry key\n" msgstr "پرونده‌های متنی (*.txt).\n" @@ -14410,12 +14410,12 @@ msgstr "پرونده‌های متنی (*.txt).\n" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy msgid "reg: The registry operation was cancelled\n" msgstr "&پرونده.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy msgid "reg: Unable to find the specified registry key\n" msgstr "پرونده‌های متنی (*.txt).\n" @@ -14425,11 +14425,11 @@ msgstr "پرونده‌های متنی (*.txt).\n" msgid "reg: Unable to find the specified registry value\n" msgstr "پرونده‌های متنی (*.txt).\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14496,7 +14496,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14570,7 +14570,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14601,7 +14601,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14647,7 +14647,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14666,12 +14666,12 @@ msgstr "پرونده‌های متنی (*.txt).\n" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy msgid "reg: Invalid system key\n" msgstr "پرونده‌های متنی (*.txt).\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "" @@ -14683,7 +14683,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -14707,28 +14707,38 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "" +"پرونده‌ای با نام '%s' وجود ندارد.\n" +"\n" +"آیا می‌خواهید یک پرونده‌ی جدید ایجاد کنید؟" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "پرونده‌های متنی (*.txt).\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "" @@ -14736,24 +14746,24 @@ msgstr "" "\n" "آیا می‌خواهید یک پرونده‌ی جدید ایجاد کنید؟" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy msgid "reg: Unable to import the registry key '%1'\n" msgstr "پرونده‌های متنی (*.txt).\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 891cbb02b47..ab6598e2848 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13238,12 +13238,12 @@ msgstr "" msgid "Are you sure?" msgstr "Oletko varma?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "K" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "E" @@ -13312,7 +13312,7 @@ msgstr "'%1' ei auennut\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Komentojonon nimiötä ei voi kutsua komentojonon ulkopuolelta\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -13381,11 +13381,11 @@ msgstr "Osio asemassa %1!c! on %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Osiolla asemassa %1!c! ei ole nimeä.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Kyllä|Ei)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Kyllä|Ei|kAikki)" @@ -14752,15 +14752,15 @@ msgstr "Kuvaketiedostot" msgid "Icons (*.ico)" msgstr "Kuvakkeet (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Syntaksi ei kelpaa. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Komento \"REG %1 /?\" näyttää ohjeen.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" msgstr "reg: Annetun rekisteriavaimen käyttö tai luonti ei onnistu\n" @@ -14768,11 +14768,11 @@ msgstr "reg: Annetun rekisteriavaimen käyttö tai luonti ei onnistu\n" msgid "reg: The operation completed successfully\n" msgstr "reg: Toiminnon suorittaminen onnistui\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "reg: Rekisterin toimenpide peruttiin\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "reg: Annettua rekisteriavainta ei löydy\n" @@ -14780,11 +14780,11 @@ msgstr "reg: Annettua rekisteriavainta ei löydy\n" msgid "reg: Unable to find the specified registry value\n" msgstr "reg: Annettua rekisteriarvoa ei löydy\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Oletus)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Komento \"REG /?\" näyttää ohjeen.\n" @@ -14916,7 +14916,7 @@ msgstr "" " Muokkaa rekisteriä kysymättä vahvistusta.\n" "\n" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 #, fuzzy #| msgid "" #| "REG EXPORT [/y]\n" @@ -15079,7 +15079,7 @@ msgstr "" " vahvistusta.\n" "\n" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15136,7 +15136,7 @@ msgstr "" " Ylikirjoita tiedosto kysymättä vahvistusta.\n" "\n" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15220,7 +15220,7 @@ msgstr "" " Listaa kaikki rekisterin kohdat avaimen ja sen aliavainten alla.\n" "\n" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15244,11 +15244,11 @@ msgstr "reg: Rekisteriavain ei kelpaa\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: Ei pääsyä etäkoneelle\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "reg: Järjestelmäavain ei kelpaa\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: Valitsin [%1] ei kelpaa. " @@ -15262,7 +15262,7 @@ msgstr "reg: Valitsinta [/d] täytyy seurata kelpo heksadesimaaliarvo\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg: Valitsinta [/d] täytyy seurata kelpo heksadesimaaliarvo\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: Valitsinta [/d] täytyy seurata kelpo merkkijono\n" @@ -15282,49 +15282,57 @@ msgstr "Rekisterin arvo '%1' on jo olemassa. Haluatko korvata sen?" msgid "reg: Invalid command line parameters\n" msgstr "reg: Komentoriviparametrit eivät kelpaa\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Tiedosto '%1' on jo olemassa. Haluatko korvata sen?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Haluatko varmasti tuhota rekisteristä arvon '%1'?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Haluatko varmasti tuhota kaikki rekisterin arvot kohteesta '%1'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Haluatko varmasti tuhota rekisteriavaimen '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: Rekisteriavainta '%1' ei voida poistaa.\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Tiedosto '%1' on jo olemassa. Haluatko korvata sen?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Tuntematon merkintä [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: Rekisteriavaimen '%1' tuonti ei onnistu\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: Tiedostoa '%1' ei löydy.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(arvoa ei asetettu)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Haku on valmis. Osumia: %1!d!\n" diff --git a/po/fr.po b/po/fr.po index f2b943b32cb..eb068960026 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13872,12 +13872,12 @@ msgstr "" msgid "Are you sure?" msgstr "Êtes-vous sûr(e) ?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "O" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13948,7 +13948,7 @@ msgid "Cannot call batch label outside of a batch script\n" msgstr "" "Impossible de sauter vers une étiquette hors d'un fichier de commandes\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "T" @@ -14017,11 +14017,11 @@ msgstr "Le volume dans le lecteur %1!c! est %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Le volume dans le lecteur %1!c! n'a pas de label.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Oui|Non)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Oui|Non|Tous)" @@ -15400,15 +15400,15 @@ msgstr "Fichiers icônes" msgid "Icons (*.ico)" msgstr "Icônes (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg : syntaxe invalide. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Tapez « REG %1 /? » pour de l'aide.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -15422,13 +15422,13 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "L'opération s'est terminée avec succès\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" msgstr "L'operation sur le registre a été annulée\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -15444,11 +15444,11 @@ msgid "reg: Unable to find the specified registry value\n" msgstr "" "reg : le système n'a pas pu trouver la clé ou valeur de registre spécifiée\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(par défaut)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Tapez « REG /? » pour de l'aide.\n" @@ -15535,7 +15535,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15609,7 +15609,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15640,7 +15640,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15686,7 +15686,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15706,13 +15706,13 @@ msgstr "reg : nom de clé invalide\n" msgid "reg: Unable to access remote machine\n" msgstr "reg : impossible d'accéder à une machine distante\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "reg: Invalid key name\n" msgid "reg: Invalid system key\n" msgstr "reg : nom de clé invalide\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg : option [%1] invalide. " @@ -15728,7 +15728,7 @@ msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" "reg : l'option [/d] doit être suivie d'une valeur hexadécimale valide\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" "reg : l'option [/d] doit être suivie d'une chaîne de caractères valide\n" @@ -15749,58 +15749,66 @@ msgstr "La valeur de registre « %1 » existe déjà. Voulez-vous la remplacer msgid "reg: Invalid command line parameters\n" msgstr "reg : paramètres de ligne de commande invalide\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "La valeur de registre « %1 » existe déjà. Voulez-vous la remplacer ?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Voulez-vous réellement supprimer la valeur de registre « %1 » ?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" "Voulez-vous réellement supprimer toutes les valeurs de registre dans « %1 » ?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Voulez-vous réellement supprimer la clé de registre « %1 » ?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit : impossible d'effacer la classe de registre « %1 ».\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy #| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "La valeur de registre « %1 » existe déjà. Voulez-vous la remplacer ?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 #, fuzzy #| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit : séquence d'échappement non reconnue [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy #| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" msgstr "regedit : le fichier « %1 » est introuvable.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(valeur non définie)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Recherche terminée. Nombre de correspondances trouvées : %1!d!\n" diff --git a/po/he.po b/po/he.po index 6545fb2d8e0..85f121e5cb1 100644 --- a/po/he.po +++ b/po/he.po @@ -13463,12 +13463,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -13537,7 +13537,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -13604,11 +13604,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr "" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14996,17 +14996,17 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid syntax. " msgstr "Error: Invalid key name\n" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15020,12 +15020,12 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "The operation completed successfully\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy msgid "reg: The registry operation was cancelled\n" msgstr "תכניות התקנה.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15041,11 +15041,11 @@ msgid "reg: Unable to find the specified registry value\n" msgstr "" "Error: The system was unable to find the specified registry key or value\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(בררת המחדל)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -15112,7 +15112,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15186,7 +15186,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15217,7 +15217,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15263,7 +15263,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15285,13 +15285,13 @@ msgstr "Error: Invalid key name\n" msgid "reg: Unable to access remote machine\n" msgstr "Error: Unable to add keys to remote machine\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid system key\n" msgstr "Error: Invalid key name\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 #, fuzzy #| msgid "Error: Invalid option '%c'.\n" msgid "reg: Invalid option [%1]. " @@ -15305,7 +15305,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -15332,62 +15332,71 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "Error: Invalid command line parameters\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "" +"הקובץ כבר קיים.\n" +"האם ברצונך להחליף אותו?" + +#: programs/reg/reg.rc:133 #, fuzzy #| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" msgstr "האם ברצונך למחוק ערכים אלו?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 #, fuzzy #| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "האם ברצונך למחוק את הערך '%s'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" msgstr "האם אכן ברצונך למחוק את '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "Error: Unable to add keys to remote machine\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "" "הקובץ כבר קיים.\n" "האם ברצונך להחליף אותו?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "Error: Unable to add keys to remote machine\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy #| msgid "Search string '%s' not found" msgid "reg: The file '%1' was not found.\n" msgstr "מחרוזת החיפוש ׳%s׳ לא נמצאה" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(לא הוגדר ערך)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/hi.po b/po/hi.po index e9a7c6ef479..0af1c903741 100644 --- a/po/hi.po +++ b/po/hi.po @@ -12676,12 +12676,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -12750,7 +12750,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -12817,11 +12817,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr "" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14147,15 +14147,15 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" msgstr "" @@ -14163,11 +14163,11 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "" @@ -14175,11 +14175,11 @@ msgstr "" msgid "reg: Unable to find the specified registry value\n" msgstr "" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14246,7 +14246,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14320,7 +14320,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14351,7 +14351,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14397,7 +14397,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14415,11 +14415,11 @@ msgstr "" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "" @@ -14431,7 +14431,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -14451,47 +14451,53 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 -msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "" - -#: programs/reg/reg.rc:132 -msgid "Are you sure you want to delete all registry values in '%1'?" +#: programs/reg/reg.rc:205 +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" msgstr "" #: programs/reg/reg.rc:133 -msgid "Are you sure you want to delete the registry key '%1'?" +msgid "Are you sure you want to delete the registry value '%1'?" +msgstr "" + +#: programs/reg/reg.rc:134 +msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" #: programs/reg/reg.rc:135 +msgid "Are you sure you want to delete the registry key '%1'?" +msgstr "" + +#: programs/reg/reg.rc:137 msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/hr.po b/po/hr.po index 3fdd8b4d999..b5c7868b4aa 100644 --- a/po/hr.po +++ b/po/hr.po @@ -13458,12 +13458,12 @@ msgstr "" msgid "Are you sure?" msgstr "Da li ste sigurni?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "D" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13532,7 +13532,7 @@ msgstr "Neuspjelo otvaranje '%1'\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "S" @@ -13599,11 +13599,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Da|Ne)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Da|Ne|Sve)" @@ -14967,17 +14967,17 @@ msgstr "Datoteke ikona" msgid "Icons (*.ico)" msgstr "Ikone (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid syntax. " msgstr "Greška: Neispravan naziv ključa\n" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -14991,13 +14991,13 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "Operacija uspješno dovršena\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "Operation canceled by user.\n" msgid "reg: The registry operation was cancelled\n" msgstr "Korisnik prekinuo operaciju.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15013,11 +15013,11 @@ msgid "reg: Unable to find the specified registry value\n" msgstr "" "Greška: Sustav nije mogao pronaći navedeni ključ ili vrijednost u registru.\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Podrazumijevano)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -15084,7 +15084,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15158,7 +15158,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15189,7 +15189,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15235,7 +15235,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15255,13 +15255,13 @@ msgstr "Greška: Neispravan naziv ključa\n" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid system key\n" msgstr "Greška: Neispravan naziv ključa\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 #, fuzzy #| msgid "Error: Invalid option '%c'.\n" msgid "reg: Invalid option [%1]. " @@ -15275,7 +15275,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -15302,61 +15302,69 @@ msgid "reg: Invalid command line parameters\n" msgstr "" "Greška: uneseni su nepoznati ili neispravni parametri naredbene linije\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The specified file already exists. Do you want to replace it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Odabrana datoteka već postoji. Želite li je zamijeniti?" + +#: programs/reg/reg.rc:133 #, fuzzy #| msgid "Are you sure you want to delete these %1 items?" msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Sigurno želite izbrisati ovih %1 stavki?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Sigurno želite izbrisati '%1'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Sigurno želite izbrisati '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "Could not open the file." msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "Datoteka se ne može otvoriti." -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy #| msgid "The specified file already exists. Do you want to replace it?" msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Odabrana datoteka već postoji. Želite li je zamijeniti?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "Could not open the file." msgid "reg: Unable to import the registry key '%1'\n" msgstr "Datoteka se ne može otvoriti." -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy #| msgid "File not found.\n" msgid "reg: The file '%1' was not found.\n" msgstr "Datoteka nije pronađena.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(vrijednost nije postavljena)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index 49d69f83fa4..168ce571cc4 100644 --- a/po/hu.po +++ b/po/hu.po @@ -13892,12 +13892,12 @@ msgstr "" msgid "Are you sure?" msgstr "Biztos benne?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "I" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13966,7 +13966,7 @@ msgstr "'%1' megnyitása sikertelen\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Nem lehet hívi batch címkét a batch szkripten kívűl\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "M" @@ -14035,11 +14035,11 @@ msgstr "%1!c! meghajtó kötet neve %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "%1!c! kötetnek nincs címkéje.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Igen|Nem)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Igen|Nem|Mind)" @@ -15459,17 +15459,17 @@ msgstr "Ikon fájlok" msgid "Icons (*.ico)" msgstr "Ikonok (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid syntax. " msgstr "Hiba: Érvénytelen kulcsnév\n" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15483,13 +15483,13 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "A művelet sikresen befejeződött\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "Operation canceled by user.\n" msgid "reg: The registry operation was cancelled\n" msgstr "Műveletet a felhasználó megszakította.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15505,11 +15505,11 @@ msgid "reg: Unable to find the specified registry value\n" msgstr "" "Hiba: A rendszer nem találta a megadott regisztrációs kulcsot vagy értéket\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Alapérték)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -15576,7 +15576,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15650,7 +15650,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15681,7 +15681,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15727,7 +15727,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15749,13 +15749,13 @@ msgstr "Hiba: Érvénytelen kulcsnév\n" msgid "reg: Unable to access remote machine\n" msgstr "Hiba: nem lehet kulcsokat hozzáadni a távoli gépnél\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid system key\n" msgstr "Hiba: Érvénytelen kulcsnév\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 #, fuzzy #| msgid "Error: Invalid option '%c'.\n" msgid "reg: Invalid option [%1]. " @@ -15769,7 +15769,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -15795,61 +15795,69 @@ msgstr "A fájl már létezik. Lecseréli a fájlt?" msgid "reg: Invalid command line parameters\n" msgstr "Hiba: Érvénytelen parancssor paraméterek\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The specified file already exists. Do you want to replace it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "A fájl már létezik. Lecseréli a fájlt?" + +#: programs/reg/reg.rc:133 #, fuzzy #| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Biztosan törölni szeretné ezeket az értékeket?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 #, fuzzy #| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Biztos hogy törölni szeretné a(z) '%s' kulcsot?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Biztos hogy törölni szeretné ezt: '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "Hiba: nem lehet kulcsokat hozzáadni a távoli gépnél\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy #| msgid "The specified file already exists. Do you want to replace it?" msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "A fájl már létezik. Lecseréli a fájlt?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "Hiba: nem lehet kulcsokat hozzáadni a távoli gépnél\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy #| msgid "No command was specified." msgid "reg: The file '%1' was not found.\n" msgstr "Nem volt parancs meghatározva." -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(nem beállított)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/it.po b/po/it.po index eda14414426..081979a73ac 100644 --- a/po/it.po +++ b/po/it.po @@ -13974,12 +13974,12 @@ msgstr "" msgid "Are you sure?" msgstr "Sei sicuro?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "S" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -14048,7 +14048,7 @@ msgstr "Impossibile aprire '%1'\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Impossibile chiamare un'etichetta batch fuori da uno script batch\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "T" @@ -14117,11 +14117,11 @@ msgstr "Il volume nell'unità %1!c! è %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Il volume nell'unità %1!c! non ha etichetta.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Sì|No)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Sì|No|Tutti)" @@ -15545,17 +15545,17 @@ msgstr "File icona" msgid "Icons (*.ico)" msgstr "Icone (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid syntax. " msgstr "Errore: nome della chiave non valido\n" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15570,13 +15570,13 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "Operazione completata con successo\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "Operation canceled by user.\n" msgid "reg: The registry operation was cancelled\n" msgstr "Operazione annullata dall'utente.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15594,11 +15594,11 @@ msgstr "" "Errore: il sistema non è riuscito a trovare la chiave di registro o il " "valore specificati\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Predefinito)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -15665,7 +15665,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15739,7 +15739,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15770,7 +15770,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15816,7 +15816,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15838,13 +15838,13 @@ msgstr "Errore: nome della chiave non valido\n" msgid "reg: Unable to access remote machine\n" msgstr "Errore: impossibile aggiungere chiavi alla macchina remota\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid system key\n" msgstr "Errore: nome della chiave non valido\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 #, fuzzy #| msgid "Error: Invalid option '%c'.\n" msgid "reg: Invalid option [%1]. " @@ -15858,7 +15858,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -15884,61 +15884,69 @@ msgstr "Il file specificato esiste già. Vuoi sostituirlo?" msgid "reg: Invalid command line parameters\n" msgstr "Errore: parametri della linea di comando non validi\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The specified file already exists. Do you want to replace it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Il file specificato esiste già. Vuoi sostituirlo?" + +#: programs/reg/reg.rc:133 #, fuzzy #| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Sei sicuro di volere eliminare questi valori?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 #, fuzzy #| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Sei sicuro di volere eliminare il valore '%s'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Sei sicuro di voler cancellare '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "Errore: impossibile aggiungere chiavi alla macchina remota\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy #| msgid "The specified file already exists. Do you want to replace it?" msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Il file specificato esiste già. Vuoi sostituirlo?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "Errore: impossibile aggiungere chiavi alla macchina remota\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy #| msgid "No command was specified." msgid "reg: The file '%1' was not found.\n" msgstr "Non è stato specificato nessun comando." -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(valore non immesso)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index fb7b078c9aa..5e9067d3cd1 100644 --- a/po/ja.po +++ b/po/ja.po @@ -13255,12 +13255,12 @@ msgstr "" msgid "Are you sure?" msgstr "よろしいですか?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "Y" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13329,7 +13329,7 @@ msgstr "'%1' を開けません\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "バッチ スクリプトの外からバッチ ラベルを呼び出すことはできません\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -13398,11 +13398,11 @@ msgstr "ドライブ %1!c! のボリューム ラベルは %2 です\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "ドライブ %1!c! のボリューム ラベルがありません。\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Yes|No)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Yes|No|All)" @@ -14767,15 +14767,15 @@ msgstr "アイコン ファイル" msgid "Icons (*.ico)" msgstr "アイコン (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: 無効な構文です。" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "ヘルプは \"REG %1 /?\" と入力してください。\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" msgstr "reg: 指定されたレジストリ キーをアクセスまたは作成できません\n" @@ -14783,11 +14783,11 @@ msgstr "reg: 指定されたレジストリ キーをアクセスまたは作成 msgid "reg: The operation completed successfully\n" msgstr "reg: 操作は正常に完了しました\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "reg: レジストリ操作は取り消されました\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "reg: 指定されたレジストリ キーを見つけられません\n" @@ -14795,11 +14795,11 @@ msgstr "reg: 指定されたレジストリ キーを見つけられません\n" msgid "reg: Unable to find the specified registry value\n" msgstr "reg: 指定されたレジストリ値を見つけられません\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(既定)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "ヘルプは \"REG /?\" と入力してください。\n" @@ -14933,7 +14933,7 @@ msgstr "" " レジストリを確認することなく変更します。\n" "\n" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 #, fuzzy #| msgid "" #| "REG EXPORT [/y]\n" @@ -15094,7 +15094,7 @@ msgstr "" " 削除します。\n" "\n" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15148,7 +15148,7 @@ msgstr "" " <ファイル> を確認することなく上書きします。\n" "\n" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15233,7 +15233,7 @@ msgstr "" " <キー> とそのサブキー配下にあるレジストリ エントリの一覧を表示します。\n" "\n" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15257,11 +15257,11 @@ msgstr "reg: レジストリ キーが正しくありません\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: リモート マシンにアクセスできません\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "reg: システム キーが正しくありません\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: 無効なオプション [%1]。" @@ -15275,7 +15275,7 @@ msgstr "reg: [/d] オプションのあとに正しい 16 進数値を指定し msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg: [/d] オプションのあとに正しい 16 進数値を指定してください\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: /d オプションのあとに正しい文字列を指定してください\n" @@ -15295,49 +15295,57 @@ msgstr "レジストリ値 '%1' はすでに存在します。上書きします msgid "reg: Invalid command line parameters\n" msgstr "reg: コマンド ライン パラメーターが正しくありません\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "ファイル '%1' はすでに存在します。上書きしますか?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "本当にレジストリ値 '%1' を削除しますか?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "本当に '%1' にあるすべてのレジストリ値を削除しますか?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "本当にレジストリ キー '%1' を削除しますか?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: レジストリ キー '%1' を削除できません。\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "ファイル '%1' はすでに存在します。上書きしますか?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: 認識できないエスケープ シーケンスです [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: レジストリ キー '%1' をインポートできません\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: ファイル '%1' が見つかりません。\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(値の設定なし)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "検索が完了しました。該当箇所の数: %1!d!\n" diff --git a/po/ko.po b/po/ko.po index 8be2f8ebe20..09807ef1d4b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -13223,12 +13223,12 @@ msgstr "" msgid "Are you sure?" msgstr "확실합니까?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "Y" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13297,7 +13297,7 @@ msgstr "'%1' 열기 실패\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "배치 스크립트 밖의 배치 레이블은 불러올 수 없습니다\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -13366,11 +13366,11 @@ msgstr "드라이브 %1!c! 볼륨: %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "드라이브 %1!c!는 레이블을 가지고 있지 않습니다.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (예|아니요)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (예|아니요|모두)" @@ -14735,15 +14735,15 @@ msgstr "아이콘 파일" msgid "Icons (*.ico)" msgstr "아이콘 (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: 잘못된 구문. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "도움말을 보려면 \"REG %1 /?\"를 입력하세요.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -14756,13 +14756,13 @@ msgstr "reg: 시스템에서 지정한 레지스트리 키 또는 값을 찾을 msgid "reg: The operation completed successfully\n" msgstr "작업이 성공적으로 끝났습니다\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" msgstr "레지스트리 작업이 취소되었습니다\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -14776,11 +14776,11 @@ msgstr "reg: 시스템에서 지정한 레지스트리 키 또는 값을 찾을 msgid "reg: Unable to find the specified registry value\n" msgstr "reg: 시스템에서 지정한 레지스트리 키 또는 값을 찾을 수 없습니다\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(기본)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "도움말을 보려면 \"REG /?\"를 입력하세요.\n" @@ -14867,7 +14867,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14941,7 +14941,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14972,7 +14972,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15018,7 +15018,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15038,13 +15038,13 @@ msgstr "reg: 키 이름이 잘못되었습니다\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: 원격 컴퓨터에 액세스할 수 없습니다\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" msgstr "reg: 잘못된 시스템 키 [%1]\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: 잘못된 옵션 [%1]. " @@ -15058,7 +15058,7 @@ msgstr "reg : 옵션 [/d] 다음에 유효한 16 진수 값이 있어야 합니 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg : 옵션 [/d] 다음에 유효한 16 진수 값이 있어야 합니다\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg : 옵션 [/d] 다음에 유효한 문자열이 있어야 합니다\n" @@ -15078,51 +15078,59 @@ msgstr "레지스트리 값 '%1'(이)가 이미 존재합니다. 덮어쓰시겠 msgid "reg: Invalid command line parameters\n" msgstr "reg: 명령줄 매개변수가 잘못되었습니다\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "'%1' 파일이 이미 존재합니다. 덮어쓰시겠습니까?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "레지스트리 값 '%1'을(를) 제거하시겠습니까?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "'%1'의 모든 레지스트리 값을 제거하시겠습니까?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "레지스트리 키 '%1'을 제거하시겠습니까?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: 레지스트리 '%1'을(를) 지울 수 없습니다.\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "'%1' 파일이 이미 존재합니다. 덮어쓰시겠습니까?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: 인식되지 않는 이스케이프 시퀀스 [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "레지스트리 키 '%1'을(를) 열 수 없습니다.\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: 파일 '%1'을(를) 찾을 수 없습니다.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(값이 설정되지 않음)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "검색 완료. 일치하는 항목 수: %1!d!\n" diff --git a/po/lt.po b/po/lt.po index 2a8f5ae8bcb..9410f833c2f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -13164,12 +13164,12 @@ msgstr "" msgid "Are you sure?" msgstr "Ar tikrai?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "T" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13238,7 +13238,7 @@ msgstr "Nepavyko atverti „%1“\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Negalima iškviesti žymės esančios už komandų failo ribų\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "V" @@ -13307,11 +13307,11 @@ msgstr "Tomas diske %1!c! yra %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Tomas diske %1!c! neturi vardo.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Taip|Ne)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Taip|Ne|Visus)" @@ -14679,15 +14679,15 @@ msgstr "Piktogramų failai" msgid "Icons (*.ico)" msgstr "Piktogramos (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Netinkama sintaksė. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Pagalbai įrašykite „REG %1 /?“.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" msgstr "reg: Nepavyko prieiti prie ar sukurti nurodyto registro rakto\n" @@ -14695,11 +14695,11 @@ msgstr "reg: Nepavyko prieiti prie ar sukurti nurodyto registro rakto\n" msgid "reg: The operation completed successfully\n" msgstr "reg: Operacija sėkmingai įvykdyta\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "reg: Registro operacija buvo nutraukta\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "reg: Nepavyko rasti nurodyto registro rakto\n" @@ -14707,11 +14707,11 @@ msgstr "reg: Nepavyko rasti nurodyto registro rakto\n" msgid "reg: Unable to find the specified registry value\n" msgstr "reg: Nepavyko rasti nurodytos registro reikšmės\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(numatytoji)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Pagalbai įrašykite „REG /?“.\n" @@ -14836,7 +14836,7 @@ msgstr "" " Modifikuoti registrą be patvirtinimo klausimo.\n" "\n" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14978,7 +14978,7 @@ msgstr "" " patvirtinimo klausimo.\n" "\n" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15037,7 +15037,7 @@ msgstr "" " Perrašyti be patvirtinimo klausimo.\n" "\n" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15125,7 +15125,7 @@ msgstr "" " Išvesti visus registro įrašus po raktu ir jo porakčiais.\n" "\n" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15149,11 +15149,11 @@ msgstr "reg: Netinkamas registro raktas\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: Nepavyko prieiti prie nuotolinio kompiuterio\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "reg: Netinkamas sisteminis raktas\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: Netinkamas parametras [%1]. " @@ -15165,7 +15165,7 @@ msgstr "reg: Už parametro [/d] privalo būti tinkama skaitinė reikšmė\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg: Už parametro [/d] privalo būti tinkama šešioliktainė reikšmė\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: Už parametro [/d] privalo būti tinkama eilutė\n" @@ -15185,47 +15185,55 @@ msgstr "Registro reikšmė „%1“ jau egzistuoja. Ar norite ją perrašyti?" msgid "reg: Invalid command line parameters\n" msgstr "reg: Netinkami komandos eilutės parametrai\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "reg: Šaltinio ir paskirties raktai negali būti tie patys\n" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Failas „%1“ jau egzistuoja. Ar norite jį perrašyti?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Ar tikrai norite pašalinti registro reikšmę „%1“?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Ar tikrai norite pašalinti visas registro „%1“ reikšmes?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Ar tikrai norite pašalinti registro raktą „%1“?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "reg: Nepavyko pašalinti visų „%1“ registro reikšmių\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Failas „%1“ jau egzistuoja. Ar norite jį perrašyti?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Neatpažinta kaitos seka [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: Nepavyko importuoti registro rakto „%1“.\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: Failas „%1“ nerastas.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(reikšmė nenustatyta)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Paieška baigta. Rasta atitikimų: %1!d!\n" diff --git a/po/ml.po b/po/ml.po index 8d6c8c91f8e..d5f8264ea17 100644 --- a/po/ml.po +++ b/po/ml.po @@ -12675,12 +12675,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -12749,7 +12749,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -12816,11 +12816,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr "" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14146,15 +14146,15 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" msgstr "" @@ -14162,11 +14162,11 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "" @@ -14174,11 +14174,11 @@ msgstr "" msgid "reg: Unable to find the specified registry value\n" msgstr "" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14245,7 +14245,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14319,7 +14319,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14350,7 +14350,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14396,7 +14396,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14414,11 +14414,11 @@ msgstr "" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "" @@ -14430,7 +14430,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -14450,47 +14450,53 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 -msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "" - -#: programs/reg/reg.rc:132 -msgid "Are you sure you want to delete all registry values in '%1'?" +#: programs/reg/reg.rc:205 +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" msgstr "" #: programs/reg/reg.rc:133 -msgid "Are you sure you want to delete the registry key '%1'?" +msgid "Are you sure you want to delete the registry value '%1'?" +msgstr "" + +#: programs/reg/reg.rc:134 +msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" #: programs/reg/reg.rc:135 +msgid "Are you sure you want to delete the registry key '%1'?" +msgstr "" + +#: programs/reg/reg.rc:137 msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index 36e4d97d44b..258307488f5 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -13526,12 +13526,12 @@ msgstr "" msgid "Are you sure?" msgstr "Er du sikker?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "J" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13600,7 +13600,7 @@ msgstr "Klarte ikke åpne %1\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "En merkelapp kan ikke kalles utenfor en satsvis fil\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -13669,11 +13669,11 @@ msgstr "Volumet i stasjon %1!c! er %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Volumet i stasjon %1!c! har ikke et navn.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Ja|Nei)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Ja|Nei|Alle)" @@ -15031,15 +15031,15 @@ msgstr "Ikonfiler" msgid "Icons (*.ico)" msgstr "Ikoner (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Ugyldig syntaks. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Skriv \"REG %1 /?\" for hjelp.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -15053,13 +15053,13 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "Operasjonen ble utført\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" msgstr "Register-operasjonen ble avbrutt\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -15075,11 +15075,11 @@ msgid "reg: Unable to find the specified registry value\n" msgstr "" "reg: Systemet klarte ikke finne den angitte registernøkkelen eller -verdien\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Standard)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Skriv \"REG /?\" for hjelp.\n" @@ -15166,7 +15166,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15240,7 +15240,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15271,7 +15271,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15317,7 +15317,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15337,13 +15337,13 @@ msgstr "reg: Ugyldig nøkkelnavn\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: Ingen tilgang til ekstern maskin\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" msgstr "reg: Ugyldig systemnøkkel [%1]\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: [%1] er et ugyldig valg. " @@ -15359,7 +15359,7 @@ msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" "reg: Alternativet [/d] må etterfølges av en gyldig heksadesimal verdi\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: Alternativet [/d] må etterfølges av en gyldig streng\n" @@ -15379,51 +15379,59 @@ msgstr "Registerverdien \"%1\" finnes fra før. Vil du erstatte den?" msgid "reg: Invalid command line parameters\n" msgstr "reg: Ugyldige parametere på kommandolinjen\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Filen \"%1\" finnes fra før. Vil du erstatte den?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Virkelig slette registerverdien \"%1\"?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Virkelig slette alle registerverdiene i \"%1\"?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Vil du virkelig slette registernøkkel \"%1\"?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: Kan ikke slette registernøkkel \"%1\".\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Filen \"%1\" finnes fra før. Vil du erstatte den?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Ukjent escape-sekvens [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: Kan ikke åpne registernøkkelen \"%1\".\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: Filen \"%1\" ble ikke funnet.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(verdi ikke oppgitt)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Søk fullført. Antall treff: %1!d!\n" diff --git a/po/nl.po b/po/nl.po index 7d04338d296..03a6b7a1f3e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -13222,12 +13222,12 @@ msgstr "" msgid "Are you sure?" msgstr "Weet u het zeker?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "J" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13297,7 +13297,7 @@ msgid "Cannot call batch label outside of a batch script\n" msgstr "" "Onmogelijk om een batch label aan te roepen van buiten een batch script\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -13366,11 +13366,11 @@ msgstr "Volume in schijfstation %1!c! is %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Volume in schijfstation %1!c! heeft geen label.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Ja|Nee)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Ja|Nee|Alles)" @@ -14747,15 +14747,15 @@ msgstr "Pictogrambestanden" msgid "Icons (*.ico)" msgstr "Pictogrammen (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Foutieve syntax. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Type \"REG %1 /?\" voor hulp.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" msgstr "reg: Kan de gegeven registersleutel niet openen of aanmaken\n" @@ -14763,11 +14763,11 @@ msgstr "reg: Kan de gegeven registersleutel niet openen of aanmaken\n" msgid "reg: The operation completed successfully\n" msgstr "reg: De bewerking is succesvol voltooid\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "reg: De register bewerking is afgebroken\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "reg: Kan de gegeven registersleutel niet vinden\n" @@ -14775,11 +14775,11 @@ msgstr "reg: Kan de gegeven registersleutel niet vinden\n" msgid "reg: Unable to find the specified registry value\n" msgstr "reg: Kan de gegeven registerwaarde niet vinden\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Standaard)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Type \"REG /?\" voor hulp.\n" @@ -14906,7 +14906,7 @@ msgstr "" " Wijzig het register zonder bevestiging te vragen.\n" "\n" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15053,7 +15053,7 @@ msgstr "" " zonder bevestiging te vragen.\n" "\n" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15113,7 +15113,7 @@ msgstr "" " overschrijven zonder een bevestiging te vragen.\n" "\n" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15201,7 +15201,7 @@ msgstr "" " Toon alle registervermeldingen onder en zijn subsleutels.\n" "\n" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15225,11 +15225,11 @@ msgstr "reg: Foutieve registersleutel\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: Kan de computer op afstand niet benaderen\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "reg: Foutieve systeemsleutel\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: Ongeldige optie [%1]. " @@ -15241,7 +15241,7 @@ msgstr "reg: De optie [/d] moet gevolgd worden door een numerieke waarde\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg: De optie [/d] moet gevolgd worden door een hexadecimale waarde\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: De optie [/d] moet gevolgd worden door tekenreeks\n" @@ -15261,47 +15261,55 @@ msgstr "De registerwaarde '%1' bestand bestaat al. Wilt u het vervangen?" msgid "reg: Invalid command line parameters\n" msgstr "reg: Foutieve opdrachtregel-parameters\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Het bestand '%1' bestaat al. Wilt u het overschrijven?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Weet u zeker dat u de registerwaarde '%1' wilt verwijderen?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Weet u zeker dat u alle registerwaardes in '%1' wilt verwijderen?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Weet u zeker dat u registersleutel '%1' wilt verwijderen?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "reg: Kan niet alle registerwaardes in '%1' verwijderen.\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Het bestand '%1' bestaat al. Wilt u het overschrijven?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Escape-tekenreeks niet herkend [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: Importeren van de registersleutel '%1' is niet mogelijk.\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: Het bestand '%1' is niet gevonden.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(Geen waarde ingesteld)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Zoeken voltooid. Aantal gevonden resultaten: %1!d!\n" diff --git a/po/or.po b/po/or.po index 90be283c477..421cdaf0e70 100644 --- a/po/or.po +++ b/po/or.po @@ -12661,12 +12661,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -12735,7 +12735,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -12802,11 +12802,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr "" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14132,15 +14132,15 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" msgstr "" @@ -14148,11 +14148,11 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "" @@ -14160,11 +14160,11 @@ msgstr "" msgid "reg: Unable to find the specified registry value\n" msgstr "" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14231,7 +14231,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14305,7 +14305,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14336,7 +14336,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14382,7 +14382,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14400,11 +14400,11 @@ msgstr "" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "" @@ -14416,7 +14416,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -14436,47 +14436,53 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 -msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "" - -#: programs/reg/reg.rc:132 -msgid "Are you sure you want to delete all registry values in '%1'?" +#: programs/reg/reg.rc:205 +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" msgstr "" #: programs/reg/reg.rc:133 -msgid "Are you sure you want to delete the registry key '%1'?" +msgid "Are you sure you want to delete the registry value '%1'?" +msgstr "" + +#: programs/reg/reg.rc:134 +msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" #: programs/reg/reg.rc:135 +msgid "Are you sure you want to delete the registry key '%1'?" +msgstr "" + +#: programs/reg/reg.rc:137 msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/pa.po b/po/pa.po index 731a5d909bf..48184b3d1f9 100644 --- a/po/pa.po +++ b/po/pa.po @@ -12661,12 +12661,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -12735,7 +12735,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -12802,11 +12802,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr "" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14132,15 +14132,15 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" msgstr "" @@ -14148,11 +14148,11 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "" @@ -14160,11 +14160,11 @@ msgstr "" msgid "reg: Unable to find the specified registry value\n" msgstr "" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14231,7 +14231,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14305,7 +14305,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14336,7 +14336,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14382,7 +14382,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14400,11 +14400,11 @@ msgstr "" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "" @@ -14416,7 +14416,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -14436,47 +14436,53 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 -msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "" - -#: programs/reg/reg.rc:132 -msgid "Are you sure you want to delete all registry values in '%1'?" +#: programs/reg/reg.rc:205 +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" msgstr "" #: programs/reg/reg.rc:133 -msgid "Are you sure you want to delete the registry key '%1'?" +msgid "Are you sure you want to delete the registry value '%1'?" +msgstr "" + +#: programs/reg/reg.rc:134 +msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" #: programs/reg/reg.rc:135 +msgid "Are you sure you want to delete the registry key '%1'?" +msgstr "" + +#: programs/reg/reg.rc:137 msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index 068ed7eb7c1..21b0dcc86bc 100644 --- a/po/pl.po +++ b/po/pl.po @@ -13299,12 +13299,12 @@ msgstr "" msgid "Are you sure?" msgstr "Czy jesteś pewien?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "T" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13373,7 +13373,7 @@ msgstr "Nieudane otwarcie '%1'\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Nie można wywołać etykiety bat poza skryptem bat\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -13442,11 +13442,11 @@ msgstr "Wolumen w napędzie %1!c! to %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Wolumen w napędzie %1!c! nie ma etykiety.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Tak|Nie)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Tak|Nie|Wszystkie)" @@ -14815,15 +14815,15 @@ msgstr "Pliki ikon" msgid "Icons (*.ico)" msgstr "Ikony (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Nieprawidłowa składnia. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Wprowadź \"REG %1 /?\" aby uzyskać pomoc.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" msgstr "reg: Nie można otworzyć, ani stworzyć danego klucza rejestru\n" @@ -14831,11 +14831,11 @@ msgstr "reg: Nie można otworzyć, ani stworzyć danego klucza rejestru\n" msgid "reg: The operation completed successfully\n" msgstr "reg: Pomyślnie zakończono działanie\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "reg: Zaniechano działania rejestru\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "reg: Nie można znaleźć danej klucza rejestru\n" @@ -14843,11 +14843,11 @@ msgstr "reg: Nie można znaleźć danej klucza rejestru\n" msgid "reg: Unable to find the specified registry value\n" msgstr "reg: Nie można znaleźć danej wartości rejestru\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Domyślna)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Wprowadź \"REG /?\" aby uzyskać pomoc.\n" @@ -14983,7 +14983,7 @@ msgstr "" " Zmień rejestr bez pytania o potwierdzenie.\n" "\n" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 #, fuzzy #| msgid "" #| "REG EXPORT [/y]\n" @@ -15154,7 +15154,7 @@ msgstr "" " pytania o potwierdzenie.\n" "\n" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15214,7 +15214,7 @@ msgstr "" " Zastąp bez pytania o potwierdzenie.\n" "\n" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15302,7 +15302,7 @@ msgstr "" " Wypisz wszystkie wpisy rejestru pod oraz jego podkluczami.\n" "\n" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15326,11 +15326,11 @@ msgstr "reg: Nieprawidłowy klucz rejestru\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: Nie udało się uzyskać dostępu do zdalnej maszyny\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "reg: Nieprawidłowy klucz systemowy\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: Nieprawidłowa opcja [%1]. " @@ -15344,7 +15344,7 @@ msgstr "reg: Po opcji [/d] musi wystąpić prawidłowa wartość szesnastkowa\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg: Po opcji [/d] musi wystąpić prawidłowa wartość szesnastkowa\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: Opcja [/d] musi występować przy prawidłowym ciągu tekstu\n" @@ -15364,49 +15364,57 @@ msgstr "Wartość rejestru '%1' już istnieje. Czy chcesz ją zastąpić?" msgid "reg: Invalid command line parameters\n" msgstr "reg: Nieprawidłowe parametry wiersza poleceń\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Plik '%1' już istnieje. Czy chcesz go zastąpić?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Czy na pewno chcesz usunąć wartość rejestru '%1'?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Czy na pewno chcesz usunąć wszystkie wartości rejestru z '%1'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Czy na pewno chcesz usunąć kłucz rejestru '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: Nie udało się usunąć klucza rejestru '%1'.\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Plik '%1' już istnieje. Czy chcesz go zastąpić?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Nierozpoznana sekwencja wyjściowa [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: Nie można zaimportować klucza rejestru '%1'.\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: Nie znaleziono pliku '%1'.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(wartość nie ustalona)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Wyszukiwanie zakończone. Liczba pasujących wyrażeń: %1!d!\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index b44e972d6af..22102d68ecd 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13214,12 +13214,12 @@ msgstr "" msgid "Are you sure?" msgstr "Tem certeza?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "S" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13289,7 +13289,7 @@ msgstr "Falha ao abrir '%1'\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Não pode chamar um rótulo de lote fora de um script de lote\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "T" @@ -13358,11 +13358,11 @@ msgstr "O volume na unidade %1!c! é %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "O volume na unidade %1!c! não tem rótulo.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Sim|Não)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Sim|Não|Tudo)" @@ -14732,15 +14732,15 @@ msgstr "Arquivos de ícones" msgid "Icons (*.ico)" msgstr "Ícones (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Sintaxe inválida. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Digite \"REG %1 /?\" para ajuda.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" msgstr "" "reg: Não foi possível acessar ou criar a chave de registo especificado\n" @@ -14749,11 +14749,11 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "reg: A operação foi completada com sucesso\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "reg: A operação de registro foi cancelada\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "reg: Não foi possível encontrar a chave de registo especificada\n" @@ -14761,11 +14761,11 @@ msgstr "reg: Não foi possível encontrar a chave de registo especificada\n" msgid "reg: Unable to find the specified registry value\n" msgstr "reg: Não foi possível encontrar o valor especificado\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Padrão)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Digite \"REG /?\" para ajuda.\n" @@ -14891,7 +14891,7 @@ msgstr "" " Modifica o registro sem pedir por confirmação.\n" "\n" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15038,7 +15038,7 @@ msgstr "" " pedir por confirmação.\n" "\n" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15097,7 +15097,7 @@ msgstr "" " Sobrescreve o sem pedir confirmação.\n" "\n" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15186,7 +15186,7 @@ msgstr "" "subchaves.\n" "\n" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15210,11 +15210,11 @@ msgstr "reg: Chave de registro inválida\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: Não foi possível acessar a máquina remota\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "reg: Chave de sistema inválida\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: Opção inválida [%1]. " @@ -15226,7 +15226,7 @@ msgstr "reg: A opção [/d] precisa ser seguida de um valor numérico válido\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg: A opção [/d] precisa ser seguida de um valor hexadecimal válido\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: A opção [/d] precisa ser seguida de uma string válida\n" @@ -15246,47 +15246,55 @@ msgstr "O valor do registro '%1' já existe. Deseja sobrescrevê-lo?" msgid "reg: Invalid command line parameters\n" msgstr "reg: Parâmetros da linha de comandos inválidos\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "reg: Chaves de origem e destino não podem ser as mesmas\n" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "O arquivo '%1' já existe. Deseja sobrescrevê-lo?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Tem certeza que deseja excluir o valor do registro '%1'?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Tem certeza que deseja excluir todos os valores em '%1'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Você tem certeza que deseja excluir a chave de registro '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: Não foi possível remover todos os valores em '%1'\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "O arquivo '%1' já existe. Deseja sobrescrevê-lo?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Sequência de escape não reconhecida [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: Não foi possível importar a chave de registro '%1'\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: O arquivo '%1' não foi encontrado.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(valor não dado)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Busca terminada. Número de ocorrências encontradas: %1!d!\n" diff --git a/po/pt_PT.po b/po/pt_PT.po index 41b2a9a5518..997d7b8b29f 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -13665,12 +13665,12 @@ msgstr "" msgid "Are you sure?" msgstr "Tem a certeza?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "S" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13739,7 +13739,7 @@ msgstr "Falhou ao abrir '%1'\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Não é possível chamar a etiqueta de lote fora de um guião de lote\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "T" @@ -13808,11 +13808,11 @@ msgstr "O volume na unidade %1!c! é %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "O volume na unidade %1!c! não tem nome.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Sim|Não)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Sim|Não|Todos)" @@ -15176,15 +15176,15 @@ msgstr "Ficheiros de ícones" msgid "Icons (*.ico)" msgstr "Ícones (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Sintaxe inválida. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Escreva \"REG %1 /?\" para ver ajuda.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -15199,13 +15199,13 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "A operação foi completada com sucesso\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" msgstr "A operação no Registo foi cancelada\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -15223,11 +15223,11 @@ msgstr "" "reg: O sistema foi incapaz de encontrar no Registo a chave ou valor " "especificados\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Pré-definido)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Escreva \"REG /?\" para ver ajuda.\n" @@ -15314,7 +15314,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15388,7 +15388,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15419,7 +15419,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15465,7 +15465,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15485,13 +15485,13 @@ msgstr "reg: Nome de chave inválido\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: Incapaz de aceder à máquina remota\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" msgstr "reg: Nome de chave de sistema inválido [%1]\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: Opção inválida [%1]. " @@ -15505,7 +15505,7 @@ msgstr "reg: A opção [/d] tem de ser seguida por um valor hexadecimal válido\ msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg: A opção [/d] tem de ser seguida por um valor hexadecimal válido\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: A opção [/d] tem de ser seguida por caracteres válidos\n" @@ -15526,51 +15526,59 @@ msgstr "O valor '%1' já existe no Registo. Deseja substituí-lo?" msgid "reg: Invalid command line parameters\n" msgstr "reg: Parâmetros da linha de comandos inválidos\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "O ficheiro especificado '%1' já existe. Deseja substituí-lo?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Tem a certeza que deseja remover o valor '%1' do Registo?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Tem certeza que deseja remover todos os valores do Registo em '%1'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Tem certeza que deseja remover a chave '%1' do Registo?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: Incapaz de remover a chave '%1' do Registo.\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "O ficheiro especificado '%1' já existe. Deseja substituí-lo?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Sequência de escape não reconhecida [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: Incapaz de abrir a chave '%1' no Registo.\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: O ficheiro '%1' não foi encontrado.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(valor não definido)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Pesquisa concluída. Número de correspondências encontradas: %1!d!\n" diff --git a/po/rm.po b/po/rm.po index 5bab1073b54..8178b05d5b8 100644 --- a/po/rm.po +++ b/po/rm.po @@ -12747,12 +12747,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -12822,7 +12822,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -12889,11 +12889,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr "" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14230,15 +14230,15 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy msgid "reg: Unable to access or create the specified registry key\n" msgstr "Tuot las datotecas (*.*).\n" @@ -14247,12 +14247,12 @@ msgstr "Tuot las datotecas (*.*).\n" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy msgid "reg: The registry operation was cancelled\n" msgstr "Wine ag�d.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy msgid "reg: Unable to find the specified registry key\n" msgstr "Tuot las datotecas (*.*).\n" @@ -14262,11 +14262,11 @@ msgstr "Tuot las datotecas (*.*).\n" msgid "reg: Unable to find the specified registry value\n" msgstr "Tuot las datotecas (*.*).\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14333,7 +14333,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14407,7 +14407,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14438,7 +14438,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14484,7 +14484,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14503,12 +14503,12 @@ msgstr "Tuot las datotecas (*.*).\n" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy msgid "reg: Invalid system key\n" msgstr "Tuot las datotecas (*.*).\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "" @@ -14520,7 +14520,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -14540,49 +14540,55 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 -msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "" - -#: programs/reg/reg.rc:132 -msgid "Are you sure you want to delete all registry values in '%1'?" +#: programs/reg/reg.rc:205 +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" msgstr "" #: programs/reg/reg.rc:133 -msgid "Are you sure you want to delete the registry key '%1'?" +msgid "Are you sure you want to delete the registry value '%1'?" +msgstr "" + +#: programs/reg/reg.rc:134 +msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" #: programs/reg/reg.rc:135 +msgid "Are you sure you want to delete the registry key '%1'?" +msgstr "" + +#: programs/reg/reg.rc:137 #, fuzzy msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "Tuot las datotecas (*.*).\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy msgid "reg: Unable to import the registry key '%1'\n" msgstr "Tuot las datotecas (*.*).\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/ro.po b/po/ro.po index 16a8b35fb70..d401f91ccd0 100644 --- a/po/ro.po +++ b/po/ro.po @@ -13742,12 +13742,12 @@ msgstr "" msgid "Are you sure?" msgstr "Sunteți sigur?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "D" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13818,7 +13818,7 @@ msgstr "Deschiderea „%1” a eșuat\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Nu se poate apela eticheta pentru batch în afara unui script batch\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "T" @@ -13887,11 +13887,11 @@ msgstr "Volumul în unitatea %1!c! este %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Volumul în unitatea %1!c! nu are etichetă.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Da|Nu)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Da|Nu|Toate)" @@ -15260,15 +15260,15 @@ msgstr "Fișiere pictogramă" msgid "Icons (*.ico)" msgstr "Pictograme (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Sintaxă nevalidă. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Tastați \"REG %1 /?\" pentru ajutor.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -15282,13 +15282,13 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "Operațiunea a fost finalizată cu succes\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" msgstr "Operația pe registru a fost anulată\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -15304,11 +15304,11 @@ msgid "reg: Unable to find the specified registry value\n" msgstr "" "reg: Sistemul nu a putut găsi cheia sau valoarea de registru specificată\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Implicit)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Tastați \"REG /?\" pentru ajutor.\n" @@ -15375,7 +15375,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15449,7 +15449,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15480,7 +15480,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15526,7 +15526,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15548,13 +15548,13 @@ msgstr "reg: Nume de cheie nevalid\n" msgid "reg: Unable to access remote machine\n" msgstr "Eroare: Nu se pot adăuga chei pe calculatorul de la distanță\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "reg: Invalid key name\n" msgid "reg: Invalid system key\n" msgstr "reg: Nume de cheie nevalid\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: Opțiune nevalidă [%1]. " @@ -15566,7 +15566,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -15588,55 +15588,63 @@ msgstr "Valoare de registru „%1” există deja. Doriți să o înlocuiți?" msgid "reg: Invalid command line parameters\n" msgstr "reg: Parametri nevalizi pentru linia de comandă\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Valoare de registru „%1” există deja. Doriți să o înlocuiți?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Sigur doriți să ștergeți valoarea de registru „%1”?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Sigur doriți să ștergeți toate valorile de registru în „%1”?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Sigur doriți să ștergeți cheia de registru „%1”?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: Nu s-a putut șterge clasa de registru „%1”.\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy #| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Valoare de registru „%1” există deja. Doriți să o înlocuiți?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "regedit: Nu s-a putut deschide cheia de registru „%1”.\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy #| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" msgstr "regedit: Fișierul „%1” nu a fost găsit.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(valoare nestabilită)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 432e13b862f..281200c8415 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13372,12 +13372,12 @@ msgstr "" msgid "Are you sure?" msgstr "Вы уверены?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "Y" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13446,7 +13446,7 @@ msgstr "Не удалось открыть «%1»\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Не могу вызвать метку bat-файла вне bat-скрипта\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -13515,11 +13515,11 @@ msgstr "Том на диске %1!c! имеет метку %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Том на диске %1!c! не имеет метки.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Y - да|N - нет)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Y - да|N - нет|A - все)" @@ -14878,15 +14878,15 @@ msgstr "Файлы значков" msgid "Icons (*.ico)" msgstr "Значки (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: неверный синтаксис. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Для справки введите «REG %1 /?».\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -14899,13 +14899,13 @@ msgstr "reg: не удалось найти указанный раздел ре msgid "reg: The operation completed successfully\n" msgstr "Операция успешно завершена\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" msgstr "Операция с реестром была отменена\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -14919,11 +14919,11 @@ msgstr "reg: не удалось найти указанный раздел ре msgid "reg: Unable to find the specified registry value\n" msgstr "reg: не удалось найти указанный раздел реестра или значение\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(По умолчанию)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Для справки введите «REG /?».\n" @@ -15010,7 +15010,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15084,7 +15084,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15115,7 +15115,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15161,7 +15161,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15181,13 +15181,13 @@ msgstr "reg: неверное имя раздела\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: не удалось получить доступ к удалённому компьютеру\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" msgstr "reg: неверный системный ключ [%1]\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: неверная опция [%1]. " @@ -15203,7 +15203,7 @@ msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" "reg: за опцией [/d] должно следовать число в шестнадцатеричном формате\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: за опцией [/d] должна следовать строка\n" @@ -15223,51 +15223,59 @@ msgstr "Значение «%1» уже существует. Вы хотите msgid "reg: Invalid command line parameters\n" msgstr "reg: неверные параметры командной строки\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Файл «%1» уже существует. Вы хотите заменить его?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Вы точно хотите удалить параметр реестра «%1»?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Вы точно хотите удалить все параметры реестра из «%1»?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Вы точно хотите удалить ключ реестра «%1»?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: не удалось удалить ключ «%1».\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Файл «%1» уже существует. Вы хотите заменить его?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: неизвестная управляющая последовательность [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: не удалось открыть ключ «%1».\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: файл «%1» не найден.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(значение не задано)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Поиск завершён. Найдено совпадений: %1!d!\n" diff --git a/po/si.po b/po/si.po index a374233c846..186257a46f5 100644 --- a/po/si.po +++ b/po/si.po @@ -13082,12 +13082,12 @@ msgstr "" msgid "Are you sure?" msgstr "ඔබට විශ්වාසද?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "Y" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13156,7 +13156,7 @@ msgstr "'%1' විවෘත කරන්න බැරි උනා\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -13225,11 +13225,11 @@ msgstr "ධාවකය %1!c! ඇතුලේ තියෙන වෙළුම %2 msgid "Volume in drive %1!c! has no label.\n" msgstr "ධාවකය %1!c! ඇතුලේ තියෙන වෙළුමට ලේබලයක් නැහැ.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (ඔව්|නෑ)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (ඔව්|නෑ|ඔක්කොම)" @@ -14575,15 +14575,15 @@ msgstr "අයිකන ගොනු" msgid "Icons (*.ico)" msgstr "අයිකන (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: අවලංගු රීති." -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "\"REG %1 /?\" ගහන්න උදව්වට.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to access or create the specified registry key\n" @@ -14595,13 +14595,13 @@ msgstr "reg: රෙජිස්තරයේ යතුර '%1' අරින්න msgid "reg: The operation completed successfully\n" msgstr "මෙහෙයුම හරියට ඉවර උනා\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" msgstr "රෙජිස්තරයේ මෙහෙයුම අවලංගු කරා\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to find the specified registry key\n" @@ -14613,11 +14613,11 @@ msgstr "reg: රෙජිස්තරයේ යතුර '%1' අරින්න msgid "reg: Unable to find the specified registry value\n" msgstr "reg: රෙජිස්තරයේ යතුර '%1' අරින්න බැහැ.\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(පෙරනිමිය)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "\"REG /?\" ගහන්න උදව්වට.\n" @@ -14704,7 +14704,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14778,7 +14778,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14809,7 +14809,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14855,7 +14855,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14875,13 +14875,13 @@ msgstr "reg: අවලංගු යතුරේ නම\n" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" msgstr "reg: අවලංගු පද්ධතිය යතුර [%1]\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: අවලංගු විකල්පය [%1]." @@ -14895,7 +14895,7 @@ msgstr "reg: [/d] විකල්පයට පස්සේ වලංගු හ msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg: [/d] විකල්පයට පස්සේ වලංගු හෙක්සාඩෙසිමල් අගයක් තියෙන්න ඕනේ\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: [/d] විකල්පයට පස්සේ වලංගු අනුලකුණු වැලක් තියෙන්න ඕනේ\n" @@ -14915,51 +14915,59 @@ msgstr "රෙජිස්තරයේ අගය '%1' දැනටමත් ත msgid "reg: Invalid command line parameters\n" msgstr "reg: අවලංගු විධාන රේඛා පරාමිති\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "'%1' ගොනුව දැනටමත් තියෙනවා. ඔබට ඒක උඩින් ලියන්න ඕනෙද?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: රෙජිස්තරයෙ යතුර '%1' මකන්න බැහැ.\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "'%1' ගොනුව දැනටමත් තියෙනවා. ඔබට ඒක උඩින් ලියන්න ඕනෙද?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: හඳුනගත්තු නැති escape sequence එකක් [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: රෙජිස්තරයේ යතුර '%1' අරින්න බැහැ.\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: '%1' ගොනුව හම්බු උනේ නැහැ.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/sk.po b/po/sk.po index 0e9c67d7a15..4fde0d76e54 100644 --- a/po/sk.po +++ b/po/sk.po @@ -13215,12 +13215,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "O" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13290,7 +13290,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "V" @@ -13362,11 +13362,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Áno|Nie)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Áno|Nie|Všetky)" @@ -14745,17 +14745,17 @@ msgstr "Súbory ikon" msgid "Icons (*.ico)" msgstr "Icony (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 #, fuzzy #| msgid "Invalid name.\n" msgid "reg: Invalid syntax. " msgstr "Nesprávny názov.\n" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "Error: Unable to terminate process \"%1\".\n" msgid "reg: Unable to access or create the specified registry key\n" @@ -14765,13 +14765,13 @@ msgstr "Chyba: Nemožno ukončiť proces \"%1\".\n" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "Operation canceled by user.\n" msgid "reg: The registry operation was cancelled\n" msgstr "Operácia prerušená užívateľom.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "Error: Unable to terminate process \"%1\".\n" msgid "reg: Unable to find the specified registry key\n" @@ -14783,11 +14783,11 @@ msgstr "Chyba: Nemožno ukončiť proces \"%1\".\n" msgid "reg: Unable to find the specified registry value\n" msgstr "Chyba: Nemožno ukončiť proces \"%1\".\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Predvolené)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14854,7 +14854,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14928,7 +14928,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14959,7 +14959,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15005,7 +15005,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15027,13 +15027,13 @@ msgstr "Nesprávny názov.\n" msgid "reg: Unable to access remote machine\n" msgstr "Chyba: Nemožno ukončiť proces \"%1\".\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "Invalid name.\n" msgid "reg: Invalid system key\n" msgstr "Nesprávny názov.\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "" @@ -15045,7 +15045,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -15075,35 +15075,47 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "Nesprávny parameter.\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "" +#| "File already exists.\n" +#| "Do you want to replace it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "" +"Súbor už existuje.\n" +"Prajete si ho prepísať?" + +#: programs/reg/reg.rc:133 #, fuzzy #| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Ste si istý že chcete zmazať tieto hodnoty?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 #, fuzzy #| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Ste si istý že chcete zmazať túto hodnotu '%s'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 #, fuzzy #| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Ste si istý že chcete zmazať tieto hodnoty?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "Error: Unable to terminate process \"%1\".\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "Chyba: Nemožno ukončiť proces \"%1\".\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy #| msgid "" #| "File already exists.\n" @@ -15113,27 +15125,27 @@ msgstr "" "Súbor už existuje.\n" "Prajete si ho prepísať?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "Error: Unable to terminate process \"%1\".\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "Chyba: Nemožno ukončiť proces \"%1\".\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy #| msgid "No command was specified." msgid "reg: The file '%1' was not found.\n" msgstr "Nebol špecifikovaný žiadny príkaz." -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/sl.po b/po/sl.po index 403ab0ce98d..dfdb147dd61 100644 --- a/po/sl.po +++ b/po/sl.po @@ -13922,12 +13922,12 @@ msgstr "" msgid "Are you sure?" msgstr "Ali ste prepričani?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "D" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13996,7 +13996,7 @@ msgstr "Odpiranje '%1' je spodletelo\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Klic paketne oznake zunaj paketnega skripta ni mogoč\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "V" @@ -14065,11 +14065,11 @@ msgstr "Nosilec v pogonu %1!c! je %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Nosilec v pogonu %1!c! nima oznake.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Da|Ne)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Da|Ne|Vse)" @@ -15488,17 +15488,17 @@ msgstr "Datoteke ikon" msgid "Icons (*.ico)" msgstr "Ikone (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid syntax. " msgstr "Napaka: neveljavno ime ključa\n" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15511,13 +15511,13 @@ msgstr "Napaka: sistem ni našel navedenega ključa ali vrednosti registra\n" msgid "reg: The operation completed successfully\n" msgstr "Opravilo se je uspešno izvedlo\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "Operation canceled by user.\n" msgid "reg: The registry operation was cancelled\n" msgstr "Uporabnik je prekinil opravilo.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15531,11 +15531,11 @@ msgstr "Napaka: sistem ni našel navedenega ključa ali vrednosti registra\n" msgid "reg: Unable to find the specified registry value\n" msgstr "Napaka: sistem ni našel navedenega ključa ali vrednosti registra\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Privzeto)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -15602,7 +15602,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15676,7 +15676,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15707,7 +15707,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15753,7 +15753,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15775,13 +15775,13 @@ msgstr "Napaka: neveljavno ime ključa\n" msgid "reg: Unable to access remote machine\n" msgstr "Napaka: ni mogoče dodati ključa na oddaljen računalnik\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid system key\n" msgstr "Napaka: neveljavno ime ključa\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 #, fuzzy #| msgid "Error: Invalid option '%c'.\n" msgid "reg: Invalid option [%1]. " @@ -15795,7 +15795,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -15821,61 +15821,69 @@ msgstr "Določena datoteka že obstaja. Ali jo želite zamenjati?" msgid "reg: Invalid command line parameters\n" msgstr "Napaka: neveljaven parameter v ukazni vrstici\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The specified file already exists. Do you want to replace it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Določena datoteka že obstaja. Ali jo želite zamenjati?" + +#: programs/reg/reg.rc:133 #, fuzzy #| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Are ste prepričani, da želite izbrisati te vrednosti?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 #, fuzzy #| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Ali ste prepričani, da želite izbrisati vrednost '%s'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Ali ste prepričani, da želite izbrisati predmet '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "Napaka: ni mogoče dodati ključa na oddaljen računalnik\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy #| msgid "The specified file already exists. Do you want to replace it?" msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Določena datoteka že obstaja. Ali jo želite zamenjati?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "Napaka: ni mogoče dodati ključa na oddaljen računalnik\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy #| msgid "No command was specified." msgid "reg: The file '%1' was not found.\n" msgstr "Ukaz ni bil naveden." -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(vrednost ni nastavljena)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index 88bd60e2a08..75cc819733a 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -13440,12 +13440,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -13518,7 +13518,7 @@ msgstr "Отварање „%s“ датотеке није успело\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -13586,12 +13586,12 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 #, fuzzy msgid " (Yes|No)" msgstr "%s? (Да|Не)\n" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 #, fuzzy msgid " (Yes|No|All)" msgstr "%s? (Да|Не)\n" @@ -15036,16 +15036,16 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 #, fuzzy msgid "reg: Invalid syntax. " msgstr "Неисправна синтакса.\n" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "reg: Unable to access or create the specified registry key\n" @@ -15055,12 +15055,12 @@ msgstr "Желите ли да избришете „%1“?" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy msgid "reg: The registry operation was cancelled\n" msgstr "Инсталациони програми.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "reg: Unable to find the specified registry key\n" @@ -15072,12 +15072,12 @@ msgstr "Желите ли да избришете „%1“?" msgid "reg: Unable to find the specified registry value\n" msgstr "Желите ли да избришете „%1“?" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 #, fuzzy msgid "(Default)" msgstr "Подразумевано" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -15144,7 +15144,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15218,7 +15218,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15249,7 +15249,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15295,7 +15295,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15314,12 +15314,12 @@ msgstr "Неисправна синтакса.\n" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy msgid "reg: Invalid system key\n" msgstr "Неисправна синтакса.\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 #, fuzzy msgid "reg: Invalid option [%1]. " msgstr "Неисправна синтакса" @@ -15332,7 +15332,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -15361,58 +15361,67 @@ msgid "reg: Invalid command line parameters\n" msgstr "" "Грешка: унесени су непознати или неисправни параметри наредбене линије\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "" +"Датотека већ постоји.\n" +"Желите ли да је замените?" + +#: programs/reg/reg.rc:133 #, fuzzy msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Желите ли да избришете ових %1 ставки?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 #, fuzzy msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Желите ли да избришете „%1“?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Желите ли да избришете „%1“?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "Желите ли да избришете ових %1 ставки?" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "" "Датотека већ постоји.\n" "Желите ли да је замените?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "reg: Unable to import the registry key '%1'\n" msgstr "Желите ли да избришете „%1“?" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy msgid "reg: The file '%1' was not found.\n" msgstr "%s путања није пронађена" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index fc25ed292b3..a73db185464 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -13574,12 +13574,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -13652,7 +13652,7 @@ msgstr "Otvaranje „%s“ datoteke nije uspelo\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -13720,12 +13720,12 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 #, fuzzy msgid " (Yes|No)" msgstr "%s? (Da|Ne)\n" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 #, fuzzy msgid " (Yes|No|All)" msgstr "%s? (Da|Ne)\n" @@ -15214,16 +15214,16 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 #, fuzzy msgid "reg: Invalid syntax. " msgstr "Neispravna sintaksa.\n" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "reg: Unable to access or create the specified registry key\n" @@ -15233,12 +15233,12 @@ msgstr "Želite li da izbrišete „%1“?" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy msgid "reg: The registry operation was cancelled\n" msgstr "Instalacioni programi.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "reg: Unable to find the specified registry key\n" @@ -15250,7 +15250,7 @@ msgstr "Želite li da izbrišete „%1“?" msgid "reg: Unable to find the specified registry value\n" msgstr "Želite li da izbrišete „%1“?" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 #, fuzzy msgid "(Default)" msgstr "" @@ -15259,7 +15259,7 @@ msgstr "" "#-#-#-#-# sr_RS@latin.po (Wine) #-#-#-#-#\n" "Osnovno" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -15326,7 +15326,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15400,7 +15400,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15431,7 +15431,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15477,7 +15477,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15496,12 +15496,12 @@ msgstr "Neispravna sintaksa.\n" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy msgid "reg: Invalid system key\n" msgstr "Neispravna sintaksa.\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 #, fuzzy msgid "reg: Invalid option [%1]. " msgstr "Neispravna sintaksa" @@ -15514,7 +15514,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -15543,58 +15543,67 @@ msgid "reg: Invalid command line parameters\n" msgstr "" "Greška: uneseni su nepoznati ili neispravni parametri naredbene linije\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "" +"Datoteka već postoji.\n" +"Želite li da je zamenite?" + +#: programs/reg/reg.rc:133 #, fuzzy msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Želite li da izbrišete ovih %1 stavki?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 #, fuzzy msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Želite li da izbrišete „%1“?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Želite li da izbrišete „%1“?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "Želite li da izbrišete ovih %1 stavki?" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "" "Datoteka već postoji.\n" "Želite li da je zamenite?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "reg: Unable to import the registry key '%1'\n" msgstr "Želite li da izbrišete „%1“?" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy msgid "reg: The file '%1' was not found.\n" msgstr "%s putanja nije pronađena" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index 2df1629f4ca..4bc4e514238 100644 --- a/po/sv.po +++ b/po/sv.po @@ -13609,12 +13609,12 @@ msgstr "" msgid "Are you sure?" msgstr "Är du säker?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "J" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13683,7 +13683,7 @@ msgstr "Misslyckades med att öppna '%1'\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Går ej att anropa en batchetikett utanför ett batchskript\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -13752,11 +13752,11 @@ msgstr "Volymen i enhet %1!c! är %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Volymen i enhet %1!c! har ingen etikett.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Ja|Nej)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Ja|Nej|Alla)" @@ -15123,15 +15123,15 @@ msgstr "Ikonfiler" msgid "Icons (*.ico)" msgstr "Ikoner (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Ogiltig syntax. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Skriv \"REG %1 /?\" för hjälp.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -15145,13 +15145,13 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "Operation slutfördes utan problem\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" msgstr "Registeroperationen avbröts\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -15167,11 +15167,11 @@ msgid "reg: Unable to find the specified registry value\n" msgstr "" "reg: Systemet kunde inte hitta angiven nyckel eller värde i registret\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Standard)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Skriv \"REG /?\" för hjälp.\n" @@ -15258,7 +15258,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15332,7 +15332,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15363,7 +15363,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15409,7 +15409,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15429,13 +15429,13 @@ msgstr "reg: Ogiltigt nyckelnamn\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: Kan inte få tillgång till fjärrmaskin\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" msgstr "reg: Ogiltig systemnyckel [%1]\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: Ogiltig flagga [%1]. " @@ -15449,7 +15449,7 @@ msgstr "reg: Flaggan [/d] måste följas av ett giltigt hexadecimalt värde\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg: Flaggan [/d] måste följas av ett giltigt hexadecimalt värde\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: Flaggan [/d] måste följas av en giltig sträng\n" @@ -15469,51 +15469,59 @@ msgstr "Värdet '%1' finns redan i registret. Vill du ersätta det?" msgid "reg: Invalid command line parameters\n" msgstr "reg: Ogiltiga kommandoradsparametrar\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Filen '%1' finns redan. Vill du skriva över den?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Vill du verkligen ta bort registervärdet '%1'?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Vill du verkligen ta bort alla registervärden i '%1'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Vill du verkligen ta bort registernyckeln '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: Kan inte ta bort registernyckeln '%1'.\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Filen '%1' finns redan. Vill du skriva över den?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Okänd kontrollsekvens [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: Kan inte öppna registernyckeln '%1'.\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: Filen '%1' hittades inte.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(värde ej angivet)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Sökning slutförd. Antal hittade matchningar: %1!d!\n" diff --git a/po/ta.po b/po/ta.po index d08b90f3147..16dc28680dd 100644 --- a/po/ta.po +++ b/po/ta.po @@ -12596,12 +12596,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -12670,7 +12670,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -12737,11 +12737,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr "" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14059,15 +14059,15 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" msgstr "" @@ -14075,11 +14075,11 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "" @@ -14087,11 +14087,11 @@ msgstr "" msgid "reg: Unable to find the specified registry value\n" msgstr "" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14158,7 +14158,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14232,7 +14232,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14263,7 +14263,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14309,7 +14309,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14327,11 +14327,11 @@ msgstr "" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "" @@ -14343,7 +14343,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -14363,47 +14363,53 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 -msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "" - -#: programs/reg/reg.rc:132 -msgid "Are you sure you want to delete all registry values in '%1'?" +#: programs/reg/reg.rc:205 +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" msgstr "" #: programs/reg/reg.rc:133 -msgid "Are you sure you want to delete the registry key '%1'?" +msgid "Are you sure you want to delete the registry value '%1'?" +msgstr "" + +#: programs/reg/reg.rc:134 +msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" #: programs/reg/reg.rc:135 +msgid "Are you sure you want to delete the registry key '%1'?" +msgstr "" + +#: programs/reg/reg.rc:137 msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/te.po b/po/te.po index 54933bed3a0..478754edcb3 100644 --- a/po/te.po +++ b/po/te.po @@ -12661,12 +12661,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -12735,7 +12735,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -12802,11 +12802,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr "" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14132,15 +14132,15 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" msgstr "" @@ -14148,11 +14148,11 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "" @@ -14160,11 +14160,11 @@ msgstr "" msgid "reg: Unable to find the specified registry value\n" msgstr "" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14231,7 +14231,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14305,7 +14305,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14336,7 +14336,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14382,7 +14382,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14400,11 +14400,11 @@ msgstr "" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "" @@ -14416,7 +14416,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -14436,47 +14436,53 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 -msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "" - -#: programs/reg/reg.rc:132 -msgid "Are you sure you want to delete all registry values in '%1'?" +#: programs/reg/reg.rc:205 +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" msgstr "" #: programs/reg/reg.rc:133 -msgid "Are you sure you want to delete the registry key '%1'?" +msgid "Are you sure you want to delete the registry value '%1'?" +msgstr "" + +#: programs/reg/reg.rc:134 +msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" #: programs/reg/reg.rc:135 +msgid "Are you sure you want to delete the registry key '%1'?" +msgstr "" + +#: programs/reg/reg.rc:137 msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/th.po b/po/th.po index 27cf5d9a860..abd30fb4474 100644 --- a/po/th.po +++ b/po/th.po @@ -12975,12 +12975,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -13050,7 +13050,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -13118,11 +13118,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr "" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14493,15 +14493,15 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy msgid "reg: Unable to access or create the specified registry key\n" msgstr "แฟ้มตํารา (*.txt).\n" @@ -14510,12 +14510,12 @@ msgstr "แฟ้มตํารา (*.txt).\n" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy msgid "reg: The registry operation was cancelled\n" msgstr "ผู้ใช้ยกเลิก; .\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy msgid "reg: Unable to find the specified registry key\n" msgstr "แฟ้มตํารา (*.txt).\n" @@ -14525,11 +14525,11 @@ msgstr "แฟ้มตํารา (*.txt).\n" msgid "reg: Unable to find the specified registry value\n" msgstr "แฟ้มตํารา (*.txt).\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14596,7 +14596,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14670,7 +14670,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14701,7 +14701,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14747,7 +14747,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14766,12 +14766,12 @@ msgstr "แฟ้มตํารา (*.txt).\n" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy msgid "reg: Invalid system key\n" msgstr "แฟ้มตํารา (*.txt).\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "" @@ -14783,7 +14783,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -14803,28 +14803,42 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "" +#| "File '%s' does not exist.\n" +#| "\n" +#| "Do you want to create a new file?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "" +"ไม่พบแฟ้ม '%s' ที่ต้องการเปิด\n" +"\n" +"คุณต้องการสร้างใหม่ไม่?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "แฟ้มตํารา (*.txt).\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy #| msgid "" #| "File '%s' does not exist.\n" @@ -14836,25 +14850,25 @@ msgstr "" "\n" "คุณต้องการสร้างใหม่ไม่?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy msgid "reg: Unable to import the registry key '%1'\n" msgstr "แฟ้มตํารา (*.txt).\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy msgid "reg: The file '%1' was not found.\n" msgstr "ไม่พบแฟ้ม.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/tr.po b/po/tr.po index acb856eed31..e1a1217f2d3 100644 --- a/po/tr.po +++ b/po/tr.po @@ -13280,12 +13280,12 @@ msgstr "" msgid "Are you sure?" msgstr "Emin misiniz?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "E" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "H" @@ -13355,7 +13355,7 @@ msgstr "'%1' açılamadı\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Toplu iş dosyası kodlarının dışından yığın etiketi çağrılamıyor\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "T" @@ -13424,11 +13424,11 @@ msgstr "%1!c! sürücüsündeki birim %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "%1!c! sürücüsündeki birimin etiketi yok.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Evet|Hayır)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Evet|Hayır|Tümü)" @@ -14792,15 +14792,15 @@ msgstr "Simge dosyaları" msgid "Icons (*.ico)" msgstr "Simgeler (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Geçersiz sözdizimi. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Yardım için \"REG %1 /?\" yazın.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -14814,13 +14814,13 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "İşlem başarıyla tamamlandı\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" msgstr "Kayıt defteri işlemi iptal edildi\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -14836,11 +14836,11 @@ msgid "reg: Unable to find the specified registry value\n" msgstr "" "reg: Sistem belirtilen kayıt defteri anahtarını veya değerini bulamadı\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Standart)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Yardım için \"REG /?\" yazın.\n" @@ -14927,7 +14927,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15001,7 +15001,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15032,7 +15032,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15078,7 +15078,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15098,13 +15098,13 @@ msgstr "reg: Geçersiz anahtar adı\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: Uzak makineye erişilemiyor\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" msgstr "reg: Geçersiz anahtar adı [%1]\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: [%1] seçeneği geçersiz." @@ -15122,7 +15122,7 @@ msgstr "" "uninstaller: [/d] seçeneğinden sonra geçerli bir onaltılık değer " "girilmelidir\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: [/d] seçeneğinden sonra geçerli bir dize girilmelidir\n" @@ -15142,53 +15142,61 @@ msgstr "Belirtilen '%1' kayıt defteri değeri zaten var. Üzerine yazılsın m msgid "reg: Invalid command line parameters\n" msgstr "reg: Geçersiz komut satırı parametreleri\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Belirtilen '%1' dosyası zaten var. Üzerine yazılsın mı?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "'%1' kayıt defteri değerini silmek istediğinizden emin misiniz?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" "%1' içindeki bütün kayıt defteri değerlerini silmek istediğinizden emin " "misiniz?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "'%1' kayıt defteri anahtarını silmek istediğinizden emin misiniz?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: '%1' kayıt anahtarı silinemiyor.\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Belirtilen '%1' dosyası zaten var. Üzerine yazılsın mı?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Bilinmeyen kaçış sırası [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: '%1' kayıt defteri anahtarı açılamıyor.\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: '%1' dosyası bulunamadı.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(değer belirlenmemiş)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Arama tamamlandı. Bulunan eşleşmelerin sayısı: %1!d!\n" diff --git a/po/uk.po b/po/uk.po index e4c3f5b7553..7bee05d8a44 100644 --- a/po/uk.po +++ b/po/uk.po @@ -13332,12 +13332,12 @@ msgstr "" msgid "Are you sure?" msgstr "Ви впевнені?" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "Т" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "Н" @@ -13406,7 +13406,7 @@ msgstr "Не вдалось відкрити '%1'\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "Не можу викликати мітку пакету за межами пакетного скрипта\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "В" @@ -13475,11 +13475,11 @@ msgstr "Том в приводі %1!c! : %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "Том в приводі %1!c! не має мітки.\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (Так|Ні)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (Так|Ні|Всі)" @@ -14860,15 +14860,15 @@ msgstr "Файли значків" msgid "Icons (*.ico)" msgstr "Значки (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: Невірний синтаксис. " -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "Введіть \"REG %1 /?\" для довідки.\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -14881,13 +14881,13 @@ msgstr "reg: не вдалось знайти вказаний ключ реєс msgid "reg: The operation completed successfully\n" msgstr "Операція успішно завершена\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" msgstr "Операцію з реєстром було скасовано\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -14901,11 +14901,11 @@ msgstr "reg: не вдалось знайти вказаний ключ реєс msgid "reg: Unable to find the specified registry value\n" msgstr "reg: не вдалось знайти вказаний ключ реєстру чи значення\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(За замовчуванням)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "Введіть \"REG /?\" для довідки.\n" @@ -14992,7 +14992,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15066,7 +15066,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15097,7 +15097,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15143,7 +15143,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15163,13 +15163,13 @@ msgstr "reg: невірне ім'я ключа\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: неможливо отримати доступ до віддаленої машини\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" msgstr "reg: Невірний системний ключ [%1]\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: Невірна опція [%1]. " @@ -15187,7 +15187,7 @@ msgstr "" "reg: після параметра [/d] повинно бути вказано число в шістнадцятковому " "форматі\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: після параметра [/d] повинно бути вказано рядок\n" @@ -15207,51 +15207,59 @@ msgstr "Значення реєстру '%1' вже існує. Ви хочет msgid "reg: Invalid command line parameters\n" msgstr "reg: невірні параметри командного рядка\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "Файл '%1' вже існує. Ви хочете його перезаписати?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "Ви впевнені, що хочете видалити значення реєстру '%1'?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "Ви впевнені, що хочете видалити всі значення реєстру в '%1'?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Ви впевнені, що хочете видалити ключ реєстру '%1'?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit: Неможливо видалити ключ реєстру '%1'.\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Файл '%1' вже існує. Ви хочете його перезаписати?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Нерозпізнана керівна послідовність [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: Неможливо відкрити ключ реєстру '%1'.\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: Файл '%1' не знайдено.\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(значення не задане)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Пошук завершено. Знайдено збігів: %1!d!\n" diff --git a/po/wa.po b/po/wa.po index d4628115772..072439878ba 100644 --- a/po/wa.po +++ b/po/wa.po @@ -12871,12 +12871,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -12945,7 +12945,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -13013,11 +13013,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr "" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14365,15 +14365,15 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy msgid "reg: Unable to access or create the specified registry key\n" msgstr "Fitchîs tekse (*.txt).\n" @@ -14382,12 +14382,12 @@ msgstr "Fitchîs tekse (*.txt).\n" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy msgid "reg: The registry operation was cancelled\n" msgstr "&Rafacer\tDel.\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy msgid "reg: Unable to find the specified registry key\n" msgstr "Fitchîs tekse (*.txt).\n" @@ -14397,11 +14397,11 @@ msgstr "Fitchîs tekse (*.txt).\n" msgid "reg: Unable to find the specified registry value\n" msgstr "Fitchîs tekse (*.txt).\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14468,7 +14468,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14542,7 +14542,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14573,7 +14573,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14619,7 +14619,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14638,12 +14638,12 @@ msgstr "Fitchîs tekse (*.txt).\n" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy msgid "reg: Invalid system key\n" msgstr "Fitchîs tekse (*.txt).\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "" @@ -14655,7 +14655,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -14675,49 +14675,55 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 -msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "" - -#: programs/reg/reg.rc:132 -msgid "Are you sure you want to delete all registry values in '%1'?" +#: programs/reg/reg.rc:205 +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" msgstr "" #: programs/reg/reg.rc:133 -msgid "Are you sure you want to delete the registry key '%1'?" +msgid "Are you sure you want to delete the registry value '%1'?" +msgstr "" + +#: programs/reg/reg.rc:134 +msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" #: programs/reg/reg.rc:135 +msgid "Are you sure you want to delete the registry key '%1'?" +msgstr "" + +#: programs/reg/reg.rc:137 #, fuzzy msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "Fitchîs tekse (*.txt).\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy msgid "reg: Unable to import the registry key '%1'\n" msgstr "Fitchîs tekse (*.txt).\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/wine.pot b/po/wine.pot index 913e51bce4b..7649731a996 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -12577,12 +12577,12 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "" @@ -12651,7 +12651,7 @@ msgstr "" msgid "Cannot call batch label outside of a batch script\n" msgstr "" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "" @@ -12718,11 +12718,11 @@ msgstr "" msgid "Volume in drive %1!c! has no label.\n" msgstr "" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr "" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr "" @@ -14040,15 +14040,15 @@ msgstr "" msgid "Icons (*.ico)" msgstr "" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 msgid "reg: Unable to access or create the specified registry key\n" msgstr "" @@ -14056,11 +14056,11 @@ msgstr "" msgid "reg: The operation completed successfully\n" msgstr "" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 msgid "reg: The registry operation was cancelled\n" msgstr "" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 msgid "reg: Unable to find the specified registry key\n" msgstr "" @@ -14068,11 +14068,11 @@ msgstr "" msgid "reg: Unable to find the specified registry value\n" msgstr "" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -14139,7 +14139,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14213,7 +14213,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14244,7 +14244,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14290,7 +14290,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14308,11 +14308,11 @@ msgstr "" msgid "reg: Unable to access remote machine\n" msgstr "" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 msgid "reg: Invalid system key\n" msgstr "" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "" @@ -14324,7 +14324,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -14344,47 +14344,53 @@ msgstr "" msgid "reg: Invalid command line parameters\n" msgstr "" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 -msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "" - -#: programs/reg/reg.rc:132 -msgid "Are you sure you want to delete all registry values in '%1'?" +#: programs/reg/reg.rc:205 +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" msgstr "" #: programs/reg/reg.rc:133 -msgid "Are you sure you want to delete the registry key '%1'?" +msgid "Are you sure you want to delete the registry value '%1'?" +msgstr "" + +#: programs/reg/reg.rc:134 +msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "" #: programs/reg/reg.rc:135 +msgid "Are you sure you want to delete the registry key '%1'?" +msgstr "" + +#: programs/reg/reg.rc:137 msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 msgid "reg: Unable to import the registry key '%1'\n" msgstr "" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index dafd133161b..4bd48376552 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -13059,12 +13059,12 @@ msgstr "" msgid "Are you sure?" msgstr "确定吗？" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "Y" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13133,7 +13133,7 @@ msgstr "无法打开 \"%1\"\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "无法调用批处理脚本外的批处理标签\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -13202,11 +13202,11 @@ msgstr "驱动器 %1!c! 的卷标为 %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "驱动器 %1!c! 没有卷标。\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 msgid " (Yes|No)" msgstr " (是(Y)|否(N))" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 msgid " (Yes|No|All)" msgstr " (是(Y)|否(N)|全部(A))" @@ -14567,15 +14567,15 @@ msgstr "图标文件" msgid "Icons (*.ico)" msgstr "图标 (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 msgid "reg: Invalid syntax. " msgstr "reg: 语法无效。" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "输入“REG %1 /?”以获取帮助。\n" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -14588,13 +14588,13 @@ msgstr "reg：系统无法找到指定的注册表键或值\n" msgid "reg: The operation completed successfully\n" msgstr "操作完成\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" msgstr "注册表操作已经取消\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" @@ -14608,11 +14608,11 @@ msgstr "reg：系统无法找到指定的注册表键或值\n" msgid "reg: Unable to find the specified registry value\n" msgstr "reg：系统无法找到指定的注册表键或值\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(默认)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "输入“REG /?”以获取帮助。\n" @@ -14699,7 +14699,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -14773,7 +14773,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -14804,7 +14804,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -14850,7 +14850,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -14870,13 +14870,13 @@ msgstr "reg: 无效的键名\n" msgid "reg: Unable to access remote machine\n" msgstr "reg: 无法访问远程设备\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" msgstr "regedit: 无效的系统键 [%1]\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: 无效的选项 [%1]。" @@ -14890,7 +14890,7 @@ msgstr "reg：选项 [/d] 后必须紧跟一个有效的十六进制值\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "reg：选项 [/d] 后必须紧跟一个有效的十六进制值\n" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg：选项 [/d] 后必须紧跟一个有效的字符串\n" @@ -14910,51 +14910,59 @@ msgstr "注册表值 '%1' 已经存在。您想要覆盖它吗?" msgid "reg: Invalid command line parameters\n" msgstr "reg: 无效的命令行参数\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The file '%1' already exists. Do you want to overwrite it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "文件 '%1' 已存在。您想要覆盖它吗?" + +#: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" msgstr "您真的要删除注册表键值 '%1' 吗?" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "您真的要删除 '%1' 下的所有注册表键值吗?" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" msgstr "您真的要删除注册表键 '%1' 吗?" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "regedit：无法删除注册表键“%1”。\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "文件 '%1' 已存在。您想要覆盖它吗?" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: 无法识别的转义序列 [\\%1!c!]\n" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "reg: 无法打开注册表键 '%1'。\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" msgstr "reg: 找不到文件 '%1'。\n" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(没有设值)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "搜索完成。找到的匹配项数量: %1!d!\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 2b2c1b003d4..59a724f6fa2 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -13896,12 +13896,12 @@ msgstr "" msgid "Are you sure?" msgstr "您確定嗎？" -#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:43 +#: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" msgid "Y" msgstr "Y" -#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:44 +#: programs/cmd/cmd.rc:367 programs/reg/reg.rc:127 programs/xcopy/xcopy.rc:44 msgctxt "No key" msgid "N" msgstr "N" @@ -13970,7 +13970,7 @@ msgstr "開啟 %1 失敗\n" msgid "Cannot call batch label outside of a batch script\n" msgstr "無法呼叫批次命令稿外部的批次標貼\n" -#: programs/cmd/cmd.rc:386 programs/xcopy/xcopy.rc:45 +#: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" msgid "A" msgstr "A" @@ -14039,12 +14039,12 @@ msgstr "位於儲存裝置 %1!c! 的卷冊為 %2\n" msgid "Volume in drive %1!c! has no label.\n" msgstr "位於儲存裝置 %1!c! 的卷冊沒有任何標貼。\n" -#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:126 +#: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 #, fuzzy msgid " (Yes|No)" msgstr " (是|否)" -#: programs/cmd/cmd.rc:403 +#: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 #, fuzzy msgid " (Yes|No|All)" msgstr " (是|否|全部)" @@ -15420,17 +15420,17 @@ msgstr "圖示檔案" msgid "Icons (*.ico)" msgstr "圖示 (*.ico)" -#: programs/reg/reg.rc:137 +#: programs/reg/reg.rc:139 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid syntax. " msgstr "錯誤：無效的索引鍵名稱\n" -#: programs/reg/reg.rc:140 +#: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" msgstr "" -#: programs/reg/reg.rc:179 +#: programs/reg/reg.rc:181 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15443,13 +15443,13 @@ msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" msgid "reg: The operation completed successfully\n" msgstr "作業已成功完成\n" -#: programs/reg/reg.rc:129 +#: programs/reg/reg.rc:131 #, fuzzy #| msgid "Operation canceled by user.\n" msgid "reg: The registry operation was cancelled\n" msgstr "作業被使用者取消。\n" -#: programs/reg/reg.rc:172 +#: programs/reg/reg.rc:174 #, fuzzy #| msgid "" #| "Error: The system was unable to find the specified registry key or value\n" @@ -15463,11 +15463,11 @@ msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" msgid "reg: Unable to find the specified registry value\n" msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" -#: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 +#: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(預設)" -#: programs/reg/reg.rc:139 +#: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" msgstr "" @@ -15534,7 +15534,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:200 +#: programs/reg/reg.rc:202 msgid "" "REG COPY [/s] [/f]\n" "\n" @@ -15608,7 +15608,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:168 +#: programs/reg/reg.rc:170 msgid "" "REG EXPORT [/y]\n" "\n" @@ -15639,7 +15639,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:146 +#: programs/reg/reg.rc:148 msgid "" "REG IMPORT \n" "\n" @@ -15685,7 +15685,7 @@ msgid "" "\n" msgstr "" -#: programs/reg/reg.rc:178 +#: programs/reg/reg.rc:180 msgid "" " /reg:32\n" " Access the registry using the 32-bit view.\n" @@ -15707,13 +15707,13 @@ msgstr "錯誤：無效的索引鍵名稱\n" msgid "reg: Unable to access remote machine\n" msgstr "錯誤：無法加入索引鍵到遠端機器\n" -#: programs/reg/reg.rc:170 +#: programs/reg/reg.rc:172 #, fuzzy #| msgid "Error: Invalid key name\n" msgid "reg: Invalid system key\n" msgstr "錯誤：無效的索引鍵名稱\n" -#: programs/reg/reg.rc:138 +#: programs/reg/reg.rc:140 #, fuzzy #| msgid "Error: Invalid option '%c'.\n" msgid "reg: Invalid option [%1]. " @@ -15727,7 +15727,7 @@ msgstr "" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -#: programs/reg/reg.rc:134 +#: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "" @@ -15753,61 +15753,69 @@ msgstr "檔案已經存在。您要取代嗎？" msgid "reg: Invalid command line parameters\n" msgstr "錯誤：無效的命令列參數\n" -#: programs/reg/reg.rc:202 +#: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" msgstr "" -#: programs/reg/reg.rc:131 +#: programs/reg/reg.rc:205 +#, fuzzy +#| msgid "The specified file already exists. Do you want to replace it?" +msgid "" +"The value '%1\\%2' already exists in the destination key. Do you want to " +"overwrite it?" +msgstr "檔案已經存在。您要取代嗎？" + +#: programs/reg/reg.rc:133 #, fuzzy #| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" msgstr "您確認要刪除這些數值嗎？" -#: programs/reg/reg.rc:132 +#: programs/reg/reg.rc:134 #, fuzzy #| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" msgstr "您確認要刪除這個數值 %s 嗎？" -#: programs/reg/reg.rc:133 +#: programs/reg/reg.rc:135 #, fuzzy #| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" msgstr "確定要刪除 %1？" -#: programs/reg/reg.rc:135 +#: programs/reg/reg.rc:137 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to delete all registry values in '%1'\n" msgstr "錯誤：無法加入索引鍵到遠端機器\n" -#: programs/reg/reg.rc:171 +#: programs/reg/reg.rc:173 #, fuzzy #| msgid "The specified file already exists. Do you want to replace it?" msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "檔案已經存在。您要取代嗎？" -#: programs/reg/reg.rc:149 +#: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "" -#: programs/reg/reg.rc:173 +#: programs/reg/reg.rc:175 #, fuzzy #| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to import the registry key '%1'\n" msgstr "錯誤：無法加入索引鍵到遠端機器\n" -#: programs/reg/reg.rc:148 +#: programs/reg/reg.rc:150 #, fuzzy #| msgid "No command was specified." msgid "reg: The file '%1' was not found.\n" msgstr "沒有任何命令被指定。" -#: programs/reg/reg.rc:141 programs/regedit/regedit.rc:240 +#: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" msgstr "(沒有設值)" -#: programs/reg/reg.rc:136 +#: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" msgstr "" diff --git a/programs/reg/copy.c b/programs/reg/copy.c index 208adc46e00..3ede5440cb6 100644 --- a/programs/reg/copy.c +++ b/programs/reg/copy.c @@ -16,12 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include #include "reg.h" struct key { HKEY root; /* system key */ - WCHAR *subkey; /* path to subkey */ + WCHAR *subkey; /* relative path to subkey */ HKEY hkey; /* handle to opened or created key */ + WCHAR *path; /* full path to subkey */ +}; + +enum operation { + COPY_NO, + COPY_YES, + COPY_ALL }; static void output_error(LONG rc) @@ -32,13 +40,50 @@ static void output_error(LONG rc) output_message(STRING_ACCESS_DENIED); } +static enum operation ask_overwrite_value(WCHAR *path, WCHAR *value) +{ + HMODULE hmod; + static WCHAR Ybuffer[4]; + static WCHAR Nbuffer[4]; + static WCHAR Abuffer[4]; + static WCHAR defval[32]; + WCHAR answer[MAX_PATH]; + WCHAR *str; + DWORD count; + + hmod = GetModuleHandleW(NULL); + LoadStringW(hmod, STRING_YES, Ybuffer, ARRAY_SIZE(Ybuffer)); + LoadStringW(hmod, STRING_NO, Nbuffer, ARRAY_SIZE(Nbuffer)); + LoadStringW(hmod, STRING_ALL, Abuffer, ARRAY_SIZE(Abuffer)); + LoadStringW(hmod, STRING_DEFAULT_VALUE, defval, ARRAY_SIZE(defval)); + + str = (value && *value) ? value : defval; + + while (1) + { + output_message(STRING_COPY_CONFIRM, path, str); + output_message(STRING_YESNOALL); + + ReadConsoleW(GetStdHandle(STD_INPUT_HANDLE), answer, ARRAY_SIZE(answer), &count, NULL); + + *answer = towupper(*answer); + + if (*answer == *Ybuffer) + return COPY_YES; + if (*answer == *Nbuffer) + return COPY_NO; + if (*answer == *Abuffer) + return COPY_ALL; + } +} + static int run_copy(struct key *src, struct key *dest, BOOL recurse, BOOL force) { LONG rc; DWORD max_subkey_len; DWORD max_name_len, name_len; DWORD max_data_size, data_size; - DWORD type, i; + DWORD type, dispos, i; WCHAR *name = NULL; BYTE *data = NULL; @@ -49,7 +94,7 @@ static int run_copy(struct key *src, struct key *dest, BOOL recurse, BOOL force) } if ((rc = RegCreateKeyExW(dest->root, dest->subkey, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_WRITE, NULL, &dest->hkey, NULL))) + KEY_READ|KEY_WRITE, NULL, &dest->hkey, &dispos))) { RegCloseKey(src->hkey); output_error(rc); @@ -83,6 +128,18 @@ static int run_copy(struct key *src, struct key *dest, BOOL recurse, BOOL force) if (rc == ERROR_NO_MORE_ITEMS) break; if (rc) goto cleanup; + if (!force && dispos == REG_OPENED_EXISTING_KEY) + { + if (!RegQueryValueExW(dest->hkey, name, NULL, NULL, NULL, NULL)) + { + enum operation op; + + op = ask_overwrite_value(src->path, name); + if (op == COPY_NO) continue; + if (op == COPY_ALL) force = TRUE; + } + } + if ((rc = RegSetValueExW(dest->hkey, name, 0, type, data, data_size))) { output_error(rc); @@ -93,6 +150,7 @@ static int run_copy(struct key *src, struct key *dest, BOOL recurse, BOOL force) for (i = 0; recurse; i++) { struct key subkey_src, subkey_dest; + size_t path_len; name_len = max_name_len; @@ -105,7 +163,20 @@ static int run_copy(struct key *src, struct key *dest, BOOL recurse, BOOL force) subkey_dest.root = dest->hkey; subkey_dest.subkey = name; + path_len = lstrlenW(src->path) + name_len + 2; + + if (!(subkey_src.path = malloc(path_len * sizeof(WCHAR)))) + { + rc = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + + swprintf(subkey_src.path, path_len, L"%s\\%s", src->path, name); + rc = run_copy(&subkey_src, &subkey_dest, TRUE, force); + + free(subkey_src.path); + if (rc) goto cleanup; } @@ -169,6 +240,8 @@ int reg_copy(int argc, WCHAR *argvW[]) return 1; } + src.path = src.subkey; + return run_copy(&src, &dest, recurse, force); invalid: diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index 89df2c45c4c..a3c53cf41b4 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -122,9 +122,11 @@ STRINGTABLE STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" - STRING_YESNO, " (Yes|No)" STRING_YES, "#msgctxt#Yes key#Y" STRING_NO, "#msgctxt#No key#N" + STRING_ALL, "#msgctxt#All key#A" + STRING_YESNO, " (Yes|No)" + STRING_YESNOALL, " (Yes|No|All)" STRING_CANCELLED, "reg: The registry operation was cancelled\n" STRING_DEFAULT_VALUE, "(Default)" STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" @@ -199,4 +201,5 @@ STRINGTABLE \ This option does not modify subkeys and values that only exist in .\n\n" STRING_COPY_SRC_DEST_SAME, "reg: The source and destination keys cannot be the same\n" + STRING_COPY_CONFIRM, "The value '%1\\%2' already exists in the destination key. Do you want to overwrite it?" } diff --git a/programs/reg/resource.h b/programs/reg/resource.h index 92d82d80a9b..f33d3da69be 100644 --- a/programs/reg/resource.h +++ b/programs/reg/resource.h @@ -25,7 +25,9 @@ /* Shared */ #define STRING_YES 100 #define STRING_NO 101 +#define STRING_ALL 102 #define STRING_YESNO 103 +#define STRING_YESNOALL 104 #define STRING_INVALID_SYNTAX 105 #define STRING_FUNC_HELP 106 #define STRING_ACCESS_DENIED 107 @@ -61,6 +63,7 @@ /* copy.c */ #define STRING_COPY_SRC_DEST_SAME 250 +#define STRING_COPY_CONFIRM 251 /* delete.c */ #define STRING_DELETE_VALUE 300