Author: keichwa
Date: 2015-10-01 13:24:47 +0200 (Thu, 01 Oct 2015)
New Revision: 92953
Modified:
trunk/yast/ko/po/autoinst.ko.po
trunk/yast/ko/po/bootloader.ko.po
trunk/yast/ko/po/crowbar.ko.po
trunk/yast/ko/po/kdump.ko.po
trunk/yast/ko/po/ncurses-pkg.ko.po
trunk/yast/ko/po/qt-pkg.ko.po
trunk/yast/ko/po/registration.ko.po
trunk/yast/ko/po/storage.ko.po
trunk/yast/ko/po/vpn.ko.po
Log:
merged
Modified: trunk/yast/ko/po/autoinst.ko.po
===================================================================
--- trunk/yast/ko/po/autoinst.ko.po 2015-10-01 11:24:45 UTC (rev 92952)
+++ trunk/yast/ko/po/autoinst.ko.po 2015-10-01 11:24:47 UTC (rev 92953)
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: autoinst.ko\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2009-11-04 16:58+0900\n"
"Last-Translator: Yunseok Choi \n"
"Language-Team: Korean \n"
@@ -33,7 +33,7 @@
#: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123
#: src/include/autoinstall/conftree.rb:622
-#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:360
+#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:352
msgid "This may take a while"
msgstr "약간의 시간이 소요될 수 있습니다."
@@ -54,12 +54,12 @@
#. command line options
#. Init variables
-#. We will have to set default entries which are defined
-#. in the import call of ServicesManager
+#. Import users configuration from the profile
+#.
#. Backup
#. Now check if there any classes defined in theis pre final control file
#: src/clients/autoyast.rb:114 src/clients/ayast_setup.rb:148
-#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:389
+#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:410
#: src/clients/inst_autosetup_upgrade.rb:484
#: src/modules/AutoInstallRules.rb:1001
msgid ""
@@ -546,88 +546,102 @@
#. Uwe Gansert
#.
#. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
-#: src/clients/inst_autosetup.rb:50 src/clients/inst_autosetup_upgrade.rb:47
+#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:47
msgid "<P>Please wait while the system is prepared for autoinstallation.</P>"
msgstr "<P>자동 설치를 위해 시스템을 준비하는 동안 잠시 기다려 주세요.</P>"
-#: src/clients/inst_autosetup.rb:54 src/clients/inst_autosetup_upgrade.rb:52
+#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:52
msgid "Execute pre-install user scripts"
msgstr "선행 사용자 스크립트 실행"
-#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:51
+#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:51
msgid "Configure General Settings "
msgstr "일반 설정사항 설정(&C)"
-#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:53
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:53
msgid "Set up language"
msgstr "언어 설정"
-#: src/clients/inst_autosetup.rb:57
+#: src/clients/inst_autosetup.rb:60
msgid "Create partition plans"
msgstr "파티션 계획 만들기"
-#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:56
+#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:56
msgid "Configure Bootloader"
msgstr "부트로더 설정"
# dialog caption
-#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:62 src/clients/inst_autosetup_upgrade.rb:54
msgid "Registration"
msgstr "등록"
-#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:55
+#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:55
msgid "Configure Software selections"
msgstr "소프트웨어 선택 설정"
-#: src/clients/inst_autosetup.rb:61
+#: src/clients/inst_autosetup.rb:64
msgid "Configure Systemd Default Target"
msgstr ""
-#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:61
+#: src/clients/inst_autosetup.rb:65
+#, fuzzy
+#| msgid "Configure Volume Groups"
+msgid "Configure users and groups"
+msgstr "볼륨 그룹 구성"
+
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61
msgid "Executing pre-install user scripts..."
msgstr "선행 사용자 스크립트 실행 중..."
-#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:60
msgid "Configuring general settings..."
msgstr "일반 설정사항 적용 중"
-#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:62
+#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:62
#, fuzzy
#| msgid "Set up language"
msgid "Setting up language..."
msgstr "언어 설정"
-#: src/clients/inst_autosetup.rb:68
+#: src/clients/inst_autosetup.rb:72
msgid "Creating partition plans..."
msgstr "파티션 구성 중..."
-#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:65
+#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:65
msgid "Configuring Bootloader..."
msgstr "부트로더 설정 중..."
-#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:63
+#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:63
#, fuzzy
#| msgid "Repairing file system..."
msgid "Registering the system..."
msgstr "파일 시스템 복구 중..."
-#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:64
msgid "Configuring Software selections..."
msgstr "소프트웨어 선택 적용 중..."
# src/config/proxy.y2cc:21
-#: src/clients/inst_autosetup.rb:72
+#: src/clients/inst_autosetup.rb:76
#, fuzzy
#| msgid "Configuring language..."
msgid "Configuring Systemd Default Target..."
msgstr "언어 구성 중..."
-#: src/clients/inst_autosetup.rb:76 src/clients/inst_autosetup_upgrade.rb:69
+#: src/clients/inst_autosetup.rb:77
+msgid "Importing users and groups configuration..."
+msgstr ""
+
+#: src/clients/inst_autosetup.rb:81 src/clients/inst_autosetup_upgrade.rb:69
msgid "Preparing System for Automated Installation"
msgstr "자동설치를 위해서 시스템 준비중..."
-#. configure general settings
-#: src/clients/inst_autosetup.rb:164
+#. Second stage of installation will not be called but a
+#. network configuration is available. So this will be written
+#. while the general inst_finish process at the end of the
+#. first stage. But for the installation workflow the linuxrc
+#. network settings will be taken. (bnc#944942)
+#: src/clients/inst_autosetup.rb:183
#, fuzzy
#| msgid "Signing the Add-On Product"
msgid "Handling Add-On Products..."
@@ -637,12 +651,12 @@
#. Set it in the Language module.
#.
#. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:184 src/clients/inst_autosetup_upgrade.rb:149
+#: src/clients/inst_autosetup.rb:202 src/clients/inst_autosetup_upgrade.rb:149
msgid "Configuring language..."
msgstr "언어 구성 중..."
#. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:273
+#: src/clients/inst_autosetup.rb:290
msgid ""
"Error while configuring partitions.\n"
"Try again.\n"
@@ -651,7 +665,7 @@
"다시 시도하세요.\n"
#. Software
-#: src/clients/inst_autosetup.rb:331
+#: src/clients/inst_autosetup.rb:344
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"
@@ -1692,7 +1706,7 @@
#. list<any> l = [ "key1",0,"key3" ];
#. m[ l ] = v;
#. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:815
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807
msgid "Checking XML with RNG validation..."
msgstr "RNG 유효성 검사와 함께 XML을 확인하는 중..."
@@ -1703,7 +1717,7 @@
msgstr "섹션 %1:"
#. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:827
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819
msgid "Checking XML with RNC validation..."
msgstr "RNC 유효성 검사와 함께 XML을 확인하는 중..."
@@ -2460,7 +2474,7 @@
#. @param [String] result_profile the resulting control file path
#. @return [Boolean] true on success
#. autoyast has read the autoyast configuration file but something went wrong
-#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:746
+#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:738
msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
msgstr "XML 파서가 autoyast 프로파일을 구문 분석하는 동안 오류를 보고했습니다. 오류 메시지 내용:\n"
@@ -2973,14 +2987,14 @@
# Routing dialog caption
#. Prepare Profile for saving and remove empty data structs
#. @return [void]
-#: src/modules/Profile.rb:359
+#: src/modules/Profile.rb:351
msgid "Collecting configuration data..."
msgstr "구성 데이터 수집 중..."
#. Save YCP data into XML
#. @param path to file
#. @return [Boolean] true on success
-#: src/modules/Profile.rb:462
+#: src/modules/Profile.rb:454
#, fuzzy
#| msgid "Encrypted AutoYaST profile. Please enter the password twice"
msgid "Encrypted AutoYaST profile. Enter the password twice."
@@ -2990,7 +3004,7 @@
#.
#. @param [String] dir - directory to store section xml files in
#. @return - list of filenames
-#: src/modules/Profile.rb:536
+#: src/modules/Profile.rb:528
#, fuzzy
#| msgid "Couldn't write section %1 to file %2"
msgid "Could not write section %1 to file %2."
@@ -2999,7 +3013,7 @@
#. Read XML into YCP data
#. @param path to file
#. @return [Boolean]
-#: src/modules/Profile.rb:703 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:695 src/modules/ProfileLocation.rb:190
#, fuzzy
#| msgid "Encrypted AutoYaST profile. Please enter the correct password."
msgid "Encrypted AutoYaST profile. Enter the correct password."
@@ -3121,9 +3135,6 @@
#~ " 여기서 볼륨 그룹을 작성 및 편집하십시오. 그런 다음 물리적 하드 디스크의 파티션 대화 상자에서 이 볼륨 그룹에 물리 파티션을 할당하십시오. 그러한 파티션에 대해 파티션 ID를 0x8e로 설정하십시오.\n"
#~ " </P>\n"
-#~ msgid "Configure Volume Groups"
-#~ msgstr "볼륨 그룹 구성"
-
#~ msgid "&Volume Group"
#~ msgstr "볼륨 그룹(&V)"
Modified: trunk/yast/ko/po/bootloader.ko.po
===================================================================
--- trunk/yast/ko/po/bootloader.ko.po 2015-10-01 11:24:45 UTC (rev 92952)
+++ trunk/yast/ko/po/bootloader.ko.po 2015-10-01 11:24:47 UTC (rev 92953)
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: bootloader.ko\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2009-11-04 16:38+0900\n"
"Last-Translator: Yunseok Choi \n"
"Language-Team: Korean \n"
@@ -434,7 +434,7 @@
# frame
# table cell / label
#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:56
+#: src/include/bootloader/grub2/dialogs.rb:57
#, fuzzy
#| msgid "Boot Loader Options"
msgid "Boot Code Options"
@@ -524,33 +524,23 @@
msgid "<p><b>Protective MBR flag</b> is expert only settings, that is needed only on exotic hardware. For details see Protective MBR in GPT disks. Do not touch if you are not sure.</p>"
msgstr ""
-#: src/include/bootloader/grub2/helps.rb:35
-msgid "<p><b>Distributor</b> specifies name of distributor of kernel used to create boot entry name. </p>"
-msgstr ""
-
# Provider dialog caption
-#: src/include/bootloader/grub2/helps.rb:41
+#: src/include/bootloader/grub2/helps.rb:38
msgid "O&ptional Kernel Command Line Parameter"
msgstr "선택적 커널 명령줄 매개변수(&P)"
-#: src/include/bootloader/grub2/helps.rb:42
-#, fuzzy
-#| msgid "Distribution:"
-msgid "D&istributor"
-msgstr "배포판:"
-
-#: src/include/bootloader/grub2/helps.rb:43
+#: src/include/bootloader/grub2/helps.rb:39
msgid "&Vga Mode"
msgstr "VGA 모드(&V)"
# table header
-#: src/include/bootloader/grub2/helps.rb:44
+#: src/include/bootloader/grub2/helps.rb:40
#, fuzzy
#| msgid "Probe Source Type"
msgid "Probe Foreign OS"
msgstr "소스 종류 탐색"
-#: src/include/bootloader/grub2/helps.rb:45
+#: src/include/bootloader/grub2/helps.rb:41
msgid "Protective MBR flag"
msgstr ""
@@ -655,7 +645,7 @@
#. F#300779 - Install diskless client (NFS-root)
#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:237
+#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:239
msgid "The boot partition is of type NFS. Bootloader cannot be installed."
msgstr "부트파티션이 NFS 형식입니다. 부트 로더를 설치할 수 없었습니다."
@@ -1053,7 +1043,7 @@
"사용됩니다.</p>"
#. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:101
+#: src/include/bootloader/routines/lilolike.rb:108
msgid "Order of Hard Disks: %1"
msgstr "하드 디스크 순서: %1"
@@ -1270,61 +1260,61 @@
# warning text in the summary rixhtext
#. warning text in the summary richtext
-#: src/lib/bootloader/proposal_client.rb:178
+#: src/lib/bootloader/proposal_client.rb:174
msgid "No boot loader is selected for installation. Your system might not be bootable."
msgstr "어떤 부트 로더도 설치하기위해서 선택할 수 없습니다. 여러분의 시스템은 부팅할 수 없습니다."
#. error in the proposal
-#: src/lib/bootloader/proposal_client.rb:187
+#: src/lib/bootloader/proposal_client.rb:183
msgid "Because of the partitioning, the bootloader cannot be installed properly"
msgstr "파티셔닝 때문에 부트 로더를 제대로 설치할 수 없습니다."
#. FATE#303643 Enable one-click changes in bootloader proposal
#.
-#: src/modules/BootGRUB2.rb:194
+#: src/modules/BootGRUB2.rb:168
#, fuzzy
#| msgid "Boot from MBR is enabled (disable</a>"
msgid "Install bootcode into MBR (do not install</a>)"
msgstr "MBR로 부터 부팅 활성화 (비활성화</a>"
-#: src/modules/BootGRUB2.rb:198
+#: src/modules/BootGRUB2.rb:172
#, fuzzy
#| msgid "Boot from MBR is disabled (enable</a>"
msgid "Do not install bootcode into MBR (install</a>)"
msgstr "MBR로 부터 부팅 비활성화 (활성화</a>"
#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB2.rb:211
+#: src/modules/BootGRUB2.rb:185
#, fuzzy
#| msgid "Boot from /boot partition is enabled (disable</a>"
msgid "Install bootcode into /boot partition (do not install</a>)"
msgstr "/boot 파티션으로 부터 부팅 활성화 (비활성화</a>"
-#: src/modules/BootGRUB2.rb:215
+#: src/modules/BootGRUB2.rb:189
#, fuzzy
#| msgid "Boot from /boot partition is disabled (enable</a>"
msgid "Do not install bootcode into /boot partition (install</a>)"
msgstr "/boot 파티션으로 부터 부팅 비활성화 (활성화</a>"
-#: src/modules/BootGRUB2.rb:221
+#: src/modules/BootGRUB2.rb:195
#, fuzzy
#| msgid "Boot from \"/\" partition is enabled (disable</a>"
msgid "Install bootcode into \"/\" partition (do not install</a>)"
msgstr "\"/\" 으로 부터 부팅 활성화 (비활성화</a>"
-#: src/modules/BootGRUB2.rb:225
+#: src/modules/BootGRUB2.rb:199
#, fuzzy
#| msgid "Boot from \"/\" partition is disabled (enable</a>"
msgid "Do not install bootcode into \"/\" partition (install</a>)"
msgstr "\"/\" 으로 부터 부팅 비활성화 (활성화</a>"
#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:235
+#: src/modules/BootGRUB2.rb:209
msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
msgstr ""
#. TRANSLATORS: title for list of location proposals
-#: src/modules/BootGRUB2.rb:243
+#: src/modules/BootGRUB2.rb:217
#, fuzzy
#| msgid "Change Location: %1"
msgid "Change Location: %s"
@@ -1335,22 +1325,22 @@
#. @return a list of summary lines
#. Display bootloader summary
#. @return a list of summary lines
-#: src/modules/BootGRUB2.rb:252 src/modules/BootGRUB2EFI.rb:100
+#: src/modules/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100
msgid "Boot Loader Type: %1"
msgstr "부트 로더 유형: %1"
#. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/modules/BootGRUB2.rb:263
+#: src/modules/BootGRUB2.rb:237
msgid " (extended)"
msgstr " (extended)"
#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
#. is used in your language, then keep it as it is.
-#: src/modules/BootGRUB2.rb:271
+#: src/modules/BootGRUB2.rb:245
msgid " (MBR)"
msgstr " (MBR)"
-#: src/modules/BootGRUB2.rb:278
+#: src/modules/BootGRUB2.rb:252
msgid "Status Location: %1"
msgstr "위치 상태: %1"
@@ -1387,81 +1377,90 @@
msgstr "부트 장치가 소프트웨어 RAID1에 있습니다. 다른 부트로더 위치를 선택하세요.(예. 마스터 부트 레코드)"
#. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:243
+#: src/modules/BootSupportCheck.rb:239
msgid "Missing ext partition for booting. Cannot install boot code."
msgstr ""
+#. activate set or there is already activate flag
+#: src/modules/BootSupportCheck.rb:248
+msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
+msgstr ""
+
+#: src/modules/BootSupportCheck.rb:255
+msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot disk."
+msgstr ""
+
# progress stage, text in dialog (short, infinitiv)
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:144
+#: src/modules/Bootloader.rb:146
msgid "Check boot loader"
msgstr "부트 로더 검사 "
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:146
+#: src/modules/Bootloader.rb:148
msgid "Read partitioning"
msgstr "파티션 읽는 중"
# progress stage, text in dialog (short, infinitiv)
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:148
+#: src/modules/Bootloader.rb:150
msgid "Load boot loader settings"
msgstr "부트 로더 설정들 적재"
# progress stage, text in dialog (short)
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:152
+#: src/modules/Bootloader.rb:154
msgid "Checking boot loader..."
msgstr "부트 로더를 검사 중..."
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:154
+#: src/modules/Bootloader.rb:156
msgid "Reading partitioning..."
msgstr "파티션을 읽는 중..."
# progress stage, text in dialog (short)
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:156
+#: src/modules/Bootloader.rb:158
msgid "Loading boot loader settings..."
msgstr "부트 로더 설정을 적재 중..."
# progress bar caption
#. dialog header
-#: src/modules/Bootloader.rb:160
+#: src/modules/Bootloader.rb:162
msgid "Initializing Boot Loader Configuration"
msgstr "부트 로더 구성을 초기화합니다."
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:279
+#: src/modules/Bootloader.rb:281
msgid "Create initrd"
msgstr "initrd 생성"
# progress stage, text in dialog (short)
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:281
+#: src/modules/Bootloader.rb:283
msgid "Save boot loader configuration files"
msgstr "부트 로더 구성 파일 저장"
# progress stage, text in dialog (short)
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:283
+#: src/modules/Bootloader.rb:285
msgid "Install boot loader"
msgstr "부트 로더 설치"
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:287
+#: src/modules/Bootloader.rb:289
msgid "Creating initrd..."
msgstr "initrd 생성 중..."
# progress stage, text in dialog (short)
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:289
+#: src/modules/Bootloader.rb:291
msgid "Saving boot loader configuration files..."
msgstr "부트 로더 설정파일을 저장 중 ... "
# progress stage, text in dialog (short)
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:291
+#: src/modules/Bootloader.rb:293
msgid "Installing boot loader..."
msgstr "부트 로더를 설치 중..."
@@ -1469,11 +1468,16 @@
# src/modem/wizards.ycp:84
# progress line
#. progress line
-#: src/modules/Bootloader.rb:297
+#: src/modules/Bootloader.rb:299
msgid "Saving Boot Loader Configuration"
msgstr "부트 로더 구성 저장 중"
#, fuzzy
+#~| msgid "Distribution:"
+#~ msgid "D&istributor"
+#~ msgstr "배포판:"
+
+#, fuzzy
#~| msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
#~ msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>"
#~ msgstr "<p><b>선택적 커널 명령줄 매개 변수</b> 로 커널로 전달할 추가 매개 변수를 정의할 수 있습니다.</p>"
Modified: trunk/yast/ko/po/crowbar.ko.po
===================================================================
--- trunk/yast/ko/po/crowbar.ko.po 2015-10-01 11:24:45 UTC (rev 92952)
+++ trunk/yast/ko/po/crowbar.ko.po 2015-10-01 11:24:47 UTC (rev 92953)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2001-07-18 11:05+0200\n"
"Last-Translator: Hwang, Sang-Jin \n"
"Language-Team: Korean \n"
@@ -521,7 +521,7 @@
#. popup message %1 is FQDN
#: src/include/crowbar/complex.rb:1731
msgid ""
-"The SUSE Cloud Admin Server has been deployed. Changing the network is\n"
+"The Crowbar Admin Server has been deployed. Changing the network is\n"
"currently not supported.\n"
"\n"
"You can visit the Crowbar web UI on http://%1:3000/"
@@ -579,7 +579,7 @@
#: src/include/crowbar/helps.rb:49
msgid ""
"<p>\n"
-"See the SUSE Cloud deployment guide for details on the network\n"
+"See the product deployment guide for details on the network\n"
"configuration and on using this YaST module.\n"
"</p>"
msgstr ""
Modified: trunk/yast/ko/po/kdump.ko.po
===================================================================
--- trunk/yast/ko/po/kdump.ko.po 2015-10-01 11:24:45 UTC (rev 92952)
+++ trunk/yast/ko/po/kdump.ko.po 2015-10-01 11:24:47 UTC (rev 92953)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kdump.ko\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2010-04-22 12:48+0900\n"
"Last-Translator: Yunseok Choi \n"
"Language-Team: Korean \n"
@@ -350,7 +350,7 @@
msgid "Kdump immediate reboots: %1"
msgstr "Kdump 즉시 시스템 다시 시작: %1"
-#: src/clients/kdump.rb:652 src/clients/kdump.rb:1259
+#: src/clients/kdump.rb:652 src/clients/kdump.rb:1262
#, fuzzy
#| msgid "enabled"
msgid "Enabled"
@@ -358,7 +358,7 @@
# translators: service status radio button label
# translators: server module status
-#: src/clients/kdump.rb:653 src/clients/kdump.rb:1260
+#: src/clients/kdump.rb:653 src/clients/kdump.rb:1263
#, fuzzy
#| msgid "disabled"
msgid "Disabled"
@@ -403,14 +403,19 @@
#. TRANSLATORS: CommandLine printed text
#: src/clients/kdump.rb:747
-msgid "Kernel option \"crashkernel\" includes ranges. They will be rewritten."
+#, fuzzy
+#| msgid "Kernel option \"crashkernel\" includes ranges. They will be rewritten."
+msgid ""
+"Kernel option \"crashkernel\" includes ranges and/or redundant values.\n"
+"It will be rewritten."
msgstr "커널 옵션 \"crashkernel\" 에 범위가 포함되었습니다. 이것은 재기록 될것입니다."
+#. Force value to false, so it's actually rewritten
#. TRANSLATORS: CommandLine printed text
-#. Popup::Message(crash_value);
-#. delete crashkernel paramter from bootloader
-#: src/clients/kdump.rb:752 src/clients/kdump.rb:757 src/modules/Kdump.rb:570
-#: src/modules/Kdump.rb:589
+#. start kdump at boot
+#. delete crashkernel parameter from bootloader
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487
+#: src/modules/Kdump.rb:500
msgid "To apply changes a reboot is necessary."
msgstr "변경 사항을 적용하려면 시스템을 다시 시작해야 합니다."
@@ -429,36 +434,36 @@
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:761 src/clients/kdump.rb:787 src/clients/kdump.rb:816
-#: src/clients/kdump.rb:1048 src/clients/kdump.rb:1065
-#: src/clients/kdump.rb:1082 src/clients/kdump.rb:1099
-#: src/clients/kdump.rb:1114 src/clients/kdump.rb:1130
-#: src/clients/kdump.rb:1153 src/clients/kdump.rb:1173
-#: src/clients/kdump.rb:1193 src/clients/kdump.rb:1207
-#: src/clients/kdump.rb:1230 src/clients/kdump.rb:1250
+#: src/clients/kdump.rb:764 src/clients/kdump.rb:790 src/clients/kdump.rb:819
+#: src/clients/kdump.rb:1051 src/clients/kdump.rb:1068
+#: src/clients/kdump.rb:1085 src/clients/kdump.rb:1102
+#: src/clients/kdump.rb:1117 src/clients/kdump.rb:1133
+#: src/clients/kdump.rb:1156 src/clients/kdump.rb:1176
+#: src/clients/kdump.rb:1196 src/clients/kdump.rb:1210
+#: src/clients/kdump.rb:1233 src/clients/kdump.rb:1253
msgid "Wrong options were used."
msgstr "잘못된 옵션이 사용되고 있습니다."
#. TRANSLATORS: CommandLine printed text
-#: src/clients/kdump.rb:778
+#: src/clients/kdump.rb:781
msgid "Dump level was set."
msgstr "덤프 레벨이 설정 되었습니다."
# command line help text for an option
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:782 src/clients/kdump.rb:807
+#: src/clients/kdump.rb:785 src/clients/kdump.rb:810
msgid "Wrong value of option."
msgstr "잘못된 옵션 값입니다."
# button text
#. TRANSLATORS: CommandLine printed text
-#: src/clients/kdump.rb:803
+#: src/clients/kdump.rb:806
msgid "Dump format was set."
msgstr "덤프 형식이 설정되었습니다."
#. TRANSLATORS: CommandLine printed text help
-#: src/clients/kdump.rb:810
+#: src/clients/kdump.rb:813
#, fuzzy
#| msgid "Option can include only \"ELF\" or \"compressed\" value."
msgid "Option can include only \"none\", \"ELF\", \"compressed\" or \"lzo\" value."
@@ -468,7 +473,7 @@
# %1 is a name of an init script in /etc/init.d,
# eg. nfsserver
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:830
+#: src/clients/kdump.rb:833
msgid "File %1 does not exist."
msgstr "%1 파일이 존재하지 않습니다."
@@ -476,8 +481,8 @@
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:852 src/clients/kdump.rb:886 src/clients/kdump.rb:935
-#: src/clients/kdump.rb:969 src/clients/kdump.rb:1016
+#: src/clients/kdump.rb:855 src/clients/kdump.rb:889 src/clients/kdump.rb:938
+#: src/clients/kdump.rb:972 src/clients/kdump.rb:1019
msgid "Value for \"dir\" missing."
msgstr "\"dir\" 값이 설정되어 있지 않습니다."
@@ -485,30 +490,30 @@
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:866 src/clients/kdump.rb:916 src/clients/kdump.rb:957
-#: src/clients/kdump.rb:983
+#: src/clients/kdump.rb:869 src/clients/kdump.rb:919 src/clients/kdump.rb:960
+#: src/clients/kdump.rb:986
msgid "Value for \"server\" missing."
msgstr "\"server\" 값이 설정되어 있지 않습니다."
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:995
+#: src/clients/kdump.rb:998
msgid "Value for \"share\" missing."
msgstr "\"share\" 값이 설정되어 있지 않습니다."
# command line error report, %1 is manufacturer name
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1037
+#: src/clients/kdump.rb:1040
msgid "Wrong value for target."
msgstr "잘못된 대상 값입니다."
# command line help text for an option
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1148
+#: src/clients/kdump.rb:1151
msgid "Wrong value of options \"no\"."
msgstr "잘못된 \"no\" 옵션 값입니다."
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1168
+#: src/clients/kdump.rb:1171
#, fuzzy
#| msgid "Wrong value of options \"server\"."
msgid "Wrong value for option \"server\"."
@@ -516,7 +521,7 @@
# command line help text for an option
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1188
+#: src/clients/kdump.rb:1191
#, fuzzy
#| msgid "Wrong value of options \"user\"."
msgid "Wrong value for option \"user\"."
@@ -524,18 +529,18 @@
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1225 src/clients/kdump.rb:1245
+#: src/clients/kdump.rb:1228 src/clients/kdump.rb:1248
#, fuzzy
#| msgid "Wrong value of options \"email\"."
msgid "Wrong value for option \"email\"."
msgstr "잘못된 \"email\" 옵션 값입니다."
-#: src/clients/kdump.rb:1257
+#: src/clients/kdump.rb:1260
msgid "Firmware-assisted dump: %{status}"
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1275
+#: src/clients/kdump.rb:1278
#, fuzzy
#| msgid "Wrong options were used."
msgid "No option has been defined."
@@ -559,122 +564,106 @@
msgstr "Kdump(&K)"
#. TRANSLATORS: RadioButtonGroup Label
-#: src/include/kdump/dialogs.rb:53
+#: src/include/kdump/dialogs.rb:57
msgid "Enable/Disable Kdump"
msgstr "Kdump 활성화/비활성화"
# progress stages
-#: src/include/kdump/dialogs.rb:58
+#: src/include/kdump/dialogs.rb:62
msgid "Enable Kd&ump"
msgstr "Kdump 활성화(&U)"
-#: src/include/kdump/dialogs.rb:59
+#: src/include/kdump/dialogs.rb:63
msgid "&Disable Kdump"
msgstr "Kdump 비활성화(&D)"
-# tree node string - memory (RAM) information
-#. "handle" : HandleEnableDisalbeKdump,
-#: src/include/kdump/dialogs.rb:79
-msgid "Total System Memory [MB]:"
-msgstr "총 시스템 메모리 [MB]:"
-
-# tree node string - memory (RAM) information
-#: src/include/kdump/dialogs.rb:86
-msgid "Usable Memory [MB]:"
-msgstr "사용가능한 메모리 [MB]:"
-
-# tree node string - memory (RAM) information
-#: src/include/kdump/dialogs.rb:95
-msgid "Kdump Memor&y [MB]"
-msgstr "Kdump 메모리 [MB](&Y)"
-
# translators: dialog caption
#. ---------============ Dump Filtering screen=============------------
-#: src/include/kdump/dialogs.rb:134
+#: src/include/kdump/dialogs.rb:111
msgid "Include in Dumping"
msgstr "덤프에 포함"
-#: src/include/kdump/dialogs.rb:141
+#: src/include/kdump/dialogs.rb:118
msgid "&Pages Filled with Zero"
msgstr "제로로 채울있었던 페이지(&P)"
#. `VStretch ()
-#: src/include/kdump/dialogs.rb:147
+#: src/include/kdump/dialogs.rb:124
msgid "Cach&e Pages"
msgstr "페이지 캐시(&E)"
-#: src/include/kdump/dialogs.rb:157
+#: src/include/kdump/dialogs.rb:134
msgid "Cache Priva&te Pages"
msgstr "개인 페이지 캐시(&T)"
# src/dsl/dialogs.ycp:140
# Frame title
-#: src/include/kdump/dialogs.rb:162
+#: src/include/kdump/dialogs.rb:139
msgid "&User Data Pages"
msgstr "사용자 데이터 페이지(&U)"
# text entry
-#: src/include/kdump/dialogs.rb:163
+#: src/include/kdump/dialogs.rb:140
msgid "&Free Pages"
msgstr "여유 페이지(&F)"
# button text
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:191
+#: src/include/kdump/dialogs.rb:168
msgid "&Dump Format"
msgstr "덤프 형식(&D)"
-#: src/include/kdump/dialogs.rb:194
+#: src/include/kdump/dialogs.rb:171
#, fuzzy
#| msgid "Number of Dumps"
msgid "&No Dump"
msgstr "덤프 수"
# button text
-#: src/include/kdump/dialogs.rb:195
+#: src/include/kdump/dialogs.rb:172
#, fuzzy
#| msgid "E&LF Format"
msgid "&ELF Format"
msgstr "ELF 형식(&L)"
# checkbox
-#: src/include/kdump/dialogs.rb:196
+#: src/include/kdump/dialogs.rb:173
msgid "C&ompressed Format"
msgstr "압축 형식(&O)"
# checkbox
-#: src/include/kdump/dialogs.rb:197
+#: src/include/kdump/dialogs.rb:174
#, fuzzy
#| msgid "C&ompressed Format"
msgid "&LZO Compressed Format"
msgstr "압축 형식(&O)"
#. ---------============ Dump Target screen=============------------
-#: src/include/kdump/dialogs.rb:217
+#: src/include/kdump/dialogs.rb:194
msgid "&Select Target"
msgstr "대상 선택(&S)"
-#: src/include/kdump/dialogs.rb:221
+#: src/include/kdump/dialogs.rb:198
msgid "Local Directory"
msgstr "로컬 디렉터리"
-#: src/include/kdump/dialogs.rb:222 src/include/kdump/uifunctions.rb:106
+#: src/include/kdump/dialogs.rb:199 src/include/kdump/uifunctions.rb:106
msgid "FTP"
msgstr "FTP"
-#: src/include/kdump/dialogs.rb:223
+#: src/include/kdump/dialogs.rb:200
msgid "SSH"
msgstr "SSH"
-#: src/include/kdump/dialogs.rb:224
+#: src/include/kdump/dialogs.rb:201
msgid "SFTP"
msgstr ""
-#: src/include/kdump/dialogs.rb:225 src/include/kdump/uifunctions.rb:173
+#: src/include/kdump/dialogs.rb:202 src/include/kdump/uifunctions.rb:173
msgid "NFS"
msgstr "NFS"
-#: src/include/kdump/dialogs.rb:226 src/include/kdump/uifunctions.rb:188
+#: src/include/kdump/dialogs.rb:203 src/include/kdump/uifunctions.rb:188
msgid "CIFS (SMB)"
msgstr "CIFS (SMB)"
@@ -682,7 +671,7 @@
# text entry label
# combo box label
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:251
+#: src/include/kdump/dialogs.rb:228
msgid "&SMTP Server"
msgstr "SMTP 서버(&S)"
@@ -691,7 +680,7 @@
#. text entry
#. text entry
#. text entry
-#: src/include/kdump/dialogs.rb:263 src/include/kdump/uifunctions.rb:130
+#: src/include/kdump/dialogs.rb:240 src/include/kdump/uifunctions.rb:130
#: src/include/kdump/uifunctions.rb:160 src/include/kdump/uifunctions.rb:212
msgid "&User Name"
msgstr "사용자 이름(&U)"
@@ -702,133 +691,168 @@
#. password entry
#. password entry
#. password entry
-#: src/include/kdump/dialogs.rb:275 src/include/kdump/uifunctions.rb:133
+#: src/include/kdump/dialogs.rb:252 src/include/kdump/uifunctions.rb:133
#: src/include/kdump/uifunctions.rb:163 src/include/kdump/uifunctions.rb:215
msgid "&Password"
msgstr "열쇠글(&P)"
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:287
+#: src/include/kdump/dialogs.rb:264
msgid "Notification &To"
msgstr "알림 받는 자(&T)"
# translators: frame title for new hsot identification details
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:303
+#: src/include/kdump/dialogs.rb:280
msgid "Notifica&tion CC"
msgstr "알림 CC(&T)"
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:320
+#: src/include/kdump/dialogs.rb:297
msgid "Custom Kdump &Kernel"
msgstr "사용자 정의 Kdump 커널(&K)"
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:332
+#: src/include/kdump/dialogs.rb:309
msgid "Kdump Co&mmand Line"
msgstr "Kdump 명령줄(&M)"
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:344
+#: src/include/kdump/dialogs.rb:321
msgid "Kdump Command &Line Append"
msgstr "Kdump 명령줄 Append(&L)"
#. TRANSLATORS: CheckBox Label
-#: src/include/kdump/dialogs.rb:361
+#: src/include/kdump/dialogs.rb:338
msgid "&Enable Immediate Reboot After Saving the Core"
msgstr "코어 부분을 저장한 후 즉시 시스템 다시 시작 활성화(&E)"
#. TRANSLATORS: CheckBox Label
-#: src/include/kdump/dialogs.rb:375
+#: src/include/kdump/dialogs.rb:352
msgid "Enable Copy Ke&rnel into the Dump Directory"
msgstr "덤프 디렉터리에 커널 복사 활성화(&R)"
#. TRANSLATORS: CheckBox Label
-#: src/include/kdump/dialogs.rb:389
+#: src/include/kdump/dialogs.rb:366
msgid "Enable &Delete Old Dump Images"
msgstr "오래된 덤프 이미지 삭제 활성화(&D)"
#. TRANSLATORS: IntField Label
-#: src/include/kdump/dialogs.rb:406
+#: src/include/kdump/dialogs.rb:383
msgid "N&umber of Old Dumps"
msgstr "오래된 덤프의 수(&U)"
# tree node string - memory (RAM) information
#. "handle" :
-#: src/include/kdump/dialogs.rb:427
+#: src/include/kdump/dialogs.rb:408
msgid "Kdump Memory"
msgstr "Kdump 메모리"
# dialog caption
-#: src/include/kdump/dialogs.rb:432
+#: src/include/kdump/dialogs.rb:413
msgid "Kdump Start-Up"
msgstr "Kdump 시작"
# dialog caption
-#: src/include/kdump/dialogs.rb:433
+#: src/include/kdump/dialogs.rb:414
msgid "Start-Up"
msgstr "시작"
-#: src/include/kdump/dialogs.rb:448
+#: src/include/kdump/dialogs.rb:429
msgid "Kdump - Dump Filtering"
msgstr "Kdump - 덤프 거르개"
# checkbox
-#: src/include/kdump/dialogs.rb:449
+#: src/include/kdump/dialogs.rb:430
msgid "Dump Filtering"
msgstr "덤프 거르개"
-#: src/include/kdump/dialogs.rb:455
+#: src/include/kdump/dialogs.rb:436
msgid "Saving Target for Kdump Image"
msgstr "Kdump 이미지를 저장할 대상"
# Tv frequency table
-#: src/include/kdump/dialogs.rb:462 src/include/kdump/dialogs.rb:463
+#: src/include/kdump/dialogs.rb:443 src/include/kdump/dialogs.rb:444
msgid "Dump Target"
msgstr "덤프 대상"
# combo box label
# text entry label
# combo box label
-#: src/include/kdump/dialogs.rb:469
+#: src/include/kdump/dialogs.rb:450
msgid "SMTP Server"
msgstr "SMTP 서버"
# label in proposal text
-#: src/include/kdump/dialogs.rb:479
+#: src/include/kdump/dialogs.rb:460
#, fuzzy
#| msgid "Notification Email addresses"
msgid "Notification Email Addresses"
msgstr "알림 전자 우편 주소"
-#: src/include/kdump/dialogs.rb:487 src/include/kdump/dialogs.rb:488
+#: src/include/kdump/dialogs.rb:468 src/include/kdump/dialogs.rb:469
msgid "Email Notification"
msgstr "전자 우편 알림"
-#: src/include/kdump/dialogs.rb:501
+#: src/include/kdump/dialogs.rb:482
msgid "Custom Kernel for Kdump"
msgstr "Kdump 사용자 정의 커널"
-#: src/include/kdump/dialogs.rb:506
+#: src/include/kdump/dialogs.rb:487
msgid "Command Line"
msgstr "명령줄"
-#: src/include/kdump/dialogs.rb:514
+#: src/include/kdump/dialogs.rb:495
#, fuzzy
#| msgid "Dumps Settings"
msgid "Dump Settings"
msgstr "덤프 설정"
# dialog caption
-#: src/include/kdump/dialogs.rb:527
+#: src/include/kdump/dialogs.rb:508
msgid "Kdump Expert Settings"
msgstr "Kdump 전문가 설정"
# dialog caption
-#: src/include/kdump/dialogs.rb:528
+#: src/include/kdump/dialogs.rb:509
msgid "Expert Settings"
msgstr "전문가 설정"
+# tree node string - memory (RAM) information
+#: src/include/kdump/dialogs.rb:529
+#, fuzzy
+#| msgid "Kdump Memor&y [MB]"
+msgid "Kdump &Low Memory [MiB]"
+msgstr "Kdump 메모리 [MB](&Y)"
+
+# tree node string - memory (RAM) information
+#: src/include/kdump/dialogs.rb:531
+#, fuzzy
+#| msgid "Kdump Memor&y [MB]"
+msgid "Kdump Memor&y [MiB]"
+msgstr "Kdump 메모리 [MB](&Y)"
+
+# tree node string - memory (RAM) information
+#: src/include/kdump/dialogs.rb:537
+#, fuzzy
+#| msgid "Total System Memory [MB]:"
+msgid "Total System Memory [MiB]:"
+msgstr "총 시스템 메모리 [MB]:"
+
+# tree node string - memory (RAM) information
+#: src/include/kdump/dialogs.rb:544
+#, fuzzy
+#| msgid "Usable Memory [MB]:"
+msgid "Usable Memory [MiB]:"
+msgstr "사용가능한 메모리 [MB]:"
+
+# tree node string - memory (RAM) information
+#: src/include/kdump/dialogs.rb:567
+#, fuzzy
+#| msgid "Kdump Memor&y [MB]"
+msgid "Kdump &High Memory [MiB]"
+msgstr "Kdump 메모리 [MB](&Y)"
+
#. Enable/Disable Kdump - RadioButtons 1/1
#: src/include/kdump/helps.rb:36
#, fuzzy
@@ -1349,19 +1373,21 @@
#. several ranges and ask user about rewritting
#.
#. "KdumpMemory"
-#: src/include/kdump/uifunctions.rb:1439
-msgid "Kernel option includes several ranges. Rewrite it?"
+#: src/include/kdump/uifunctions.rb:1449
+#, fuzzy
+#| msgid "Kernel option includes several ranges. Rewrite it?"
+msgid "Kernel option includes several ranges or redundant values. Rewrite it?"
msgstr "커널 옵션에 범위 설정이 포함되었습니다. 재기록 하시겠습니까?"
#. T: Checkbox label
-#: src/include/kdump/uifunctions.rb:1467
+#: src/include/kdump/uifunctions.rb:1482
msgid "Use &Firmware-Assisted Dump"
msgstr ""
#. See FATE#315780
#. See https://www.suse.com/support/kb/doc.php?id=7012786
#. FIXME what about dracut?
-#: src/modules/Kdump.rb:495
+#: src/modules/Kdump.rb:412
msgid ""
"Error updating initrd while calling '%{cmd}'.\n"
"See %{log} for details."
@@ -1370,138 +1396,146 @@
# src/config/modem.y2cc:11 src/modem/complex.ycp:96 src/modem/wizards.ycp:65
# src/modem/wizards.ycp:84
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:605
+#: src/modules/Kdump.rb:514
msgid "Initializing kdump Configuration"
msgstr "Kdump 구성 초기화 중"
#. Progress stage 1/4
#. Progress step 1/4
-#: src/modules/Kdump.rb:614 src/modules/Kdump.rb:622
+#: src/modules/Kdump.rb:523 src/modules/Kdump.rb:531
msgid "Reading the config file..."
msgstr "설정 파일 읽는 중..."
# dialog caption
#. Progress stage 3/4
-#: src/modules/Kdump.rb:616
+#: src/modules/Kdump.rb:525
msgid "Reading kernel boot options..."
msgstr "커널 부팅 옵션 읽는 중..."
-# Progress step
#. Progress stage 4/4
-#. Progress finished 3/4
-#: src/modules/Kdump.rb:618 src/modules/Kdump.rb:626
-msgid "Reading available memory..."
-msgstr "사용가능한 메모리 읽은 중..."
+#: src/modules/Kdump.rb:527
+msgid "Calculating memory limits..."
+msgstr ""
#. Progress step 2/4
-#: src/modules/Kdump.rb:624
+#: src/modules/Kdump.rb:533
msgid "Reading partitions of disks..."
msgstr "디스크 파티션을 읽는 중..."
+# Progress step
+#. Progress finished 3/4
+#: src/modules/Kdump.rb:535
+#, fuzzy
+#| msgid "Reading available memory..."
+msgid "Reading available memory and calibrating usage..."
+msgstr "사용가능한 메모리 읽은 중..."
+
# error report
#. Error message
-#: src/modules/Kdump.rb:638
+#: src/modules/Kdump.rb:547
msgid "Cannot read config file /etc/sysconfig/kdump"
msgstr "/etc/sysconfig/kdump 설정 파일을 읽을 수 없음"
#. Error message
-#: src/modules/Kdump.rb:646
+#: src/modules/Kdump.rb:555
msgid "Cannot read kernel boot options."
msgstr "커널 부팅 옵션을 읽을 수 없습니다."
#. Error message
-#: src/modules/Kdump.rb:653
+#: src/modules/Kdump.rb:563
msgid "Cannot read available memory."
msgstr "사용가능한 메모리를 읽을 수 없습니다."
# src/config/modem.y2cc:11 src/modem/complex.ycp:96 src/modem/wizards.ycp:65
# src/modem/wizards.ycp:84
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:679
+#: src/modules/Kdump.rb:589
msgid "Saving kdump Configuration"
msgstr "Kdump 구성 저장 중"
# translators: progress stage 1/2
#. Progress stage 1/2
-#: src/modules/Kdump.rb:708
+#: src/modules/Kdump.rb:618
msgid "Write the settings"
msgstr "설정 기록"
#. Progress stage 2/2
-#: src/modules/Kdump.rb:710
+#: src/modules/Kdump.rb:620
msgid "Update boot options"
msgstr "부팅 옵션 업데이트"
# translators: progress step 1/1
#. Progress step 1/2
-#: src/modules/Kdump.rb:714
+#: src/modules/Kdump.rb:624
msgid "Writing the settings..."
msgstr "설정을 기록하고 있습니다..."
# progress step
#. Progress step 2/2
-#: src/modules/Kdump.rb:716
+#: src/modules/Kdump.rb:626
msgid "Updating boot options..."
msgstr "부팅 옵션 업데이트 중..."
# progress step
#. Progress finished
-#: src/modules/Kdump.rb:718
+#: src/modules/Kdump.rb:628
msgid "Finished"
msgstr "완료됨"
#. Error message
-#: src/modules/Kdump.rb:728
+#: src/modules/Kdump.rb:638
msgid "Cannot write settings."
msgstr "설정을 기록할 수 없습니다."
#. Error message
-#: src/modules/Kdump.rb:737
+#: src/modules/Kdump.rb:647
msgid "Adding crashkernel parameter to bootloader fault."
msgstr "부트로더에 crashkernel 매개변수를 추가 중입니다."
-#. Create a textual summary and a list of unconfigured cards
+#. Create a textual summary
#. @return summary of the current configuration
-#: src/modules/Kdump.rb:851
+#: src/modules/Kdump.rb:758
msgid "Kdump status: %1"
msgstr "Kdump 상태: %1"
-#: src/modules/Kdump.rb:852
+#: src/modules/Kdump.rb:759
msgid "enabled"
msgstr "활성화"
# translators: service status radio button label
# translators: server module status
-#: src/modules/Kdump.rb:852
+#: src/modules/Kdump.rb:759
msgid "disabled"
msgstr "비활성화"
# To translators: error popup
-#: src/modules/Kdump.rb:859
-msgid "Value of crashkernel option: %1"
+#: src/modules/Kdump.rb:766
+#, fuzzy
+#| msgid "Value of crashkernel option: %1"
+msgid "Value(s) of crashkernel option: %1"
msgstr "crashkernel 옵션의 값: %1"
# button text
-#: src/modules/Kdump.rb:866
+#: src/modules/Kdump.rb:773
msgid "Dump format: %1"
msgstr "덤프 형식: %1"
-#: src/modules/Kdump.rb:873
+#: src/modules/Kdump.rb:780
msgid "Target of dumps: %1"
msgstr "덤프 대상: %1"
-#: src/modules/Kdump.rb:880
+#: src/modules/Kdump.rb:787
msgid "Number of dumps: %1"
msgstr "덤프 수: %1"
#. TRANSLATORS: warning message in installation proposal,
#. do not translate %{requested} and %{available} - they are replaced with actual sizes later
-#: src/modules/Kdump.rb:972
+#: src/modules/Kdump.rb:879
msgid "Warning! There might not be enough free space. %{required} required, but only %{available} are available."
msgstr ""
#. Trying to use fadump on unsupported hardware
-#: src/modules/Kdump.rb:1065
+#: src/modules/Kdump.rb:974
msgid ""
"Cannot use Firmware-assisted dump.\n"
"It is not supported on this hardware."
Modified: trunk/yast/ko/po/ncurses-pkg.ko.po
===================================================================
--- trunk/yast/ko/po/ncurses-pkg.ko.po 2015-10-01 11:24:45 UTC (rev 92952)
+++ trunk/yast/ko/po/ncurses-pkg.ko.po 2015-10-01 11:24:47 UTC (rev 92953)
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: ncurses-pkg.ko\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2014-01-13 01:34+0900\n"
"Last-Translator: Yunseok Choi \n"
"Language-Team: Korean \n"
@@ -95,7 +95,7 @@
#. add the Cancel button
#. begin: the label of the Cancel button
#: src/NCPackageSelector.cc:1717 src/NCPackageSelector.cc:1836
-#: src/NCPkgStrings.cc:684
+#: src/NCPkgStrings.cc:691
msgid "&Cancel"
msgstr "취소(&C)"
@@ -104,7 +104,7 @@
#. add the OK button
#. the label of an Accept button
#: src/NCPackageSelector.cc:1722 src/NCPackageSelector.cc:1841
-#: src/NCPkgStrings.cc:698
+#: src/NCPkgStrings.cc:705
msgid "&Accept"
msgstr "적용(&A)"
@@ -1194,38 +1194,45 @@
msgid "&OK"
msgstr "확인(&O)"
+#. begin: the label of the Contiunue button
+#: src/NCPkgStrings.cc:684
+#, fuzzy
+#| msgid "&Continue anyway"
+msgid "C&ontinue"
+msgstr "계속 진행(&C)"
+
# Button label
#. the label of the Yes button
-#: src/NCPkgStrings.cc:691
+#: src/NCPkgStrings.cc:698
msgid "&Yes"
msgstr "예(&Y)"
# Button label
#. the label of the No button
-#: src/NCPkgStrings.cc:705
+#: src/NCPkgStrings.cc:712
msgid "&No"
msgstr "아니요(&N)"
#. the label of the Solve button - 'try again' implies that user
#. has to make some action (#213602)
-#: src/NCPkgStrings.cc:713
+#: src/NCPkgStrings.cc:720
msgid "&OK -- Try Again"
msgstr "확인 - 재시도(&O)"
#. text for a Notify popup
-#: src/NCPkgStrings.cc:721
+#: src/NCPkgStrings.cc:728
#, fuzzy
#| msgid "<p>All changes in package, patch or pattern selection will be lost.<br>Really exit?</p>"
msgid "<p>All changes in the package, patch or pattern selection will be lost.<br>Really exit?</p>"
msgstr "<p>취소하고 나가면 패치또는 패턴 선택 꾸러미 모두 취소됩니다.<br>정말 나가시겠습니까?</p>"
#. the label of language table
-#: src/NCPkgStrings.cc:729
+#: src/NCPkgStrings.cc:736
msgid "Available Languages"
msgstr "사용가능한 언어"
#. the label of language table
-#: src/NCPkgStrings.cc:736
+#: src/NCPkgStrings.cc:743
msgid "Available Repositories"
msgstr "사용가능한 저장소"
@@ -1233,7 +1240,7 @@
#. (the list shows all patches which are needed)
#. static const std::string value = _( "Installable Patches" );
#. static const std::string value = _( "Relevant Patches" );
-#: src/NCPkgStrings.cc:746
+#: src/NCPkgStrings.cc:753
msgid "Needed Patches"
msgstr "필요한 패치"
@@ -1241,65 +1248,84 @@
# (the list shows all patches which are already installed)
#. A label for a list of YOU Patches - keep it short - max. 25 chars!
#. (the list shows all patches which are already installed)
-#: src/NCPkgStrings.cc:754
+#: src/NCPkgStrings.cc:761
msgid "Installed Patches"
msgstr "설치된 패치"
# A common label for a list of YOU Patches - keep it short - max. 25 chars!
#. A common label for a list of YOU Patches - keep it short - max. 25 chars!
-#: src/NCPkgStrings.cc:762
+#: src/NCPkgStrings.cc:769
msgid "Online Update Patches"
msgstr "온라인 업데이트 패치"
# the label Filter: Update Problem ( keep it short - max. 25 chars )
#. the label Filter: Update Problem ( keep it short - max. 25 chars )
-#: src/NCPkgStrings.cc:769
+#: src/NCPkgStrings.cc:776
msgid "Update Problem -- see help"
msgstr "업데이트 문제 -- 도움말을 보십시오"
# the label for Filter: Search results
#. the label for Filter: Search results
-#: src/NCPkgStrings.cc:776
+#: src/NCPkgStrings.cc:783
msgid "Search Results"
msgstr "검색 결과"
# the headline of the dependency popup
#. the headline of the dependency popup
-#: src/NCPkgStrings.cc:783
+#: src/NCPkgStrings.cc:790
msgid "Package Dependencies"
msgstr "꾸러미 의존성"
#. help text package status
-#: src/NCPkgStrings.cc:790
+#: src/NCPkgStrings.cc:797
msgid "<b>Update Problem List</b><br><p>The packages in the list cannot be updated automatically.</p><p>Possible reasons:</p><p>They are obsoleted by other packages.</p><p>There is no newer version to which to update on any installation media.</p><p>They are third-party packages</p><p>Manually select what to do with them. The safest course of action is to delete them.</p>"
msgstr "<b>업데이트 문제 리스트</b><br><p>이 꾸러미는 자동적으로 업데이트될 수 없습니다.</p><p>가능한 이유:</p><p>이것은 다른 꾸러미에 안 쓰입니다.</p><p>다른 미디어에서 업데이트할 수 있는 새로운 버전이 없습니다.</p><p>이것들은 third-party꾸러미입니다.</p><p>어떻게 할 것인지 수동적으로 고르십시오. 가장 안전한 방법은 지우는 것입니다.</p>"
#. column header source RPM installation (keep it short!)
-#: src/NCPkgStrings.cc:797
+#: src/NCPkgStrings.cc:804
msgid "Source"
msgstr "소스"
# end: menu items of the filter menu
#. menu entry Update List
-#: src/NCPkgStrings.cc:805
+#: src/NCPkgStrings.cc:812
msgid "&Update List"
msgstr "업데이트 목록(&U)"
# part of the patch description
#. part of the patch description
-#: src/NCPkgStrings.cc:812
+#: src/NCPkgStrings.cc:819
msgid "<b>Patch: </b>"
msgstr "<b>패치: </b>"
#. info line is shown if YOU patch list is empty
-#: src/NCPkgStrings.cc:819
+#: src/NCPkgStrings.cc:826
msgid "No patches available"
msgstr "사용 가능한 패치가 없습니다."
# a pre script (included in a YOU patch)
-#: src/NCPkgStrings.cc:825
+#: src/NCPkgStrings.cc:832
msgid "Script"
msgstr "스크립트"
+# Dialog title
+#: src/NCPkgStrings.cc:838
+#, fuzzy
+#| msgid "Package Versions"
+msgid "Incompatible Package Versions"
+msgstr "꾸러미 버전"
+
+#: src/NCPkgStrings.cc:845
+msgid "<p>You are trying to install multiversion-capable and non-multiversion-capable versions of this package at the same time.</p>"
+msgstr ""
+
+#: src/NCPkgStrings.cc:854
+msgid "<p>This version is multiversion-capable.</p><p>Press \"Continue\" to install this version and unselect the non-multiversion-capable version, \"Cancel\" to unselect this version and keep the other one.</p>"
+msgstr ""
+
+#: src/NCPkgStrings.cc:864
+msgid "<p>This version is not multiversion-capable.</p><p>Press \"Continue\" to install only this version and unselect all other versions, \"Cancel\" to unselect this version and keep the other ones.<p>"
+msgstr ""
+
#~ msgid "----- this patch is broken !!! -----"
#~ msgstr "----- 이 패치는 손상되었습니다!!! -----"
Modified: trunk/yast/ko/po/qt-pkg.ko.po
===================================================================
--- trunk/yast/ko/po/qt-pkg.ko.po 2015-10-01 11:24:45 UTC (rev 92952)
+++ trunk/yast/ko/po/qt-pkg.ko.po 2015-10-01 11:24:47 UTC (rev 92953)
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: qt-pkg.ko\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2009-11-03 12:10+0900\n"
"Last-Translator: Yunseok Choi \n"
"Language-Team: Korean \n"
@@ -50,7 +50,7 @@
# DEBUG
#. DEBUG
-#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:113
+#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:114
msgid "&Keywords"
msgstr "키워드(&K)"
@@ -93,8 +93,8 @@
#: src/YQPackageSelectorBase.cc:249 src/YQPackageSelectorBase.cc:305
#: src/YQPackageSelectorBase.cc:326 src/YQPatternSelector.cc:259
#: src/YQPkgConflictDialog.cc:163 src/YQPkgConflictDialog.cc:398
-#: src/YQPkgSearchFilterView.cc:245 src/YQPkgTextDialog.cc:258
-#: src/YQPkgVersionsView.cc:429 src/YQSimplePatchSelector.cc:219
+#: src/YQPkgSearchFilterView.cc:249 src/YQPkgTextDialog.cc:258
+#: src/YQPkgVersionsView.cc:413 src/YQSimplePatchSelector.cc:219
msgid "&Cancel"
msgstr "취소(&C)"
@@ -398,7 +398,7 @@
msgstr "수동으로 추가 선택한 다음 꾸러미는 의존성을 해결하기 위해 변경되었습니다:"
#: src/YQPackageSelectorBase.cc:305 src/YQPackageSelectorBase.cc:326
-#: src/YQPkgConflictDialog.cc:397 src/YQPkgVersionsView.cc:428
+#: src/YQPkgConflictDialog.cc:397 src/YQPkgVersionsView.cc:412
msgid "C&ontinue"
msgstr "계속(&O)"
@@ -1373,15 +1373,11 @@
msgid "Unmaintained Packages"
msgstr "중요하지 않은 꾸러미"
-#. horizontal
-#. vertical
-#: src/YQPkgRepoFilterView.cc:180
+#: src/YQPkgRepoFilterView.cc:177
msgid "Search"
msgstr "검색"
-#. horizontal
-#. vertical
-#: src/YQPkgRepoFilterView.cc:199
+#: src/YQPkgRepoFilterView.cc:192
msgid "Installation Summary"
msgstr "설치요약"
@@ -1397,88 +1393,88 @@
msgstr "zzz 모두"
#. Search button
-#: src/YQPkgSearchFilterView.cc:92
+#: src/YQPkgSearchFilterView.cc:93
msgid "&Search"
msgstr "검색(&S)"
#.
#. Where to search
#.
-#: src/YQPkgSearchFilterView.cc:105
+#: src/YQPkgSearchFilterView.cc:106
msgid "Search in"
msgstr "검색 대상"
# src/isdn/complex.ycp:266 src/modem/complex.ycp:207
# src/provider/complex.ycp:186
-#: src/YQPkgSearchFilterView.cc:111
+#: src/YQPkgSearchFilterView.cc:112
#, fuzzy
#| msgid "Name"
msgid "Nam&e"
msgstr "이름"
-#: src/YQPkgSearchFilterView.cc:115
+#: src/YQPkgSearchFilterView.cc:116
msgid "Su&mmary"
msgstr "요약정보(&M)"
-#: src/YQPkgSearchFilterView.cc:117
+#: src/YQPkgSearchFilterView.cc:118
msgid "Descr&iption"
msgstr "상세설명(&I)"
# label of a combo box (search popup)
-#: src/YQPkgSearchFilterView.cc:122
+#: src/YQPkgSearchFilterView.cc:123
#, fuzzy
#| msgid "RPM Provides"
msgid "RPM \"P&rovides\""
msgstr "RPM 제공자"
# tree node string
-#: src/YQPkgSearchFilterView.cc:124
+#: src/YQPkgSearchFilterView.cc:125
#, fuzzy
#| msgid "RPM Requires"
msgid "RPM \"Re&quires\""
msgstr "RPM에 필요한것들"
-#: src/YQPkgSearchFilterView.cc:127
+#: src/YQPkgSearchFilterView.cc:128
msgid "File list"
msgstr "파일 목록"
#.
#. Search mode
#.
-#: src/YQPkgSearchFilterView.cc:142
+#: src/YQPkgSearchFilterView.cc:143
msgid "Search &Mode:"
msgstr "검색 모드(&M):"
#. Caution: combo box items must be inserted in the same order as enum SearchMode!
-#: src/YQPkgSearchFilterView.cc:155
+#: src/YQPkgSearchFilterView.cc:156
msgid "Contains"
msgstr "포함 문자"
-#: src/YQPkgSearchFilterView.cc:156
+#: src/YQPkgSearchFilterView.cc:157
msgid "Begins with"
msgstr "시작 문자"
-#: src/YQPkgSearchFilterView.cc:157
+#: src/YQPkgSearchFilterView.cc:158
msgid "Exact Match"
msgstr "정확히 일치"
-#: src/YQPkgSearchFilterView.cc:158
+#: src/YQPkgSearchFilterView.cc:159
msgid "Use Wild Cards"
msgstr "와일드카드 사용"
-#: src/YQPkgSearchFilterView.cc:159
+#: src/YQPkgSearchFilterView.cc:160
msgid "Use Regular Expression"
msgstr "정규식 사용"
-#: src/YQPkgSearchFilterView.cc:166
+#: src/YQPkgSearchFilterView.cc:167
msgid "Case Sensiti&ve"
msgstr "민감한 경우(&V)"
-#: src/YQPkgSearchFilterView.cc:244
+#: src/YQPkgSearchFilterView.cc:248
msgid "Searching..."
msgstr "검색(&S)..."
-#: src/YQPkgSearchFilterView.cc:330
+#: src/YQPkgSearchFilterView.cc:334
msgid "No Results."
msgstr "결과 없음."
@@ -1487,7 +1483,7 @@
#. if it's a user error (e.g., syntax error in regular expression) or
#. an internal error. But there is a "Details" button that will return
#. the original (translated) error message.
-#: src/YQPkgSearchFilterView.cc:345
+#: src/YQPkgSearchFilterView.cc:349
msgid "Query Error"
msgstr "쿼리 오류"
@@ -1636,14 +1632,14 @@
msgstr "제조사 %3 으로부터 %1-%2 (설치됨)"
#. Translators: Popup dialog text. Try to keep the lines about the same length.
-#: src/YQPkgVersionsView.cc:398
+#: src/YQPkgVersionsView.cc:382
msgid ""
"You are trying to install multiversion-capable\n"
"and non-multiversion-capable versions of this\n"
"package at the same time."
msgstr ""
-#: src/YQPkgVersionsView.cc:406
+#: src/YQPkgVersionsView.cc:390
msgid ""
"This version is multiversion-capable.\n"
"\n"
@@ -1652,7 +1648,7 @@
"\"Cancel\" to unselect this version and keep the other one."
msgstr ""
-#: src/YQPkgVersionsView.cc:415
+#: src/YQPkgVersionsView.cc:399
msgid ""
"This version is not multiversion-capable.\n"
"\n"
@@ -1663,7 +1659,7 @@
# Dialog title
#. Dialog heading
-#: src/YQPkgVersionsView.cc:423
+#: src/YQPkgVersionsView.cc:407
#, fuzzy
#| msgid "Package Versions"
msgid "Incompatible Package Versions"
@@ -1678,11 +1674,11 @@
#. 3.17.4-i386 from openSUSE-11.1 update repository with priority 20 and vendor openSUSE
#. ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^
#. %1 %2 %3 %4 %5
-#: src/YQPkgVersionsView.cc:549 src/YQPkgVersionsView.cc:586
+#: src/YQPkgVersionsView.cc:533 src/YQPkgVersionsView.cc:570
msgid "%1-%2 from %3 with priority %4 and vendor %5"
msgstr "우선권 %4 과(와) 제조사 %5 와 함께 %3 으로부터 %1-%2 "
-#: src/YQPkgVersionsView.cc:570
+#: src/YQPkgVersionsView.cc:554
msgid "This version is installed in your system."
msgstr "이 버전은 이 시스템에 설치되어 있습니다."
Modified: trunk/yast/ko/po/registration.ko.po
===================================================================
--- trunk/yast/ko/po/registration.ko.po 2015-10-01 11:24:45 UTC (rev 92952)
+++ trunk/yast/ko/po/registration.ko.po 2015-10-01 11:24:47 UTC (rev 92953)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: registration.ko\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-27 10:52+0200\n"
+"POT-Creation-Date: 2015-09-28 18:17+0200\n"
"PO-Revision-Date: 2009-10-12 01:22+0900\n"
"Last-Translator: Yunseok Choi \n"
"Language-Team: Korean \n"
@@ -73,7 +73,7 @@
#: src/clients/inst_scc.rb:186
#: src/lib/registration/ui/autoyast_config_dialog.rb:104
#: src/lib/registration/ui/base_system_registration_dialog.rb:48
-#: src/lib/registration/ui/migration_repos_workflow.rb:270
+#: src/lib/registration/ui/migration_repos_workflow.rb:287
#: src/lib/registration/ui/registered_system_dialog.rb:37
#: src/lib/registration/ui/registration_update_dialog.rb:41
#, fuzzy
@@ -118,8 +118,8 @@
#. %s is name of given product
#. then register the product(s)
#. %s is name of given product
-#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:247
-#: src/lib/registration/registration_ui.rb:277
+#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:281
+#: src/lib/registration/registration_ui.rb:311
#, fuzzy
#| msgid "Registration Code"
msgid "Registering %s ..."
@@ -394,24 +394,36 @@
msgid "Details: %s"
msgstr "세부 사항..."
+#. TRANSLATORS: multiline error message - a SSL certificate has been
+#. imported but the registration server still cannot be accessed securely,
+#. user has to solve the certificate issue manually.
+#: src/lib/registration/connect_helpers.rb:226
+msgid ""
+"A certificate has been already imported\n"
+"but the server connection still cannot be trusted.\n"
+"\n"
+"Please fix the certificate issue manually, ensure that the server\n"
+"can be connected securely and start the YaST module again."
+msgstr ""
+
#. progress label
-#: src/lib/registration/connect_helpers.rb:222
+#: src/lib/registration/connect_helpers.rb:238
msgid "Importing the SSL certificate"
msgstr ""
-#: src/lib/registration/connect_helpers.rb:223
+#: src/lib/registration/connect_helpers.rb:239
msgid "Importing '%s' certificate..."
msgstr ""
#. try to use a translatable message first, if not found then use
#. the original error message from openSSL
-#: src/lib/registration/connect_helpers.rb:244
+#: src/lib/registration/connect_helpers.rb:260
msgid "Secure connection error: %s"
msgstr ""
#. TRANSLATORS: error message, %s is a server URL,
#. e.g. https://smt.example.com
-#: src/lib/registration/connect_helpers.rb:263
+#: src/lib/registration/connect_helpers.rb:279
msgid ""
"An old registration server was detected at\n"
"%s.\n"
@@ -449,19 +461,31 @@
#. FIXME: reused an existing message due to text freeze
#. (later use a better text, it's system update actually...)
#: src/lib/registration/registration_ui.rb:80
-#: src/lib/registration/registration_ui.rb:233
+#: src/lib/registration/registration_ui.rb:267
msgid "Registering the System..."
msgstr ""
#. updating base product registration, %s is a new base product name
+#. updating product registration, %s is a product name
#. updating registered addon/extension, %s is an extension name
+#. TRANSLATORS: Progress label
#: src/lib/registration/registration_ui.rb:106
-#: src/lib/registration/registration_ui.rb:312
+#: src/lib/registration/registration_ui.rb:146
+#: src/lib/registration/registration_ui.rb:346
+#: src/lib/registration/ui/migration_repos_workflow.rb:304
#, fuzzy
#| msgid "Updating /etc/hosts ..."
msgid "Updating to %s ..."
msgstr "/etc/hosts 업데이트 중..."
+# src/clients/lan_auto.ycp:58
+#. TRANSLATORS: progress label
+#: src/lib/registration/registration_ui.rb:163
+#, fuzzy
+#| msgid "Loading configuration %1..."
+msgid "Synchronizing Products..."
+msgstr "구성 %1 불러오는 중..."
+
# dialog caption
#. load available addons from SCC server
#. the result is cached to avoid reloading when going back and forth in the
@@ -469,15 +493,15 @@
#. @return [ArrayRegistration::Addon] available addons
#. download the addons from SCC, let the user select addons to install
#. @return [Symbol] the user input
-#: src/lib/registration/registration_ui.rb:143
-#: src/lib/registration/ui/autoyast_config_workflow.rb:109
+#: src/lib/registration/registration_ui.rb:177
+#: src/lib/registration/ui/autoyast_config_workflow.rb:106
#, fuzzy
#| msgid "Registration Module Help"
msgid "Loading Available Extensions and Modules..."
msgstr "등록 모듈 도움말"
# src/clients/lan_auto.ycp:58
-#: src/lib/registration/registration_ui.rb:157
+#: src/lib/registration/registration_ui.rb:191
#, fuzzy
#| msgid "Loading configuration %1..."
msgid "Loading Migration Products..."
@@ -485,21 +509,21 @@
# dialog caption
#. dialog title
-#: src/lib/registration/registration_ui.rb:174
+#: src/lib/registration/registration_ui.rb:208
#, fuzzy
#| msgid "Registration Module Help"
msgid "Register Extensions and Modules"
msgstr "등록 모듈 도움말"
#. help text
-#: src/lib/registration/registration_ui.rb:178
+#: src/lib/registration/registration_ui.rb:212
#, fuzzy
#| msgid "<p>Please wait, while volumes are being detected.</p>"
msgid "<p>Extensions and Modules are being registered.</p>"
msgstr "<p>볼륨을 감지하는 중입니다. 기다려 주세요.</p>"
#. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:203
+#: src/lib/registration/registration_ui.rb:237
#, fuzzy
#| msgid "Use custom registration server "
msgid ""
@@ -509,20 +533,24 @@
# popup text
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:207
+#: src/lib/registration/registration_ui.rb:241
#, fuzzy
#| msgid ""
#| "Would you like to use these mount points\n"
#| "for your new installation?"
-msgid "Would you like to enable these repositories during installation\n"
+msgid ""
+"Would you like to enable these repositories during installation\n"
+"in order to receive the latest updates?"
msgstr "새롭게 설치하기 위해, 이 마운트 포인트를 사용하시겠습니까?"
#. Yast::Mode.update
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:211
+#: src/lib/registration/registration_ui.rb:245
#, fuzzy
#| msgid "Would you like to open this profile in editing mode?"
-msgid "Would you like to enable these repositories during upgrade\n"
+msgid ""
+"Would you like to enable these repositories during upgrade\n"
+"in order to receive the latest updates?"
msgstr "이 프로파일을 편집 모드에서 여시겠습니까?"
#. indent size used in summary text
@@ -532,10 +560,21 @@
msgid "Certificate:"
msgstr "SMT 인증서"
+#. TRANSLATORS: error popup, %s is a repository name, the popup is displayed
+#. when a migration repository cannot be accessed, there are [Skip]
+#. and [Abort] buttons displayed below the question
+#: src/lib/registration/sw_mgmt.rb:97
+msgid ""
+"Repository '%s'\n"
+"cannot be loaded.\n"
+"\n"
+"Skip the repository or abort?"
+msgstr ""
+
#. create UI label for a base product
#. @param base_product [Hash] Product (hash from pkg-bindings)
#. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:147
+#: src/lib/registration/sw_mgmt.rb:192
#, fuzzy
#| msgid "Unknown error"
msgid "Unknown product"
@@ -544,7 +583,7 @@
# progress stages
#. error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:174 src/lib/registration/sw_mgmt.rb:248
+#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:292
#, fuzzy
#| msgid "Starting registration..."
msgid "Saving repository configuration failed."
@@ -552,27 +591,27 @@
#. # error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:212 src/lib/registration/sw_mgmt.rb:223
+#: src/lib/registration/sw_mgmt.rb:256 src/lib/registration/sw_mgmt.rb:267
msgid "Updating service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:218
+#: src/lib/registration/sw_mgmt.rb:262
msgid "Adding service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:230
+#: src/lib/registration/sw_mgmt.rb:274
msgid "Saving service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:235
+#: src/lib/registration/sw_mgmt.rb:279
msgid "Refreshing service '%s' failed."
msgstr ""
#. TRANSLATORS: %s is a product name
-#: src/lib/registration/sw_mgmt.rb:438
+#: src/lib/registration/sw_mgmt.rb:486
#, fuzzy
#| msgid "No product found in the repository"
msgid ""
@@ -1066,8 +1105,17 @@
msgid "&Local Registration Server URL"
msgstr "로컬 등록 서버"
+#. TRANSLATORS: error message, %s are details
+#. TRANSLATORS: error message, %s are details
+#: src/lib/registration/ui/media_addon_workflow.rb:95
+#: src/lib/registration/ui/wizard_client.rb:57
+#, fuzzy
+#| msgid "Internal error"
+msgid "Internal error: %s"
+msgstr "내부 오류"
+
#. register the base system if not already registered
-#: src/lib/registration/ui/media_addon_workflow.rb:130
+#: src/lib/registration/ui/media_addon_workflow.rb:132
msgid ""
"The base system has to be registered in order to register the '%s' add-on.\n"
"Skip the base system and the add-on registration?"
@@ -1075,22 +1123,21 @@
#. TRANSLATORS: dialog title
#: src/lib/registration/ui/migration_repos_selection_dialog.rb:47
-#, fuzzy
-#| msgid "&List of Repositories"
-msgid "Migration Repositories"
-msgstr "저장소 목록(&L)"
+msgid "Repositories used for Migration"
+msgstr ""
#. TRANSLATORS: help text
#: src/lib/registration/ui/migration_repos_selection_dialog.rb:50
msgid "<p>In this dialog you can manually select which repositories willbe used for online migration. The packages will be upgraded to thehighest version found in the selected repositories.</p>"
msgstr ""
+# ComboBox label
#. TRANSLATORS: Multiselection widget label
#: src/lib/registration/ui/migration_repos_selection_dialog.rb:85
#, fuzzy
-#| msgid "Di&rectory to Contain Repositories:"
-msgid "Select the Migration Repositories"
-msgstr "저장소를 포함할 디렉터리(&R):"
+#| msgid "Select the new target architecture."
+msgid "Select the Repositories used for Migration"
+msgstr "새 대상 구조를 선택하세요."
# Progress step 2/3
#. TRANSLATORS: Push button label, starts the repository management module
@@ -1115,82 +1162,63 @@
msgid "Priority: %s"
msgstr "우선 순위"
-#. a dummy message which will be used later, just make sure we have it
-#. before the translation deadline...
-#. TRANSLATORS: popup question, confirm installing the available
-#. updates now
-#: src/lib/registration/ui/migration_repos_workflow.rb:50
+#. TRANSLATORS: a popup message with [Continue] [Cancel] buttons,
+#. pressing [Continue] starts the registration module, [Cancel] aborts
+#. the online migration
+#: src/lib/registration/ui/migration_repos_workflow.rb:145
msgid ""
-"Online updates are available for installation.\n"
-"It is recommended to install all updates before proceeding.\n"
-"\n"
-"Would you like to install the updates now?"
+"The system is not registered,\n"
+"to run the online migration you need\n"
+"to register the system first."
msgstr ""
-#. TRANSLATORS: error message, %s are details
-#: src/lib/registration/ui/migration_repos_workflow.rb:86
-#, fuzzy
-#| msgid "Internal error"
-msgid "Internal error: %s"
-msgstr "내부 오류"
-
#. TRANSLATORS: Error message
-#: src/lib/registration/ui/migration_repos_workflow.rb:170
+#: src/lib/registration/ui/migration_repos_workflow.rb:183
msgid "No installed product found."
msgstr ""
# transltors: command line help text for the Xcd-creator module
#. TRANSLATORS: Error message
-#: src/lib/registration/ui/migration_repos_workflow.rb:199
+#: src/lib/registration/ui/migration_repos_workflow.rb:212
#, fuzzy
#| msgid "Configuration of Product creator"
msgid "No migration product found."
msgstr "제품 제작기의 구성"
-# dialog caption
-#. TRANSLATORS: Progress label
-#: src/lib/registration/ui/migration_repos_workflow.rb:246
-#, fuzzy
-#| msgid "Registration Code"
-msgid "Registering Migration Products..."
-msgstr "등록 코드"
-
# Progress step 2/3
#. TRANSLATORS: progress message
-#: src/lib/registration/ui/migration_repos_workflow.rb:272
+#: src/lib/registration/ui/migration_repos_workflow.rb:289
#, fuzzy
#| msgid "Saving Repositories..."
msgid "Preparing Migration Repositories..."
msgstr "저장소 저장 중..."
#. TRANSLATORS: dialog title
-#: src/lib/registration/ui/migration_selection_dialog.rb:61
+#: src/lib/registration/ui/migration_selection_dialog.rb:62
#, fuzzy
#| msgid "Select the Mount Point"
msgid "Select the Migration Target"
msgstr "마운트 포인트 선택"
#. TRANSLATORS: help text (1/3)
-#: src/lib/registration/ui/migration_selection_dialog.rb:64
+#: src/lib/registration/ui/migration_selection_dialog.rb:65
msgid "<p>Here you can select the migration target products. The registrationserver may offer several possible migration to new products.</p>"
msgstr ""
#. TRANSLATORS: help text (2/3)
-#: src/lib/registration/ui/migration_selection_dialog.rb:67
+#: src/lib/registration/ui/migration_selection_dialog.rb:68
msgid "<p>Only one migration target from the list can be selected.</p>"
msgstr ""
#. TRANSLATORS: help text (3/3), %s is replaced by the (translated) check box label
-#: src/lib/registration/ui/migration_selection_dialog.rb:69
+#: src/lib/registration/ui/migration_selection_dialog.rb:70
#, fuzzy
#| msgid "<p>Use <b>Edit</b> to change selected image configuration or create the image.</p>"
msgid "<p>Use the <b>%s</b> check box to manually select the migration repositories later.</p>"
msgstr "<p><b>편집</b> 을 사용하여 선택한 이미지 구성이나 이미지 만들기를 변경합니다.</p>"
# message popup
-#. TRANSLATORS: check button label
-#: src/lib/registration/ui/migration_selection_dialog.rb:70
-#: src/lib/registration/ui/migration_selection_dialog.rb:139
+#: src/lib/registration/ui/migration_selection_dialog.rb:71
#, fuzzy
#| msgid "Add all selected online repositories"
msgid "Manually Select Migration Repositories"
@@ -1198,22 +1226,27 @@
# ComboBox label
#. TRANSLATORS: error popup, no target migration is selected
-#: src/lib/registration/ui/migration_selection_dialog.rb:96
+#: src/lib/registration/ui/migration_selection_dialog.rb:97
#, fuzzy
#| msgid "Select the new target architecture."
msgid "Select the target migration."
msgstr "새 대상 구조를 선택하세요."
+#. TRANSLATORS: check button label
+#: src/lib/registration/ui/migration_selection_dialog.rb:138
+msgid "Manually Adjust the Repositories for Migration"
+msgstr ""
+
# rich text item
#. TRANSLATORS: selection box label
-#: src/lib/registration/ui/migration_selection_dialog.rb:151
+#: src/lib/registration/ui/migration_selection_dialog.rb:153
#, fuzzy
#| msgid "Possible &Solutions"
msgid "Possible Migration Targets"
msgstr "가능한 해결책(&S)"
#. TRANSLATORS: RichText header (details for the selected item)
-#: src/lib/registration/ui/migration_selection_dialog.rb:189
+#: src/lib/registration/ui/migration_selection_dialog.rb:191
#, fuzzy
#| msgid "Configuration Summary"
msgid "Migration Summary"
@@ -1225,14 +1258,14 @@
#. using the selected migration.
#. %{url} is the URL of the registration server (SMT)
#. %{product} is a full product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:212
+#: src/lib/registration/ui/migration_selection_dialog.rb:214
msgid "ERROR: Product <b>%{product}</b> is not available at the registration server (%{url}). Make the product available to allow using this migration."
msgstr ""
#. this is rather a theoretical case, but anyway....
#. TRANSLATORS: Summary message, rich text format
#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64"
-#: src/lib/registration/ui/migration_selection_dialog.rb:223
+#: src/lib/registration/ui/migration_selection_dialog.rb:225
#, fuzzy
#| msgid "Package %1 will be installed."
msgid "%s <b>will be installed.</b>"
@@ -1240,25 +1273,25 @@
#. TRANSLATORS: Summary message, rich text format
#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:240
+#: src/lib/registration/ui/migration_selection_dialog.rb:242
msgid "%s <b>stays unchanged.</b>"
msgstr ""
#. TRANSLATORS: Summary message, rich text format
#. %{old_product} is a product name, e.g. "SUSE Linux Enterprise Server 12"
#. %{new_product} is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64"
-#: src/lib/registration/ui/migration_selection_dialog.rb:250
+#: src/lib/registration/ui/migration_selection_dialog.rb:252
msgid "%{old_product} <b>will be upgraded to</b> %{new_product}."
msgstr ""
#. TRANSLATORS: Summary message, rich text format
#. %{old_product} and %{new_product} are product names
-#: src/lib/registration/ui/migration_selection_dialog.rb:255
+#: src/lib/registration/ui/migration_selection_dialog.rb:257
msgid "%{old_product} <b>will be downgraded to</b> %{new_product}."
msgstr ""
#. TRANSLATORS: an error popup message
-#: src/lib/registration/ui/migration_selection_dialog.rb:285
+#: src/lib/registration/ui/migration_selection_dialog.rb:290
msgid ""
"The selected migration contains a product\n"
"which is not available at the registration server.\n"
@@ -1328,6 +1361,22 @@
msgstr "로컬 등록 서버 사용"
#, fuzzy
+#~| msgid "&List of Repositories"
+#~ msgid "Migration Repositories"
+#~ msgstr "저장소 목록(&L)"
+
+#, fuzzy
+#~| msgid "Di&rectory to Contain Repositories:"
+#~ msgid "Select the Migration Repositories"
+#~ msgstr "저장소를 포함할 디렉터리(&R):"
+
+# dialog caption
+#, fuzzy
+#~| msgid "Registration Code"
+#~ msgid "Registering Migration Products..."
+#~ msgstr "등록 코드"
+
+#, fuzzy
#~| msgid "SMT Certificate"
#~ msgid "SSL Certificate"
#~ msgstr "SMT 인증서"
Modified: trunk/yast/ko/po/storage.ko.po
===================================================================
--- trunk/yast/ko/po/storage.ko.po 2015-10-01 11:24:45 UTC (rev 92952)
+++ trunk/yast/ko/po/storage.ko.po 2015-10-01 11:24:47 UTC (rev 92953)
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: storage.ko\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-27 10:53+0200\n"
+"POT-Creation-Date: 2015-09-28 18:17+0200\n"
"PO-Revision-Date: 2009-11-04 16:54+0900\n"
"Last-Translator: Yunseok Choi \n"
"Language-Team: Korean \n"
@@ -1138,7 +1138,7 @@
# popup text
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:246
+#: src/include/partitioning/custom_part_check_generated.rb:251
msgid ""
"You have not assigned a root partition for\n"
"installation. This does not work. Assign the root mount point \"/\" to a\n"
@@ -1154,7 +1154,7 @@
# popup text
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:259
+#: src/include/partitioning/custom_part_check_generated.rb:264
#, fuzzy
#| msgid ""
#| "You tried to mount a fat partition to one of\n"
@@ -1179,7 +1179,7 @@
# popup text
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:272
+#: src/include/partitioning/custom_part_check_generated.rb:277
#, fuzzy
#| msgid ""
#| "You tried to mount a fat partition to the\n"
@@ -1202,7 +1202,7 @@
# popup text
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:286
+#: src/include/partitioning/custom_part_check_generated.rb:291
#, fuzzy
#| msgid ""
#| "You tried to mount a fat partition to the\n"
@@ -1223,9 +1223,20 @@
"\n"
"정말 이 설정을 사용하시겠습니까?\n"
+#. A PReP/CHRP partition is not supposed to be mounted. So if we find any
+#. other /boot partition, we should warn the user.
+#: src/include/partitioning/custom_part_check_generated.rb:305
+msgid ""
+"Warning:\n"
+"Your system needs a boot partition with type 0x41 PReP/CHRP.\n"
+"Please, consider creating one.\n"
+"\n"
+"Really use this setup?\n"
+msgstr ""
+
# popup text %1 is a number
#. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:301
+#: src/include/partitioning/custom_part_check_generated.rb:320
msgid ""
"Warning:\n"
"Your boot partition ends above cylinder %1.\n"
@@ -1247,7 +1258,7 @@
# popup text
#. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:321
+#: src/include/partitioning/custom_part_check_generated.rb:340
#, fuzzy
#| msgid ""
#| "Warning:\n"
@@ -1269,7 +1280,7 @@
"정말 이 크기를 부트 파티션으로 사용하시겠습니까?\n"
#. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:338
+#: src/include/partitioning/custom_part_check_generated.rb:357
msgid ""
"Warning: There is no partition of type bios_grub present.\n"
"Such a partition is recommended (required with Btrfs) when Grub2 is\n"
@@ -1284,7 +1295,7 @@
#. popup text
#. If the user chooses 'no' here, the system will not be able to
#. boot from the hard drive!
-#: src/include/partitioning/custom_part_check_generated.rb:360
+#: src/include/partitioning/custom_part_check_generated.rb:377
#, fuzzy
#| msgid ""
#| "Warning: There is no partition mounted as /boot.\n"
@@ -1297,9 +1308,8 @@
msgid ""
"Warning: There is no partition mounted as /boot.\n"
"To boot from your hard disk, a small /boot partition\n"
-"(approx. %1) is required. Consider creating one.\n"
-"Partitions assigned to /boot will automatically be changed to\n"
-"type 0x41 PReP/CHRP.\n"
+"(approx. %1) is required. Consider creating one\n"
+"with type 0x41 PReP/CHRP.\n"
"\n"
"Really use the setup without /boot partition?\n"
msgstr ""
@@ -1313,7 +1323,7 @@
# popup text
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:380
+#: src/include/partitioning/custom_part_check_generated.rb:396
msgid ""
"Warning: According to your setup, you intend to\n"
"boot your machine from the root partition (/), which, unfortunately,\n"
@@ -1333,7 +1343,7 @@
"\n"
"정말 이 설정을 사용하시겠습니까?\n"
-#: src/include/partitioning/custom_part_check_generated.rb:400
+#: src/include/partitioning/custom_part_check_generated.rb:416
msgid ""
"Warning: Some subvolumes of the root filesystem are shadowed by\n"
"mount points of other filesystem. This could lead to problems.\n"
@@ -1342,7 +1352,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:417
+#: src/include/partitioning/custom_part_check_generated.rb:433
msgid ""
"Warning: With your current setup, your %1\n"
"installation might not be directly bootable, because\n"
@@ -1360,7 +1370,7 @@
# popup text
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:435
+#: src/include/partitioning/custom_part_check_generated.rb:451
#, fuzzy
#| msgid ""
#| "Warning: With your current setup, your %2 installation\n"
@@ -1398,7 +1408,7 @@
# popup text
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:457
+#: src/include/partitioning/custom_part_check_generated.rb:473
#, fuzzy
#| msgid ""
#| "Warning: With your current setup, your %2 installation will\n"
@@ -1436,13 +1446,13 @@
# / yes-no popup contents
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:480
+#: src/include/partitioning/custom_part_check_generated.rb:496
msgid "Really use this setup?"
msgstr "정말 이 설정대로 사용하시겠습니까?"
# popup text
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:488
+#: src/include/partitioning/custom_part_check_generated.rb:504
#, fuzzy
#| msgid ""
#| "\n"
@@ -1474,7 +1484,7 @@
# popup text
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:504
+#: src/include/partitioning/custom_part_check_generated.rb:520
#, fuzzy
#| msgid ""
#| "\n"
@@ -1494,7 +1504,7 @@
# continued popup text
#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:511
+#: src/include/partitioning/custom_part_check_generated.rb:527
msgid ""
"- if this is an existing ReiserFS partition\n"
"- if this partition already contains a Linux distribution that will be\n"
@@ -1507,7 +1517,7 @@
# continued popup text
#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:518
+#: src/include/partitioning/custom_part_check_generated.rb:534
#, fuzzy
#| msgid ""
#| "If in doubt, you might want to go back and mark this partition for\n"
@@ -1524,7 +1534,7 @@
# continued popup text
#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:524
+#: src/include/partitioning/custom_part_check_generated.rb:540
msgid ""
"If you decide to format the partition, all data on it will be lost.\n"
"\n"
@@ -1536,7 +1546,7 @@
# popup text %1 is replaced by a raid name e.g. /dev/md0
#. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:579
+#: src/include/partitioning/custom_part_check_generated.rb:595
msgid ""
"The selected device belongs to the RAID (%1).\n"
"Remove it from the RAID before editing it.\n"
@@ -1546,7 +1556,7 @@
# popup text %1 is replaced by a name
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:590
+#: src/include/partitioning/custom_part_check_generated.rb:606
msgid ""
"The selected device belongs to a volume group (%1).\n"
"Remove it from the volume group before editing it.\n"
@@ -1556,7 +1566,7 @@
# popup text %1 is replaced by a name
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:600
+#: src/include/partitioning/custom_part_check_generated.rb:616
msgid ""
"The selected device is used by volume (%1).\n"
"Remove the volume before editing it.\n"
@@ -1566,7 +1576,7 @@
# popup text %2 is a partition name, %1 is the raid name
#. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:633
+#: src/include/partitioning/custom_part_check_generated.rb:649
msgid ""
"The device (%2) belongs to the RAID (%1).\n"
"Remove it from the RAID before deleting it.\n"
@@ -1575,7 +1585,7 @@
"삭제하기 전에 먼저 RAID에서 장치를 제거하십시오.\n"
#. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:644
+#: src/include/partitioning/custom_part_check_generated.rb:660
msgid ""
"The device (%2) is used by %1.\n"
"Remove %1 before deleting it.\n"
@@ -1583,12 +1593,12 @@
"장치(%2)를 %1에서 사용하고 있습니다.\n"
"삭제하기 전에 먼저 %1을(를) 제거하십시오.\n"
-#: src/include/partitioning/custom_part_check_generated.rb:656
+#: src/include/partitioning/custom_part_check_generated.rb:672
msgid "It cannot be deleted while mounted."
msgstr ""
#. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:692
+#: src/include/partitioning/custom_part_check_generated.rb:708
#, fuzzy
#| msgid ""
#| "The device (%1) cannot be removed\n"
@@ -1604,7 +1614,7 @@
# popup text
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:768
+#: src/include/partitioning/custom_part_check_generated.rb:784
#, fuzzy
#| msgid ""
#| "The selected extended partition contains partitions which are currently mounted:\n"
@@ -1624,7 +1634,7 @@
# popup text, Do not translate LVM.
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:786
+#: src/include/partitioning/custom_part_check_generated.rb:802
msgid ""
"\n"
"The selected extended partition contains at least one LVM partition\n"
@@ -1638,7 +1648,7 @@
# popup text, Do not translate LVM.
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:797
+#: src/include/partitioning/custom_part_check_generated.rb:813
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1653,7 +1663,7 @@
# popup text, Do not translate LVM.
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:808
+#: src/include/partitioning/custom_part_check_generated.rb:824
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1667,7 +1677,7 @@
# heading text
#. heading text
-#: src/include/partitioning/custom_part_dialogs.rb:71
+#: src/include/partitioning/custom_part_dialogs.rb:70
#, fuzzy
#| msgid "Enter your password for the encrypted file system."
msgid "Enter your Password for the Encrypted File System."
@@ -1675,7 +1685,7 @@
# advise user to remember his new password
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:75
+#: src/include/partitioning/custom_part_dialogs.rb:74
#: src/include/partitioning/ep-dialogs.rb:768
#: src/modules/StorageProposal.rb:6372
#, fuzzy
@@ -1683,14 +1693,14 @@
msgid "Do not forget what you enter here!"
msgstr "이곳에 입력한 열쇠글을 잊어버리지 않도록 주의하세요."
-#: src/include/partitioning/custom_part_dialogs.rb:79
+#: src/include/partitioning/custom_part_dialogs.rb:78
#: src/include/partitioning/ep-dialogs.rb:771
msgid "Empty password allowed."
msgstr "열쇠글 비워두기 허용."
# heading text
#. heading text, %1 is replaced by device name (e.g. /dev/hda1)
-#: src/include/partitioning/custom_part_dialogs.rb:85
+#: src/include/partitioning/custom_part_dialogs.rb:84
msgid "Password for Encrypted File System on %1"
msgstr "%1에 대한 암호화된 파일 시스템의 열쇠글"
@@ -1698,7 +1708,7 @@
# example: "...password for device /dev/hda6 mounted on /var"
#. translator comment: %1 is the device name, %2 is a directory
#. example: "...password for device /dev/hda6 mounted on /var"
-#: src/include/partitioning/custom_part_dialogs.rb:106
+#: src/include/partitioning/custom_part_dialogs.rb:105
#, fuzzy
#| msgid ""
#| "Enter your crypt password for\n"
@@ -1712,7 +1722,7 @@
# heading text
#. heading text
-#: src/include/partitioning/custom_part_dialogs.rb:122
+#: src/include/partitioning/custom_part_dialogs.rb:121
#, fuzzy
#| msgid "Enter your password for the encrypted file system."
msgid "Enter your Password for the Encrypted File System"
@@ -1724,7 +1734,7 @@
#. Please use newline if label is longer than 40 characters
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
-#: src/include/partitioning/custom_part_dialogs.rb:137
+#: src/include/partitioning/custom_part_dialogs.rb:136
#: src/include/partitioning/ep-dialogs.rb:796
#, fuzzy
#| msgid "&Enter a password for your file system:"
@@ -1739,8 +1749,8 @@
#. Please use newline if label is longer than 40 characters
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
-#: src/include/partitioning/custom_part_dialogs.rb:148
-#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4001
+#: src/include/partitioning/custom_part_dialogs.rb:147
+#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4002
#, fuzzy
#| msgid "Reenter the password for &verification:"
msgid "Reenter the Password for &Verification:"
@@ -1748,13 +1758,13 @@
# PushButton label
#. Cancel button
-#: src/include/partitioning/custom_part_dialogs.rb:160
+#: src/include/partitioning/custom_part_dialogs.rb:159
msgid "&Skip"
msgstr "생략(&S)"
# popup text
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:189
+#: src/include/partitioning/custom_part_dialogs.rb:188
#, fuzzy
#| msgid ""
#| "The first and the second version\n"
@@ -1772,8 +1782,8 @@
# popup text
#. popup text
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:197
-#: src/modules/Storage.rb:3957
+#: src/include/partitioning/custom_part_dialogs.rb:196
+#: src/modules/Storage.rb:3958
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -1784,8 +1794,8 @@
# popup text
#. popup text
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:204
-#: src/modules/Storage.rb:3965
+#: src/include/partitioning/custom_part_dialogs.rb:203
+#: src/modules/Storage.rb:3966
msgid ""
"The password must have at least %1 characters.\n"
"Try again.\n"
@@ -1794,7 +1804,7 @@
"다시 시도하십시오.\n"
# tree node string - CPU information
-#: src/include/partitioning/custom_part_dialogs.rb:238
+#: src/include/partitioning/custom_part_dialogs.rb:237
#, fuzzy
#| msgid "Floating point unit"
msgid "No floating point number."
@@ -1802,12 +1812,12 @@
# heading text
#. heading text
-#: src/include/partitioning/custom_part_dialogs.rb:362
+#: src/include/partitioning/custom_part_dialogs.rb:361
msgid "File system options:"
msgstr "파일 시스템 옵션:"
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:444
+#: src/include/partitioning/custom_part_dialogs.rb:443
msgid ""
"The character '/' is no longer permitted in a volume label.\n"
"Change your volume label so that it does not contain this character.\n"
@@ -1817,7 +1827,7 @@
# help text, richtext format
#. help text, richtext format
-#: src/include/partitioning/custom_part_dialogs.rb:467
+#: src/include/partitioning/custom_part_dialogs.rb:466
#, fuzzy
#| msgid ""
#| "<p><b>Mount in /etc/fstab by:</b>\n"
@@ -1841,7 +1851,7 @@
# help text, richtext format
#. help text, richtext format
-#: src/include/partitioning/custom_part_dialogs.rb:480
+#: src/include/partitioning/custom_part_dialogs.rb:479
msgid ""
"<p><b>Volume Label:</b>\n"
"The name entered in this field is used as the volume label. This usually makes sense only \n"
@@ -1855,26 +1865,26 @@
# label text
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:495
+#: src/include/partitioning/custom_part_dialogs.rb:494
msgid "Mount in /etc/fstab by"
msgstr "/etc/fstab에 의한 마운트"
# label text
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:502
+#: src/include/partitioning/custom_part_dialogs.rb:501
msgid "&Device Name"
msgstr "장치 이름(&D)"
# label text
#. label text
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:509
-#: src/include/partitioning/custom_part_dialogs.rb:545
+#: src/include/partitioning/custom_part_dialogs.rb:508
+#: src/include/partitioning/custom_part_dialogs.rb:544
msgid "Volume &Label"
msgstr "볼륨 레이블(&L)"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:516
+#: src/include/partitioning/custom_part_dialogs.rb:515
#, fuzzy
#| msgid "UUID"
msgid "&UUID"
@@ -1882,19 +1892,19 @@
# table column headings
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:526
+#: src/include/partitioning/custom_part_dialogs.rb:525
msgid "Device &ID"
msgstr "장치 ID(&I)"
# table column headings
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:533
+#: src/include/partitioning/custom_part_dialogs.rb:532
msgid "Device &Path"
msgstr "장치 경로(&P)"
# button text
#. heading text
-#: src/include/partitioning/custom_part_dialogs.rb:673
+#: src/include/partitioning/custom_part_dialogs.rb:672
#, fuzzy
#| msgid "Fs&tab Options"
msgid "Fstab Options:"
@@ -1902,7 +1912,7 @@
# popup text %1 is a number
#. popup text %1 is a number
-#: src/include/partitioning/custom_part_dialogs.rb:847
+#: src/include/partitioning/custom_part_dialogs.rb:846
#, fuzzy
#| msgid ""
#| "\n"
@@ -1919,32 +1929,32 @@
# popup text
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:870
+#: src/include/partitioning/custom_part_dialogs.rb:869
msgid "Provide a volume label to mount by label."
msgstr "레이블로 마운트하기 위해 볼륨 레이블을 적어주십시오."
# popup text
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:881
+#: src/include/partitioning/custom_part_dialogs.rb:880
msgid "This volume label is already in use. Select a different one."
msgstr "이 볼륨 레이블은 이미 사용 중입니다. 다른 이름을 사용하십시오."
# type of item (displayed in the table)
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1050
+#: src/include/partitioning/custom_part_dialogs.rb:1046
#, fuzzy
#| msgid "File System"
msgid "File &System"
msgstr "파일 시스템"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1057
+#: src/include/partitioning/custom_part_dialogs.rb:1053
msgid "O&ptions..."
msgstr "옵션(&P)..."
# Text entry label
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1073
+#: src/include/partitioning/custom_part_dialogs.rb:1069
#, fuzzy
#| msgid "&Encrypt device"
msgid "&Encrypt Device"
@@ -1952,41 +1962,41 @@
# label text
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1148
+#: src/include/partitioning/custom_part_dialogs.rb:1144
msgid "File system &ID:"
msgstr "파일 시스템 ID(&I)"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1180
+#: src/include/partitioning/custom_part_dialogs.rb:1176
msgid "Format"
msgstr "포맷"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1190
+#: src/include/partitioning/custom_part_dialogs.rb:1186
msgid "Do ¬ format"
msgstr "포맷하지 않기(&N)"
# button text
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1200
+#: src/include/partitioning/custom_part_dialogs.rb:1196
msgid "&Format"
msgstr "포맷(&F)"
# button text
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1253
+#: src/include/partitioning/custom_part_dialogs.rb:1249
msgid "Fs&tab Options"
msgstr "Fstab 옵션(&T)"
# label text
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1260
+#: src/include/partitioning/custom_part_dialogs.rb:1256
msgid "&Mount Point"
msgstr "마운트 포인트(&M)"
# popup text %1 is a partition name, %2 a dirctory
#. popup text %1 is a partition name, %2 a dirctory
-#: src/include/partitioning/custom_part_dialogs.rb:1272
+#: src/include/partitioning/custom_part_dialogs.rb:1268
#, fuzzy
#| msgid ""
#| "\n"
@@ -2023,7 +2033,7 @@
# Popup text
# %1 is either replaced by "logical volume" or by "partition"
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1301
+#: src/include/partitioning/custom_part_dialogs.rb:1297
msgid ""
"\n"
"The file system on the partition cannot be shrunk by YaST2.\n"
@@ -2036,7 +2046,7 @@
# Popup text
# %1 is either replaced by "logical volume" or by "partition"
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1308
+#: src/include/partitioning/custom_part_dialogs.rb:1304
msgid ""
"\n"
"The file system on the logical volume cannot be shrunk by YaST2.\n"
@@ -2049,25 +2059,25 @@
# Popup text
# %1 is either replaced by "logical volume" or by "partition"
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1320
+#: src/include/partitioning/custom_part_dialogs.rb:1316
msgid "You risk losing data if you shrink this partition."
msgstr "이 파티션을 축소하면 데이터가 손실될 수 있습니다."
# Popup text
# %1 is either replaced by "logical volume" or by "partition"
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1326
+#: src/include/partitioning/custom_part_dialogs.rb:1322
msgid "You risk losing data if you shrink this logical volume."
msgstr "이 논리 볼륨을 축소하면 데이터가 손실될 수 있습니다."
-#: src/include/partitioning/custom_part_dialogs.rb:1330
+#: src/include/partitioning/custom_part_dialogs.rb:1326
msgid "Continue?"
msgstr "계속하시겠습니까?"
# Popup text
# %1 is either replaced by "logical volume" or by "partition"
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1346
+#: src/include/partitioning/custom_part_dialogs.rb:1342
msgid ""
"\n"
"The file system on the selected partition cannot be extended by YaST2.\n"
@@ -2080,7 +2090,7 @@
# Popup text
# %1 is either replaced by "logical volume" or by "partition"
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1353
+#: src/include/partitioning/custom_part_dialogs.rb:1349
msgid ""
"\n"
"The file system on the selected logical volume cannot be extended by YaST2.\n"
@@ -2093,22 +2103,22 @@
# src/config/proxy.y2cc:21
# Popup text
# %1 is either replaced by "logical volume" or by "partition"
-#: src/include/partitioning/custom_part_dialogs.rb:1361
+#: src/include/partitioning/custom_part_dialogs.rb:1357
msgid "Continue resizing?"
msgstr "크기 조정 작업을 계속하시겠습니까?"
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1378
+#: src/include/partitioning/custom_part_dialogs.rb:1374
msgid "You decreased a partition with a reiser file system on it."
msgstr "reiser 파일 시스템이 사용하고 있는 파티션을 축소하려 합니다."
-#: src/include/partitioning/custom_part_dialogs.rb:1380
+#: src/include/partitioning/custom_part_dialogs.rb:1376
msgid "You decreased a logical volume with a reiser file system on it."
msgstr "reiser 파일 시스템이 사용하고 있는 논리 볼륨을 축소하려 합니다."
# Popup text
# %1 is either replaced by "logical volume" or by "partition"
-#: src/include/partitioning/custom_part_dialogs.rb:1387
+#: src/include/partitioning/custom_part_dialogs.rb:1383
msgid ""
"\n"
"It is possible to shrink a reiser file system, but this feature is not\n"
@@ -2124,7 +2134,7 @@
# popup text, %1 is replaced by device name
#. popup text, %1 is replaced by device name
-#: src/include/partitioning/custom_part_dialogs.rb:1441
+#: src/include/partitioning/custom_part_dialogs.rb:1437
#, fuzzy
#| msgid ""
#| "The selected device contains partitions that are currently mounted:\n"
@@ -2142,7 +2152,7 @@
"파티션 테이블을 삭제하기 전에 이 파티션을 언마운트하기를 *강력히* 권합니다.어떤 상황인지 잘 모르신다면 취소를 선택하십시오\n"
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_dialogs.rb:1464
+#: src/include/partitioning/custom_part_dialogs.rb:1460
msgid ""
"\n"
"The selected device contains at least one LVM partition\n"
@@ -2157,7 +2167,7 @@
"해당하는 볼륨 그룹의 파티션을 모두 삭제하세요.\n"
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_dialogs.rb:1475
+#: src/include/partitioning/custom_part_dialogs.rb:1471
msgid ""
"\n"
"The selected device contains at least one partition\n"
@@ -2172,7 +2182,7 @@
"RAID 시스템의 파티션을 삭제하세요.\n"
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1486
+#: src/include/partitioning/custom_part_dialogs.rb:1482
msgid ""
"\n"
"The selected device contains at least one partition\n"
@@ -2185,7 +2195,7 @@
"파티션을 사용하는 볼륨을 삭제하세요.\n"
#. help text, richtext format
-#: src/include/partitioning/custom_part_dialogs.rb:1547
+#: src/include/partitioning/custom_part_dialogs.rb:1543
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -2197,20 +2207,20 @@
"암호화된 파일 시스템을 생성합니다.\n"
"</p>\n"
-#: src/include/partitioning/custom_part_dialogs.rb:1552
+#: src/include/partitioning/custom_part_dialogs.rb:1548
msgid "<p>Enable automatic snapshots for a Btrfs filesystem with snapper.</p>"
msgstr ""
# dialog caption:
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1566
+#: src/include/partitioning/custom_part_dialogs.rb:1562
#, fuzzy
#| msgid "Existing Sudo Rule "
msgid "Existing Subvolumes:"
msgstr "기존 Sudo 규칙"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1572
+#: src/include/partitioning/custom_part_dialogs.rb:1568
#, fuzzy
#| msgid "New Sudo Rule"
msgid "New Subvolume"
@@ -2218,7 +2228,7 @@
# translators: command line help text for ad action
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1578
+#: src/include/partitioning/custom_part_dialogs.rb:1574
#, fuzzy
#| msgid "Add new user"
msgid "Add new"
@@ -2226,46 +2236,46 @@
#. button text
#. push button text
-#: src/include/partitioning/custom_part_dialogs.rb:1584
+#: src/include/partitioning/custom_part_dialogs.rb:1580
#: src/modules/DualMultiSelectionBox.rb:147
msgid "Remove"
msgstr "제거"
#. TRANSLATOR: checkbox text
#. TRANSLATORS: checkbox text
-#: src/include/partitioning/custom_part_dialogs.rb:1596
+#: src/include/partitioning/custom_part_dialogs.rb:1592
#: src/modules/StorageProposal.rb:6226
msgid "Enable Snapshots"
msgstr ""
#. heading text
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1607
-#: src/include/partitioning/custom_part_lib.rb:420
+#: src/include/partitioning/custom_part_dialogs.rb:1603
+#: src/include/partitioning/custom_part_lib.rb:409
#, fuzzy
#| msgid "Signature Handling"
msgid "Subvolume Handling"
msgstr "서명 처리"
-#: src/include/partitioning/custom_part_dialogs.rb:1670
+#: src/include/partitioning/custom_part_dialogs.rb:1666
#, fuzzy
#| msgid "Empty password is not allowed."
msgid "Empty subvolume name not allowed."
msgstr "빈 열쇠글은 허용되지 않습니다."
-#: src/include/partitioning/custom_part_dialogs.rb:1674
+#: src/include/partitioning/custom_part_dialogs.rb:1670
msgid ""
"Only subvolume names starting with \"%1\" currently allowed!\n"
"Automatically prepending \"%1\" to name of subvolume."
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1684
+#: src/include/partitioning/custom_part_dialogs.rb:1680
#, fuzzy
#| msgid "Zone name %1 already exists."
msgid "Subvolume name %1 already exists."
msgstr "%1 영역 이름은 이미 존재합니다."
-#: src/include/partitioning/custom_part_dialogs.rb:1713
+#: src/include/partitioning/custom_part_dialogs.rb:1709
msgid "Modifications done so far in this dialog will be lost."
msgstr ""
@@ -2469,18 +2479,18 @@
# error popup text
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:62
+#: src/include/partitioning/custom_part_lib.rb:51
msgid "You cannot use the mount point \"%1\" for LVM.\n"
msgstr "LVM에 대해서는 마운트 포인트 \"%1\"을(를) 사용할 수 없습니다.\n"
# error popup text
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:89
+#: src/include/partitioning/custom_part_lib.rb:78
msgid "You cannot use the mount point %1 for RAID."
msgstr "RAID에 대해서는 마운트 포인트 %1을(를) 사용할 수 없습니다."
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:108
+#: src/include/partitioning/custom_part_lib.rb:97
#, fuzzy
#| msgid ""
#| "You have selected not to mount automatically at start-up a file system\n"
@@ -2505,7 +2515,7 @@
" 이렇게 하시겠습니까?\n"
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:131
+#: src/include/partitioning/custom_part_lib.rb:120
msgid ""
"You have assigned an encrypted file system to a partition\n"
"with one of the following mount points: \"/\", \"/usr\", \"/boot\",\n"
@@ -2518,7 +2528,7 @@
"루프백되지 않은 파일 시스템을 사용하십시오.\n"
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:169
+#: src/include/partitioning/custom_part_lib.rb:158
#, fuzzy
#| msgid ""
#| "You have set the option to be mountable by users for a file system\n"
@@ -2548,28 +2558,28 @@
#. @param [Hash{String => map}] targetMap the TargetMap
#. @param mount mount point
#. @return [Boolean]
-#: src/include/partitioning/custom_part_lib.rb:216
+#: src/include/partitioning/custom_part_lib.rb:205
msgid "Mount point must not be empty."
msgstr "마운트 포인트는 비워져 있으면 안됩니다."
#. error popup
-#: src/include/partitioning/custom_part_lib.rb:221
+#: src/include/partitioning/custom_part_lib.rb:210
msgid "Swap devices must have swap as mount point."
msgstr "스왑 장치의 마운트 포인트는 swap 이어야 합니다."
#. error popup
-#: src/include/partitioning/custom_part_lib.rb:225
+#: src/include/partitioning/custom_part_lib.rb:214
msgid "Only swap devices may have swap as mount point."
msgstr "스왑 장치에만 swap 마운트 포인트를 지정할 수 있습니다."
#. && mount!="swap" )
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:240
+#: src/include/partitioning/custom_part_lib.rb:229
msgid "This mount point is already in use. Select a different one."
msgstr "이 마운트 포인트는 이미 사용 중입니다. 다른 것을 선택하십시오."
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:250
+#: src/include/partitioning/custom_part_lib.rb:239
msgid ""
"FAT filesystem used for system mount point (/, /usr, /opt, /var, /home).\n"
"This is not possible."
@@ -2579,13 +2589,13 @@
# error popup text
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:259
+#: src/include/partitioning/custom_part_lib.rb:248
msgid "Invalid character in mount point. Do not use \"`'!\"%#\" in a mount point."
msgstr "마운트 포인트에 잘못된 문자가 있습니다. 마운트 포인트에 \"`'!\"%#\" 를 사용하지 마세요."
# error popup text
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:268
+#: src/include/partitioning/custom_part_lib.rb:257
#, fuzzy
#| msgid ""
#| "You cannot use any of the following mount points:\n"
@@ -2599,12 +2609,12 @@
"/proc, /dev, /lib, /bin, /etc, /sbin, /mnt, /var/adm/mnt, /lost+found\n"
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:277
+#: src/include/partitioning/custom_part_lib.rb:266
msgid "Your mount point must start with a \"/\" "
msgstr "마운트 포인트는 반드시 \"/\"로 시작해야합니다."
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:283
+#: src/include/partitioning/custom_part_lib.rb:272
#, fuzzy
#| msgid ""
#| "It is not allowed to assign a mount point\n"
@@ -2618,7 +2628,7 @@
#. warning message, %1 is replaced by fs name (e.g. Ext3)
#. %2 is prelaced by a size (e.g. 10 MB)
-#: src/include/partitioning/custom_part_lib.rb:310
+#: src/include/partitioning/custom_part_lib.rb:299
msgid ""
"Your partition is too small to use %1.\n"
"The minimum size for this file system is %2.\n"
@@ -2627,7 +2637,7 @@
"이 파일 시스템의 최소 크기는 %2입니다.\n"
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:380
+#: src/include/partitioning/custom_part_lib.rb:369
msgid ""
"It is not allowed to assign a mount point\n"
"to a device with nonexistent or unknown file system."
@@ -2636,7 +2646,7 @@
"존재하지 않는 파일시스템이 있는 장치에 할당하는것은 허용되지 않습니다."
#. warning message, %1 is replaced by fs name (e.g. Ext3)
-#: src/include/partitioning/custom_part_lib.rb:502
+#: src/include/partitioning/custom_part_lib.rb:491
#, fuzzy
#| msgid ""
#| "\n"
@@ -2671,12 +2681,12 @@
#. //////////////////////////////////////////////
#. modify map new
-#: src/include/partitioning/custom_part_lib.rb:948
-#: src/include/partitioning/custom_part_lib.rb:975
+#: src/include/partitioning/custom_part_lib.rb:919
+#: src/include/partitioning/custom_part_lib.rb:946
msgid "The file system is currently mounted on %1."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:953
+#: src/include/partitioning/custom_part_lib.rb:924
msgid ""
"You can try to unmount it now, continue without unmounting or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2684,34 +2694,34 @@
#. button text
#. button text
-#: src/include/partitioning/custom_part_lib.rb:964
-#: src/include/partitioning/custom_part_lib.rb:989
+#: src/include/partitioning/custom_part_lib.rb:935
+#: src/include/partitioning/custom_part_lib.rb:960
#, fuzzy
#| msgid "Unmounting %1$s"
msgid "Unmount"
msgstr "%1$s을(를) 언마운트 중"
-#: src/include/partitioning/custom_part_lib.rb:980
+#: src/include/partitioning/custom_part_lib.rb:951
msgid ""
"You can try to unmount it now or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
msgstr ""
# popup text , %1 is replaced by a disk name e.g. /dev/hda
-#: src/include/partitioning/custom_part_lib.rb:1026
+#: src/include/partitioning/custom_part_lib.rb:997
#, fuzzy
#| msgid "It is not possible to create a partition on %1."
msgid "It is not possible to shrink the file system while it is mounted."
msgstr "%1에 파티션을 생성할 수 없습니다."
# popup text , %1 is replaced by a disk name e.g. /dev/hda
-#: src/include/partitioning/custom_part_lib.rb:1039
+#: src/include/partitioning/custom_part_lib.rb:1010
#, fuzzy
#| msgid "It is not possible to create a partition on %1."
msgid "It is not possible to extend the file system while it is mounted."
msgstr "%1에 파티션을 생성할 수 없습니다."
-#: src/include/partitioning/custom_part_lib.rb:1050
+#: src/include/partitioning/custom_part_lib.rb:1021
#, fuzzy
#| msgid ""
#| "Partition %1 cannot be resized\n"
@@ -3814,7 +3824,7 @@
# translators: error message
#. error popup
#. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5211
+#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5240
msgid "The disk is in use and cannot be modified."
msgstr "디스크가 사용 중이고 수정할 수 없습니다."
@@ -4387,18 +4397,30 @@
msgid "<p>No changes to partitioning.</p>"
msgstr "<p>파티션 변경 사항이 없습니다.</p>"
-#: src/include/partitioning/ep-lib.rb:485
+#: src/include/partitioning/ep-lib.rb:484
msgid "<p>Changes to partitioning:</p>"
msgstr "<p>파티션 변경 사항:</p>"
-#: src/include/partitioning/ep-lib.rb:490
+#: src/include/partitioning/ep-lib.rb:487
msgid "<p>No changes to storage settings.</p>"
msgstr "<p>저장매체 설정 변경 사항이 없습니다.</p>"
-#: src/include/partitioning/ep-lib.rb:493
+#: src/include/partitioning/ep-lib.rb:489
msgid "<p>Storage settings:</p>"
msgstr "<p>저장매체 설정:</p>"
+#: src/include/partitioning/ep-lib.rb:498
+#, fuzzy
+#| msgid "<p>Storage settings:</p>"
+msgid "<p>Packages to install:</p>"
+msgstr "<p>저장매체 설정:</p>"
+
+#: src/include/partitioning/ep-lib.rb:500
+#, fuzzy
+#| msgid "<p>No changes to storage settings.</p>"
+msgid "<p>No packages need to be installed.</p>"
+msgstr "<p>저장매체 설정 변경 사항이 없습니다.</p>"
+
# logview caption
#. heading
#. tree node label
@@ -6818,7 +6840,7 @@
#. @param integer testsize
#. @param [Symbol] used_fs
#. @param [Boolean] verbose
-#: src/modules/Storage.rb:991
+#: src/modules/Storage.rb:992
msgid "Resize Not Possible:"
msgstr "크기를 조정할 수 없습니다."
@@ -6831,7 +6853,7 @@
#. mark swap-partitions with pseudo Mountpoint swap in targetMap
#. @param [Hash{String => map}] target Disk map
#. @return [Hash{String => map}] modified target
-#: src/modules/Storage.rb:2691 src/modules/Storage.rb:3914
+#: src/modules/Storage.rb:2692 src/modules/Storage.rb:3915
#, fuzzy
#| msgid ""
#| "Could not set encryption.\n"
@@ -6851,7 +6873,7 @@
# popup text
#. popup text
-#: src/modules/Storage.rb:3945
+#: src/modules/Storage.rb:3946
msgid ""
"The first and the second version\n"
"of the password do not match.\n"
@@ -6863,7 +6885,7 @@
# error popup
#. popup text
-#: src/modules/Storage.rb:3976
+#: src/modules/Storage.rb:3977
#, fuzzy
#| msgid ""
#| "The password may only contain the following characters:\n"
@@ -6881,7 +6903,7 @@
# Translators: popup dialog heading
#. Label: get password for encrypted volume
#. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4030
+#: src/modules/Storage.rb:4031
#, fuzzy
#| msgid "Enter Encryption Key"
msgid "&Enter Encryption Password:"
@@ -6889,23 +6911,23 @@
# Heading text
#. Clear password fields on every round.
-#: src/modules/Storage.rb:4089
+#: src/modules/Storage.rb:4090
#, fuzzy
#| msgid "Enter Provider Password"
msgid "Provide Password"
msgstr "열쇠글 입력"
-#: src/modules/Storage.rb:4108
+#: src/modules/Storage.rb:4109
msgid "The following encrypted volumes are already available."
msgstr ""
-#: src/modules/Storage.rb:4123
+#: src/modules/Storage.rb:4124
#, fuzzy
#| msgid "Encrypt Volume Group"
msgid "Encrypted Volume Activation"
msgstr "암호화 볼륨 그룹"
-#: src/modules/Storage.rb:4127
+#: src/modules/Storage.rb:4128
msgid ""
"The following volumes contain an encryption signature but the \n"
"passwords are not yet known.\n"
@@ -6914,14 +6936,14 @@
msgstr ""
# popup question
-#: src/modules/Storage.rb:4139
+#: src/modules/Storage.rb:4140
#, fuzzy
#| msgid "Do you want to retry?"
msgid "Do you want to provide encryption passwords?"
msgstr "재시도 하시겠습니까?"
#. text in help field
-#: src/modules/Storage.rb:4196
+#: src/modules/Storage.rb:4197
msgid ""
"Enter encryption password for any of the\n"
"devices in the locked devices list.\n"
@@ -6930,13 +6952,13 @@
# Translators: popup dialog heading
#. header text
-#: src/modules/Storage.rb:4202
+#: src/modules/Storage.rb:4203
#, fuzzy
#| msgid "Enter Encryption Key"
msgid "Enter Encryption Password"
msgstr "암호화 키 입력"
-#: src/modules/Storage.rb:4205
+#: src/modules/Storage.rb:4206
msgid "There are no encrypted volume to unlock."
msgstr ""
@@ -6944,7 +6966,7 @@
# vendor and device information strings as stored
# in the hardware-probing database.
#. label text, multiple device names follow
-#: src/modules/Storage.rb:4218
+#: src/modules/Storage.rb:4219
#, fuzzy
#| msgid "YaST2 detected the following device"
msgid "Provide password for any of the following devices:"
@@ -6954,54 +6976,70 @@
# vendor and device information strings as stored
# in the hardware-probing database.
#. label text, one device name follows
-#: src/modules/Storage.rb:4221
+#: src/modules/Storage.rb:4222
#, fuzzy
#| msgid "YaST2 detected the following device"
msgid "Provide password for the following device:"
msgstr "YaST2에서 아래 장치를 검색했습니다."
-#: src/modules/Storage.rb:4234
+#: src/modules/Storage.rb:4235
msgid "Trying to unlock encrypted volumes..."
msgstr ""
-#: src/modules/Storage.rb:4258
+#: src/modules/Storage.rb:4259
msgid "Password did not unlock any volume."
msgstr ""
# this is a heading
-#: src/modules/Storage.rb:4344
+#: src/modules/Storage.rb:4345
#, fuzzy
#| msgid "DASD Disks"
msgid "IDE Disk"
msgstr "DASD 디스크"
# this is a heading
-#: src/modules/Storage.rb:4350
+#: src/modules/Storage.rb:4351
#, fuzzy
#| msgid "DASD Disks"
msgid "SCSI Disk"
msgstr "DASD 디스크"
# tree node string
-#: src/modules/Storage.rb:4356
+#: src/modules/Storage.rb:4357
msgid "Disk"
msgstr "디스크"
-#: src/modules/Storage.rb:4384
+#: src/modules/Storage.rb:4385
#, fuzzy
#| msgid "RAID"
msgid "DM RAID"
msgstr "RAID"
-#: src/modules/Storage.rb:4397
+#: src/modules/Storage.rb:4398
#, fuzzy
#| msgid "RAID"
msgid "MD RAID"
msgstr "RAID"
+#. TODO: more informative error message, but the Package module does
+#. not provide anything
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5223
+#: src/modules/Storage.rb:4893
+msgid "Installing required packages failed."
+msgstr ""
+
+# src/config/proxy.y2cc:21
+# Popup text
+# %1 is either replaced by "logical volume" or by "partition"
+#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159
#, fuzzy
+#| msgid "Continue resizing the %1?"
+msgid "Continue despite the error?"
+msgstr "%1의 크기 조정 작업을 계속하시겠습니까?"
+
+#. TRANSLATORS: error popup
+#: src/modules/Storage.rb:5252
+#, fuzzy
#| msgid ""
#| "Partition %1 cannot be resized\n"
#| "because the file system could not be mounted.\n"
@@ -7010,7 +7048,7 @@
"파일 시스템을 마운트할 수 없기 때문에\n"
"%1 파티션의 크기를 조정할 수 없습니다.\n"
-#: src/modules/Storage.rb:5249
+#: src/modules/Storage.rb:5278
msgid ""
"\n"
"Device %1 cannot be modified because it contains activated swap\n"
@@ -7020,7 +7058,7 @@
"%1 장치에는 설치 작업에 필요한 스왑이 포함되어 있기 때문에\n"
"설정을 변경할 수 없습니다.\n"
-#: src/modules/Storage.rb:5263
+#: src/modules/Storage.rb:5292
msgid ""
"\n"
"Device %1 cannot be modified because it contains the installation\n"
@@ -7030,7 +7068,7 @@
"%1 장치에는 설치 작업에 필요한 설치 데이터가 포함되어 있기 때문에\n"
"설정을 변경할 수 없습니다.\n"
-#: src/modules/Storage.rb:5292
+#: src/modules/Storage.rb:5321
msgid ""
"\n"
"Device %1 cannot be removed because it contains activated swap\n"
@@ -7040,7 +7078,7 @@
"%1 장치에는 설치 작업에 필요한 스왑이 포함되어 있기 때문에 \n"
"삭제할 수 없습니다.\n"
-#: src/modules/Storage.rb:5301
+#: src/modules/Storage.rb:5330
msgid ""
"\n"
"Device %1 cannot be removed because it contains the installation\n"
@@ -7050,7 +7088,7 @@
"%1 장치에는 설치 작업에 필요한 설치데이터가 포함되어 있기 때문에\n"
"삭제할 수 없습니다.\n"
-#: src/modules/Storage.rb:5330
+#: src/modules/Storage.rb:5359
#, fuzzy
#| msgid ""
#| "\n"
@@ -7068,7 +7106,7 @@
"간접적으로 변경하게 되므로\n"
"삭제할 수 없습니다.\n"
-#: src/modules/Storage.rb:5341
+#: src/modules/Storage.rb:5370
#, fuzzy
#| msgid ""
#| "\n"
@@ -7084,7 +7122,7 @@
"간접적으로 변경하게 되므로 삭제할 수 없습니다.\n"
#. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5363
+#: src/modules/Storage.rb:5392
#, fuzzy
#| msgid ""
#| "Partition %1 cannot be resized\n"
@@ -7098,20 +7136,20 @@
"%1 파티션의 크기를 조정할 수 없습니다.\n"
#. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5452
+#: src/modules/Storage.rb:5481
#, fuzzy
#| msgid "Copying root filesystem..."
msgid "Nothing assigned as root filesystem!"
msgstr "루트 파일시스템 복사 중..."
-#: src/modules/Storage.rb:5453
+#: src/modules/Storage.rb:5482
msgid "Installation will most certainly fail fatally!"
msgstr ""
#. Set rather than Add, there might be some packs left over
#. from previous 'MakeProposal' we don't need now
#. This also covers the case when AddPackagesList returns [] or nil
-#: src/modules/Storage.rb:6003
+#: src/modules/Storage.rb:6032
#, fuzzy
#| msgid "Add the following resolvables failed: %1"
msgid "Adding the following resolvables failed: %1"
@@ -7138,15 +7176,6 @@
msgid "System error code was: %1"
msgstr "오류 메시지: '"
-# src/config/proxy.y2cc:21
-# Popup text
-# %1 is either replaced by "logical volume" or by "partition"
-#: src/modules/StorageClients.rb:159
-#, fuzzy
-#| msgid "Continue resizing the %1?"
-msgid "Continue despite the error?"
-msgstr "%1의 크기 조정 작업을 계속하시겠습니까?"
-
# Label: get password for user root
# Please use newline if label is longer than 40 characters
#. Label: get password for device
Modified: trunk/yast/ko/po/vpn.ko.po
===================================================================
--- trunk/yast/ko/po/vpn.ko.po 2015-10-01 11:24:45 UTC (rev 92952)
+++ trunk/yast/ko/po/vpn.ko.po 2015-10-01 11:24:47 UTC (rev 92953)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2015-09-28 18:17+0200\n"
"PO-Revision-Date: 2001-07-18 11:05+0200\n"
"Last-Translator: Hwang, Sang-Jin \n"
"Language-Team: Korean \n"
@@ -221,23 +221,30 @@
msgid "Client - Certificate"
msgstr "클라이언트 인증서(&C)"
+#. Load parameters from connections of known scenarios
+#: src/lib/vpn/ipsec.rb:239
+msgid ""
+"ipsec.conf and ipsec.secrets have been manipulated outside of this module.\n"
+"Continue using the module will remove your customisation."
+msgstr ""
+
# error report
#. Create a new connection, by default it is a site-to-site client. Return true if successful.
-#: src/lib/vpn/ipsec.rb:303
+#: src/lib/vpn/ipsec.rb:310
#, fuzzy
#| msgid "The selected option is already present."
msgid "The connection name is already used."
msgstr "선택한 옵션은 이미 존재합니다."
#. Find an unused gateway scenario
-#: src/lib/vpn/ipsec.rb:320
+#: src/lib/vpn/ipsec.rb:327
msgid ""
"You may only have one gateway connection per scenario.\n"
"All of gateway scenarios are already used."
msgstr ""
#. Warn against duplicated configuration
-#: src/lib/vpn/ipsec.rb:337
+#: src/lib/vpn/ipsec.rb:344
msgid ""
"The scenario is already configured with another gateway.\n"
"You may not have two gateways operating under one scenario."
@@ -245,14 +252,14 @@
# command line error report, %1 is queue name
#. Create the user (:xauth or :eap). Return true if successful.
-#: src/lib/vpn/ipsec.rb:432
+#: src/lib/vpn/ipsec.rb:439
#, fuzzy
#| msgid "Specified queue name %1 is already used."
msgid "The user name is already used."
msgstr "지정한 대기열 이름 %1은(는) 이미 사용 중입니다."
#. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false.
-#: src/lib/vpn/ipsec.rb:496
+#: src/lib/vpn/ipsec.rb:503
msgid "Cannot find a matching client connection."
msgstr ""