From ea72916cf88681e86955a2a38a7f1bab3ad5d99f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Fri, 20 Dec 2019 16:11:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pot/cl_core3.pot | 297 +++++++++++---------- pot/cl_install3.pot | 368 +++++++++++++------------- pot/cl_lib3.pot | 392 ++++++++++++++-------------- ru/cl_core3.po | 622 ++++++++++++++++++++++++-------------------- ru/cl_install3.po | 368 +++++++++++++------------- ru/cl_lib3.po | 410 +++++++++++++++-------------- 6 files changed, 1278 insertions(+), 1179 deletions(-) diff --git a/pot/cl_core3.pot b/pot/cl_core3.pot index 736dfdd..c5ea4d5 100644 --- a/pot/cl_core3.pot +++ b/pot/cl_core3.pot @@ -65,7 +65,7 @@ msgstr "" msgid "%s ago" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:427 +#: ../calculate-core/pym/core/server/methods_func.py:431 #, python-format msgid "%s values:" msgstr "" @@ -89,20 +89,20 @@ msgstr "" msgid "%s: Process started" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:267 +#: ../calculate-core/pym/core/server/methods_func.py:271 msgid "'list' for displaying possible values" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:262 +#: ../calculate-core/pym/core/server/methods_func.py:266 msgid "'list' for displaying possible values, 'none' is never one" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:221 +#: ../calculate-core/pym/core/server/methods_func.py:225 msgid "(by default)" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:240 -#: ../calculate-core/pym/core/server/methods_func.py:247 +#: ../calculate-core/pym/core/server/methods_func.py:244 +#: ../calculate-core/pym/core/server/methods_func.py:251 msgid "(enabled by default)" msgstr "" @@ -122,7 +122,9 @@ msgstr "" #: ../calculate-core/pym/core/client/cert_info.py:83 #: ../calculate-core/pym/core/client/pid_information.py:91 -#: ../calculate-core/pym/core/server/methods_func.py:557 +#: ../calculate-core/pym/core/server/methods_func.py:561 +#: ../calculate-core/pym/core/variables/setup_package.py:112 +#: ../calculate-core/pym/core/variables/setup_package.py:245 msgid ": " msgstr "" @@ -148,15 +150,15 @@ msgstr "" msgid "Action {ac_custom_name} not found" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:380 +#: ../calculate-core/pym/core/wsdl_core.py:381 msgid "Add" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:356 +#: ../calculate-core/pym/core/wsdl_core.py:357 msgid "Add a Group" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:376 +#: ../calculate-core/pym/core/wsdl_core.py:377 msgid "Add a group" msgstr "" @@ -201,9 +203,9 @@ msgstr "" msgid "Are you sure? Delete all client certificates?" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:233 -#: ../calculate-core/pym/core/wsdl_core.py:301 -#: ../calculate-core/pym/core/wsdl_core.py:480 +#: ../calculate-core/pym/core/wsdl_core.py:234 +#: ../calculate-core/pym/core/wsdl_core.py:302 +#: ../calculate-core/pym/core/wsdl_core.py:481 msgid "Back" msgstr "" @@ -215,9 +217,9 @@ msgstr "" msgid "Backing up files configured by templates" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:694 -#: ../calculate-core/pym/core/wsdl_core.py:696 -#: ../calculate-core/pym/core/wsdl_core.py:726 +#: ../calculate-core/pym/core/wsdl_core.py:733 +#: ../calculate-core/pym/core/wsdl_core.py:735 +#: ../calculate-core/pym/core/wsdl_core.py:765 msgid "Backup" msgstr "" @@ -273,7 +275,7 @@ msgstr "" msgid "Calculate Utilities have backuped files" msgstr "" -#: ../calculate-core/pym/core/setup_package.py:326 +#: ../calculate-core/pym/core/setup_package.py:333 msgid "Calculate core is executing the following tasks" msgstr "" @@ -313,7 +315,7 @@ msgstr "" msgid "Certificate %s now exists" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:212 +#: ../calculate-core/pym/core/wsdl_core.py:213 msgid "Certificate Details" msgstr "" @@ -339,7 +341,7 @@ msgstr "" msgid "Certificate deleted" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:230 +#: ../calculate-core/pym/core/wsdl_core.py:231 msgid "Certificate details" msgstr "" @@ -427,11 +429,11 @@ msgid "Certificate {cl_req_crt_path} is signed" msgstr "" #: ../calculate-core/pym/core/server/certificate.py:47 -#: ../calculate-core/pym/core/wsdl_core.py:200 +#: ../calculate-core/pym/core/wsdl_core.py:201 msgid "Certificates" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:304 +#: ../calculate-core/pym/core/wsdl_core.py:305 msgid "Change" msgstr "" @@ -467,12 +469,17 @@ msgstr "" msgid "Closing all processes" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:282 +#: ../calculate-core/pym/core/server/methods_func.py:286 msgid "Common arguments" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:60 -#: ../calculate-core/pym/core/wsdl_core.py:105 +#: ../calculate-core/pym/core/wsdl_core.py:630 +msgid "Config" +msgstr "" + +#: ../calculate-core/pym/core/wsdl_core.py:61 +#: ../calculate-core/pym/core/wsdl_core.py:106 +#: ../calculate-core/pym/core/wsdl_core.py:628 msgid "Configuration" msgstr "" @@ -481,27 +488,29 @@ msgid "Configuration after restoring from backup" msgstr "" #: ../calculate-core/pym/core/utils/cl_core_setup.py:38 +#: ../calculate-core/pym/core/utils/cl_config.py:38 msgid "Configuration manually interrupted" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:62 +#: ../calculate-core/pym/core/wsdl_core.py:63 msgid "Configure a Package" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:84 -#: ../calculate-core/pym/core/wsdl_core.py:129 +#: ../calculate-core/pym/core/wsdl_core.py:85 +#: ../calculate-core/pym/core/wsdl_core.py:130 +#: ../calculate-core/pym/core/wsdl_core.py:651 msgid "Configure a package" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:235 +#: ../calculate-core/pym/core/variables/setup_package.py:363 msgid "Configure dependent packages in root" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:195 +#: ../calculate-core/pym/core/variables/setup_package.py:323 msgid "Configure the system" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:220 +#: ../calculate-core/pym/core/variables/setup_package.py:348 msgid "Configure users" msgstr "" @@ -510,12 +519,12 @@ msgstr "" msgid "Configuring dependencies: %s" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:344 -#: ../calculate-core/pym/core/wsdl_core.py:483 +#: ../calculate-core/pym/core/wsdl_core.py:345 +#: ../calculate-core/pym/core/wsdl_core.py:484 msgid "Confirm" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:530 +#: ../calculate-core/pym/core/wsdl_core.py:531 msgid "Confirm the Request" msgstr "" @@ -545,11 +554,11 @@ msgstr "" msgid "Create symlinks for methods" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:629 +#: ../calculate-core/pym/core/wsdl_core.py:668 msgid "Custom Action" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:649 +#: ../calculate-core/pym/core/wsdl_core.py:688 msgid "Custom action" msgstr "" @@ -557,19 +566,19 @@ msgstr "" msgid "Date" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:307 -#: ../calculate-core/pym/core/wsdl_core.py:412 -#: ../calculate-core/pym/core/wsdl_core.py:486 -#: ../calculate-core/pym/core/wsdl_core.py:520 -#: ../calculate-core/pym/core/wsdl_core.py:552 +#: ../calculate-core/pym/core/wsdl_core.py:308 +#: ../calculate-core/pym/core/wsdl_core.py:413 +#: ../calculate-core/pym/core/wsdl_core.py:487 +#: ../calculate-core/pym/core/wsdl_core.py:521 +#: ../calculate-core/pym/core/wsdl_core.py:553 msgid "Delete" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:390 +#: ../calculate-core/pym/core/wsdl_core.py:391 msgid "Delete the Group" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:498 +#: ../calculate-core/pym/core/wsdl_core.py:499 msgid "Delete the Request" msgstr "" @@ -582,12 +591,12 @@ msgstr "" msgid "Delete the client certificate with ID %d? y/[n]: " msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:410 +#: ../calculate-core/pym/core/wsdl_core.py:411 msgid "Delete the group" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:518 -#: ../calculate-core/pym/core/wsdl_core.py:550 +#: ../calculate-core/pym/core/wsdl_core.py:519 +#: ../calculate-core/pym/core/wsdl_core.py:551 msgid "Delete the request" msgstr "" @@ -600,7 +609,7 @@ msgstr "" msgid "Deleting manually interrupted" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:181 +#: ../calculate-core/pym/core/variables/setup_package.py:309 #, python-format msgid "Directory %s not found" msgstr "" @@ -622,7 +631,7 @@ msgstr "" msgid "Do you really want to remove all certificates, requests and config files from the server?" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:343 +#: ../calculate-core/pym/core/wsdl_core.py:344 msgid "Done" msgstr "" @@ -655,12 +664,12 @@ msgstr "" msgid "Error creating directory %s" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:774 +#: ../calculate-core/pym/core/server/methods_func.py:778 #, python-format msgid "Error in field '%s'. " msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:778 +#: ../calculate-core/pym/core/server/methods_func.py:782 msgid "Error in parameter " msgstr "" @@ -706,6 +715,7 @@ msgid "Failed to clear the cache! " msgstr "" #: ../calculate-core/pym/core/utils/cl_core_setup.py:37 +#: ../calculate-core/pym/core/utils/cl_config.py:37 msgid "Failed to configure the system!" msgstr "" @@ -922,12 +932,12 @@ msgstr "" msgid "Group %s does not exist" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:279 +#: ../calculate-core/pym/core/wsdl_core.py:280 msgid "Group Details" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:297 -#: ../calculate-core/pym/core/wsdl_core.py:474 +#: ../calculate-core/pym/core/wsdl_core.py:298 +#: ../calculate-core/pym/core/wsdl_core.py:475 msgid "Group details" msgstr "" @@ -965,7 +975,7 @@ msgstr "" #: ../calculate-core/pym/core/server/certificate.py:47 #: ../calculate-core/pym/core/server/groups.py:44 -#: ../calculate-core/pym/core/wsdl_core.py:267 +#: ../calculate-core/pym/core/wsdl_core.py:268 msgid "Groups" msgstr "" @@ -1047,7 +1057,7 @@ msgstr "" msgid "MAC: %s" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:268 +#: ../calculate-core/pym/core/variables/setup_package.py:396 msgid "Machine architecture" msgstr "" @@ -1087,11 +1097,11 @@ msgstr "" msgid "Modification of variables manually interrupted" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:319 +#: ../calculate-core/pym/core/wsdl_core.py:320 msgid "Modify Group" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:339 +#: ../calculate-core/pym/core/wsdl_core.py:340 msgid "Modify group" msgstr "" @@ -1114,9 +1124,9 @@ msgstr "" #: ../calculate-core/pym/core/server/func.py:125 #: ../calculate-core/pym/core/server/func.py:1790 -#: ../calculate-core/pym/core/wsdl_core.py:202 -#: ../calculate-core/pym/core/wsdl_core.py:269 -#: ../calculate-core/pym/core/wsdl_core.py:446 +#: ../calculate-core/pym/core/wsdl_core.py:203 +#: ../calculate-core/pym/core/wsdl_core.py:270 +#: ../calculate-core/pym/core/wsdl_core.py:447 msgid "Next" msgstr "" @@ -1216,30 +1226,33 @@ msgstr "" msgid "PIDs not found for this session!" msgstr "" -#: ../calculate-core/pym/core/setup_package.py:167 -#: ../calculate-core/pym/core/setup_package.py:170 -#: ../calculate-core/pym/core/setup_package.py:230 +#: ../calculate-core/pym/core/setup_package.py:171 +#: ../calculate-core/pym/core/setup_package.py:174 +#: ../calculate-core/pym/core/setup_package.py:234 +#: ../calculate-core/pym/core/setup_package.py:364 #, python-format msgid "Package %s" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:132 +#: ../calculate-core/pym/core/variables/setup_package.py:260 msgid "Package category" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:45 +#: ../calculate-core/pym/core/variables/setup_package.py:47 msgid "Package name" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:53 +#: ../calculate-core/pym/core/variables/setup_package.py:55 msgid "Package not found" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:105 +#: ../calculate-core/pym/core/variables/setup_package.py:156 +#: ../calculate-core/pym/core/variables/setup_package.py:184 msgid "Package slot" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:78 +#: ../calculate-core/pym/core/variables/setup_package.py:80 +#: ../calculate-core/pym/core/variables/setup_package.py:126 msgid "Package version" msgstr "" @@ -1259,25 +1272,25 @@ msgstr "" msgid "Page offset" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:556 +#: ../calculate-core/pym/core/server/methods_func.py:560 msgid "Password" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:677 +#: ../calculate-core/pym/core/server/methods_func.py:681 #, python-format msgid "Password for %s: " msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:97 +#: ../calculate-core/pym/core/server/methods_func.py:101 msgid "Password: " msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:109 +#: ../calculate-core/pym/core/server/methods_func.py:113 #: ../calculate-core/pym/core/result_viewer.py:326 msgid "Passwords do not match" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:107 +#: ../calculate-core/pym/core/wsdl_core.py:108 msgid "Patch" msgstr "" @@ -1285,12 +1298,12 @@ msgstr "" msgid "Patching manually interrupted" msgstr "" -#: ../calculate-core/pym/core/setup_package.py:233 +#: ../calculate-core/pym/core/setup_package.py:237 #, python-format msgid "Path '%s' does not exist" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:176 +#: ../calculate-core/pym/core/variables/setup_package.py:304 msgid "Path for configuration" msgstr "" @@ -1308,19 +1321,25 @@ msgstr "" msgid "Permissions: " msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:50 +#: ../calculate-core/pym/core/variables/setup_package.py:52 msgid "Please choose a package" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:163 +#: ../calculate-core/pym/core/variables/setup_package.py:291 msgid "Please choose the category" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:118 +#: ../calculate-core/pym/core/variables/setup_package.py:172 +#: ../calculate-core/pym/core/variables/setup_package.py:227 +#: ../calculate-core/pym/core/variables/setup_package.py:231 +#: ../calculate-core/pym/core/variables/setup_package.py:245 msgid "Please choose the slot" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:92 +#: ../calculate-core/pym/core/variables/setup_package.py:97 +#: ../calculate-core/pym/core/variables/setup_package.py:101 +#: ../calculate-core/pym/core/variables/setup_package.py:112 +#: ../calculate-core/pym/core/variables/setup_package.py:143 msgid "Please choose the version" msgstr "" @@ -1380,16 +1399,16 @@ msgstr "" msgid "Remote" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:678 +#: ../calculate-core/pym/core/server/methods_func.py:682 #, python-format msgid "Repeat password for %s: " msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:558 +#: ../calculate-core/pym/core/server/methods_func.py:562 msgid "Repeat password: " msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:99 +#: ../calculate-core/pym/core/server/methods_func.py:103 #: ../calculate-core/pym/core/result_viewer.py:318 msgid "Repeat: " msgstr "" @@ -1417,7 +1436,7 @@ msgstr "" msgid "Request %s not found!" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:456 +#: ../calculate-core/pym/core/wsdl_core.py:457 msgid "Request Details" msgstr "" @@ -1472,7 +1491,7 @@ msgstr "" msgid "Request signed" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:667 +#: ../calculate-core/pym/core/wsdl_core.py:706 msgid "Restart calculate-core" msgstr "" @@ -1492,7 +1511,7 @@ msgstr "" msgid "Restoration from backup manually interrupted" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:728 +#: ../calculate-core/pym/core/wsdl_core.py:767 msgid "Restore" msgstr "" @@ -1532,12 +1551,13 @@ msgstr "" msgid "Root certificate or private key not found" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:97 -#: ../calculate-core/pym/core/wsdl_core.py:138 -#: ../calculate-core/pym/core/wsdl_core.py:657 -#: ../calculate-core/pym/core/wsdl_core.py:718 -#: ../calculate-core/pym/core/wsdl_core.py:752 -#: ../calculate-core/pym/core/wsdl_core.py:753 +#: ../calculate-core/pym/core/wsdl_core.py:98 +#: ../calculate-core/pym/core/wsdl_core.py:139 +#: ../calculate-core/pym/core/wsdl_core.py:658 +#: ../calculate-core/pym/core/wsdl_core.py:696 +#: ../calculate-core/pym/core/wsdl_core.py:757 +#: ../calculate-core/pym/core/wsdl_core.py:791 +#: ../calculate-core/pym/core/wsdl_core.py:792 msgid "Run" msgstr "" @@ -1560,7 +1580,7 @@ msgstr "" msgid "SSL library is not support TLSv1_2" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:585 +#: ../calculate-core/pym/core/wsdl_core.py:586 msgid "Save" msgstr "" @@ -1634,32 +1654,32 @@ msgstr "" msgid "Settings ignored for following packages: %s" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:562 +#: ../calculate-core/pym/core/wsdl_core.py:563 msgid "Setup Variables" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:583 -#: ../calculate-core/pym/core/wsdl_core.py:615 +#: ../calculate-core/pym/core/wsdl_core.py:584 +#: ../calculate-core/pym/core/wsdl_core.py:616 msgid "Setup variables" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:619 +#: ../calculate-core/pym/core/wsdl_core.py:620 msgid "Show" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:178 +#: ../calculate-core/pym/core/wsdl_core.py:179 msgid "Show Certificates" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:245 +#: ../calculate-core/pym/core/wsdl_core.py:246 msgid "Show Groups" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:422 +#: ../calculate-core/pym/core/wsdl_core.py:423 msgid "Show Requests" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:444 +#: ../calculate-core/pym/core/wsdl_core.py:445 msgid "Show requests" msgstr "" @@ -1709,17 +1729,18 @@ msgstr "" msgid "System" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:716 +#: ../calculate-core/pym/core/wsdl_core.py:755 msgid "System backup" msgstr "" -#: ../calculate-core/pym/core/setup_package.py:279 +#: ../calculate-core/pym/core/setup_package.py:286 +#: ../calculate-core/pym/core/setup_package.py:407 #, python-brace-format msgid "System configuring for {nameProgram} package by Calculate Utilities" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:749 -#: ../calculate-core/pym/core/wsdl_core.py:754 +#: ../calculate-core/pym/core/wsdl_core.py:788 +#: ../calculate-core/pym/core/wsdl_core.py:793 msgid "System restore" msgstr "" @@ -1828,6 +1849,7 @@ msgid "The signature request was rejected!" msgstr "" #: ../calculate-core/pym/core/utils/cl_core_setup.py:35 +#: ../calculate-core/pym/core/utils/cl_config.py:35 msgid "The system is being configured" msgstr "" @@ -1888,11 +1910,11 @@ msgstr "" msgid "Untrusted server certificate!" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:146 +#: ../calculate-core/pym/core/wsdl_core.py:147 msgid "Update " msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:148 +#: ../calculate-core/pym/core/wsdl_core.py:149 msgid "Update Settings" msgstr "" @@ -1900,11 +1922,12 @@ msgstr "" msgid "Updating configuration files" msgstr "" -#: ../calculate-core/pym/core/setup_package.py:231 +#: ../calculate-core/pym/core/setup_package.py:235 +#: ../calculate-core/pym/core/setup_package.py:365 msgid "Updating system cofiguration files" msgstr "" -#: ../calculate-core/pym/core/setup_package.py:171 +#: ../calculate-core/pym/core/setup_package.py:175 msgid "Updating user configuration files" msgstr "" @@ -1912,17 +1935,17 @@ msgstr "" msgid "Use new" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:769 +#: ../calculate-core/pym/core/server/methods_func.py:773 msgid "Use the parameter" msgstr "" #: ../calculate-core/pym/core/server/cl_server.py:160 -#: ../calculate-core/pym/core/variables/setup_package.py:252 +#: ../calculate-core/pym/core/variables/setup_package.py:380 #, python-format msgid "User %s does not exist" msgstr "" -#: ../calculate-core/pym/core/setup_package.py:202 +#: ../calculate-core/pym/core/setup_package.py:206 #, python-brace-format msgid "User configuring the {nameProgram} package by Calculate Utilities" msgstr "" @@ -1948,7 +1971,7 @@ msgstr "" msgid "Username [%s]: " msgstr "" -#: ../calculate-core/pym/core/setup_package.py:304 +#: ../calculate-core/pym/core/setup_package.py:311 #, python-brace-format msgid "Using patches for the {nameProgram} package by Calculate Utilities" msgstr "" @@ -1957,13 +1980,13 @@ msgstr "" msgid "Using the root certificate as the server certificate" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:176 -#: ../calculate-core/pym/core/wsdl_core.py:243 -#: ../calculate-core/pym/core/wsdl_core.py:420 -#: ../calculate-core/pym/core/wsdl_core.py:560 -#: ../calculate-core/pym/core/wsdl_core.py:593 -#: ../calculate-core/pym/core/wsdl_core.py:627 -#: ../calculate-core/pym/core/wsdl_core.py:665 +#: ../calculate-core/pym/core/wsdl_core.py:177 +#: ../calculate-core/pym/core/wsdl_core.py:244 +#: ../calculate-core/pym/core/wsdl_core.py:421 +#: ../calculate-core/pym/core/wsdl_core.py:561 +#: ../calculate-core/pym/core/wsdl_core.py:594 +#: ../calculate-core/pym/core/wsdl_core.py:666 +#: ../calculate-core/pym/core/wsdl_core.py:704 msgid "Utilities" msgstr "" @@ -1996,7 +2019,7 @@ msgstr "" msgid "Verbose output" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:595 +#: ../calculate-core/pym/core/wsdl_core.py:596 msgid "View Variables" msgstr "" @@ -2017,7 +2040,7 @@ msgstr "" msgid "WARNING!!! %s trying to replace the certificate!" msgstr "" -#: ../calculate-core/pym/core/setup_package.py:336 +#: ../calculate-core/pym/core/setup_package.py:343 msgid "Would you like to terminate these tasks?" msgstr "" @@ -2025,8 +2048,8 @@ msgstr "" msgid "Writable" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:620 -#: ../calculate-core/pym/core/server/methods_func.py:642 +#: ../calculate-core/pym/core/server/methods_func.py:624 +#: ../calculate-core/pym/core/server/methods_func.py:646 #, python-format msgid "Wrong %s value syntax" msgstr "" @@ -2044,11 +2067,11 @@ msgstr "" msgid "Wrong normal varaiables list" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:420 +#: ../calculate-core/pym/core/server/methods_func.py:424 msgid "Wrong option " msgstr "" -#: ../calculate-core/pym/core/setup_package.py:168 +#: ../calculate-core/pym/core/setup_package.py:172 msgid "X session users not found" msgstr "" @@ -2069,7 +2092,7 @@ msgstr "" msgid "You do not have a certificate. Use option --gen-cert-by HOST to generate a new certificate or --get-cert-from HOST to get the certificate from the server." msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:216 +#: ../calculate-core/pym/core/variables/setup_package.py:344 msgid "You must not choose only clt location for desktop templates" msgstr "" @@ -2137,7 +2160,7 @@ msgstr "" msgid "configuration check" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:236 +#: ../calculate-core/pym/core/variables/setup_package.py:364 msgid "configure the dependent packages in the same directory as the specified package, instead of root" msgstr "" @@ -2252,19 +2275,21 @@ msgstr "" msgid "operations with certificates (number or \"all\"). Server not running." msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:133 +#: ../calculate-core/pym/core/variables/setup_package.py:261 msgid "package category name" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:46 +#: ../calculate-core/pym/core/variables/setup_package.py:48 msgid "package name" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:106 +#: ../calculate-core/pym/core/variables/setup_package.py:157 +#: ../calculate-core/pym/core/variables/setup_package.py:185 msgid "package slot" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:79 +#: ../calculate-core/pym/core/variables/setup_package.py:81 +#: ../calculate-core/pym/core/variables/setup_package.py:127 msgid "package version number with the revision" msgstr "" @@ -2352,7 +2377,7 @@ msgstr "" msgid "root certificate not found (use cl-core with option --gen-root-cert)" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:177 +#: ../calculate-core/pym/core/variables/setup_package.py:305 msgid "root path for saving the updated configuration files" msgstr "" @@ -2369,7 +2394,7 @@ msgstr "" msgid "server started" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:269 +#: ../calculate-core/pym/core/variables/setup_package.py:397 msgid "set machine architecture" msgstr "" @@ -2410,7 +2435,7 @@ msgid "signature request deleted" msgstr "" #: ../calculate-core/pym/core/server/cert_cmd.py:1229 -#: ../calculate-core/pym/core/server/methods_func.py:285 +#: ../calculate-core/pym/core/server/methods_func.py:289 msgid "silent during the process" msgstr "" @@ -2427,7 +2452,7 @@ msgstr "" msgid "the private key and request now exist" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:71 +#: ../calculate-core/pym/core/server/methods_func.py:75 #, python-brace-format msgid "the value may be {0}" msgstr "" @@ -2436,11 +2461,11 @@ msgstr "" msgid "to change permissions, the certificate number must be integer" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:221 +#: ../calculate-core/pym/core/variables/setup_package.py:349 msgid "updating desktop (user) configuration files" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:196 +#: ../calculate-core/pym/core/variables/setup_package.py:324 msgid "updating system configuration files" msgstr "" diff --git a/pot/cl_install3.pot b/pot/cl_install3.pot index 752897c..97c01dd 100644 --- a/pot/cl_install3.pot +++ b/pot/cl_install3.pot @@ -30,15 +30,15 @@ msgstr "" msgid "AMD Radeon (radeon)" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:199 +#: ../calculate-install/pym/install/variables/net.py:215 msgid "Addresses" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:372 +#: ../calculate-install/pym/install/variables/system.py:395 msgid "Administrator" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:465 +#: ../calculate-install/pym/install/variables/autopartition.py:468 msgid "Allocate drive space" msgstr "" @@ -46,7 +46,7 @@ msgstr "" msgid "Architecture of the target system must be x86_64" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:538 +#: ../calculate-install/pym/install/variables/autopartition.py:541 msgid "Architecture of the target system must be x86_64 for using the UEFI bootloader" msgstr "" @@ -74,9 +74,9 @@ msgstr "" msgid "Audio system" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:367 #: ../calculate-install/pym/install/variables/distr.py:411 -#: ../calculate-install/pym/install/variables/X11.py:354 +#: ../calculate-install/pym/install/variables/X11.py:358 +#: ../calculate-install/pym/install/variables/net.py:405 msgid "Auto" msgstr "" @@ -84,15 +84,15 @@ msgstr "" msgid "Auto detection" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:534 +#: ../calculate-install/pym/install/variables/system.py:557 msgid "Autologin" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:58 +#: ../calculate-install/pym/install/variables/system.py:59 msgid "Autologin is available for Xorg sessions only" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:572 +#: ../calculate-install/pym/install/variables/system.py:595 #, python-format msgid "Autologin is unavailable for user %s" msgstr "" @@ -110,7 +110,7 @@ msgstr "" msgid "Boot" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:807 +#: ../calculate-install/pym/install/variables/system.py:830 msgid "Boot configuration is not available on a LiveCD" msgstr "" @@ -126,7 +126,7 @@ msgstr "" msgid "Bootloader" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:416 +#: ../calculate-install/pym/install/variables/net.py:454 msgid "CIDR" msgstr "" @@ -142,7 +142,7 @@ msgstr "" msgid "Click to select partitions to be created" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:308 +#: ../calculate-install/pym/install/variables/X11.py:311 msgid "Composite" msgstr "" @@ -160,7 +160,7 @@ msgstr "" msgid "Configuration manually interrupted" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:819 +#: ../calculate-install/pym/install/variables/system.py:842 msgid "Configure dynamic options only" msgstr "" @@ -188,9 +188,9 @@ msgstr "" msgid "Creating a new partition table" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:171 -#: ../calculate-install/pym/install/variables/net.py:365 -#: ../calculate-install/pym/install/variables/net.py:476 +#: ../calculate-install/pym/install/variables/net.py:187 +#: ../calculate-install/pym/install/variables/net.py:403 +#: ../calculate-install/pym/install/variables/net.py:514 msgid "DHCP" msgstr "" @@ -198,12 +198,12 @@ msgstr "" msgid "DISK bound for installation will be mounted to the MP directory. To create a bind mount point, you have to specify the source directory as DISK" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:525 +#: ../calculate-install/pym/install/variables/autopartition.py:528 msgid "Data partition" msgstr "" #: ../calculate-install/pym/install/variables/kernel.py:92 -#: ../calculate-install/pym/install/variables/system.py:461 +#: ../calculate-install/pym/install/variables/system.py:484 msgid "Default" msgstr "" @@ -211,7 +211,7 @@ msgstr "" msgid "Default audio card" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:308 +#: ../calculate-install/pym/install/variables/autopartition.py:311 #, python-format msgid "Device %s is already in use by the current system" msgstr "" @@ -226,7 +226,7 @@ msgstr "" msgid "Device {device} has not BIOS Boot partition" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:279 +#: ../calculate-install/pym/install/variables/autopartition.py:282 #, python-brace-format msgid "Device {device} is used for {selected}" msgstr "" @@ -235,7 +235,7 @@ msgstr "" msgid "Devices for install" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:274 +#: ../calculate-install/pym/install/variables/autopartition.py:277 #, python-brace-format msgid "Devices {devices} are used for {selected}" msgstr "" @@ -244,7 +244,7 @@ msgstr "" msgid "Directory already mounted" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:366 +#: ../calculate-install/pym/install/variables/net.py:404 msgid "Disabled" msgstr "" @@ -257,7 +257,7 @@ msgstr "" msgid "Disk or directory" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:232 +#: ../calculate-install/pym/install/variables/autopartition.py:235 #, python-brace-format msgid "" "Disks {selecteddisk} are part of {agrtype}\n" @@ -268,26 +268,26 @@ msgstr "" msgid "Distribution" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:852 +#: ../calculate-install/pym/install/variables/net.py:890 msgid "Domain name server" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:281 +#: ../calculate-install/pym/install/variables/system.py:304 msgid "Encrypt user profiles" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:145 -#: ../calculate-install/pym/install/variables/system.py:510 +#: ../calculate-install/pym/install/variables/system.py:168 +#: ../calculate-install/pym/install/variables/system.py:533 #, python-format msgid "Enter password for user %s" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:470 +#: ../calculate-install/pym/install/variables/autopartition.py:473 #, python-format msgid "Erase disk and install %s" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:105 +#: ../calculate-install/pym/install/variables/X11.py:106 msgid "Example" msgstr "" @@ -351,7 +351,7 @@ msgstr "" msgid "Failed to create the ISO image" msgstr "" -#: ../calculate-install/pym/install/install.py:463 +#: ../calculate-install/pym/install/install.py:464 msgid "Failed to create the UEFI boot record" msgstr "" @@ -369,22 +369,22 @@ msgstr "" msgid "Failed to create the user's home directory" msgstr "" -#: ../calculate-install/pym/install/install.py:490 +#: ../calculate-install/pym/install/install.py:491 msgid "Failed to determine mbr" msgstr "" -#: ../calculate-install/pym/install/install.py:483 +#: ../calculate-install/pym/install/install.py:484 msgid "Failed to determine the boot disk" msgstr "" -#: ../calculate-install/pym/install/install.py:105 #: ../calculate-install/pym/install/distr.py:1248 +#: ../calculate-install/pym/install/install.py:106 #, python-format msgid "Failed to determine the parent device for %s" msgstr "" -#: ../calculate-install/pym/install/install.py:127 #: ../calculate-install/pym/install/distr.py:1259 +#: ../calculate-install/pym/install/install.py:128 #, python-format msgid "Failed to determine the partition number for %s" msgstr "" @@ -394,7 +394,7 @@ msgstr "" msgid "Failed to execute 'mkswap %s': the swap partition is used by the current system" msgstr "" -#: ../calculate-install/pym/install/install.py:191 +#: ../calculate-install/pym/install/install.py:192 #, python-format msgid "Failed to find partition %s after changing the activity" msgstr "" @@ -425,7 +425,7 @@ msgstr "" msgid "Failed to found partition %s after changing the system ID" msgstr "" -#: ../calculate-install/pym/install/install.py:633 +#: ../calculate-install/pym/install/install.py:634 #, python-format msgid "Failed to found partition %s after creating the partition table" msgstr "" @@ -434,18 +434,18 @@ msgstr "" msgid "Failed to get size of the squash image" msgstr "" -#: ../calculate-install/pym/install/install.py:214 +#: ../calculate-install/pym/install/install.py:215 #, python-format msgid "" "Failed to install syslinux\n" "%s" msgstr "" -#: ../calculate-install/pym/install/install.py:226 -#: ../calculate-install/pym/install/install.py:291 -#: ../calculate-install/pym/install/install.py:448 -#: ../calculate-install/pym/install/install.py:473 -#: ../calculate-install/pym/install/install.py:496 +#: ../calculate-install/pym/install/install.py:227 +#: ../calculate-install/pym/install/install.py:292 +#: ../calculate-install/pym/install/install.py:449 +#: ../calculate-install/pym/install/install.py:474 +#: ../calculate-install/pym/install/install.py:497 msgid "Failed to install the bootloader" msgstr "" @@ -453,7 +453,7 @@ msgstr "" msgid "Failed to install the system!" msgstr "" -#: ../calculate-install/pym/install/install.py:757 +#: ../calculate-install/pym/install/install.py:758 msgid "Failed to migrate users onto the new system" msgstr "" @@ -507,7 +507,7 @@ msgstr "" msgid "Failed to use attributes (%s) " msgstr "" -#: ../calculate-install/pym/install/install.py:206 +#: ../calculate-install/pym/install/install.py:207 #, python-format msgid "" "Failed to write the master boot record\n" @@ -533,11 +533,11 @@ msgstr "" msgid "Filesystem '%s' is not available" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:443 +#: ../calculate-install/pym/install/variables/autopartition.py:446 msgid "Filesystem for data partition" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:428 +#: ../calculate-install/pym/install/variables/autopartition.py:431 msgid "Filesystem for root partition" msgstr "" @@ -573,12 +573,12 @@ msgstr "" msgid "For Flash install, you need only one disk" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:841 +#: ../calculate-install/pym/install/variables/system.py:864 #, python-format msgid "For PXE install, you need to install package %s" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:298 +#: ../calculate-install/pym/install/variables/autopartition.py:301 msgid "For autopartition, please select the device" msgstr "" @@ -591,50 +591,54 @@ msgid "Format the USB Flash" msgstr "" #: ../calculate-install/pym/install/utils/cl_install.py:54 -#: ../calculate-install/pym/install/install.py:333 +#: ../calculate-install/pym/install/install.py:334 msgid "Formatting the partitions" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:351 -#: ../calculate-install/pym/install/variables/X11.py:376 +#: ../calculate-install/pym/install/variables/X11.py:58 +msgid "Framebuffer device (modesetting)" +msgstr "" + +#: ../calculate-install/pym/install/variables/X11.py:355 +#: ../calculate-install/pym/install/variables/X11.py:380 msgid "Framebuffer resolution" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:377 +#: ../calculate-install/pym/install/variables/system.py:400 msgid "Full access" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:582 +#: ../calculate-install/pym/install/variables/net.py:620 msgid "Gateway" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:605 +#: ../calculate-install/pym/install/variables/net.py:643 #, python-format msgid "Gateways %s are unreachable" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:60 +#: ../calculate-install/pym/install/variables/X11.py:61 msgid "Generic VESA (vesa)" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:839 -#: ../calculate-install/pym/install/variables/net.py:873 +#: ../calculate-install/pym/install/variables/net.py:877 +#: ../calculate-install/pym/install/variables/net.py:911 msgid "Get via DHCP" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:424 +#: ../calculate-install/pym/install/variables/system.py:447 msgid "Groups" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:914 +#: ../calculate-install/pym/install/variables/system.py:937 msgid "Grub configuration unavailable for Flash install" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:220 +#: ../calculate-install/pym/install/variables/system.py:243 msgid "Grub password" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:889 +#: ../calculate-install/pym/install/variables/system.py:912 msgid "Grub terminal" msgstr "" @@ -646,7 +650,7 @@ msgstr "" msgid "Hardware clock type" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:230 +#: ../calculate-install/pym/install/variables/net.py:246 msgid "Hostname" msgstr "" @@ -658,8 +662,8 @@ msgstr "" msgid "I/O scheduler unavailable for Flash install" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:325 -#: ../calculate-install/pym/install/variables/net.py:377 +#: ../calculate-install/pym/install/variables/net.py:363 +#: ../calculate-install/pym/install/variables/net.py:415 msgid "IP address" msgstr "" @@ -686,7 +690,7 @@ msgstr "" msgid "Incorrect mount point (bind '%(bindSrc)s' to '%(bindDst)s')" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:264 +#: ../calculate-install/pym/install/variables/X11.py:267 #, python-format msgid "Install driver %s with:" msgstr "" @@ -719,7 +723,7 @@ msgstr "" msgid "Installation manually interrupted" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:866 +#: ../calculate-install/pym/install/variables/system.py:889 msgid "Installation path" msgstr "" @@ -736,8 +740,8 @@ msgstr "" msgid "Intel (intel)" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:140 -#: ../calculate-install/pym/install/variables/net.py:618 +#: ../calculate-install/pym/install/variables/net.py:156 +#: ../calculate-install/pym/install/variables/net.py:656 msgid "Interface" msgstr "" @@ -775,7 +779,7 @@ msgstr "" msgid "Locale configuration unavailable for Flash install" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:311 +#: ../calculate-install/pym/install/variables/net.py:349 msgid "MAC" msgstr "" @@ -783,11 +787,15 @@ msgstr "" msgid "MBR is not used with the UEFI bootloader" msgstr "" +#: ../calculate-install/pym/install/variables/net.py:328 +msgid "Mac type" +msgstr "" + #: ../calculate-install/pym/install/variables/net.py:97 msgid "Manually network configuration" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:433 +#: ../calculate-install/pym/install/variables/net.py:471 msgid "Mask" msgstr "" @@ -796,8 +804,8 @@ msgid "Migrate network settings" msgstr "" #: ../calculate-install/pym/install/utils/cl_install.py:113 -#: ../calculate-install/pym/install/variables/system.py:312 #: ../calculate-install/pym/install/variables/system.py:335 +#: ../calculate-install/pym/install/variables/system.py:358 msgid "Migrating users" msgstr "" @@ -819,19 +827,19 @@ msgstr "" msgid "NTP server" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:281 +#: ../calculate-install/pym/install/variables/net.py:297 msgid "Name" msgstr "" #: ../calculate-install/pym/install/variables/net.py:92 -#: ../calculate-install/pym/install/variables/net.py:401 -#: ../calculate-install/pym/install/variables/net.py:554 +#: ../calculate-install/pym/install/variables/net.py:439 +#: ../calculate-install/pym/install/variables/net.py:592 #: ../calculate-install/pym/install/wsdl_install.py:243 #: ../calculate-install/pym/install/wsdl_install.py:258 msgid "Network" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:571 +#: ../calculate-install/pym/install/variables/net.py:609 #, python-format msgid "Network '%s' is used more than once" msgstr "" @@ -840,17 +848,17 @@ msgstr "" msgid "Network configuration is unavailable for Flash install" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:210 +#: ../calculate-install/pym/install/variables/net.py:226 #, python-format msgid "Network interface %s not found" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:201 +#: ../calculate-install/pym/install/variables/net.py:217 #, python-format msgid "Network interface, DHCP or IP address and network mask (example: %s)" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:782 +#: ../calculate-install/pym/install/variables/net.py:820 msgid "Network manager" msgstr "" @@ -870,11 +878,11 @@ msgstr "" msgid "Network settings unavailable with use settings migration" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:757 +#: ../calculate-install/pym/install/variables/net.py:795 msgid "NetworkManager" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:559 +#: ../calculate-install/pym/install/variables/system.py:582 msgid "No autologin" msgstr "" @@ -891,36 +899,36 @@ msgstr "" msgid "Not enough free space on the USB Flash" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:841 -#: ../calculate-install/pym/install/variables/net.py:875 #: ../calculate-install/pym/install/variables/distr.py:410 #: ../calculate-install/pym/install/variables/distr.py:415 #: ../calculate-install/pym/install/variables/distr.py:433 #: ../calculate-install/pym/install/variables/distr.py:444 #: ../calculate-install/pym/install/variables/distr.py:458 #: ../calculate-install/pym/install/variables/distr.py:472 -#: ../calculate-install/pym/install/variables/system.py:575 +#: ../calculate-install/pym/install/variables/system.py:598 +#: ../calculate-install/pym/install/variables/net.py:879 +#: ../calculate-install/pym/install/variables/net.py:913 msgid "Not used" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:59 +#: ../calculate-install/pym/install/variables/X11.py:60 msgid "Nvidia Graphics Driver (nvidia)" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:58 +#: ../calculate-install/pym/install/variables/X11.py:59 msgid "Nvidia Nouveau (nouveau)" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:174 +#: ../calculate-install/pym/install/variables/net.py:190 msgid "Off" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:257 +#: ../calculate-install/pym/install/variables/X11.py:260 #, python-format msgid "Only %s drivers are available" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:758 +#: ../calculate-install/pym/install/variables/net.py:796 msgid "OpenRC" msgstr "" @@ -937,19 +945,19 @@ msgstr "" msgid "PXE install does not support %s" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:835 +#: ../calculate-install/pym/install/variables/system.py:858 msgid "PXE install is available for Calculate Directory Server only" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:853 +#: ../calculate-install/pym/install/variables/system.py:876 msgid "PXE install is only available if the DHCP service has been configured first" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:898 +#: ../calculate-install/pym/install/variables/net.py:936 msgid "PXE server IP" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:621 +#: ../calculate-install/pym/install/variables/autopartition.py:624 msgid "Partition table" msgstr "" @@ -963,11 +971,11 @@ msgstr "" msgid "Partition {disk} already used for installation" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:508 +#: ../calculate-install/pym/install/variables/autopartition.py:511 msgid "Partitions options" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:471 +#: ../calculate-install/pym/install/variables/system.py:494 msgid "Password" msgstr "" @@ -975,7 +983,7 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:151 +#: ../calculate-install/pym/install/variables/system.py:174 msgid "Please enter a root password for Grub" msgstr "" @@ -1010,7 +1018,7 @@ msgstr "" msgid "PulseAudio" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:292 +#: ../calculate-install/pym/install/variables/autopartition.py:295 #, python-format msgid "RAID %s is wrong" msgstr "" @@ -1023,19 +1031,19 @@ msgstr "" msgid "Recovery is not implemented" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:271 +#: ../calculate-install/pym/install/variables/system.py:294 msgid "Remove the password protection on Grub" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:583 +#: ../calculate-install/pym/install/variables/autopartition.py:586 msgid "Root partition size" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:141 +#: ../calculate-install/pym/install/variables/system.py:164 msgid "Root password" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:499 +#: ../calculate-install/pym/install/variables/net.py:537 msgid "Routing" msgstr "" @@ -1057,19 +1065,19 @@ msgstr "" msgid "Save" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:121 +#: ../calculate-install/pym/install/variables/X11.py:122 msgid "Screen resolution" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:814 +#: ../calculate-install/pym/install/variables/net.py:852 msgid "Search domains" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:329 +#: ../calculate-install/pym/install/variables/autopartition.py:332 msgid "Selected devices have not BIOS boot partition" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:325 +#: ../calculate-install/pym/install/variables/autopartition.py:328 msgid "Selected devices have not EFI partition" msgstr "" @@ -1087,7 +1095,7 @@ msgstr "" msgid "Size" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:633 +#: ../calculate-install/pym/install/variables/net.py:671 msgid "Source IP" msgstr "" @@ -1107,7 +1115,7 @@ msgstr "" msgid "Start installing" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:523 +#: ../calculate-install/pym/install/variables/autopartition.py:526 msgid "Swap partition" msgstr "" @@ -1140,7 +1148,7 @@ msgstr "" msgid "System successfully installed!" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:378 +#: ../calculate-install/pym/install/variables/system.py:401 msgid "System update" msgstr "" @@ -1148,7 +1156,7 @@ msgstr "" msgid "The audio settings are being configured" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:585 +#: ../calculate-install/pym/install/variables/system.py:608 msgid "The autologin is not available with domain workstations" msgstr "" @@ -1174,7 +1182,7 @@ msgstr "" msgid "The following attributes are not specified: (%s)" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:245 +#: ../calculate-install/pym/install/variables/net.py:261 #, python-format msgid "The hostname length should be less than %d" msgstr "" @@ -1201,11 +1209,11 @@ msgstr "" msgid "The network settings are being configured" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:524 +#: ../calculate-install/pym/install/variables/autopartition.py:527 msgid "The partition for the update" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:542 +#: ../calculate-install/pym/install/variables/autopartition.py:545 msgid "The partition table must be GPT for using UEFI bootloader" msgstr "" @@ -1219,7 +1227,7 @@ msgstr "" msgid "The root partition should be at least %s" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:604 +#: ../calculate-install/pym/install/variables/autopartition.py:607 #, python-brace-format msgid "The root partition should be at least {size}" msgstr "" @@ -1258,7 +1266,7 @@ msgstr "" msgid "Themes configured!" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:73 +#: ../calculate-install/pym/install/variables/X11.py:74 msgid "This distribution does not provide a Xorg server" msgstr "" @@ -1268,7 +1276,7 @@ msgid "This distribution does not provide the ALSA sound" msgstr "" #: ../calculate-install/pym/install/variables/disk.py:2146 -#: ../calculate-install/pym/install/variables/autopartition.py:493 +#: ../calculate-install/pym/install/variables/autopartition.py:496 msgid "This option not used for Flash install" msgstr "" @@ -1324,16 +1332,16 @@ msgstr "" msgid "USB flash %s" msgstr "" -#: ../calculate-install/pym/install/install.py:567 +#: ../calculate-install/pym/install/install.py:568 msgid "Unable to change the I/O scheduler" msgstr "" -#: ../calculate-install/pym/install/install.py:737 +#: ../calculate-install/pym/install/install.py:738 #, python-format msgid "Unable to remove directory %s" msgstr "" -#: ../calculate-install/pym/install/install.py:731 +#: ../calculate-install/pym/install/install.py:732 #, python-format msgid "Unable to umount %s" msgstr "" @@ -1355,11 +1363,11 @@ msgstr "" msgid "Unable to use {part} partition used by active {typepart} for installation" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:299 #: ../calculate-install/pym/install/variables/disk.py:2089 #: ../calculate-install/pym/install/variables/disk.py:2191 #: ../calculate-install/pym/install/variables/disk.py:2491 #: ../calculate-install/pym/install/variables/autopartition.py:162 +#: ../calculate-install/pym/install/variables/net.py:315 msgid "Unknown" msgstr "" @@ -1395,11 +1403,11 @@ msgstr "" msgid "Update" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:977 +#: ../calculate-install/pym/install/variables/system.py:1000 msgid "Update configuration unavailable for Flash install" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:1007 +#: ../calculate-install/pym/install/variables/system.py:1030 msgid "Update packages at first boot" msgstr "" @@ -1411,7 +1419,7 @@ msgstr "" msgid "Updating the configuration" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:527 +#: ../calculate-install/pym/install/variables/autopartition.py:530 msgid "Use LVM" msgstr "" @@ -1419,23 +1427,23 @@ msgstr "" msgid "Use UUID" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:471 +#: ../calculate-install/pym/install/variables/autopartition.py:474 msgid "Use current partitions" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:526 +#: ../calculate-install/pym/install/variables/autopartition.py:529 msgid "Use the UEFI bootloader" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:201 +#: ../calculate-install/pym/install/variables/system.py:224 msgid "Use the root password to edit Grub" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:345 +#: ../calculate-install/pym/install/variables/system.py:368 msgid "User" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:569 +#: ../calculate-install/pym/install/variables/system.py:592 #, python-format msgid "User %s does not exist" msgstr "" @@ -1445,15 +1453,15 @@ msgstr "" msgid "User %s not found" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:56 +#: ../calculate-install/pym/install/variables/system.py:57 msgid "User configuration unavailable for Flash install" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:290 +#: ../calculate-install/pym/install/variables/system.py:313 msgid "User profile encryption is uncompatible with autologin" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:360 +#: ../calculate-install/pym/install/variables/system.py:383 msgid "Username is missing" msgstr "" @@ -1467,12 +1475,12 @@ msgstr "" msgid "Video" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:69 -#: ../calculate-install/pym/install/variables/X11.py:281 +#: ../calculate-install/pym/install/variables/X11.py:70 +#: ../calculate-install/pym/install/variables/X11.py:284 msgid "Video configuration unavailable for Flash install" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:203 +#: ../calculate-install/pym/install/variables/X11.py:206 msgid "Video driver" msgstr "" @@ -1493,17 +1501,17 @@ msgstr "" msgid "Wrong EFI device %s" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:362 +#: ../calculate-install/pym/install/variables/net.py:400 #, python-format msgid "Wrong IP address %s" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:647 +#: ../calculate-install/pym/install/variables/net.py:685 #, python-format msgid "Wrong IP address %s in the specified source IP" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:870 +#: ../calculate-install/pym/install/variables/net.py:908 msgid "Wrong IP address for DNS" msgstr "" @@ -1523,12 +1531,12 @@ msgstr "" msgid "Wrong distribution" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:596 +#: ../calculate-install/pym/install/variables/net.py:634 #, python-format msgid "Wrong gateway IP %s" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:242 +#: ../calculate-install/pym/install/variables/net.py:258 msgid "Wrong hostname" msgstr "" @@ -1538,7 +1546,7 @@ msgstr "" msgid "Wrong image file" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:459 +#: ../calculate-install/pym/install/variables/net.py:497 #, python-format msgid "Wrong mask %s" msgstr "" @@ -1548,17 +1556,17 @@ msgstr "" msgid "Wrong mount point '%s'" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:566 +#: ../calculate-install/pym/install/variables/net.py:604 #, python-format msgid "Wrong network %s" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:103 +#: ../calculate-install/pym/install/variables/X11.py:104 #, python-brace-format msgid "Wrong resolution {resolution} {example}" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:641 +#: ../calculate-install/pym/install/variables/net.py:679 #, python-format msgid "Wrong source IP %s" msgstr "" @@ -1576,7 +1584,7 @@ msgstr "" msgid "You cannot install the new system instead current" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:255 +#: ../calculate-install/pym/install/variables/system.py:278 msgid "You cannot set a password and remove the existing password at a time" msgstr "" @@ -1601,15 +1609,15 @@ msgid "Your boot device must have a BIOS Boot partition ({minsize})" msgstr "" #: ../calculate-install/pym/install/variables/disk.py:2102 -#: ../calculate-install/pym/install/variables/autopartition.py:534 +#: ../calculate-install/pym/install/variables/autopartition.py:537 msgid "Your system must be loaded in UEFI for using this bootloader" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:501 +#: ../calculate-install/pym/install/variables/net.py:539 msgid "add a routing rule (specified as NETWORK:GATEWAY[:DEV[:SOURCE]])" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:306 +#: ../calculate-install/pym/install/variables/system.py:329 msgid "add a user to the installed system. USER is username. ADMIN is administrator rights (none, all, update, none by default). GROUPS is list user supplimentary groups (comma delimeter). Use 'none' value to discard user migration" msgstr "" @@ -1618,11 +1626,11 @@ msgstr "" msgid "archive %s" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:798 +#: ../calculate-install/pym/install/variables/system.py:821 msgid "audio parameters" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:507 +#: ../calculate-install/pym/install/variables/autopartition.py:510 msgid "autopartition options" msgstr "" @@ -1630,7 +1638,7 @@ msgstr "" msgid "boot disk for the system bound for install" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:797 +#: ../calculate-install/pym/install/variables/system.py:820 msgid "boot parameters" msgstr "" @@ -1657,7 +1665,7 @@ msgstr "" msgid "command '%s' not found" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:820 +#: ../calculate-install/pym/install/variables/system.py:843 msgid "configure dynamic options only" msgstr "" @@ -1670,7 +1678,7 @@ msgstr "" msgid "directory '%s'" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:853 +#: ../calculate-install/pym/install/variables/net.py:891 msgid "domain name server (comma-separated)" msgstr "" @@ -1678,7 +1686,7 @@ msgstr "" msgid "empty" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:280 +#: ../calculate-install/pym/install/variables/system.py:303 msgid "encrypt user profiles" msgstr "" @@ -1687,7 +1695,7 @@ msgstr "" msgid "for {typedisk} install" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:890 +#: ../calculate-install/pym/install/variables/system.py:913 msgid "grub terminal" msgstr "" @@ -1710,15 +1718,15 @@ msgstr "" msgid "live image %s" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:795 +#: ../calculate-install/pym/install/variables/system.py:818 msgid "localization and time options" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:783 +#: ../calculate-install/pym/install/variables/net.py:821 msgid "network manager" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:794 +#: ../calculate-install/pym/install/variables/system.py:817 msgid "network settings" msgstr "" @@ -1727,7 +1735,7 @@ msgstr "" msgid "partition '%s'" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:867 +#: ../calculate-install/pym/install/variables/system.py:890 msgid "path for PXE install" msgstr "" @@ -1739,11 +1747,11 @@ msgstr "" msgid "reconfigure network" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:270 +#: ../calculate-install/pym/install/variables/system.py:293 msgid "remove the password protection for editing the Grub menu" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:815 +#: ../calculate-install/pym/install/variables/net.py:853 msgid "search domains (comma-separated)" msgstr "" @@ -1763,7 +1771,7 @@ msgstr "" msgid "select the processor architecture" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:800 +#: ../calculate-install/pym/install/variables/system.py:823 msgid "session settings" msgstr "" @@ -1771,23 +1779,23 @@ msgstr "" msgid "set UEFI boot disks" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:535 +#: ../calculate-install/pym/install/variables/system.py:558 msgid "set an autologin for the user, 'off' for disable" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:231 +#: ../calculate-install/pym/install/variables/net.py:247 msgid "set either the short or the full hostname" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:444 +#: ../calculate-install/pym/install/variables/autopartition.py:447 msgid "set filesystem for data partititon" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:429 +#: ../calculate-install/pym/install/variables/autopartition.py:432 msgid "set filesystem for root partititon" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:219 +#: ../calculate-install/pym/install/variables/system.py:242 msgid "set grub password" msgstr "" @@ -1803,7 +1811,7 @@ msgstr "" msgid "set the USB Flash device" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:120 +#: ../calculate-install/pym/install/variables/X11.py:121 msgid "set the Xorg resolution" msgstr "" @@ -1819,8 +1827,8 @@ msgstr "" msgid "set the device for autopartition" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:350 -#: ../calculate-install/pym/install/variables/X11.py:375 +#: ../calculate-install/pym/install/variables/X11.py:354 +#: ../calculate-install/pym/install/variables/X11.py:379 msgid "set the framebuffer resolution" msgstr "" @@ -1832,11 +1840,11 @@ msgstr "" msgid "set the locale" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:622 +#: ../calculate-install/pym/install/variables/autopartition.py:625 msgid "set the partition table for autopartition" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:584 +#: ../calculate-install/pym/install/variables/autopartition.py:587 msgid "set the root partition size for autopartition" msgstr "" @@ -1848,11 +1856,11 @@ msgstr "" msgid "set the timezone" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:202 +#: ../calculate-install/pym/install/variables/X11.py:205 msgid "set the video driver" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:140 +#: ../calculate-install/pym/install/variables/system.py:163 msgid "specify the root password" msgstr "" @@ -1866,7 +1874,7 @@ msgstr "" msgid "to" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:307 +#: ../calculate-install/pym/install/variables/X11.py:310 msgid "toggle composite" msgstr "" @@ -1874,11 +1882,11 @@ msgstr "" msgid "toggle the I/O scheduler" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:1006 +#: ../calculate-install/pym/install/variables/system.py:1029 msgid "update packages at first boot" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:799 +#: ../calculate-install/pym/install/variables/system.py:822 msgid "update themes" msgstr "" @@ -1886,7 +1894,7 @@ msgstr "" msgid "use UUID" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:466 +#: ../calculate-install/pym/install/variables/autopartition.py:469 msgid "use the autopartition" msgstr "" @@ -1894,24 +1902,24 @@ msgstr "" msgid "use the network migration" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:200 +#: ../calculate-install/pym/install/variables/system.py:223 msgid "use the root password to edit Grub" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:801 +#: ../calculate-install/pym/install/variables/system.py:824 msgid "user settings" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:300 +#: ../calculate-install/pym/install/variables/net.py:316 msgid "vendor" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:262 +#: ../calculate-install/pym/install/variables/X11.py:265 #, python-format msgid "video driver %s is unavailable" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:796 +#: ../calculate-install/pym/install/variables/system.py:819 msgid "video settings" msgstr "" diff --git a/pot/cl_lib3.pot b/pot/cl_lib3.pot index 30491ca..978c30e 100644 --- a/pot/cl_lib3.pot +++ b/pot/cl_lib3.pot @@ -1,4 +1,4 @@ -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3525 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3526 #, python-format msgid "%(name)s does not match %(nameElement)s in size" msgstr "" @@ -20,7 +20,7 @@ msgstr "" msgid "%s is not directory" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3453 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3454 #, python-format msgid "'%s' is not a number" msgstr "" @@ -31,7 +31,7 @@ msgstr "" #: ../calculate-lib/pym/calculate/lib/utils/mount.py:246 #: ../calculate-lib/pym/calculate/lib/utils/mount.py:256 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4547 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4548 msgid ":" msgstr "" @@ -44,66 +44,66 @@ msgstr "" #: ../calculate-lib/pym/calculate/lib/cl_template.py:1218 #: ../calculate-lib/pym/calculate/lib/cl_template.py:1220 #: ../calculate-lib/pym/calculate/lib/cl_template.py:2270 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4512 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5000 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5033 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5055 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4513 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5011 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5044 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5066 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5140 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5158 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5077 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5151 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5169 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5186 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5191 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5384 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5180 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5197 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5202 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5395 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5417 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5429 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5462 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5469 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5478 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5406 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5428 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5440 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5473 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5480 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5495 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5497 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5489 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5491 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5506 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5508 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5541 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5543 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5517 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5519 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5552 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5554 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5556 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5565 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5567 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5588 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5591 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5618 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5620 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5628 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5630 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5576 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5578 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5599 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5602 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5629 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5631 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5639 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5668 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5685 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5707 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5724 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5641 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5650 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5679 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5696 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5718 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5735 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5741 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5772 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5774 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5786 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5787 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6105 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6107 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6138 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6182 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6184 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6212 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6214 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6241 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6243 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6276 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6312 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6322 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6339 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6341 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6351 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5746 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5752 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5783 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5785 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5797 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5798 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6116 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6118 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6149 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6193 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6195 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6223 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6225 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6252 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6254 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6287 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6323 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6333 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6350 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6352 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6362 msgid ": " msgstr "" @@ -125,7 +125,7 @@ msgstr "" msgid "Ambiguous choice:%s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6094 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6105 msgid "Appling patch" msgstr "" @@ -163,7 +163,7 @@ msgstr "" msgid "Branch {branch} not found in repository {url}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4547 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4548 msgid "Calculate Utilities have changed files" msgstr "" @@ -181,6 +181,12 @@ msgstr "" msgid "Command not found '%s'" msgstr "" +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4860 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4869 +#, python-format +msgid "Config action is not support '%s' parameter" +msgstr "" + #: ../calculate-lib/pym/calculate/lib/format/dconf.py:68 msgid "Config is wrong" msgstr "" @@ -219,7 +225,7 @@ msgstr "" #: ../calculate-lib/pym/calculate/lib/encrypt.py:75 #: ../calculate-lib/pym/calculate/lib/encrypt.py:125 #: ../calculate-lib/pym/calculate/lib/encrypt.py:129 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4016 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4017 msgid "ERROR" msgstr "" @@ -228,7 +234,7 @@ msgstr "" msgid "Each entry must contains %d field(s)" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4001 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4002 msgid "Empty oct value" msgstr "" @@ -251,26 +257,26 @@ msgstr "" msgid "Error in profile calculate.env" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6308 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6319 #, python-format msgid "Error in template %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4329 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4330 msgid "Example:" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4919 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4927 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4930 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4938 #, python-format msgid "Failed to apply template file %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5671 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5682 msgid "Failed to change the current directory to" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4851 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4852 #, python-format msgid "Failed to change version of %s" msgstr "" @@ -280,7 +286,7 @@ msgstr "" msgid "Failed to clean the {rpath} repository" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5480 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5491 msgid "Failed to clear the file" msgstr "" @@ -301,7 +307,7 @@ msgstr "" msgid "Failed to copy '%(src)s' to '%(dst)s'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4631 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4632 #, python-brace-format msgid "Failed to copy {ffrom} to {fto}" msgstr "" @@ -318,7 +324,7 @@ msgstr "" msgid "Failed to create LVM" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5787 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5798 msgid "Failed to create a symbolic link" msgstr "" @@ -331,14 +337,14 @@ msgstr "" msgid "Failed to create tarball: %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4053 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4065 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4054 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4066 msgid "Failed to create the directory: " msgstr "" #: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:142 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5543 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5641 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5554 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5652 msgid "Failed to create the file" msgstr "" @@ -347,25 +353,25 @@ msgstr "" msgid "Failed to create volume %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5097 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5112 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5108 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5123 msgid "Failed to delete the directory: " msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5508 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5567 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5591 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5630 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5774 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5519 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5578 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5602 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5641 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5785 msgid "Failed to delete the file" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5497 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5556 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5508 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5567 msgid "Failed to delete the link" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5119 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5130 msgid "Failed to delete: " msgstr "" @@ -388,16 +394,16 @@ msgid "Failed to determine the system profile" msgstr "" #: ../calculate-lib/pym/calculate/lib/cl_template.py:2270 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4512 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6107 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6184 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6214 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6243 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6341 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4513 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6118 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6195 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6225 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6254 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6352 msgid "Failed to execute" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5463 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5474 #, python-format msgid "Failed to execute %s" msgstr "" @@ -431,12 +437,12 @@ msgstr "" msgid "Failed to get value %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1578 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1579 #, python-brace-format msgid "Failed to hide {packages}: {error}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1603 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1604 #, python-brace-format msgid "Failed to hide {package}: {error}" msgstr "" @@ -456,7 +462,7 @@ msgstr "" msgid "Failed to join the template" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4644 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4645 #, python-format msgid "Failed to modify %s contents" msgstr "" @@ -476,12 +482,12 @@ msgstr "" msgid "Failed to move to branch {branch} in the {rpath} repository" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5620 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5631 msgid "Failed to open the file" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5000 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5384 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5011 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5395 msgid "Failed to open the template" msgstr "" @@ -495,19 +501,19 @@ msgstr "" msgid "Failed to parse Private.sig" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4684 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4786 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4685 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4787 #, python-format msgid "Failed to read templates directory %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4876 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4887 #, python-format msgid "Failed to reconfigure package %s" msgstr "" #: ../calculate-lib/pym/calculate/lib/format/backgrounds.py:260 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4640 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4641 #, python-format msgid "Failed to remove %s" msgstr "" @@ -517,7 +523,7 @@ msgstr "" msgid "Failed to rename data: %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5833 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5844 #, python-format msgid "Failed to restart %s service" msgstr "" @@ -531,12 +537,12 @@ msgstr "" msgid "Failed to set btrfs compression" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5835 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5846 #, python-format msgid "Failed to start %s service" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5834 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5845 #, python-format msgid "Failed to stop %s service" msgstr "" @@ -547,7 +553,7 @@ msgstr "" msgid "Failed to support '%s' encryption algorithm" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5237 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5248 #, python-brace-format msgid "Failed to synchronize directory {dn}: {error}" msgstr "" @@ -557,12 +563,12 @@ msgstr "" msgid "Failed to umount {target}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1621 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1622 #, python-brace-format msgid "Failed to unhide packages: {error}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1631 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1632 #, python-brace-format msgid "Failed to unhide: {error}" msgstr "" @@ -577,12 +583,12 @@ msgstr "" msgid "Failed to update the repository in {rpath}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6088 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6099 #, python-format msgid "Failed to use %s " msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6090 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6101 msgid "Failed to use patch " msgstr "" @@ -629,12 +635,12 @@ msgstr "" msgid "Group ID %s not found" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5165 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5721 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5176 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5732 msgid "Group not found on the system: " msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4326 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4327 msgid "Headers of directory templates and headers of files on the first level should include an action variable" msgstr "" @@ -671,8 +677,8 @@ msgstr "" #: ../calculate-lib/pym/calculate/lib/cl_template.py:1027 #: ../calculate-lib/pym/calculate/lib/cl_template.py:1217 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5033 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5395 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5044 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5406 msgid "Incorrect template" msgstr "" @@ -692,7 +698,7 @@ msgstr "" msgid "Incorrect text of template ''" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3997 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3998 msgid "Invalid oct value: " msgstr "" @@ -722,7 +728,7 @@ msgstr "" msgid "Method for updating config files" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5660 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5671 #, python-format msgid "Missed source link in template '%s'" msgstr "" @@ -744,11 +750,11 @@ msgstr "" msgid "Next" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4035 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4036 msgid "No access to the directory: " msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4310 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4311 msgid "No conditions for checking the value of an action variable" msgstr "" @@ -775,8 +781,8 @@ msgstr "" msgid "No space left on device" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5154 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5704 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5165 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5715 msgid "No such user on the system: " msgstr "" @@ -794,22 +800,22 @@ msgstr "" msgid "Number of processors" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6025 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6036 #, python-format msgid "Option %s should be used for format=backgrounds only" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6017 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6028 #, python-format msgid "Option %s should be used for format=dconf only" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6009 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6020 #, python-format msgid "Option %s should be used for format=patch only" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5080 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5091 #, python-format msgid "Option '%(opt)s' should be used with %(appends)s only" msgstr "" @@ -846,7 +852,7 @@ msgstr "" msgid "Repository {path} is not a directory" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/ip.py:430 +#: ../calculate-lib/pym/calculate/lib/utils/ip.py:435 msgid "Request timed out" msgstr "" @@ -859,17 +865,17 @@ msgstr "" msgid "Select the profile with command {cmd}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5828 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5839 #, python-format msgid "Service %s has been restarted" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5830 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5841 #, python-format msgid "Service %s has been started" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5829 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5840 #, python-format msgid "Service %s has been stopped" msgstr "" @@ -878,19 +884,19 @@ msgstr "" msgid "Skip the update of config files" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4322 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4323 msgid "Skipped directories:" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4318 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4319 msgid "Skipped templates:" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4649 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4650 msgid "Some config files need updating. Perform run dispatch-conf." msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5218 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5229 #, python-format msgid "Source path %s is not a directory" msgstr "" @@ -900,23 +906,23 @@ msgstr "" msgid "Source variable %s does not contain a list" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5478 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5495 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5489 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5506 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5541 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5554 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5517 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5552 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5565 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5588 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5618 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5628 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5576 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5599 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5629 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5639 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5668 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5772 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5786 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5650 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5679 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5783 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5797 msgid "Template error" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6354 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6365 msgid "Template type not found: " msgstr "" @@ -1131,14 +1137,14 @@ msgstr "" msgid "Wrong entry '{entry}' for table variable '{varname}'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6069 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6080 #, python-format msgid "Wrong header parameter 'format=%s' in template" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6131 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6259 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6269 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6142 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6270 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6280 #, python-brace-format msgid "Wrong header parameter '{var}={val}' in template" msgstr "" @@ -1154,13 +1160,13 @@ msgstr "" msgid "Wrong interval operator" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6034 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6045 #, python-format msgid "Wrong option '%(param)s=%(type)s' in template %(file)s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6196 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6226 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6207 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6237 #, python-brace-format msgid "Wrong option '{var}={val}' in template {fn}" msgstr "" @@ -1175,42 +1181,42 @@ msgstr "" msgid "Wrong repository in the {rpath} directory" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6105 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6138 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6182 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6212 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6241 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6276 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6312 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6322 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6339 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6116 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6149 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6193 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6223 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6252 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6287 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6323 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6333 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6350 msgid "Wrong template" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6350 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6361 msgid "Wrong template option (type append)" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5054 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5065 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5139 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5157 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5076 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5150 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5168 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5185 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5190 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5416 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5428 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5461 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5684 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5706 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5723 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5179 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5196 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5201 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5427 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5439 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5472 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5695 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5717 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5734 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5740 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5745 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5751 #, python-format msgid "Wrong value '%s' in the template" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5467 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5478 #, python-brace-format msgid "Wrong value '{var}={val}' in template" msgstr "" @@ -1232,7 +1238,7 @@ msgstr "" msgid "custom action" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1622 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1623 msgid "directory not found" msgstr "" @@ -1241,20 +1247,20 @@ msgid "empty password" msgstr "" #: ../calculate-lib/pym/calculate/lib/datavars.py:1318 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3715 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4920 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4928 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3716 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4931 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4939 msgid "error" msgstr "" #: ../calculate-lib/pym/calculate/lib/cl_template.py:290 #: ../calculate-lib/pym/calculate/lib/cl_template.py:2739 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3595 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3596 #, python-format msgid "error in template %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3596 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3597 #, python-format msgid "error, template term '%s'" msgstr "" @@ -1276,9 +1282,9 @@ msgstr "" #: ../calculate-lib/pym/calculate/lib/cl_template.py:2318 #: ../calculate-lib/pym/calculate/lib/cl_template.py:2770 #: ../calculate-lib/pym/calculate/lib/cl_template.py:2805 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3460 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3503 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3514 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3461 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3504 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3515 #, python-format msgid "error: variable %s does not exist" msgstr "" @@ -1299,7 +1305,7 @@ msgstr "" msgid "error: variable %s not found" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/ip.py:410 +#: ../calculate-lib/pym/calculate/lib/utils/ip.py:415 #, python-format msgid "failed. (socket error: '%s')" msgstr "" @@ -1308,7 +1314,7 @@ msgstr "" msgid "first parameter must be number" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3652 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3653 #, python-format msgid "function of templates '%s' not found" msgstr "" @@ -1347,12 +1353,12 @@ msgstr "" msgid "incorrect text in the template: '%s'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4111 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4112 msgid "invalid template content: " msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4127 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4138 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4128 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4139 msgid "invalid template name: " msgstr "" @@ -1369,7 +1375,7 @@ msgstr "" msgid "mark as human modification" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3539 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3540 #, python-format msgid "mount point '/' or '/%s' not found in the value of variable os_disk_install" msgstr "" @@ -1378,7 +1384,7 @@ msgstr "" msgid "or" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1580 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1581 msgid "package is already hidden" msgstr "" @@ -1411,7 +1417,7 @@ msgstr "" msgid "template variable '%s' not found" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4799 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4800 #, python-brace-format msgid "templates in {tempath} are skipped" msgstr "" @@ -1463,8 +1469,8 @@ msgstr "" msgid "unable to open the file:" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4358 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6573 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4359 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6584 msgid "undefined variable: " msgstr "" @@ -1476,8 +1482,8 @@ msgstr "" msgid "username" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3464 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3522 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3465 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3523 #, python-format msgid "value of %s is not a list or a tuple" msgstr "" @@ -1490,8 +1496,8 @@ msgstr "" msgid "without py-smbpasswd" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3496 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3513 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3497 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3514 #, python-format msgid "wrong %s" msgstr "" @@ -1501,7 +1507,7 @@ msgstr "" msgid "wrong dict value: %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3624 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3625 #, python-format msgid "wrong function syntax %s" msgstr "" @@ -1517,7 +1523,7 @@ msgstr "" msgid "wrong path '%s'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4797 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4798 #, python-brace-format msgid "{dirpath} is a file" msgstr "" diff --git a/ru/cl_core3.po b/ru/cl_core3.po index ecb68ab..8bb5427 100644 --- a/ru/cl_core3.po +++ b/ru/cl_core3.po @@ -78,7 +78,7 @@ msgstr "%d секунд" msgid "%s ago" msgstr "%s назад" -#: ../calculate-core/pym/core/server/methods_func.py:425 +#: ../calculate-core/pym/core/server/methods_func.py:431 #, python-format msgid "%s values:" msgstr "%s:" @@ -90,9 +90,9 @@ msgstr "%s:" msgid "%s: " msgstr "%s: " +#: ../calculate-core/pym/core/client/cert_func.py:291 #: ../calculate-core/pym/core/client/sid_func.py:55 #: ../calculate-core/pym/core/client/sid_func.py:79 -#: ../calculate-core/pym/core/client/cert_func.py:291 #, python-format msgid "%s: Permission denied" msgstr "Доступ запрещён %s" @@ -102,20 +102,20 @@ msgstr "Доступ запрещён %s" msgid "%s: Process started" msgstr "Процесс запущен %s" -#: ../calculate-core/pym/core/server/methods_func.py:267 +#: ../calculate-core/pym/core/server/methods_func.py:271 msgid "'list' for displaying possible values" msgstr "'list' для отображения возможных значений" -#: ../calculate-core/pym/core/server/methods_func.py:262 +#: ../calculate-core/pym/core/server/methods_func.py:266 msgid "'list' for displaying possible values, 'none' is never one" msgstr "'list' для отображения возможных значений, 'none' - ни один" -#: ../calculate-core/pym/core/server/methods_func.py:221 +#: ../calculate-core/pym/core/server/methods_func.py:225 msgid "(by default)" msgstr "(по умолчанию)" -#: ../calculate-core/pym/core/server/methods_func.py:240 -#: ../calculate-core/pym/core/server/methods_func.py:247 +#: ../calculate-core/pym/core/server/methods_func.py:244 +#: ../calculate-core/pym/core/server/methods_func.py:251 msgid "(enabled by default)" msgstr "(включено по умолчанию)" @@ -124,7 +124,7 @@ msgstr "(включено по умолчанию)" msgid "({one} of {_all}) -- {fname}" msgstr "({one} из {_all}) -- {fname}" -#: ../calculate-core/pym/core/server/cert_cmd.py:599 +#: ../calculate-core/pym/core/server/cert_cmd.py:588 msgid ", except:" msgstr ", кроме:" @@ -135,7 +135,9 @@ msgstr ":" #: ../calculate-core/pym/core/client/cert_info.py:83 #: ../calculate-core/pym/core/client/pid_information.py:91 -#: ../calculate-core/pym/core/server/methods_func.py:552 +#: ../calculate-core/pym/core/server/methods_func.py:561 +#: ../calculate-core/pym/core/variables/setup_package.py:112 +#: ../calculate-core/pym/core/variables/setup_package.py:245 msgid ": " msgstr ": " @@ -161,15 +163,15 @@ msgstr "Действие выполнено!" msgid "Action {ac_custom_name} not found" msgstr "Действие {ac_custom_name} не найдено" -#: ../calculate-core/pym/core/wsdl_core.py:380 +#: ../calculate-core/pym/core/wsdl_core.py:381 msgid "Add" msgstr "Добавить" -#: ../calculate-core/pym/core/wsdl_core.py:356 +#: ../calculate-core/pym/core/wsdl_core.py:357 msgid "Add a Group" msgstr "Добавление группы" -#: ../calculate-core/pym/core/wsdl_core.py:376 +#: ../calculate-core/pym/core/wsdl_core.py:377 msgid "Add a group" msgstr "Добавление группы" @@ -210,13 +212,13 @@ msgstr "Применение исправлений к исходному код msgid "Archive created: {core.cl_backup_file}" msgstr "Создан архивный файл: {core.cl_backup_file}" -#: ../calculate-core/pym/core/server/cert_cmd.py:661 +#: ../calculate-core/pym/core/server/cert_cmd.py:650 msgid "Are you sure? Delete all client certificates?" msgstr "Вы уверены? Удалить все клиентские сертификаты?" -#: ../calculate-core/pym/core/wsdl_core.py:233 -#: ../calculate-core/pym/core/wsdl_core.py:301 -#: ../calculate-core/pym/core/wsdl_core.py:480 +#: ../calculate-core/pym/core/wsdl_core.py:234 +#: ../calculate-core/pym/core/wsdl_core.py:302 +#: ../calculate-core/pym/core/wsdl_core.py:481 msgid "Back" msgstr "Назад" @@ -228,9 +230,9 @@ msgstr "Резервное копирование учётных записей" msgid "Backing up files configured by templates" msgstr "Резервное копирование файлов, настроенных шаблонами" -#: ../calculate-core/pym/core/wsdl_core.py:694 -#: ../calculate-core/pym/core/wsdl_core.py:696 -#: ../calculate-core/pym/core/wsdl_core.py:726 +#: ../calculate-core/pym/core/wsdl_core.py:733 +#: ../calculate-core/pym/core/wsdl_core.py:735 +#: ../calculate-core/pym/core/wsdl_core.py:765 msgid "Backup" msgstr "Резервная копия" @@ -262,6 +264,10 @@ msgstr "Сертификат центра авторизации удалён и msgid "CA certificate not found on the server" msgstr "Сертификат центра авторизации не найден на сервере" +#: ../calculate-core/pym/core/server/create_cert.py:159 +msgid "CA certitficate file {} not found" +msgstr "Файл CA сертификата {} не найден" + #: ../calculate-core/pym/core/backup.py:135 msgid "CONTENTS file not found" msgstr "Файл CONTENTS не найден" @@ -270,11 +276,11 @@ msgstr "Файл CONTENTS не найден" msgid "CRL added" msgstr "Список отзыва сертификатов (CRL) добавлен" -#: ../calculate-core/pym/core/server/cert_cmd.py:1067 +#: ../calculate-core/pym/core/server/cert_cmd.py:1052 msgid "CRL deleted" msgstr "Список отзыва сертификатов удалён" -#: ../calculate-core/pym/core/server/cert_cmd.py:1069 +#: ../calculate-core/pym/core/server/cert_cmd.py:1054 msgid "CRL does not exist" msgstr "Список отзыва сертификатов не создан" @@ -282,7 +288,7 @@ msgstr "Список отзыва сертификатов не создан" msgid "Calculate Utilities have backuped files" msgstr "Утилиты Calculate сделали резервную копию файлов" -#: ../calculate-core/pym/core/setup_package.py:326 +#: ../calculate-core/pym/core/setup_package.py:333 msgid "Calculate core is executing the following tasks" msgstr "Настройка" @@ -290,7 +296,7 @@ msgstr "Настройка" msgid "Calculating checksums" msgstr "Вычисление файловых контрольных сумм" -#: ../calculate-core/pym/core/server/cert_cmd.py:962 +#: ../calculate-core/pym/core/server/cert_cmd.py:947 msgid "Certificate \t" msgstr "Сертификат \t" @@ -299,34 +305,34 @@ msgstr "Сертификат \t" msgid "Certificate %s has been signed" msgstr "Сертифика %s подписан" -#: ../calculate-core/pym/core/server/cert_cmd.py:759 +#: ../calculate-core/pym/core/server/cert_cmd.py:744 #, python-format msgid "Certificate %s has not been signed" msgstr "Сертификат %s не подписан" -#: ../calculate-core/pym/core/server/cert_cmd.py:757 -#: ../calculate-core/pym/core/server/cert_cmd.py:813 +#: ../calculate-core/pym/core/server/cert_cmd.py:742 +#: ../calculate-core/pym/core/server/cert_cmd.py:798 #, python-format msgid "Certificate %s is signed" msgstr "Сертификат %s подписан" -#: ../calculate-core/pym/core/server/cert_cmd.py:1080 #: ../calculate-core/pym/core/server/bootstrap.py:57 +#: ../calculate-core/pym/core/server/cert_cmd.py:1065 #, python-format msgid "Certificate %s not found" msgstr "Сертификат %s не найден" -#: ../calculate-core/pym/core/server/cert_cmd.py:710 -#: ../calculate-core/pym/core/server/cert_cmd.py:786 +#: ../calculate-core/pym/core/server/cert_cmd.py:699 +#: ../calculate-core/pym/core/server/cert_cmd.py:771 #, python-format msgid "Certificate %s now exists" msgstr "Сертификат %s уже существует" -#: ../calculate-core/pym/core/wsdl_core.py:212 +#: ../calculate-core/pym/core/wsdl_core.py:213 msgid "Certificate Details" msgstr "Просмотр сертификата" -#: ../calculate-core/pym/core/server/cert_cmd.py:649 +#: ../calculate-core/pym/core/server/cert_cmd.py:638 #, python-format msgid "Certificate ID = %s" msgstr "Номер сертификата = %s" @@ -348,7 +354,7 @@ msgstr "Дата создания сертификата больше текущ msgid "Certificate deleted" msgstr "Сертификат удалён" -#: ../calculate-core/pym/core/wsdl_core.py:230 +#: ../calculate-core/pym/core/wsdl_core.py:231 msgid "Certificate details" msgstr "Просмотр сертификата" @@ -380,7 +386,7 @@ msgstr "Дата подписания сертификата - %s" msgid "Certificate not added to trusted" msgstr "Сертификат не добавлен в доверенные" -#: ../calculate-core/pym/core/server/cert_cmd.py:675 +#: ../calculate-core/pym/core/server/cert_cmd.py:664 msgid "Certificate not found" msgstr "Сертификат не найден" @@ -397,7 +403,7 @@ msgstr "Сертификат не найден на стороне клиент msgid "Certificate not found on the server!" msgstr "Сертификат не найден на сервере!" -#: ../calculate-core/pym/core/server/cert_cmd.py:861 +#: ../calculate-core/pym/core/server/cert_cmd.py:846 msgid "Certificate not found!" msgstr "Сертификат не найден!" @@ -410,8 +416,8 @@ msgstr "Сертификат не отправлен!" msgid "Certificate number: %s" msgstr "Номер сертификата - %s" -#: ../calculate-core/pym/core/server/cert_cmd.py:933 -#: ../calculate-core/pym/core/server/cert_cmd.py:971 +#: ../calculate-core/pym/core/server/cert_cmd.py:918 +#: ../calculate-core/pym/core/server/cert_cmd.py:956 msgid "Certificate or request not found!" msgstr "Сертификат или запрос не найден!" @@ -420,7 +426,7 @@ msgstr "Сертификат или запрос не найден!" msgid "Certificate permissions" msgstr "Права сертификата" -#: ../calculate-core/pym/core/server/cert_cmd.py:264 +#: ../calculate-core/pym/core/server/cert_cmd.py:253 #, python-format msgid "Certificate saved. Your certificate ID = %s" msgstr "Сертификат сохранён. Номер Вашего сертификата = %s" @@ -436,11 +442,11 @@ msgid "Certificate {cl_req_crt_path} is signed" msgstr "Сертификат {cl_req_crt_path} подписан" #: ../calculate-core/pym/core/server/certificate.py:47 -#: ../calculate-core/pym/core/wsdl_core.py:200 +#: ../calculate-core/pym/core/wsdl_core.py:201 msgid "Certificates" msgstr "Сертификаты" -#: ../calculate-core/pym/core/wsdl_core.py:304 +#: ../calculate-core/pym/core/wsdl_core.py:305 msgid "Change" msgstr "Изменить" @@ -448,9 +454,9 @@ msgstr "Изменить" msgid "Choose a configuration action:" msgstr "Выберите действие для настройки:" -#: ../calculate-core/pym/core/client/create_cert.py:83 -#: ../calculate-core/pym/core/server/create_cert.py:90 -#: ../calculate-core/pym/core/server/cert_cmd.py:104 +#: ../calculate-core/pym/core/client/create_cert.py:84 +#: ../calculate-core/pym/core/server/cert_cmd.py:119 +#: ../calculate-core/pym/core/server/create_cert.py:97 msgid "City: " msgstr "Город: " @@ -463,8 +469,8 @@ msgstr "Очистка временных файлов" msgid "Client type: %s" msgstr "Тип клиента - %s" -#: ../calculate-core/pym/core/server/cert_cmd.py:192 -#: ../calculate-core/pym/core/server/cert_cmd.py:237 +#: ../calculate-core/pym/core/server/cert_cmd.py:181 +#: ../calculate-core/pym/core/server/cert_cmd.py:226 msgid "Close. Connection Error." msgstr "Закрыто. Ошибка соединения." @@ -476,12 +482,17 @@ msgstr "Закрыто. Ошибка соединения." msgid "Closing all processes" msgstr "Завершаю все процессы" -#: ../calculate-core/pym/core/server/methods_func.py:280 +#: ../calculate-core/pym/core/server/methods_func.py:286 msgid "Common arguments" msgstr "Общие параметры" -#: ../calculate-core/pym/core/wsdl_core.py:60 -#: ../calculate-core/pym/core/wsdl_core.py:105 +#: ../calculate-core/pym/core/wsdl_core.py:630 +msgid "Config" +msgstr "Конфигурировать" + +#: ../calculate-core/pym/core/wsdl_core.py:61 +#: ../calculate-core/pym/core/wsdl_core.py:106 +#: ../calculate-core/pym/core/wsdl_core.py:628 msgid "Configuration" msgstr "Настройка" @@ -490,27 +501,29 @@ msgid "Configuration after restoring from backup" msgstr "Настройка после восстановления из резервной копии" #: ../calculate-core/pym/core/utils/cl_core_setup.py:38 +#: ../calculate-core/pym/core/utils/cl_config.py:38 msgid "Configuration manually interrupted" msgstr "Настройка прервана пользователем" -#: ../calculate-core/pym/core/wsdl_core.py:62 +#: ../calculate-core/pym/core/wsdl_core.py:63 msgid "Configure a Package" msgstr "Настройка пакета" -#: ../calculate-core/pym/core/wsdl_core.py:84 -#: ../calculate-core/pym/core/wsdl_core.py:129 +#: ../calculate-core/pym/core/wsdl_core.py:85 +#: ../calculate-core/pym/core/wsdl_core.py:130 +#: ../calculate-core/pym/core/wsdl_core.py:651 msgid "Configure a package" msgstr "Настройка пакета" -#: ../calculate-core/pym/core/variables/setup_package.py:235 +#: ../calculate-core/pym/core/variables/setup_package.py:363 msgid "Configure dependent packages in root" msgstr "Настраивать зависимые пакеты в корне" -#: ../calculate-core/pym/core/variables/setup_package.py:195 +#: ../calculate-core/pym/core/variables/setup_package.py:323 msgid "Configure the system" msgstr "Конфигурировать систему" -#: ../calculate-core/pym/core/variables/setup_package.py:220 +#: ../calculate-core/pym/core/variables/setup_package.py:348 msgid "Configure users" msgstr "Настройка пользователей" @@ -519,30 +532,30 @@ msgstr "Настройка пользователей" msgid "Configuring dependencies: %s" msgstr "Настройка зависимых пакетов: %s" -#: ../calculate-core/pym/core/wsdl_core.py:344 -#: ../calculate-core/pym/core/wsdl_core.py:483 +#: ../calculate-core/pym/core/wsdl_core.py:345 +#: ../calculate-core/pym/core/wsdl_core.py:484 msgid "Confirm" msgstr "Подтвердить" -#: ../calculate-core/pym/core/wsdl_core.py:530 +#: ../calculate-core/pym/core/wsdl_core.py:531 msgid "Confirm the Request" msgstr "Подтвердить запрос" -#: ../calculate-core/pym/core/server/cert_cmd.py:109 +#: ../calculate-core/pym/core/server/cert_cmd.py:124 #, python-format msgid "Country (two letters only!) [%s]: " msgstr "Страна (только 2 символа!) [%s]: " -#: ../calculate-core/pym/core/server/create_cert.py:95 +#: ../calculate-core/pym/core/server/create_cert.py:99 msgid "Country (two letters only!): " msgstr "Страна (только 2 символа!): " -#: ../calculate-core/pym/core/client/create_cert.py:84 +#: ../calculate-core/pym/core/client/create_cert.py:86 #, python-format msgid "Country: [%s]" msgstr "Страна: [%s]" -#: ../calculate-core/pym/core/server/cert_cmd.py:199 +#: ../calculate-core/pym/core/server/cert_cmd.py:188 msgid "Create a new private key and request?" msgstr "Создать новый секретный ключ и запрос?" @@ -550,15 +563,15 @@ msgstr "Создать новый секретный ключ и запрос?" msgid "Create a new private key and request? y/[n]: " msgstr "Создать новый секретный ключ и запрос? y/[n]: " -#: ../calculate-core/pym/core/server/cert_cmd.py:1255 +#: ../calculate-core/pym/core/server/cert_cmd.py:1240 msgid "Create symlinks for methods" msgstr "Создание ссылок для методов" -#: ../calculate-core/pym/core/wsdl_core.py:629 +#: ../calculate-core/pym/core/wsdl_core.py:668 msgid "Custom Action" msgstr "Произвольное действие" -#: ../calculate-core/pym/core/wsdl_core.py:649 +#: ../calculate-core/pym/core/wsdl_core.py:688 msgid "Custom action" msgstr "Произвольное действие" @@ -566,41 +579,41 @@ msgstr "Произвольное действие" msgid "Date" msgstr "Дата" -#: ../calculate-core/pym/core/wsdl_core.py:307 -#: ../calculate-core/pym/core/wsdl_core.py:412 -#: ../calculate-core/pym/core/wsdl_core.py:486 -#: ../calculate-core/pym/core/wsdl_core.py:520 -#: ../calculate-core/pym/core/wsdl_core.py:552 +#: ../calculate-core/pym/core/wsdl_core.py:308 +#: ../calculate-core/pym/core/wsdl_core.py:413 +#: ../calculate-core/pym/core/wsdl_core.py:487 +#: ../calculate-core/pym/core/wsdl_core.py:521 +#: ../calculate-core/pym/core/wsdl_core.py:553 msgid "Delete" msgstr "Удалить" -#: ../calculate-core/pym/core/wsdl_core.py:390 +#: ../calculate-core/pym/core/wsdl_core.py:391 msgid "Delete the Group" msgstr "Удаление группы" -#: ../calculate-core/pym/core/wsdl_core.py:498 +#: ../calculate-core/pym/core/wsdl_core.py:499 msgid "Delete the Request" msgstr "Удаление запроса" -#: ../calculate-core/pym/core/server/cert_cmd.py:1015 +#: ../calculate-core/pym/core/server/cert_cmd.py:1000 msgid "Delete the certificate and the signature request? y/[n]: " msgstr "Удалить сертификат и запрос на подпись? y/[n]: " -#: ../calculate-core/pym/core/server/cert_cmd.py:684 +#: ../calculate-core/pym/core/server/cert_cmd.py:673 #, python-format msgid "Delete the client certificate with ID %d? y/[n]: " msgstr "Удалить сертификат клиента с ID %d? y/[n]: " -#: ../calculate-core/pym/core/wsdl_core.py:410 +#: ../calculate-core/pym/core/wsdl_core.py:411 msgid "Delete the group" msgstr "Удаление группы" -#: ../calculate-core/pym/core/wsdl_core.py:518 -#: ../calculate-core/pym/core/wsdl_core.py:550 +#: ../calculate-core/pym/core/wsdl_core.py:519 +#: ../calculate-core/pym/core/wsdl_core.py:551 msgid "Delete the request" msgstr "Удаление запроса" -#: ../calculate-core/pym/core/server/cert_cmd.py:687 +#: ../calculate-core/pym/core/server/cert_cmd.py:676 msgid "Deleted" msgstr "Удалено" @@ -609,7 +622,7 @@ msgstr "Удалено" msgid "Deleting manually interrupted" msgstr "Удаление прервано пользователем" -#: ../calculate-core/pym/core/variables/setup_package.py:181 +#: ../calculate-core/pym/core/variables/setup_package.py:309 #, python-format msgid "Directory %s not found" msgstr "Каталог %s не найден" @@ -622,8 +635,8 @@ msgstr "Обновление конфигурационных файлов вр msgid "Dispatching manually interrupted" msgstr "Обновление конфигурационных файлов прервано пользователем" -#: ../calculate-core/pym/core/server/create_cert.py:57 -#: ../calculate-core/pym/core/server/cert_cmd.py:85 +#: ../calculate-core/pym/core/server/cert_cmd.py:100 +#: ../calculate-core/pym/core/server/create_cert.py:66 msgid "Do not use spaces or tabs." msgstr "Не используйте символы пробела и табуляции." @@ -631,12 +644,12 @@ msgstr "Не используйте символы пробела и табул msgid "Do you really want to remove all certificates, requests and config files from the server?" msgstr "Вы действительно хотите удалить все сертификаты, запросы и конфигурационные файлы на сервере?" -#: ../calculate-core/pym/core/wsdl_core.py:343 +#: ../calculate-core/pym/core/wsdl_core.py:344 msgid "Done" msgstr "Готово" -#: ../calculate-core/pym/core/server/create_cert.py:46 -#: ../calculate-core/pym/core/server/cert_cmd.py:64 +#: ../calculate-core/pym/core/server/cert_cmd.py:65 +#: ../calculate-core/pym/core/server/create_cert.py:55 msgid "Enter the certificate date manually? [y]/n: " msgstr "Ввести дату сертификата вручную? y/[n]: " @@ -644,7 +657,7 @@ msgstr "Ввести дату сертификата вручную? y/[n]: " msgid "Enter the certificate date manually? y/[n]: " msgstr "Ввести дату сертификата вручную? y/[n]: " -#: ../calculate-core/pym/core/server/cert_cmd.py:717 +#: ../calculate-core/pym/core/server/cert_cmd.py:706 msgid "Enter the group of the new certificate (group name or 'all'): " msgstr "Введите группу нового сертификата (имя группы или 'all'): " @@ -664,12 +677,12 @@ msgstr "Ошибка" msgid "Error creating directory %s" msgstr "Ошибка создания директории %s" -#: ../calculate-core/pym/core/server/methods_func.py:769 +#: ../calculate-core/pym/core/server/methods_func.py:778 #, python-format msgid "Error in field '%s'. " msgstr "Ошибка в поле '%s'." -#: ../calculate-core/pym/core/server/methods_func.py:773 +#: ../calculate-core/pym/core/server/methods_func.py:782 msgid "Error in parameter " msgstr "Ошибка в параметре " @@ -715,6 +728,7 @@ msgid "Failed to clear the cache! " msgstr "Ошибка очистки кэша! " #: ../calculate-core/pym/core/utils/cl_core_setup.py:37 +#: ../calculate-core/pym/core/utils/cl_config.py:37 msgid "Failed to configure the system!" msgstr "Не удалось настроить систему!" @@ -732,6 +746,10 @@ msgstr "Не удалось скопировать {ffrom} в {fto}" msgid "Failed to create directory %s" msgstr "Не удалось создать директорию %s" +#: ../calculate-core/pym/core/server/cert_cmd.py:131 +msgid "Failed to create root certificate" +msgstr "Не удалось создать корневой сертификат" + #: ../calculate-core/pym/core/client/cert_func.py:288 msgid "Failed to create the certificate ID!" msgstr "Ошибка создания номера сертификата!" @@ -838,6 +856,10 @@ msgstr "Не удалось перезапустить сервис {name}" msgid "Failed to restore from backup!" msgstr "Не удалось выполнить восстановление из резервной копии!" +#: ../calculate-core/pym/core/server/cert_cmd.py:719 +msgid "Failed to sign client certificate" +msgstr "Не удалось подписать сертификат клиента" + #: ../calculate-core/pym/core/utils/cl_core_request.py:50 #, python-brace-format msgid "Failed to sign {cl_req_csr_path} request" @@ -878,8 +900,8 @@ msgstr "Восстановление из резервной копии успе msgid "Filter" msgstr "Фильтр" -#: ../calculate-core/pym/core/server/cert_cmd.py:538 -#: ../calculate-core/pym/core/server/cert_cmd.py:831 +#: ../calculate-core/pym/core/server/cert_cmd.py:527 +#: ../calculate-core/pym/core/server/cert_cmd.py:816 msgid "Fingerprint = " msgstr "Отпечаток = " @@ -890,8 +912,8 @@ msgstr "Отпечаток = " msgid "Fingerprint = %s" msgstr "Отпечаток = %s" -#: ../calculate-core/pym/core/server/create_cert.py:86 -#: ../calculate-core/pym/core/server/cert_cmd.py:100 +#: ../calculate-core/pym/core/server/cert_cmd.py:115 +#: ../calculate-core/pym/core/server/create_cert.py:94 msgid "Full network address (host:port)" msgstr "Полный сетевой адрес (хост:порт)" @@ -917,18 +939,18 @@ msgstr "Группа" msgid "Group %s already exists!" msgstr "Группа %s уже существует!" -#: ../calculate-core/pym/core/variables/request.py:344 #: ../calculate-core/pym/core/variables/groups.py:80 +#: ../calculate-core/pym/core/variables/request.py:344 #, python-format msgid "Group %s does not exist" msgstr "Группа %s не существует" -#: ../calculate-core/pym/core/wsdl_core.py:279 +#: ../calculate-core/pym/core/wsdl_core.py:280 msgid "Group Details" msgstr "Подробности групп" -#: ../calculate-core/pym/core/wsdl_core.py:297 -#: ../calculate-core/pym/core/wsdl_core.py:474 +#: ../calculate-core/pym/core/wsdl_core.py:298 +#: ../calculate-core/pym/core/wsdl_core.py:475 msgid "Group details" msgstr "Подробности групп" @@ -966,13 +988,13 @@ msgstr "Группа {cl_core_group} удалена" #: ../calculate-core/pym/core/server/certificate.py:47 #: ../calculate-core/pym/core/server/groups.py:44 -#: ../calculate-core/pym/core/wsdl_core.py:267 +#: ../calculate-core/pym/core/wsdl_core.py:268 msgid "Groups" msgstr "Группы" #: ../calculate-core/pym/core/client/create_cert.py:73 -#: ../calculate-core/pym/core/server/create_cert.py:73 -#: ../calculate-core/pym/core/server/cert_cmd.py:87 +#: ../calculate-core/pym/core/server/cert_cmd.py:102 +#: ../calculate-core/pym/core/server/create_cert.py:88 #, python-format msgid "Hostname [%s] : " msgstr "Имя хоста [%s]: " @@ -1005,11 +1027,16 @@ msgstr "Сертификат сервера недействителен" #: ../calculate-core/pym/core/client/client_class.py:210 #: ../calculate-core/pym/core/client/client_class.py:235 #: ../calculate-core/pym/core/server/client_class.py:88 -#: ../calculate-core/pym/core/server/cert_cmd.py:541 -#: ../calculate-core/pym/core/server/cert_cmd.py:834 +#: ../calculate-core/pym/core/server/cert_cmd.py:530 +#: ../calculate-core/pym/core/server/cert_cmd.py:819 msgid "Issuer" msgstr "Подписчик" +#: ../calculate-core/pym/core/server/create_cert.py:118 +#: ../calculate-core/pym/core/server/create_cert.py:156 +msgid "Key file {} not found" +msgstr "Файл ключа {} не найден" + #: ../calculate-core/pym/core/server/groups.py:54 msgid "List of available groups" msgstr "Список доступных групп" @@ -1043,7 +1070,7 @@ msgstr "Расположение" msgid "MAC: %s" msgstr "MAC - %s" -#: ../calculate-core/pym/core/variables/setup_package.py:268 +#: ../calculate-core/pym/core/variables/setup_package.py:396 msgid "Machine architecture" msgstr "Архитектура компьютера" @@ -1083,11 +1110,11 @@ msgstr "Режим" msgid "Modification of variables manually interrupted" msgstr "Изменение переменных прервано пользователем" -#: ../calculate-core/pym/core/wsdl_core.py:319 +#: ../calculate-core/pym/core/wsdl_core.py:320 msgid "Modify Group" msgstr "Изменить группу" -#: ../calculate-core/pym/core/wsdl_core.py:339 +#: ../calculate-core/pym/core/wsdl_core.py:340 msgid "Modify group" msgstr "Изменить группу" @@ -1109,10 +1136,10 @@ msgid "Network address (hostname or IP) [%s]: " msgstr "Сетевой адрес (hostname или IP) [%s]: " #: ../calculate-core/pym/core/server/func.py:125 -#: ../calculate-core/pym/core/server/func.py:1788 -#: ../calculate-core/pym/core/wsdl_core.py:202 -#: ../calculate-core/pym/core/wsdl_core.py:269 -#: ../calculate-core/pym/core/wsdl_core.py:446 +#: ../calculate-core/pym/core/server/func.py:1790 +#: ../calculate-core/pym/core/wsdl_core.py:203 +#: ../calculate-core/pym/core/wsdl_core.py:270 +#: ../calculate-core/pym/core/wsdl_core.py:447 msgid "Next" msgstr "Далее" @@ -1130,7 +1157,7 @@ msgstr "Нет групп" #: ../calculate-core/pym/core/client/pid_information.py:121 #: ../calculate-core/pym/core/client/pid_information.py:125 -#: ../calculate-core/pym/core/server/cert_cmd.py:613 +#: ../calculate-core/pym/core/server/cert_cmd.py:602 msgid "No methods available" msgstr "Нет доступных методов" @@ -1152,7 +1179,7 @@ msgstr "Не получается создать сокет" msgid "No such variables" msgstr "Нет таких переменных" -#: ../calculate-core/pym/core/server/cert_cmd.py:1017 +#: ../calculate-core/pym/core/server/cert_cmd.py:1002 msgid "Not deleted" msgstr "Не удалён" @@ -1164,8 +1191,8 @@ msgstr "Нет запросов" msgid "Not signed" msgstr "Не подписан" -#: ../calculate-core/pym/core/server/cert_cmd.py:152 -#: ../calculate-core/pym/core/server/cert_cmd.py:177 +#: ../calculate-core/pym/core/server/cert_cmd.py:141 +#: ../calculate-core/pym/core/server/cert_cmd.py:166 msgid "OK" msgstr "OK" @@ -1174,14 +1201,14 @@ msgstr "OK" msgid "Object %s not found" msgstr "Объект %s не найден" -#: ../calculate-core/pym/core/client/create_cert.py:80 -#: ../calculate-core/pym/core/server/create_cert.py:81 -#: ../calculate-core/pym/core/server/cert_cmd.py:95 +#: ../calculate-core/pym/core/client/create_cert.py:79 +#: ../calculate-core/pym/core/server/cert_cmd.py:110 +#: ../calculate-core/pym/core/server/create_cert.py:92 msgid "Organization name: " msgstr "Название организации: " -#: ../calculate-core/pym/core/server/create_cert.py:76 -#: ../calculate-core/pym/core/server/cert_cmd.py:90 +#: ../calculate-core/pym/core/server/cert_cmd.py:105 +#: ../calculate-core/pym/core/server/create_cert.py:90 msgid "Organization unit: " msgstr "Название отдела: " @@ -1212,30 +1239,33 @@ msgstr "Идентификатор процесса для закрытия: " msgid "PIDs not found for this session!" msgstr "Не найден ID процесса для данной сессии!" -#: ../calculate-core/pym/core/setup_package.py:167 -#: ../calculate-core/pym/core/setup_package.py:170 -#: ../calculate-core/pym/core/setup_package.py:230 +#: ../calculate-core/pym/core/setup_package.py:171 +#: ../calculate-core/pym/core/setup_package.py:174 +#: ../calculate-core/pym/core/setup_package.py:234 +#: ../calculate-core/pym/core/setup_package.py:364 #, python-format msgid "Package %s" msgstr "Пакет %s" -#: ../calculate-core/pym/core/variables/setup_package.py:132 +#: ../calculate-core/pym/core/variables/setup_package.py:260 msgid "Package category" msgstr "Категория пакета" -#: ../calculate-core/pym/core/variables/setup_package.py:45 +#: ../calculate-core/pym/core/variables/setup_package.py:47 msgid "Package name" msgstr "Имя пакета" -#: ../calculate-core/pym/core/variables/setup_package.py:53 +#: ../calculate-core/pym/core/variables/setup_package.py:55 msgid "Package not found" msgstr "Пакет не найден" -#: ../calculate-core/pym/core/variables/setup_package.py:105 +#: ../calculate-core/pym/core/variables/setup_package.py:156 +#: ../calculate-core/pym/core/variables/setup_package.py:184 msgid "Package slot" msgstr "Слот пакета" -#: ../calculate-core/pym/core/variables/setup_package.py:78 +#: ../calculate-core/pym/core/variables/setup_package.py:80 +#: ../calculate-core/pym/core/variables/setup_package.py:126 msgid "Package version" msgstr "Версия пакета" @@ -1255,25 +1285,25 @@ msgstr "Предел для страницы" msgid "Page offset" msgstr "Смещение для страницы" -#: ../calculate-core/pym/core/server/methods_func.py:551 +#: ../calculate-core/pym/core/server/methods_func.py:560 msgid "Password" msgstr "Пароль" -#: ../calculate-core/pym/core/server/methods_func.py:672 +#: ../calculate-core/pym/core/server/methods_func.py:681 #, python-format msgid "Password for %s: " msgstr "Пароль для %s: " -#: ../calculate-core/pym/core/server/methods_func.py:97 +#: ../calculate-core/pym/core/server/methods_func.py:101 msgid "Password: " msgstr "Пароль: " -#: ../calculate-core/pym/core/server/methods_func.py:109 +#: ../calculate-core/pym/core/server/methods_func.py:113 #: ../calculate-core/pym/core/result_viewer.py:326 msgid "Passwords do not match" msgstr "Пароли не совпадают" -#: ../calculate-core/pym/core/wsdl_core.py:107 +#: ../calculate-core/pym/core/wsdl_core.py:108 msgid "Patch" msgstr "Патч" @@ -1281,17 +1311,17 @@ msgstr "Патч" msgid "Patching manually interrupted" msgstr "Исправление прервано пользователем" -#: ../calculate-core/pym/core/setup_package.py:233 +#: ../calculate-core/pym/core/setup_package.py:237 #, python-format msgid "Path '%s' does not exist" msgstr "Путь %s не существует" -#: ../calculate-core/pym/core/variables/setup_package.py:176 +#: ../calculate-core/pym/core/variables/setup_package.py:304 msgid "Path for configuration" msgstr "Путь для настройки" -#: ../calculate-core/pym/core/client/pid_information.py:37 #: ../calculate-core/pym/core/client/cert_func.py:315 +#: ../calculate-core/pym/core/client/pid_information.py:37 msgid "Permission denied" msgstr "Доступ запрещён" @@ -1300,23 +1330,29 @@ msgstr "Доступ запрещён" msgid "Permissions" msgstr "Права" -#: ../calculate-core/pym/core/server/cert_cmd.py:549 +#: ../calculate-core/pym/core/server/cert_cmd.py:538 msgid "Permissions: " msgstr "Права: " -#: ../calculate-core/pym/core/variables/setup_package.py:50 +#: ../calculate-core/pym/core/variables/setup_package.py:52 msgid "Please choose a package" msgstr "Пожалуйста, выберите пакет" -#: ../calculate-core/pym/core/variables/setup_package.py:163 +#: ../calculate-core/pym/core/variables/setup_package.py:291 msgid "Please choose the category" msgstr "Пожалуйста, выберите категорию" -#: ../calculate-core/pym/core/variables/setup_package.py:118 +#: ../calculate-core/pym/core/variables/setup_package.py:172 +#: ../calculate-core/pym/core/variables/setup_package.py:227 +#: ../calculate-core/pym/core/variables/setup_package.py:231 +#: ../calculate-core/pym/core/variables/setup_package.py:245 msgid "Please choose the slot" msgstr "Пожалуйста, выберите слот" -#: ../calculate-core/pym/core/variables/setup_package.py:92 +#: ../calculate-core/pym/core/variables/setup_package.py:97 +#: ../calculate-core/pym/core/variables/setup_package.py:101 +#: ../calculate-core/pym/core/variables/setup_package.py:112 +#: ../calculate-core/pym/core/variables/setup_package.py:143 msgid "Please choose the version" msgstr "Пожалуйста, выберите версию" @@ -1333,7 +1369,7 @@ msgstr "Введите корректный номер сертификата!" msgid "Port %d already in use" msgstr "Порт %d уже используется" -#: ../calculate-core/pym/core/server/api_types.py:324 +#: ../calculate-core/pym/core/server/api_types.py:325 msgid "Previous" msgstr "Назад" @@ -1376,28 +1412,28 @@ msgstr "Перегенерация клиентского сертификата msgid "Remote" msgstr "Удалённые" -#: ../calculate-core/pym/core/server/methods_func.py:673 +#: ../calculate-core/pym/core/server/methods_func.py:682 #, python-format msgid "Repeat password for %s: " msgstr "Повтор пароля для %s: " -#: ../calculate-core/pym/core/server/methods_func.py:553 +#: ../calculate-core/pym/core/server/methods_func.py:562 msgid "Repeat password: " msgstr "Повтор пароля: " -#: ../calculate-core/pym/core/server/methods_func.py:99 +#: ../calculate-core/pym/core/server/methods_func.py:103 #: ../calculate-core/pym/core/result_viewer.py:318 msgid "Repeat: " msgstr "Повтор: " -#: ../calculate-core/pym/core/server/cert_cmd.py:930 -#: ../calculate-core/pym/core/server/cert_cmd.py:968 +#: ../calculate-core/pym/core/server/cert_cmd.py:915 +#: ../calculate-core/pym/core/server/cert_cmd.py:953 #, python-format msgid "Request \t%s" msgstr "Запрос \t%s" -#: ../calculate-core/pym/core/server/cert_cmd.py:928 -#: ../calculate-core/pym/core/server/cert_cmd.py:966 +#: ../calculate-core/pym/core/server/cert_cmd.py:913 +#: ../calculate-core/pym/core/server/cert_cmd.py:951 #, python-format msgid "Request \t%s: not signed" msgstr "Запрос \t%s - не подписан" @@ -1413,7 +1449,7 @@ msgstr "Запрос %s не найден" msgid "Request %s not found!" msgstr "Запрос %s не найден" -#: ../calculate-core/pym/core/wsdl_core.py:456 +#: ../calculate-core/pym/core/wsdl_core.py:457 msgid "Request Details" msgstr "Подробности запроса на подпись сертификата" @@ -1434,11 +1470,15 @@ msgstr "MAC-адрес" msgid "Request date" msgstr "Дата запроса" -#: ../calculate-core/pym/core/server/cert_cmd.py:1013 +#: ../calculate-core/pym/core/server/cert_cmd.py:998 msgid "Request duly signed" msgstr "Запрос успешно подписан" -#: ../calculate-core/pym/core/server/cert_cmd.py:900 +#: ../calculate-core/pym/core/server/create_cert.py:162 +msgid "Request file {} not found" +msgstr "Файл запроса {} не найден" + +#: ../calculate-core/pym/core/server/cert_cmd.py:885 msgid "Request for signature not found!" msgstr "Запрос на подпись не найден!" @@ -1451,7 +1491,7 @@ msgid "Request location" msgstr "Расположение" #: ../calculate-core/pym/core/server/request.py:126 -#: ../calculate-core/pym/core/server/cert_cmd.py:1006 +#: ../calculate-core/pym/core/server/cert_cmd.py:991 #, python-format msgid "Request or certificate with ID = %s not found!" msgstr "Запрос или сертификат с идентификатором = %s не найден!" @@ -1464,7 +1504,7 @@ msgstr "Имя владельца запроса" msgid "Request signed" msgstr "Запрос подписан" -#: ../calculate-core/pym/core/wsdl_core.py:667 +#: ../calculate-core/pym/core/wsdl_core.py:706 msgid "Restart calculate-core" msgstr "Перезапуск calculate-core" @@ -1484,7 +1524,7 @@ msgstr "Перезапуск calculate-core" msgid "Restoration from backup manually interrupted" msgstr "Восстановление из резервной копии прервано пользователем" -#: ../calculate-core/pym/core/wsdl_core.py:728 +#: ../calculate-core/pym/core/wsdl_core.py:767 msgid "Restore" msgstr "Восстановление" @@ -1520,16 +1560,17 @@ msgstr "Восстановление учётных записей" msgid "Revoke date" msgstr "Дата отзыва" -#: ../calculate-core/pym/core/server/cert_cmd.py:769 +#: ../calculate-core/pym/core/server/cert_cmd.py:754 msgid "Root certificate or private key not found" msgstr "Корневой сертификат или секретный ключ не найден" -#: ../calculate-core/pym/core/wsdl_core.py:97 -#: ../calculate-core/pym/core/wsdl_core.py:138 -#: ../calculate-core/pym/core/wsdl_core.py:657 -#: ../calculate-core/pym/core/wsdl_core.py:718 -#: ../calculate-core/pym/core/wsdl_core.py:752 -#: ../calculate-core/pym/core/wsdl_core.py:753 +#: ../calculate-core/pym/core/wsdl_core.py:98 +#: ../calculate-core/pym/core/wsdl_core.py:139 +#: ../calculate-core/pym/core/wsdl_core.py:658 +#: ../calculate-core/pym/core/wsdl_core.py:696 +#: ../calculate-core/pym/core/wsdl_core.py:757 +#: ../calculate-core/pym/core/wsdl_core.py:791 +#: ../calculate-core/pym/core/wsdl_core.py:792 msgid "Run" msgstr "Выполнить" @@ -1552,7 +1593,7 @@ msgstr "Сессия закрыта!" msgid "SSL library is not support TLSv1_2" msgstr "SSL библиотека не поддерживает TLSv1_2" -#: ../calculate-core/pym/core/wsdl_core.py:585 +#: ../calculate-core/pym/core/wsdl_core.py:586 msgid "Save" msgstr "Сохранить" @@ -1567,8 +1608,8 @@ msgstr "Серийный номер" #: ../calculate-core/pym/core/client/client_class.py:208 #: ../calculate-core/pym/core/client/client_class.py:233 #: ../calculate-core/pym/core/server/client_class.py:86 -#: ../calculate-core/pym/core/server/cert_cmd.py:539 -#: ../calculate-core/pym/core/server/cert_cmd.py:832 +#: ../calculate-core/pym/core/server/cert_cmd.py:528 +#: ../calculate-core/pym/core/server/cert_cmd.py:817 msgid "Serial number = " msgstr "Серийный номер = " @@ -1626,32 +1667,32 @@ msgstr "Выберите группу сертификата" msgid "Settings ignored for following packages: %s" msgstr "Пропущены настройки следующих пакетов: %s" -#: ../calculate-core/pym/core/wsdl_core.py:562 +#: ../calculate-core/pym/core/wsdl_core.py:563 msgid "Setup Variables" msgstr "Настройка переменных" -#: ../calculate-core/pym/core/wsdl_core.py:583 -#: ../calculate-core/pym/core/wsdl_core.py:615 +#: ../calculate-core/pym/core/wsdl_core.py:584 +#: ../calculate-core/pym/core/wsdl_core.py:616 msgid "Setup variables" msgstr "Настройка переменных" -#: ../calculate-core/pym/core/wsdl_core.py:619 +#: ../calculate-core/pym/core/wsdl_core.py:620 msgid "Show" msgstr "Показать " -#: ../calculate-core/pym/core/wsdl_core.py:178 +#: ../calculate-core/pym/core/wsdl_core.py:179 msgid "Show Certificates" msgstr "Просмотр сертификатов" -#: ../calculate-core/pym/core/wsdl_core.py:245 +#: ../calculate-core/pym/core/wsdl_core.py:246 msgid "Show Groups" msgstr "Просмотр групп" -#: ../calculate-core/pym/core/wsdl_core.py:422 +#: ../calculate-core/pym/core/wsdl_core.py:423 msgid "Show Requests" msgstr "Просмотр запросов" -#: ../calculate-core/pym/core/wsdl_core.py:444 +#: ../calculate-core/pym/core/wsdl_core.py:445 msgid "Show requests" msgstr "Просмотр запросов" @@ -1660,8 +1701,8 @@ msgid "Show the value" msgstr "Показать значение" #: ../calculate-core/pym/core/server/request.py:87 -#: ../calculate-core/pym/core/server/cert_cmd.py:706 -#: ../calculate-core/pym/core/server/cert_cmd.py:782 +#: ../calculate-core/pym/core/server/cert_cmd.py:695 +#: ../calculate-core/pym/core/server/cert_cmd.py:767 #, python-format msgid "Signature request %s not found" msgstr "Запрос на подпись %s не найден" @@ -1674,16 +1715,16 @@ msgstr "Запрос на подпись сертификата удалён" msgid "Signing manually interrupted" msgstr "Процесс подписывания прерван пользователем" -#: ../calculate-core/pym/core/server/cert_cmd.py:1148 +#: ../calculate-core/pym/core/server/cert_cmd.py:1133 msgid "Specify the location of the PID file" msgstr "Указать расположение PID файла" #: ../calculate-core/pym/core/client/client_class.py:214 #: ../calculate-core/pym/core/client/client_class.py:239 #: ../calculate-core/pym/core/server/client_class.py:92 -#: ../calculate-core/pym/core/server/cert_cmd.py:545 -#: ../calculate-core/pym/core/server/cert_cmd.py:838 -#: ../calculate-core/pym/core/server/cert_cmd.py:878 +#: ../calculate-core/pym/core/server/cert_cmd.py:534 +#: ../calculate-core/pym/core/server/cert_cmd.py:823 +#: ../calculate-core/pym/core/server/cert_cmd.py:863 msgid "Subject" msgstr "Субъект" @@ -1701,17 +1742,18 @@ msgstr "Удалена ссылка %s" msgid "System" msgstr "Системные" -#: ../calculate-core/pym/core/wsdl_core.py:716 +#: ../calculate-core/pym/core/wsdl_core.py:755 msgid "System backup" msgstr "Резервная копия системы" -#: ../calculate-core/pym/core/setup_package.py:279 +#: ../calculate-core/pym/core/setup_package.py:286 +#: ../calculate-core/pym/core/setup_package.py:407 #, python-brace-format msgid "System configuring for {nameProgram} package by Calculate Utilities" msgstr "Конфигурация утилитами Calculate системных настроек {nameProgram}" -#: ../calculate-core/pym/core/wsdl_core.py:749 -#: ../calculate-core/pym/core/wsdl_core.py:754 +#: ../calculate-core/pym/core/wsdl_core.py:788 +#: ../calculate-core/pym/core/wsdl_core.py:793 msgid "System restore" msgstr "Восстановление системы" @@ -1730,11 +1772,11 @@ msgstr "Подготовка резервной копии шаблонами" msgid "The CN and L fields in the CA certificate are incorrect!" msgstr "Поля CN и L в сертификате центра авторизации некорректны!" -#: ../calculate-core/pym/core/server/cert_cmd.py:997 +#: ../calculate-core/pym/core/server/cert_cmd.py:982 msgid "The ID must be int." msgstr "идентификатор должен быть целочисленным." -#: ../calculate-core/pym/core/server/cert_cmd.py:1075 +#: ../calculate-core/pym/core/server/cert_cmd.py:1060 msgid "The ID of a certificate to be revoked must be integer!" msgstr "Номер отзываемого сертификата должен быть целочисленным!" @@ -1755,8 +1797,8 @@ msgstr "Сертификат не соответствует секретном msgid "The certificate expires after %d days" msgstr "Срок годности истекает через %d дней" -#: ../calculate-core/pym/core/server/cert_cmd.py:701 -#: ../calculate-core/pym/core/server/cert_cmd.py:777 +#: ../calculate-core/pym/core/server/cert_cmd.py:690 +#: ../calculate-core/pym/core/server/cert_cmd.py:762 msgid "The certificate number must be int" msgstr "Номер сертификата должен быть целочисленным" @@ -1796,30 +1838,31 @@ msgid "The request ID must be int" msgstr "Идентификатор запроса должен быть целочисленным" #: ../calculate-core/pym/core/client/cert_func.py:189 -#: ../calculate-core/pym/core/server/cert_cmd.py:259 #: ../calculate-core/pym/core/server/bootstrap.py:346 +#: ../calculate-core/pym/core/server/cert_cmd.py:247 msgid "The request was sent from another IP." msgstr "Запрос был послан с другого IP." #: ../calculate-core/pym/core/client/cert_func.py:186 -#: ../calculate-core/pym/core/server/cert_cmd.py:256 #: ../calculate-core/pym/core/server/bootstrap.py:343 +#: ../calculate-core/pym/core/server/cert_cmd.py:244 msgid "The signature request does not match earlier data." msgstr "Запрос на подпись сертификата не соответствует отправленному ранее." #: ../calculate-core/pym/core/client/cert_func.py:182 -#: ../calculate-core/pym/core/server/cert_cmd.py:252 #: ../calculate-core/pym/core/server/bootstrap.py:339 +#: ../calculate-core/pym/core/server/cert_cmd.py:240 msgid "The signature request has not been examined yet." msgstr "Запрос на подписание до сих пор не рассмотрены." #: ../calculate-core/pym/core/client/cert_func.py:179 -#: ../calculate-core/pym/core/server/cert_cmd.py:249 #: ../calculate-core/pym/core/server/bootstrap.py:336 +#: ../calculate-core/pym/core/server/cert_cmd.py:237 msgid "The signature request was rejected!" msgstr "Запрос на подпись отвергнут!" #: ../calculate-core/pym/core/utils/cl_core_setup.py:35 +#: ../calculate-core/pym/core/utils/cl_config.py:35 msgid "The system is being configured" msgstr "Конфигурирование системы" @@ -1832,11 +1875,11 @@ msgid "This certificate has been revoked!" msgstr "Сертификат отозван!" #: ../calculate-core/pym/core/client/cert_func.py:127 -#: ../calculate-core/pym/core/server/cert_cmd.py:212 +#: ../calculate-core/pym/core/server/cert_cmd.py:201 msgid "This server is not enabled to sign certificates!" msgstr "Данный сервер не может подписывать сертификаты!" -#: ../calculate-core/pym/core/server/cert_cmd.py:657 +#: ../calculate-core/pym/core/server/cert_cmd.py:646 #, python-format msgid "Total: %d certificates." msgstr "Всего %d сертификатов." @@ -1880,11 +1923,11 @@ msgstr "Распаковка конфигурационных файлов" msgid "Untrusted server certificate!" msgstr "Ненадёжный сертификат сервера!" -#: ../calculate-core/pym/core/wsdl_core.py:146 +#: ../calculate-core/pym/core/wsdl_core.py:147 msgid "Update " msgstr "Обновление " -#: ../calculate-core/pym/core/wsdl_core.py:148 +#: ../calculate-core/pym/core/wsdl_core.py:149 msgid "Update Settings" msgstr "Обновление настроек" @@ -1892,11 +1935,12 @@ msgstr "Обновление настроек" msgid "Updating configuration files" msgstr "Обновление конфигурационых файлов" -#: ../calculate-core/pym/core/setup_package.py:231 +#: ../calculate-core/pym/core/setup_package.py:235 +#: ../calculate-core/pym/core/setup_package.py:365 msgid "Updating system cofiguration files" msgstr "Обновление системных конфигурационных файлов" -#: ../calculate-core/pym/core/setup_package.py:171 +#: ../calculate-core/pym/core/setup_package.py:175 msgid "Updating user configuration files" msgstr "Обновление пользовательских конфигурационных файлов" @@ -1904,17 +1948,17 @@ msgstr "Обновление пользовательских конфигура msgid "Use new" msgstr "Использовать новый" -#: ../calculate-core/pym/core/server/methods_func.py:764 +#: ../calculate-core/pym/core/server/methods_func.py:773 msgid "Use the parameter" msgstr "Используйте параметр" #: ../calculate-core/pym/core/server/cl_server.py:160 -#: ../calculate-core/pym/core/variables/setup_package.py:252 +#: ../calculate-core/pym/core/variables/setup_package.py:380 #, python-format msgid "User %s does not exist" msgstr "Пользователь %s не существует" -#: ../calculate-core/pym/core/setup_package.py:202 +#: ../calculate-core/pym/core/setup_package.py:206 #, python-brace-format msgid "User configuring the {nameProgram} package by Calculate Utilities" msgstr "Конфигурация Calculate утилитами пользовательских настроек {nameProgram}" @@ -1935,27 +1979,27 @@ msgstr "Изменены" msgid "UserName" msgstr "Имя пользователя" -#: ../calculate-core/pym/core/client/create_cert.py:77 +#: ../calculate-core/pym/core/client/create_cert.py:76 #, python-format msgid "Username [%s]: " msgstr "Имя пользователя [%s]: " -#: ../calculate-core/pym/core/setup_package.py:304 +#: ../calculate-core/pym/core/setup_package.py:311 #, python-brace-format msgid "Using patches for the {nameProgram} package by Calculate Utilities" msgstr "Применение патчей Calculate утилитами для {nameProgram}" -#: ../calculate-core/pym/core/server/cert_cmd.py:161 +#: ../calculate-core/pym/core/server/cert_cmd.py:150 msgid "Using the root certificate as the server certificate" msgstr "Использование корневого сертификата в качестве серверного сертификата" -#: ../calculate-core/pym/core/wsdl_core.py:176 -#: ../calculate-core/pym/core/wsdl_core.py:243 -#: ../calculate-core/pym/core/wsdl_core.py:420 -#: ../calculate-core/pym/core/wsdl_core.py:560 -#: ../calculate-core/pym/core/wsdl_core.py:593 -#: ../calculate-core/pym/core/wsdl_core.py:627 -#: ../calculate-core/pym/core/wsdl_core.py:665 +#: ../calculate-core/pym/core/wsdl_core.py:177 +#: ../calculate-core/pym/core/wsdl_core.py:244 +#: ../calculate-core/pym/core/wsdl_core.py:421 +#: ../calculate-core/pym/core/wsdl_core.py:561 +#: ../calculate-core/pym/core/wsdl_core.py:594 +#: ../calculate-core/pym/core/wsdl_core.py:666 +#: ../calculate-core/pym/core/wsdl_core.py:704 msgid "Utilities" msgstr "Утилиты" @@ -1988,7 +2032,7 @@ msgstr "Переменные" msgid "Verbose output" msgstr "Подробный вывод" -#: ../calculate-core/pym/core/wsdl_core.py:595 +#: ../calculate-core/pym/core/wsdl_core.py:596 msgid "View Variables" msgstr "Просмотреть переменные" @@ -2009,7 +2053,7 @@ msgstr "Внимание! %s пытается подменить сертифи msgid "WARNING!!! %s trying to replace the certificate!" msgstr "Предупреждение!!! %s пытается подменить сертификат!" -#: ../calculate-core/pym/core/setup_package.py:336 +#: ../calculate-core/pym/core/setup_package.py:343 msgid "Would you like to terminate these tasks?" msgstr "Вы хотите завершить эти задачи?" @@ -2017,13 +2061,13 @@ msgstr "Вы хотите завершить эти задачи?" msgid "Writable" msgstr "Перезаписываемые" -#: ../calculate-core/pym/core/server/methods_func.py:615 -#: ../calculate-core/pym/core/server/methods_func.py:637 +#: ../calculate-core/pym/core/server/methods_func.py:624 +#: ../calculate-core/pym/core/server/methods_func.py:646 #, python-format msgid "Wrong %s value syntax" msgstr "Неправильный %s синтаксис у значения" -#: ../calculate-core/pym/core/server/func.py:1718 +#: ../calculate-core/pym/core/server/func.py:1720 msgid "Wrong expert varaiables list" msgstr "Неправильный список экспертных переменных" @@ -2032,15 +2076,15 @@ msgstr "Неправильный список экспертных переме msgid "Wrong method for task %s" msgstr "Неправильный метод для задачи %s" -#: ../calculate-core/pym/core/server/func.py:1716 +#: ../calculate-core/pym/core/server/func.py:1718 msgid "Wrong normal varaiables list" msgstr "Неправильный список обычных переменных" -#: ../calculate-core/pym/core/server/methods_func.py:418 +#: ../calculate-core/pym/core/server/methods_func.py:424 msgid "Wrong option " msgstr "Неправильный параметр " -#: ../calculate-core/pym/core/setup_package.py:168 +#: ../calculate-core/pym/core/setup_package.py:172 msgid "X session users not found" msgstr "Не найден X сессия пользователей" @@ -2061,15 +2105,15 @@ msgstr "Вы не можете изменить права сертификат msgid "You do not have a certificate. Use option --gen-cert-by HOST to generate a new certificate or --get-cert-from HOST to get the certificate from the server." msgstr "У вас нет сертификата. Используйте ключ --gen-cert-by HOST для генерации нового сертификата или ключ --get-cert-from HOST для получения нового сертификата с сервера." -#: ../calculate-core/pym/core/variables/setup_package.py:216 +#: ../calculate-core/pym/core/variables/setup_package.py:344 msgid "You must not choose only clt location for desktop templates" msgstr "Вы не можете выбрать только clt расположение для desktop шаблонов" #: ../calculate-core/pym/core/client/cert_func.py:132 #: ../calculate-core/pym/core/client/cert_func.py:183 -#: ../calculate-core/pym/core/server/cert_cmd.py:216 -#: ../calculate-core/pym/core/server/cert_cmd.py:253 #: ../calculate-core/pym/core/server/bootstrap.py:340 +#: ../calculate-core/pym/core/server/cert_cmd.py:205 +#: ../calculate-core/pym/core/server/cert_cmd.py:241 #, python-format msgid "Your request ID = %s" msgstr "Номер Вашего запроса = %s" @@ -2078,7 +2122,7 @@ msgstr "Номер Вашего запроса = %s" msgid "Zap new" msgstr "Удалить новый" -#: ../calculate-core/pym/core/server/cert_cmd.py:1192 +#: ../calculate-core/pym/core/server/cert_cmd.py:1177 msgid "add permissions for a certificate (or certificates, comma-separated) (use with option -c [ID])" msgstr "добавить права для сертификата (или списка через ',') (используйте с ключом -c [ID])" @@ -2086,7 +2130,7 @@ msgstr "добавить права для сертификата (или спи msgid "add this certificate to trusted and continue? y/[n]: " msgstr "add this certificate to trusted and continue? y/[n]: " -#: ../calculate-core/pym/core/server/cert_cmd.py:596 +#: ../calculate-core/pym/core/server/cert_cmd.py:585 msgid "all methods" msgstr "все методы" @@ -2095,73 +2139,73 @@ msgstr "все методы" msgid "auto" msgstr "авто" -#: ../calculate-core/pym/core/server/cert_cmd.py:1166 +#: ../calculate-core/pym/core/server/cert_cmd.py:1151 msgid "bootstrap action" msgstr "начальные загрузки" -#: ../calculate-core/pym/core/server/cert_cmd.py:1229 +#: ../calculate-core/pym/core/server/cert_cmd.py:1214 msgid "call method" msgstr "запуск метода" -#: ../calculate-core/pym/core/server/cert_cmd.py:280 -#: ../calculate-core/pym/core/server/cert_cmd.py:288 -#: ../calculate-core/pym/core/server/cert_cmd.py:294 -#: ../calculate-core/pym/core/server/cert_cmd.py:326 +#: ../calculate-core/pym/core/server/cert_cmd.py:269 +#: ../calculate-core/pym/core/server/cert_cmd.py:277 +#: ../calculate-core/pym/core/server/cert_cmd.py:283 +#: ../calculate-core/pym/core/server/cert_cmd.py:315 #: ../calculate-core/pym/core/server/func.py:1509 #, python-format msgid "cannot create directory %s" msgstr "не удаётся создать директорию %s" -#: ../calculate-core/pym/core/server/cert_cmd.py:939 -#: ../calculate-core/pym/core/server/cert_cmd.py:977 +#: ../calculate-core/pym/core/server/cert_cmd.py:924 +#: ../calculate-core/pym/core/server/cert_cmd.py:962 msgid "certificate (request) number not int and not 'all'" msgstr "номер сертификата (запроса) не целочисленный и не 'all'" -#: ../calculate-core/pym/core/server/cert_cmd.py:1050 +#: ../calculate-core/pym/core/server/cert_cmd.py:1035 msgid "certificate deleted" msgstr "сертификат удалён" -#: ../calculate-core/pym/core/server/cert_cmd.py:669 +#: ../calculate-core/pym/core/server/cert_cmd.py:658 msgid "certificate number not int and not 'all'" msgstr "номер сертификата не целочисленный и не 'all'" -#: ../calculate-core/pym/core/server/cert_cmd.py:1252 +#: ../calculate-core/pym/core/server/cert_cmd.py:1237 msgid "configuration check" msgstr "проверка конфигурации" -#: ../calculate-core/pym/core/variables/setup_package.py:236 +#: ../calculate-core/pym/core/variables/setup_package.py:364 msgid "configure the dependent packages in the same directory as the specified package, instead of root" msgstr "настраивать зависимые пакеты в той же, где и указанный пакет, директории, вместо корня" #: ../calculate-core/pym/core/client/cert_func.py:100 #: ../calculate-core/pym/core/client/cert_func.py:153 -#: ../calculate-core/pym/core/server/cert_cmd.py:183 -#: ../calculate-core/pym/core/server/cert_cmd.py:228 +#: ../calculate-core/pym/core/server/cert_cmd.py:172 +#: ../calculate-core/pym/core/server/cert_cmd.py:217 msgid "connecting..." msgstr "соединение..." -#: ../calculate-core/pym/core/server/cert_cmd.py:1169 +#: ../calculate-core/pym/core/server/cert_cmd.py:1154 msgid "create certificate for local user" msgstr "создать сертификат для локального пользователя" -#: ../calculate-core/pym/core/server/cert_cmd.py:857 -#: ../calculate-core/pym/core/server/cert_cmd.py:897 +#: ../calculate-core/pym/core/server/cert_cmd.py:842 +#: ../calculate-core/pym/core/server/cert_cmd.py:882 msgid "date" msgstr "дата" -#: ../calculate-core/pym/core/server/cert_cmd.py:1184 +#: ../calculate-core/pym/core/server/cert_cmd.py:1169 msgid "debug" msgstr "режим отладки (debug)" -#: ../calculate-core/pym/core/server/cert_cmd.py:1223 +#: ../calculate-core/pym/core/server/cert_cmd.py:1208 msgid "decline client's request for signature" msgstr "отвергнуть клиентский запрос на подпись сертификата" -#: ../calculate-core/pym/core/server/cert_cmd.py:1232 +#: ../calculate-core/pym/core/server/cert_cmd.py:1217 msgid "display all available methods" msgstr "отобразить все доступные методы" -#: ../calculate-core/pym/core/server/cert_cmd.py:1238 +#: ../calculate-core/pym/core/server/cert_cmd.py:1223 msgid "display the GUI progress bar" msgstr "отображать индикатор прогресса GUI" @@ -2169,19 +2213,19 @@ msgstr "отображать индикатор прогресса GUI" msgid "display variables ('userset' displays user set variables, 'writable' displays only writable variables, 'system' displays user set variables from the system env file, 'local' displays user set variables from the local env file, 'remote' displays user set variables from the remote env file, 'all' displays all variables or filters them by part of name)" msgstr "отобразить переменные ('userset' - отобразить изменённые переменные, 'writable' - отобразить только доступные для записи переменные, 'system' - отобразить изменённые переменные из системного конфигурационного файла, 'local' - отобразить изменённые переменные из локального конфигурационного файла, 'remote' - отобразить изменённые переменные из удалённого конфигурационного файла, 'all' - отобразить все переменные или фильтр по имени переменной" -#: ../calculate-core/pym/core/server/cert_cmd.py:1241 +#: ../calculate-core/pym/core/server/cert_cmd.py:1226 msgid "display warnings at the end" msgstr "отобразить предупреждения в конце" -#: ../calculate-core/pym/core/server/cert_cmd.py:1235 +#: ../calculate-core/pym/core/server/cert_cmd.py:1220 msgid "do not display the progress bar" msgstr "не отображать индикатор прогресса" -#: ../calculate-core/pym/core/server/cert_cmd.py:1181 +#: ../calculate-core/pym/core/server/cert_cmd.py:1166 msgid "dump (use with option -c [ID])" msgstr "дамп (используйте с ключом -c [ID])" -#: ../calculate-core/pym/core/server/cert_cmd.py:150 +#: ../calculate-core/pym/core/server/cert_cmd.py:139 #, python-format msgid "error writing to (reading from) files in directory %s" msgstr "ошибка записи (чтения) файла в директории %s" @@ -2191,20 +2235,20 @@ msgstr "ошибка записи (чтения) файла в директор msgid "failed to create PID file %s" msgstr "не удаётся создать PID файл %s" -#: ../calculate-core/pym/core/server/cert_cmd.py:398 +#: ../calculate-core/pym/core/server/cert_cmd.py:387 msgid "failed to delete the certificate!" msgstr "ошибка удаления сертификата!" -#: ../calculate-core/pym/core/server/cert_cmd.py:1052 +#: ../calculate-core/pym/core/server/cert_cmd.py:1037 msgid "failed to delete the file!" msgstr "ошибка удаления файла!" -#: ../calculate-core/pym/core/server/cert_cmd.py:1206 +#: ../calculate-core/pym/core/server/cert_cmd.py:1191 msgid "fetch the signed certificate from the server" msgstr "получить подписанный сертификат с сервера (хост сервера)" -#: ../calculate-core/pym/core/server/cert_cmd.py:517 -#: ../calculate-core/pym/core/server/cert_cmd.py:525 +#: ../calculate-core/pym/core/server/cert_cmd.py:506 +#: ../calculate-core/pym/core/server/cert_cmd.py:514 #, python-format msgid "file %s not found!" msgstr "файл %s не найден!" @@ -2218,7 +2262,7 @@ msgstr "файл с сертификатом Центра авторизации msgid "filename = " msgstr "имя файла = " -#: ../calculate-core/pym/core/server/cert_cmd.py:1200 +#: ../calculate-core/pym/core/server/cert_cmd.py:1185 msgid "generate a root (or CA) certificate" msgstr "генерировать корневой сертификат (сертификат удостоверяющего центра)" @@ -2240,23 +2284,25 @@ msgstr "нет" msgid "no path to the client certificate" msgstr "не создан путь к сертификату клиента" -#: ../calculate-core/pym/core/server/cert_cmd.py:1155 +#: ../calculate-core/pym/core/server/cert_cmd.py:1140 msgid "operations with certificates (number or \"all\"). Server not running." msgstr "операции с сертификатами (номер или \"all\"). Сервер не запускается." -#: ../calculate-core/pym/core/variables/setup_package.py:133 +#: ../calculate-core/pym/core/variables/setup_package.py:261 msgid "package category name" msgstr "имя категории пакета" -#: ../calculate-core/pym/core/variables/setup_package.py:46 +#: ../calculate-core/pym/core/variables/setup_package.py:48 msgid "package name" msgstr "имя пакета" -#: ../calculate-core/pym/core/variables/setup_package.py:106 +#: ../calculate-core/pym/core/variables/setup_package.py:157 +#: ../calculate-core/pym/core/variables/setup_package.py:185 msgid "package slot" msgstr "слот пакета" -#: ../calculate-core/pym/core/variables/setup_package.py:79 +#: ../calculate-core/pym/core/variables/setup_package.py:81 +#: ../calculate-core/pym/core/variables/setup_package.py:127 msgid "package version number with the revision" msgstr "версия пакета с ревизией" @@ -2267,35 +2313,35 @@ msgstr "версия пакета с ревизией" msgid "page %d from " msgstr "страница %d из " -#: ../calculate-core/pym/core/server/cert_cmd.py:1258 +#: ../calculate-core/pym/core/server/cert_cmd.py:1243 msgid "path to log files" msgstr "путь к файлам логов" -#: ../calculate-core/pym/core/server/cert_cmd.py:1145 +#: ../calculate-core/pym/core/server/cert_cmd.py:1130 msgid "port number" msgstr "номер порта" -#: ../calculate-core/pym/core/server/cert_cmd.py:1261 +#: ../calculate-core/pym/core/server/cert_cmd.py:1246 msgid "print the version number, then exit" msgstr "вывод версии программы и выход" -#: ../calculate-core/pym/core/server/cert_cmd.py:1219 +#: ../calculate-core/pym/core/server/cert_cmd.py:1204 msgid "refuse to sign the certificate at the server's request" msgstr "отвергнуть серверный запрос на подпись сертификата" -#: ../calculate-core/pym/core/server/cert_cmd.py:1173 +#: ../calculate-core/pym/core/server/cert_cmd.py:1158 msgid "remove all local user certificates" msgstr "удалить все локальные пользовательские сертификаты" -#: ../calculate-core/pym/core/server/cert_cmd.py:1196 +#: ../calculate-core/pym/core/server/cert_cmd.py:1181 msgid "remove permissions for a certificate (use with option -c [ID])" msgstr "удаление прав сертификата (используйте с -c [ID])" -#: ../calculate-core/pym/core/server/cert_cmd.py:1189 +#: ../calculate-core/pym/core/server/cert_cmd.py:1174 msgid "remove the selected certificate (use with option -c [ID])" msgstr "удалить выбранный сертификат (используйте с ключом -c [ID])" -#: ../calculate-core/pym/core/server/cert_cmd.py:1010 +#: ../calculate-core/pym/core/server/cert_cmd.py:995 #, python-format msgid "request %s not found!" msgstr "запрос %s не найден!" @@ -2321,8 +2367,8 @@ msgid "request location" msgstr "расположение" #: ../calculate-core/pym/core/client/cert_func.py:138 -#: ../calculate-core/pym/core/server/cert_cmd.py:222 #: ../calculate-core/pym/core/server/bootstrap.py:305 +#: ../calculate-core/pym/core/server/cert_cmd.py:211 #, python-format msgid "request not sent or file %s deleted" msgstr "запрос не был отправлен, или удалён файл %s" @@ -2331,37 +2377,37 @@ msgstr "запрос не был отправлен, или удалён фай msgid "request owner username" msgstr "имя владельца запроса" -#: ../calculate-core/pym/core/server/cert_cmd.py:854 -#: ../calculate-core/pym/core/server/cert_cmd.py:894 +#: ../calculate-core/pym/core/server/cert_cmd.py:839 +#: ../calculate-core/pym/core/server/cert_cmd.py:879 msgid "request sent from:" msgstr "запрос на подпись отправлен от:" -#: ../calculate-core/pym/core/server/cert_cmd.py:1226 +#: ../calculate-core/pym/core/server/cert_cmd.py:1211 msgid "revoke an earlier signed server (or CA) certificate. Run rm to remove the CRL" msgstr "отозвать ранее подписанный сертификат сервера (удостоверяющего центра). rm для удаления списка отзыва" -#: ../calculate-core/pym/core/server/cert_cmd.py:157 +#: ../calculate-core/pym/core/server/cert_cmd.py:146 msgid "root certificate not found (use cl-core with option --gen-root-cert)" msgstr "корневой сертификат не найден (используйте cl-core с ключом --gen-root-cert)" -#: ../calculate-core/pym/core/variables/setup_package.py:177 +#: ../calculate-core/pym/core/variables/setup_package.py:305 msgid "root path for saving the updated configuration files" msgstr "корневой путь для сохранения обновлённых конфигурационных файлов" -#: ../calculate-core/pym/core/server/cert_cmd.py:770 +#: ../calculate-core/pym/core/server/cert_cmd.py:755 #, python-format msgid "see %s" msgstr "смотрите %s" -#: ../calculate-core/pym/core/server/cert_cmd.py:1203 +#: ../calculate-core/pym/core/server/cert_cmd.py:1188 msgid "send a signature request for the root certificate" msgstr "отправить запрос на подписание корневого сертификата" -#: ../calculate-core/pym/core/server/cert_cmd.py:1142 +#: ../calculate-core/pym/core/server/cert_cmd.py:1127 msgid "server started" msgstr "сервер запущен" -#: ../calculate-core/pym/core/variables/setup_package.py:269 +#: ../calculate-core/pym/core/variables/setup_package.py:397 msgid "set machine architecture" msgstr "установить архитектуру компьютера" @@ -2385,28 +2431,28 @@ msgstr "установить смещение для страницы" msgid "show the variable value" msgstr "показать значение переменной" -#: ../calculate-core/pym/core/server/cert_cmd.py:1138 +#: ../calculate-core/pym/core/server/cert_cmd.py:1123 msgid "show this help message and exit" msgstr "вывод этой справки и выход" -#: ../calculate-core/pym/core/server/cert_cmd.py:1213 +#: ../calculate-core/pym/core/server/cert_cmd.py:1198 msgid "sign the client's request with the server certificate" msgstr "подписать запрос на подписание сертификата клиента сертификатом сервера" -#: ../calculate-core/pym/core/server/cert_cmd.py:1216 +#: ../calculate-core/pym/core/server/cert_cmd.py:1201 msgid "sign the server's request with the root certificate" msgstr "подписать запрос на подписание сертификата сервера корневым сертификатом" -#: ../calculate-core/pym/core/server/cert_cmd.py:1047 +#: ../calculate-core/pym/core/server/cert_cmd.py:1032 msgid "signature request deleted" msgstr "запрос на подпись сертификата удалён" -#: ../calculate-core/pym/core/server/methods_func.py:283 -#: ../calculate-core/pym/core/server/cert_cmd.py:1244 +#: ../calculate-core/pym/core/server/cert_cmd.py:1229 +#: ../calculate-core/pym/core/server/methods_func.py:289 msgid "silent during the process" msgstr "не задавать вопросы во время процесса" -#: ../calculate-core/pym/core/server/cert_cmd.py:1152 +#: ../calculate-core/pym/core/server/cert_cmd.py:1137 msgid "stop the server if there are no active sessions" msgstr "остановить сервер если нет активной сессии" @@ -2415,24 +2461,24 @@ msgid "the URL looks like" msgstr "URL имеет вид" #: ../calculate-core/pym/core/client/cert_func.py:115 -#: ../calculate-core/pym/core/server/cert_cmd.py:198 +#: ../calculate-core/pym/core/server/cert_cmd.py:187 msgid "the private key and request now exist" msgstr "секретный ключ и запрос созданы" -#: ../calculate-core/pym/core/server/methods_func.py:71 +#: ../calculate-core/pym/core/server/methods_func.py:75 #, python-brace-format msgid "the value may be {0}" msgstr "значение может быть {0}" -#: ../calculate-core/pym/core/server/cert_cmd.py:498 +#: ../calculate-core/pym/core/server/cert_cmd.py:487 msgid "to change permissions, the certificate number must be integer" msgstr "для изменения прав сертификата используйте целочисленное значение" -#: ../calculate-core/pym/core/variables/setup_package.py:221 +#: ../calculate-core/pym/core/variables/setup_package.py:349 msgid "updating desktop (user) configuration files" msgstr "обновление пользовательских конфигурационных файлов" -#: ../calculate-core/pym/core/variables/setup_package.py:196 +#: ../calculate-core/pym/core/variables/setup_package.py:324 msgid "updating system configuration files" msgstr "обновление системных конфигурационных файлов" @@ -2440,15 +2486,15 @@ msgstr "обновление системных конфигурационных msgid "use cl-core with option --gen-cert-by HOST (--get-cert-from HOST) or --use-root-as-server)" msgstr "используйте cl-core с ключом --gen-cert-by HOST (--get-cert-from HOST) или --use-root-as-server)" -#: ../calculate-core/pym/core/server/cert_cmd.py:1248 +#: ../calculate-core/pym/core/server/cert_cmd.py:1233 msgid "use passwords from standard input for users accounts" msgstr "использовать пароли для пользовательских учетных записей из стандартного ввода" -#: ../calculate-core/pym/core/server/cert_cmd.py:1209 +#: ../calculate-core/pym/core/server/cert_cmd.py:1194 msgid "use the root certificate as the server certificate" msgstr "использовать корневой сертификат как сертификат сервера" -#: ../calculate-core/pym/core/server/cert_cmd.py:1177 +#: ../calculate-core/pym/core/server/cert_cmd.py:1162 msgid "use with option --bootstrap to remove all certificates, requests and config files on the server" msgstr "используйте с ключом --bootstrap, удаление всех сертификатов, запросов и конфигурационных файлов на сервере" @@ -2456,11 +2502,11 @@ msgstr "используйте с ключом --bootstrap, удаление в msgid "verbose output" msgstr "подробный вывод" -#: ../calculate-core/pym/core/server/cert_cmd.py:1159 +#: ../calculate-core/pym/core/server/cert_cmd.py:1144 msgid "view client requests (number or \"all\")" msgstr "просмотр клиентских запросов (номер или \"all\")" -#: ../calculate-core/pym/core/server/cert_cmd.py:1162 +#: ../calculate-core/pym/core/server/cert_cmd.py:1147 msgid "view servers certificates (number or \"all\"). Server not running." msgstr "просмотр серверных сертификатов (номер или \"all\"). Сервер не запускается." diff --git a/ru/cl_install3.po b/ru/cl_install3.po index 2127a5e..ebf6d28 100644 --- a/ru/cl_install3.po +++ b/ru/cl_install3.po @@ -46,15 +46,15 @@ msgstr "AMD Catalyst (fglrx)" msgid "AMD Radeon (radeon)" msgstr "AMD Radeon (radeon)" -#: ../calculate-install/pym/install/variables/net.py:199 +#: ../calculate-install/pym/install/variables/net.py:215 msgid "Addresses" msgstr "Адреса" -#: ../calculate-install/pym/install/variables/system.py:372 +#: ../calculate-install/pym/install/variables/system.py:395 msgid "Administrator" msgstr "Администратор" -#: ../calculate-install/pym/install/variables/autopartition.py:465 +#: ../calculate-install/pym/install/variables/autopartition.py:468 msgid "Allocate drive space" msgstr "Распределение места на диске" @@ -62,7 +62,7 @@ msgstr "Распределение места на диске" msgid "Architecture of the target system must be x86_64" msgstr "Архитектура устанавливаемой системы должна быть x86_64" -#: ../calculate-install/pym/install/variables/autopartition.py:538 +#: ../calculate-install/pym/install/variables/autopartition.py:541 msgid "Architecture of the target system must be x86_64 for using the UEFI bootloader" msgstr "Для использования UEFI загрузчика архитектура устанавливаемой системы должна быть x86_64" @@ -90,9 +90,9 @@ msgstr "Настройка аудио выполнена!" msgid "Audio system" msgstr "Звуковая система" -#: ../calculate-install/pym/install/variables/net.py:367 #: ../calculate-install/pym/install/variables/distr.py:411 -#: ../calculate-install/pym/install/variables/X11.py:354 +#: ../calculate-install/pym/install/variables/X11.py:358 +#: ../calculate-install/pym/install/variables/net.py:405 msgid "Auto" msgstr "Автоматически" @@ -100,15 +100,15 @@ msgstr "Автоматически" msgid "Auto detection" msgstr "Автоопределение системой" -#: ../calculate-install/pym/install/variables/system.py:534 +#: ../calculate-install/pym/install/variables/system.py:557 msgid "Autologin" msgstr "Автовход" -#: ../calculate-install/pym/install/variables/system.py:58 +#: ../calculate-install/pym/install/variables/system.py:59 msgid "Autologin is available for Xorg sessions only" msgstr "Автовход возможен только для Xorg-сессии" -#: ../calculate-install/pym/install/variables/system.py:572 +#: ../calculate-install/pym/install/variables/system.py:595 #, python-format msgid "Autologin is unavailable for user %s" msgstr "Автовход не возможен для пользователя %s" @@ -126,7 +126,7 @@ msgstr "Bind-точка монтирования не должна формат msgid "Boot" msgstr "Загрузка" -#: ../calculate-install/pym/install/variables/system.py:807 +#: ../calculate-install/pym/install/variables/system.py:830 msgid "Boot configuration is not available on a LiveCD" msgstr "Настройка загрузки не доступна на LiveCD" @@ -142,7 +142,7 @@ msgstr "Параметры загрузки настроены!" msgid "Bootloader" msgstr "Загрузчик" -#: ../calculate-install/pym/install/variables/net.py:416 +#: ../calculate-install/pym/install/variables/net.py:454 msgid "CIDR" msgstr "CIDR" @@ -158,7 +158,7 @@ msgstr "Нажмите для выбора сетевых параметров" msgid "Click to select partitions to be created" msgstr "Нажмите для выбора создаваемых разделов" -#: ../calculate-install/pym/install/variables/X11.py:308 +#: ../calculate-install/pym/install/variables/X11.py:311 msgid "Composite" msgstr "Композит" @@ -176,7 +176,7 @@ msgstr "Настройка" msgid "Configuration manually interrupted" msgstr "Настройка прервана пользователем" -#: ../calculate-install/pym/install/variables/system.py:819 +#: ../calculate-install/pym/install/variables/system.py:842 msgid "Configure dynamic options only" msgstr "Конфигурировать только динамические параметры" @@ -204,9 +204,9 @@ msgstr "Копирование прочих настроек в новую си msgid "Creating a new partition table" msgstr "Создание новой таблицы разделов" -#: ../calculate-install/pym/install/variables/net.py:171 -#: ../calculate-install/pym/install/variables/net.py:365 -#: ../calculate-install/pym/install/variables/net.py:476 +#: ../calculate-install/pym/install/variables/net.py:187 +#: ../calculate-install/pym/install/variables/net.py:403 +#: ../calculate-install/pym/install/variables/net.py:514 msgid "DHCP" msgstr "DHCP" @@ -214,12 +214,12 @@ msgstr "DHCP" msgid "DISK bound for installation will be mounted to the MP directory. To create a bind mount point, you have to specify the source directory as DISK" msgstr "Диск DISK для установки будет смонтирован в директорию MP. Для создания bind-точки монтирования необходимо указать исходную директорию как DISK" -#: ../calculate-install/pym/install/variables/autopartition.py:525 +#: ../calculate-install/pym/install/variables/autopartition.py:528 msgid "Data partition" msgstr "Раздел для данных" #: ../calculate-install/pym/install/variables/kernel.py:92 -#: ../calculate-install/pym/install/variables/system.py:461 +#: ../calculate-install/pym/install/variables/system.py:484 msgid "Default" msgstr "По умолчанию" @@ -227,7 +227,7 @@ msgstr "По умолчанию" msgid "Default audio card" msgstr "Звуковая карта по умолчанию" -#: ../calculate-install/pym/install/variables/autopartition.py:308 +#: ../calculate-install/pym/install/variables/autopartition.py:311 #, python-format msgid "Device %s is already in use by the current system" msgstr "Диск %s уже используется текущей системой" @@ -242,7 +242,7 @@ msgstr "Устройство '%s' используется более одног msgid "Device {device} has not BIOS Boot partition" msgstr "На устройстве {device} нет BIOS Boot раздела" -#: ../calculate-install/pym/install/variables/autopartition.py:279 +#: ../calculate-install/pym/install/variables/autopartition.py:282 #, python-brace-format msgid "Device {device} is used for {selected}" msgstr "Устройство {device} используется для {selected}" @@ -251,7 +251,7 @@ msgstr "Устройство {device} используется для {selected} msgid "Devices for install" msgstr "Устройства для установки" -#: ../calculate-install/pym/install/variables/autopartition.py:274 +#: ../calculate-install/pym/install/variables/autopartition.py:277 #, python-brace-format msgid "Devices {devices} are used for {selected}" msgstr "Устройства {devices} используются для {selected}" @@ -260,7 +260,7 @@ msgstr "Устройства {devices} используются для {selected msgid "Directory already mounted" msgstr "Директория уже смонтирована" -#: ../calculate-install/pym/install/variables/net.py:366 +#: ../calculate-install/pym/install/variables/net.py:404 msgid "Disabled" msgstr "Выключен" @@ -273,7 +273,7 @@ msgstr "Диск '%s' без таблицы разделов не может с msgid "Disk or directory" msgstr "Диск или директория" -#: ../calculate-install/pym/install/variables/autopartition.py:232 +#: ../calculate-install/pym/install/variables/autopartition.py:235 #, python-brace-format msgid "" "Disks {selecteddisk} are part of {agrtype}\n" @@ -286,26 +286,26 @@ msgstr "" msgid "Distribution" msgstr "Выбор дистрибутива" -#: ../calculate-install/pym/install/variables/net.py:852 +#: ../calculate-install/pym/install/variables/net.py:890 msgid "Domain name server" msgstr "Сервер доменных имен" -#: ../calculate-install/pym/install/variables/system.py:281 +#: ../calculate-install/pym/install/variables/system.py:304 msgid "Encrypt user profiles" msgstr "Шифровать пользовательские профили" -#: ../calculate-install/pym/install/variables/system.py:145 -#: ../calculate-install/pym/install/variables/system.py:510 +#: ../calculate-install/pym/install/variables/system.py:168 +#: ../calculate-install/pym/install/variables/system.py:533 #, python-format msgid "Enter password for user %s" msgstr "Введите пароль для пользователя %s" -#: ../calculate-install/pym/install/variables/autopartition.py:470 +#: ../calculate-install/pym/install/variables/autopartition.py:473 #, python-format msgid "Erase disk and install %s" msgstr "Очистить диск и установить %s" -#: ../calculate-install/pym/install/variables/X11.py:105 +#: ../calculate-install/pym/install/variables/X11.py:106 msgid "Example" msgstr "Пример" @@ -369,7 +369,7 @@ msgstr "Не удалось создать squashfs" msgid "Failed to create the ISO image" msgstr "Не удалось создать ISO-образ" -#: ../calculate-install/pym/install/install.py:463 +#: ../calculate-install/pym/install/install.py:464 msgid "Failed to create the UEFI boot record" msgstr "Не удалось создать загрузочную запись UEFI" @@ -387,22 +387,22 @@ msgstr "Не удалось создать директорию" msgid "Failed to create the user's home directory" msgstr "Не удалось создать домашнюю директорию пользователя" -#: ../calculate-install/pym/install/install.py:490 +#: ../calculate-install/pym/install/install.py:491 msgid "Failed to determine mbr" msgstr "Не удалось найти mbr (главную загрузочную запись) диска" -#: ../calculate-install/pym/install/install.py:483 +#: ../calculate-install/pym/install/install.py:484 msgid "Failed to determine the boot disk" msgstr "Не удалось определить загрузочный диск" -#: ../calculate-install/pym/install/install.py:105 #: ../calculate-install/pym/install/distr.py:1248 +#: ../calculate-install/pym/install/install.py:106 #, python-format msgid "Failed to determine the parent device for %s" msgstr "Не удалось определить родительское устройство для %s" -#: ../calculate-install/pym/install/install.py:127 #: ../calculate-install/pym/install/distr.py:1259 +#: ../calculate-install/pym/install/install.py:128 #, python-format msgid "Failed to determine the partition number for %s" msgstr "Не удалось определить номер раздела для %s" @@ -412,7 +412,7 @@ msgstr "Не удалось определить номер раздела дл msgid "Failed to execute 'mkswap %s': the swap partition is used by the current system" msgstr "Не удалось выполнить 'mkswap %s', раздел подкачки используется текущей системой" -#: ../calculate-install/pym/install/install.py:191 +#: ../calculate-install/pym/install/install.py:192 #, python-format msgid "Failed to find partition %s after changing the activity" msgstr "Не удалось найти раздел %s после смены флага активности" @@ -443,7 +443,7 @@ msgstr "Не удалось отформатировать раздел подк msgid "Failed to found partition %s after changing the system ID" msgstr "Не удалось найти раздел %s после смены ID" -#: ../calculate-install/pym/install/install.py:633 +#: ../calculate-install/pym/install/install.py:634 #, python-format msgid "Failed to found partition %s after creating the partition table" msgstr "Не удалось найти раздел %s после создания таблицы разделов" @@ -452,7 +452,7 @@ msgstr "Не удалось найти раздел %s после создани msgid "Failed to get size of the squash image" msgstr "Не удалось получить размер squash образа" -#: ../calculate-install/pym/install/install.py:214 +#: ../calculate-install/pym/install/install.py:215 #, python-format msgid "" "Failed to install syslinux\n" @@ -461,11 +461,11 @@ msgstr "" "Не удалось установить syslinux\n" "%s" -#: ../calculate-install/pym/install/install.py:226 -#: ../calculate-install/pym/install/install.py:291 -#: ../calculate-install/pym/install/install.py:448 -#: ../calculate-install/pym/install/install.py:473 -#: ../calculate-install/pym/install/install.py:496 +#: ../calculate-install/pym/install/install.py:227 +#: ../calculate-install/pym/install/install.py:292 +#: ../calculate-install/pym/install/install.py:449 +#: ../calculate-install/pym/install/install.py:474 +#: ../calculate-install/pym/install/install.py:497 msgid "Failed to install the bootloader" msgstr "Не удалось установить загрузчик" @@ -473,7 +473,7 @@ msgstr "Не удалось установить загрузчик" msgid "Failed to install the system!" msgstr "Не удалось установить систему!" -#: ../calculate-install/pym/install/install.py:757 +#: ../calculate-install/pym/install/install.py:758 msgid "Failed to migrate users onto the new system" msgstr "Не удалось перенести пользователей в новую систему" @@ -527,7 +527,7 @@ msgstr "Не удалось получить тип %s" msgid "Failed to use attributes (%s) " msgstr "Не удалось использовать атрибуты (%s) " -#: ../calculate-install/pym/install/install.py:206 +#: ../calculate-install/pym/install/install.py:207 #, python-format msgid "" "Failed to write the master boot record\n" @@ -555,11 +555,11 @@ msgstr "Файловая система" msgid "Filesystem '%s' is not available" msgstr "Файловая система '%s' недоступна" -#: ../calculate-install/pym/install/variables/autopartition.py:443 +#: ../calculate-install/pym/install/variables/autopartition.py:446 msgid "Filesystem for data partition" msgstr "Файловая система для раздела с данными" -#: ../calculate-install/pym/install/variables/autopartition.py:428 +#: ../calculate-install/pym/install/variables/autopartition.py:431 msgid "Filesystem for root partition" msgstr "Файловая система для корневого раздела" @@ -595,12 +595,12 @@ msgstr "Установка на Flash-диск не поддерживает д msgid "For Flash install, you need only one disk" msgstr "Для установки на Flash необходим только один диск" -#: ../calculate-install/pym/install/variables/system.py:841 +#: ../calculate-install/pym/install/variables/system.py:864 #, python-format msgid "For PXE install, you need to install package %s" msgstr "Вы должны установить пакет %s для PXE-установки" -#: ../calculate-install/pym/install/variables/autopartition.py:298 +#: ../calculate-install/pym/install/variables/autopartition.py:301 msgid "For autopartition, please select the device" msgstr "Для авторазметки необходимо выбрать диск" @@ -613,50 +613,54 @@ msgid "Format the USB Flash" msgstr "Форматировать USB Flash" #: ../calculate-install/pym/install/utils/cl_install.py:54 -#: ../calculate-install/pym/install/install.py:333 +#: ../calculate-install/pym/install/install.py:334 msgid "Formatting the partitions" msgstr "Форматирование разделов" -#: ../calculate-install/pym/install/variables/X11.py:351 -#: ../calculate-install/pym/install/variables/X11.py:376 +#: ../calculate-install/pym/install/variables/X11.py:58 +msgid "Framebuffer device (modesetting)" +msgstr "Framebuffer device (modesetting)" + +#: ../calculate-install/pym/install/variables/X11.py:355 +#: ../calculate-install/pym/install/variables/X11.py:380 msgid "Framebuffer resolution" msgstr "Разрешение фреймбуфера" -#: ../calculate-install/pym/install/variables/system.py:377 +#: ../calculate-install/pym/install/variables/system.py:400 msgid "Full access" msgstr "Полный доступ" -#: ../calculate-install/pym/install/variables/net.py:582 +#: ../calculate-install/pym/install/variables/net.py:620 msgid "Gateway" msgstr "Шлюз" -#: ../calculate-install/pym/install/variables/net.py:605 +#: ../calculate-install/pym/install/variables/net.py:643 #, python-format msgid "Gateways %s are unreachable" msgstr "Шлюзы %s не доступны" -#: ../calculate-install/pym/install/variables/X11.py:60 +#: ../calculate-install/pym/install/variables/X11.py:61 msgid "Generic VESA (vesa)" msgstr "Generic VESA (vesa)" -#: ../calculate-install/pym/install/variables/net.py:839 -#: ../calculate-install/pym/install/variables/net.py:873 +#: ../calculate-install/pym/install/variables/net.py:877 +#: ../calculate-install/pym/install/variables/net.py:911 msgid "Get via DHCP" msgstr "Получать по DHCP" -#: ../calculate-install/pym/install/variables/system.py:424 +#: ../calculate-install/pym/install/variables/system.py:447 msgid "Groups" msgstr "Группы" -#: ../calculate-install/pym/install/variables/system.py:914 +#: ../calculate-install/pym/install/variables/system.py:937 msgid "Grub configuration unavailable for Flash install" msgstr "Конфигурация загрузки недоступна при установке на Flash" -#: ../calculate-install/pym/install/variables/system.py:220 +#: ../calculate-install/pym/install/variables/system.py:243 msgid "Grub password" msgstr "Пароль Grub" -#: ../calculate-install/pym/install/variables/system.py:889 +#: ../calculate-install/pym/install/variables/system.py:912 msgid "Grub terminal" msgstr "Grub терминал" @@ -668,7 +672,7 @@ msgstr "Жёсткий диск" msgid "Hardware clock type" msgstr "Тип аппаратных часов" -#: ../calculate-install/pym/install/variables/net.py:230 +#: ../calculate-install/pym/install/variables/net.py:246 msgid "Hostname" msgstr "Имя хоста" @@ -680,8 +684,8 @@ msgstr "I/O планировщик" msgid "I/O scheduler unavailable for Flash install" msgstr "I/O планировщик недоступен при установке на Flash" -#: ../calculate-install/pym/install/variables/net.py:325 -#: ../calculate-install/pym/install/variables/net.py:377 +#: ../calculate-install/pym/install/variables/net.py:363 +#: ../calculate-install/pym/install/variables/net.py:415 msgid "IP address" msgstr "IP-адрес" @@ -708,7 +712,7 @@ msgstr "Использование UUID недоступно при устано msgid "Incorrect mount point (bind '%(bindSrc)s' to '%(bindDst)s')" msgstr "Неправильная точка монтирования (bind-монтирование '%(bindSrc)s' в '%(bindDst)s')" -#: ../calculate-install/pym/install/variables/X11.py:264 +#: ../calculate-install/pym/install/variables/X11.py:267 #, python-format msgid "Install driver %s with:" msgstr "Установите %s драйвер командой:" @@ -741,7 +745,7 @@ msgstr "Установочный образ" msgid "Installation manually interrupted" msgstr "Установка прервана пользователем" -#: ../calculate-install/pym/install/variables/system.py:866 +#: ../calculate-install/pym/install/variables/system.py:889 msgid "Installation path" msgstr "Путь для установки" @@ -758,8 +762,8 @@ msgstr "Установка загрузчика" msgid "Intel (intel)" msgstr "Intel (intel)" -#: ../calculate-install/pym/install/variables/net.py:140 -#: ../calculate-install/pym/install/variables/net.py:618 +#: ../calculate-install/pym/install/variables/net.py:156 +#: ../calculate-install/pym/install/variables/net.py:656 msgid "Interface" msgstr "Интерфейс" @@ -797,7 +801,7 @@ msgstr "Локализация" msgid "Locale configuration unavailable for Flash install" msgstr "Конфигурация локали недоступна при установке на Flash" -#: ../calculate-install/pym/install/variables/net.py:311 +#: ../calculate-install/pym/install/variables/net.py:349 msgid "MAC" msgstr "MAC" @@ -805,11 +809,15 @@ msgstr "MAC" msgid "MBR is not used with the UEFI bootloader" msgstr "MBR не используется вместе с UEFI загрузчиком" +#: ../calculate-install/pym/install/variables/net.py:328 +msgid "Mac type" +msgstr "Mac тип" + #: ../calculate-install/pym/install/variables/net.py:97 msgid "Manually network configuration" msgstr "Настроить сеть вручную" -#: ../calculate-install/pym/install/variables/net.py:433 +#: ../calculate-install/pym/install/variables/net.py:471 msgid "Mask" msgstr "Маска" @@ -818,8 +826,8 @@ msgid "Migrate network settings" msgstr "Переносить сетевые настройки" #: ../calculate-install/pym/install/utils/cl_install.py:113 -#: ../calculate-install/pym/install/variables/system.py:312 #: ../calculate-install/pym/install/variables/system.py:335 +#: ../calculate-install/pym/install/variables/system.py:358 msgid "Migrating users" msgstr "Перенос пользователей" @@ -841,19 +849,19 @@ msgstr "Точки монтирования" msgid "NTP server" msgstr "Сервер времени" -#: ../calculate-install/pym/install/variables/net.py:281 +#: ../calculate-install/pym/install/variables/net.py:297 msgid "Name" msgstr "Название" #: ../calculate-install/pym/install/variables/net.py:92 -#: ../calculate-install/pym/install/variables/net.py:401 -#: ../calculate-install/pym/install/variables/net.py:554 +#: ../calculate-install/pym/install/variables/net.py:439 +#: ../calculate-install/pym/install/variables/net.py:592 #: ../calculate-install/pym/install/wsdl_install.py:243 #: ../calculate-install/pym/install/wsdl_install.py:258 msgid "Network" msgstr "Сеть" -#: ../calculate-install/pym/install/variables/net.py:571 +#: ../calculate-install/pym/install/variables/net.py:609 #, python-format msgid "Network '%s' is used more than once" msgstr "Сеть '%s' используется более одного раза" @@ -862,17 +870,17 @@ msgstr "Сеть '%s' используется более одного раза" msgid "Network configuration is unavailable for Flash install" msgstr "Конфигурация сети недоступна при установке на Flash" -#: ../calculate-install/pym/install/variables/net.py:210 +#: ../calculate-install/pym/install/variables/net.py:226 #, python-format msgid "Network interface %s not found" msgstr "Сетевой интерфейс %s не найден" -#: ../calculate-install/pym/install/variables/net.py:201 +#: ../calculate-install/pym/install/variables/net.py:217 #, python-format msgid "Network interface, DHCP or IP address and network mask (example: %s)" msgstr "Сетевой интерфейс, DHCP или IP-адрес и маска сети (пример: %s)" -#: ../calculate-install/pym/install/variables/net.py:782 +#: ../calculate-install/pym/install/variables/net.py:820 msgid "Network manager" msgstr "Менеджер сети" @@ -892,11 +900,11 @@ msgstr "Настройка сети выполнена!" msgid "Network settings unavailable with use settings migration" msgstr "Настройка сети недоступна при использовании переноса сетевых настроек" -#: ../calculate-install/pym/install/variables/net.py:757 +#: ../calculate-install/pym/install/variables/net.py:795 msgid "NetworkManager" msgstr "NetworkManager" -#: ../calculate-install/pym/install/variables/system.py:559 +#: ../calculate-install/pym/install/variables/system.py:582 msgid "No autologin" msgstr "Без автовхода" @@ -913,36 +921,36 @@ msgstr "Не доступно" msgid "Not enough free space on the USB Flash" msgstr "Не достаточно свободного места на USB Flash" -#: ../calculate-install/pym/install/variables/net.py:841 -#: ../calculate-install/pym/install/variables/net.py:875 #: ../calculate-install/pym/install/variables/distr.py:410 #: ../calculate-install/pym/install/variables/distr.py:415 #: ../calculate-install/pym/install/variables/distr.py:433 #: ../calculate-install/pym/install/variables/distr.py:444 #: ../calculate-install/pym/install/variables/distr.py:458 #: ../calculate-install/pym/install/variables/distr.py:472 -#: ../calculate-install/pym/install/variables/system.py:575 +#: ../calculate-install/pym/install/variables/system.py:598 +#: ../calculate-install/pym/install/variables/net.py:879 +#: ../calculate-install/pym/install/variables/net.py:913 msgid "Not used" msgstr "Не используется" -#: ../calculate-install/pym/install/variables/X11.py:59 +#: ../calculate-install/pym/install/variables/X11.py:60 msgid "Nvidia Graphics Driver (nvidia)" msgstr "Nvidia Graphics Driver (nvidia)" -#: ../calculate-install/pym/install/variables/X11.py:58 +#: ../calculate-install/pym/install/variables/X11.py:59 msgid "Nvidia Nouveau (nouveau)" msgstr "Nvidia Nouveau (nouveau)" -#: ../calculate-install/pym/install/variables/net.py:174 +#: ../calculate-install/pym/install/variables/net.py:190 msgid "Off" msgstr "Выкл" -#: ../calculate-install/pym/install/variables/X11.py:257 +#: ../calculate-install/pym/install/variables/X11.py:260 #, python-format msgid "Only %s drivers are available" msgstr "Доступны только драйвера %s" -#: ../calculate-install/pym/install/variables/net.py:758 +#: ../calculate-install/pym/install/variables/net.py:796 msgid "OpenRC" msgstr "OpenRC" @@ -959,19 +967,19 @@ msgstr "Установка PXE" msgid "PXE install does not support %s" msgstr "Установка PXE не поддерживается %s" -#: ../calculate-install/pym/install/variables/system.py:835 +#: ../calculate-install/pym/install/variables/system.py:858 msgid "PXE install is available for Calculate Directory Server only" msgstr "Установка PXE доступна только на Calculate Directory Server" -#: ../calculate-install/pym/install/variables/system.py:853 +#: ../calculate-install/pym/install/variables/system.py:876 msgid "PXE install is only available if the DHCP service has been configured first" msgstr "PXE установка доступна только при настроенном DHCP-сервисе" -#: ../calculate-install/pym/install/variables/net.py:898 +#: ../calculate-install/pym/install/variables/net.py:936 msgid "PXE server IP" msgstr "IP адрес PXE сервера" -#: ../calculate-install/pym/install/variables/autopartition.py:621 +#: ../calculate-install/pym/install/variables/autopartition.py:624 msgid "Partition table" msgstr "Таблица разделов" @@ -985,11 +993,11 @@ msgstr "Раздел {disk} уже используется текущей си msgid "Partition {disk} already used for installation" msgstr "Раздел {disk} уже используется для установки" -#: ../calculate-install/pym/install/variables/autopartition.py:508 +#: ../calculate-install/pym/install/variables/autopartition.py:511 msgid "Partitions options" msgstr "Параметры разделов" -#: ../calculate-install/pym/install/variables/system.py:471 +#: ../calculate-install/pym/install/variables/system.py:494 msgid "Password" msgstr "Пароль" @@ -1000,7 +1008,7 @@ msgstr "Пропущен пароль для пользователя %s" msgid "Permission denied" msgstr "Нет доступа" -#: ../calculate-install/pym/install/variables/system.py:151 +#: ../calculate-install/pym/install/variables/system.py:174 msgid "Please enter a root password for Grub" msgstr "Пожалуйста, введите root-пароль для меню Grub" @@ -1038,7 +1046,7 @@ msgstr "Подготовим систему для перезагрузки" msgid "PulseAudio" msgstr "PulseAudio" -#: ../calculate-install/pym/install/variables/autopartition.py:292 +#: ../calculate-install/pym/install/variables/autopartition.py:295 #, python-format msgid "RAID %s is wrong" msgstr "Неправильное RAID устройство %s" @@ -1051,19 +1059,19 @@ msgstr "Перенастроить сеть" msgid "Recovery is not implemented" msgstr "Восстановление не поддерживается" -#: ../calculate-install/pym/install/variables/system.py:271 +#: ../calculate-install/pym/install/variables/system.py:294 msgid "Remove the password protection on Grub" msgstr "Удалить пароль на меню Grub" -#: ../calculate-install/pym/install/variables/autopartition.py:583 +#: ../calculate-install/pym/install/variables/autopartition.py:586 msgid "Root partition size" msgstr "Размер корневого раздела" -#: ../calculate-install/pym/install/variables/system.py:141 +#: ../calculate-install/pym/install/variables/system.py:164 msgid "Root password" msgstr "Пароль пользователя root" -#: ../calculate-install/pym/install/variables/net.py:499 +#: ../calculate-install/pym/install/variables/net.py:537 msgid "Routing" msgstr "Маршрутизация" @@ -1085,19 +1093,19 @@ msgstr "Выполнить" msgid "Save" msgstr "Сохранить" -#: ../calculate-install/pym/install/variables/X11.py:121 +#: ../calculate-install/pym/install/variables/X11.py:122 msgid "Screen resolution" msgstr "Разрешение экрана" -#: ../calculate-install/pym/install/variables/net.py:814 +#: ../calculate-install/pym/install/variables/net.py:852 msgid "Search domains" msgstr "Домены для поиска" -#: ../calculate-install/pym/install/variables/autopartition.py:329 +#: ../calculate-install/pym/install/variables/autopartition.py:332 msgid "Selected devices have not BIOS boot partition" msgstr "На выбранных устройствах нет BIOS boot раздела" -#: ../calculate-install/pym/install/variables/autopartition.py:325 +#: ../calculate-install/pym/install/variables/autopartition.py:328 msgid "Selected devices have not EFI partition" msgstr "На выбранных устройствах нет EFI раздела" @@ -1115,7 +1123,7 @@ msgstr "Настройка сессии выполнена!" msgid "Size" msgstr "Размер" -#: ../calculate-install/pym/install/variables/net.py:633 +#: ../calculate-install/pym/install/variables/net.py:671 msgid "Source IP" msgstr "Исходный IP" @@ -1135,7 +1143,7 @@ msgstr "Размер squash не поддерживается для %s" msgid "Start installing" msgstr "Начать установку" -#: ../calculate-install/pym/install/variables/autopartition.py:523 +#: ../calculate-install/pym/install/variables/autopartition.py:526 msgid "Swap partition" msgstr "Раздел подкачки" @@ -1168,7 +1176,7 @@ msgstr "Перезагрузка системы" msgid "System successfully installed!" msgstr "Система установлена!" -#: ../calculate-install/pym/install/variables/system.py:378 +#: ../calculate-install/pym/install/variables/system.py:401 msgid "System update" msgstr "Обновление системы" @@ -1176,7 +1184,7 @@ msgstr "Обновление системы" msgid "The audio settings are being configured" msgstr "Настройка аудио параметров" -#: ../calculate-install/pym/install/variables/system.py:585 +#: ../calculate-install/pym/install/variables/system.py:608 msgid "The autologin is not available with domain workstations" msgstr "Автовход не доступен для доменных рабочих станций" @@ -1202,7 +1210,7 @@ msgstr "'%(opt)s' не может быть файловой системой д msgid "The following attributes are not specified: (%s)" msgstr "Не указаны следующие атрибуты: (%s)" -#: ../calculate-install/pym/install/variables/net.py:245 +#: ../calculate-install/pym/install/variables/net.py:261 #, python-format msgid "The hostname length should be less than %d" msgstr "Длина имени хоста должна быть меньше чем %d" @@ -1229,11 +1237,11 @@ msgstr "Настройка локализации и времени" msgid "The network settings are being configured" msgstr "Настройка параметров сети" -#: ../calculate-install/pym/install/variables/autopartition.py:524 +#: ../calculate-install/pym/install/variables/autopartition.py:527 msgid "The partition for the update" msgstr "Раздел для обновлений" -#: ../calculate-install/pym/install/variables/autopartition.py:542 +#: ../calculate-install/pym/install/variables/autopartition.py:545 msgid "The partition table must be GPT for using UEFI bootloader" msgstr "Для использования UEFI загрузчика таблица разделов должна быть GPT" @@ -1247,7 +1255,7 @@ msgstr "Раздел {dev} уже используется как {mp}" msgid "The root partition should be at least %s" msgstr "Корневой раздел должен быть не менее %s" -#: ../calculate-install/pym/install/variables/autopartition.py:604 +#: ../calculate-install/pym/install/variables/autopartition.py:607 #, python-brace-format msgid "The root partition should be at least {size}" msgstr "Размер корневого раздела не может быть меньше {size}" @@ -1286,7 +1294,7 @@ msgstr "Темы" msgid "Themes configured!" msgstr "Темы настроены!" -#: ../calculate-install/pym/install/variables/X11.py:73 +#: ../calculate-install/pym/install/variables/X11.py:74 msgid "This distribution does not provide a Xorg server" msgstr "Устанавливаемый дистрибутив не содержит Xorg-сервер" @@ -1296,7 +1304,7 @@ msgid "This distribution does not provide the ALSA sound" msgstr "Устанавливаемый дистрибутив не поддерживает звуковую систему ALSA" #: ../calculate-install/pym/install/variables/disk.py:2146 -#: ../calculate-install/pym/install/variables/autopartition.py:493 +#: ../calculate-install/pym/install/variables/autopartition.py:496 msgid "This option not used for Flash install" msgstr "Этот параметр не используется при установке на Flash" @@ -1352,16 +1360,16 @@ msgstr "Жёсткий диск USB" msgid "USB flash %s" msgstr "USB-flash %s" -#: ../calculate-install/pym/install/install.py:567 +#: ../calculate-install/pym/install/install.py:568 msgid "Unable to change the I/O scheduler" msgstr "Не удалось изменить I/O планировщик" -#: ../calculate-install/pym/install/install.py:737 +#: ../calculate-install/pym/install/install.py:738 #, python-format msgid "Unable to remove directory %s" msgstr "Не удалось удалить директорию %s" -#: ../calculate-install/pym/install/install.py:731 +#: ../calculate-install/pym/install/install.py:732 #, python-format msgid "Unable to umount %s" msgstr "Не удалось отмонтировать %s" @@ -1383,11 +1391,11 @@ msgstr "Невозможно использовать расширенный р msgid "Unable to use {part} partition used by active {typepart} for installation" msgstr "Невозможно использовать раздел {part}, используемый активным {typepart} для установки" -#: ../calculate-install/pym/install/variables/net.py:299 #: ../calculate-install/pym/install/variables/disk.py:2089 #: ../calculate-install/pym/install/variables/disk.py:2191 #: ../calculate-install/pym/install/variables/disk.py:2491 #: ../calculate-install/pym/install/variables/autopartition.py:162 +#: ../calculate-install/pym/install/variables/net.py:315 msgid "Unknown" msgstr "Неизвестный" @@ -1425,11 +1433,11 @@ msgstr "Не поддерживается" msgid "Update" msgstr "Обновление" -#: ../calculate-install/pym/install/variables/system.py:977 +#: ../calculate-install/pym/install/variables/system.py:1000 msgid "Update configuration unavailable for Flash install" msgstr "Настройка обновлений недоступна при установке на Flash" -#: ../calculate-install/pym/install/variables/system.py:1007 +#: ../calculate-install/pym/install/variables/system.py:1030 msgid "Update packages at first boot" msgstr "Обновить пакеты при первой загрузке" @@ -1441,7 +1449,7 @@ msgstr "Обновить настройки системы" msgid "Updating the configuration" msgstr "Обновление конфигурации" -#: ../calculate-install/pym/install/variables/autopartition.py:527 +#: ../calculate-install/pym/install/variables/autopartition.py:530 msgid "Use LVM" msgstr "Использовать LVM" @@ -1449,23 +1457,23 @@ msgstr "Использовать LVM" msgid "Use UUID" msgstr "Использовать UUID" -#: ../calculate-install/pym/install/variables/autopartition.py:471 +#: ../calculate-install/pym/install/variables/autopartition.py:474 msgid "Use current partitions" msgstr "Использовать существующие разделы" -#: ../calculate-install/pym/install/variables/autopartition.py:526 +#: ../calculate-install/pym/install/variables/autopartition.py:529 msgid "Use the UEFI bootloader" msgstr "Использовать UEFI загрузчик" -#: ../calculate-install/pym/install/variables/system.py:201 +#: ../calculate-install/pym/install/variables/system.py:224 msgid "Use the root password to edit Grub" msgstr "Использовать root-пароль для редактирования меню grub" -#: ../calculate-install/pym/install/variables/system.py:345 +#: ../calculate-install/pym/install/variables/system.py:368 msgid "User" msgstr "Пользователь" -#: ../calculate-install/pym/install/variables/system.py:569 +#: ../calculate-install/pym/install/variables/system.py:592 #, python-format msgid "User %s does not exist" msgstr "Пользователь %s не существует" @@ -1475,15 +1483,15 @@ msgstr "Пользователь %s не существует" msgid "User %s not found" msgstr "Не найден пользователь %s" -#: ../calculate-install/pym/install/variables/system.py:56 +#: ../calculate-install/pym/install/variables/system.py:57 msgid "User configuration unavailable for Flash install" msgstr "Конфигурация пользователей недоступна при установке на Flash" -#: ../calculate-install/pym/install/variables/system.py:290 +#: ../calculate-install/pym/install/variables/system.py:313 msgid "User profile encryption is uncompatible with autologin" msgstr "Шифрование пользовательских профилей не совместимо с автовходом" -#: ../calculate-install/pym/install/variables/system.py:360 +#: ../calculate-install/pym/install/variables/system.py:383 msgid "Username is missing" msgstr "Имя пользователя пропущено" @@ -1497,12 +1505,12 @@ msgstr "Пользователи" msgid "Video" msgstr "Видео" -#: ../calculate-install/pym/install/variables/X11.py:69 -#: ../calculate-install/pym/install/variables/X11.py:281 +#: ../calculate-install/pym/install/variables/X11.py:70 +#: ../calculate-install/pym/install/variables/X11.py:284 msgid "Video configuration unavailable for Flash install" msgstr "Конфигурация видео не доступна при установке на Flash" -#: ../calculate-install/pym/install/variables/X11.py:203 +#: ../calculate-install/pym/install/variables/X11.py:206 msgid "Video driver" msgstr "Видео драйвер" @@ -1523,17 +1531,17 @@ msgstr "Вы хотите перезагрузить компьютер сейч msgid "Wrong EFI device %s" msgstr "Неправильное EFI устройство %s" -#: ../calculate-install/pym/install/variables/net.py:362 +#: ../calculate-install/pym/install/variables/net.py:400 #, python-format msgid "Wrong IP address %s" msgstr "Неправильный IP-адрес %s" -#: ../calculate-install/pym/install/variables/net.py:647 +#: ../calculate-install/pym/install/variables/net.py:685 #, python-format msgid "Wrong IP address %s in the specified source IP" msgstr "Неправильный IP-адрес %s в указанном исходном IP" -#: ../calculate-install/pym/install/variables/net.py:870 +#: ../calculate-install/pym/install/variables/net.py:908 msgid "Wrong IP address for DNS" msgstr "Неправильный IP-адрес для DNS" @@ -1553,12 +1561,12 @@ msgstr "Неправильное устройство '%s'" msgid "Wrong distribution" msgstr "Неподходящий дистрибутив" -#: ../calculate-install/pym/install/variables/net.py:596 +#: ../calculate-install/pym/install/variables/net.py:634 #, python-format msgid "Wrong gateway IP %s" msgstr "Неверный IP-шлюза %s" -#: ../calculate-install/pym/install/variables/net.py:242 +#: ../calculate-install/pym/install/variables/net.py:258 msgid "Wrong hostname" msgstr "Неправильное имя хоста" @@ -1568,7 +1576,7 @@ msgstr "Неправильное имя хоста" msgid "Wrong image file" msgstr "Неправильный файл образа" -#: ../calculate-install/pym/install/variables/net.py:459 +#: ../calculate-install/pym/install/variables/net.py:497 #, python-format msgid "Wrong mask %s" msgstr "Неправильная маска %s" @@ -1578,17 +1586,17 @@ msgstr "Неправильная маска %s" msgid "Wrong mount point '%s'" msgstr "Неправильная точка монтирования '%s'" -#: ../calculate-install/pym/install/variables/net.py:566 +#: ../calculate-install/pym/install/variables/net.py:604 #, python-format msgid "Wrong network %s" msgstr "Неправильная сеть %s" -#: ../calculate-install/pym/install/variables/X11.py:103 +#: ../calculate-install/pym/install/variables/X11.py:104 #, python-brace-format msgid "Wrong resolution {resolution} {example}" msgstr "Неправильное разрешение {resolution} {example}" -#: ../calculate-install/pym/install/variables/net.py:641 +#: ../calculate-install/pym/install/variables/net.py:679 #, python-format msgid "Wrong source IP %s" msgstr "Неверный исходный IP %s" @@ -1606,7 +1614,7 @@ msgstr "Вы не может отформатировать USB Flash, кото msgid "You cannot install the new system instead current" msgstr "Вы не можете установить новую систему вместо текущей" -#: ../calculate-install/pym/install/variables/system.py:255 +#: ../calculate-install/pym/install/variables/system.py:278 msgid "You cannot set a password and remove the existing password at a time" msgstr "Установка пароля несовместима с удалением пароля" @@ -1631,15 +1639,15 @@ msgid "Your boot device must have a BIOS Boot partition ({minsize})" msgstr "На загрузочном диске должен присутствовать BIOS Boot раздел ({minsize})" #: ../calculate-install/pym/install/variables/disk.py:2102 -#: ../calculate-install/pym/install/variables/autopartition.py:534 +#: ../calculate-install/pym/install/variables/autopartition.py:537 msgid "Your system must be loaded in UEFI for using this bootloader" msgstr "Система должна быть загружена как UEFI для того, чтобы использовать этот загрузчик" -#: ../calculate-install/pym/install/variables/net.py:501 +#: ../calculate-install/pym/install/variables/net.py:539 msgid "add a routing rule (specified as NETWORK:GATEWAY[:DEV[:SOURCE]])" msgstr "добавить правило маршрутизации (формат NETWORK:GATEWAY[:DEV[:SOURCE]])" -#: ../calculate-install/pym/install/variables/system.py:306 +#: ../calculate-install/pym/install/variables/system.py:329 msgid "add a user to the installed system. USER is username. ADMIN is administrator rights (none, all, update, none by default). GROUPS is list user supplimentary groups (comma delimeter). Use 'none' value to discard user migration" msgstr "добавить пользователя в устанавливаемую систему. USER - имя пользователя. ADMIN - права администратора (none, all, update, none по умолчанию). GROUPS список пользовательских дополнительных групп (через запятую). Используйте 'none' значение для отмены переноса пользователей" @@ -1648,11 +1656,11 @@ msgstr "добавить пользователя в устанавливаем msgid "archive %s" msgstr "архив %s" -#: ../calculate-install/pym/install/variables/system.py:798 +#: ../calculate-install/pym/install/variables/system.py:821 msgid "audio parameters" msgstr "звуковые параметры" -#: ../calculate-install/pym/install/variables/autopartition.py:507 +#: ../calculate-install/pym/install/variables/autopartition.py:510 msgid "autopartition options" msgstr "параметры авторазметки" @@ -1660,7 +1668,7 @@ msgstr "параметры авторазметки" msgid "boot disk for the system bound for install" msgstr "загрузочный диск для устанавливаемой системы" -#: ../calculate-install/pym/install/variables/system.py:797 +#: ../calculate-install/pym/install/variables/system.py:820 msgid "boot parameters" msgstr "параметры загрузки" @@ -1687,7 +1695,7 @@ msgstr "по версии" msgid "command '%s' not found" msgstr "команда '%s' не найдена" -#: ../calculate-install/pym/install/variables/system.py:820 +#: ../calculate-install/pym/install/variables/system.py:843 msgid "configure dynamic options only" msgstr "конфигурировать только динамические параметры" @@ -1700,7 +1708,7 @@ msgstr "тип устройства для устанавливаемой сис msgid "directory '%s'" msgstr "директория '%s'" -#: ../calculate-install/pym/install/variables/net.py:853 +#: ../calculate-install/pym/install/variables/net.py:891 msgid "domain name server (comma-separated)" msgstr "сервера доменных имен (разделитель - запятая)" @@ -1708,7 +1716,7 @@ msgstr "сервера доменных имен (разделитель - за msgid "empty" msgstr "пусто" -#: ../calculate-install/pym/install/variables/system.py:280 +#: ../calculate-install/pym/install/variables/system.py:303 msgid "encrypt user profiles" msgstr "шифровать пользовательские профили" @@ -1717,7 +1725,7 @@ msgstr "шифровать пользовательские профили" msgid "for {typedisk} install" msgstr "для {typedisk} установки" -#: ../calculate-install/pym/install/variables/system.py:890 +#: ../calculate-install/pym/install/variables/system.py:913 msgid "grub terminal" msgstr "grub терминал" @@ -1740,15 +1748,15 @@ msgstr "со слоями '{file} {diff}'" msgid "live image %s" msgstr "live-образ %s" -#: ../calculate-install/pym/install/variables/system.py:795 +#: ../calculate-install/pym/install/variables/system.py:818 msgid "localization and time options" msgstr "параметры локализации и времени" -#: ../calculate-install/pym/install/variables/net.py:783 +#: ../calculate-install/pym/install/variables/net.py:821 msgid "network manager" msgstr "менеджер сети" -#: ../calculate-install/pym/install/variables/system.py:794 +#: ../calculate-install/pym/install/variables/system.py:817 msgid "network settings" msgstr "сетевые параметры" @@ -1757,7 +1765,7 @@ msgstr "сетевые параметры" msgid "partition '%s'" msgstr "раздел '%s'" -#: ../calculate-install/pym/install/variables/system.py:867 +#: ../calculate-install/pym/install/variables/system.py:890 msgid "path for PXE install" msgstr "путь для PXE-установки" @@ -1769,11 +1777,11 @@ msgstr "выполнить форматирование USB Flash" msgid "reconfigure network" msgstr "перенастроить сеть" -#: ../calculate-install/pym/install/variables/system.py:270 +#: ../calculate-install/pym/install/variables/system.py:293 msgid "remove the password protection for editing the Grub menu" msgstr "удалить пароль на редактирование меню Grub" -#: ../calculate-install/pym/install/variables/net.py:815 +#: ../calculate-install/pym/install/variables/net.py:853 msgid "search domains (comma-separated)" msgstr "домены для поиска (разделитель - запятая)" @@ -1793,7 +1801,7 @@ msgstr "выбрать операционную систему по версии msgid "select the processor architecture" msgstr "выбор архитектуры процессора" -#: ../calculate-install/pym/install/variables/system.py:800 +#: ../calculate-install/pym/install/variables/system.py:823 msgid "session settings" msgstr "настройки сессии" @@ -1801,23 +1809,23 @@ msgstr "настройки сессии" msgid "set UEFI boot disks" msgstr "установить диски для UEFI загрузки" -#: ../calculate-install/pym/install/variables/system.py:535 +#: ../calculate-install/pym/install/variables/system.py:558 msgid "set an autologin for the user, 'off' for disable" msgstr "установить автоматический вход в систему для пользователя, 'off' для отключения" -#: ../calculate-install/pym/install/variables/net.py:231 +#: ../calculate-install/pym/install/variables/net.py:247 msgid "set either the short or the full hostname" msgstr "установить короткое или полное имя хоста" -#: ../calculate-install/pym/install/variables/autopartition.py:444 +#: ../calculate-install/pym/install/variables/autopartition.py:447 msgid "set filesystem for data partititon" msgstr "установить файловую систему для раздела с данными" -#: ../calculate-install/pym/install/variables/autopartition.py:429 +#: ../calculate-install/pym/install/variables/autopartition.py:432 msgid "set filesystem for root partititon" msgstr "установить файловую систему для корневого раздела" -#: ../calculate-install/pym/install/variables/system.py:219 +#: ../calculate-install/pym/install/variables/system.py:242 msgid "set grub password" msgstr "установить пароль на grub" @@ -1833,7 +1841,7 @@ msgstr "установка NTP сервера для системы" msgid "set the USB Flash device" msgstr "установить USB Flash" -#: ../calculate-install/pym/install/variables/X11.py:120 +#: ../calculate-install/pym/install/variables/X11.py:121 msgid "set the Xorg resolution" msgstr "установить разрешение Xorg" @@ -1849,8 +1857,8 @@ msgstr "установить звуковую карту по умолчанию msgid "set the device for autopartition" msgstr "установить диск для авторазметки" -#: ../calculate-install/pym/install/variables/X11.py:350 -#: ../calculate-install/pym/install/variables/X11.py:375 +#: ../calculate-install/pym/install/variables/X11.py:354 +#: ../calculate-install/pym/install/variables/X11.py:379 msgid "set the framebuffer resolution" msgstr "установить разрешение фреймбуфера" @@ -1862,11 +1870,11 @@ msgstr "установить раскладку клавиатуры" msgid "set the locale" msgstr "установить локаль" -#: ../calculate-install/pym/install/variables/autopartition.py:622 +#: ../calculate-install/pym/install/variables/autopartition.py:625 msgid "set the partition table for autopartition" msgstr "установить таблицу разделов для авторазметки" -#: ../calculate-install/pym/install/variables/autopartition.py:584 +#: ../calculate-install/pym/install/variables/autopartition.py:587 msgid "set the root partition size for autopartition" msgstr "установить размер корневого раздела для авторазметки" @@ -1878,11 +1886,11 @@ msgstr "установить размер раздела подкачки для msgid "set the timezone" msgstr "установить часовой пояс" -#: ../calculate-install/pym/install/variables/X11.py:202 +#: ../calculate-install/pym/install/variables/X11.py:205 msgid "set the video driver" msgstr "установить видеодрайвер" -#: ../calculate-install/pym/install/variables/system.py:140 +#: ../calculate-install/pym/install/variables/system.py:163 msgid "specify the root password" msgstr "указать пароль пользователя root" @@ -1896,7 +1904,7 @@ msgstr "squash-образ %s" msgid "to" msgstr "в" -#: ../calculate-install/pym/install/variables/X11.py:307 +#: ../calculate-install/pym/install/variables/X11.py:310 msgid "toggle composite" msgstr "установить композит" @@ -1904,11 +1912,11 @@ msgstr "установить композит" msgid "toggle the I/O scheduler" msgstr "установить I/O планировщик" -#: ../calculate-install/pym/install/variables/system.py:1006 +#: ../calculate-install/pym/install/variables/system.py:1029 msgid "update packages at first boot" msgstr "обновить пакеты при первой загрузке" -#: ../calculate-install/pym/install/variables/system.py:799 +#: ../calculate-install/pym/install/variables/system.py:822 msgid "update themes" msgstr "обновить темы" @@ -1916,7 +1924,7 @@ msgstr "обновить темы" msgid "use UUID" msgstr "использовать UUID" -#: ../calculate-install/pym/install/variables/autopartition.py:466 +#: ../calculate-install/pym/install/variables/autopartition.py:469 msgid "use the autopartition" msgstr "использовать авторазметку" @@ -1924,24 +1932,24 @@ msgstr "использовать авторазметку" msgid "use the network migration" msgstr "использовать миграцию сетевых настроек" -#: ../calculate-install/pym/install/variables/system.py:200 +#: ../calculate-install/pym/install/variables/system.py:223 msgid "use the root password to edit Grub" msgstr "использовать root-пароль для редактирования меню grub" -#: ../calculate-install/pym/install/variables/system.py:801 +#: ../calculate-install/pym/install/variables/system.py:824 msgid "user settings" msgstr "настройки пользователей" -#: ../calculate-install/pym/install/variables/net.py:300 +#: ../calculate-install/pym/install/variables/net.py:316 msgid "vendor" msgstr "производитель" -#: ../calculate-install/pym/install/variables/X11.py:262 +#: ../calculate-install/pym/install/variables/X11.py:265 #, python-format msgid "video driver %s is unavailable" msgstr "%s видеодрайвер недоступен" -#: ../calculate-install/pym/install/variables/system.py:796 +#: ../calculate-install/pym/install/variables/system.py:819 msgid "video settings" msgstr "параметры видео" diff --git a/ru/cl_lib3.po b/ru/cl_lib3.po index e5ed5a6..5f8c44e 100644 --- a/ru/cl_lib3.po +++ b/ru/cl_lib3.po @@ -11,7 +11,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3525 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3526 #, python-format msgid "%(name)s does not match %(nameElement)s in size" msgstr "размер %(name)s не равен размеру %(nameElement)s" @@ -33,7 +33,7 @@ msgstr "Команда не найдена %s" msgid "%s is not directory" msgstr "%s не директория" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3453 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3454 #, python-format msgid "'%s' is not a number" msgstr "'%s' не число" @@ -44,7 +44,7 @@ msgstr "1 аргумент" #: ../calculate-lib/pym/calculate/lib/utils/mount.py:246 #: ../calculate-lib/pym/calculate/lib/utils/mount.py:256 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4547 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4548 msgid ":" msgstr ":" @@ -57,66 +57,66 @@ msgstr ":" #: ../calculate-lib/pym/calculate/lib/cl_template.py:1218 #: ../calculate-lib/pym/calculate/lib/cl_template.py:1220 #: ../calculate-lib/pym/calculate/lib/cl_template.py:2270 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4512 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5000 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5033 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5055 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4513 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5011 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5044 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5066 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5140 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5158 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5077 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5151 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5169 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5186 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5191 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5384 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5180 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5197 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5202 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5395 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5417 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5429 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5462 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5469 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5478 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5406 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5428 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5440 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5473 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5480 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5495 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5497 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5489 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5491 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5506 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5508 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5541 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5543 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5517 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5519 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5552 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5554 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5556 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5565 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5567 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5588 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5591 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5618 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5620 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5628 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5630 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5576 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5578 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5599 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5602 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5629 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5631 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5639 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5668 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5685 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5707 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5724 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5641 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5650 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5679 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5696 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5718 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5735 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5741 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5772 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5774 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5786 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5787 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6105 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6107 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6138 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6182 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6184 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6212 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6214 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6241 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6243 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6276 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6312 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6322 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6339 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6341 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6351 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5746 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5752 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5783 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5785 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5797 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5798 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6116 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6118 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6149 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6193 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6195 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6223 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6225 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6252 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6254 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6287 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6323 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6333 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6350 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6352 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6362 msgid ": " msgstr ": " @@ -138,7 +138,7 @@ msgstr "Неопредёленность в этом шаблоне: одни и msgid "Ambiguous choice:%s" msgstr "Неоднозначный выбор: %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6094 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6105 msgid "Appling patch" msgstr "Применение патча" @@ -176,7 +176,7 @@ msgstr "Ветка {branch} не найдена в {rpath} репозитори msgid "Branch {branch} not found in repository {url}" msgstr "Ветка {branch} не найдена в {url} репозитории" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4547 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4548 msgid "Calculate Utilities have changed files" msgstr "Утилиты Calculate изменили файлы" @@ -194,6 +194,12 @@ msgstr "Нажмите для дополнительных настроек" msgid "Command not found '%s'" msgstr "Команда не найдена '%s'" +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4860 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4869 +#, python-format +msgid "Config action is not support '%s' parameter" +msgstr "Действие Config не поддерживает параметр '%s'" + #: ../calculate-lib/pym/calculate/lib/format/dconf.py:68 msgid "Config is wrong" msgstr "Конфигурационный файл не правильный" @@ -232,7 +238,7 @@ msgstr "Шаблоны дистрибутива" #: ../calculate-lib/pym/calculate/lib/encrypt.py:75 #: ../calculate-lib/pym/calculate/lib/encrypt.py:125 #: ../calculate-lib/pym/calculate/lib/encrypt.py:129 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4016 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4017 msgid "ERROR" msgstr "ОШИБКА" @@ -241,7 +247,7 @@ msgstr "ОШИБКА" msgid "Each entry must contains %d field(s)" msgstr "Каждая запись должна содержать %d поля(ей)" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4001 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4002 msgid "Empty oct value" msgstr "Пустое значение восьмеричного числа" @@ -264,26 +270,26 @@ msgstr "Ошибка в calculate.env профиле" msgid "Error in profile calculate.env" msgstr "Ошибка в профиле calculate.env" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6308 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6319 #, python-format msgid "Error in template %s" msgstr "Ошибка в шаблоне %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4329 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4330 msgid "Example:" msgstr "Пример:" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4919 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4927 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4930 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4938 #, python-format msgid "Failed to apply template file %s" msgstr "Ошибка при применении файла шаблона %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5671 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5682 msgid "Failed to change the current directory to" msgstr "Не удалось изменить текущую директорию на" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4851 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4852 #, python-format msgid "Failed to change version of %s" msgstr "Не удалось изменить версию %s" @@ -293,7 +299,7 @@ msgstr "Не удалось изменить версию %s" msgid "Failed to clean the {rpath} repository" msgstr "Не удалось очистить {rpath} репозиторий" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5480 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5491 msgid "Failed to clear the file" msgstr "Не удалось очистить файл" @@ -314,7 +320,7 @@ msgstr "Не удалось преобразовать текстовый шаб msgid "Failed to copy '%(src)s' to '%(dst)s'" msgstr "Не удалось скопировать '%(src)s' в '%(dst)s'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4631 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4632 #, python-brace-format msgid "Failed to copy {ffrom} to {fto}" msgstr "Не удалось скопировать {ffrom} в {fto}" @@ -331,7 +337,7 @@ msgstr "Не удалось создать GPT таблицу разделов" msgid "Failed to create LVM" msgstr "Не удалось создать LVM" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5787 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5798 msgid "Failed to create a symbolic link" msgstr "Не удалось создать символическую ссылку" @@ -344,14 +350,14 @@ msgstr "Не удалось создать символическую ссылк msgid "Failed to create tarball: %s" msgstr "Не удалось создать tar: %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4053 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4065 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4054 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4066 msgid "Failed to create the directory: " msgstr "Не удалось создать директорию: " #: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:142 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5543 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5641 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5554 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5652 msgid "Failed to create the file" msgstr "Не удалось создать файл" @@ -360,25 +366,25 @@ msgstr "Не удалось создать файл" msgid "Failed to create volume %s" msgstr "Не удалось создать том %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5097 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5112 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5108 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5123 msgid "Failed to delete the directory: " msgstr "Не удалось удалить директорию: " -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5508 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5567 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5591 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5630 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5774 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5519 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5578 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5602 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5641 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5785 msgid "Failed to delete the file" msgstr "Не удалось удалить файл" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5497 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5556 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5508 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5567 msgid "Failed to delete the link" msgstr "Не удалось удалить ссылку" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5119 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5130 msgid "Failed to delete: " msgstr "Не удалось удалить: " @@ -401,16 +407,16 @@ msgid "Failed to determine the system profile" msgstr "Не удалось определить профиль системы" #: ../calculate-lib/pym/calculate/lib/cl_template.py:2270 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4512 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6107 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6184 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6214 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6243 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6341 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4513 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6118 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6195 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6225 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6254 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6352 msgid "Failed to execute" msgstr "Не удалось выполнить" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5463 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5474 #, python-format msgid "Failed to execute %s" msgstr "Не удалось выполнить %s" @@ -444,12 +450,12 @@ msgstr "Не удалось получить состояние репозито msgid "Failed to get value %s" msgstr "Не удалось получить значение %s" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1578 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1579 #, python-brace-format msgid "Failed to hide {packages}: {error}" msgstr "Не удалось спрятать {packages}: {error}" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1603 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1604 #, python-brace-format msgid "Failed to hide {package}: {error}" msgstr "Не удалось спрятать {package}: {error}" @@ -469,7 +475,7 @@ msgstr "Не удалось импортировать модуль %s" msgid "Failed to join the template" msgstr "Не удалось объединить шаблон" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4644 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4645 #, python-format msgid "Failed to modify %s contents" msgstr "Не удалось изменить содержимое %s" @@ -489,12 +495,12 @@ msgstr "Не удалось переместить данные: %s" msgid "Failed to move to branch {branch} in the {rpath} repository" msgstr "Не удалось сменить ветку на {branch} в {rpath} репозитории" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5620 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5631 msgid "Failed to open the file" msgstr "Не удалось открыть файл" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5000 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5384 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5011 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5395 msgid "Failed to open the template" msgstr "Ошибка открытия шаблона" @@ -508,19 +514,19 @@ msgstr "Не удалось оптимизировать репозиторий msgid "Failed to parse Private.sig" msgstr "Не удалось распознать Private.sig" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4684 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4786 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4685 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4787 #, python-format msgid "Failed to read templates directory %s" msgstr "Не удалось прочитать директорию с шаблонами %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4876 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4887 #, python-format msgid "Failed to reconfigure package %s" msgstr "Не удалось перенастроить пакет %s" #: ../calculate-lib/pym/calculate/lib/format/backgrounds.py:260 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4640 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4641 #, python-format msgid "Failed to remove %s" msgstr "Не удалось удалить %s" @@ -530,7 +536,7 @@ msgstr "Не удалось удалить %s" msgid "Failed to rename data: %s" msgstr "Не удалось переименовать данные: %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5833 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5844 #, python-format msgid "Failed to restart %s service" msgstr "Не удалось перезапустить %s сервис" @@ -544,12 +550,12 @@ msgstr "Не удалось выполнить rsync {src} to {dst}: {error}" msgid "Failed to set btrfs compression" msgstr "Не удалось установить btrfs сжатие" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5835 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5846 #, python-format msgid "Failed to start %s service" msgstr "Не удалось запустить %s сервис" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5834 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5845 #, python-format msgid "Failed to stop %s service" msgstr "Не удалось остановить %s сервис" @@ -560,7 +566,7 @@ msgstr "Не удалось остановить %s сервис" msgid "Failed to support '%s' encryption algorithm" msgstr "Нет поддержки алгоритма шифрования '%s'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5237 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5248 #, python-brace-format msgid "Failed to synchronize directory {dn}: {error}" msgstr "Не удалось синхронизировать директорию {dn}: {error}" @@ -570,12 +576,12 @@ msgstr "Не удалось синхронизировать директори msgid "Failed to umount {target}" msgstr "Не удалось отключить {target}" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1621 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1622 #, python-brace-format msgid "Failed to unhide packages: {error}" msgstr "Не удалось восстановить спрятанные пакеты: {error}" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1631 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1632 #, python-brace-format msgid "Failed to unhide: {error}" msgstr "Не удалось восстановить спрятанные: {error}" @@ -590,12 +596,12 @@ msgstr "Не удалось расшифровать фразу-пароль" msgid "Failed to update the repository in {rpath}" msgstr "Не удалось обновить репозиторий в {rpath}" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6088 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6099 #, python-format msgid "Failed to use %s " msgstr "Не удалось использовать %s " -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6090 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6101 msgid "Failed to use patch " msgstr "Не удалось применить патч " @@ -642,12 +648,12 @@ msgstr "GPG не инициализирован" msgid "Group ID %s not found" msgstr "Не удалось найти идентификатор группы %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5165 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5721 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5176 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5732 msgid "Group not found on the system: " msgstr "Отсутствует группа в системе: " -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4326 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4327 msgid "Headers of directory templates and headers of files on the first level should include an action variable" msgstr "Заголовки шаблонов директорий и файлов первого уровня должны включать в себя переменную действия." @@ -688,8 +694,8 @@ msgstr "Неправильный формат файла" #: ../calculate-lib/pym/calculate/lib/cl_template.py:1027 #: ../calculate-lib/pym/calculate/lib/cl_template.py:1217 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5033 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5395 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5044 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5406 msgid "Incorrect template" msgstr "Неправильный шаблон" @@ -709,7 +715,7 @@ msgstr "Неправильный текст шаблона '%s'" msgid "Incorrect text of template ''" msgstr "Неправильный текст шаблона ''" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3997 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3998 msgid "Invalid oct value: " msgstr "Ошибочное значение восьмеричной переменной" @@ -739,7 +745,7 @@ msgstr "Отметить как изменено человеком" msgid "Method for updating config files" msgstr "Метод обновления конфигурационных файлов" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5660 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5671 #, python-format msgid "Missed source link in template '%s'" msgstr "Пропущено исходное имя ссылки в шаблоне '%s'" @@ -761,11 +767,11 @@ msgstr "Необходимо указать пользователя" msgid "Next" msgstr "Далее" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4035 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4036 msgid "No access to the directory: " msgstr "Нет доступа к директории:" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4310 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4311 msgid "No conditions for checking the value of an action variable" msgstr "Нет условий проверки значения переменной действия" @@ -792,8 +798,8 @@ msgstr "Нет ответа от %s" msgid "No space left on device" msgstr "На устройстве не свободного места" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5154 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5704 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5165 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5715 msgid "No such user on the system: " msgstr "Не найден пользователь в системе: " @@ -811,22 +817,22 @@ msgstr "Пакет {package} не найден в world" msgid "Number of processors" msgstr "Число процессоров" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6025 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6036 #, python-format msgid "Option %s should be used for format=backgrounds only" msgstr "Параметр %s должен быть использован только с format=backgrounds" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6017 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6028 #, python-format msgid "Option %s should be used for format=dconf only" msgstr "Параметр %s должен быть использован только для format=dconf" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6009 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6020 #, python-format msgid "Option %s should be used for format=patch only" msgstr "Параметр %s должен быть использован только для format=patch" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5080 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5091 #, python-format msgid "Option '%(opt)s' should be used with %(appends)s only" msgstr "Параметр '%(opt)s' должен использоваться только с %(appends)s" @@ -863,7 +869,7 @@ msgstr "Репозиторий {path} не является Git репозито msgid "Repository {path} is not a directory" msgstr "Репозиторий {path} не является директорией" -#: ../calculate-lib/pym/calculate/lib/utils/ip.py:430 +#: ../calculate-lib/pym/calculate/lib/utils/ip.py:435 msgid "Request timed out" msgstr "Время ожидания истекло" @@ -876,17 +882,17 @@ msgstr "Корень на всё свободное место не должен msgid "Select the profile with command {cmd}" msgstr "Выберите профиль с помощью команды {cmd}" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5828 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5839 #, python-format msgid "Service %s has been restarted" msgstr "Сервис %s перезапущен" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5830 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5841 #, python-format msgid "Service %s has been started" msgstr "Сервис %s запущен" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5829 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5840 #, python-format msgid "Service %s has been stopped" msgstr "Сервис %s остановлен" @@ -895,19 +901,19 @@ msgstr "Сервис %s остановлен" msgid "Skip the update of config files" msgstr "Пропустить обновление конфигурационных файлов" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4322 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4323 msgid "Skipped directories:" msgstr "Пропущенные директории:" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4318 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4319 msgid "Skipped templates:" msgstr "Пропущенные шаблоны:" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4649 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4650 msgid "Some config files need updating. Perform run dispatch-conf." msgstr "Некоторые конфигурационные файлы нуждаются в обновлении. Выполните dispatch-conf." -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5218 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5229 #, python-format msgid "Source path %s is not a directory" msgstr "Исходный путь %s не является директорией" @@ -917,23 +923,23 @@ msgstr "Исходный путь %s не является директорие msgid "Source variable %s does not contain a list" msgstr "Исходная переменная %s не содержит список" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5478 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5495 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5489 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5506 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5541 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5554 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5517 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5552 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5565 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5588 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5618 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5628 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5576 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5599 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5629 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5639 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5668 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5772 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5786 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5650 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5679 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5783 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5797 msgid "Template error" msgstr "Ошибка в шаблоне" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6354 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6365 msgid "Template type not found: " msgstr "Тип шаблона не найден: " @@ -1034,6 +1040,9 @@ msgstr "Значение для {varname} может быть только '{var msgid "The value of variable '{varname}' must be integer" msgstr "Значение для {varname} должно быть целым числом" +msgid "There is not enough space on this device to perform the autopartition" +msgstr "На устройстве не хватает свободного места для выполнения авторазметки" + #: ../calculate-lib/pym/calculate/lib/utils/partition.py:218 #, python-brace-format msgid "There is not enough space on this device, to perform the autopartition need {need}" @@ -1150,14 +1159,14 @@ msgstr "Неправильная запись '{data}' для '{var_name}'" msgid "Wrong entry '{entry}' for table variable '{varname}'" msgstr "Неправильная запись '{entry}' для табличной переменной '{varname}'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6069 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6080 #, python-format msgid "Wrong header parameter 'format=%s' in template" msgstr "Неправильный параметр заголовка 'format=%s' в шаблоне" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6131 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6259 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6269 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6142 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6270 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6280 #, python-brace-format msgid "Wrong header parameter '{var}={val}' in template" msgstr "Неправильный параметр заголовка '{var}={val}' в шаблоне" @@ -1173,13 +1182,13 @@ msgstr "Неправильный формат изображения '%s'" msgid "Wrong interval operator" msgstr "Неправильный оператор интервалов" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6034 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6045 #, python-format msgid "Wrong option '%(param)s=%(type)s' in template %(file)s" msgstr "Неправильный параметр '%(param)s=%(type)s' в шаблоне %(file)s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6196 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6226 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6207 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6237 #, python-brace-format msgid "Wrong option '{var}={val}' in template {fn}" msgstr "Неправильный параметр '{var}={val}' в шаблоне {fn}" @@ -1194,42 +1203,42 @@ msgstr "Неправильное регулярное выражение" msgid "Wrong repository in the {rpath} directory" msgstr "Не правильный репозиторий в {rpath} директории" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6105 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6138 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6182 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6212 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6241 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6276 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6312 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6322 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6339 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6116 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6149 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6193 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6223 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6252 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6287 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6323 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6333 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6350 msgid "Wrong template" msgstr "Ошибка шаблона" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6350 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6361 msgid "Wrong template option (type append)" msgstr "Неправильный параметр (type append) шаблона" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5054 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5065 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5139 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5157 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5076 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5150 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5168 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5185 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5190 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5416 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5428 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5461 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5684 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5706 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5723 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5179 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5196 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5201 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5427 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5439 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5472 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5695 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5717 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5734 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5740 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5745 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5751 #, python-format msgid "Wrong value '%s' in the template" msgstr "Неправильное значение '%s' в шаблоне" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5467 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5478 #, python-brace-format msgid "Wrong value '{var}={val}' in template" msgstr "Неправильное значение '{var}={val}' в шаблоне" @@ -1251,7 +1260,7 @@ msgstr "clt шаблоны" msgid "custom action" msgstr "произвольное действие" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1622 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1623 msgid "directory not found" msgstr "директория не найдена" @@ -1260,20 +1269,20 @@ msgid "empty password" msgstr "пароль пуст" #: ../calculate-lib/pym/calculate/lib/datavars.py:1318 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3715 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4920 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4928 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3716 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4931 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4939 msgid "error" msgstr "ошибка" #: ../calculate-lib/pym/calculate/lib/cl_template.py:290 #: ../calculate-lib/pym/calculate/lib/cl_template.py:2739 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3595 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3596 #, python-format msgid "error in template %s" msgstr "ошибка в шаблоне %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3596 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3597 #, python-format msgid "error, template term '%s'" msgstr "ошибка, часть шаблона '%s'" @@ -1295,9 +1304,9 @@ msgstr "ошибка: часть шаблона %s, неправильные д #: ../calculate-lib/pym/calculate/lib/cl_template.py:2318 #: ../calculate-lib/pym/calculate/lib/cl_template.py:2770 #: ../calculate-lib/pym/calculate/lib/cl_template.py:2805 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3460 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3503 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3514 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3461 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3504 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3515 #, python-format msgid "error: variable %s does not exist" msgstr "ошибка: переменная %s не существует" @@ -1318,7 +1327,7 @@ msgstr "ошибка: переменная %s не является числом msgid "error: variable %s not found" msgstr "ошибка: переменная %s не найдена" -#: ../calculate-lib/pym/calculate/lib/utils/ip.py:410 +#: ../calculate-lib/pym/calculate/lib/utils/ip.py:415 #, python-format msgid "failed. (socket error: '%s')" msgstr "неудача. (ошибка сокета: '%s')" @@ -1327,7 +1336,7 @@ msgstr "неудача. (ошибка сокета: '%s')" msgid "first parameter must be number" msgstr "первый параметр должен быть числом" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3652 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3653 #, python-format msgid "function of templates '%s' not found" msgstr "не найдена функция шаблонов '%s'" @@ -1366,12 +1375,12 @@ msgstr "неправильный параметр заголовка - '%s'" msgid "incorrect text in the template: '%s'" msgstr "неправильный текст в шаблоне: '%s'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4111 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4112 msgid "invalid template content: " msgstr "шаблон содержит ошибку: " -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4127 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4138 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4128 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4139 msgid "invalid template name: " msgstr "имя шаблона неправильно:" @@ -1388,16 +1397,19 @@ msgstr "обновить конфигурационные файлы вручн msgid "mark as human modification" msgstr "отметить как изменено человеком" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3539 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3540 #, python-format msgid "mount point '/' or '/%s' not found in the value of variable os_disk_install" msgstr "в значении переменной os_disk_install не найдена точка монтирования '' или '\\%s'" +msgid "need {need}" +msgstr "необходимо {need}" + #: ../calculate-lib/pym/calculate/lib/utils/text.py:391 msgid "or" msgstr "или" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1580 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1581 msgid "package is already hidden" msgstr "пакет уже спрятан" @@ -1430,7 +1442,7 @@ msgstr "неправильный заголовок шаблона" msgid "template variable '%s' not found" msgstr "не найдена переменная шаблонов '%s'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4799 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4800 #, python-brace-format msgid "templates in {tempath} are skipped" msgstr "шаблоны в {tempath} пропущены" @@ -1482,8 +1494,8 @@ msgstr "не удалось открыть директорию как файл: msgid "unable to open the file:" msgstr "не удалось открыть файл:" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4358 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6573 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4359 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6584 msgid "undefined variable: " msgstr "не определена переменная:" @@ -1495,8 +1507,8 @@ msgstr "использовать новые конфигурационные ф msgid "username" msgstr "имя пользователя" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3464 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3522 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3465 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3523 #, python-format msgid "value of %s is not a list or a tuple" msgstr "значение %s не является списком или кортежем" @@ -1509,8 +1521,8 @@ msgstr "подробный вывод" msgid "without py-smbpasswd" msgstr "без py-smbpasswd" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3496 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3513 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3497 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3514 #, python-format msgid "wrong %s" msgstr "%s ошибочно" @@ -1520,7 +1532,7 @@ msgstr "%s ошибочно" msgid "wrong dict value: %s" msgstr "неправильное значение словаря: %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3624 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3625 #, python-format msgid "wrong function syntax %s" msgstr "неправильный синтаксис функции %s" @@ -1536,7 +1548,10 @@ msgstr "неправильное значение списка: %s" msgid "wrong path '%s'" msgstr "неправильный путь '%s'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4797 +msgid "{avail} available, need at {need} more" +msgstr "{avail} доступно, необходимо на {need} больше" + +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4798 #, python-brace-format msgid "{dirpath} is a file" msgstr "{dirpath} файл" @@ -1549,12 +1564,3 @@ msgstr "{url} не является git репозиторием" #: ../calculate-lib/pym/calculate/lib/utils/mount.py:284 msgid "{} is not btrfs" msgstr "{} не btrfs" - -#~ msgid "There is not enough space on this device to perform the autopartition" -#~ msgstr "На устройстве не хватает свободного места для выполнения авторазметки" - -#~ msgid "need {need}" -#~ msgstr "необходимо {need}" - -#~ msgid "{avail} available, need at {need} more" -#~ msgstr "{avail} доступно, необходимо на {need} больше"