diff --git a/pot/cl_builder3.pot b/pot/cl_builder3.pot index cdf034b..978fccf 100644 --- a/pot/cl_builder3.pot +++ b/pot/cl_builder3.pot @@ -1,9 +1,9 @@ -#: ../calculate-builder/pym/builder/variables/builder.py:1726 +#: ../calculate-builder/pym/builder/variables/builder.py:1731 #, python-format msgid "%s is unavailable for the Grub" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:2054 +#: ../calculate-builder/pym/builder/builder.py:2076 #, python-brace-format msgid "({num} of {nummax}) Inject dependences for {package} package" msgstr "" @@ -16,7 +16,7 @@ msgstr "" msgid "Appling isohybrid feature for image" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1123 +#: ../calculate-builder/pym/builder/builder.py:1149 msgid "Assigning files to packages" msgstr "" @@ -24,18 +24,18 @@ msgstr "" msgid "Auto" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1984 +#: ../calculate-builder/pym/builder/builder.py:2006 #, python-brace-format msgid "Auto depends for package {pkg} from {pkgs} will be cleared" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1978 +#: ../calculate-builder/pym/builder/builder.py:2000 #, python-brace-format msgid "Auto depends for package {pkg} from {pkgs} will be used" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1646 -#: ../calculate-builder/pym/builder/variables/builder.py:1648 +#: ../calculate-builder/pym/builder/variables/builder.py:1651 +#: ../calculate-builder/pym/builder/variables/builder.py:1653 msgid "Boot Flash" msgstr "" @@ -136,7 +136,7 @@ msgstr "" msgid "Builder" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1562 +#: ../calculate-builder/pym/builder/builder.py:1582 #, python-format msgid "Builder action for %s is already running. Try to run later." msgstr "" @@ -160,7 +160,7 @@ msgstr "" msgid "Calculating dependencies" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:938 +#: ../calculate-builder/pym/builder/builder.py:963 #, python-format msgid "Calculating dependencies for %s" msgstr "" @@ -169,13 +169,13 @@ msgstr "" msgid "Change the Build Profile" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1922 +#: ../calculate-builder/pym/builder/builder.py:1942 #, python-brace-format msgid "Check ({cur} of {maxval}) {package}" msgstr "" #: ../calculate-builder/pym/builder/utils/cl_builder_update.py:290 -#: ../calculate-builder/pym/builder/variables/builder.py:1871 +#: ../calculate-builder/pym/builder/variables/builder.py:1876 msgid "Check for auto depends" msgstr "" @@ -187,16 +187,16 @@ msgstr "" msgid "Checking the {eachvar:capitalize} repository" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1453 +#: ../calculate-builder/pym/builder/builder.py:1474 msgid "Chroot command not found" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1576 +#: ../calculate-builder/pym/builder/builder.py:1596 #, python-brace-format msgid "Chrooted {cmd} has already run into {id}" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:980 +#: ../calculate-builder/pym/builder/builder.py:1005 msgid "Cleaning and copying driver files" msgstr "" @@ -220,7 +220,7 @@ msgstr "" msgid "Clear binary packages after unmount" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1610 +#: ../calculate-builder/pym/builder/variables/builder.py:1615 msgid "Clear the boot from ISO images" msgstr "" @@ -232,7 +232,7 @@ msgstr "" msgid "Completion of the system update" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1368 +#: ../calculate-builder/pym/builder/variables/builder.py:1373 msgid "Compressor" msgstr "" @@ -250,8 +250,8 @@ msgid "Configure a Live-Menu" msgstr "" #: ../calculate-builder/pym/builder/utils/cl_builder_image.py:75 -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:108 #: ../calculate-builder/pym/builder/utils/cl_builder_prepare.py:64 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:104 msgid "Configuring build" msgstr "" @@ -259,7 +259,7 @@ msgstr "" msgid "Configuring squash filesystem image" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1900 +#: ../calculate-builder/pym/builder/variables/builder.py:1905 msgid "Container" msgstr "" @@ -299,8 +299,8 @@ msgstr "" msgid "Creating the image is failed" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:902 -#: ../calculate-builder/pym/builder/builder.py:904 +#: ../calculate-builder/pym/builder/builder.py:926 +#: ../calculate-builder/pym/builder/builder.py:928 #, python-format msgid "Depends %s" msgstr "" @@ -314,7 +314,7 @@ msgstr "" msgid "Disabling the Live HDD menu from grub" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1656 +#: ../calculate-builder/pym/builder/variables/builder.py:1661 #, python-format msgid "Distributions directory (%s)" msgstr "" @@ -323,54 +323,54 @@ msgstr "" msgid "Executing prelink" msgstr "" -#: ../calculate-builder/pym/builder/utils/cl_builder_menu.py:105 #: ../calculate-builder/pym/builder/utils/cl_builder_image.py:230 +#: ../calculate-builder/pym/builder/utils/cl_builder_menu.py:105 msgid "Extracting kernels from ISO images" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1645 +#: ../calculate-builder/pym/builder/builder.py:1665 msgid "Failed to clean /boot directory on Flash drive" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:2140 -#: ../calculate-builder/pym/builder/builder.py:2168 +#: ../calculate-builder/pym/builder/builder.py:2162 +#: ../calculate-builder/pym/builder/builder.py:2190 #, python-format msgid "Failed to clear binary directory: %s" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1025 +#: ../calculate-builder/pym/builder/builder.py:1051 #, python-format msgid "Failed to determine path for %s repository" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:371 +#: ../calculate-builder/pym/builder/builder.py:373 #, python-format msgid "Failed to determine profile %s" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:949 +#: ../calculate-builder/pym/builder/variables/builder.py:948 msgid "Failed to determine the isoscan path" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:770 +#: ../calculate-builder/pym/builder/builder.py:772 #, python-format msgid "Failed to execute %s" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1668 +#: ../calculate-builder/pym/builder/builder.py:1688 #, python-format msgid "Failed to extract kernel from %s" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:970 +#: ../calculate-builder/pym/builder/builder.py:995 #, python-format msgid "Failed to fetch files for %s" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1102 -#: ../calculate-builder/pym/builder/builder.py:1116 -#: ../calculate-builder/pym/builder/builder.py:1139 -#: ../calculate-builder/pym/builder/builder.py:2087 +#: ../calculate-builder/pym/builder/builder.py:1128 +#: ../calculate-builder/pym/builder/builder.py:1142 +#: ../calculate-builder/pym/builder/builder.py:1165 +#: ../calculate-builder/pym/builder/builder.py:2109 #, python-format msgid "Failed to find the %s command" msgstr "" @@ -379,70 +379,70 @@ msgstr "" msgid "Failed to generate kernel name" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:964 +#: ../calculate-builder/pym/builder/builder.py:989 #, python-format msgid "Failed to get %s" msgstr "" -#: ../calculate-builder/pym/builder/build_storage.py:271 +#: ../calculate-builder/pym/builder/build_storage.py:270 msgid "Failed to get distributive information" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1888 +#: ../calculate-builder/pym/builder/builder.py:1908 msgid "Failed to hide package database" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:317 +#: ../calculate-builder/pym/builder/builder.py:319 #, python-format msgid "Failed to index %s" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:2174 +#: ../calculate-builder/pym/builder/builder.py:2196 #, python-format msgid "Failed to merge prepared binaries: %s" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:2040 +#: ../calculate-builder/pym/builder/builder.py:2062 #, python-brace-format msgid "Failed to merge {package} without {hidden_pkgs}" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1696 +#: ../calculate-builder/pym/builder/builder.py:1716 msgid "Failed to move the ISO images directory on the Flash" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:2154 +#: ../calculate-builder/pym/builder/builder.py:2176 #, python-format msgid "Failed to prepare stable binaries: %s" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1369 +#: ../calculate-builder/pym/builder/builder.py:1390 msgid "Failed to prepare variables for synchronization" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1932 +#: ../calculate-builder/pym/builder/builder.py:1952 msgid "Failed to receive the package list" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1621 +#: ../calculate-builder/pym/builder/builder.py:1641 msgid "Failed to remount Flash drive" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1774 +#: ../calculate-builder/pym/builder/builder.py:1794 #, python-format msgid "Failed to remove %s" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:2037 +#: ../calculate-builder/pym/builder/builder.py:2059 msgid "Failed to save build log" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:382 +#: ../calculate-builder/pym/builder/builder.py:384 #, python-format msgid "Failed to set the profile: %s" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1962 +#: ../calculate-builder/pym/builder/builder.py:1984 msgid "Failed to unhide package database" msgstr "" @@ -458,22 +458,22 @@ msgstr "" msgid "Failed to update the system" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1172 +#: ../calculate-builder/pym/builder/builder.py:1198 #, python-brace-format msgid "Failed to update the {rname} repository" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:2147 +#: ../calculate-builder/pym/builder/builder.py:2169 #, python-format msgid "Failed to update trunk binaries: %s" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1764 +#: ../calculate-builder/pym/builder/builder.py:1784 #, python-format msgid "Failed to write %s" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:947 +#: ../calculate-builder/pym/builder/builder.py:972 msgid "Fetching binary packages and sources tarballs" msgstr "" @@ -494,15 +494,15 @@ msgid "Find & rebuild packages and Perl header files broken due to a perl upgrad msgstr "" #: ../calculate-builder/pym/builder/utils/cl_builder_profile.py:144 -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:147 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:143 msgid "Fixing the settings" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1564 +#: ../calculate-builder/pym/builder/variables/builder.py:1569 msgid "Flash" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1705 +#: ../calculate-builder/pym/builder/variables/builder.py:1710 #, python-format msgid "Flash drive %s not found" msgstr "" @@ -527,23 +527,23 @@ msgstr "" msgid "Free disk space for container image" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1563 +#: ../calculate-builder/pym/builder/variables/builder.py:1568 msgid "Grub" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1652 +#: ../calculate-builder/pym/builder/variables/builder.py:1657 msgid "HDD Grub" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1901 +#: ../calculate-builder/pym/builder/variables/builder.py:1906 msgid "ISO" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1415 +#: ../calculate-builder/pym/builder/variables/builder.py:1420 msgid "ISO hybrid feature" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:909 +#: ../calculate-builder/pym/builder/variables/builder.py:908 #, python-format msgid "Image %s is already used" msgstr "" @@ -556,15 +556,15 @@ msgstr "" msgid "Image creating manually interrupted" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1393 +#: ../calculate-builder/pym/builder/builder.py:1414 msgid "Image not found" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:892 +#: ../calculate-builder/pym/builder/variables/builder.py:891 msgid "Image path" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1896 +#: ../calculate-builder/pym/builder/variables/builder.py:1901 msgid "Image type" msgstr "" @@ -572,27 +572,27 @@ msgstr "" msgid "Include proprietary video drivers" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1214 +#: ../calculate-builder/pym/builder/variables/builder.py:1219 msgid "Init RAM fs" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1419 +#: ../calculate-builder/pym/builder/variables/builder.py:1424 msgid "Iso hybrid is uncompatible with container" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1391 +#: ../calculate-builder/pym/builder/builder.py:1412 msgid "Isohybrid utility not found" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1437 +#: ../calculate-builder/pym/builder/variables/builder.py:1442 msgid "Keep portage tree" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1235 +#: ../calculate-builder/pym/builder/variables/builder.py:1240 msgid "Kernel file" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1129 +#: ../calculate-builder/pym/builder/variables/builder.py:1128 msgid "Kernel version" msgstr "" @@ -608,7 +608,7 @@ msgstr "" msgid "Layers are used for building in a directory only" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:402 +#: ../calculate-builder/pym/builder/builder.py:404 msgid "List of worlds differences" msgstr "" @@ -631,19 +631,19 @@ msgstr "" msgid "Next" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:713 +#: ../calculate-builder/pym/builder/builder.py:715 msgid "Nothing to merge" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:748 +#: ../calculate-builder/pym/builder/builder.py:750 msgid "Nothing to unmerge" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1087 +#: ../calculate-builder/pym/builder/builder.py:1113 msgid "Obsolete packages list:" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:176 +#: ../calculate-builder/pym/builder/builder.py:178 msgid "Pack ISO image" msgstr "" @@ -651,11 +651,11 @@ msgstr "" msgid "Pack squash filesystem image" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1614 +#: ../calculate-builder/pym/builder/variables/builder.py:1619 msgid "Path" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1488 +#: ../calculate-builder/pym/builder/variables/builder.py:1493 msgid "Perform prelink" msgstr "" @@ -664,11 +664,11 @@ msgstr "" msgid "Please select the build ID" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1703 +#: ../calculate-builder/pym/builder/variables/builder.py:1708 msgid "Please specify the Flash drive" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1731 +#: ../calculate-builder/pym/builder/variables/builder.py:1736 msgid "Please specify the LiveHDD directory" msgstr "" @@ -676,19 +676,19 @@ msgstr "" msgid "Please specify the build ID" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1714 +#: ../calculate-builder/pym/builder/variables/builder.py:1719 msgid "Please specify the directory" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1711 +#: ../calculate-builder/pym/builder/variables/builder.py:1716 msgid "Please specify the images directory" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:171 +#: ../calculate-builder/pym/builder/builder.py:173 msgid "Prepare ISO data" msgstr "" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:165 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:161 msgid "Prepare binary package directory" msgstr "" @@ -730,11 +730,11 @@ msgstr "" msgid "PulseAudio" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1501 +#: ../calculate-builder/pym/builder/variables/builder.py:1506 msgid "Rebuild changed packages" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1516 +#: ../calculate-builder/pym/builder/variables/builder.py:1521 msgid "Rebuild installed packages with binary packages" msgstr "" @@ -754,7 +754,7 @@ msgstr "" msgid "Recreating the Live USB menu" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1337 +#: ../calculate-builder/pym/builder/variables/builder.py:1342 msgid "Reference" msgstr "" @@ -762,8 +762,8 @@ msgstr "" msgid "Remove the {eachvar:capitalize} repository" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1286 -#: ../calculate-builder/pym/builder/variables/builder.py:1304 +#: ../calculate-builder/pym/builder/variables/builder.py:1291 +#: ../calculate-builder/pym/builder/variables/builder.py:1309 msgid "Repositories references" msgstr "" @@ -771,12 +771,12 @@ msgstr "" msgid "Repositories synchronization" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1318 +#: ../calculate-builder/pym/builder/variables/builder.py:1323 #: ../calculate-builder/pym/builder/wsdl_builder.py:518 msgid "Repository" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1292 +#: ../calculate-builder/pym/builder/variables/builder.py:1297 #, python-format msgid "Repository %s not found" msgstr "" @@ -793,7 +793,7 @@ msgstr "" msgid "Restore the Build" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1213 +#: ../calculate-builder/pym/builder/builder.py:1239 msgid "Restoring file capabilities" msgstr "" @@ -827,7 +827,7 @@ msgstr "" msgid "Save build information" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:2013 +#: ../calculate-builder/pym/builder/variables/builder.py:2018 msgid "Save packages used during build" msgstr "" @@ -843,7 +843,7 @@ msgstr "" msgid "Source image" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1990 +#: ../calculate-builder/pym/builder/builder.py:2012 #, python-brace-format msgid "Specified depends for package {pkg} from {pkgs} are obsolete" msgstr "" @@ -865,7 +865,7 @@ msgstr "" msgid "System" msgstr "" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:137 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:133 msgid "System configuration" msgstr "" @@ -885,7 +885,7 @@ msgstr "" msgid "System update manually interrupted" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1152 +#: ../calculate-builder/pym/builder/builder.py:1178 msgid "The Emerge tool is not found" msgstr "" @@ -893,11 +893,11 @@ msgstr "" msgid "The build is being configured" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:911 +#: ../calculate-builder/pym/builder/variables/builder.py:910 msgid "The image should be a directory" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:904 +#: ../calculate-builder/pym/builder/variables/builder.py:903 msgid "The image shouldn't be a directory" msgstr "" @@ -917,7 +917,7 @@ msgstr "" msgid "This option is not compatible with container image" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1557 +#: ../calculate-builder/pym/builder/variables/builder.py:1562 msgid "Type" msgstr "" @@ -968,7 +968,7 @@ msgstr "" msgid "Update the Build" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1885 +#: ../calculate-builder/pym/builder/variables/builder.py:1890 msgid "Update themes" msgstr "" @@ -985,7 +985,7 @@ msgid "Updating X.Org server modules" msgstr "" #: ../calculate-builder/pym/builder/utils/cl_builder_profile.py:151 -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:158 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:154 #: ../calculate-builder/pym/builder/utils/cl_builder_update.py:308 msgid "Updating configuration files" msgstr "" @@ -1019,33 +1019,33 @@ msgstr "" msgid "Use layers for build" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1030 +#: ../calculate-builder/pym/builder/variables/builder.py:1029 msgid "Use only live templates on startup" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1837 +#: ../calculate-builder/pym/builder/variables/builder.py:1842 msgid "Use only stable updates" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:976 +#: ../calculate-builder/pym/builder/builder.py:1001 #, python-format msgid "Waiting for unlock %s" msgstr "" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:125 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:121 #, python-brace-format msgid "Will be used base binhost: {builder.cl_builder_binhost_base}" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:706 +#: ../calculate-builder/pym/builder/builder.py:708 msgid "Would you like to merge these packages?" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:743 +#: ../calculate-builder/pym/builder/builder.py:745 msgid "Would you like to unmerge these unused packages (recommended)?" msgstr "" -#: ../calculate-builder/pym/builder/builder.py:1862 +#: ../calculate-builder/pym/builder/builder.py:1882 msgid "Wrong build state: /var/db/pkg not found" msgstr "" @@ -1071,15 +1071,15 @@ msgstr "" msgid "Wrong symbols in the build ID" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1720 +#: ../calculate-builder/pym/builder/variables/builder.py:1725 msgid "You cannot change the images directory" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:898 +#: ../calculate-builder/pym/builder/variables/builder.py:897 msgid "You must specify image filename" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:901 +#: ../calculate-builder/pym/builder/variables/builder.py:900 msgid "You must specify image filename with 'iso' suffix" msgstr "" @@ -1108,7 +1108,7 @@ msgstr "" msgid "build ID" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1872 +#: ../calculate-builder/pym/builder/variables/builder.py:1877 msgid "check for auto depends" msgstr "" @@ -1120,7 +1120,7 @@ msgstr "" msgid "clear data after unmount" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1414 +#: ../calculate-builder/pym/builder/variables/builder.py:1419 msgid "create the ISO image with isohybrid" msgstr "" @@ -1128,7 +1128,7 @@ msgstr "" msgid "include proprietary video drivers" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1436 +#: ../calculate-builder/pym/builder/variables/builder.py:1441 msgid "keep portage tree in image" msgstr "" @@ -1140,44 +1140,44 @@ msgstr "" msgid "partition or directory intended for build" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1487 +#: ../calculate-builder/pym/builder/variables/builder.py:1492 msgid "perform prelink" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1500 +#: ../calculate-builder/pym/builder/variables/builder.py:1505 msgid "rebuild changed packages" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1514 +#: ../calculate-builder/pym/builder/variables/builder.py:1519 msgid "replace installed packages with binary packages that have been rebuilt" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:2012 +#: ../calculate-builder/pym/builder/variables/builder.py:2017 msgid "save packages used during build" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:893 +#: ../calculate-builder/pym/builder/variables/builder.py:892 msgid "set image path" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1897 +#: ../calculate-builder/pym/builder/variables/builder.py:1902 msgid "set image type" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1558 +#: ../calculate-builder/pym/builder/variables/builder.py:1563 msgid "set livemenu type" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1613 +#: ../calculate-builder/pym/builder/variables/builder.py:1618 msgid "set path" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1285 -#: ../calculate-builder/pym/builder/variables/builder.py:1303 +#: ../calculate-builder/pym/builder/variables/builder.py:1290 +#: ../calculate-builder/pym/builder/variables/builder.py:1308 msgid "set references for repository (REPOSITORY:REF)" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1369 +#: ../calculate-builder/pym/builder/variables/builder.py:1374 msgid "set the compressor" msgstr "" @@ -1185,7 +1185,7 @@ msgstr "" msgid "source image" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1886 +#: ../calculate-builder/pym/builder/variables/builder.py:1891 msgid "update themes" msgstr "" @@ -1193,6 +1193,6 @@ msgstr "" msgid "use layers for build" msgstr "" -#: ../calculate-builder/pym/builder/variables/builder.py:1029 +#: ../calculate-builder/pym/builder/variables/builder.py:1028 msgid "use only live templates on startup" msgstr "" diff --git a/pot/cl_client3.pot b/pot/cl_client3.pot index b704fca..b7a0789 100644 --- a/pot/cl_client3.pot +++ b/pot/cl_client3.pot @@ -1,20 +1,20 @@ -#: ../calculate-client/pym/client/client.py:226 -#: ../calculate-client/pym/client/client.py:227 +#: ../calculate-client/pym/client/client.py:230 +#: ../calculate-client/pym/client/client.py:231 msgid ":" msgstr "" #: ../calculate-client/pym/client/client_cache.py:56 #: ../calculate-client/pym/client/client_cache.py:63 -#: ../calculate-client/pym/client/client.py:231 -#: ../calculate-client/pym/client/client.py:1023 -#: ../calculate-client/pym/client/client.py:1036 -#: ../calculate-client/pym/client/client.py:1052 -#: ../calculate-client/pym/client/client.py:1166 -#: ../calculate-client/pym/client/client.py:1264 +#: ../calculate-client/pym/client/client.py:235 +#: ../calculate-client/pym/client/client.py:1032 +#: ../calculate-client/pym/client/client.py:1045 +#: ../calculate-client/pym/client/client.py:1061 +#: ../calculate-client/pym/client/client.py:1175 +#: ../calculate-client/pym/client/client.py:1273 msgid ": " msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:95 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:273 #, python-brace-format msgid "A second X session cannot be opened for user {ur_login}." msgstr "" @@ -23,11 +23,11 @@ msgstr "" msgid "Applying domain templates" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client.py:108 +#: ../calculate-client/pym/client/utils/cl_client.py:113 msgid "Applying non-domain templates" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:200 +#: ../calculate-client/pym/client/variables/client.py:202 msgid "Before joining the domain, you need to remove it from the previous domain" msgstr "" @@ -36,22 +36,22 @@ msgstr "" msgid "Checking {cl_remote_host_new} for domain resources" msgstr "" -#: ../calculate-client/pym/client/client.py:470 +#: ../calculate-client/pym/client/client.py:475 msgid "Cleaning the local user profile" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client.py:120 +#: ../calculate-client/pym/client/utils/cl_client.py:125 msgid "Clearing the user cache" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:341 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:448 msgid "Clearing user keys" msgstr "" -#: ../calculate-client/pym/client/wsdl_client.py:46 -#: ../calculate-client/pym/client/wsdl_client.py:91 -#: ../calculate-client/pym/client/wsdl_client.py:126 -#: ../calculate-client/pym/client/wsdl_client.py:161 +#: ../calculate-client/pym/client/wsdl_client.py:47 +#: ../calculate-client/pym/client/wsdl_client.py:92 +#: ../calculate-client/pym/client/wsdl_client.py:128 +#: ../calculate-client/pym/client/wsdl_client.py:163 msgid "Client" msgstr "" @@ -59,90 +59,92 @@ msgstr "" msgid "Configuration manually interrupted" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:62 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:247 #, python-brace-format msgid "Creating the home directory for {ur_login}" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:235 +#: ../calculate-client/pym/client/variables/client.py:237 msgid "Current password" msgstr "" -#: ../calculate-client/pym/client/wsdl_client.py:48 -#: ../calculate-client/pym/client/wsdl_client.py:74 +#: ../calculate-client/pym/client/wsdl_client.py:49 +#: ../calculate-client/pym/client/wsdl_client.py:75 msgid "Domain" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:72 +#: ../calculate-client/pym/client/variables/client.py:74 msgid "Domain IP" msgstr "" -#: ../calculate-client/pym/client/wsdl_client.py:93 +#: ../calculate-client/pym/client/wsdl_client.py:94 msgid "Domain User Login" msgstr "" -#: ../calculate-client/pym/client/wsdl_client.py:128 +#: ../calculate-client/pym/client/wsdl_client.py:130 msgid "Domain User Logout" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:117 +#: ../calculate-client/pym/client/variables/client.py:119 msgid "Domain password" msgstr "" -#: ../calculate-client/pym/client/client.py:1131 +#: ../calculate-client/pym/client/client.py:1140 msgid "Domain password for the desktop" msgstr "" -#: ../calculate-client/pym/client/wsdl_client.py:116 +#: ../calculate-client/pym/client/wsdl_client.py:117 msgid "Domain user login" msgstr "" -#: ../calculate-client/pym/client/wsdl_client.py:151 +#: ../calculate-client/pym/client/wsdl_client.py:153 msgid "Domain user logout" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:189 +#: ../calculate-client/pym/client/variables/client.py:191 msgid "Domain workstation" msgstr "" -#: ../calculate-client/pym/client/client.py:231 -#: ../calculate-client/pym/client/client.py:1023 -#: ../calculate-client/pym/client/client.py:1036 -#: ../calculate-client/pym/client/client.py:1052 +#: ../calculate-client/pym/client/client.py:235 +#: ../calculate-client/pym/client/client.py:1032 +#: ../calculate-client/pym/client/client.py:1045 +#: ../calculate-client/pym/client/client.py:1061 msgid "ERROR" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:252 -#: ../calculate-client/pym/client/variables/client.py:281 +#: ../calculate-client/pym/client/variables/client.py:253 +#: ../calculate-client/pym/client/variables/client.py:282 msgid "Empty password" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:147 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:92 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:194 #, python-brace-format msgid "Error synchronizing with the local server {cl_remote_host}" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:196 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:141 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:206 #, python-brace-format msgid "Error synchronizing with the {cl_replication_host} remote server" msgstr "" -#: ../calculate-client/pym/client/wsdl_client.py:83 -#: ../calculate-client/pym/client/wsdl_client.py:118 -#: ../calculate-client/pym/client/wsdl_client.py:153 +#: ../calculate-client/pym/client/wsdl_client.py:84 +#: ../calculate-client/pym/client/wsdl_client.py:120 +#: ../calculate-client/pym/client/wsdl_client.py:155 msgid "Execute" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client.py:146 +#: ../calculate-client/pym/client/utils/cl_client.py:151 #, python-brace-format msgid "Failed to add the workstation to domain {cl_remote_host}" msgstr "" -#: ../calculate-client/pym/client/client.py:1053 +#: ../calculate-client/pym/client/client.py:1062 msgid "Failed to add to the default runlevel" msgstr "" -#: ../calculate-client/pym/client/client.py:1174 +#: ../calculate-client/pym/client/client.py:1183 #, python-format msgid "Failed to authorize on %s" msgstr "" @@ -151,57 +153,60 @@ msgstr "" msgid "Failed to change the password" msgstr "" -#: ../calculate-client/pym/client/client.py:957 +#: ../calculate-client/pym/client/client.py:961 #, python-format msgid "Failed to clear the kernel key for user %s" msgstr "" -#: ../calculate-client/pym/client/client_cache.py:668 +#: ../calculate-client/pym/client/client_cache.py:669 msgid "Failed to connect to the LDAP server" msgstr "" -#: ../calculate-client/pym/client/client.py:805 +#: ../calculate-client/pym/client/client.py:814 #, python-brace-format msgid "Failed to copy {ffrom} to {fto}" msgstr "" -#: ../calculate-client/pym/client/client_cache.py:283 +#: ../calculate-client/pym/client/client_cache.py:286 #, python-format msgid "Failed to create directory %s" msgstr "" -#: ../calculate-client/pym/client/client_cache.py:289 +#: ../calculate-client/pym/client/client_cache.py:292 #, python-format msgid "Failed to create file %s" msgstr "" -#: ../calculate-client/pym/client/client.py:686 +#: ../calculate-client/pym/client/client.py:691 msgid "Failed to create the directory" msgstr "" -#: ../calculate-client/pym/client/client.py:1037 +#: ../calculate-client/pym/client/client.py:1046 msgid "Failed to delete from the default runlevel" msgstr "" -#: ../calculate-client/pym/client/client.py:439 +#: ../calculate-client/pym/client/client.py:444 +#: ../calculate-client/pym/client/client.py:1357 +#: ../calculate-client/pym/client/client.py:1377 msgid "Failed to execute rsync" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:160 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:105 #, python-brace-format msgid "Failed to find the profile archive of {cl_replication_host}" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:217 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:162 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:223 msgid "Failed to get the user profile from the domain" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:321 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:422 msgid "Failed to make a links archive" msgstr "" -#: ../calculate-client/pym/client/client.py:709 -#: ../calculate-client/pym/client/client.py:1271 +#: ../calculate-client/pym/client/client.py:714 +#: ../calculate-client/pym/client/client.py:1280 #, python-format msgid "Failed to mount the Samba volume [%s]" msgstr "" @@ -210,19 +215,19 @@ msgstr "" msgid "Failed to read the file" msgstr "" -#: ../calculate-client/pym/client/client.py:809 +#: ../calculate-client/pym/client/client.py:818 msgid "Failed to remove " msgstr "" -#: ../calculate-client/pym/client/utils/cl_client.py:153 +#: ../calculate-client/pym/client/utils/cl_client.py:158 msgid "Failed to remove the workstation from the domain" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:169 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:114 msgid "Failed to unpack" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:227 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:303 msgid "Failed to unpack the links archive" msgstr "" @@ -230,78 +235,83 @@ msgstr "" msgid "Failed to write to file" msgstr "" -#: ../calculate-client/pym/client/client.py:189 +#: ../calculate-client/pym/client/client.py:193 #, python-format msgid "Failed to write variables in file %s" msgstr "" -#: ../calculate-client/pym/client/client.py:385 +#: ../calculate-client/pym/client/client.py:390 #, python-format msgid "Fetching the file list from %s" msgstr "" -#: ../calculate-client/pym/client/client.py:386 +#: ../calculate-client/pym/client/client.py:391 +#: ../calculate-client/pym/client/client.py:1424 #, python-format msgid "Fetching the user profile from %s" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:212 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:157 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:217 #, python-brace-format msgid "Got a user fallback profile from the {cl_remote_host} domain" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:287 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:384 #, python-brace-format msgid "Home directory {ur_home_path} not found" msgstr "" -#: ../calculate-client/pym/client/client.py:1166 +#: ../calculate-client/pym/client/client.py:1175 msgid "Info not found on the server" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:190 +#: ../calculate-client/pym/client/variables/client.py:192 msgid "Local workstation" msgstr "" -#: ../calculate-client/pym/client/client.py:380 +#: ../calculate-client/pym/client/client.py:385 +#: ../calculate-client/pym/client/client.py:1420 #, python-format msgid "Method syncUser: wrong option sync=%s" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:351 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:458 msgid "Modified user profile saved in the domain" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:357 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:464 msgid "Modified user profile saved in the domain with errors" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:73 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:258 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:357 msgid "Mounting encrypted data" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:87 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:48 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:174 msgid "Mounting user resources" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:312 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:413 msgid "Moving non-profile files to the Home/Moved directory" msgstr "" -#: ../calculate-client/pym/client/client.py:224 -#: ../calculate-client/pym/client/variables/client.py:276 +#: ../calculate-client/pym/client/variables/client.py:277 +#: ../calculate-client/pym/client/client.py:228 msgid "New password" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:220 +#: ../calculate-client/pym/client/variables/client.py:222 msgid "Only mount the domain resource" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:157 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:102 msgid "Packing the archive on the server" msgstr "" -#: ../calculate-client/pym/client/wsdl_client.py:163 +#: ../calculate-client/pym/client/wsdl_client.py:165 msgid "Password Modification" msgstr "" @@ -309,125 +319,124 @@ msgstr "" msgid "Password changing manually interrupted" msgstr "" -#: ../calculate-client/pym/client/wsdl_client.py:188 +#: ../calculate-client/pym/client/wsdl_client.py:190 msgid "Password modification" msgstr "" -#: ../calculate-client/pym/client/client.py:1296 +#: ../calculate-client/pym/client/client.py:1306 msgid "Permission denied" msgstr "" -#: ../calculate-client/pym/client/client.py:687 +#: ../calculate-client/pym/client/client.py:692 #, python-format msgid "Permission denied: '%s'" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:80 +#: ../calculate-client/pym/client/variables/client.py:82 msgid "Please specify the domain" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:303 +#: ../calculate-client/pym/client/variables/client.py:304 msgid "Please specify the user" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:688 -#: ../calculate-client/pym/client/variables/client.py:709 +#: ../calculate-client/pym/client/variables/client.py:739 msgid "Remote profile not mounted" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:298 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:399 msgid "Remote user resources not found" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:331 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:438 msgid "Removing hindering files" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:336 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:443 msgid "Removing user private files" msgstr "" -#: ../calculate-client/pym/client/client.py:225 +#: ../calculate-client/pym/client/client.py:229 msgid "Retype the new password" msgstr "" -#: ../calculate-client/pym/client/client.py:111 +#: ../calculate-client/pym/client/client.py:115 msgid "RsyncProgressBar: Wrong pipe" msgstr "" -#: ../calculate-client/pym/client/client.py:1116 +#: ../calculate-client/pym/client/client.py:1125 #, python-format msgid "Samba server not found in %s" msgstr "" -#: ../calculate-client/pym/client/client.py:1259 -#: ../calculate-client/pym/client/client.py:1273 +#: ../calculate-client/pym/client/client.py:1268 +#: ../calculate-client/pym/client/client.py:1282 #, python-format msgid "Samba volume [%s] mounted" msgstr "" -#: ../calculate-client/pym/client/wsdl_client.py:191 +#: ../calculate-client/pym/client/wsdl_client.py:193 msgid "Save" msgstr "" -#: ../calculate-client/pym/client/client.py:390 +#: ../calculate-client/pym/client/client.py:395 #, python-format msgid "Sending the file list to %s" msgstr "" -#: ../calculate-client/pym/client/client.py:1107 +#: ../calculate-client/pym/client/client.py:1116 #, python-format msgid "Server %s does not respond" msgstr "" #: ../calculate-client/pym/client/utils/cl_client_sync.py:43 -#: ../calculate-client/pym/client/utils/cl_client_sync.py:268 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:346 msgid "Synchronization manually interrupted" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:169 +#: ../calculate-client/pym/client/variables/client.py:171 msgid "Synchronize the user profile" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:59 -#: ../calculate-client/pym/client/utils/cl_client_sync.py:276 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:244 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:354 msgid "The local profile will be used" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:141 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:86 msgid "The local user profile does not need to be synchronized with the local domain" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:122 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:67 msgid "The local user profile does not need to be synchronized with the remote domain" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:308 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:409 msgid "The profile will not be uploaded to the domain" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:83 +#: ../calculate-client/pym/client/variables/client.py:85 msgid "The specified address is not available" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:198 +#: ../calculate-client/pym/client/variables/client.py:200 #, python-format msgid "The workstation is already in the domain %s" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:195 +#: ../calculate-client/pym/client/variables/client.py:197 msgid "The workstation is not in the domain" msgstr "" -#: ../calculate-client/pym/client/client.py:1200 +#: ../calculate-client/pym/client/client.py:1209 msgid "The workstation was configured for work in the domain" msgstr "" -#: ../calculate-client/pym/client/client.py:1204 +#: ../calculate-client/pym/client/client.py:1213 msgid "The workstation was configured for work outside the domain" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:306 +#: ../calculate-client/pym/client/variables/client.py:307 msgid "This action can be executed by a non-root user only" msgstr "" @@ -435,134 +444,144 @@ msgstr "" msgid "This workstation is not in the domain" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:252 -#: ../calculate-client/pym/client/utils/cl_client_sync.py:346 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:329 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:453 msgid "Umounting user resources" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:83 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:268 msgid "Unable to cache user info" msgstr "" -#: ../calculate-client/pym/client/client.py:761 +#: ../calculate-client/pym/client/client.py:766 #, python-format msgid "Unable to mount %s" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:175 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:120 msgid "Unable to remove useless files" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:166 +#: ../calculate-client/pym/client/variables/client.py:856 +msgid "Unmount user resources on error" +msgstr "" + +#: ../calculate-client/pym/client/utils/cl_client_sync.py:111 msgid "Unpacking the profile" msgstr "" -#: ../calculate-client/pym/client/client.py:391 +#: ../calculate-client/pym/client/client.py:396 +#: ../calculate-client/pym/client/client.py:1426 #, python-format msgid "Uploading the user profile to %s" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:310 +#: ../calculate-client/pym/client/variables/client.py:311 #, python-format msgid "User %s does not exist" msgstr "" -#: ../calculate-client/pym/client/client_cache.py:351 +#: ../calculate-client/pym/client/client_cache.py:354 #, python-format msgid "User %s not found in LDAP" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:70 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:255 msgid "User password not found" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:232 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:308 msgid "User profile fetched from the domain" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:240 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:316 msgid "User profile modifications will not be saved to the domain" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:280 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:377 #, python-brace-format msgid "User {ur_login} is already on the X session" msgstr "" -#: ../calculate-client/pym/client/client.py:352 +#: ../calculate-client/pym/client/client.py:361 +#: ../calculate-client/pym/client/client.py:1392 msgid "Variable 'cl_sync_skip_path' empty" msgstr "" -#: ../calculate-client/pym/client/client.py:1263 +#: ../calculate-client/pym/client/client.py:1272 msgid "Variable not found" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client.py:142 +#: ../calculate-client/pym/client/utils/cl_client.py:147 #, python-brace-format msgid "Workstation added to domain {cl_remote_host}" msgstr "" -#: ../calculate-client/pym/client/utils/cl_client.py:150 +#: ../calculate-client/pym/client/utils/cl_client.py:155 #, python-brace-format msgid "Workstation removed from domain {cl_remote_host}" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:185 +#: ../calculate-client/pym/client/variables/client.py:187 msgid "Workstation role" msgstr "" -#: ../calculate-client/pym/client/client.py:202 -#: ../calculate-client/pym/client/client.py:1129 -#: ../calculate-client/pym/client/client.py:1132 -#: ../calculate-client/pym/client/variables/client.py:244 +#: ../calculate-client/pym/client/variables/client.py:246 +#: ../calculate-client/pym/client/client.py:206 +#: ../calculate-client/pym/client/client.py:1138 +#: ../calculate-client/pym/client/client.py:1141 msgid "Wrong password" msgstr "" -#: ../calculate-client/pym/client/client.py:1176 +#: ../calculate-client/pym/client/client.py:1185 #, python-format msgid "Wrong value of variable sr_samba_host in %s" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:301 +#: ../calculate-client/pym/client/variables/client.py:302 msgid "X session users not found" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:236 +#: ../calculate-client/pym/client/variables/client.py:238 msgid "current user password" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:73 +#: ../calculate-client/pym/client/variables/client.py:75 msgid "domain" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:277 +#: ../calculate-client/pym/client/variables/client.py:278 msgid "new user password" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:221 +#: ../calculate-client/pym/client/variables/client.py:223 msgid "only mount the [remote] domain resource" msgstr "" -#: ../calculate-client/pym/client/client.py:232 +#: ../calculate-client/pym/client/client.py:236 msgid "passwords do not match" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:186 +#: ../calculate-client/pym/client/variables/client.py:188 msgid "remove the domain connection settings" msgstr "" -#: ../calculate-client/pym/client/client.py:1168 +#: ../calculate-client/pym/client/client.py:1177 msgid "services DN or unix DN or bind DN or bind password" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:118 +#: ../calculate-client/pym/client/variables/client.py:120 msgid "specify the domain password" msgstr "" -#: ../calculate-client/pym/client/variables/client.py:170 +#: ../calculate-client/pym/client/variables/client.py:172 msgid "synchronize user preferences" msgstr "" +#: ../calculate-client/pym/client/variables/client.py:857 +msgid "unmount user resources on error" +msgstr "" + #: ../calculate-client/pym/client/utils/cl_passwd.py:39 #, python-brace-format msgid "" diff --git a/pot/cl_console3.pot b/pot/cl_console3.pot index 6149a18..8fa571f 100644 --- a/pot/cl_console3.pot +++ b/pot/cl_console3.pot @@ -21,7 +21,7 @@ msgstr "" msgid "%s: permission denied" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:61 +#: ../calculate-console/pym/console/application/methods_func.py:62 msgid "'list' for displaying possible values" msgstr "" @@ -49,15 +49,15 @@ msgstr "" msgid "Active sessions on the server: " msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:308 +#: ../calculate-console/pym/console/application/client_class.py:392 msgid "Add the CA and root certificates" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:233 +#: ../calculate-console/pym/console/application/client_class.py:317 msgid "Add the CA certificate to trusted? y/[n]:" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:257 +#: ../calculate-console/pym/console/application/client_class.py:341 msgid "Add this server certificate to trusted (s) or" msgstr "" @@ -73,7 +73,7 @@ msgstr "" msgid "CA certificate deleted from the list of user trusted certificates" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:214 +#: ../calculate-console/pym/console/application/client_class.py:298 msgid "CA certificate not found on the server" msgstr "" @@ -81,8 +81,8 @@ msgstr "" msgid "CRL added" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:330 -#: ../calculate-console/pym/console/application/client_class.py:198 +#: ../calculate-console/pym/console/application/cert_func.py:329 +#: ../calculate-console/pym/console/application/client_class.py:282 msgid "Certificate added" msgstr "" @@ -91,17 +91,17 @@ msgstr "" msgid "Certificate issued: %s" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:238 +#: ../calculate-console/pym/console/application/client_class.py:322 msgid "Certificate not added to trusted" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:114 +#: ../calculate-console/pym/console/application/client_class.py:198 msgid "Certificate not found on the client`s side" msgstr "" -#: ../calculate-console/pym/console/application/cl_client.py:320 -#: ../calculate-console/pym/console/application/pid_information.py:150 #: ../calculate-console/pym/console/application/cert_func.py:55 +#: ../calculate-console/pym/console/application/cl_client.py:321 +#: ../calculate-console/pym/console/application/pid_information.py:150 msgid "Certificate not found on the server" msgstr "" @@ -114,7 +114,7 @@ msgstr "" msgid "Certificate number: %s" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:263 +#: ../calculate-console/pym/console/application/cert_func.py:262 #, python-format msgid "Certificate saved. Your certificate ID: %s" msgstr "" @@ -123,8 +123,8 @@ msgstr "" msgid "City: " msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:158 -#: ../calculate-console/pym/console/application/cert_func.py:219 +#: ../calculate-console/pym/console/application/cert_func.py:157 +#: ../calculate-console/pym/console/application/cert_func.py:218 msgid "Closing. Connection error." msgstr "" @@ -137,7 +137,7 @@ msgstr "" msgid "Country (2 characters): [%s]" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:169 +#: ../calculate-console/pym/console/application/cert_func.py:168 msgid "Create a new private key and request? y/[n]: " msgstr "" @@ -154,45 +154,45 @@ msgstr "" msgid "Error fetching the PID list from the server" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:221 +#: ../calculate-console/pym/console/application/client_class.py:305 msgid "Error. Certificate not added to trusted" msgstr "" -#: ../calculate-console/pym/console/application/cl_client.py:465 -#: ../calculate-console/pym/console/application/cl_client.py:477 -#: ../calculate-console/pym/console/application/cl_client.py:566 -#: ../calculate-console/pym/console/application/cl_client.py:583 +#: ../calculate-console/pym/console/application/cl_client.py:468 +#: ../calculate-console/pym/console/application/cl_client.py:480 +#: ../calculate-console/pym/console/application/cl_client.py:569 +#: ../calculate-console/pym/console/application/cl_client.py:586 msgid "Error: " msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:159 +#: ../calculate-console/pym/console/application/cert_func.py:158 #, python-format msgid "Error: %s" msgstr "" -#: ../calculate-console/pym/console/application/cl_client.py:493 #: ../calculate-console/pym/console/application/cl_client.py:496 -#: ../calculate-console/pym/console/application/cl_client.py:502 -#: ../calculate-console/pym/console/application/cl_client.py:601 +#: ../calculate-console/pym/console/application/cl_client.py:499 +#: ../calculate-console/pym/console/application/cl_client.py:505 #: ../calculate-console/pym/console/application/cl_client.py:604 -#: ../calculate-console/pym/console/application/cl_client.py:610 +#: ../calculate-console/pym/console/application/cl_client.py:607 +#: ../calculate-console/pym/console/application/cl_client.py:613 #, python-format msgid "Exception: %s" msgstr "" -#: ../calculate-console/pym/console/application/function.py:54 +#: ../calculate-console/pym/console/application/function.py:58 msgid "Failed to clear the cache! " msgstr "" -#: ../calculate-console/pym/console/application/cl_client.py:517 -#: ../calculate-console/pym/console/application/methods_func.py:103 +#: ../calculate-console/pym/console/application/cl_client.py:520 +#: ../calculate-console/pym/console/application/methods_func.py:104 msgid "Failed to connect" msgstr "" -#: ../calculate-console/pym/console/application/cl_client.py:411 #: ../calculate-console/pym/console/application/cert_verify.py:104 #: ../calculate-console/pym/console/application/cert_verify.py:109 -#: ../calculate-console/pym/console/application/client_class.py:305 +#: ../calculate-console/pym/console/application/cl_client.py:413 +#: ../calculate-console/pym/console/application/client_class.py:389 #, python-format msgid "Failed to create directory %s" msgstr "" @@ -201,22 +201,22 @@ msgstr "" msgid "Failed to obtain certificate data!" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:123 +#: ../calculate-console/pym/console/application/client_class.py:207 msgid "Failed to open the file" msgstr "" -#: ../calculate-console/pym/console/application/cl_client.py:324 +#: ../calculate-console/pym/console/application/cl_client.py:325 #: ../calculate-console/pym/console/application/pid_information.py:154 msgid "Failed to terminate the process" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:317 -#: ../calculate-console/pym/console/application/client_class.py:186 +#: ../calculate-console/pym/console/application/cert_func.py:316 +#: ../calculate-console/pym/console/application/client_class.py:270 msgid "Field \"CN\" not found in the certificate!" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:223 -#: ../calculate-console/pym/console/application/client_class.py:246 +#: ../calculate-console/pym/console/application/client_class.py:307 +#: ../calculate-console/pym/console/application/client_class.py:330 #, python-format msgid "Fingerprint = %s" msgstr "" @@ -226,23 +226,23 @@ msgstr "" msgid "Host Name [%s]: " msgstr "" -#: ../calculate-console/pym/console/application/sid_func.py:44 #: ../calculate-console/pym/console/application/pid_information.py:45 +#: ../calculate-console/pym/console/application/sid_func.py:44 #, python-format msgid "ID: %s" msgstr "" -#: ../calculate-console/pym/console/application/cl_client.py:459 -#: ../calculate-console/pym/console/application/cl_client.py:559 +#: ../calculate-console/pym/console/application/cl_client.py:462 +#: ../calculate-console/pym/console/application/cl_client.py:562 msgid "Invalid password" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:210 +#: ../calculate-console/pym/console/application/client_class.py:294 msgid "Invalid server certificate!" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:226 -#: ../calculate-console/pym/console/application/client_class.py:249 +#: ../calculate-console/pym/console/application/client_class.py:310 +#: ../calculate-console/pym/console/application/client_class.py:333 msgid "Issuer" msgstr "" @@ -250,22 +250,22 @@ msgstr "" msgid "Killed" msgstr "" -#: ../calculate-console/pym/console/application/cl_client.py:481 -#: ../calculate-console/pym/console/application/cl_client.py:500 -#: ../calculate-console/pym/console/application/cl_client.py:522 -#: ../calculate-console/pym/console/application/cl_client.py:587 -#: ../calculate-console/pym/console/application/cl_client.py:608 -#: ../calculate-console/pym/console/application/methods_func.py:199 +#: ../calculate-console/pym/console/application/cl_client.py:484 +#: ../calculate-console/pym/console/application/cl_client.py:503 +#: ../calculate-console/pym/console/application/cl_client.py:525 +#: ../calculate-console/pym/console/application/cl_client.py:590 +#: ../calculate-console/pym/console/application/cl_client.py:611 +#: ../calculate-console/pym/console/application/methods_func.py:200 #: ../calculate-console/pym/console/console_main.py:39 msgid "Manually interrupted" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:170 -#: ../calculate-console/pym/console/application/methods_func.py:207 +#: ../calculate-console/pym/console/application/methods_func.py:171 +#: ../calculate-console/pym/console/application/methods_func.py:208 msgid "Method not available" msgstr "" -#: ../calculate-console/pym/console/application/function.py:117 +#: ../calculate-console/pym/console/application/function.py:121 msgid "Method not found: " msgstr "" @@ -296,7 +296,7 @@ msgstr "" msgid "PIDs not found for this session!" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:422 +#: ../calculate-console/pym/console/application/cert_func.py:421 msgid "Password: " msgstr "" @@ -321,30 +321,30 @@ msgstr "" msgid "Process not found" msgstr "" -#: ../calculate-console/pym/console/application/cl_client.py:318 +#: ../calculate-console/pym/console/application/cl_client.py:319 msgid "Process terminated" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:259 +#: ../calculate-console/pym/console/application/client_class.py:343 msgid "Quit (q)? s/c/[q]: " msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:226 +#: ../calculate-console/pym/console/application/cert_func.py:225 #, python-format msgid "Request %s not found on the client's side" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:140 +#: ../calculate-console/pym/console/application/cert_func.py:139 #, python-format msgid "Request ID = %s" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:201 +#: ../calculate-console/pym/console/application/cert_func.py:200 #, python-format msgid "Request not sent or file %s deleted" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:250 +#: ../calculate-console/pym/console/application/cert_func.py:249 msgid "Request or signature not matching earlier data." msgstr "" @@ -352,11 +352,11 @@ msgstr "" msgid "Revoke date" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:195 +#: ../calculate-console/pym/console/application/methods_func.py:196 msgid "Run process?" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:141 +#: ../calculate-console/pym/console/application/cert_func.py:140 msgid "Send a new request? y/[n]: " msgstr "" @@ -364,8 +364,8 @@ msgstr "" msgid "Serial" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:224 -#: ../calculate-console/pym/console/application/client_class.py:247 +#: ../calculate-console/pym/console/application/client_class.py:308 +#: ../calculate-console/pym/console/application/client_class.py:331 msgid "Serial Number = " msgstr "" @@ -381,16 +381,16 @@ msgstr "" msgid "Session non registered on the server!" msgstr "" -#: ../calculate-console/pym/console/application/cl_client.py:322 +#: ../calculate-console/pym/console/application/cl_client.py:323 #: ../calculate-console/pym/console/application/pid_information.py:152 msgid "Session not matching your certificate" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:244 +#: ../calculate-console/pym/console/application/cert_func.py:243 msgid "Signature request not examined yet." msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:241 +#: ../calculate-console/pym/console/application/cert_func.py:240 msgid "Signature request rejected!" msgstr "" @@ -404,8 +404,8 @@ msgstr "" msgid "Status: %s" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:230 -#: ../calculate-console/pym/console/application/client_class.py:253 +#: ../calculate-console/pym/console/application/client_class.py:314 +#: ../calculate-console/pym/console/application/client_class.py:337 msgid "Subject" msgstr "" @@ -423,20 +423,20 @@ msgstr "" msgid "The client uses certificate {certfile} (server ID {cert_id})" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:332 -#: ../calculate-console/pym/console/application/client_class.py:200 +#: ../calculate-console/pym/console/application/cert_func.py:331 +#: ../calculate-console/pym/console/application/client_class.py:284 msgid "The file containing the CA certificate now exists" msgstr "" -#: ../calculate-console/pym/console/application/function.py:166 +#: ../calculate-console/pym/console/application/function.py:170 msgid "The process does not exist or does not belong to your session" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:253 +#: ../calculate-console/pym/console/application/cert_func.py:252 msgid "The request was sent from another IP." msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:184 +#: ../calculate-console/pym/console/application/cert_func.py:183 msgid "The server has not signed the certificate!" msgstr "" @@ -444,24 +444,24 @@ msgstr "" msgid "This certificate has been revoked!" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:437 +#: ../calculate-console/pym/console/application/client_class.py:510 msgid "This server is not trusted" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:190 -#: ../calculate-console/pym/console/application/cert_func.py:246 +#: ../calculate-console/pym/console/application/cert_func.py:189 +#: ../calculate-console/pym/console/application/cert_func.py:245 msgid "To submit the certificate request on the server use command" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:258 +#: ../calculate-console/pym/console/application/client_class.py:342 msgid "Try to add the CA and root certificates to trusted (c) or" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:157 +#: ../calculate-console/pym/console/application/methods_func.py:158 msgid "Unknown parameter" msgstr "" -#: ../calculate-console/pym/console/application/client_class.py:243 +#: ../calculate-console/pym/console/application/client_class.py:327 msgid "Untrusted server certificate!" msgstr "" @@ -474,11 +474,11 @@ msgstr "" msgid "Using the upstream certificate" msgstr "" -#: ../calculate-console/pym/console/application/cl_client.py:249 +#: ../calculate-console/pym/console/application/cl_client.py:250 msgid "Wrong PID" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:139 +#: ../calculate-console/pym/console/application/cert_func.py:138 msgid "You already sent a certificate signature request." msgstr "" @@ -486,38 +486,38 @@ msgstr "" msgid "You can generate a new certificate using options --gen-cert-by and --get-cert-from" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:346 +#: ../calculate-console/pym/console/application/cert_func.py:345 msgid "You do not have a certificate. Use option --gen-cert-by HOST to generate a new request or --get-cert-from HOST to get a new certificate from the server." msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:189 -#: ../calculate-console/pym/console/application/cert_func.py:245 +#: ../calculate-console/pym/console/application/cert_func.py:188 +#: ../calculate-console/pym/console/application/cert_func.py:244 #, python-format msgid "Your request ID = %s" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:60 +#: ../calculate-console/pym/console/application/methods_func.py:61 msgid "attach to process" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:41 +#: ../calculate-console/pym/console/application/methods_func.py:42 msgid "call method" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:71 +#: ../calculate-console/pym/console/application/methods_func.py:72 msgid "clear the session cache" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:151 -#: ../calculate-console/pym/console/application/cert_func.py:210 +#: ../calculate-console/pym/console/application/cert_func.py:150 +#: ../calculate-console/pym/console/application/cert_func.py:209 msgid "connecting..." msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:47 +#: ../calculate-console/pym/console/application/methods_func.py:48 msgid "destination host" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:91 +#: ../calculate-console/pym/console/application/methods_func.py:92 msgid "do not display the progress bar" msgstr "" @@ -526,44 +526,44 @@ msgstr "" msgid "fields CN and L in the CA certificate are incorrect!" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:329 -#: ../calculate-console/pym/console/application/client_class.py:197 +#: ../calculate-console/pym/console/application/cert_func.py:328 +#: ../calculate-console/pym/console/application/client_class.py:281 msgid "filename = " msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:53 +#: ../calculate-console/pym/console/application/methods_func.py:54 msgid "get the signed certificate from the server" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:64 +#: ../calculate-console/pym/console/application/methods_func.py:65 msgid "keep the cache of the process results" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:68 +#: ../calculate-console/pym/console/application/methods_func.py:69 msgid "kill the selected process" msgstr "" -#: ../calculate-console/pym/console/application/cl_client.py:73 +#: ../calculate-console/pym/console/application/cl_client.py:74 msgid "no connection to the server!" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:56 +#: ../calculate-console/pym/console/application/methods_func.py:57 msgid "path to the cert and key files" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:44 +#: ../calculate-console/pym/console/application/methods_func.py:45 msgid "port number" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:50 +#: ../calculate-console/pym/console/application/methods_func.py:51 msgid "send a certificate signature request to the server" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:39 +#: ../calculate-console/pym/console/application/methods_func.py:40 msgid "show this help message and exit" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:88 +#: ../calculate-console/pym/console/application/methods_func.py:89 msgid "stop cl-consoled" msgstr "" @@ -572,30 +572,30 @@ msgstr "" msgid "the client uses certificate %s" msgstr "" -#: ../calculate-console/pym/console/application/cert_func.py:168 +#: ../calculate-console/pym/console/application/cert_func.py:167 msgid "the private key and request now exist" msgstr "" -#: ../calculate-console/pym/console/application/function.py:184 +#: ../calculate-console/pym/console/application/function.py:188 msgid "the server sent PID = " msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:85 +#: ../calculate-console/pym/console/application/methods_func.py:86 msgid "update the revocation list" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:95 +#: ../calculate-console/pym/console/application/methods_func.py:96 msgid "use passwords from standard input for users accounts" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:78 +#: ../calculate-console/pym/console/application/methods_func.py:79 msgid "view information about session = SID" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:82 +#: ../calculate-console/pym/console/application/methods_func.py:83 msgid "view the active server sessions" msgstr "" -#: ../calculate-console/pym/console/application/methods_func.py:74 +#: ../calculate-console/pym/console/application/methods_func.py:75 msgid "view the session information" msgstr "" diff --git a/pot/cl_consolegui3.pot b/pot/cl_consolegui3.pot index cc618d6..5ba47a7 100644 --- a/pot/cl_consolegui3.pot +++ b/pot/cl_consolegui3.pot @@ -6,7 +6,7 @@ msgstr "" msgid " Old session" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2693 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2708 msgid " Step " msgstr "" @@ -20,7 +20,7 @@ msgstr "" msgid " Your session ID: %s" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/more.py:2518 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2539 #, python-format msgid "%s: Permission denied" msgstr "" @@ -29,48 +29,57 @@ msgstr "" msgid "0: hide images" msgstr "" +#: ../calculate-console-gui/pym/consolegui/application/user_update.py:80 +msgid ": " +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:107 +#, python-format +msgid ": %s" +msgstr "" + #: ../calculate-console-gui/pym/consolegui/application/tools.py:155 msgid "
Apply them?
" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:375 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:484 msgid "A file with the CA certificate now exists" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/more.py:186 -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:178 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:179 +#: ../calculate-console-gui/pym/consolegui/application/more.py:197 msgid "About" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1715 -#: ../calculate-console-gui/pym/consolegui/application/more.py:1188 -#: ../calculate-console-gui/pym/consolegui/application/more.py:1328 -#: ../calculate-console-gui/pym/consolegui/application/more.py:1395 -#: ../calculate-console-gui/pym/consolegui/application/more.py:1509 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1721 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1204 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1344 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1411 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1525 msgid "Add a row" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:114 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:183 msgid "Add the CA and root certificates" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:426 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:535 msgid "Add the CA certificate to trusted? " msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:126 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:195 msgid "Add the certificate to trusted" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:108 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:177 msgid "Add the server certificate" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:95 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:164 msgid "Add this server certificate to trusted or " msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:428 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:537 msgid "Adding the certificate" msgstr "" @@ -90,8 +99,8 @@ msgstr "" msgid "All settings" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:371 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:383 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:379 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:391 msgid "Also you can generate administrator certificate by root command" msgstr "" @@ -109,44 +118,44 @@ msgstr "" msgid "Apply" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1920 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2272 -#: ../calculate-console-gui/pym/consolegui/application/more.py:718 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2014 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1926 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2284 +#: ../calculate-console-gui/pym/consolegui/application/more.py:731 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2027 msgid "Auto" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/more.py:2226 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2238 msgid "Break the process" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:396 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:505 msgid "CA certificate not found on the server" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:818 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:943 msgid "CA certificate removed from system trusted" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:800 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:925 msgid "CA certificate removed from user trusted" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:711 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:836 msgid "CRL added" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1440 -#: ../calculate-console-gui/pym/consolegui/application/DisplayMethod.py:232 -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:170 #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:119 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:162 -#: ../calculate-console-gui/pym/consolegui/application/LeftMenu.py:438 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:161 +#: ../calculate-console-gui/pym/consolegui/application/DisplayMethod.py:245 +#: ../calculate-console-gui/pym/consolegui/application/LeftMenu.py:439 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:171 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1440 msgid "Calculate Console" msgstr "" #: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:93 -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:173 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:172 msgid "Calculate Console " msgstr "" @@ -154,16 +163,16 @@ msgstr "" msgid "Calculate company" msgstr "" +#: ../calculate-console-gui/pym/consolegui/application/Box.py:444 +#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:255 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:190 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:55 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:137 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:119 +#: ../calculate-console-gui/pym/consolegui/application/more.py:943 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1149 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2125 #: ../calculate-console-gui/pym/consolegui/application/tools.py:86 -#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:246 -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:118 -#: ../calculate-console-gui/pym/consolegui/application/more.py:929 -#: ../calculate-console-gui/pym/consolegui/application/more.py:1134 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2112 -#: ../calculate-console-gui/pym/consolegui/application/Box.py:441 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:50 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:132 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:121 msgid "Cancel" msgstr "" @@ -171,8 +180,8 @@ msgstr "" msgid "Certificate Directory" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:170 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:373 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:239 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:482 msgid "Certificate added" msgstr "" @@ -181,18 +190,18 @@ msgstr "" msgid "Certificate expired" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:431 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:540 msgid "Certificate not added to trusted" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:181 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:586 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:177 #: ../calculate-console-gui/pym/consolegui/application/session_function.py:57 #: ../calculate-console-gui/pym/consolegui/application/session_function.py:92 -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:583 msgid "Certificate not found in the server!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:299 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:408 msgid "Certificate not found on the client's side" msgstr "" @@ -201,7 +210,7 @@ msgstr "" msgid "Certificate not sent!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:286 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:284 #, python-format msgid "Certificate saved. Your certificate ID = %s" msgstr "" @@ -210,10 +219,10 @@ msgstr "" msgid "Certificate signature request" msgstr "" +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:91 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:205 #: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:90 #: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:160 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:91 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:206 msgid "Certificates" msgstr "" @@ -224,11 +233,11 @@ msgstr "" msgid "Certificates manager" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/more.py:1245 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1261 msgid "Check all" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:83 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:84 msgid "City" msgstr "" @@ -244,31 +253,31 @@ msgstr "" msgid "Clear the session cache" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1746 -#: ../calculate-console-gui/pym/consolegui/application/more.py:1084 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1752 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1098 msgid "Clear the table" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:244 -#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:364 -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:205 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:209 +#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:253 +#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:397 #: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:57 -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:143 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:142 #: ../calculate-console-gui/pym/consolegui/application/session_function.py:127 msgid "Close" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:423 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:426 msgid "Close this session" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:422 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:425 msgid "Closing session" msgstr "" #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:136 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:139 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:230 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:138 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:229 msgid "Closing. Connection error." msgstr "" @@ -276,49 +285,49 @@ msgstr "" msgid "Company" msgstr "" +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:130 #: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:81 #: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:84 #: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:85 #: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:155 #: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:156 #: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:157 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:125 msgid "Connect" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:159 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:164 msgid "Connection" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:46 -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:51 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:174 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:362 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:47 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:52 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:179 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:370 msgid "Connection Error" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:368 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:371 msgid "Connection lost!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:90 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:91 msgid "Country (a two-character tag)" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:160 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:159 msgid "Create a new private key and signature request?" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:111 -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:130 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:112 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:131 msgid "Create a signature request" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1981 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1987 msgid "Delete the row" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1725 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1731 msgid "Delete the selected rows" msgstr "" @@ -342,11 +351,11 @@ msgstr "" msgid "Distribution website" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/LeftMenu.py:436 +#: ../calculate-console-gui/pym/consolegui/application/LeftMenu.py:437 msgid "Do you want to continue?" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:279 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:277 msgid "Either the request or the signature does not match the earlier ones." msgstr "" @@ -358,23 +367,23 @@ msgstr "" msgid "English" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:199 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:198 msgid "Enter a valid email!" msgstr "" #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:100 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:142 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:213 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:234 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:141 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:212 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:233 msgid "Enter the hostname or the IP address" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:239 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:244 msgid "Enter the port correctly!" msgstr "" #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:106 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:219 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:218 msgid "Enter the port number" msgstr "" @@ -382,7 +391,7 @@ msgstr "" msgid "Error" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/LeftMenu.py:435 +#: ../calculate-console-gui/pym/consolegui/application/LeftMenu.py:436 msgid "Error at this step." msgstr "" @@ -390,91 +399,105 @@ msgstr "" msgid "Error clearing the session cache" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:387 +#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:420 msgid "Error closing the process" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:230 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:229 #, python-format msgid "Error code: %s" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:187 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:630 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:635 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:256 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:755 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:760 #, python-format msgid "Error creating directory %s" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:308 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:417 msgid "Error opening file" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/more.py:2529 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2550 msgid "Error removing the session from the server" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:408 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:517 msgid "Error. Certificate not added to trusted" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:182 +#: ../calculate-console-gui/pym/consolegui/application/user_update.py:104 +#: ../calculate-console-gui/pym/consolegui/application/user_update.py:107 +#, python-format +msgid "Exception: %s" +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:183 msgid "Exit Program" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:733 +#: ../calculate-console-gui/pym/consolegui/application/utils.py:63 +msgid "Failed to clear the cache! " +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/user_update.py:80 +msgid "Failed to connect" +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:735 msgid "Failed to get a frame from the server." msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/pid_information.py:58 +#: ../calculate-console-gui/pym/consolegui/application/pid_information.py:60 msgid "Failed to get the PID list from the server" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:814 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:815 msgid "Failed to get the complete frame from the server." msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:890 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:891 msgid "Failed to get the progress status from the server" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:185 -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:587 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:590 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:181 msgid "Failed to kill the process!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/more.py:2515 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2536 msgid "Failed to obtain certificate data!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1094 -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1166 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1096 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1167 msgid "Failed to send the message (password) to the server" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:365 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:474 msgid "Field \"CN\" not found in the certificate!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:337 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:335 msgid "Field \"CN\" not found in the root certificate!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:353 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:351 msgid "File with the CA certificate now exists" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:350 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:348 msgid "Filename = " msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:373 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:482 #, python-format msgid "Filename = %s" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:58 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:414 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:127 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:523 #, python-format msgid "Fingerprint = %s" msgstr "" @@ -501,12 +524,12 @@ msgid "Help" msgstr "" #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:41 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:83 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:88 msgid "Host" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:127 -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:130 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:126 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:129 msgid "If the email does not exist, you will receive no letter" msgstr "" @@ -515,39 +538,39 @@ msgid "Image height" msgstr "" #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:101 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:214 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:213 msgid "Incorrect \"Host\" value!" msgstr "" #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:106 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:219 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:218 msgid "Incorrect \"Port\" value!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/more.py:193 +#: ../calculate-console-gui/pym/consolegui/application/more.py:204 msgid "Info" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:143 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:143 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:235 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:142 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:234 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:144 msgid "Input error" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:361 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:369 msgid "Invalid password" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:391 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:500 msgid "Invalid server certificate!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:74 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:418 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:143 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:527 msgid "Issuer" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:86 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:81 msgid "Kill the process? (It's active)" msgstr "" @@ -556,82 +579,87 @@ msgstr "" msgid "Makes part of Calculate Utilities %s" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:224 +#: ../calculate-console-gui/pym/consolegui/application/user_update.py:83 +#: ../calculate-console-gui/pym/consolegui/application/user_update.py:109 +msgid "Manually interrupted" +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:223 msgid "Message sent!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:135 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:134 msgid "Message:" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:77 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:78 msgid "Network address" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:422 -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:495 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:429 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:502 msgid "New connection" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:312 +#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:322 msgid "Next" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:211 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1917 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2270 -#: ../calculate-console-gui/pym/consolegui/application/more.py:722 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2012 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2364 -#: ../calculate-console-gui/pym/consolegui/application/Box.py:440 -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1182 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:443 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:215 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1183 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1923 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2282 +#: ../calculate-console-gui/pym/consolegui/application/more.py:735 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2025 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2386 msgid "No" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/more.py:2512 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2533 msgid "No access to the file!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/more.py:2481 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2503 msgid "No methods available!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:113 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:108 msgid "No running processes in the current session" msgstr "" +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:151 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:185 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:241 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:257 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:792 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:510 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:286 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:289 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:296 #: ../calculate-console-gui/pym/consolegui/application/session_function.py:85 -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:791 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:152 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:186 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:242 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:259 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:281 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:284 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:291 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:401 msgid "Not connected!" msgstr "" +#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:310 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:48 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2119 #: ../calculate-console-gui/pym/consolegui/application/tools.py:76 -#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:300 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2106 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:43 msgid "Ok" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:427 -#: ../calculate-console-gui/pym/consolegui/application/Box.py:431 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:430 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:434 #, python-format msgid "Once the session is closed, data on process %d will be lost!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/more.py:507 -#: ../calculate-console-gui/pym/consolegui/application/more.py:613 +#: ../calculate-console-gui/pym/consolegui/application/more.py:520 +#: ../calculate-console-gui/pym/consolegui/application/more.py:626 msgid "Open" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:71 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:72 msgid "Organization Name" msgstr "" @@ -641,16 +669,16 @@ msgstr "" msgid "Other" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/pid_information.py:80 +#: ../calculate-console-gui/pym/consolegui/application/pid_information.py:82 #, python-format msgid "PID %d not found" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:104 -#: ../calculate-console-gui/pym/consolegui/application/more.py:1879 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2091 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:36 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:85 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:41 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:90 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:105 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1893 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2104 msgid "Password" msgstr "" @@ -658,44 +686,42 @@ msgstr "" msgid "Path to Certificates" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/pid_information.py:83 -#: ../calculate-console-gui/pym/consolegui/application/DisplayMethod.py:275 -#: ../calculate-console-gui/pym/consolegui/application/LeftMenu.py:245 +#: ../calculate-console-gui/pym/consolegui/application/pid_information.py:85 msgid "Permission denied" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:173 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:178 msgid "Please disconnect" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:126 -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:129 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:125 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:128 msgid "Please enter a valid email. " msgstr "" #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:45 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:84 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:89 msgid "Port" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/tools.py:35 #: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:165 +#: ../calculate-console-gui/pym/consolegui/application/tools.py:35 msgid "Preferences" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:278 +#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:288 msgid "Previous" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:179 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:175 msgid "Process completed" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:97 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:92 msgid "Process failed" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:94 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:89 msgid "Process successful completed" msgstr "" @@ -704,7 +730,7 @@ msgstr "" msgid "Processes" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:180 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:181 msgid "Program settings" msgstr "" @@ -712,39 +738,39 @@ msgstr "" msgid "Quit" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/DisplayMethod.py:363 +#: ../calculate-console-gui/pym/consolegui/application/DisplayMethod.py:381 msgid "Reconnect" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:401 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:404 msgid "Reconnecting to the server" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1736 -#: ../calculate-console-gui/pym/consolegui/application/more.py:1200 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1742 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1216 msgid "Recover the table" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/more.py:1882 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2101 -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1054 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1056 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1896 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2114 msgid "Repeat" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:177 -#: ../calculate-console-gui/pym/consolegui/application/more.py:200 -#: ../calculate-console-gui/pym/consolegui/application/more.py:346 -#: ../calculate-console-gui/pym/consolegui/application/more.py:389 -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:179 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:180 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:176 +#: ../calculate-console-gui/pym/consolegui/application/more.py:211 +#: ../calculate-console-gui/pym/consolegui/application/more.py:357 +#: ../calculate-console-gui/pym/consolegui/application/more.py:400 msgid "Report a Bug" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:198 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:276 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:197 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:274 msgid "Request" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:246 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:245 #, python-format msgid "Request %s not found on the client`s side" msgstr "" @@ -754,20 +780,24 @@ msgstr "" msgid "Request ID: %s" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:204 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:203 #, python-format msgid "Request not sent, or file %s deleted" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/more.py:1409 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1425 msgid "Reset" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:120 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:115 msgid "Result" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:351 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:107 +msgid "Revoke date" +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:349 msgid "Root certificate added" msgstr "" @@ -775,8 +805,8 @@ msgstr "" msgid "Rows in Table" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2697 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2703 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2712 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2719 msgid "Running" msgstr "" @@ -792,11 +822,11 @@ msgstr "" msgid "Select Language" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1061 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1063 msgid "Send" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:138 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:137 msgid "Send a Bug" msgstr "" @@ -808,25 +838,29 @@ msgstr "" msgid "Send a request" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:228 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:227 msgid "Sending error" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:60 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:106 +msgid "Serial" +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:129 #, python-format msgid "Serial Number = %s" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:415 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:524 #, python-format msgid "Serial Number = %s" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:169 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:238 msgid "Server certificate added to trusted" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:346 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:351 msgid "Server certificate verification error" msgstr "" @@ -843,8 +877,8 @@ msgstr "" msgid "Session information" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:183 -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:585 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:588 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:179 msgid "Session not matching your certificate!" msgstr "" @@ -852,81 +886,86 @@ msgstr "" msgid "Set a fixed height image for actions" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:269 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:267 msgid "Signature request rejected!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:118 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:113 msgid "Start time" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:119 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:114 msgid "Status" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:86 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:422 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:155 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:531 msgid "Subject" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:132 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:131 msgid "Subject:" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:293 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:294 msgid "System Update" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:117 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:112 msgid "Task name" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:142 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:143 msgid "The \"Country\" field must be two-character" msgstr "" +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:80 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:86 +msgid "The CN and L fields in the CA certificate are incorrect!" +msgstr "" + #: ../calculate-console-gui/pym/consolegui/application/session_function.py:72 #: ../calculate-console-gui/pym/consolegui/application/session_function.py:112 #, python-format msgid "The certificate expires after %d days" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:158 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:157 msgid "The private key and the request now exist!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:272 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:270 msgid "The request has not been reviewed yet." msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:190 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:189 msgid "The server has not signed the certificate!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:400 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:403 msgid "The server was restarted" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/more.py:87 -msgid "The user must not be root" +#: ../calculate-console-gui/pym/consolegui/application/tools.py:153 +#, python-format +msgid "There are unsaved changes in tab %s" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:22 -msgid "The user should not be root" +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:91 +msgid "This certificate cannot be verified in the CRL." msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/tools.py:153 -#, python-format -msgid "There are unsaved changes in tab %s" +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:105 +msgid "This certificate has been revoked!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:281 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:266 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:375 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:286 msgid "This server is not trusted" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:196 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:274 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:195 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:272 msgid "To submit the certificate request on the server use command" msgstr "" @@ -938,15 +977,15 @@ msgstr "" msgid "Ukrainian" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:53 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:122 msgid "Untrusted Server Certificate!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:181 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:182 msgid "Update System" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:65 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:66 msgid "User Name" msgstr "" @@ -968,50 +1007,50 @@ msgstr "" msgid "View information about the current session" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:35 -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:43 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:30 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:38 msgid "View information about the running processes" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2105 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2111 msgid "View options" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:102 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:97 #, python-format msgid "View the result, PID %s" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:177 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:173 msgid "Well killed!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:210 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1915 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2268 -#: ../calculate-console-gui/pym/consolegui/application/more.py:720 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2010 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2363 -#: ../calculate-console-gui/pym/consolegui/application/Box.py:439 -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1180 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:442 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:214 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1181 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1921 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2280 +#: ../calculate-console-gui/pym/consolegui/application/more.py:733 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2023 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2385 msgid "Yes" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:172 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:177 msgid "You are connected to the server!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:48 -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:53 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:49 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:54 msgid "You are not connected to the localhost server" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:377 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:385 msgid "You do not have a certificate or your certificate does not match the server certificate. Please generate a new request and get the new certificate from the server." msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/more.py:2397 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:366 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:374 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2419 msgid "You do not have a certificate. Please generate a new request and get the new certificate from the server." msgstr "" @@ -1031,16 +1070,16 @@ msgstr "" msgid "Your certificate ID: " msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:125 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:124 msgid "Your email:" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:122 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:121 msgid "Your name:" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:195 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:273 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:194 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:271 #, python-format msgid "Your request ID: %s" msgstr "" @@ -1049,39 +1088,39 @@ msgstr "" msgid "Your session ID: " msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:243 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:250 msgid "call method" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:253 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:260 msgid "destination host" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:250 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:257 msgid "port number" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:173 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:178 msgid "previous connection!" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:247 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:254 msgid "run the method without options" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:237 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:244 msgid "show this help message and exit" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:240 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:247 msgid "translation language" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:96 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:165 msgid "try adding the CA and root certificates to trusted?" msgstr "" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:423 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:426 #, python-format msgid "with %s?" msgstr "" diff --git a/pot/cl_core3.pot b/pot/cl_core3.pot index 085e5d0..c663b8b 100644 --- a/pot/cl_core3.pot +++ b/pot/cl_core3.pot @@ -1,136 +1,136 @@ -#: ../calculate-core/pym/core/client/pid_information.py:165 +#: ../calculate-core/pym/core/client/pid_information.py:167 msgid " Certificate not found in the server database!" msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:169 +#: ../calculate-core/pym/core/client/pid_information.py:171 msgid " Failed to terminate the process!" msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:161 +#: ../calculate-core/pym/core/client/pid_information.py:163 msgid " Killed successfully!" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:36 +#: ../calculate-core/pym/core/client/sid_func.py:38 msgid " New session" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:38 +#: ../calculate-core/pym/core/client/sid_func.py:40 msgid " Old session" msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:163 +#: ../calculate-core/pym/core/client/pid_information.py:165 msgid " Process completed!" msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:167 +#: ../calculate-core/pym/core/client/pid_information.py:169 msgid " Session not matching your certificate!" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:49 +#: ../calculate-core/pym/core/client/cert_func.py:51 #, python-format msgid " Your certifitate ID = %d" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:39 +#: ../calculate-core/pym/core/client/sid_func.py:41 #, python-format msgid " Your session ID = %s" msgstr "" -#: ../calculate-core/pym/core/server/func.py:1522 +#: ../calculate-core/pym/core/server/func.py:1551 msgid " is a file, not a link!" msgstr "" -#: ../calculate-core/pym/core/variables/backup.py:102 +#: ../calculate-core/pym/core/variables/backup.py:103 #, python-format msgid "%d days" msgstr "" -#: ../calculate-core/pym/core/variables/backup.py:107 +#: ../calculate-core/pym/core/variables/backup.py:108 #, python-format msgid "%d hours" msgstr "" -#: ../calculate-core/pym/core/variables/backup.py:110 +#: ../calculate-core/pym/core/variables/backup.py:111 #, python-format msgid "%d minutes" msgstr "" -#: ../calculate-core/pym/core/variables/backup.py:113 +#: ../calculate-core/pym/core/variables/backup.py:114 #, python-format msgid "%d seconds" msgstr "" -#: ../calculate-core/pym/core/variables/backup.py:114 +#: ../calculate-core/pym/core/variables/backup.py:115 #, python-format msgid "%s ago" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:431 +#: ../calculate-core/pym/core/server/methods_func.py:433 #, python-format msgid "%s values:" msgstr "" -#: ../calculate-core/pym/core/result_viewer.py:315 -#: ../calculate-core/pym/core/server/local_call.py:460 #: ../calculate-core/pym/core/server/local_call.py:468 +#: ../calculate-core/pym/core/server/local_call.py:476 +#: ../calculate-core/pym/core/result_viewer.py:313 #, python-format msgid "%s: " msgstr "" -#: ../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 +#: ../calculate-core/pym/core/client/cert_func.py:293 +#: ../calculate-core/pym/core/client/sid_func.py:57 +#: ../calculate-core/pym/core/client/sid_func.py:81 #, python-format msgid "%s: Permission denied" msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:48 +#: ../calculate-core/pym/core/client/pid_information.py:50 #, python-format msgid "%s: Process started" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:271 +#: ../calculate-core/pym/core/server/methods_func.py:274 msgid "'list' for displaying possible values" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:266 +#: ../calculate-core/pym/core/server/methods_func.py:269 msgid "'list' for displaying possible values, 'none' is never one" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:225 +#: ../calculate-core/pym/core/server/methods_func.py:228 msgid "(by default)" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:244 -#: ../calculate-core/pym/core/server/methods_func.py:251 +#: ../calculate-core/pym/core/server/methods_func.py:247 +#: ../calculate-core/pym/core/server/methods_func.py:254 msgid "(enabled by default)" msgstr "" -#: ../calculate-core/pym/core/server/func.py:120 +#: ../calculate-core/pym/core/server/func.py:118 #, python-brace-format msgid "({one} of {_all}) -- {fname}" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:588 +#: ../calculate-core/pym/core/server/cert_cmd.py:592 msgid ", except:" msgstr "" -#: ../calculate-core/pym/core/result_viewer.py:304 -#: ../calculate-core/pym/core/backup.py:636 +#: ../calculate-core/pym/core/backup.py:635 +#: ../calculate-core/pym/core/result_viewer.py:302 msgid ":" 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:561 -#: ../calculate-core/pym/core/variables/setup_package.py:112 -#: ../calculate-core/pym/core/variables/setup_package.py:245 +#: ../calculate-core/pym/core/client/cert_info.py:85 +#: ../calculate-core/pym/core/client/pid_information.py:93 +#: ../calculate-core/pym/core/server/methods_func.py:569 +#: ../calculate-core/pym/core/variables/setup_package.py:116 +#: ../calculate-core/pym/core/variables/setup_package.py:249 msgid ": " msgstr "" -#: ../calculate-core/pym/core/client/cert_verify.py:88 -#: ../calculate-core/pym/core/backup.py:235 -#: ../calculate-core/pym/core/backup.py:292 +#: ../calculate-core/pym/core/client/cert_verify.py:90 +#: ../calculate-core/pym/core/backup.py:236 +#: ../calculate-core/pym/core/backup.py:293 #, python-format msgid ": %s" msgstr "" @@ -150,27 +150,27 @@ msgstr "" msgid "Action {ac_custom_name} not found" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:381 +#: ../calculate-core/pym/core/wsdl_core.py:382 msgid "Add" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:357 +#: ../calculate-core/pym/core/wsdl_core.py:358 msgid "Add a Group" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:377 +#: ../calculate-core/pym/core/wsdl_core.py:378 msgid "Add a group" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:292 +#: ../calculate-core/pym/core/client/client_class.py:294 msgid "Add the CA and root certificates" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:217 +#: ../calculate-core/pym/core/client/client_class.py:219 msgid "Add the CA certificate to trusted? y/[n]:" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:243 +#: ../calculate-core/pym/core/client/client_class.py:245 msgid "Add this server certificate to trusted (s) or" msgstr "" @@ -178,15 +178,15 @@ msgstr "" msgid "Adding manually interrupted" msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:279 +#: ../calculate-core/pym/core/variables/variable.py:273 msgid "All" msgstr "" -#: ../calculate-core/pym/core/server/baseClass.py:200 +#: ../calculate-core/pym/core/server/baseClass.py:223 msgid "All processes are closed." msgstr "" -#: ../calculate-core/pym/core/result_viewer.py:297 +#: ../calculate-core/pym/core/result_viewer.py:296 msgid "Ambiguous answer:" msgstr "" @@ -199,13 +199,13 @@ msgstr "" msgid "Archive created: {core.cl_backup_file}" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:650 +#: ../calculate-core/pym/core/server/cert_cmd.py:654 msgid "Are you sure? Delete all client certificates?" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:234 -#: ../calculate-core/pym/core/wsdl_core.py:302 -#: ../calculate-core/pym/core/wsdl_core.py:481 +#: ../calculate-core/pym/core/wsdl_core.py:235 +#: ../calculate-core/pym/core/wsdl_core.py:303 +#: ../calculate-core/pym/core/wsdl_core.py:482 msgid "Back" msgstr "" @@ -217,17 +217,17 @@ msgstr "" msgid "Backing up files configured by templates" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:733 -#: ../calculate-core/pym/core/wsdl_core.py:735 -#: ../calculate-core/pym/core/wsdl_core.py:765 +#: ../calculate-core/pym/core/wsdl_core.py:734 +#: ../calculate-core/pym/core/wsdl_core.py:736 +#: ../calculate-core/pym/core/wsdl_core.py:766 msgid "Backup" msgstr "" -#: ../calculate-core/pym/core/variables/backup.py:80 +#: ../calculate-core/pym/core/variables/backup.py:81 msgid "Backup created" msgstr "" -#: ../calculate-core/pym/core/variables/backup.py:125 +#: ../calculate-core/pym/core/variables/backup.py:126 msgid "Backup file" msgstr "" @@ -239,43 +239,43 @@ msgstr "" msgid "Backup successfully completed!" msgstr "" -#: ../calculate-core/pym/core/client/cert_verify.py:302 +#: ../calculate-core/pym/core/client/cert_verify.py:305 msgid "CA certificate deleted from the system trusted certificates list" msgstr "" -#: ../calculate-core/pym/core/client/cert_verify.py:283 +#: ../calculate-core/pym/core/client/cert_verify.py:286 msgid "CA certificate deleted from the user's trusted certificates list" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:196 +#: ../calculate-core/pym/core/client/client_class.py:198 msgid "CA certificate not found on the server" msgstr "" -#: ../calculate-core/pym/core/server/create_cert.py:159 +#: ../calculate-core/pym/core/server/create_cert.py:160 msgid "CA certitficate file {} not found" msgstr "" -#: ../calculate-core/pym/core/backup.py:135 +#: ../calculate-core/pym/core/backup.py:136 msgid "CONTENTS file not found" msgstr "" -#: ../calculate-core/pym/core/client/cert_verify.py:181 +#: ../calculate-core/pym/core/client/cert_verify.py:182 msgid "CRL added" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1052 +#: ../calculate-core/pym/core/server/cert_cmd.py:1056 msgid "CRL deleted" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1054 +#: ../calculate-core/pym/core/server/cert_cmd.py:1058 msgid "CRL does not exist" msgstr "" -#: ../calculate-core/pym/core/backup.py:635 +#: ../calculate-core/pym/core/backup.py:634 msgid "Calculate Utilities have backuped files" msgstr "" -#: ../calculate-core/pym/core/setup_package.py:333 +#: ../calculate-core/pym/core/setup_package.py:329 msgid "Calculate core is executing the following tasks" msgstr "" @@ -283,7 +283,7 @@ msgstr "" msgid "Calculating checksums" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:947 +#: ../calculate-core/pym/core/server/cert_cmd.py:951 msgid "Certificate \t" msgstr "" @@ -292,48 +292,48 @@ msgstr "" msgid "Certificate %s has been signed" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:744 +#: ../calculate-core/pym/core/server/cert_cmd.py:748 #, python-format msgid "Certificate %s has not been signed" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:742 -#: ../calculate-core/pym/core/server/cert_cmd.py:798 +#: ../calculate-core/pym/core/server/cert_cmd.py:746 +#: ../calculate-core/pym/core/server/cert_cmd.py:802 #, python-format msgid "Certificate %s is signed" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1065 -#: ../calculate-core/pym/core/server/bootstrap.py:57 +#: ../calculate-core/pym/core/server/bootstrap.py:59 +#: ../calculate-core/pym/core/server/cert_cmd.py:1069 #, python-format msgid "Certificate %s not found" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:699 -#: ../calculate-core/pym/core/server/cert_cmd.py:771 +#: ../calculate-core/pym/core/server/cert_cmd.py:703 +#: ../calculate-core/pym/core/server/cert_cmd.py:775 #, python-format msgid "Certificate %s now exists" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:213 +#: ../calculate-core/pym/core/wsdl_core.py:214 msgid "Certificate Details" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:638 +#: ../calculate-core/pym/core/server/cert_cmd.py:642 #, python-format msgid "Certificate ID = %s" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:301 +#: ../calculate-core/pym/core/client/cert_func.py:303 msgid "Certificate ID: " msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:256 -#: ../calculate-core/pym/core/client/client_class.py:181 +#: ../calculate-core/pym/core/client/cert_func.py:258 +#: ../calculate-core/pym/core/client/client_class.py:183 msgid "Certificate added" msgstr "" -#: ../calculate-core/pym/core/server/bootstrap.py:87 +#: ../calculate-core/pym/core/server/bootstrap.py:89 msgid "Certificate creation date later than current date" msgstr "" @@ -341,16 +341,16 @@ msgstr "" msgid "Certificate deleted" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:231 +#: ../calculate-core/pym/core/wsdl_core.py:232 msgid "Certificate details" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:52 -#: ../calculate-core/pym/core/server/bootstrap.py:90 +#: ../calculate-core/pym/core/client/cert_func.py:54 +#: ../calculate-core/pym/core/server/bootstrap.py:92 msgid "Certificate expired" msgstr "" -#: ../calculate-core/pym/core/variables/request.py:295 +#: ../calculate-core/pym/core/variables/request.py:294 msgid "Certificate group" msgstr "" @@ -364,47 +364,47 @@ msgstr "" msgid "Certificate identifier" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:89 +#: ../calculate-core/pym/core/client/sid_func.py:91 #, python-format msgid "Certificate issued on %s" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:222 +#: ../calculate-core/pym/core/client/client_class.py:224 msgid "Certificate not added to trusted" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:664 +#: ../calculate-core/pym/core/server/cert_cmd.py:668 msgid "Certificate not found" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:43 +#: ../calculate-core/pym/core/client/cert_func.py:45 msgid "Certificate not found in the server database!" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:97 -#: ../calculate-core/pym/core/server/client_class.py:65 +#: ../calculate-core/pym/core/client/client_class.py:99 +#: ../calculate-core/pym/core/server/client_class.py:67 msgid "Certificate not found on the client's side" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:285 +#: ../calculate-core/pym/core/client/cert_func.py:287 msgid "Certificate not found on the server!" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:846 +#: ../calculate-core/pym/core/server/cert_cmd.py:850 msgid "Certificate not found!" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:47 +#: ../calculate-core/pym/core/client/cert_func.py:49 msgid "Certificate not sent!" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:88 +#: ../calculate-core/pym/core/client/sid_func.py:90 #, python-format msgid "Certificate number: %s" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:918 -#: ../calculate-core/pym/core/server/cert_cmd.py:956 +#: ../calculate-core/pym/core/server/cert_cmd.py:922 +#: ../calculate-core/pym/core/server/cert_cmd.py:960 msgid "Certificate or request not found!" msgstr "" @@ -413,12 +413,12 @@ msgstr "" msgid "Certificate permissions" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:253 +#: ../calculate-core/pym/core/server/cert_cmd.py:257 #, python-format msgid "Certificate saved. Your certificate ID = %s" msgstr "" -#: ../calculate-core/pym/core/server/bootstrap.py:362 +#: ../calculate-core/pym/core/server/bootstrap.py:364 #, python-format msgid "Certificate saved. Your certificate ID: %s" msgstr "" @@ -428,22 +428,22 @@ msgstr "" msgid "Certificate {cl_req_crt_path} is signed" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:201 #: ../calculate-core/pym/core/server/certificate.py:47 +#: ../calculate-core/pym/core/wsdl_core.py:202 msgid "Certificates" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:305 +#: ../calculate-core/pym/core/wsdl_core.py:306 msgid "Change" msgstr "" -#: ../calculate-core/pym/core/server/func.py:122 +#: ../calculate-core/pym/core/server/func.py:120 msgid "Choose a configuration action:" msgstr "" -#: ../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 +#: ../calculate-core/pym/core/client/create_cert.py:83 +#: ../calculate-core/pym/core/server/cert_cmd.py:121 +#: ../calculate-core/pym/core/server/create_cert.py:98 msgid "City: " msgstr "" @@ -451,35 +451,35 @@ msgstr "" msgid "Clearing temporary files" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:92 +#: ../calculate-core/pym/core/client/sid_func.py:94 #, python-format msgid "Client type: %s" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:181 -#: ../calculate-core/pym/core/server/cert_cmd.py:226 +#: ../calculate-core/pym/core/server/cert_cmd.py:184 +#: ../calculate-core/pym/core/server/cert_cmd.py:230 msgid "Close. Connection Error." msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:161 +#: ../calculate-core/pym/core/client/cert_func.py:163 msgid "Closed. Connection error." msgstr "" -#: ../calculate-core/pym/core/server/baseClass.py:181 +#: ../calculate-core/pym/core/server/baseClass.py:204 msgid "Closing all processes" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:286 +#: ../calculate-core/pym/core/server/methods_func.py:289 msgid "Common arguments" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:630 +#: ../calculate-core/pym/core/wsdl_core.py:631 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 +#: ../calculate-core/pym/core/wsdl_core.py:62 +#: ../calculate-core/pym/core/wsdl_core.py:107 +#: ../calculate-core/pym/core/wsdl_core.py:629 msgid "Configuration" msgstr "" @@ -492,25 +492,25 @@ msgstr "" msgid "Configuration manually interrupted" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:63 +#: ../calculate-core/pym/core/wsdl_core.py:64 msgid "Configure a Package" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:85 -#: ../calculate-core/pym/core/wsdl_core.py:130 -#: ../calculate-core/pym/core/wsdl_core.py:651 +#: ../calculate-core/pym/core/wsdl_core.py:86 +#: ../calculate-core/pym/core/wsdl_core.py:131 +#: ../calculate-core/pym/core/wsdl_core.py:652 msgid "Configure a package" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:363 +#: ../calculate-core/pym/core/variables/setup_package.py:367 msgid "Configure dependent packages in root" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:323 +#: ../calculate-core/pym/core/variables/setup_package.py:327 msgid "Configure the system" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:348 +#: ../calculate-core/pym/core/variables/setup_package.py:352 msgid "Configure users" msgstr "" @@ -519,46 +519,46 @@ msgstr "" msgid "Configuring dependencies: %s" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:345 -#: ../calculate-core/pym/core/wsdl_core.py:484 +#: ../calculate-core/pym/core/wsdl_core.py:346 +#: ../calculate-core/pym/core/wsdl_core.py:485 msgid "Confirm" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:531 +#: ../calculate-core/pym/core/wsdl_core.py:532 msgid "Confirm the Request" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:124 +#: ../calculate-core/pym/core/server/cert_cmd.py:126 #, python-format msgid "Country (two letters only!) [%s]: " msgstr "" -#: ../calculate-core/pym/core/server/create_cert.py:99 +#: ../calculate-core/pym/core/server/create_cert.py:100 msgid "Country (two letters only!): " msgstr "" -#: ../calculate-core/pym/core/client/create_cert.py:86 +#: ../calculate-core/pym/core/client/create_cert.py:85 #, python-format msgid "Country: [%s]" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:188 +#: ../calculate-core/pym/core/server/cert_cmd.py:191 msgid "Create a new private key and request?" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:116 +#: ../calculate-core/pym/core/client/cert_func.py:118 msgid "Create a new private key and request? y/[n]: " msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1240 +#: ../calculate-core/pym/core/server/cert_cmd.py:1244 msgid "Create symlinks for methods" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:668 +#: ../calculate-core/pym/core/wsdl_core.py:669 msgid "Custom Action" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:688 +#: ../calculate-core/pym/core/wsdl_core.py:689 msgid "Custom action" msgstr "" @@ -566,50 +566,50 @@ msgstr "" msgid "Date" msgstr "" -#: ../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 +#: ../calculate-core/pym/core/wsdl_core.py:309 +#: ../calculate-core/pym/core/wsdl_core.py:414 +#: ../calculate-core/pym/core/wsdl_core.py:488 +#: ../calculate-core/pym/core/wsdl_core.py:522 +#: ../calculate-core/pym/core/wsdl_core.py:554 msgid "Delete" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:391 +#: ../calculate-core/pym/core/wsdl_core.py:392 msgid "Delete the Group" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:499 +#: ../calculate-core/pym/core/wsdl_core.py:500 msgid "Delete the Request" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1000 +#: ../calculate-core/pym/core/server/cert_cmd.py:1004 msgid "Delete the certificate and the signature request? y/[n]: " msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:673 +#: ../calculate-core/pym/core/server/cert_cmd.py:677 #, python-format msgid "Delete the client certificate with ID %d? y/[n]: " msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:411 +#: ../calculate-core/pym/core/wsdl_core.py:412 msgid "Delete the group" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:519 -#: ../calculate-core/pym/core/wsdl_core.py:551 +#: ../calculate-core/pym/core/wsdl_core.py:520 +#: ../calculate-core/pym/core/wsdl_core.py:552 msgid "Delete the request" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:676 +#: ../calculate-core/pym/core/server/cert_cmd.py:680 msgid "Deleted" msgstr "" -#: ../calculate-core/pym/core/utils/cl_core_request.py:69 #: ../calculate-core/pym/core/utils/cl_core_group.py:86 +#: ../calculate-core/pym/core/utils/cl_core_request.py:69 msgid "Deleting manually interrupted" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:309 +#: ../calculate-core/pym/core/variables/setup_package.py:313 #, python-format msgid "Directory %s not found" msgstr "" @@ -622,21 +622,21 @@ msgstr "" msgid "Dispatching manually interrupted" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:100 -#: ../calculate-core/pym/core/server/create_cert.py:66 +#: ../calculate-core/pym/core/server/cert_cmd.py:102 +#: ../calculate-core/pym/core/server/create_cert.py:67 msgid "Do not use spaces or tabs." msgstr "" -#: ../calculate-core/pym/core/server/bootstrap.py:477 +#: ../calculate-core/pym/core/server/bootstrap.py:479 msgid "Do you really want to remove all certificates, requests and config files from the server?" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:344 +#: ../calculate-core/pym/core/wsdl_core.py:345 msgid "Done" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:65 -#: ../calculate-core/pym/core/server/create_cert.py:55 +#: ../calculate-core/pym/core/server/cert_cmd.py:67 +#: ../calculate-core/pym/core/server/create_cert.py:56 msgid "Enter the certificate date manually? [y]/n: " msgstr "" @@ -644,12 +644,12 @@ msgstr "" msgid "Enter the certificate date manually? y/[n]: " msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:706 +#: ../calculate-core/pym/core/server/cert_cmd.py:710 msgid "Enter the group of the new certificate (group name or 'all'): " msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:93 -#: ../calculate-core/pym/core/client/cert_func.py:146 +#: ../calculate-core/pym/core/client/cert_func.py:95 +#: ../calculate-core/pym/core/client/cert_func.py:148 msgid "Enter the port number: " msgstr "" @@ -657,41 +657,41 @@ msgstr "" msgid "Error" msgstr "" -#: ../calculate-core/pym/core/client/cert_verify.py:104 -#: ../calculate-core/pym/core/client/cert_verify.py:109 -#: ../calculate-core/pym/core/client/client_class.py:289 +#: ../calculate-core/pym/core/client/cert_verify.py:106 +#: ../calculate-core/pym/core/client/cert_verify.py:111 +#: ../calculate-core/pym/core/client/client_class.py:291 #, python-format msgid "Error creating directory %s" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:778 +#: ../calculate-core/pym/core/server/methods_func.py:784 #, python-format msgid "Error in field '%s'. " msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:782 +#: ../calculate-core/pym/core/server/methods_func.py:788 msgid "Error in parameter " msgstr "" -#: ../calculate-core/pym/core/server/clean.py:159 +#: ../calculate-core/pym/core/server/clean.py:162 msgid "Error reading SID files" msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:228 +#: ../calculate-core/pym/core/variables/variable.py:223 #, python-format msgid "Error writing to variable %s:" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:205 +#: ../calculate-core/pym/core/client/client_class.py:207 msgid "Error. Certificate not added to the trusted list." msgstr "" -#: ../calculate-core/pym/core/server/client_class.py:163 +#: ../calculate-core/pym/core/server/client_class.py:165 msgid "Error. The server certificate and the private key are probably invalid!" msgstr "" -#: ../calculate-core/pym/core/client/cert_info.py:105 -#: ../calculate-core/pym/core/client/cert_info.py:108 +#: ../calculate-core/pym/core/client/cert_info.py:107 +#: ../calculate-core/pym/core/client/cert_info.py:110 #, python-format msgid "Exception: %s" msgstr "" @@ -701,7 +701,7 @@ msgstr "" msgid "Failed to add {cl_core_group} group" msgstr "" -#: ../calculate-core/pym/core/backup.py:290 +#: ../calculate-core/pym/core/backup.py:291 msgid "Failed to backup configuration files that were modified by templates" msgstr "" @@ -710,7 +710,7 @@ msgstr "" msgid "Failed to change {cl_core_group} group" msgstr "" -#: ../calculate-core/pym/core/client/function.py:48 +#: ../calculate-core/pym/core/client/function.py:49 msgid "Failed to clear the cache! " msgstr "" @@ -719,29 +719,29 @@ msgstr "" msgid "Failed to configure the system!" msgstr "" -#: ../calculate-core/pym/core/client/cert_info.py:83 +#: ../calculate-core/pym/core/client/cert_info.py:85 msgid "Failed to connect" msgstr "" -#: ../calculate-core/pym/core/server/func.py:142 +#: ../calculate-core/pym/core/server/func.py:140 #, python-brace-format msgid "Failed to copy {ffrom} to {fto}" msgstr "" -#: ../calculate-core/pym/core/backup.py:251 +#: ../calculate-core/pym/core/backup.py:252 #, python-format msgid "Failed to create directory %s" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:131 +#: ../calculate-core/pym/core/server/cert_cmd.py:133 msgid "Failed to create root certificate" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:288 +#: ../calculate-core/pym/core/client/cert_func.py:290 msgid "Failed to create the certificate ID!" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:64 +#: ../calculate-core/pym/core/client/sid_func.py:66 msgid "Failed to delete the SID on the server" msgstr "" @@ -750,7 +750,7 @@ msgstr "" msgid "Failed to delete the request with ID={cl_req_id}" msgstr "" -#: ../calculate-core/pym/core/set_vars.py:52 +#: ../calculate-core/pym/core/set_vars.py:50 #, python-brace-format msgid "Failed to delete variable {var} from {location}" msgstr "" @@ -764,7 +764,7 @@ msgstr "" msgid "Failed to dispatch configuration files!" msgstr "" -#: ../calculate-core/pym/core/backup.py:234 +#: ../calculate-core/pym/core/backup.py:235 msgid "Failed to enable service at startup" msgstr "" @@ -772,38 +772,38 @@ msgstr "" msgid "Failed to find backup" msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:66 -#: ../calculate-core/pym/core/client/pid_information.py:84 +#: ../calculate-core/pym/core/client/pid_information.py:68 +#: ../calculate-core/pym/core/client/pid_information.py:86 msgid "Failed to get PIDs from the server" msgstr "" -#: ../calculate-core/pym/core/server/bootstrap.py:93 +#: ../calculate-core/pym/core/server/bootstrap.py:95 msgid "Failed to get certificate work date" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:111 -#: ../calculate-core/pym/core/client/pid_information.py:107 +#: ../calculate-core/pym/core/client/pid_information.py:109 +#: ../calculate-core/pym/core/client/sid_func.py:113 msgid "Failed to get data" msgstr "" -#: ../calculate-core/pym/core/backup.py:337 +#: ../calculate-core/pym/core/backup.py:338 #, python-brace-format msgid "Failed to get status of {name} service" msgstr "" -#: ../calculate-core/pym/core/server/cl_server.py:30 -#: ../calculate-core/pym/core/core_main.py:51 +#: ../calculate-core/pym/core/server/cl_server.py:40 +#: ../calculate-core/pym/core/core_main.py:54 #, python-format msgid "Failed to import %s" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:52 -#: ../calculate-core/pym/core/client/sid_func.py:76 +#: ../calculate-core/pym/core/client/sid_func.py:54 +#: ../calculate-core/pym/core/client/sid_func.py:78 msgid "Failed to obtain the certificate data!" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:105 -#: ../calculate-core/pym/core/server/client_class.py:74 +#: ../calculate-core/pym/core/client/client_class.py:107 +#: ../calculate-core/pym/core/server/client_class.py:76 msgid "Failed to open the file" msgstr "" @@ -820,21 +820,21 @@ msgstr "" msgid "Failed to perform backup!" msgstr "" -#: ../calculate-core/pym/core/server/func.py:155 +#: ../calculate-core/pym/core/server/func.py:153 #, python-format msgid "Failed to remove %s" msgstr "" -#: ../calculate-core/pym/core/backup.py:380 +#: ../calculate-core/pym/core/backup.py:381 #, python-format msgid "Failed to remove %s service" msgstr "" -#: ../calculate-core/pym/core/server/bootstrap.py:298 +#: ../calculate-core/pym/core/server/bootstrap.py:300 msgid "Failed to remove local client certificate" msgstr "" -#: ../calculate-core/pym/core/backup.py:333 +#: ../calculate-core/pym/core/backup.py:334 #, python-brace-format msgid "Failed to restart {name} service" msgstr "" @@ -843,7 +843,7 @@ msgstr "" msgid "Failed to restore from backup!" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:719 +#: ../calculate-core/pym/core/server/cert_cmd.py:723 msgid "Failed to sign client certificate" msgstr "" @@ -852,30 +852,30 @@ msgstr "" msgid "Failed to sign {cl_req_csr_path} request" msgstr "" -#: ../calculate-core/pym/core/backup.py:334 +#: ../calculate-core/pym/core/backup.py:335 #, python-brace-format msgid "Failed to start {name} service" msgstr "" -#: ../calculate-core/pym/core/backup.py:335 +#: ../calculate-core/pym/core/backup.py:336 #, python-brace-format msgid "Failed to stop {name} service" msgstr "" -#: ../calculate-core/pym/core/server/func.py:1082 -#: ../calculate-core/pym/core/server/local_call.py:156 +#: ../calculate-core/pym/core/server/func.py:1089 +#: ../calculate-core/pym/core/server/local_call.py:159 #, python-format msgid "Failed to write the PID file %s!" msgstr "" -#: ../calculate-core/pym/core/backup.py:336 +#: ../calculate-core/pym/core/backup.py:337 #, python-brace-format msgid "Failed to zap {name} service" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:244 -#: ../calculate-core/pym/core/client/client_class.py:170 -#: ../calculate-core/pym/core/server/bootstrap.py:414 +#: ../calculate-core/pym/core/client/cert_func.py:246 +#: ../calculate-core/pym/core/client/client_class.py:172 +#: ../calculate-core/pym/core/server/bootstrap.py:416 msgid "Field \"CN\" not found in the certificate!" msgstr "" @@ -883,36 +883,36 @@ msgstr "" msgid "Files successfully restored from backup!" msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:263 +#: ../calculate-core/pym/core/variables/variable.py:257 msgid "Filter" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:527 -#: ../calculate-core/pym/core/server/cert_cmd.py:816 +#: ../calculate-core/pym/core/server/cert_cmd.py:531 +#: ../calculate-core/pym/core/server/cert_cmd.py:820 msgid "Fingerprint = " msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:207 -#: ../calculate-core/pym/core/client/client_class.py:232 -#: ../calculate-core/pym/core/server/client_class.py:85 +#: ../calculate-core/pym/core/client/client_class.py:209 +#: ../calculate-core/pym/core/client/client_class.py:234 +#: ../calculate-core/pym/core/server/client_class.py:87 #, python-format msgid "Fingerprint = %s" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:115 -#: ../calculate-core/pym/core/server/create_cert.py:94 +#: ../calculate-core/pym/core/server/cert_cmd.py:117 +#: ../calculate-core/pym/core/server/create_cert.py:95 msgid "Full network address (host:port)" msgstr "" -#: ../calculate-core/pym/core/server/baseClass.py:163 +#: ../calculate-core/pym/core/server/baseClass.py:185 msgid "General monitoring started" msgstr "" -#: ../calculate-core/pym/core/server/bootstrap.py:126 +#: ../calculate-core/pym/core/server/bootstrap.py:128 msgid "Generating the client certificate" msgstr "" -#: ../calculate-core/pym/core/server/bootstrap.py:105 +#: ../calculate-core/pym/core/server/bootstrap.py:107 msgid "Generating the server certificate" msgstr "" @@ -921,23 +921,23 @@ msgid "Group" msgstr "" #: ../calculate-core/pym/core/server/groups.py:102 -#: ../calculate-core/pym/core/variables/groups.py:78 +#: ../calculate-core/pym/core/variables/groups.py:77 #, python-format msgid "Group %s already exists!" msgstr "" -#: ../calculate-core/pym/core/variables/groups.py:80 -#: ../calculate-core/pym/core/variables/request.py:344 +#: ../calculate-core/pym/core/variables/groups.py:79 +#: ../calculate-core/pym/core/variables/request.py:343 #, python-format msgid "Group %s does not exist" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:280 +#: ../calculate-core/pym/core/wsdl_core.py:281 msgid "Group Details" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:298 -#: ../calculate-core/pym/core/wsdl_core.py:475 +#: ../calculate-core/pym/core/wsdl_core.py:299 +#: ../calculate-core/pym/core/wsdl_core.py:476 msgid "Group details" msgstr "" @@ -949,12 +949,12 @@ msgstr "" msgid "Group name is a required parameter" msgstr "" +#: ../calculate-core/pym/core/variables/groups.py:91 #: ../calculate-core/pym/core/variables/groups.py:92 -#: ../calculate-core/pym/core/variables/groups.py:93 msgid "Group permissions" msgstr "" -#: ../calculate-core/pym/core/variables/request.py:332 +#: ../calculate-core/pym/core/variables/request.py:331 msgid "Group permissions is a required parameter" msgstr "" @@ -973,54 +973,54 @@ msgstr "" msgid "Group {cl_core_group} deleted" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:268 -#: ../calculate-core/pym/core/server/groups.py:44 #: ../calculate-core/pym/core/server/certificate.py:47 +#: ../calculate-core/pym/core/server/groups.py:44 +#: ../calculate-core/pym/core/wsdl_core.py:269 msgid "Groups" msgstr "" -#: ../calculate-core/pym/core/client/create_cert.py:73 -#: ../calculate-core/pym/core/server/cert_cmd.py:102 -#: ../calculate-core/pym/core/server/create_cert.py:88 +#: ../calculate-core/pym/core/client/create_cert.py:72 +#: ../calculate-core/pym/core/server/cert_cmd.py:104 +#: ../calculate-core/pym/core/server/create_cert.py:89 #, python-format msgid "Hostname [%s] : " msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:90 +#: ../calculate-core/pym/core/client/sid_func.py:92 #, python-format msgid "IP: %s" msgstr "" -#: ../calculate-core/pym/core/server/baseClass.py:170 +#: ../calculate-core/pym/core/server/baseClass.py:192 msgid "Inactive watchdog failed" msgstr "" -#: ../calculate-core/pym/core/server/baseClass.py:169 +#: ../calculate-core/pym/core/server/baseClass.py:191 msgid "Inactive watchdog started" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:103 +#: ../calculate-core/pym/core/client/sid_func.py:105 msgid "Invalid SID" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:305 +#: ../calculate-core/pym/core/client/cert_func.py:307 msgid "Invalid certificate ID" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:192 +#: ../calculate-core/pym/core/client/client_class.py:194 msgid "Invalid server certificate!" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:210 -#: ../calculate-core/pym/core/client/client_class.py:235 -#: ../calculate-core/pym/core/server/cert_cmd.py:530 -#: ../calculate-core/pym/core/server/cert_cmd.py:819 -#: ../calculate-core/pym/core/server/client_class.py:88 +#: ../calculate-core/pym/core/client/client_class.py:212 +#: ../calculate-core/pym/core/client/client_class.py:237 +#: ../calculate-core/pym/core/server/cert_cmd.py:534 +#: ../calculate-core/pym/core/server/cert_cmd.py:823 +#: ../calculate-core/pym/core/server/client_class.py:90 msgid "Issuer" msgstr "" -#: ../calculate-core/pym/core/server/create_cert.py:118 -#: ../calculate-core/pym/core/server/create_cert.py:156 +#: ../calculate-core/pym/core/server/create_cert.py:119 +#: ../calculate-core/pym/core/server/create_cert.py:157 msgid "Key file {} not found" msgstr "" @@ -1036,60 +1036,60 @@ msgstr "" msgid "List of requests" msgstr "" -#: ../calculate-core/pym/core/set_vars.py:43 -#: ../calculate-core/pym/core/set_vars.py:109 +#: ../calculate-core/pym/core/set_vars.py:41 +#: ../calculate-core/pym/core/set_vars.py:107 msgid "List of variables" msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:277 +#: ../calculate-core/pym/core/variables/variable.py:271 msgid "Local" msgstr "" #: ../calculate-core/pym/core/server/request.py:51 -#: ../calculate-core/pym/core/set_vars.py:42 -#: ../calculate-core/pym/core/set_vars.py:108 -#: ../calculate-core/pym/core/variables/variable.py:238 +#: ../calculate-core/pym/core/variables/variable.py:233 +#: ../calculate-core/pym/core/set_vars.py:40 +#: ../calculate-core/pym/core/set_vars.py:106 msgid "Location" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:91 +#: ../calculate-core/pym/core/client/sid_func.py:93 #, python-format msgid "MAC: %s" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:396 +#: ../calculate-core/pym/core/variables/setup_package.py:400 msgid "Machine architecture" msgstr "" -#: ../calculate-core/pym/core/client/cert_info.py:86 -#: ../calculate-core/pym/core/client/cert_info.py:110 -#: ../calculate-core/pym/core/server/local_call.py:252 -#: ../calculate-core/pym/core/server/local_call.py:379 +#: ../calculate-core/pym/core/client/cert_info.py:88 +#: ../calculate-core/pym/core/client/cert_info.py:112 +#: ../calculate-core/pym/core/server/local_call.py:256 +#: ../calculate-core/pym/core/server/local_call.py:383 msgid "Manually interrupted" msgstr "" -#: ../calculate-core/pym/core/server/local_call.py:336 +#: ../calculate-core/pym/core/server/local_call.py:340 msgid "Method not available" msgstr "" -#: ../calculate-core/pym/core/server/local_call.py:191 +#: ../calculate-core/pym/core/server/local_call.py:195 #, python-format msgid "Method not found for %s" msgstr "" -#: ../calculate-core/pym/core/server/local_call.py:220 -#: ../calculate-core/pym/core/server/local_call.py:290 -#: ../calculate-core/pym/core/server/local_call.py:362 +#: ../calculate-core/pym/core/server/local_call.py:224 +#: ../calculate-core/pym/core/server/local_call.py:294 +#: ../calculate-core/pym/core/server/local_call.py:366 msgid "Method not found: " msgstr "" -#: ../calculate-core/pym/core/server/func.py:456 +#: ../calculate-core/pym/core/server/func.py:457 #, python-brace-format msgid "Method {method} for {obj} not found" msgstr "" -#: ../calculate-core/pym/core/set_vars.py:42 -#: ../calculate-core/pym/core/set_vars.py:107 +#: ../calculate-core/pym/core/set_vars.py:40 +#: ../calculate-core/pym/core/set_vars.py:105 msgid "Mode" msgstr "" @@ -1097,11 +1097,11 @@ msgstr "" msgid "Modification of variables manually interrupted" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:320 +#: ../calculate-core/pym/core/wsdl_core.py:321 msgid "Modify Group" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:340 +#: ../calculate-core/pym/core/wsdl_core.py:341 msgid "Modify group" msgstr "" @@ -1109,28 +1109,28 @@ msgstr "" msgid "Modifying manually interrupted" msgstr "" -#: ../calculate-core/pym/core/server/baseClass.py:164 +#: ../calculate-core/pym/core/server/baseClass.py:186 msgid "Monitoring error" msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:130 +#: ../calculate-core/pym/core/variables/variable.py:128 msgid "Name" msgstr "" -#: ../calculate-core/pym/core/client/create_cert.py:81 +#: ../calculate-core/pym/core/client/create_cert.py:80 #, python-format msgid "Network address (hostname or IP) [%s]: " msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:203 -#: ../calculate-core/pym/core/wsdl_core.py:270 -#: ../calculate-core/pym/core/wsdl_core.py:447 -#: ../calculate-core/pym/core/server/func.py:125 -#: ../calculate-core/pym/core/server/func.py:1790 +#: ../calculate-core/pym/core/server/func.py:123 +#: ../calculate-core/pym/core/server/func.py:1829 +#: ../calculate-core/pym/core/wsdl_core.py:204 +#: ../calculate-core/pym/core/wsdl_core.py:271 +#: ../calculate-core/pym/core/wsdl_core.py:448 msgid "Next" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:49 +#: ../calculate-core/pym/core/client/sid_func.py:51 msgid "No access to the file!" msgstr "" @@ -1142,14 +1142,14 @@ msgstr "" msgid "No groups" 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:602 +#: ../calculate-core/pym/core/client/pid_information.py:123 +#: ../calculate-core/pym/core/client/pid_information.py:127 +#: ../calculate-core/pym/core/server/cert_cmd.py:606 msgid "No methods available" msgstr "" -#: ../calculate-core/pym/core/server/cl_server.py:31 -#: ../calculate-core/pym/core/core_main.py:54 +#: ../calculate-core/pym/core/server/cl_server.py:41 +#: ../calculate-core/pym/core/core_main.py:57 #, python-format msgid "No module named %s" msgstr "" @@ -1158,15 +1158,15 @@ msgstr "" msgid "No requests" msgstr "" -#: ../calculate-core/pym/core/server/cl_server.py:334 +#: ../calculate-core/pym/core/server/cl_server.py:353 msgid "No socket could be created" msgstr "" -#: ../calculate-core/pym/core/set_vars.py:112 +#: ../calculate-core/pym/core/set_vars.py:110 msgid "No such variables" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1002 +#: ../calculate-core/pym/core/server/cert_cmd.py:1006 msgid "Not deleted" msgstr "" @@ -1178,63 +1178,63 @@ msgstr "" msgid "Not signed" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:141 -#: ../calculate-core/pym/core/server/cert_cmd.py:166 +#: ../calculate-core/pym/core/server/cert_cmd.py:143 +#: ../calculate-core/pym/core/server/cert_cmd.py:168 msgid "OK" msgstr "" -#: ../calculate-core/pym/core/server/func.py:453 +#: ../calculate-core/pym/core/server/func.py:454 #, python-format msgid "Object %s not found" msgstr "" -#: ../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 +#: ../calculate-core/pym/core/client/create_cert.py:78 +#: ../calculate-core/pym/core/server/cert_cmd.py:112 +#: ../calculate-core/pym/core/server/create_cert.py:93 msgid "Organization name: " msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:105 -#: ../calculate-core/pym/core/server/create_cert.py:90 +#: ../calculate-core/pym/core/server/cert_cmd.py:107 +#: ../calculate-core/pym/core/server/create_cert.py:91 msgid "Organization unit: " msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:91 +#: ../calculate-core/pym/core/client/pid_information.py:93 msgid "PID" msgstr "" -#: ../calculate-core/pym/core/server/clean.py:66 +#: ../calculate-core/pym/core/server/clean.py:68 #, python-format msgid "PID %d watcher error" msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:95 -#: ../calculate-core/pym/core/client/pid_information.py:154 +#: ../calculate-core/pym/core/client/pid_information.py:97 +#: ../calculate-core/pym/core/client/pid_information.py:156 msgid "PID error" msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:34 +#: ../calculate-core/pym/core/client/pid_information.py:36 msgid "PID not found" msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:150 +#: ../calculate-core/pym/core/client/pid_information.py:152 msgid "PID to be killed: " msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:60 -#: ../calculate-core/pym/core/client/pid_information.py:78 +#: ../calculate-core/pym/core/client/pid_information.py:62 +#: ../calculate-core/pym/core/client/pid_information.py:80 msgid "PIDs not found for this session!" msgstr "" -#: ../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 +#: ../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:360 #, python-format msgid "Package %s" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:260 +#: ../calculate-core/pym/core/variables/setup_package.py:264 msgid "Package category" msgstr "" @@ -1246,13 +1246,13 @@ msgstr "" msgid "Package not found" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:156 -#: ../calculate-core/pym/core/variables/setup_package.py:184 +#: ../calculate-core/pym/core/variables/setup_package.py:160 +#: ../calculate-core/pym/core/variables/setup_package.py:188 msgid "Package slot" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:80 -#: ../calculate-core/pym/core/variables/setup_package.py:126 +#: ../calculate-core/pym/core/variables/setup_package.py:84 +#: ../calculate-core/pym/core/variables/setup_package.py:130 msgid "Package version" msgstr "" @@ -1272,25 +1272,25 @@ msgstr "" msgid "Page offset" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:560 +#: ../calculate-core/pym/core/server/methods_func.py:568 msgid "Password" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:681 +#: ../calculate-core/pym/core/server/methods_func.py:689 #, python-format msgid "Password for %s: " msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:101 +#: ../calculate-core/pym/core/server/methods_func.py:104 msgid "Password: " msgstr "" -#: ../calculate-core/pym/core/result_viewer.py:326 -#: ../calculate-core/pym/core/server/methods_func.py:113 +#: ../calculate-core/pym/core/server/methods_func.py:116 +#: ../calculate-core/pym/core/result_viewer.py:324 msgid "Passwords do not match" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:108 +#: ../calculate-core/pym/core/wsdl_core.py:109 msgid "Patch" msgstr "" @@ -1298,26 +1298,26 @@ msgstr "" msgid "Patching manually interrupted" msgstr "" -#: ../calculate-core/pym/core/setup_package.py:237 +#: ../calculate-core/pym/core/setup_package.py:233 #, python-format msgid "Path '%s' does not exist" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:304 +#: ../calculate-core/pym/core/variables/setup_package.py:308 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/cert_func.py:317 +#: ../calculate-core/pym/core/client/pid_information.py:39 msgid "Permission denied" msgstr "" -#: ../calculate-core/pym/core/server/groups.py:44 #: ../calculate-core/pym/core/server/certificate.py:47 +#: ../calculate-core/pym/core/server/groups.py:44 msgid "Permissions" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:538 +#: ../calculate-core/pym/core/server/cert_cmd.py:542 msgid "Permissions: " msgstr "" @@ -1325,108 +1325,108 @@ msgstr "" msgid "Please choose a package" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:291 +#: ../calculate-core/pym/core/variables/setup_package.py:295 msgid "Please choose the category" msgstr "" -#: ../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:176 #: ../calculate-core/pym/core/variables/setup_package.py:231 -#: ../calculate-core/pym/core/variables/setup_package.py:245 +#: ../calculate-core/pym/core/variables/setup_package.py:235 +#: ../calculate-core/pym/core/variables/setup_package.py:249 msgid "Please choose the slot" msgstr "" -#: ../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 +#: ../calculate-core/pym/core/variables/setup_package.py:105 +#: ../calculate-core/pym/core/variables/setup_package.py:116 +#: ../calculate-core/pym/core/variables/setup_package.py:147 msgid "Please choose the version" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:109 +#: ../calculate-core/pym/core/client/sid_func.py:111 msgid "Please enter a correct SID" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:312 +#: ../calculate-core/pym/core/client/cert_func.py:314 msgid "Please enter a valid certificate ID!" msgstr "" -#: ../calculate-core/pym/core/server/cl_server.py:335 +#: ../calculate-core/pym/core/server/cl_server.py:354 #, python-format msgid "Port %d already in use" msgstr "" -#: ../calculate-core/pym/core/server/api_types.py:325 +#: ../calculate-core/pym/core/server/api_types.py:321 msgid "Previous" msgstr "" -#: ../calculate-core/pym/core/server/bootstrap.py:61 +#: ../calculate-core/pym/core/server/bootstrap.py:63 #, python-format msgid "Private key %s not found" msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:41 +#: ../calculate-core/pym/core/client/pid_information.py:43 #, python-format msgid "Process ID: %s" msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:43 +#: ../calculate-core/pym/core/client/pid_information.py:45 msgid "Process active" msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:45 +#: ../calculate-core/pym/core/client/pid_information.py:47 msgid "Process completed" msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:47 +#: ../calculate-core/pym/core/client/pid_information.py:49 msgid "Process killed" msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:40 +#: ../calculate-core/pym/core/client/pid_information.py:42 #, python-format msgid "Process name: %s" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:245 +#: ../calculate-core/pym/core/client/client_class.py:247 msgid "Quit (q)? s/c/[q]: " msgstr "" -#: ../calculate-core/pym/core/server/bootstrap.py:128 +#: ../calculate-core/pym/core/server/bootstrap.py:130 msgid "Regenerating the client certificate" msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:278 +#: ../calculate-core/pym/core/variables/variable.py:272 msgid "Remote" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:682 +#: ../calculate-core/pym/core/server/methods_func.py:690 #, python-format msgid "Repeat password for %s: " msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:562 +#: ../calculate-core/pym/core/server/methods_func.py:570 msgid "Repeat password: " msgstr "" -#: ../calculate-core/pym/core/result_viewer.py:318 -#: ../calculate-core/pym/core/server/methods_func.py:103 +#: ../calculate-core/pym/core/server/methods_func.py:106 +#: ../calculate-core/pym/core/result_viewer.py:316 msgid "Repeat: " msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:915 -#: ../calculate-core/pym/core/server/cert_cmd.py:953 +#: ../calculate-core/pym/core/server/cert_cmd.py:919 +#: ../calculate-core/pym/core/server/cert_cmd.py:957 #, python-format msgid "Request \t%s" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:913 -#: ../calculate-core/pym/core/server/cert_cmd.py:951 +#: ../calculate-core/pym/core/server/cert_cmd.py:917 +#: ../calculate-core/pym/core/server/cert_cmd.py:955 #, python-format msgid "Request \t%s: not signed" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:167 -#: ../calculate-core/pym/core/server/bootstrap.py:318 +#: ../calculate-core/pym/core/client/cert_func.py:169 +#: ../calculate-core/pym/core/server/bootstrap.py:320 #, python-format msgid "Request %s not found" msgstr "" @@ -1436,36 +1436,36 @@ msgstr "" msgid "Request %s not found!" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:457 +#: ../calculate-core/pym/core/wsdl_core.py:458 msgid "Request Details" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:88 +#: ../calculate-core/pym/core/client/cert_func.py:90 #, python-format msgid "Request ID = %s" msgstr "" -#: ../calculate-core/pym/core/variables/request.py:199 +#: ../calculate-core/pym/core/variables/request.py:198 msgid "Request IP address" msgstr "" -#: ../calculate-core/pym/core/variables/request.py:215 +#: ../calculate-core/pym/core/variables/request.py:214 msgid "Request MAC address" msgstr "" -#: ../calculate-core/pym/core/variables/request.py:231 +#: ../calculate-core/pym/core/variables/request.py:230 msgid "Request date" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:998 +#: ../calculate-core/pym/core/server/cert_cmd.py:1002 msgid "Request duly signed" msgstr "" -#: ../calculate-core/pym/core/server/create_cert.py:162 +#: ../calculate-core/pym/core/server/create_cert.py:163 msgid "Request file {} not found" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:885 +#: ../calculate-core/pym/core/server/cert_cmd.py:889 msgid "Request for signature not found!" msgstr "" @@ -1473,17 +1473,17 @@ msgstr "" msgid "Request identifier" msgstr "" -#: ../calculate-core/pym/core/variables/request.py:271 +#: ../calculate-core/pym/core/variables/request.py:270 msgid "Request location" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:991 +#: ../calculate-core/pym/core/server/cert_cmd.py:995 #: ../calculate-core/pym/core/server/request.py:126 #, python-format msgid "Request or certificate with ID = %s not found!" msgstr "" -#: ../calculate-core/pym/core/variables/request.py:251 +#: ../calculate-core/pym/core/variables/request.py:250 msgid "Request owner username" msgstr "" @@ -1491,15 +1491,15 @@ msgstr "" msgid "Request signed" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:706 +#: ../calculate-core/pym/core/wsdl_core.py:707 msgid "Restart calculate-core" msgstr "" -#: ../calculate-core/pym/core/server/baseClass.py:168 +#: ../calculate-core/pym/core/server/baseClass.py:190 msgid "Restart watchdog failed" msgstr "" -#: ../calculate-core/pym/core/server/baseClass.py:167 +#: ../calculate-core/pym/core/server/baseClass.py:189 msgid "Restart watchdog started" msgstr "" @@ -1511,19 +1511,19 @@ msgstr "" msgid "Restoration from backup manually interrupted" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:767 +#: ../calculate-core/pym/core/wsdl_core.py:768 msgid "Restore" msgstr "" -#: ../calculate-core/pym/core/backup.py:695 +#: ../calculate-core/pym/core/backup.py:694 msgid "Restored groups:" msgstr "" -#: ../calculate-core/pym/core/backup.py:714 +#: ../calculate-core/pym/core/backup.py:713 msgid "Restored user passwords:" msgstr "" -#: ../calculate-core/pym/core/backup.py:678 +#: ../calculate-core/pym/core/backup.py:677 msgid "Restored users:" msgstr "" @@ -1543,25 +1543,25 @@ msgstr "" msgid "Restoring user accounts" msgstr "" -#: ../calculate-core/pym/core/client/cert_verify.py:88 +#: ../calculate-core/pym/core/client/cert_verify.py:90 msgid "Revoke date" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:754 +#: ../calculate-core/pym/core/server/cert_cmd.py:758 msgid "Root certificate or private key not found" msgstr "" -#: ../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:99 +#: ../calculate-core/pym/core/wsdl_core.py:140 +#: ../calculate-core/pym/core/wsdl_core.py:659 +#: ../calculate-core/pym/core/wsdl_core.py:697 +#: ../calculate-core/pym/core/wsdl_core.py:758 #: ../calculate-core/pym/core/wsdl_core.py:792 +#: ../calculate-core/pym/core/wsdl_core.py:793 msgid "Run" msgstr "" -#: ../calculate-core/pym/core/server/local_call.py:375 +#: ../calculate-core/pym/core/server/local_call.py:379 msgid "Run process?" msgstr "" @@ -1569,79 +1569,79 @@ msgstr "" msgid "Running stopped services" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:62 +#: ../calculate-core/pym/core/client/sid_func.py:64 msgid "SID deleted!" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:317 -#: ../calculate-core/pym/core/client/client_class.py:357 -#: ../calculate-core/pym/core/server/client_class.py:133 -#: ../calculate-core/pym/core/server/client_class.py:189 +#: ../calculate-core/pym/core/client/client_class.py:319 +#: ../calculate-core/pym/core/client/client_class.py:359 +#: ../calculate-core/pym/core/server/client_class.py:135 +#: ../calculate-core/pym/core/server/client_class.py:191 msgid "SSL library is not support TLSv1_2" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:586 +#: ../calculate-core/pym/core/wsdl_core.py:587 msgid "Save" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:89 +#: ../calculate-core/pym/core/client/cert_func.py:91 msgid "Send a new request? y/[n]: " msgstr "" -#: ../calculate-core/pym/core/client/cert_verify.py:87 +#: ../calculate-core/pym/core/client/cert_verify.py:89 msgid "Serial" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:208 -#: ../calculate-core/pym/core/client/client_class.py:233 -#: ../calculate-core/pym/core/server/cert_cmd.py:528 -#: ../calculate-core/pym/core/server/cert_cmd.py:817 -#: ../calculate-core/pym/core/server/client_class.py:86 +#: ../calculate-core/pym/core/client/client_class.py:210 +#: ../calculate-core/pym/core/client/client_class.py:235 +#: ../calculate-core/pym/core/server/cert_cmd.py:532 +#: ../calculate-core/pym/core/server/cert_cmd.py:821 +#: ../calculate-core/pym/core/server/client_class.py:88 msgid "Serial number = " msgstr "" -#: ../calculate-core/pym/core/server/cl_server.py:343 +#: ../calculate-core/pym/core/server/cl_server.py:362 msgid "Server certificate not found" msgstr "" -#: ../calculate-core/pym/core/server/bootstrap.py:111 +#: ../calculate-core/pym/core/server/bootstrap.py:113 msgid "Server certificate now exists." msgstr "" -#: ../calculate-core/pym/core/server/cl_server.py:313 +#: ../calculate-core/pym/core/server/cl_server.py:332 msgid "Server started" msgstr "" -#: ../calculate-core/pym/core/server/cl_server.py:329 +#: ../calculate-core/pym/core/server/cl_server.py:348 msgid "Server stopped" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:85 +#: ../calculate-core/pym/core/client/sid_func.py:87 msgid "Session active" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:87 +#: ../calculate-core/pym/core/client/sid_func.py:89 msgid "Session inactive" msgstr "" -#: ../calculate-core/pym/core/server/baseClass.py:166 +#: ../calculate-core/pym/core/server/baseClass.py:188 msgid "Session monitoring failed" msgstr "" -#: ../calculate-core/pym/core/server/baseClass.py:165 +#: ../calculate-core/pym/core/server/baseClass.py:187 msgid "Session monitoring started" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:73 +#: ../calculate-core/pym/core/client/sid_func.py:75 msgid "Session not registered on the server!" msgstr "" -#: ../calculate-core/pym/core/client/sid_func.py:83 +#: ../calculate-core/pym/core/client/sid_func.py:85 #, python-format msgid "Session number: %s" msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:142 +#: ../calculate-core/pym/core/client/pid_information.py:144 msgid "Sessions running:" msgstr "" @@ -1649,46 +1649,46 @@ msgstr "" msgid "Set the certificate group" msgstr "" -#: ../calculate-core/pym/core/backup.py:131 +#: ../calculate-core/pym/core/backup.py:132 #, python-format msgid "Settings ignored for following packages: %s" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:563 +#: ../calculate-core/pym/core/wsdl_core.py:564 msgid "Setup Variables" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:584 -#: ../calculate-core/pym/core/wsdl_core.py:616 +#: ../calculate-core/pym/core/wsdl_core.py:585 +#: ../calculate-core/pym/core/wsdl_core.py:617 msgid "Setup variables" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:620 +#: ../calculate-core/pym/core/wsdl_core.py:621 msgid "Show" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:179 +#: ../calculate-core/pym/core/wsdl_core.py:180 msgid "Show Certificates" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:246 +#: ../calculate-core/pym/core/wsdl_core.py:247 msgid "Show Groups" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:423 +#: ../calculate-core/pym/core/wsdl_core.py:424 msgid "Show Requests" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:445 +#: ../calculate-core/pym/core/wsdl_core.py:446 msgid "Show requests" msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:293 +#: ../calculate-core/pym/core/variables/variable.py:287 msgid "Show the value" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:695 -#: ../calculate-core/pym/core/server/cert_cmd.py:767 +#: ../calculate-core/pym/core/server/cert_cmd.py:699 +#: ../calculate-core/pym/core/server/cert_cmd.py:771 #: ../calculate-core/pym/core/server/request.py:87 #, python-format msgid "Signature request %s not found" @@ -1702,51 +1702,51 @@ msgstr "" msgid "Signing manually interrupted" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1133 +#: ../calculate-core/pym/core/server/cert_cmd.py:1137 msgid "Specify the location of the PID file" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:214 -#: ../calculate-core/pym/core/client/client_class.py:239 -#: ../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 -#: ../calculate-core/pym/core/server/client_class.py:92 +#: ../calculate-core/pym/core/client/client_class.py:216 +#: ../calculate-core/pym/core/client/client_class.py:241 +#: ../calculate-core/pym/core/server/cert_cmd.py:538 +#: ../calculate-core/pym/core/server/cert_cmd.py:827 +#: ../calculate-core/pym/core/server/cert_cmd.py:867 +#: ../calculate-core/pym/core/server/client_class.py:94 msgid "Subject" msgstr "" -#: ../calculate-core/pym/core/server/func.py:1532 +#: ../calculate-core/pym/core/server/func.py:1561 #, python-format msgid "Symlink %s created" msgstr "" -#: ../calculate-core/pym/core/server/func.py:1540 +#: ../calculate-core/pym/core/server/func.py:1569 #, python-format msgid "Symlink %s deleted" msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:276 +#: ../calculate-core/pym/core/variables/variable.py:270 msgid "System" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:755 +#: ../calculate-core/pym/core/wsdl_core.py:756 msgid "System backup" msgstr "" -#: ../calculate-core/pym/core/setup_package.py:286 -#: ../calculate-core/pym/core/setup_package.py:407 +#: ../calculate-core/pym/core/setup_package.py:282 +#: ../calculate-core/pym/core/setup_package.py:403 #, python-brace-format msgid "System configuring for {nameProgram} package by Calculate Utilities" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:788 -#: ../calculate-core/pym/core/wsdl_core.py:793 +#: ../calculate-core/pym/core/wsdl_core.py:789 +#: ../calculate-core/pym/core/wsdl_core.py:794 msgid "System restore" msgstr "" -#: ../calculate-core/pym/core/server/func.py:778 +#: ../calculate-core/pym/core/server/func.py:777 #: ../calculate-core/pym/core/server/func.py:840 -#: ../calculate-core/pym/core/core_main.py:60 +#: ../calculate-core/pym/core/core_main.py:64 msgid "Task interrupted" msgstr "" @@ -1754,20 +1754,20 @@ msgstr "" msgid "Templates preparing for backup" msgstr "" -#: ../calculate-core/pym/core/client/cert_verify.py:61 -#: ../calculate-core/pym/core/client/cert_verify.py:67 +#: ../calculate-core/pym/core/client/cert_verify.py:63 +#: ../calculate-core/pym/core/client/cert_verify.py:69 msgid "The CN and L fields in the CA certificate are incorrect!" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:982 +#: ../calculate-core/pym/core/server/cert_cmd.py:986 msgid "The ID must be int." msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1060 +#: ../calculate-core/pym/core/server/cert_cmd.py:1064 msgid "The ID of a certificate to be revoked must be integer!" msgstr "" -#: ../calculate-core/pym/core/result_viewer.py:292 +#: ../calculate-core/pym/core/result_viewer.py:291 msgid "The answer is uncertain" msgstr "" @@ -1775,17 +1775,17 @@ msgstr "" msgid "The certificate ID must be int" msgstr "" -#: ../calculate-core/pym/core/server/bootstrap.py:72 +#: ../calculate-core/pym/core/server/bootstrap.py:74 msgid "The certificate does not match the private key" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:54 +#: ../calculate-core/pym/core/client/cert_func.py:56 #, python-format msgid "The certificate expires after %d days" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:690 -#: ../calculate-core/pym/core/server/cert_cmd.py:762 +#: ../calculate-core/pym/core/server/cert_cmd.py:694 +#: ../calculate-core/pym/core/server/cert_cmd.py:766 msgid "The certificate number must be int" msgstr "" @@ -1794,7 +1794,7 @@ msgstr "" msgid "The certificate with ID %s not exists" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:294 +#: ../calculate-core/pym/core/client/cert_func.py:296 #, python-format msgid "The certificate with ID = %d can execute:" msgstr "" @@ -1811,8 +1811,8 @@ msgstr "" msgid "The limit number must be int" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:97 -#: ../calculate-core/pym/core/client/cert_func.py:150 +#: ../calculate-core/pym/core/client/cert_func.py:99 +#: ../calculate-core/pym/core/client/cert_func.py:152 msgid "The port number must be int" msgstr "" @@ -1824,27 +1824,27 @@ msgstr "" 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:247 -#: ../calculate-core/pym/core/server/bootstrap.py:346 +#: ../calculate-core/pym/core/client/cert_func.py:191 +#: ../calculate-core/pym/core/server/bootstrap.py:348 +#: ../calculate-core/pym/core/server/cert_cmd.py:251 msgid "The request was sent from another IP." msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:186 -#: ../calculate-core/pym/core/server/cert_cmd.py:244 -#: ../calculate-core/pym/core/server/bootstrap.py:343 +#: ../calculate-core/pym/core/client/cert_func.py:188 +#: ../calculate-core/pym/core/server/bootstrap.py:345 +#: ../calculate-core/pym/core/server/cert_cmd.py:248 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:240 -#: ../calculate-core/pym/core/server/bootstrap.py:339 +#: ../calculate-core/pym/core/client/cert_func.py:184 +#: ../calculate-core/pym/core/server/bootstrap.py:341 +#: ../calculate-core/pym/core/server/cert_cmd.py:244 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:237 -#: ../calculate-core/pym/core/server/bootstrap.py:336 +#: ../calculate-core/pym/core/client/cert_func.py:181 +#: ../calculate-core/pym/core/server/bootstrap.py:338 +#: ../calculate-core/pym/core/server/cert_cmd.py:241 msgid "The signature request was rejected!" msgstr "" @@ -1853,47 +1853,47 @@ msgstr "" msgid "The system is being configured" msgstr "" -#: ../calculate-core/pym/core/client/cert_verify.py:72 +#: ../calculate-core/pym/core/client/cert_verify.py:74 msgid "This certificate cannot be verified in the CRL." msgstr "" -#: ../calculate-core/pym/core/client/cert_verify.py:86 +#: ../calculate-core/pym/core/client/cert_verify.py:88 msgid "This certificate has been revoked!" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:127 -#: ../calculate-core/pym/core/server/cert_cmd.py:201 +#: ../calculate-core/pym/core/client/cert_func.py:129 +#: ../calculate-core/pym/core/server/cert_cmd.py:204 msgid "This server is not enabled to sign certificates!" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:646 +#: ../calculate-core/pym/core/server/cert_cmd.py:650 #, python-format msgid "Total: %d certificates." msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:244 +#: ../calculate-core/pym/core/client/client_class.py:246 msgid "Try to add the CA and root certificates to trusted (c) or" msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:158 +#: ../calculate-core/pym/core/variables/variable.py:156 msgid "Type" msgstr "" -#: ../calculate-core/pym/core/server/func.py:1561 -#: ../calculate-core/pym/core/backup.py:617 +#: ../calculate-core/pym/core/server/func.py:1590 +#: ../calculate-core/pym/core/backup.py:616 #, python-format msgid "Unable to import %s" msgstr "" -#: ../calculate-core/pym/core/variables/backup.py:116 +#: ../calculate-core/pym/core/variables/backup.py:117 msgid "Unknown" msgstr "" -#: ../calculate-core/pym/core/server/local_call.py:325 +#: ../calculate-core/pym/core/server/local_call.py:329 msgid "Unknown argument" msgstr "" -#: ../calculate-core/pym/core/server/local_call.py:322 +#: ../calculate-core/pym/core/server/local_call.py:326 msgid "Unknown parameter" msgstr "" @@ -1905,16 +1905,16 @@ msgstr "" msgid "Unpacking configuration files" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:229 -#: ../calculate-core/pym/core/server/client_class.py:80 +#: ../calculate-core/pym/core/client/client_class.py:231 +#: ../calculate-core/pym/core/server/client_class.py:82 msgid "Untrusted server certificate!" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:147 +#: ../calculate-core/pym/core/wsdl_core.py:148 msgid "Update " msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:149 +#: ../calculate-core/pym/core/wsdl_core.py:150 msgid "Update Settings" msgstr "" @@ -1922,43 +1922,43 @@ msgstr "" msgid "Updating configuration files" msgstr "" -#: ../calculate-core/pym/core/setup_package.py:235 -#: ../calculate-core/pym/core/setup_package.py:365 +#: ../calculate-core/pym/core/setup_package.py:231 +#: ../calculate-core/pym/core/setup_package.py:361 msgid "Updating system cofiguration files" msgstr "" -#: ../calculate-core/pym/core/setup_package.py:175 +#: ../calculate-core/pym/core/setup_package.py:171 msgid "Updating user configuration files" msgstr "" -#: ../calculate-core/pym/core/server/func.py:124 +#: ../calculate-core/pym/core/server/func.py:122 msgid "Use new" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:773 +#: ../calculate-core/pym/core/server/methods_func.py:779 msgid "Use the parameter" msgstr "" -#: ../calculate-core/pym/core/server/cl_server.py:160 -#: ../calculate-core/pym/core/variables/setup_package.py:380 +#: ../calculate-core/pym/core/server/cl_server.py:171 +#: ../calculate-core/pym/core/variables/setup_package.py:384 #, python-format msgid "User %s does not exist" msgstr "" -#: ../calculate-core/pym/core/setup_package.py:206 +#: ../calculate-core/pym/core/setup_package.py:202 #, python-brace-format msgid "User configuring the {nameProgram} package by Calculate Utilities" msgstr "" -#: ../calculate-core/pym/core/server/cl_server.py:29 +#: ../calculate-core/pym/core/server/cl_server.py:39 msgid "User must be root" msgstr "" -#: ../calculate-core/pym/core/server/bootstrap.py:137 +#: ../calculate-core/pym/core/server/bootstrap.py:139 msgid "User profile is encrypted. Please perform user login for complete of certificate generation" msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:274 +#: ../calculate-core/pym/core/variables/variable.py:268 msgid "User set" msgstr "" @@ -1966,120 +1966,120 @@ msgstr "" msgid "UserName" msgstr "" -#: ../calculate-core/pym/core/client/create_cert.py:76 +#: ../calculate-core/pym/core/client/create_cert.py:75 #, python-format msgid "Username [%s]: " msgstr "" -#: ../calculate-core/pym/core/setup_package.py:311 +#: ../calculate-core/pym/core/setup_package.py:307 #, python-brace-format msgid "Using patches for the {nameProgram} package by Calculate Utilities" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:150 +#: ../calculate-core/pym/core/server/cert_cmd.py:152 msgid "Using the root certificate as the server certificate" msgstr "" -#: ../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 +#: ../calculate-core/pym/core/wsdl_core.py:178 +#: ../calculate-core/pym/core/wsdl_core.py:245 +#: ../calculate-core/pym/core/wsdl_core.py:422 +#: ../calculate-core/pym/core/wsdl_core.py:562 +#: ../calculate-core/pym/core/wsdl_core.py:595 +#: ../calculate-core/pym/core/wsdl_core.py:667 +#: ../calculate-core/pym/core/wsdl_core.py:705 msgid "Utilities" msgstr "" -#: ../calculate-core/pym/core/set_vars.py:42 -#: ../calculate-core/pym/core/set_vars.py:108 -#: ../calculate-core/pym/core/variables/variable.py:194 +#: ../calculate-core/pym/core/variables/variable.py:191 +#: ../calculate-core/pym/core/set_vars.py:40 +#: ../calculate-core/pym/core/set_vars.py:106 msgid "Value" msgstr "" -#: ../calculate-core/pym/core/set_vars.py:42 -#: ../calculate-core/pym/core/set_vars.py:107 +#: ../calculate-core/pym/core/set_vars.py:40 +#: ../calculate-core/pym/core/set_vars.py:105 msgid "Variable" msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:98 -#: ../calculate-core/pym/core/variables/variable.py:300 +#: ../calculate-core/pym/core/variables/variable.py:99 +#: ../calculate-core/pym/core/variables/variable.py:294 #, python-format msgid "Variable %s not found" msgstr "" -#: ../calculate-core/pym/core/server/clean.py:96 +#: ../calculate-core/pym/core/server/clean.py:99 msgid "Variable cl_core_monitor_period or cl_core_sid_live not found" msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:86 +#: ../calculate-core/pym/core/variables/variable.py:87 msgid "Variables" msgstr "" -#: ../calculate-core/pym/core/variables/backup.py:167 +#: ../calculate-core/pym/core/variables/backup.py:168 msgid "Verbose output" msgstr "" -#: ../calculate-core/pym/core/wsdl_core.py:596 +#: ../calculate-core/pym/core/wsdl_core.py:597 msgid "View Variables" msgstr "" -#: ../calculate-core/pym/core/utils/cl_core_view_cert.py:35 +#: ../calculate-core/pym/core/utils/cl_core_group.py:35 #: ../calculate-core/pym/core/utils/cl_core_request.py:35 #: ../calculate-core/pym/core/utils/cl_core_variables.py:54 -#: ../calculate-core/pym/core/utils/cl_core_group.py:35 +#: ../calculate-core/pym/core/utils/cl_core_view_cert.py:35 msgid "Viewing manually interrupted" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:333 +#: ../calculate-core/pym/core/client/client_class.py:335 #, python-format msgid "WARNING! %s trying to replace the certificate!" msgstr "" -#: ../calculate-core/pym/core/server/client_class.py:157 +#: ../calculate-core/pym/core/server/client_class.py:159 #, python-format msgid "WARNING!!! %s trying to replace the certificate!" msgstr "" -#: ../calculate-core/pym/core/setup_package.py:343 +#: ../calculate-core/pym/core/setup_package.py:339 msgid "Would you like to terminate these tasks?" msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:275 +#: ../calculate-core/pym/core/variables/variable.py:269 msgid "Writable" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:624 -#: ../calculate-core/pym/core/server/methods_func.py:646 +#: ../calculate-core/pym/core/server/methods_func.py:633 +#: ../calculate-core/pym/core/server/methods_func.py:654 #, python-format msgid "Wrong %s value syntax" msgstr "" -#: ../calculate-core/pym/core/server/func.py:1720 +#: ../calculate-core/pym/core/server/func.py:1751 msgid "Wrong expert varaiables list" msgstr "" -#: ../calculate-core/pym/core/server/func.py:450 +#: ../calculate-core/pym/core/server/func.py:451 #, python-format msgid "Wrong method for task %s" msgstr "" -#: ../calculate-core/pym/core/server/func.py:1718 +#: ../calculate-core/pym/core/server/func.py:1749 msgid "Wrong normal varaiables list" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:424 +#: ../calculate-core/pym/core/server/methods_func.py:427 msgid "Wrong option " msgstr "" -#: ../calculate-core/pym/core/setup_package.py:172 +#: ../calculate-core/pym/core/setup_package.py:168 msgid "X session users not found" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:87 +#: ../calculate-core/pym/core/client/cert_func.py:89 msgid "You already sent a certificate signature request." msgstr "" -#: ../calculate-core/pym/core/client/pid_information.py:129 +#: ../calculate-core/pym/core/client/pid_information.py:131 msgid "You can execute:" msgstr "" @@ -2088,194 +2088,194 @@ msgstr "" msgid "You cannot change the certificate permissions" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:270 +#: ../calculate-core/pym/core/client/cert_func.py:272 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:344 +#: ../calculate-core/pym/core/variables/setup_package.py:348 msgid "You must not choose only clt location for desktop templates" msgstr "" -#: ../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:205 -#: ../calculate-core/pym/core/server/cert_cmd.py:241 -#: ../calculate-core/pym/core/server/bootstrap.py:340 +#: ../calculate-core/pym/core/client/cert_func.py:134 +#: ../calculate-core/pym/core/client/cert_func.py:185 +#: ../calculate-core/pym/core/server/bootstrap.py:342 +#: ../calculate-core/pym/core/server/cert_cmd.py:208 +#: ../calculate-core/pym/core/server/cert_cmd.py:245 #, python-format msgid "Your request ID = %s" msgstr "" -#: ../calculate-core/pym/core/server/func.py:123 +#: ../calculate-core/pym/core/server/func.py:121 msgid "Zap new" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1177 +#: ../calculate-core/pym/core/server/cert_cmd.py:1181 msgid "add permissions for a certificate (or certificates, comma-separated) (use with option -c [ID])" msgstr "" -#: ../calculate-core/pym/core/server/client_class.py:97 +#: ../calculate-core/pym/core/server/client_class.py:99 msgid "add this certificate to trusted and continue? y/[n]: " msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:585 +#: ../calculate-core/pym/core/server/cert_cmd.py:589 msgid "all methods" msgstr "" -#: ../calculate-core/pym/core/server/local_call.py:544 -#: ../calculate-core/pym/core/server/local_call.py:592 +#: ../calculate-core/pym/core/server/local_call.py:552 +#: ../calculate-core/pym/core/server/local_call.py:600 msgid "auto" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1151 +#: ../calculate-core/pym/core/server/cert_cmd.py:1155 msgid "bootstrap action" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1214 +#: ../calculate-core/pym/core/server/cert_cmd.py:1218 msgid "call method" msgstr "" -#: ../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 +#: ../calculate-core/pym/core/server/cert_cmd.py:273 +#: ../calculate-core/pym/core/server/cert_cmd.py:281 +#: ../calculate-core/pym/core/server/cert_cmd.py:287 +#: ../calculate-core/pym/core/server/cert_cmd.py:319 +#: ../calculate-core/pym/core/server/func.py:1538 #, python-format msgid "cannot create directory %s" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:924 -#: ../calculate-core/pym/core/server/cert_cmd.py:962 +#: ../calculate-core/pym/core/server/cert_cmd.py:928 +#: ../calculate-core/pym/core/server/cert_cmd.py:966 msgid "certificate (request) number not int and not 'all'" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1035 +#: ../calculate-core/pym/core/server/cert_cmd.py:1039 msgid "certificate deleted" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:658 +#: ../calculate-core/pym/core/server/cert_cmd.py:662 msgid "certificate number not int and not 'all'" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1237 +#: ../calculate-core/pym/core/server/cert_cmd.py:1241 msgid "configuration check" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:364 +#: ../calculate-core/pym/core/variables/setup_package.py:368 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:172 -#: ../calculate-core/pym/core/server/cert_cmd.py:217 +#: ../calculate-core/pym/core/client/cert_func.py:102 +#: ../calculate-core/pym/core/client/cert_func.py:155 +#: ../calculate-core/pym/core/server/cert_cmd.py:174 +#: ../calculate-core/pym/core/server/cert_cmd.py:220 msgid "connecting..." msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1154 +#: ../calculate-core/pym/core/server/cert_cmd.py:1158 msgid "create certificate for local user" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:842 -#: ../calculate-core/pym/core/server/cert_cmd.py:882 +#: ../calculate-core/pym/core/server/cert_cmd.py:846 +#: ../calculate-core/pym/core/server/cert_cmd.py:886 msgid "date" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1169 +#: ../calculate-core/pym/core/server/cert_cmd.py:1173 msgid "debug" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1208 +#: ../calculate-core/pym/core/server/cert_cmd.py:1212 msgid "decline client's request for signature" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1217 +#: ../calculate-core/pym/core/server/cert_cmd.py:1221 msgid "display all available methods" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1223 +#: ../calculate-core/pym/core/server/cert_cmd.py:1227 msgid "display the GUI progress bar" msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:264 +#: ../calculate-core/pym/core/variables/variable.py:258 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 "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1226 +#: ../calculate-core/pym/core/server/cert_cmd.py:1230 msgid "display warnings at the end" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1220 +#: ../calculate-core/pym/core/server/cert_cmd.py:1224 msgid "do not display the progress bar" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1166 +#: ../calculate-core/pym/core/server/cert_cmd.py:1170 msgid "dump (use with option -c [ID])" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:139 +#: ../calculate-core/pym/core/server/cert_cmd.py:141 #, python-format msgid "error writing to (reading from) files in directory %s" msgstr "" -#: ../calculate-core/pym/core/server/cl_server.py:303 +#: ../calculate-core/pym/core/server/cl_server.py:322 #, python-format msgid "failed to create PID file %s" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:387 +#: ../calculate-core/pym/core/server/cert_cmd.py:391 msgid "failed to delete the certificate!" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1037 +#: ../calculate-core/pym/core/server/cert_cmd.py:1041 msgid "failed to delete the file!" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1191 +#: ../calculate-core/pym/core/server/cert_cmd.py:1195 msgid "fetch the signed certificate from the server" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:506 -#: ../calculate-core/pym/core/server/cert_cmd.py:514 +#: ../calculate-core/pym/core/server/cert_cmd.py:510 +#: ../calculate-core/pym/core/server/cert_cmd.py:518 #, python-format msgid "file %s not found!" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:258 -#: ../calculate-core/pym/core/client/client_class.py:183 +#: ../calculate-core/pym/core/client/cert_func.py:260 +#: ../calculate-core/pym/core/client/client_class.py:185 msgid "file containing the CA certificate now exists" msgstr "" -#: ../calculate-core/pym/core/client/client_class.py:180 +#: ../calculate-core/pym/core/client/client_class.py:182 msgid "filename = " msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1185 +#: ../calculate-core/pym/core/server/cert_cmd.py:1189 msgid "generate a root (or CA) certificate" msgstr "" -#: ../calculate-core/pym/core/server/cl_server.py:269 +#: ../calculate-core/pym/core/server/cl_server.py:285 #, python-format msgid "listening to https://0.0.0.0:%d" msgstr "" -#: ../calculate-core/pym/core/server/local_call.py:389 +#: ../calculate-core/pym/core/server/local_call.py:393 msgid "method unavailable" msgstr "" -#: ../calculate-core/pym/core/server/local_call.py:544 -#: ../calculate-core/pym/core/server/local_call.py:592 +#: ../calculate-core/pym/core/server/local_call.py:552 +#: ../calculate-core/pym/core/server/local_call.py:600 msgid "no" msgstr "" -#: ../calculate-core/pym/core/server/bootstrap.py:186 +#: ../calculate-core/pym/core/server/bootstrap.py:188 msgid "no path to the client certificate" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1140 +#: ../calculate-core/pym/core/server/cert_cmd.py:1144 msgid "operations with certificates (number or \"all\"). Server not running." msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:261 +#: ../calculate-core/pym/core/variables/setup_package.py:265 msgid "package category name" msgstr "" @@ -2283,65 +2283,65 @@ msgstr "" msgid "package name" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:157 -#: ../calculate-core/pym/core/variables/setup_package.py:185 +#: ../calculate-core/pym/core/variables/setup_package.py:161 +#: ../calculate-core/pym/core/variables/setup_package.py:189 msgid "package slot" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:81 -#: ../calculate-core/pym/core/variables/setup_package.py:127 +#: ../calculate-core/pym/core/variables/setup_package.py:85 +#: ../calculate-core/pym/core/variables/setup_package.py:131 msgid "package version number with the revision" msgstr "" +#: ../calculate-core/pym/core/server/certificate.py:64 #: ../calculate-core/pym/core/server/groups.py:59 #: ../calculate-core/pym/core/server/request.py:74 -#: ../calculate-core/pym/core/server/certificate.py:64 #, python-format msgid "page %d from " msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1243 +#: ../calculate-core/pym/core/server/cert_cmd.py:1247 msgid "path to log files" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1130 +#: ../calculate-core/pym/core/server/cert_cmd.py:1134 msgid "port number" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1246 +#: ../calculate-core/pym/core/server/cert_cmd.py:1250 msgid "print the version number, then exit" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1204 +#: ../calculate-core/pym/core/server/cert_cmd.py:1208 msgid "refuse to sign the certificate at the server's request" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1158 +#: ../calculate-core/pym/core/server/cert_cmd.py:1162 msgid "remove all local user certificates" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1181 +#: ../calculate-core/pym/core/server/cert_cmd.py:1185 msgid "remove permissions for a certificate (use with option -c [ID])" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1174 +#: ../calculate-core/pym/core/server/cert_cmd.py:1178 msgid "remove the selected certificate (use with option -c [ID])" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:995 +#: ../calculate-core/pym/core/server/cert_cmd.py:999 #, python-format msgid "request %s not found!" msgstr "" -#: ../calculate-core/pym/core/variables/request.py:198 +#: ../calculate-core/pym/core/variables/request.py:197 msgid "request IP address" msgstr "" -#: ../calculate-core/pym/core/variables/request.py:214 +#: ../calculate-core/pym/core/variables/request.py:213 msgid "request MAC adress" msgstr "" -#: ../calculate-core/pym/core/variables/request.py:230 +#: ../calculate-core/pym/core/variables/request.py:229 msgid "request date" msgstr "" @@ -2349,56 +2349,56 @@ msgstr "" msgid "request identifier" msgstr "" -#: ../calculate-core/pym/core/variables/request.py:270 +#: ../calculate-core/pym/core/variables/request.py:269 msgid "request location" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:138 -#: ../calculate-core/pym/core/server/cert_cmd.py:211 -#: ../calculate-core/pym/core/server/bootstrap.py:305 +#: ../calculate-core/pym/core/client/cert_func.py:140 +#: ../calculate-core/pym/core/server/bootstrap.py:307 +#: ../calculate-core/pym/core/server/cert_cmd.py:214 #, python-format msgid "request not sent or file %s deleted" msgstr "" -#: ../calculate-core/pym/core/variables/request.py:250 +#: ../calculate-core/pym/core/variables/request.py:249 msgid "request owner username" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:839 -#: ../calculate-core/pym/core/server/cert_cmd.py:879 +#: ../calculate-core/pym/core/server/cert_cmd.py:843 +#: ../calculate-core/pym/core/server/cert_cmd.py:883 msgid "request sent from:" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1211 +#: ../calculate-core/pym/core/server/cert_cmd.py:1215 msgid "revoke an earlier signed server (or CA) certificate. Run rm to remove the CRL" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:146 +#: ../calculate-core/pym/core/server/cert_cmd.py:148 msgid "root certificate not found (use cl-core with option --gen-root-cert)" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:305 +#: ../calculate-core/pym/core/variables/setup_package.py:309 msgid "root path for saving the updated configuration files" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:755 +#: ../calculate-core/pym/core/server/cert_cmd.py:759 #, python-format msgid "see %s" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1188 +#: ../calculate-core/pym/core/server/cert_cmd.py:1192 msgid "send a signature request for the root certificate" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1127 +#: ../calculate-core/pym/core/server/cert_cmd.py:1131 msgid "server started" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:397 +#: ../calculate-core/pym/core/variables/setup_package.py:401 msgid "set machine architecture" msgstr "" -#: ../calculate-core/pym/core/variables/request.py:294 +#: ../calculate-core/pym/core/variables/request.py:293 msgid "set the certificate group" msgstr "" @@ -2414,99 +2414,99 @@ msgstr "" msgid "set the page offset value" msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:294 +#: ../calculate-core/pym/core/variables/variable.py:288 msgid "show the variable value" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1123 +#: ../calculate-core/pym/core/server/cert_cmd.py:1127 msgid "show this help message and exit" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1198 +#: ../calculate-core/pym/core/server/cert_cmd.py:1202 msgid "sign the client's request with the server certificate" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1201 +#: ../calculate-core/pym/core/server/cert_cmd.py:1205 msgid "sign the server's request with the root certificate" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1032 +#: ../calculate-core/pym/core/server/cert_cmd.py:1036 msgid "signature request deleted" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1229 -#: ../calculate-core/pym/core/server/methods_func.py:289 +#: ../calculate-core/pym/core/server/cert_cmd.py:1233 +#: ../calculate-core/pym/core/server/methods_func.py:292 msgid "silent during the process" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1137 +#: ../calculate-core/pym/core/server/cert_cmd.py:1141 msgid "stop the server if there are no active sessions" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:144 +#: ../calculate-core/pym/core/client/cert_func.py:146 msgid "the URL looks like" msgstr "" -#: ../calculate-core/pym/core/client/cert_func.py:115 -#: ../calculate-core/pym/core/server/cert_cmd.py:187 +#: ../calculate-core/pym/core/client/cert_func.py:117 +#: ../calculate-core/pym/core/server/cert_cmd.py:190 msgid "the private key and request now exist" msgstr "" -#: ../calculate-core/pym/core/server/methods_func.py:75 +#: ../calculate-core/pym/core/server/methods_func.py:78 #, python-brace-format msgid "the value may be {0}" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:487 +#: ../calculate-core/pym/core/server/cert_cmd.py:491 msgid "to change permissions, the certificate number must be integer" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:349 +#: ../calculate-core/pym/core/variables/setup_package.py:353 msgid "updating desktop (user) configuration files" msgstr "" -#: ../calculate-core/pym/core/variables/setup_package.py:324 +#: ../calculate-core/pym/core/variables/setup_package.py:328 msgid "updating system configuration files" msgstr "" -#: ../calculate-core/pym/core/server/cl_server.py:344 +#: ../calculate-core/pym/core/server/cl_server.py:363 msgid "use cl-core with option --gen-cert-by HOST (--get-cert-from HOST) or --use-root-as-server)" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1233 +#: ../calculate-core/pym/core/server/cert_cmd.py:1237 msgid "use passwords from standard input for users accounts" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1194 +#: ../calculate-core/pym/core/server/cert_cmd.py:1198 msgid "use the root certificate as the server certificate" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1162 +#: ../calculate-core/pym/core/server/cert_cmd.py:1166 msgid "use with option --bootstrap to remove all certificates, requests and config files on the server" msgstr "" -#: ../calculate-core/pym/core/variables/backup.py:166 +#: ../calculate-core/pym/core/variables/backup.py:167 msgid "verbose output" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1144 +#: ../calculate-core/pym/core/server/cert_cmd.py:1148 msgid "view client requests (number or \"all\")" msgstr "" -#: ../calculate-core/pym/core/server/cert_cmd.py:1147 +#: ../calculate-core/pym/core/server/cert_cmd.py:1151 msgid "view servers certificates (number or \"all\"). Server not running." msgstr "" -#: ../calculate-core/pym/core/variables/variable.py:87 +#: ../calculate-core/pym/core/variables/variable.py:88 msgid "write to the variable. VAR is the variable name. VALUE is the new variable value. LOCATION is where the env file is located (system,local,remote). Variable will be removed from all env files if only VAR is specified." msgstr "" -#: ../calculate-core/pym/core/server/cl_server.py:270 +#: ../calculate-core/pym/core/server/cl_server.py:286 #, python-format msgid "wsdl is located at: https://0.0.0.0:%d/?wsdl" msgstr "" -#: ../calculate-core/pym/core/server/local_call.py:544 -#: ../calculate-core/pym/core/server/local_call.py:592 +#: ../calculate-core/pym/core/server/local_call.py:552 +#: ../calculate-core/pym/core/server/local_call.py:600 msgid "yes" msgstr "" diff --git a/pot/cl_desktop3.pot b/pot/cl_desktop3.pot index 8d6e9ef..ec52bc5 100644 --- a/pot/cl_desktop3.pot +++ b/pot/cl_desktop3.pot @@ -57,7 +57,7 @@ msgstr "" msgid "Failed to unmount directory %s" msgstr "" -#: ../calculate-desktop/pym/desktop/variables/desktop.py:434 +#: ../calculate-desktop/pym/desktop/variables/desktop.py:440 msgid "Force configuration" msgstr "" @@ -69,7 +69,7 @@ msgstr "" msgid "Mounting encrypted data" msgstr "" -#: ../calculate-desktop/pym/desktop/variables/desktop.py:343 +#: ../calculate-desktop/pym/desktop/variables/desktop.py:348 msgid "No X session user found" msgstr "" @@ -78,7 +78,7 @@ msgstr "" msgid "Path %s exists" msgstr "" -#: ../calculate-desktop/pym/desktop/variables/desktop.py:345 +#: ../calculate-desktop/pym/desktop/variables/desktop.py:350 msgid "Please specify the user name" msgstr "" @@ -94,19 +94,23 @@ msgstr "" msgid "The home directory contains mount points" msgstr "" -#: ../calculate-desktop/pym/desktop/desktop.py:285 +#: ../calculate-desktop/pym/desktop/desktop.py:318 msgid "Unable to detect the X session" msgstr "" +#: ../calculate-desktop/pym/desktop/desktop.py:290 +msgid "Unable to detect user session id" +msgstr "" + #: ../calculate-desktop/pym/desktop/utils/cl_desktop.py:39 msgid "Unable to log out" msgstr "" -#: ../calculate-desktop/pym/desktop/desktop.py:288 +#: ../calculate-desktop/pym/desktop/desktop.py:321 msgid "Unable to send the logout command" msgstr "" -#: ../calculate-desktop/pym/desktop/desktop.py:319 +#: ../calculate-desktop/pym/desktop/desktop.py:349 msgid "Unable to wait for completion of the user logout" msgstr "" @@ -114,7 +118,7 @@ msgstr "" msgid "Unmouning user resources" msgstr "" -#: ../calculate-desktop/pym/desktop/variables/desktop.py:349 +#: ../calculate-desktop/pym/desktop/variables/desktop.py:354 #, python-format msgid "User %s does not exist" msgstr "" @@ -152,6 +156,6 @@ msgstr "" msgid "Waiting for the logout" msgstr "" -#: ../calculate-desktop/pym/desktop/variables/desktop.py:435 +#: ../calculate-desktop/pym/desktop/variables/desktop.py:441 msgid "force configuration" msgstr "" diff --git a/pot/cl_install3.pot b/pot/cl_install3.pot index 6687edf..520727e 100644 --- a/pot/cl_install3.pot +++ b/pot/cl_install3.pot @@ -1,16 +1,16 @@ -#: ../calculate-install/pym/install/variables/disk.py:2454 +#: ../calculate-install/pym/install/variables/disk.py:2447 #, python-format msgid "%s is not mounted" msgstr "" -#: ../calculate-install/pym/install/distr.py:371 +#: ../calculate-install/pym/install/distr.py:372 #, python-format msgid "'%s' not found" msgstr "" -#: ../calculate-install/pym/install/migrate_users.py:421 -#: ../calculate-install/pym/install/migrate_users.py:425 -#: ../calculate-install/pym/install/migrate_users.py:436 +#: ../calculate-install/pym/install/migrate_users.py:393 +#: ../calculate-install/pym/install/migrate_users.py:397 +#: ../calculate-install/pym/install/migrate_users.py:407 msgid ": " msgstr "" @@ -18,19 +18,19 @@ msgstr "" msgid "ALSA" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:55 +#: ../calculate-install/pym/install/variables/X11.py:56 msgid "AMD AMDGPU (amdgpu)" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:56 +#: ../calculate-install/pym/install/variables/X11.py:57 msgid "AMD Catalyst (fglrx)" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:54 +#: ../calculate-install/pym/install/variables/X11.py:55 msgid "AMD Radeon (radeon)" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:215 +#: ../calculate-install/pym/install/variables/net.py:214 msgid "Addresses" msgstr "" @@ -38,19 +38,19 @@ msgstr "" msgid "Administrator" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:488 +#: ../calculate-install/pym/install/variables/autopartition.py:499 msgid "Allocate drive space" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2100 +#: ../calculate-install/pym/install/variables/disk.py:2094 msgid "Architecture of the target system must be x86_64" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:561 +#: ../calculate-install/pym/install/variables/autopartition.py:572 msgid "Architecture of the target system must be x86_64 for using the UEFI bootloader" msgstr "" -#: ../calculate-install/pym/install/distr.py:1402 +#: ../calculate-install/pym/install/distr.py:1387 #, python-format msgid "Archive type '%s' is not supported" msgstr "" @@ -62,11 +62,11 @@ msgid "Audio" msgstr "" #: ../calculate-install/pym/install/variables/audio.py:69 -#: ../calculate-install/pym/install/variables/audio.py:273 +#: ../calculate-install/pym/install/variables/audio.py:271 msgid "Audio configuration unavailable for Flash install" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:123 +#: ../calculate-install/pym/install/utils/cl_setup.py:118 msgid "Audio settings configured!" msgstr "" @@ -74,25 +74,25 @@ msgstr "" msgid "Audio system" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:411 -#: ../calculate-install/pym/install/variables/X11.py:358 -#: ../calculate-install/pym/install/variables/net.py:405 +#: ../calculate-install/pym/install/variables/X11.py:365 +#: ../calculate-install/pym/install/variables/distr.py:406 +#: ../calculate-install/pym/install/variables/net.py:398 msgid "Auto" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:53 +#: ../calculate-install/pym/install/variables/X11.py:54 msgid "Auto detection" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:558 +#: ../calculate-install/pym/install/variables/system.py:571 msgid "Autologin" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:59 +#: ../calculate-install/pym/install/variables/system.py:60 msgid "Autologin is available for Xorg sessions only" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:596 +#: ../calculate-install/pym/install/variables/system.py:609 #, python-format msgid "Autologin is unavailable for user %s" msgstr "" @@ -101,7 +101,7 @@ msgstr "" msgid "Autopartition options are not available with manual partitioning" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1474 +#: ../calculate-install/pym/install/variables/disk.py:1454 msgid "Bind mount points should not be formatted" msgstr "" @@ -110,23 +110,23 @@ msgstr "" msgid "Boot" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:831 +#: ../calculate-install/pym/install/variables/system.py:863 msgid "Boot configuration is not available on a LiveCD" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2156 +#: ../calculate-install/pym/install/variables/disk.py:2152 msgid "Boot disk" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:179 +#: ../calculate-install/pym/install/utils/cl_setup.py:174 msgid "Boot parameters configured!" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1964 +#: ../calculate-install/pym/install/variables/disk.py:1955 msgid "Bootloader" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:454 +#: ../calculate-install/pym/install/variables/net.py:447 msgid "CIDR" msgstr "" @@ -142,7 +142,7 @@ msgstr "" msgid "Click to select partitions to be created" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:311 +#: ../calculate-install/pym/install/variables/X11.py:318 msgid "Composite" msgstr "" @@ -160,7 +160,7 @@ msgstr "" msgid "Configuration manually interrupted" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:843 +#: ../calculate-install/pym/install/variables/system.py:875 msgid "Configure dynamic options only" msgstr "" @@ -168,10 +168,6 @@ msgstr "" msgid "Configuring Flash install" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:62 -msgid "Configuring OpenGL" -msgstr "" - #: ../calculate-install/pym/install/utils/cl_install.py:92 msgid "Configuring PXE install" msgstr "" @@ -189,75 +185,75 @@ msgid "Creating a new partition table" msgstr "" #: ../calculate-install/pym/install/variables/net.py:187 -#: ../calculate-install/pym/install/variables/net.py:403 -#: ../calculate-install/pym/install/variables/net.py:514 +#: ../calculate-install/pym/install/variables/net.py:396 +#: ../calculate-install/pym/install/variables/net.py:505 msgid "DHCP" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:971 +#: ../calculate-install/pym/install/variables/disk.py:959 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:548 +#: ../calculate-install/pym/install/variables/autopartition.py:559 msgid "Data partition" msgstr "" #: ../calculate-install/pym/install/variables/kernel.py:92 -#: ../calculate-install/pym/install/variables/system.py:485 +#: ../calculate-install/pym/install/variables/system.py:501 msgid "Default" msgstr "" -#: ../calculate-install/pym/install/variables/audio.py:247 +#: ../calculate-install/pym/install/variables/audio.py:245 msgid "Default audio card" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:321 +#: ../calculate-install/pym/install/variables/autopartition.py:332 #, python-format msgid "Device %s is already in use by the current system" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1089 +#: ../calculate-install/pym/install/variables/disk.py:1075 #, python-format msgid "Device '%s' is used more than once" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2248 +#: ../calculate-install/pym/install/variables/disk.py:2243 #, python-brace-format msgid "Device {device} has not BIOS Boot partition" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:283 +#: ../calculate-install/pym/install/variables/autopartition.py:282 #, python-brace-format msgid "Device {device} is used for {selected}" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:212 +#: ../calculate-install/pym/install/variables/autopartition.py:210 msgid "Devices for install" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:278 +#: ../calculate-install/pym/install/variables/autopartition.py:277 #, python-brace-format msgid "Devices {devices} are used for {selected}" msgstr "" -#: ../calculate-install/pym/install/distr.py:457 +#: ../calculate-install/pym/install/distr.py:455 msgid "Directory already mounted" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:404 +#: ../calculate-install/pym/install/variables/net.py:397 msgid "Disabled" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2216 +#: ../calculate-install/pym/install/variables/disk.py:2211 #, python-format msgid "Disk '%s' needs a partition table for the boot record" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:990 +#: ../calculate-install/pym/install/variables/disk.py:978 msgid "Disk or directory" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:236 +#: ../calculate-install/pym/install/variables/autopartition.py:234 #, python-brace-format msgid "" "Disks {selecteddisk} are part of {agrtype}\n" @@ -268,7 +264,7 @@ msgstr "" msgid "Distribution" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:890 +#: ../calculate-install/pym/install/variables/net.py:881 msgid "Domain name server" msgstr "" @@ -276,13 +272,13 @@ msgstr "" msgid "Encrypt user profiles" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:168 -#: ../calculate-install/pym/install/variables/system.py:534 +#: ../calculate-install/pym/install/variables/system.py:169 +#: ../calculate-install/pym/install/variables/system.py:548 #, python-format msgid "Enter password for user %s" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:493 +#: ../calculate-install/pym/install/variables/autopartition.py:504 #, python-format msgid "Erase disk and install %s" msgstr "" @@ -291,28 +287,28 @@ msgstr "" msgid "Example" msgstr "" -#: ../calculate-install/pym/install/distr.py:730 +#: ../calculate-install/pym/install/distr.py:727 msgid "Failed to clean directory" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:124 +#: ../calculate-install/pym/install/utils/cl_setup.py:119 msgid "Failed to configure the audio parameters!" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:180 +#: ../calculate-install/pym/install/utils/cl_setup.py:175 msgid "Failed to configure the boot parameters!" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:161 +#: ../calculate-install/pym/install/utils/cl_setup.py:156 msgid "Failed to configure the network settings!" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:171 +#: ../calculate-install/pym/install/utils/cl_setup.py:166 msgid "Failed to configure the session settings!" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:113 -#: ../calculate-install/pym/install/utils/cl_setup.py:151 +#: ../calculate-install/pym/install/utils/cl_setup.py:108 +#: ../calculate-install/pym/install/utils/cl_setup.py:146 msgid "Failed to configure the system!" msgstr "" @@ -320,13 +316,13 @@ msgstr "" msgid "Failed to configure the video settings!" msgstr "" -#: ../calculate-install/pym/install/distr.py:278 +#: ../calculate-install/pym/install/distr.py:279 msgid "Failed to convert" msgstr "" -#: ../calculate-install/pym/install/distr.py:353 -#: ../calculate-install/pym/install/distr.py:360 -#: ../calculate-install/pym/install/distr.py:363 +#: ../calculate-install/pym/install/distr.py:354 +#: ../calculate-install/pym/install/distr.py:361 +#: ../calculate-install/pym/install/distr.py:364 msgid "Failed to copy" msgstr "" @@ -334,118 +330,118 @@ msgstr "" msgid "Failed to copy files from" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2461 +#: ../calculate-install/pym/install/variables/disk.py:2454 msgid "Failed to create data in /run" msgstr "" -#: ../calculate-install/pym/install/distr.py:1594 +#: ../calculate-install/pym/install/distr.py:1579 msgid "Failed to create squash" msgstr "" -#: ../calculate-install/pym/install/distr.py:1614 +#: ../calculate-install/pym/install/distr.py:1599 msgid "Failed to create squashfs" msgstr "" -#: ../calculate-install/pym/install/distr.py:1746 -#: ../calculate-install/pym/install/distr.py:1801 +#: ../calculate-install/pym/install/distr.py:1731 +#: ../calculate-install/pym/install/distr.py:1786 msgid "Failed to create the ISO image" msgstr "" -#: ../calculate-install/pym/install/install.py:464 +#: ../calculate-install/pym/install/install.py:484 msgid "Failed to create the UEFI boot record" msgstr "" -#: ../calculate-install/pym/install/distr.py:1446 -#: ../calculate-install/pym/install/distr.py:1511 +#: ../calculate-install/pym/install/distr.py:1431 +#: ../calculate-install/pym/install/distr.py:1496 msgid "Failed to create the archive" msgstr "" -#: ../calculate-install/pym/install/distr.py:323 -#: ../calculate-install/pym/install/distr.py:326 +#: ../calculate-install/pym/install/distr.py:324 +#: ../calculate-install/pym/install/distr.py:327 msgid "Failed to create the directory" msgstr "" -#: ../calculate-install/pym/install/migrate_users.py:489 +#: ../calculate-install/pym/install/migrate_users.py:458 msgid "Failed to create the user's home directory" msgstr "" -#: ../calculate-install/pym/install/install.py:491 +#: ../calculate-install/pym/install/install.py:511 msgid "Failed to determine mbr" msgstr "" -#: ../calculate-install/pym/install/install.py:484 +#: ../calculate-install/pym/install/install.py:504 msgid "Failed to determine the boot disk" msgstr "" -#: ../calculate-install/pym/install/distr.py:1252 -#: ../calculate-install/pym/install/install.py:106 +#: ../calculate-install/pym/install/distr.py:1236 +#: ../calculate-install/pym/install/install.py:104 #, python-format msgid "Failed to determine the parent device for %s" msgstr "" -#: ../calculate-install/pym/install/distr.py:1263 -#: ../calculate-install/pym/install/install.py:128 +#: ../calculate-install/pym/install/distr.py:1247 +#: ../calculate-install/pym/install/install.py:126 #, python-format msgid "Failed to determine the partition number for %s" msgstr "" -#: ../calculate-install/pym/install/distr.py:1300 +#: ../calculate-install/pym/install/distr.py:1285 #, python-format msgid "Failed to execute 'mkswap %s': the swap partition is used by the current system" msgstr "" -#: ../calculate-install/pym/install/install.py:192 +#: ../calculate-install/pym/install/install.py:212 #, python-format msgid "Failed to find partition %s after changing the activity" msgstr "" -#: ../calculate-install/pym/install/distr.py:1211 -#: ../calculate-install/pym/install/distr.py:1305 -#: ../calculate-install/pym/install/distr.py:1877 +#: ../calculate-install/pym/install/distr.py:1196 +#: ../calculate-install/pym/install/distr.py:1290 +#: ../calculate-install/pym/install/distr.py:1862 #, python-format msgid "Failed to format %s: this partition is mounted" msgstr "" -#: ../calculate-install/pym/install/distr.py:1222 +#: ../calculate-install/pym/install/distr.py:1206 #, python-format msgid "Failed to format %s: this partition is used as swap" msgstr "" -#: ../calculate-install/pym/install/distr.py:1225 -#: ../calculate-install/pym/install/distr.py:1232 +#: ../calculate-install/pym/install/distr.py:1209 +#: ../calculate-install/pym/install/distr.py:1216 msgid "Failed to format the partition" msgstr "" -#: ../calculate-install/pym/install/distr.py:1309 +#: ../calculate-install/pym/install/distr.py:1294 msgid "Failed to format the swap partition" msgstr "" -#: ../calculate-install/pym/install/distr.py:1292 +#: ../calculate-install/pym/install/distr.py:1278 #, python-format msgid "Failed to found partition %s after changing the system ID" msgstr "" -#: ../calculate-install/pym/install/install.py:634 +#: ../calculate-install/pym/install/install.py:620 #, python-format msgid "Failed to found partition %s after creating the partition table" msgstr "" -#: ../calculate-install/pym/install/distr.py:1690 +#: ../calculate-install/pym/install/distr.py:1675 msgid "Failed to get size of the squash image" msgstr "" -#: ../calculate-install/pym/install/install.py:215 +#: ../calculate-install/pym/install/install.py:235 #, python-format msgid "" "Failed to install syslinux\n" "%s" msgstr "" -#: ../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 +#: ../calculate-install/pym/install/install.py:247 +#: ../calculate-install/pym/install/install.py:312 +#: ../calculate-install/pym/install/install.py:469 +#: ../calculate-install/pym/install/install.py:494 +#: ../calculate-install/pym/install/install.py:517 msgid "Failed to install the bootloader" msgstr "" @@ -453,98 +449,94 @@ msgstr "" msgid "Failed to install the system!" msgstr "" -#: ../calculate-install/pym/install/install.py:758 +#: ../calculate-install/pym/install/install.py:744 msgid "Failed to migrate users onto the new system" msgstr "" -#: ../calculate-install/pym/install/distr.py:144 +#: ../calculate-install/pym/install/distr.py:145 msgid "Failed to mount" msgstr "" -#: ../calculate-install/pym/install/distr.py:456 +#: ../calculate-install/pym/install/distr.py:454 #, python-format msgid "Failed to mount to the directory: %s\n" msgstr "" -#: ../calculate-install/pym/install/migrate_users.py:421 +#: ../calculate-install/pym/install/migrate_users.py:393 msgid "Failed to read files" msgstr "" -#: ../calculate-install/pym/install/distr.py:1783 +#: ../calculate-install/pym/install/distr.py:1768 msgid "Failed to remove" msgstr "" -#: ../calculate-install/pym/install/distr.py:1895 +#: ../calculate-install/pym/install/distr.py:1880 #, python-format msgid "Failed to remove %s" msgstr "" -#: ../calculate-install/pym/install/distr.py:343 -#: ../calculate-install/pym/install/distr.py:346 +#: ../calculate-install/pym/install/distr.py:344 +#: ../calculate-install/pym/install/distr.py:347 msgid "Failed to remove the directory from" msgstr "" -#: ../calculate-install/pym/install/distr.py:1006 -msgid "Failed to set btrfs compression for {}" -msgstr "" - -#: ../calculate-install/pym/install/distr.py:488 +#: ../calculate-install/pym/install/distr.py:485 msgid "Failed to umount" msgstr "" -#: ../calculate-install/pym/install/distr.py:606 +#: ../calculate-install/pym/install/distr.py:603 #, python-format msgid "Failed to unserialize %s" msgstr "" -#: ../calculate-install/pym/install/distr.py:596 +#: ../calculate-install/pym/install/distr.py:593 #, python-format msgid "Failed to unserialize type %s" msgstr "" -#: ../calculate-install/pym/install/distr.py:811 +#: ../calculate-install/pym/install/distr.py:805 #, python-format msgid "Failed to use attributes (%s) " msgstr "" -#: ../calculate-install/pym/install/install.py:207 +#: ../calculate-install/pym/install/install.py:227 #, python-format msgid "" "Failed to write the master boot record\n" "%s" msgstr "" -#: ../calculate-install/pym/install/migrate_users.py:425 -#: ../calculate-install/pym/install/migrate_users.py:436 +#: ../calculate-install/pym/install/migrate_users.py:397 +#: ../calculate-install/pym/install/migrate_users.py:407 msgid "Failed to write to files" msgstr "" -#: ../calculate-install/pym/install/distr.py:1374 +#: ../calculate-install/pym/install/distr.py:1359 #, python-format msgid "File '%s' not found" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1301 +#: ../calculate-install/pym/install/variables/disk.py:1277 msgid "Filesystem" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1471 +#: ../calculate-install/pym/install/variables/disk.py:1451 #, python-format msgid "Filesystem '%s' is not available" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:466 +#: ../calculate-install/pym/install/variables/autopartition.py:477 msgid "Filesystem for data partition" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:451 +#: ../calculate-install/pym/install/variables/autopartition.py:462 msgid "Filesystem for root partition" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:401 -#: ../calculate-install/pym/install/variables/distr.py:429 -#: ../calculate-install/pym/install/variables/distr.py:454 -#: ../calculate-install/pym/install/variables/distr.py:468 +#: ../calculate-install/pym/install/variables/distr.py:396 +#: ../calculate-install/pym/install/variables/distr.py:424 +#: ../calculate-install/pym/install/variables/distr.py:449 +#: ../calculate-install/pym/install/variables/distr.py:463 msgid "Filter" msgstr "" @@ -556,51 +548,51 @@ msgstr "" msgid "Flash install" msgstr "" -#: ../calculate-install/pym/install/distr.py:1950 +#: ../calculate-install/pym/install/distr.py:1935 #, python-format msgid "Flash install does not support %s" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1277 +#: ../calculate-install/pym/install/variables/disk.py:1254 msgid "Flash install does not support multipartition mode" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1280 +#: ../calculate-install/pym/install/variables/disk.py:1257 msgid "Flash install does not support swap disks" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2200 +#: ../calculate-install/pym/install/variables/disk.py:2195 msgid "For Flash install, you need only one disk" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:865 +#: ../calculate-install/pym/install/variables/system.py:897 #, python-format msgid "For PXE install, you need to install package %s" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:302 +#: ../calculate-install/pym/install/variables/autopartition.py:319 msgid "For autopartition, please select the device" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1403 +#: ../calculate-install/pym/install/variables/disk.py:1382 msgid "Format" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2536 +#: ../calculate-install/pym/install/variables/disk.py:2529 msgid "Format the USB Flash" msgstr "" -#: ../calculate-install/pym/install/install.py:334 #: ../calculate-install/pym/install/utils/cl_install.py:54 +#: ../calculate-install/pym/install/install.py:354 msgid "Formatting the partitions" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:57 +#: ../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 +#: ../calculate-install/pym/install/variables/X11.py:362 +#: ../calculate-install/pym/install/variables/X11.py:387 msgid "Framebuffer resolution" msgstr "" @@ -608,29 +600,29 @@ msgstr "" msgid "Full access" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:620 +#: ../calculate-install/pym/install/variables/net.py:609 msgid "Gateway" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:643 +#: ../calculate-install/pym/install/variables/net.py:627 #, python-format msgid "Gateways %s are unreachable" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:58 +#: ../calculate-install/pym/install/variables/X11.py:59 msgid "Generic VESA (vesa)" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:877 -#: ../calculate-install/pym/install/variables/net.py:911 +#: ../calculate-install/pym/install/variables/net.py:868 +#: ../calculate-install/pym/install/variables/net.py:901 msgid "Get via DHCP" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:448 +#: ../calculate-install/pym/install/variables/system.py:465 msgid "Groups" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:938 +#: ../calculate-install/pym/install/variables/system.py:970 msgid "Grub configuration unavailable for Flash install" msgstr "" @@ -638,19 +630,19 @@ msgstr "" msgid "Grub password" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:913 +#: ../calculate-install/pym/install/variables/system.py:945 msgid "Grub terminal" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2312 +#: ../calculate-install/pym/install/variables/disk.py:2307 msgid "Hard disk" msgstr "" -#: ../calculate-install/pym/install/variables/locale.py:360 +#: ../calculate-install/pym/install/variables/locale.py:355 msgid "Hardware clock type" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:246 +#: ../calculate-install/pym/install/variables/net.py:245 msgid "Hostname" msgstr "" @@ -662,44 +654,44 @@ msgstr "" msgid "I/O scheduler unavailable for Flash install" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:363 -#: ../calculate-install/pym/install/variables/net.py:415 +#: ../calculate-install/pym/install/variables/net.py:359 +#: ../calculate-install/pym/install/variables/net.py:408 msgid "IP address" msgstr "" -#: ../calculate-install/pym/install/distr.py:1720 +#: ../calculate-install/pym/install/distr.py:1705 #, python-format msgid "ISO %s contains no live image" msgstr "" -#: ../calculate-install/pym/install/distr.py:1673 +#: ../calculate-install/pym/install/distr.py:1658 #, python-format msgid "ISO image %s" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:300 +#: ../calculate-install/pym/install/variables/distr.py:297 msgid "ISO image for installation" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1572 +#: ../calculate-install/pym/install/variables/disk.py:1551 msgid "Impossible to use UUID for Flash install" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1216 +#: ../calculate-install/pym/install/variables/disk.py:1194 #, python-format msgid "Incorrect mount point (bind '%(bindSrc)s' to '%(bindDst)s')" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:267 +#: ../calculate-install/pym/install/variables/X11.py:275 #, python-format msgid "Install driver %s with:" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:619 +#: ../calculate-install/pym/install/variables/distr.py:610 msgid "Install the newer image only" msgstr "" -#: ../calculate-install/pym/install/distr.py:2075 +#: ../calculate-install/pym/install/distr.py:2062 #, python-format msgid "Install with layers does not support %s" msgstr "" @@ -711,11 +703,11 @@ msgstr "" msgid "Installation" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2475 +#: ../calculate-install/pym/install/variables/disk.py:2468 msgid "Installation disk" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:299 +#: ../calculate-install/pym/install/variables/distr.py:296 msgid "Installation image" msgstr "" @@ -723,33 +715,33 @@ msgstr "" msgid "Installation manually interrupted" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:890 +#: ../calculate-install/pym/install/variables/system.py:922 msgid "Installation path" msgstr "" +#: ../calculate-install/pym/install/variables/disk.py:2287 #: ../calculate-install/pym/install/wsdl_install.py:82 -#: ../calculate-install/pym/install/variables/disk.py:2292 msgid "Installation type" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:186 +#: ../calculate-install/pym/install/utils/cl_setup.py:181 msgid "Installing the bootloader" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:59 +#: ../calculate-install/pym/install/variables/X11.py:60 msgid "Intel (intel)" msgstr "" #: ../calculate-install/pym/install/variables/net.py:156 -#: ../calculate-install/pym/install/variables/net.py:656 +#: ../calculate-install/pym/install/variables/net.py:640 msgid "Interface" msgstr "" -#: ../calculate-install/pym/install/distr.py:1839 +#: ../calculate-install/pym/install/distr.py:1824 msgid "Keyboard interruption" msgstr "" -#: ../calculate-install/pym/install/variables/locale.py:154 +#: ../calculate-install/pym/install/variables/locale.py:150 msgid "Keyboard layout" msgstr "" @@ -761,7 +753,7 @@ msgstr "" msgid "Layout" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2265 +#: ../calculate-install/pym/install/variables/disk.py:2260 msgid "Legacy grub requires a separate /boot partition to support boot from a RAID or a LVM" msgstr "" @@ -769,9 +761,9 @@ msgstr "" msgid "Letting go the source distribution" msgstr "" +#: ../calculate-install/pym/install/variables/locale.py:128 #: ../calculate-install/pym/install/wsdl_install.py:353 #: ../calculate-install/pym/install/wsdl_install.py:366 -#: ../calculate-install/pym/install/variables/locale.py:132 msgid "Locale" msgstr "" @@ -779,15 +771,15 @@ msgstr "" msgid "Locale configuration unavailable for Flash install" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:349 +#: ../calculate-install/pym/install/variables/net.py:346 msgid "MAC" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2202 +#: ../calculate-install/pym/install/variables/disk.py:2197 msgid "MBR is not used with the UEFI bootloader" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:328 +#: ../calculate-install/pym/install/variables/net.py:325 msgid "Mac type" msgstr "" @@ -795,7 +787,7 @@ msgstr "" msgid "Manually network configuration" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:471 +#: ../calculate-install/pym/install/variables/net.py:463 msgid "Mask" msgstr "" @@ -809,17 +801,17 @@ msgstr "" msgid "Migrating users" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1104 +#: ../calculate-install/pym/install/variables/disk.py:1090 msgid "Mount point" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1207 +#: ../calculate-install/pym/install/variables/disk.py:1185 #, python-format msgid "Mount point '%s' is used more than once" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:879 -#: ../calculate-install/pym/install/variables/disk.py:977 +#: ../calculate-install/pym/install/variables/disk.py:867 +#: ../calculate-install/pym/install/variables/disk.py:965 msgid "Mount points" msgstr "" @@ -827,19 +819,19 @@ msgstr "" msgid "NTP server" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:297 +#: ../calculate-install/pym/install/variables/net.py:296 msgid "Name" msgstr "" +#: ../calculate-install/pym/install/variables/net.py:92 +#: ../calculate-install/pym/install/variables/net.py:432 +#: ../calculate-install/pym/install/variables/net.py:582 #: ../calculate-install/pym/install/wsdl_install.py:243 #: ../calculate-install/pym/install/wsdl_install.py:258 -#: ../calculate-install/pym/install/variables/net.py:92 -#: ../calculate-install/pym/install/variables/net.py:439 -#: ../calculate-install/pym/install/variables/net.py:592 msgid "Network" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:609 +#: ../calculate-install/pym/install/variables/net.py:598 #, python-format msgid "Network '%s' is used more than once" msgstr "" @@ -848,17 +840,17 @@ msgstr "" msgid "Network configuration is unavailable for Flash install" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:226 +#: ../calculate-install/pym/install/variables/net.py:225 #, python-format msgid "Network interface %s not found" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:217 +#: ../calculate-install/pym/install/variables/net.py:216 #, python-format msgid "Network interface, DHCP or IP address and network mask (example: %s)" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:820 +#: ../calculate-install/pym/install/variables/net.py:813 msgid "Network manager" msgstr "" @@ -870,7 +862,7 @@ msgstr "" msgid "Network settings" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:160 +#: ../calculate-install/pym/install/utils/cl_setup.py:155 msgid "Network settings configured!" msgstr "" @@ -878,44 +870,44 @@ msgstr "" msgid "Network settings unavailable with use settings migration" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:795 +#: ../calculate-install/pym/install/variables/net.py:790 msgid "NetworkManager" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:583 +#: ../calculate-install/pym/install/variables/system.py:596 msgid "No autologin" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1467 +#: ../calculate-install/pym/install/variables/disk.py:1447 #, python-brace-format msgid "No need to format unused device {dev}" msgstr "" -#: ../calculate-install/pym/install/variables/audio.py:266 +#: ../calculate-install/pym/install/variables/audio.py:264 msgid "Not available" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2576 +#: ../calculate-install/pym/install/variables/disk.py:2569 msgid "Not enough free space on the USB Flash" msgstr "" +#: ../calculate-install/pym/install/variables/distr.py:405 #: ../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/net.py:879 -#: ../calculate-install/pym/install/variables/net.py:913 -#: ../calculate-install/pym/install/variables/system.py:599 +#: ../calculate-install/pym/install/variables/distr.py:428 +#: ../calculate-install/pym/install/variables/distr.py:439 +#: ../calculate-install/pym/install/variables/distr.py:453 +#: ../calculate-install/pym/install/variables/distr.py:467 +#: ../calculate-install/pym/install/variables/net.py:870 +#: ../calculate-install/pym/install/variables/net.py:903 +#: ../calculate-install/pym/install/variables/system.py:612 msgid "Not used" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:61 +#: ../calculate-install/pym/install/variables/X11.py:62 msgid "Nvidia Graphics Driver (nvidia)" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:60 +#: ../calculate-install/pym/install/variables/X11.py:61 msgid "Nvidia Nouveau (nouveau)" msgstr "" @@ -923,12 +915,12 @@ msgstr "" msgid "Off" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:260 +#: ../calculate-install/pym/install/variables/X11.py:268 #, python-format msgid "Only %s drivers are available" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:796 +#: ../calculate-install/pym/install/variables/net.py:791 msgid "OpenRC" msgstr "" @@ -940,73 +932,73 @@ msgstr "" msgid "PXE install" msgstr "" -#: ../calculate-install/pym/install/distr.py:1978 +#: ../calculate-install/pym/install/distr.py:1963 #, python-format msgid "PXE install does not support %s" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:859 +#: ../calculate-install/pym/install/variables/system.py:891 msgid "PXE install is available for Calculate Directory Server only" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:877 +#: ../calculate-install/pym/install/variables/system.py:909 msgid "PXE install is only available if the DHCP service has been configured first" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:936 +#: ../calculate-install/pym/install/variables/net.py:926 msgid "PXE server IP" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:644 +#: ../calculate-install/pym/install/variables/autopartition.py:655 msgid "Partition table" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2114 +#: ../calculate-install/pym/install/variables/disk.py:2108 #, python-brace-format msgid "Partition {disk} already used by the current system" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2128 +#: ../calculate-install/pym/install/variables/disk.py:2124 #, python-brace-format msgid "Partition {disk} already used for installation" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:532 +#: ../calculate-install/pym/install/variables/autopartition.py:543 msgid "Partitions options" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:495 +#: ../calculate-install/pym/install/variables/system.py:511 msgid "Password" msgstr "" -#: ../calculate-install/pym/install/distr.py:1226 +#: ../calculate-install/pym/install/distr.py:1210 msgid "Permission denied" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:174 +#: ../calculate-install/pym/install/variables/system.py:175 msgid "Please enter a root password for Grub" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1198 +#: ../calculate-install/pym/install/variables/disk.py:1178 msgid "Please specify EFI partition by UEFI option" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1194 +#: ../calculate-install/pym/install/variables/disk.py:1174 msgid "Please specify EFI partition by UEFI parameter in advanced options" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1483 +#: ../calculate-install/pym/install/variables/disk.py:1464 #, python-brace-format msgid "Please unmount disk {device} to use it for install" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1457 -#: ../calculate-install/pym/install/variables/disk.py:2121 +#: ../calculate-install/pym/install/variables/disk.py:1437 +#: ../calculate-install/pym/install/variables/disk.py:2117 #, python-brace-format msgid "Please unmount {device}, as it will be used for installation" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:326 +#: ../calculate-install/pym/install/variables/autopartition.py:337 #, python-brace-format msgid "Please unmount {disks}, as {device} will be used for installation" msgstr "" @@ -1023,7 +1015,7 @@ msgstr "" msgid "PulseAudio" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:296 +#: ../calculate-install/pym/install/variables/autopartition.py:295 #, python-format msgid "RAID %s is wrong" msgstr "" @@ -1032,7 +1024,7 @@ msgstr "" msgid "Reconfigure network" msgstr "" -#: ../calculate-install/pym/install/distr.py:614 +#: ../calculate-install/pym/install/distr.py:611 msgid "Recovery is not implemented" msgstr "" @@ -1040,15 +1032,15 @@ msgstr "" msgid "Remove the password protection on Grub" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:606 +#: ../calculate-install/pym/install/variables/autopartition.py:617 msgid "Root partition size" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:164 +#: ../calculate-install/pym/install/variables/system.py:165 msgid "Root password" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:537 +#: ../calculate-install/pym/install/variables/net.py:528 msgid "Routing" msgstr "" @@ -1074,15 +1066,15 @@ msgstr "" msgid "Screen resolution" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:852 +#: ../calculate-install/pym/install/variables/net.py:844 msgid "Search domains" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:348 +#: ../calculate-install/pym/install/variables/autopartition.py:359 msgid "Selected devices have not BIOS boot partition" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:344 +#: ../calculate-install/pym/install/variables/autopartition.py:355 msgid "Selected devices have not EFI partition" msgstr "" @@ -1092,24 +1084,24 @@ msgstr "" msgid "Session" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:170 +#: ../calculate-install/pym/install/utils/cl_setup.py:165 msgid "Session settings configured!" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1525 +#: ../calculate-install/pym/install/variables/disk.py:1504 msgid "Size" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:671 +#: ../calculate-install/pym/install/variables/net.py:655 msgid "Source IP" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1265 +#: ../calculate-install/pym/install/variables/disk.py:1242 #, python-format msgid "Source directory %(src)s is already used for binding '%(bindSrc)s' to '%(bindDst)s'" msgstr "" -#: ../calculate-install/pym/install/distr.py:334 +#: ../calculate-install/pym/install/distr.py:335 #, python-format msgid "Squash size unsupported for %s" msgstr "" @@ -1120,15 +1112,15 @@ msgstr "" msgid "Start installing" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:546 +#: ../calculate-install/pym/install/variables/autopartition.py:557 msgid "Swap partition" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:124 +#: ../calculate-install/pym/install/variables/autopartition.py:122 msgid "Swap partition size" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:136 +#: ../calculate-install/pym/install/variables/autopartition.py:134 msgid "Swap size should not be less that 1MiB" msgstr "" @@ -1140,8 +1132,8 @@ msgstr "" msgid "System Install" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:112 -#: ../calculate-install/pym/install/utils/cl_setup.py:150 +#: ../calculate-install/pym/install/utils/cl_setup.py:107 +#: ../calculate-install/pym/install/utils/cl_setup.py:145 msgid "System configured!" msgstr "" @@ -1157,109 +1149,109 @@ msgstr "" msgid "System update" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:122 +#: ../calculate-install/pym/install/utils/cl_setup.py:117 msgid "The audio settings are being configured" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:609 +#: ../calculate-install/pym/install/variables/system.py:622 msgid "The autologin is not available with domain workstations" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1378 +#: ../calculate-install/pym/install/variables/disk.py:1357 msgid "The bind mount point does not use filesystem" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:178 +#: ../calculate-install/pym/install/utils/cl_setup.py:173 msgid "The boot parameters are being configured" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:194 +#: ../calculate-install/pym/install/utils/cl_setup.py:189 msgid "The builder mode is no longer supported" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1388 +#: ../calculate-install/pym/install/variables/disk.py:1367 #, python-format msgid "The filesystem for '%(mp)s' should not be '%(opt)s'" msgstr "" -#: ../calculate-install/pym/install/distr.py:804 +#: ../calculate-install/pym/install/distr.py:799 #, python-format msgid "The following attributes are not specified: (%s)" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:261 +#: ../calculate-install/pym/install/variables/net.py:260 #, python-format msgid "The hostname length should be less than %d" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:648 +#: ../calculate-install/pym/install/variables/distr.py:639 msgid "The image for update not found" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:333 +#: ../calculate-install/pym/install/variables/distr.py:330 msgid "The image is not compatible with the current kernel" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:859 -#: ../calculate-install/pym/install/variables/disk.py:2137 -#: ../calculate-install/pym/install/variables/disk.py:2278 +#: ../calculate-install/pym/install/variables/disk.py:847 +#: ../calculate-install/pym/install/variables/disk.py:2133 +#: ../calculate-install/pym/install/variables/disk.py:2273 msgid "The layout is not available with autopartitioning" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:149 +#: ../calculate-install/pym/install/utils/cl_setup.py:144 msgid "The localization and time options are being configured" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:159 +#: ../calculate-install/pym/install/utils/cl_setup.py:154 msgid "The network settings are being configured" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:547 +#: ../calculate-install/pym/install/variables/autopartition.py:558 msgid "The partition for the update" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:565 +#: ../calculate-install/pym/install/variables/autopartition.py:576 msgid "The partition table must be GPT for using UEFI bootloader" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2503 +#: ../calculate-install/pym/install/variables/disk.py:2496 #, python-brace-format msgid "The partition {dev} is already in use as {mp}" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1171 +#: ../calculate-install/pym/install/variables/disk.py:1153 #, python-format msgid "The root partition should be at least %s" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:627 +#: ../calculate-install/pym/install/variables/autopartition.py:638 #, python-brace-format msgid "The root partition should be at least {size}" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:169 +#: ../calculate-install/pym/install/utils/cl_setup.py:164 msgid "The session settings are being configured" msgstr "" -#: ../calculate-install/pym/install/distr.py:1217 +#: ../calculate-install/pym/install/distr.py:1202 #, python-format msgid "The specified format of '%s' is not supported" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1395 +#: ../calculate-install/pym/install/variables/disk.py:1374 #, python-brace-format msgid "The swap partition {dev} must be formatted as swap" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:111 +#: ../calculate-install/pym/install/utils/cl_setup.py:106 msgid "The system is being configured" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:137 +#: ../calculate-install/pym/install/utils/cl_setup.py:132 msgid "The themes are being configured" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:139 +#: ../calculate-install/pym/install/utils/cl_setup.py:134 msgid "Theme configuration failed!" msgstr "" @@ -1267,120 +1259,120 @@ msgstr "" msgid "Themes" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:138 +#: ../calculate-install/pym/install/utils/cl_setup.py:133 msgid "Themes configured!" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:74 +#: ../calculate-install/pym/install/variables/X11.py:75 msgid "This distribution does not provide a Xorg server" msgstr "" #: ../calculate-install/pym/install/variables/audio.py:71 -#: ../calculate-install/pym/install/variables/audio.py:275 +#: ../calculate-install/pym/install/variables/audio.py:273 msgid "This distribution does not provide the ALSA sound" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:516 -#: ../calculate-install/pym/install/variables/disk.py:2140 +#: ../calculate-install/pym/install/variables/autopartition.py:527 +#: ../calculate-install/pym/install/variables/disk.py:2136 msgid "This option not used for Flash install" msgstr "" -#: ../calculate-install/pym/install/variables/locale.py:212 +#: ../calculate-install/pym/install/variables/locale.py:208 msgid "Timezone" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:70 +#: ../calculate-install/pym/install/utils/cl_setup.py:65 msgid "To apply the changes, reboot the system" msgstr "" -#: ../calculate-install/pym/install/utils/cl_setup.py:80 +#: ../calculate-install/pym/install/utils/cl_setup.py:75 msgid "To apply the changes, restart the X server" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:974 +#: ../calculate-install/pym/install/variables/disk.py:962 msgid "To change the filesystem, you have to specify it as FS. FORMAT is used for the specifying the need to format partition or not" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1066 -#: ../calculate-install/pym/install/variables/disk.py:1179 +#: ../calculate-install/pym/install/variables/disk.py:1054 +#: ../calculate-install/pym/install/variables/disk.py:1161 msgid "To install the system, you need to specify the root device" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2269 +#: ../calculate-install/pym/install/variables/disk.py:2264 #, python-format msgid "To support booting from %s, legacy grub needs a separate /boot partition" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1974 +#: ../calculate-install/pym/install/variables/disk.py:1965 msgid "UEFI" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2024 +#: ../calculate-install/pym/install/variables/disk.py:2015 msgid "UEFI boot" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2092 +#: ../calculate-install/pym/install/variables/disk.py:2086 #, python-format msgid "UEFI installation is unavailable, because '%s' command not found" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2313 +#: ../calculate-install/pym/install/variables/disk.py:2308 msgid "USB Flash" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2314 +#: ../calculate-install/pym/install/variables/disk.py:2309 msgid "USB Hard Disk" msgstr "" -#: ../calculate-install/pym/install/distr.py:1900 +#: ../calculate-install/pym/install/distr.py:1885 #, python-format msgid "USB flash %s" msgstr "" -#: ../calculate-install/pym/install/install.py:568 +#: ../calculate-install/pym/install/install.py:554 msgid "Unable to change the I/O scheduler" msgstr "" -#: ../calculate-install/pym/install/install.py:738 +#: ../calculate-install/pym/install/install.py:724 #, python-format msgid "Unable to remove directory %s" msgstr "" -#: ../calculate-install/pym/install/install.py:732 +#: ../calculate-install/pym/install/install.py:718 #, python-format msgid "Unable to umount %s" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1252 -#: ../calculate-install/pym/install/variables/disk.py:2519 +#: ../calculate-install/pym/install/variables/disk.py:1230 +#: ../calculate-install/pym/install/variables/disk.py:2512 #, python-format msgid "Unable to use CDROM %s for installation" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1243 -#: ../calculate-install/pym/install/variables/disk.py:2516 +#: ../calculate-install/pym/install/variables/disk.py:1221 +#: ../calculate-install/pym/install/variables/disk.py:2509 #, python-format msgid "Unable to use extended partition %s for installation" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1291 +#: ../calculate-install/pym/install/variables/disk.py:1267 #, python-brace-format msgid "Unable to use {part} partition used by active {typepart} for installation" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:163 -#: ../calculate-install/pym/install/variables/disk.py:2083 -#: ../calculate-install/pym/install/variables/disk.py:2185 -#: ../calculate-install/pym/install/variables/disk.py:2485 -#: ../calculate-install/pym/install/variables/net.py:315 +#: ../calculate-install/pym/install/variables/autopartition.py:161 +#: ../calculate-install/pym/install/variables/disk.py:2077 +#: ../calculate-install/pym/install/variables/disk.py:2180 +#: ../calculate-install/pym/install/variables/disk.py:2478 +#: ../calculate-install/pym/install/variables/net.py:313 msgid "Unknown" msgstr "" -#: ../calculate-install/pym/install/distr.py:1547 +#: ../calculate-install/pym/install/distr.py:1532 msgid "Unknown Container" msgstr "" -#: ../calculate-install/pym/install/distr.py:1399 +#: ../calculate-install/pym/install/distr.py:1384 #, python-format msgid "Unknown archive type '%s'" msgstr "" @@ -1389,7 +1381,7 @@ msgstr "" msgid "Unmounting the target system volume" msgstr "" -#: ../calculate-install/pym/install/distr.py:1414 +#: ../calculate-install/pym/install/distr.py:1399 #, python-format msgid "" "Unpacking error\n" @@ -1400,7 +1392,7 @@ msgstr "" msgid "Unpacking the system image to the target" msgstr "" -#: ../calculate-install/pym/install/distr.py:1423 +#: ../calculate-install/pym/install/distr.py:1408 msgid "Unsupported" msgstr "" @@ -1408,11 +1400,11 @@ msgstr "" msgid "Update" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:1001 +#: ../calculate-install/pym/install/variables/system.py:1040 msgid "Update configuration unavailable for Flash install" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:1031 +#: ../calculate-install/pym/install/variables/system.py:1070 msgid "Update packages at first boot" msgstr "" @@ -1424,19 +1416,19 @@ msgstr "" msgid "Updating the configuration" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:550 +#: ../calculate-install/pym/install/variables/autopartition.py:561 msgid "Use LVM" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1564 +#: ../calculate-install/pym/install/variables/disk.py:1543 msgid "Use UUID" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:494 +#: ../calculate-install/pym/install/variables/autopartition.py:505 msgid "Use current partitions" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:549 +#: ../calculate-install/pym/install/variables/autopartition.py:560 msgid "Use the UEFI bootloader" msgstr "" @@ -1448,17 +1440,17 @@ msgstr "" msgid "User" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:593 +#: ../calculate-install/pym/install/variables/system.py:606 #, python-format msgid "User %s does not exist" msgstr "" -#: ../calculate-install/pym/install/migrate_users.py:356 +#: ../calculate-install/pym/install/migrate_users.py:329 #, python-format msgid "User %s not found" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:57 +#: ../calculate-install/pym/install/variables/system.py:58 msgid "User configuration unavailable for Flash install" msgstr "" @@ -1480,8 +1472,8 @@ msgstr "" msgid "Video" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:70 -#: ../calculate-install/pym/install/variables/X11.py:284 +#: ../calculate-install/pym/install/variables/X11.py:71 +#: ../calculate-install/pym/install/variables/X11.py:291 msgid "Video configuration unavailable for Flash install" msgstr "" @@ -1501,67 +1493,71 @@ msgstr "" msgid "Would you like to reboot your computer now to complete the installation?" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2105 +#: ../calculate-install/pym/install/variables/disk.py:2099 #, python-format msgid "Wrong EFI device %s" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:400 +#: ../calculate-install/pym/install/variables/net.py:393 #, python-format msgid "Wrong IP address %s" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:685 +#: ../calculate-install/pym/install/variables/net.py:668 #, python-format msgid "Wrong IP address %s in the specified source IP" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:908 +#: ../calculate-install/pym/install/variables/net.py:898 msgid "Wrong IP address for DNS" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1081 +#: ../calculate-install/pym/install/variables/disk.py:1068 #, python-format msgid "Wrong bind mount point '%s'" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1077 -#: ../calculate-install/pym/install/variables/disk.py:2493 -#: ../calculate-install/pym/install/variables/disk.py:2498 +#: ../calculate-install/pym/install/variables/disk.py:2586 +msgid "Wrong btrfs compression" +msgstr "" + +#: ../calculate-install/pym/install/variables/disk.py:1064 +#: ../calculate-install/pym/install/variables/disk.py:2486 +#: ../calculate-install/pym/install/variables/disk.py:2491 #, python-format msgid "Wrong device '%s'" msgstr "" -#: ../calculate-install/pym/install/distr.py:197 +#: ../calculate-install/pym/install/distr.py:198 msgid "Wrong distribution" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:634 +#: ../calculate-install/pym/install/variables/net.py:623 #, python-format msgid "Wrong gateway IP %s" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:258 +#: ../calculate-install/pym/install/variables/net.py:257 msgid "Wrong hostname" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:322 -#: ../calculate-install/pym/install/variables/distr.py:330 -#: ../calculate-install/pym/install/variables/distr.py:643 +#: ../calculate-install/pym/install/variables/distr.py:319 +#: ../calculate-install/pym/install/variables/distr.py:327 +#: ../calculate-install/pym/install/variables/distr.py:634 msgid "Wrong image file" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:497 +#: ../calculate-install/pym/install/variables/net.py:488 #, python-format msgid "Wrong mask %s" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1226 +#: ../calculate-install/pym/install/variables/disk.py:1204 #, python-format msgid "Wrong mount point '%s'" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:604 +#: ../calculate-install/pym/install/variables/net.py:594 #, python-format msgid "Wrong network %s" msgstr "" @@ -1571,21 +1567,21 @@ msgstr "" msgid "Wrong resolution {resolution} {example}" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:679 +#: ../calculate-install/pym/install/variables/net.py:663 #, python-format msgid "Wrong source IP %s" msgstr "" -#: ../calculate-install/pym/install/variables/locale.py:221 +#: ../calculate-install/pym/install/variables/locale.py:217 #, python-format msgid "Wrong timezone %s" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2557 +#: ../calculate-install/pym/install/variables/disk.py:2550 msgid "You cannot format the USB Flash which contains the current system" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2511 +#: ../calculate-install/pym/install/variables/disk.py:2504 msgid "You cannot install the new system instead current" msgstr "" @@ -1593,32 +1589,32 @@ msgstr "" msgid "You cannot set a password and remove the existing password at a time" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1233 +#: ../calculate-install/pym/install/variables/disk.py:1211 #, python-format msgid "You may not use the current root partition %s for installation" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2220 -#: ../calculate-install/pym/install/variables/disk.py:2522 +#: ../calculate-install/pym/install/variables/disk.py:2215 +#: ../calculate-install/pym/install/variables/disk.py:2515 msgid "You need a disk with a dos table for Flash install" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:318 +#: ../calculate-install/pym/install/variables/distr.py:315 msgid "You need to select a distribution image" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2235 -#: ../calculate-install/pym/install/variables/disk.py:2243 +#: ../calculate-install/pym/install/variables/disk.py:2230 +#: ../calculate-install/pym/install/variables/disk.py:2238 #, python-brace-format msgid "Your boot device must have a BIOS Boot partition ({minsize})" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:557 -#: ../calculate-install/pym/install/variables/disk.py:2096 +#: ../calculate-install/pym/install/variables/autopartition.py:568 +#: ../calculate-install/pym/install/variables/disk.py:2090 msgid "Your system must be loaded in UEFI for using this bootloader" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:539 +#: ../calculate-install/pym/install/variables/net.py:530 msgid "add a routing rule (specified as NETWORK:GATEWAY[:DEV[:SOURCE]])" msgstr "" @@ -1627,68 +1623,68 @@ msgstr "" msgid "add a user to the installed system. USER is username. ADMIN is administrator rights ({alllist}, {none_value} by default). GROUPS is list user supplimentary groups (comma delimeter). Use '{none_value}' value to discard user migration" msgstr "" -#: ../calculate-install/pym/install/distr.py:1346 +#: ../calculate-install/pym/install/distr.py:1331 #, python-format msgid "archive %s" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:822 +#: ../calculate-install/pym/install/variables/system.py:854 msgid "audio parameters" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:531 +#: ../calculate-install/pym/install/variables/autopartition.py:542 msgid "autopartition options" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2157 +#: ../calculate-install/pym/install/variables/disk.py:2153 msgid "boot disk for the system bound for install" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:821 +#: ../calculate-install/pym/install/variables/system.py:853 msgid "boot parameters" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:468 +#: ../calculate-install/pym/install/variables/distr.py:463 msgid "by build" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:429 +#: ../calculate-install/pym/install/variables/distr.py:424 msgid "by distribution" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:401 +#: ../calculate-install/pym/install/variables/distr.py:396 msgid "by processor architecture" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:454 +#: ../calculate-install/pym/install/variables/distr.py:449 msgid "by version" msgstr "" -#: ../calculate-install/pym/install/distr.py:862 -#: ../calculate-install/pym/install/distr.py:1595 -#: ../calculate-install/pym/install/distr.py:1747 +#: ../calculate-install/pym/install/distr.py:856 +#: ../calculate-install/pym/install/distr.py:1580 +#: ../calculate-install/pym/install/distr.py:1732 #, python-format msgid "command '%s' not found" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:844 +#: ../calculate-install/pym/install/variables/system.py:876 msgid "configure dynamic options only" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2291 +#: ../calculate-install/pym/install/variables/disk.py:2286 msgid "device type for the system bound for install" msgstr "" -#: ../calculate-install/pym/install/distr.py:691 +#: ../calculate-install/pym/install/distr.py:688 #, python-format msgid "directory '%s'" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:891 +#: ../calculate-install/pym/install/variables/net.py:882 msgid "domain name server (comma-separated)" msgstr "" -#: ../calculate-install/pym/install/distr.py:201 +#: ../calculate-install/pym/install/distr.py:202 msgid "empty" msgstr "" @@ -1696,60 +1692,60 @@ msgstr "" msgid "encrypt user profiles" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1390 +#: ../calculate-install/pym/install/variables/disk.py:1369 #, python-brace-format msgid "for {typedisk} install" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:914 +#: ../calculate-install/pym/install/variables/system.py:946 msgid "grub terminal" msgstr "" -#: ../calculate-install/pym/install/distr.py:1671 +#: ../calculate-install/pym/install/distr.py:1656 #, python-format msgid "image directory %s" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:620 +#: ../calculate-install/pym/install/variables/distr.py:611 msgid "install the newer image only" msgstr "" -#: ../calculate-install/pym/install/distr.py:2011 +#: ../calculate-install/pym/install/distr.py:1996 #, python-brace-format msgid "layered '{file} {diff}'" msgstr "" -#: ../calculate-install/pym/install/distr.py:1669 +#: ../calculate-install/pym/install/distr.py:1654 #, python-format msgid "live image %s" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:819 +#: ../calculate-install/pym/install/variables/system.py:851 msgid "localization and time options" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:821 +#: ../calculate-install/pym/install/variables/net.py:814 msgid "network manager" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:818 +#: ../calculate-install/pym/install/variables/system.py:850 msgid "network settings" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1978 +#: ../calculate-install/pym/install/variables/disk.py:1969 msgid "no" msgstr "" -#: ../calculate-install/pym/install/distr.py:1052 +#: ../calculate-install/pym/install/distr.py:1039 #, python-format msgid "partition '%s'" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:891 +#: ../calculate-install/pym/install/variables/system.py:923 msgid "path for PXE install" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2537 +#: ../calculate-install/pym/install/variables/disk.py:2530 msgid "perform the formatting of the USB Flash drive" msgstr "" @@ -1761,47 +1757,47 @@ msgstr "" msgid "remove the password protection for editing the Grub menu" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:853 +#: ../calculate-install/pym/install/variables/net.py:845 msgid "search domains (comma-separated)" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:430 +#: ../calculate-install/pym/install/variables/distr.py:425 msgid "select the operation system" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:469 +#: ../calculate-install/pym/install/variables/distr.py:464 msgid "select the operation system by build" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:455 +#: ../calculate-install/pym/install/variables/distr.py:450 msgid "select the operation system by version" msgstr "" -#: ../calculate-install/pym/install/variables/distr.py:402 +#: ../calculate-install/pym/install/variables/distr.py:397 msgid "select the processor architecture" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:824 +#: ../calculate-install/pym/install/variables/system.py:856 msgid "session settings" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2025 +#: ../calculate-install/pym/install/variables/disk.py:2016 msgid "set UEFI boot disks" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:559 +#: ../calculate-install/pym/install/variables/system.py:572 msgid "set an autologin for the user, 'off' for disable" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:247 +#: ../calculate-install/pym/install/variables/net.py:246 msgid "set either the short or the full hostname" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:467 +#: ../calculate-install/pym/install/variables/autopartition.py:478 msgid "set filesystem for data partititon" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:452 +#: ../calculate-install/pym/install/variables/autopartition.py:463 msgid "set filesystem for root partititon" msgstr "" @@ -1809,7 +1805,7 @@ msgstr "" msgid "set grub password" msgstr "" -#: ../calculate-install/pym/install/variables/locale.py:361 +#: ../calculate-install/pym/install/variables/locale.py:356 msgid "set hardware clock type" msgstr "" @@ -1817,7 +1813,7 @@ msgstr "" msgid "set the NTP server for the system" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:2476 +#: ../calculate-install/pym/install/variables/disk.py:2469 msgid "set the USB Flash device" msgstr "" @@ -1829,40 +1825,40 @@ msgstr "" msgid "set the audio system" msgstr "" -#: ../calculate-install/pym/install/variables/audio.py:248 +#: ../calculate-install/pym/install/variables/audio.py:246 msgid "set the default audio" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:211 +#: ../calculate-install/pym/install/variables/autopartition.py:209 msgid "set the device for autopartition" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:354 -#: ../calculate-install/pym/install/variables/X11.py:379 +#: ../calculate-install/pym/install/variables/X11.py:361 +#: ../calculate-install/pym/install/variables/X11.py:386 msgid "set the framebuffer resolution" msgstr "" -#: ../calculate-install/pym/install/variables/locale.py:155 +#: ../calculate-install/pym/install/variables/locale.py:151 msgid "set the keyboard layout" msgstr "" -#: ../calculate-install/pym/install/variables/locale.py:133 +#: ../calculate-install/pym/install/variables/locale.py:129 msgid "set the locale" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:645 +#: ../calculate-install/pym/install/variables/autopartition.py:656 msgid "set the partition table for autopartition" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:607 +#: ../calculate-install/pym/install/variables/autopartition.py:618 msgid "set the root partition size for autopartition" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:125 +#: ../calculate-install/pym/install/variables/autopartition.py:123 msgid "set the swap partition size for autopartition" msgstr "" -#: ../calculate-install/pym/install/variables/locale.py:213 +#: ../calculate-install/pym/install/variables/locale.py:209 msgid "set the timezone" msgstr "" @@ -1870,21 +1866,21 @@ msgstr "" msgid "set the video driver" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:163 +#: ../calculate-install/pym/install/variables/system.py:164 msgid "specify the root password" msgstr "" -#: ../calculate-install/pym/install/distr.py:1562 +#: ../calculate-install/pym/install/distr.py:1547 #, python-format msgid "squash image %s" msgstr "" -#: ../calculate-install/pym/install/distr.py:279 +#: ../calculate-install/pym/install/distr.py:280 #: ../calculate-install/pym/install/distr.py:407 msgid "to" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:310 +#: ../calculate-install/pym/install/variables/X11.py:317 msgid "toggle composite" msgstr "" @@ -1892,19 +1888,19 @@ msgstr "" msgid "toggle the I/O scheduler" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:1030 +#: ../calculate-install/pym/install/variables/system.py:1069 msgid "update packages at first boot" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:823 +#: ../calculate-install/pym/install/variables/system.py:855 msgid "update themes" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1565 +#: ../calculate-install/pym/install/variables/disk.py:1544 msgid "use UUID" msgstr "" -#: ../calculate-install/pym/install/variables/autopartition.py:489 +#: ../calculate-install/pym/install/variables/autopartition.py:500 msgid "use the autopartition" msgstr "" @@ -1916,31 +1912,31 @@ msgstr "" msgid "use the root password to edit Grub" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:825 +#: ../calculate-install/pym/install/variables/system.py:857 msgid "user settings" msgstr "" -#: ../calculate-install/pym/install/variables/net.py:316 +#: ../calculate-install/pym/install/variables/net.py:313 msgid "vendor" msgstr "" -#: ../calculate-install/pym/install/variables/X11.py:265 +#: ../calculate-install/pym/install/variables/X11.py:273 #, python-format msgid "video driver %s is unavailable" msgstr "" -#: ../calculate-install/pym/install/variables/system.py:820 +#: ../calculate-install/pym/install/variables/system.py:852 msgid "video settings" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1462 -#: ../calculate-install/pym/install/variables/disk.py:2562 +#: ../calculate-install/pym/install/variables/disk.py:1442 +#: ../calculate-install/pym/install/variables/disk.py:2555 #, python-brace-format msgid "{device} must be formatted" msgstr "" -#: ../calculate-install/pym/install/variables/disk.py:1452 -#: ../calculate-install/pym/install/variables/disk.py:1478 +#: ../calculate-install/pym/install/variables/disk.py:1431 +#: ../calculate-install/pym/install/variables/disk.py:1458 #, python-brace-format msgid "{device} must but cannot be formatted, as it is mounted to {mountpoint} on the current system" msgstr "" diff --git a/pot/cl_lib3.pot b/pot/cl_lib3.pot index 676dcae..05609bc 100644 --- a/pot/cl_lib3.pot +++ b/pot/cl_lib3.pot @@ -1,9 +1,9 @@ -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3541 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3550 #, python-format msgid "%(name)s does not match %(nameElement)s in size" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1932 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1944 #, python-format msgid "%d argumens" msgstr "" @@ -15,90 +15,90 @@ msgstr "" msgid "%s command not found" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1339 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1352 #, python-format msgid "%s is not directory" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3469 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3478 #, python-format msgid "'%s' is not a number" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1934 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1946 msgid "1 argument" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4628 -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:246 -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:256 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:242 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:252 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4640 msgid ":" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:136 -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:146 -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:150 -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:228 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1041 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1043 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1231 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1233 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2285 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4593 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5095 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5128 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5150 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5161 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5235 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5258 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5273 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:138 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:148 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:152 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:231 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1049 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1051 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1240 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1242 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2298 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4608 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5114 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5145 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5167 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5178 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5252 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5275 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5290 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5295 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5488 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5499 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5521 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5533 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5566 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5573 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5307 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5312 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5497 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5508 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5530 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5542 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5575 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5582 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5584 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5599 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5601 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5591 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5593 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5608 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5610 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5612 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5645 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5647 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5658 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5660 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5619 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5621 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5654 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5656 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5667 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5669 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5671 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5692 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5695 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5722 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5724 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5732 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5734 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5678 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5680 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5701 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5704 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5731 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5733 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5741 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5743 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5772 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5789 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5811 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5828 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5839 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5845 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5876 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5878 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5890 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5891 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6213 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6244 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6288 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6316 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6343 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6376 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6412 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6422 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6439 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6449 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5753 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5782 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5799 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5821 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5838 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5849 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5855 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5886 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5888 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5900 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5901 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6230 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6261 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6304 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6332 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6359 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6392 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6427 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6437 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6455 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6465 msgid ": " msgstr "" @@ -108,42 +108,42 @@ msgstr "" msgid "Access denied to repository {url}" msgstr "" +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:196 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:99 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:188 #: ../calculate-lib/pym/calculate/lib/format/xml_xfcepanel.py:123 -#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:189 -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:193 -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:98 msgid "Ambiguity in this template: the same nodes are on a same level" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1905 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1894 #, python-format msgid "Ambiguous choice:%s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6202 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6219 msgid "Appling patch" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:788 +#: ../calculate-lib/pym/calculate/lib/datavars.py:809 #, python-brace-format msgid "Attempting to rewrite a readonly index field {fieldname} in variable {variablename}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1614 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1603 #, python-format msgid "Attempting to rewrite readonly variable %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:400 +#: ../calculate-lib/pym/calculate/lib/datavars.py:421 #, python-format msgid "Attempting to rewrite readonly variable %s via calculate.env" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:125 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:128 msgid "Attribute \"name\" not found in the tag entry" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:134 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:137 msgid "Attribute \"type\" not found in the tag entry" msgstr "" @@ -158,30 +158,30 @@ msgstr "" msgid "Branch {branch} not found in repository {url}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:860 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:853 msgid "Break package building" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4628 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4640 msgid "Calculate Utilities have changed files" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1757 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1746 msgid "Click for advanced settings" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2254 -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:432 -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:535 -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:542 #: ../calculate-lib/pym/calculate/lib/utils/files.py:171 -#: ../calculate-lib/pym/calculate/lib/utils/files.py:912 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:932 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:427 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:530 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:537 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2265 #, python-format msgid "Command not found '%s'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4940 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4949 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4959 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4968 #, python-format msgid "Config action is not support '%s' parameter" msgstr "" @@ -208,74 +208,74 @@ msgstr "" msgid "Custom action" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:189 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:187 #, python-format msgid "Device %s must be mounted" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:270 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:282 msgid "Device not found" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:717 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:711 msgid "Distribution templates" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4051 -#: ../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:4060 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:73 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:123 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:127 msgid "ERROR" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:770 +#: ../calculate-lib/pym/calculate/lib/datavars.py:791 #, python-format msgid "Each entry must contains %d field(s)" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4036 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4045 msgid "Empty oct value" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1035 -#: ../calculate-lib/pym/calculate/lib/datavars.py:1380 -#: ../calculate-lib/pym/calculate/lib/datavars.py:1444 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1025 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1367 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1431 #, python-format msgid "Error in %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_ldap.py:421 +#: ../calculate-lib/pym/calculate/lib/cl_ldap.py:424 msgid "Error in LDIF file" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1030 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1020 msgid "Error in calculate.env in profile" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1438 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1425 msgid "Error in profile calculate.env" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6408 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6423 #, python-format msgid "Error in template %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4364 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4379 msgid "Example:" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5014 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5022 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5033 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5041 #, python-format msgid "Failed to apply template file %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5775 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5785 msgid "Failed to change the current directory to" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4932 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4951 #, python-format msgid "Failed to change version of %s" msgstr "" @@ -285,7 +285,7 @@ msgstr "" msgid "Failed to clean the {rpath} repository" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5584 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5593 msgid "Failed to clear the file" msgstr "" @@ -302,57 +302,57 @@ msgstr "" msgid "Failed to compose %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/patch.py:67 +#: ../calculate-lib/pym/calculate/lib/format/patch.py:69 msgid "Failed to convert the text template to XML" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1091 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1108 #, python-format msgid "Failed to copy '%(src)s' to '%(dst)s'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4712 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4724 #, python-brace-format msgid "Failed to copy {ffrom} to {fto}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:729 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:734 msgid "Failed to create DOS partition table" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:772 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:777 msgid "Failed to create GPT partition table" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:862 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:867 msgid "Failed to create LVM" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5891 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5901 msgid "Failed to create a symbolic link" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1375 #: ../calculate-lib/pym/calculate/lib/utils/files.py:1388 -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1391 -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1406 -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1423 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1401 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1404 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1419 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1436 #, python-format msgid "Failed to create tarball: %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4088 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4100 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4097 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4109 msgid "Failed to create the directory: " msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:145 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5647 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5745 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:147 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5656 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5755 msgid "Failed to create the file" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:872 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:877 #, python-format msgid "Failed to create volume %s" msgstr "" @@ -362,25 +362,25 @@ msgstr "" msgid "Failed to decompose %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5192 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5207 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5209 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5224 msgid "Failed to delete the directory: " msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5612 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5671 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5695 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5734 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5878 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5621 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5680 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5704 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5743 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5888 msgid "Failed to delete the file" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5601 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5660 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5610 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5669 msgid "Failed to delete the link" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5214 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5231 msgid "Failed to delete: " msgstr "" @@ -389,7 +389,7 @@ msgstr "" msgid "Failed to detect resolution for image '%s'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:783 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:776 msgid "Failed to detect the system profile." msgstr "" @@ -398,40 +398,48 @@ msgstr "" msgid "Failed to determine domain name on %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/linux.py:283 +#: ../calculate-lib/pym/calculate/lib/variables/linux.py:279 msgid "Failed to determine the system profile" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2285 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4593 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6213 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6288 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6316 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6343 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6439 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2298 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4608 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6230 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6304 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6332 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6359 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6455 msgid "Failed to execute" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5567 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5576 #, python-format msgid "Failed to execute %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:295 +#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:299 #, python-format msgid "Failed to fetch Packages from binary host %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:320 +#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:324 msgid "Failed to fetch Packages signature" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:388 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:384 #, python-format msgid "Failed to find %s volume" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:305 +#: ../calculate-lib/pym/calculate/lib/utils/video.py:62 +msgid "Failed to get Base EDID block" +msgstr "" + +#: ../calculate-lib/pym/calculate/lib/utils/video.py:66 +msgid "Failed to get DTD record" +msgstr "" + +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:317 msgid "Failed to get btrfs compression" msgstr "" @@ -441,47 +449,47 @@ msgstr "" msgid "Failed to get the repository status for {rpath}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:976 +#: ../calculate-lib/pym/calculate/lib/datavars.py:966 #, python-format msgid "Failed to get value %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1579 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1578 #, python-brace-format msgid "Failed to hide {packages}: {error}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1604 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1603 #, python-brace-format msgid "Failed to hide {package}: {error}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1317 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1304 #, python-format msgid "Failed to import module %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/xml_xfcepanel.py:195 -#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:87 -#: ../calculate-lib/pym/calculate/lib/format/kernel.py:85 -#: ../calculate-lib/pym/calculate/lib/format/world.py:81 -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:270 #: ../calculate-lib/pym/calculate/lib/format/json.py:73 -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:180 +#: ../calculate-lib/pym/calculate/lib/format/kernel.py:85 +#: ../calculate-lib/pym/calculate/lib/format/world.py:83 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:268 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:177 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:87 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfcepanel.py:193 msgid "Failed to join the template" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4725 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4737 #, python-format msgid "Failed to modify %s contents" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:243 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:239 #, python-brace-format msgid "Failed to mount {source} to {target}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1630 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1643 #, python-format msgid "Failed to move data: %s" msgstr "" @@ -491,12 +499,12 @@ msgstr "" msgid "Failed to move to branch {branch} in the {rpath} repository" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5724 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5733 msgid "Failed to open the file" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5095 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5488 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5114 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5497 msgid "Failed to open the template" msgstr "" @@ -506,87 +514,91 @@ msgstr "" msgid "Failed to optimize repository %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/common.py:552 +#: ../calculate-lib/pym/calculate/lib/utils/video.py:56 +msgid "Failed to parse EDID information: {}" +msgstr "" + +#: ../calculate-lib/pym/calculate/lib/utils/common.py:536 msgid "Failed to parse Private.sig" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4765 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4867 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4777 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4886 #, python-format msgid "Failed to read templates directory %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:660 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:654 msgid "Failed to receive portage config" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4967 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4986 #, 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:4721 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4733 #, python-format msgid "Failed to remove %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1624 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1637 #, python-format msgid "Failed to rename data: %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5937 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5947 #, python-format msgid "Failed to restart %s service" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1464 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1477 #, python-brace-format msgid "Failed to rsync {src} to {dst}: {error}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:322 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:332 msgid "Failed to set btrfs compression" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5939 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5949 #, python-format msgid "Failed to start %s service" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5938 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5948 #, python-format msgid "Failed to stop %s service" msgstr "" -#: ../calculate-lib/pym/calculate/lib/encrypt.py:126 -#: ../calculate-lib/pym/calculate/lib/encrypt.py:130 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:124 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:128 #, python-format msgid "Failed to support '%s' encryption algorithm" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5341 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5358 #, python-brace-format msgid "Failed to synchronize directory {dn}: {error}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:254 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:250 #, python-brace-format msgid "Failed to umount {target}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1622 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1621 #, python-brace-format msgid "Failed to unhide packages: {error}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1632 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1631 #, python-brace-format msgid "Failed to unhide: {error}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/common.py:538 +#: ../calculate-lib/pym/calculate/lib/utils/common.py:522 msgid "Failed to unwrap the passphrase" msgstr "" @@ -596,47 +608,47 @@ msgstr "" msgid "Failed to update the repository in {rpath}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6192 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6208 #, python-format msgid "Failed to use %s " msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6196 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6198 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6212 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6214 msgid "Failed to use patch " msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:135 -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:149 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:137 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:151 msgid "Failed to write to file" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:884 +#: ../calculate-lib/pym/calculate/lib/datavars.py:909 msgid "Field variable got not iterable value" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3332 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3341 #, python-brace-format msgid "Function '{funcname}' used by {template} is deprecated and will be removed in the future" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1953 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1965 #, python-brace-format msgid "Function takes at least {num}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1963 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1975 #, python-brace-format msgid "Function takes at most {num}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1957 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1967 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1969 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1979 #, python-brace-format msgid "Function takes exactly {num}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1949 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1961 msgid "Function takes no arguments" msgstr "" @@ -644,105 +656,105 @@ msgstr "" msgid "GPG is not initialized" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:329 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:341 #, python-format msgid "Group ID %s not found" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5269 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5825 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5286 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5835 msgid "Group not found on the system: " msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4361 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4376 msgid "Headers of directory templates and headers of files on the first level should include an action variable" msgstr "" +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:62 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:149 #: ../calculate-lib/pym/calculate/lib/format/xml_xfcepanel.py:81 -#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:150 -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:61 msgid "" "In the text of the XML template, reserved attribute 'action' comes with an incorrect value.\n" "Valid values of the 'action' attribute are: (action=\"join\", action=\"replace\", action=\"drop\")" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:101 -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:151 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:154 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:100 msgid "" "In the text of the XML template, reserved attribute 'action' comes with an incorrect value.\n" "Valid values of the 'action' attribute are: (action=\"join\", action=\"replace\",action=\"drop\")" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:143 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:146 #, python-format msgid "Incorrect \"type\" attribute : " msgstr "" +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:190 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:93 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:182 #: ../calculate-lib/pym/calculate/lib/format/xml_xfcepanel.py:111 -#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:183 -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:187 -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:92 msgid "Incorrect action=\"drop\" in the root node" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:228 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:231 msgid "Incorrect file format" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1040 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1230 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5128 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5499 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1048 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1239 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5145 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5508 msgid "Incorrect template" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/patch.py:77 -#: ../calculate-lib/pym/calculate/lib/format/patch.py:90 -#: ../calculate-lib/pym/calculate/lib/format/patch.py:115 +#: ../calculate-lib/pym/calculate/lib/format/patch.py:79 +#: ../calculate-lib/pym/calculate/lib/format/patch.py:92 +#: ../calculate-lib/pym/calculate/lib/format/patch.py:117 msgid "Incorrect template text" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/patch.py:99 -#: ../calculate-lib/pym/calculate/lib/format/patch.py:106 +#: ../calculate-lib/pym/calculate/lib/format/patch.py:101 +#: ../calculate-lib/pym/calculate/lib/format/patch.py:108 #, python-format msgid "Incorrect text of template '%s'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/patch.py:95 +#: ../calculate-lib/pym/calculate/lib/format/patch.py:97 msgid "Incorrect text of template ''" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4032 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4041 msgid "Invalid oct value: " msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:716 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:710 msgid "Local templates" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:82 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:84 #, python-format msgid "Lock timeout of %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1515 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1504 #, python-format msgid "Loop dependence of variables '%s'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:336 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:331 msgid "Manually update config files" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:295 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:290 msgid "Mark as human modification" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:328 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:323 msgid "Method for updating config files" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5764 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5774 #, python-format msgid "Missed source link in template '%s'" msgstr "" @@ -752,36 +764,36 @@ msgstr "" msgid "Need to install {packages}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/action.py:59 +#: ../calculate-lib/pym/calculate/lib/variables/action.py:58 msgid "Need to specify an action name" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/user.py:98 +#: ../calculate-lib/pym/calculate/lib/variables/user.py:97 msgid "Need to specify user" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1756 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1745 msgid "Next" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4070 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4079 msgid "No access to the directory: " msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4345 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4360 msgid "No conditions for checking the value of an action variable" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/action.py:62 +#: ../calculate-lib/pym/calculate/lib/variables/action.py:61 msgid "No custom action on this system" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1330 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1343 #, python-format msgid "No directory name available for %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2282 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2295 #, python-format msgid "No packages in %s category" msgstr "" @@ -791,58 +803,58 @@ msgstr "" msgid "No reply from %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:78 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:77 msgid "No space left on device" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5254 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5808 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5271 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5818 msgid "No such user on the system: " msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:53 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:54 #, python-format msgid "Not found attribute \"name\" in %(tag)s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/world.py:118 +#: ../calculate-lib/pym/calculate/lib/format/world.py:120 #, python-brace-format msgid "Not found {package} in world" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/hardware.py:74 +#: ../calculate-lib/pym/calculate/lib/variables/hardware.py:73 msgid "Number of processors" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6129 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6145 #, python-format msgid "Option %s should be used for format=backgrounds only" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6121 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6137 #, python-format msgid "Option %s should be used for format=dconf only" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6113 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6129 #, python-format msgid "Option %s should be used for format=patch only" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5175 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5192 #, python-format msgid "Option '%(opt)s' should be used with %(appends)s only" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:715 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:709 msgid "Overlay templates" msgstr "" -#: ../calculate-lib/pym/calculate/lib/encrypt.py:147 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:145 msgid "Password encryption error, method getHash()" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:1085 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:1088 msgid "Please select devices for partitions changing" msgstr "" @@ -852,7 +864,7 @@ msgstr "" msgid "Reference {mark} not found in repository {url}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:718 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:712 msgid "Remote templates" msgstr "" @@ -866,85 +878,85 @@ msgstr "" msgid "Repository {path} is not a directory" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/ip.py:435 +#: ../calculate-lib/pym/calculate/lib/utils/ip.py:446 msgid "Request timed out" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:1118 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:1121 msgid "Root to all free size should not use with update partition or calculate partition" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:784 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:777 #, python-brace-format msgid "Select the profile with command {cmd}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5932 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5942 #, python-format msgid "Service %s has been restarted" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5934 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5944 #, python-format msgid "Service %s has been started" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5933 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5943 #, python-format msgid "Service %s has been stopped" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:859 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:852 msgid "Show warning" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:335 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:330 msgid "Skip the update of config files" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4357 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4372 msgid "Skipped directories:" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4353 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4368 msgid "Skipped templates:" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4730 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4741 msgid "Some config files need updating. Perform run dispatch-conf." msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5322 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5339 #, python-format msgid "Source path %s is not a directory" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:702 +#: ../calculate-lib/pym/calculate/lib/datavars.py:726 #, python-format msgid "Source variable %s does not contain a list" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5582 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5599 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5610 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5645 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5658 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5669 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5692 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5722 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5732 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5743 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5772 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5876 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5890 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5591 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5608 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5619 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5654 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5667 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5678 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5701 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5731 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5741 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5753 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5782 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5886 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5900 msgid "Template error" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6452 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6468 msgid "Template type not found: " msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:722 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:716 msgid "Templates location" msgstr "" @@ -964,11 +976,11 @@ msgstr "" msgid "The Git tool is not found" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:705 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:714 msgid "The function value is not a version" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2399 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2412 msgid "The second argument of the function is not 'root'" msgstr "" @@ -976,13 +988,13 @@ msgstr "" msgid "The source text file is not JSON" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/world.py:127 +#: ../calculate-lib/pym/calculate/lib/format/world.py:129 msgid "The source text file is not world" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/xml_xfcepanel.py:48 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:78 #: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:75 -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:76 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfcepanel.py:49 msgid "The template content is not XML" msgstr "" @@ -990,126 +1002,126 @@ msgstr "" msgid "The template text file is not JSON" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/world.py:130 +#: ../calculate-lib/pym/calculate/lib/format/world.py:132 msgid "The template text file is not world" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:241 -#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:244 #: ../calculate-lib/pym/calculate/lib/format/kernel.py:103 #: ../calculate-lib/pym/calculate/lib/format/kernel.py:106 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:238 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:241 msgid "The text file is not XML" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:48 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:49 #, python-format msgid "The text is not a valid gconf-XML format (found '<%(tag)s>..')" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:120 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:123 #, python-format msgid "The text is not a valid gconf-XML format (found '<%(tag)s>..')" msgstr "" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:112 -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:43 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:115 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:44 msgid "The text is not a valid gconf-XML format (not found '...')" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2454 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2467 msgid "The third argument of the function is not 'root'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:578 +#: ../calculate-lib/pym/calculate/lib/datavars.py:604 #, python-brace-format msgid "The value for variable '{varname}' may be {vartype}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:541 -#: ../calculate-lib/pym/calculate/lib/datavars.py:549 +#: ../calculate-lib/pym/calculate/lib/datavars.py:568 +#: ../calculate-lib/pym/calculate/lib/datavars.py:576 #, python-brace-format msgid "The value for variable '{varname}' may be {vartype} only" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:759 +#: ../calculate-lib/pym/calculate/lib/datavars.py:780 #, python-brace-format msgid "The value for {varname} may be '{vartype}' only" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:536 +#: ../calculate-lib/pym/calculate/lib/datavars.py:563 #, python-brace-format msgid "The value of variable '{varname}' must be integer" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:218 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:214 #, python-brace-format msgid "There is not enough space on this device, to perform the autopartition need {need}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:698 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:707 msgid "This value is not a version" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:282 -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:348 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:285 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:351 #, python-format msgid "Trying to fetch a variable of 'samba' format from file %s ('plasma' format)" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:175 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:177 #, python-format msgid "Trying to write a variable of 'samba' format to file %s ('plasma' format)" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1682 -#: ../calculate-lib/pym/calculate/lib/datavars.py:1717 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1671 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1706 #, python-format msgid "Unable to find alias '%s' for the template variables path" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1677 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1666 #, python-brace-format msgid "Unable to write variable {varname} into '{location}'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:334 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:329 msgid "Use the new config files" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/user.py:102 +#: ../calculate-lib/pym/calculate/lib/variables/user.py:101 #, python-format msgid "User %s does not exist" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:322 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:334 #, python-format msgid "User %s not found" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/user.py:89 +#: ../calculate-lib/pym/calculate/lib/variables/user.py:88 msgid "User name" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:574 +#: ../calculate-lib/pym/calculate/lib/datavars.py:600 #, python-brace-format msgid "Values for variable '{varname}' may be {vartype}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:545 +#: ../calculate-lib/pym/calculate/lib/datavars.py:572 #, python-brace-format msgid "Values for variable '{varname}' may be {vartype} only" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1313 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1300 #, python-format msgid "Variable %s not found" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:424 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:418 msgid "Verbose output" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/hardware.py:199 +#: ../calculate-lib/pym/calculate/lib/variables/hardware.py:196 msgid "Videocard" msgstr "" @@ -1124,12 +1136,12 @@ msgstr "" msgid "Wrong 'contents' format rule: %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/accounts.py:201 +#: ../calculate-lib/pym/calculate/lib/utils/accounts.py:204 #, python-brace-format msgid "Wrong GIDs {gid1} {gid2}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:308 +#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:312 msgid "Wrong Packages signature" msgstr "" @@ -1138,31 +1150,31 @@ msgstr "" msgid "Wrong UIDs {uid1} {uid2}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:199 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:197 #, python-format msgid "" "Wrong df output:\n" "%s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3384 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3393 #, python-brace-format msgid "Wrong entry '{data}' for {var_name}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:767 +#: ../calculate-lib/pym/calculate/lib/datavars.py:788 #, python-brace-format msgid "Wrong entry '{entry}' for table variable '{varname}'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6173 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6189 #, python-format msgid "Wrong header parameter 'format=%s' in template" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6237 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6359 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6369 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6254 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6375 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6385 #, python-brace-format msgid "Wrong header parameter '{var}={val}' in template" msgstr "" @@ -1172,24 +1184,24 @@ msgstr "" msgid "Wrong image format '%s'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:525 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:674 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:716 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:534 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:683 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:725 msgid "Wrong interval operator" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6138 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6154 #, python-format msgid "Wrong option '%(param)s=%(type)s' in template %(file)s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6300 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6328 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6316 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6344 #, python-brace-format msgid "Wrong option '{var}={val}' in template {fn}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2613 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2622 msgid "Wrong regular expression" msgstr "" @@ -1199,51 +1211,55 @@ msgstr "" msgid "Wrong repository in the {rpath} directory" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6244 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6376 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6412 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6422 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6261 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6392 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6427 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6437 msgid "Wrong template" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6448 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6464 msgid "Wrong template option (type append)" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5149 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5160 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5234 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5257 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5272 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5166 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5177 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5251 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5274 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5289 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5294 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5520 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5532 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5565 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5788 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5810 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5827 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5838 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5844 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5306 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5311 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5529 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5541 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5574 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5798 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5820 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5837 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5848 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5854 #, python-format msgid "Wrong value '%s' in the template" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5571 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5580 #, python-brace-format msgid "Wrong value '{var}={val}' in template" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1485 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1476 #, python-format msgid "Wrong variable name %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:1095 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:1098 msgid "You should use LVM to install on more that one device" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:719 +#: ../calculate-lib/pym/calculate/contrib/passlib/ext/django/utils.py:957 +msgid "algorithm" +msgstr "" + +#: ../calculate-lib/pym/calculate/lib/variables/env.py:713 msgid "clt templates" msgstr "" @@ -1251,292 +1267,292 @@ msgstr "" msgid "custom action" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1623 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1622 msgid "directory not found" msgstr "" -#: ../calculate-lib/pym/calculate/lib/encrypt.py:76 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:74 msgid "empty password" msgstr "" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1318 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3731 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5015 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5023 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3740 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5034 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5042 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1305 msgid "error" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:303 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2754 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3611 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:315 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2763 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3620 #, python-format msgid "error in template %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3612 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3621 #, python-format msgid "error, template term '%s'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2847 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2856 msgid "error: global variables stack empty" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2183 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2194 #, python-format msgid "error: local variable %s not defined" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2189 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2200 #, python-format msgid "error: template term %s, incorrect data" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2333 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2785 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2820 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3476 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3519 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3530 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2346 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2794 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2829 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3485 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3528 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3539 #, python-format msgid "error: variable %s does not exist" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2814 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2823 #, python-format msgid "error: variable %s exists" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2172 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2179 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2183 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2190 #, python-format msgid "error: variable %s is not integer" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2755 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2764 #, python-format msgid "error: variable %s not found" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/ip.py:415 +#: ../calculate-lib/pym/calculate/lib/utils/ip.py:426 #, python-format msgid "failed. (socket error: '%s')" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2661 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2670 msgid "first parameter must be number" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3668 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3677 #, python-format msgid "function of templates '%s' not found" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2689 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2698 msgid "function rnd support one or two arguments only" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3034 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3043 msgid "function support two or three parameters" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:593 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:604 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:612 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:622 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:672 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:696 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:703 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:714 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:765 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:776 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:602 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:613 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:621 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:631 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:681 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:705 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:712 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:723 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:774 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:785 msgid "incorrect" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1085 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1108 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1274 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1291 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1093 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1116 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1283 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1300 #, python-format msgid "incorrect header parameter: '%s'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1219 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1228 #, python-format msgid "incorrect text in the template: '%s'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4146 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4155 msgid "invalid template content: " msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4162 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4173 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4171 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4182 msgid "invalid template name: " msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2701 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2710 #, python-brace-format msgid "length of UUID must not be above {maxlen}" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:327 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:322 msgid "manually update config files" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:294 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:289 msgid "mark as human modification" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3555 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3564 #, python-format msgid "mount point '/' or '/%s' not found in the value of variable os_disk_install" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/text.py:391 +#: ../calculate-lib/pym/calculate/lib/utils/text.py:388 msgid "or" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1581 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1580 msgid "package is already hidden" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1101 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1283 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1109 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1292 #, python-format msgid "redefine header parameter: '%s'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/text.py:256 +#: ../calculate-lib/pym/calculate/lib/utils/text.py:253 msgid "rows" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:723 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:717 #, python-format msgid "select location for templates %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:326 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:321 msgid "skip the update of config files" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1042 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1232 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1050 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1241 msgid "template header not valid" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3243 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3252 #, python-format msgid "template variable '%s' not found" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4880 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4899 #, python-brace-format msgid "templates in {tempath} are skipped" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2743 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2752 msgid "the first argument of the function is neither 'upper' or 'lower' or 'capitalize'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2458 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2471 msgid "the first argument of the function is neither 'ver' or 'num' or 'char' or 'empty'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2712 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2721 msgid "the first argument of the function must be 'num', 'pas' or 'uuid'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3045 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3054 msgid "the first parameter must be the resolution" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2585 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2594 msgid "the option name should not starts with CONFIG_" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2694 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2703 msgid "the second argument of the function is not a number" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3170 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3176 msgid "the third argument of the function is neither 'url' or 'purl' or 'unicode'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3029 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3038 msgid "third parameter may be 'file' only" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1559 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1574 #, python-format msgid "unable to execute '%s'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1593 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1608 msgid "unable to open the directory as file:" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1548 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1568 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1598 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1563 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1583 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1613 msgid "unable to open the file:" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4419 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6671 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4433 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6690 msgid "undefined variable: " msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:325 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:320 msgid "use the new config files" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/user.py:88 +#: ../calculate-lib/pym/calculate/lib/variables/user.py:87 msgid "username" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3480 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3538 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3489 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3547 #, python-format msgid "value of %s is not a list or a tuple" msgstr "" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:423 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:417 msgid "verbose output" msgstr "" -#: ../calculate-lib/pym/calculate/lib/encrypt.py:127 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:125 msgid "without py-smbpasswd" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3512 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3529 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3521 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3538 #, python-format msgid "wrong %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/text.py:316 +#: ../calculate-lib/pym/calculate/lib/utils/text.py:313 #, python-format msgid "wrong dict value: %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3640 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3649 #, python-format msgid "wrong function syntax %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/text.py:343 +#: ../calculate-lib/pym/calculate/lib/utils/text.py:340 #, python-format msgid "wrong list value: %s" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2405 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2470 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2418 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2483 #, python-format msgid "wrong path '%s'" msgstr "" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4878 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4897 #, python-brace-format msgid "{dirpath} is a file" msgstr "" @@ -1546,6 +1562,10 @@ msgstr "" msgid "{url} does not appear to be a git repository" msgstr "" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:284 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:296 msgid "{} is not btrfs" msgstr "" + +#: ../calculate-lib/pym/calculate/lib/utils/video.py:46 +msgid "{} not found" +msgstr "" diff --git a/pot/cl_unix3.pot b/pot/cl_unix3.pot index 5b68d06..f85d516 100644 --- a/pot/cl_unix3.pot +++ b/pot/cl_unix3.pot @@ -128,14 +128,14 @@ msgstr "" msgid "Deleting of user manually interrupted" msgstr "" -#: ../calculate-unix/pym/unix/variables/users.py:410 #: ../calculate-unix/pym/unix/variables/groups.py:401 #: ../calculate-unix/pym/unix/variables/groups.py:427 +#: ../calculate-unix/pym/unix/variables/users.py:410 msgid "Do not change" msgstr "" -#: ../calculate-unix/pym/unix/variables/users.py:424 #: ../calculate-unix/pym/unix/variables/groups.py:363 +#: ../calculate-unix/pym/unix/variables/users.py:424 msgid "Exclude from groups" msgstr "" @@ -187,8 +187,8 @@ msgstr "" msgid "Failed to modify {ur_unix_group_name} group in Unix server!" msgstr "" -#: ../calculate-unix/pym/unix/utils/cl_unix_usermod.py:48 #: ../calculate-unix/pym/unix/utils/cl_unix_passwd.py:48 +#: ../calculate-unix/pym/unix/utils/cl_unix_usermod.py:48 #, python-brace-format msgid "Failed to modify {ur_unix_login} user in Unix server!" msgstr "" @@ -253,16 +253,16 @@ msgstr "" msgid "Generate new service password" msgstr "" -#: ../calculate-unix/pym/unix/wsdl_unix.py:257 -#: ../calculate-unix/pym/unix/wsdl_unix.py:332 #: ../calculate-unix/pym/unix/variables/groups.py:55 #: ../calculate-unix/pym/unix/variables/groups.py:81 #: ../calculate-unix/pym/unix/variables/groups.py:104 +#: ../calculate-unix/pym/unix/wsdl_unix.py:257 +#: ../calculate-unix/pym/unix/wsdl_unix.py:332 msgid "Group" msgstr "" -#: ../calculate-unix/pym/unix/variables/users.py:258 #: ../calculate-unix/pym/unix/variables/groups.py:132 +#: ../calculate-unix/pym/unix/variables/users.py:258 #: ../calculate-unix/pym/unix/unix.py:144 #, python-format msgid "Group %s not found" @@ -319,8 +319,8 @@ msgstr "" msgid "Group {ur_unix_group_name} modified in Unix service!" msgstr "" -#: ../calculate-unix/pym/unix/wsdl_unix.py:562 #: ../calculate-unix/pym/unix/unix.py:738 +#: ../calculate-unix/pym/unix/wsdl_unix.py:562 msgid "Groups" msgstr "" @@ -353,8 +353,8 @@ msgstr "" msgid "Include to groups" msgstr "" -#: ../calculate-unix/pym/unix/variables/users.py:75 #: ../calculate-unix/pym/unix/variables/groups.py:69 +#: ../calculate-unix/pym/unix/variables/users.py:75 msgid "List is used as keyword" msgstr "" @@ -380,8 +380,8 @@ msgstr "" msgid "Modifing of group manually interrupted" msgstr "" -#: ../calculate-unix/pym/unix/utils/cl_unix_usermod.py:49 #: ../calculate-unix/pym/unix/utils/cl_unix_passwd.py:49 +#: ../calculate-unix/pym/unix/utils/cl_unix_usermod.py:49 msgid "Modifing of user manually interrupted" msgstr "" @@ -628,8 +628,8 @@ msgstr "" msgid "Unix service has no users" msgstr "" -#: ../calculate-unix/pym/unix/variables/unix.py:127 #: ../calculate-unix/pym/unix/variables/action.py:36 +#: ../calculate-unix/pym/unix/variables/unix.py:127 msgid "Unix service has not been configured" msgstr "" @@ -736,8 +736,8 @@ msgstr "" msgid "User {ur_unix_login} deleted from Unix service!" msgstr "" -#: ../calculate-unix/pym/unix/utils/cl_unix_usermod.py:47 #: ../calculate-unix/pym/unix/utils/cl_unix_passwd.py:47 +#: ../calculate-unix/pym/unix/utils/cl_unix_usermod.py:47 #, python-brace-format msgid "User {ur_unix_login} modified in Unix service!" msgstr "" @@ -747,10 +747,10 @@ msgstr "" msgid "User {user} already exist in groups {groups}" msgstr "" -#: ../calculate-unix/pym/unix/wsdl_unix.py:626 #: ../calculate-unix/pym/unix/variables/groups.py:265 #: ../calculate-unix/pym/unix/variables/groups.py:334 #: ../calculate-unix/pym/unix/unix.py:867 +#: ../calculate-unix/pym/unix/wsdl_unix.py:626 msgid "Users" msgstr "" @@ -783,8 +783,8 @@ msgstr "" msgid "Value" msgstr "" -#: ../calculate-unix/pym/unix/utils/cl_unix_usershow.py:49 #: ../calculate-unix/pym/unix/utils/cl_unix_groupshow.py:49 +#: ../calculate-unix/pym/unix/utils/cl_unix_usershow.py:49 msgid "Viewing manually interrupted" msgstr "" diff --git a/pot/cl_update3.pot b/pot/cl_update3.pot index e88fd7c..82b7499 100644 --- a/pot/cl_update3.pot +++ b/pot/cl_update3.pot @@ -1,57 +1,57 @@ -#: ../calculate-update/pym/update/update.py:720 +#: ../calculate-update/pym/update/update.py:721 #, python-brace-format msgid " ({current} of {maximum})" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:816 +#: ../calculate-update/pym/update/variables/update.py:829 #, python-format msgid "%s overlay templates" msgstr "" -#: ../calculate-update/pym/update/update.py:666 +#: ../calculate-update/pym/update/update.py:667 #, python-brace-format msgid "({current} of {maximum})" msgstr "" -#: ../calculate-update/pym/update/update.py:438 +#: ../calculate-update/pym/update/update.py:439 msgid ": " msgstr "" -#: ../calculate-update/pym/update/update.py:755 +#: ../calculate-update/pym/update/update.py:756 msgid "Assigning files to packages" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1353 +#: ../calculate-update/pym/update/variables/update.py:1366 msgid "Automatically check updates" msgstr "" -#: ../calculate-update/pym/update/update.py:1632 +#: ../calculate-update/pym/update/update.py:1633 msgid "Binary packages on the current binhost {} are older than local" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:796 +#: ../calculate-update/pym/update/variables/update.py:809 msgid "Calculate overlay templates" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:264 -#: ../calculate-update/pym/update/utils/cl_update.py:282 -#: ../calculate-update/pym/update/utils/cl_update.py:306 +#: ../calculate-update/pym/update/utils/cl_update.py:271 +#: ../calculate-update/pym/update/utils/cl_update.py:302 +#: ../calculate-update/pym/update/utils/cl_update.py:326 msgid "Calculating dependencies" msgstr "" -#: ../calculate-update/pym/update/wsdl_update.py:102 +#: ../calculate-update/pym/update/wsdl_update.py:103 msgid "Change the Profile" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:549 +#: ../calculate-update/pym/update/variables/update.py:562 msgid "Check Package signature" msgstr "" -#: ../calculate-update/pym/update/update.py:1466 +#: ../calculate-update/pym/update/update.py:1467 msgid "Check packages index signature" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1624 +#: ../calculate-update/pym/update/variables/update.py:1646 msgid "Check the repositories integrity" msgstr "" @@ -59,11 +59,11 @@ msgstr "" msgid "Checking current binhost" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:261 +#: ../calculate-update/pym/update/utils/cl_update.py:268 msgid "Checking for updates" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:343 +#: ../calculate-update/pym/update/utils/cl_update.py:363 msgid "Checking reverse dependencies" msgstr "" @@ -72,7 +72,7 @@ msgstr "" msgid "Checking {eachvar:capitalize} updates" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1474 +#: ../calculate-update/pym/update/variables/update.py:1487 msgid "Clean obsolete programs archives" msgstr "" @@ -80,15 +80,15 @@ msgstr "" msgid "Cleaning the history of the {eachvar:capitalize} repository" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:303 +#: ../calculate-update/pym/update/utils/cl_update.py:323 msgid "Cleaning the system from needless packages" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1652 +#: ../calculate-update/pym/update/variables/update.py:1674 msgid "Clear the history of repositories" msgstr "" -#: ../calculate-update/pym/update/wsdl_update.py:154 +#: ../calculate-update/pym/update/wsdl_update.py:155 msgid "Configuration" msgstr "" @@ -96,57 +96,57 @@ msgstr "" msgid "Configuration manually interrupted" msgstr "" -#: ../calculate-update/pym/update/update.py:389 +#: ../calculate-update/pym/update/update.py:390 msgid "Configuration variables for repositories are not setup" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1385 +#: ../calculate-update/pym/update/variables/update.py:1398 msgid "Consider the autocheck schedule" msgstr "" -#: ../calculate-update/pym/update/update.py:1612 +#: ../calculate-update/pym/update/update.py:1613 msgid "Current binhost is absent in list of update servers" msgstr "" -#: ../calculate-update/pym/update/update.py:1655 +#: ../calculate-update/pym/update/update.py:1656 msgid "Current binhost {} has wrong signature" msgstr "" -#: ../calculate-update/pym/update/update.py:1626 +#: ../calculate-update/pym/update/update.py:1627 msgid "Current binhost {} is not valid" msgstr "" -#: ../calculate-update/pym/update/update.py:1629 +#: ../calculate-update/pym/update/update.py:1630 msgid "Current binhost {} is outdated" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:729 +#: ../calculate-update/pym/update/variables/update.py:742 msgid "Distribution name" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:797 -#: ../calculate-update/pym/update/variables/update.py:798 +#: ../calculate-update/pym/update/variables/update.py:810 +#: ../calculate-update/pym/update/variables/update.py:811 msgid "Distribution templates" msgstr "" -#: ../calculate-update/pym/update/emerge_parser.py:395 +#: ../calculate-update/pym/update/emerge_parser.py:398 msgid "Emerge failed" msgstr "" -#: ../calculate-update/pym/update/update.py:332 +#: ../calculate-update/pym/update/update.py:334 msgid "Emerge is running. Try to run later." msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1398 +#: ../calculate-update/pym/update/variables/update.py:1411 msgid "Emerge-like packages list" msgstr "" -#: ../calculate-update/pym/update/update.py:684 +#: ../calculate-update/pym/update/update.py:685 #, python-brace-format msgid "Emerging {package}" msgstr "" -#: ../calculate-update/pym/update/update.py:1183 +#: ../calculate-update/pym/update/update.py:1184 msgid "Failed to apply profiles templates" msgstr "" @@ -154,28 +154,28 @@ msgstr "" msgid "Failed to configure the updates autocheck procedure!" msgstr "" -#: ../calculate-update/pym/update/update.py:614 +#: ../calculate-update/pym/update/update.py:615 msgid "Failed to create previous eix" msgstr "" -#: ../calculate-update/pym/update/update.py:1149 +#: ../calculate-update/pym/update/update.py:1150 #, python-format msgid "Failed to determine profile %s" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:945 -#: ../calculate-update/pym/update/variables/update.py:950 +#: ../calculate-update/pym/update/variables/update.py:958 +#: ../calculate-update/pym/update/variables/update.py:963 msgid "Failed to determine the repository host" msgstr "" -#: ../calculate-update/pym/update/emerge_parser.py:629 +#: ../calculate-update/pym/update/emerge_parser.py:633 #, python-format msgid "Failed to emerge %s" msgstr "" -#: ../calculate-update/pym/update/update.py:736 -#: ../calculate-update/pym/update/update.py:748 -#: ../calculate-update/pym/update/update.py:1687 +#: ../calculate-update/pym/update/update.py:737 +#: ../calculate-update/pym/update/update.py:749 +#: ../calculate-update/pym/update/update.py:1688 #, python-format msgid "Failed to find the %s command" msgstr "" @@ -184,29 +184,29 @@ msgstr "" msgid "Failed to find the binary updates server" msgstr "" -#: ../calculate-update/pym/update/update.py:1598 +#: ../calculate-update/pym/update/update.py:1599 msgid "Failed to find the reliable server with appropriate updates" msgstr "" -#: ../calculate-update/pym/update/update.py:1292 -#: ../calculate-update/pym/update/update.py:1602 +#: ../calculate-update/pym/update/update.py:1293 +#: ../calculate-update/pym/update/update.py:1603 msgid "Failed to find the server with appropriate updates" msgstr "" -#: ../calculate-update/pym/update/update.py:1604 +#: ../calculate-update/pym/update/update.py:1605 msgid "Failed to find the working server with updates" msgstr "" -#: ../calculate-update/pym/update/update.py:1402 +#: ../calculate-update/pym/update/update.py:1403 msgid "Failed to get values for binhost search" msgstr "" -#: ../calculate-update/pym/update/update.py:1444 +#: ../calculate-update/pym/update/update.py:1445 #, python-format msgid "Failed to load public keys from '%s' for signature checking" msgstr "" -#: ../calculate-update/pym/update/update.py:436 +#: ../calculate-update/pym/update/update.py:437 #, python-brace-format msgid "Failed to modify the {repname} repository" msgstr "" @@ -216,34 +216,34 @@ msgstr "" msgid "Failed to move the profile: %s" msgstr "" -#: ../calculate-update/pym/update/update.py:1373 +#: ../calculate-update/pym/update/update.py:1374 msgid "Failed to remove cached Package index" msgstr "" -#: ../calculate-update/pym/update/update.py:1364 +#: ../calculate-update/pym/update/update.py:1365 msgid "Failed to remove cached ini.env of binary repository" msgstr "" -#: ../calculate-update/pym/update/update.py:1464 +#: ../calculate-update/pym/update/update.py:1465 msgid "Failed to save Packages" msgstr "" -#: ../calculate-update/pym/update/update.py:1157 -#: ../calculate-update/pym/update/update.py:1164 +#: ../calculate-update/pym/update/update.py:1158 +#: ../calculate-update/pym/update/update.py:1165 #, python-format msgid "Failed to set the profile: %s" msgstr "" -#: ../calculate-update/pym/update/update.py:637 +#: ../calculate-update/pym/update/update.py:638 msgid "Failed to update eix cache" msgstr "" -#: ../calculate-update/pym/update/update.py:593 +#: ../calculate-update/pym/update/update.py:594 msgid "Failed to update metadata" msgstr "" -#: ../calculate-update/pym/update/update.py:561 -#: ../calculate-update/pym/update/update.py:572 +#: ../calculate-update/pym/update/update.py:562 +#: ../calculate-update/pym/update/update.py:573 #, python-brace-format msgid "Failed to update the cache of the {rname} repository" msgstr "" @@ -252,7 +252,7 @@ msgstr "" msgid "Failed to update the profile" msgstr "" -#: ../calculate-update/pym/update/update.py:532 +#: ../calculate-update/pym/update/update.py:533 #, python-brace-format msgid "Failed to update the {rname} repository" msgstr "" @@ -261,7 +261,7 @@ msgstr "" msgid "Failed to use base binhost" msgstr "" -#: ../calculate-update/pym/update/update.py:1124 +#: ../calculate-update/pym/update/update.py:1125 msgid "Failed to use the new profile. Try again." msgstr "" @@ -269,69 +269,69 @@ msgstr "" msgid "Fallback syncing the {eachvar:capitalize} repository" msgstr "" -#: ../calculate-update/pym/update/update.py:709 +#: ../calculate-update/pym/update/update.py:710 msgid "Fetching binary packages" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:293 +#: ../calculate-update/pym/update/utils/cl_update.py:313 msgid "Find & rebuild packages and Perl header files broken due to a perl upgrade" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:384 +#: ../calculate-update/pym/update/utils/cl_update.py:406 #: ../calculate-update/pym/update/utils/cl_update_profile.py:127 msgid "Fixing the settings" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:481 -#: ../calculate-update/pym/update/variables/update.py:505 -#: ../calculate-update/pym/update/variables/update.py:529 -#: ../calculate-update/pym/update/variables/update.py:552 +#: ../calculate-update/pym/update/variables/update.py:494 +#: ../calculate-update/pym/update/variables/update.py:518 +#: ../calculate-update/pym/update/variables/update.py:542 +#: ../calculate-update/pym/update/variables/update.py:565 msgid "Force" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1638 +#: ../calculate-update/pym/update/variables/update.py:1660 msgid "Force fix the settings" msgstr "" -#: ../calculate-update/pym/update/update.py:393 +#: ../calculate-update/pym/update/update.py:394 #, python-format msgid "Git %s is unavailable" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:554 +#: ../calculate-update/pym/update/variables/update.py:567 msgid "If has passibility" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:483 -#: ../calculate-update/pym/update/variables/update.py:507 -#: ../calculate-update/pym/update/variables/update.py:531 +#: ../calculate-update/pym/update/variables/update.py:496 +#: ../calculate-update/pym/update/variables/update.py:520 +#: ../calculate-update/pym/update/variables/update.py:544 msgid "If needed" msgstr "" -#: ../calculate-update/pym/update/update.py:702 +#: ../calculate-update/pym/update/update.py:703 #, python-format msgid "Installing %s" msgstr "" -#: ../calculate-update/pym/update/update.py:698 +#: ../calculate-update/pym/update/update.py:699 #, python-brace-format msgid "Installing {pkg} [{oldver}]" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1366 +#: ../calculate-update/pym/update/variables/update.py:1379 msgid "Interval for the updates checking" msgstr "" -#: ../calculate-update/pym/update/update.py:823 +#: ../calculate-update/pym/update/update.py:824 msgid "Listing packages for installation" msgstr "" -#: ../calculate-update/pym/update/update.py:827 -#: ../calculate-update/pym/update/update.py:852 +#: ../calculate-update/pym/update/update.py:828 +#: ../calculate-update/pym/update/update.py:853 msgid "Listing packages for removal" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:795 +#: ../calculate-update/pym/update/variables/update.py:808 msgid "Local templates" msgstr "" @@ -347,41 +347,41 @@ msgstr "" msgid "Metadata transfer" msgstr "" -#: ../calculate-update/pym/update/update.py:362 +#: ../calculate-update/pym/update/update.py:364 #, python-brace-format msgid "Move {repname} from {laymandir} to {reposdir}" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:826 +#: ../calculate-update/pym/update/variables/update.py:839 msgid "Name" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:650 +#: ../calculate-update/pym/update/variables/update.py:663 msgid "Only synchronize repositories" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1219 +#: ../calculate-update/pym/update/variables/update.py:1232 #, python-format msgid "Overlay %s is not specified in cl_update_rep_name" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:794 +#: ../calculate-update/pym/update/variables/update.py:807 msgid "Overlay templates" msgstr "" -#: ../calculate-update/pym/update/update.py:296 +#: ../calculate-update/pym/update/update.py:298 msgid "Please wait for the update time" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:635 +#: ../calculate-update/pym/update/variables/update.py:648 msgid "Pretend a package update" msgstr "" -#: ../calculate-update/pym/update/wsdl_update.py:131 +#: ../calculate-update/pym/update/wsdl_update.py:132 msgid "Profile" msgstr "" -#: ../calculate-update/pym/update/update.py:1157 +#: ../calculate-update/pym/update/update.py:1158 msgid "Profile not found" msgstr "" @@ -389,7 +389,7 @@ msgstr "" msgid "Profile not found in master" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:918 +#: ../calculate-update/pym/update/variables/update.py:931 msgid "Profile repository" msgstr "" @@ -397,11 +397,11 @@ msgstr "" msgid "Profile update manually interrupted" msgstr "" -#: ../calculate-update/pym/update/update.py:1448 +#: ../calculate-update/pym/update/update.py:1449 msgid "Public keys for Packages signature checking not found" msgstr "" -#: ../calculate-update/pym/update/update.py:424 +#: ../calculate-update/pym/update/update.py:425 #, python-brace-format msgid "Re-fetching the {name} repository" msgstr "" @@ -415,15 +415,15 @@ msgstr "" msgid "Rebuild world" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:315 +#: ../calculate-update/pym/update/utils/cl_update.py:335 msgid "Rebuilding dependent modules" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:388 +#: ../calculate-update/pym/update/variables/update.py:402 msgid "Reference" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:799 +#: ../calculate-update/pym/update/variables/update.py:812 msgid "Remote templates" msgstr "" @@ -441,16 +441,16 @@ msgid "Repositories synchronization" msgstr "" #: ../calculate-update/pym/update/variables/update.py:282 -#: ../calculate-update/pym/update/wsdl_update.py:125 +#: ../calculate-update/pym/update/wsdl_update.py:126 msgid "Repository" msgstr "" -#: ../calculate-update/pym/update/update.py:566 +#: ../calculate-update/pym/update/update.py:567 #, python-format msgid "Repository %s has its own cache" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:966 +#: ../calculate-update/pym/update/variables/update.py:979 #, python-format msgid "Repository %s has no profiles" msgstr "" @@ -460,12 +460,12 @@ msgstr "" msgid "Repository %s not found" msgstr "" -#: ../calculate-update/pym/update/update.py:558 +#: ../calculate-update/pym/update/update.py:559 #, python-brace-format msgid "Repository '{repo_name}' called '{repname}' in cl_update_rep_name" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1027 +#: ../calculate-update/pym/update/variables/update.py:1040 msgid "Repository branch" msgstr "" @@ -473,7 +473,7 @@ msgstr "" msgid "Repository cache update" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:998 +#: ../calculate-update/pym/update/variables/update.py:1011 msgid "Repository name" msgstr "" @@ -481,24 +481,24 @@ msgstr "" msgid "Repository transfer" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1213 +#: ../calculate-update/pym/update/variables/update.py:1226 msgid "Repository variables were not configured for the profile" msgstr "" -#: ../calculate-update/pym/update/wsdl_update.py:92 -#: ../calculate-update/pym/update/wsdl_update.py:145 +#: ../calculate-update/pym/update/wsdl_update.py:93 +#: ../calculate-update/pym/update/wsdl_update.py:146 msgid "Run" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1509 +#: ../calculate-update/pym/update/variables/update.py:1522 msgid "Run reverse dependencies check" msgstr "" -#: ../calculate-update/pym/update/wsdl_update.py:182 +#: ../calculate-update/pym/update/wsdl_update.py:183 msgid "Save" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1752 +#: ../calculate-update/pym/update/variables/update.py:1774 msgid "Save packages used during build" msgstr "" @@ -506,15 +506,15 @@ msgstr "" msgid "Search for the most appropriate update server" msgstr "" -#: ../calculate-update/pym/update/update.py:1669 +#: ../calculate-update/pym/update/update.py:1670 msgid "Searching new binhost" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:660 +#: ../calculate-update/pym/update/variables/update.py:673 msgid "Select at least one sync repository" msgstr "" -#: ../calculate-update/pym/update/wsdl_update.py:146 +#: ../calculate-update/pym/update/wsdl_update.py:147 msgid "Set the profile" msgstr "" @@ -522,18 +522,18 @@ msgstr "" msgid "Setting up the profile" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:482 -#: ../calculate-update/pym/update/variables/update.py:506 -#: ../calculate-update/pym/update/variables/update.py:530 -#: ../calculate-update/pym/update/variables/update.py:553 +#: ../calculate-update/pym/update/variables/update.py:495 +#: ../calculate-update/pym/update/variables/update.py:519 +#: ../calculate-update/pym/update/variables/update.py:543 +#: ../calculate-update/pym/update/variables/update.py:566 msgid "Skip" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1495 +#: ../calculate-update/pym/update/variables/update.py:1508 msgid "Skip reverse dependencies check" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1461 +#: ../calculate-update/pym/update/variables/update.py:1474 msgid "Skip the system setup" msgstr "" @@ -547,7 +547,7 @@ msgstr "" msgid "Synchronization finished" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:421 +#: ../calculate-update/pym/update/variables/update.py:435 msgid "Synchronized repositories" msgstr "" @@ -556,13 +556,13 @@ msgstr "" msgid "Syncing the {eachvar:capitalize} repository" msgstr "" -#: ../calculate-update/pym/update/update.py:211 -#: ../calculate-update/pym/update/update.py:235 +#: ../calculate-update/pym/update/update.py:213 +#: ../calculate-update/pym/update/update.py:237 #, python-brace-format msgid "Syncing the {rep} repository" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:378 +#: ../calculate-update/pym/update/utils/cl_update.py:400 msgid "System configuration" msgstr "" @@ -570,35 +570,35 @@ msgstr "" msgid "System packages list" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1191 +#: ../calculate-update/pym/update/variables/update.py:1204 msgid "System profile" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:871 +#: ../calculate-update/pym/update/variables/update.py:884 msgid "System profile version" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:417 +#: ../calculate-update/pym/update/utils/cl_update.py:448 msgid "System update finished!" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:803 +#: ../calculate-update/pym/update/variables/update.py:816 msgid "Templates location" msgstr "" -#: ../calculate-update/pym/update/update.py:630 +#: ../calculate-update/pym/update/update.py:631 msgid "The Eix tool is not found" msgstr "" -#: ../calculate-update/pym/update/update.py:515 +#: ../calculate-update/pym/update/update.py:516 msgid "The Emerge is not found" msgstr "" -#: ../calculate-update/pym/update/update.py:583 +#: ../calculate-update/pym/update/update.py:584 msgid "The Emerge tool is not found" msgstr "" -#: ../calculate-update/pym/update/update.py:549 +#: ../calculate-update/pym/update/update.py:550 msgid "The Portage tool is not found" msgstr "" @@ -606,7 +606,7 @@ msgstr "" msgid "The profile was successfully updated" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1226 +#: ../calculate-update/pym/update/variables/update.py:1239 msgid "The selected profile is not Calculate" msgstr "" @@ -614,20 +614,20 @@ msgstr "" msgid "The system is being configured" msgstr "" -#: ../calculate-update/pym/update/update.py:883 -#: ../calculate-update/pym/update/update.py:1022 +#: ../calculate-update/pym/update/update.py:884 +#: ../calculate-update/pym/update/update.py:1023 msgid "The system is up to date" msgstr "" -#: ../calculate-update/pym/update/emerge_parser.py:506 +#: ../calculate-update/pym/update/emerge_parser.py:509 msgid "This action requires superuser access" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:835 +#: ../calculate-update/pym/update/variables/update.py:848 msgid "URL" msgstr "" -#: ../calculate-update/pym/update/update.py:727 +#: ../calculate-update/pym/update/update.py:728 #, python-brace-format msgid "Unmerging{part} {package}" msgstr "" @@ -636,20 +636,20 @@ msgstr "" msgid "Update" msgstr "" -#: ../calculate-update/pym/update/wsdl_update.py:43 -#: ../calculate-update/pym/update/wsdl_update.py:100 +#: ../calculate-update/pym/update/wsdl_update.py:44 +#: ../calculate-update/pym/update/wsdl_update.py:101 msgid "Update " msgstr "" -#: ../calculate-update/pym/update/wsdl_update.py:156 +#: ../calculate-update/pym/update/wsdl_update.py:157 msgid "Update Check" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:408 +#: ../calculate-update/pym/update/utils/cl_update.py:430 msgid "Update failed" msgstr "" -#: ../calculate-update/pym/update/update.py:311 +#: ../calculate-update/pym/update/update.py:313 msgid "Update is already running. Try to run later." msgstr "" @@ -657,11 +657,11 @@ msgstr "" msgid "Update manually interrupted" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:478 +#: ../calculate-update/pym/update/variables/update.py:491 msgid "Update metadata" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:567 +#: ../calculate-update/pym/update/variables/update.py:580 msgid "Update other overlays" msgstr "" @@ -669,34 +669,34 @@ msgstr "" msgid "Update packages index" msgstr "" -#: ../calculate-update/pym/update/update.py:1352 +#: ../calculate-update/pym/update/update.py:1353 #, python-format msgid "Update server %s" msgstr "" -#: ../calculate-update/pym/update/update.py:1347 +#: ../calculate-update/pym/update/update.py:1348 #, python-format msgid "Update server was changed to %s" msgstr "" -#: ../calculate-update/pym/update/wsdl_update.py:45 +#: ../calculate-update/pym/update/wsdl_update.py:46 msgid "Update the System" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1340 -#: ../calculate-update/pym/update/variables/update.py:1341 +#: ../calculate-update/pym/update/variables/update.py:1353 +#: ../calculate-update/pym/update/variables/update.py:1354 msgid "Update the cache" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:526 +#: ../calculate-update/pym/update/variables/update.py:539 msgid "Update the eix cache" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:502 +#: ../calculate-update/pym/update/variables/update.py:515 msgid "Update the overlays cache" msgstr "" -#: ../calculate-update/pym/update/wsdl_update.py:66 +#: ../calculate-update/pym/update/wsdl_update.py:67 msgid "Update the system" msgstr "" @@ -704,45 +704,45 @@ msgstr "" msgid "Updates autocheck configured!" msgstr "" -#: ../calculate-update/pym/update/update.py:275 +#: ../calculate-update/pym/update/update.py:277 msgid "Updates autocheck is not enabled" msgstr "" -#: ../calculate-update/pym/update/wsdl_update.py:177 +#: ../calculate-update/pym/update/wsdl_update.py:178 msgid "Updates autocheck settings" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:318 +#: ../calculate-update/pym/update/utils/cl_update.py:338 msgid "Updating Kernel modules" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:290 +#: ../calculate-update/pym/update/utils/cl_update.py:310 msgid "Updating Perl modules" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:326 +#: ../calculate-update/pym/update/utils/cl_update.py:346 msgid "Updating X.Org server modules" msgstr "" -#: ../calculate-update/pym/update/update.py:1326 +#: ../calculate-update/pym/update/update.py:1327 msgid "Updating binary build dependences" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:353 -#: ../calculate-update/pym/update/utils/cl_update.py:395 +#: ../calculate-update/pym/update/utils/cl_update.py:373 +#: ../calculate-update/pym/update/utils/cl_update.py:417 #: ../calculate-update/pym/update/utils/cl_update_profile.py:141 msgid "Updating configuration files" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:279 +#: ../calculate-update/pym/update/utils/cl_update.py:299 msgid "Updating packages" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:334 +#: ../calculate-update/pym/update/utils/cl_update.py:354 msgid "Updating preserved libraries" msgstr "" -#: ../calculate-update/pym/update/update.py:568 +#: ../calculate-update/pym/update/update.py:569 #, python-format msgid "Updating the %s repository cache" msgstr "" @@ -765,56 +765,56 @@ msgstr "" msgid "Updating the {eachvar:capitalize} repository cache" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1575 +#: ../calculate-update/pym/update/variables/update.py:1597 msgid "Use only stable updates" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:757 +#: ../calculate-update/pym/update/variables/update.py:770 msgid "Used repositories" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:672 +#: ../calculate-update/pym/update/variables/update.py:685 msgid "Wait for another update to be complete" msgstr "" -#: ../calculate-update/pym/update/update.py:314 +#: ../calculate-update/pym/update/update.py:316 msgid "Waiting for another update to be complete" msgstr "" -#: ../calculate-update/pym/update/update.py:335 +#: ../calculate-update/pym/update/update.py:337 msgid "Waiting for emerge to be complete" msgstr "" -#: ../calculate-update/pym/update/utils/cl_update.py:423 +#: ../calculate-update/pym/update/utils/cl_update.py:454 msgid "World rebuild finished!" msgstr "" -#: ../calculate-update/pym/update/update.py:901 -#: ../calculate-update/pym/update/update.py:1014 +#: ../calculate-update/pym/update/update.py:902 +#: ../calculate-update/pym/update/update.py:1015 msgid "Would you like to merge these packages?" msgstr "" -#: ../calculate-update/pym/update/update.py:1076 +#: ../calculate-update/pym/update/update.py:1077 msgid "Would you like to unmerge these unused packages (recommended)?" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1229 +#: ../calculate-update/pym/update/variables/update.py:1242 msgid "Wrong Calculate profile" msgstr "" -#: ../calculate-update/pym/update/update.py:1139 +#: ../calculate-update/pym/update/update.py:1140 msgid "Wrong profile" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:931 +#: ../calculate-update/pym/update/variables/update.py:944 msgid "Wrong repository URL" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1196 +#: ../calculate-update/pym/update/variables/update.py:1209 msgid "You must specify the profile" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:986 +#: ../calculate-update/pym/update/variables/update.py:999 msgid "You need to update the repositories before you change the profile" msgstr "" @@ -822,75 +822,75 @@ msgstr "" msgid "append the profile packages list" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1354 +#: ../calculate-update/pym/update/variables/update.py:1367 msgid "automatically check updates" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1625 +#: ../calculate-update/pym/update/variables/update.py:1647 msgid "check and fix the repositories integrity" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:548 +#: ../calculate-update/pym/update/variables/update.py:561 msgid "check signature if system has public keys" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1475 +#: ../calculate-update/pym/update/variables/update.py:1488 msgid "clean obsolete programs archives" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1653 +#: ../calculate-update/pym/update/variables/update.py:1675 msgid "clear the history of repositories" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:800 +#: ../calculate-update/pym/update/variables/update.py:813 msgid "clt templates" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1386 +#: ../calculate-update/pym/update/variables/update.py:1399 msgid "consider the autocheck schedule" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1372 +#: ../calculate-update/pym/update/variables/update.py:1385 msgid "daily" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1399 +#: ../calculate-update/pym/update/variables/update.py:1412 msgid "display the packages list in emerge format" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:651 +#: ../calculate-update/pym/update/variables/update.py:664 msgid "do not update packages" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1370 +#: ../calculate-update/pym/update/variables/update.py:1383 msgid "every six hours" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1371 +#: ../calculate-update/pym/update/variables/update.py:1384 msgid "every twelve hours" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:546 +#: ../calculate-update/pym/update/variables/update.py:559 msgid "force check Package signature" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1639 +#: ../calculate-update/pym/update/variables/update.py:1661 msgid "force fix the settings" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:522 +#: ../calculate-update/pym/update/variables/update.py:535 msgid "force the eix cache update" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:475 +#: ../calculate-update/pym/update/variables/update.py:488 msgid "force the update ebuilds metadata" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:499 +#: ../calculate-update/pym/update/variables/update.py:512 msgid "force the update of the overlays cache" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:636 +#: ../calculate-update/pym/update/variables/update.py:649 msgid "instead of actually performing the update, simply display the list of packages that will be installed" msgstr "" @@ -902,11 +902,11 @@ msgstr "" msgid "rebuild the system packages list" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1510 +#: ../calculate-update/pym/update/variables/update.py:1523 msgid "run reverse dependencies check" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1751 +#: ../calculate-update/pym/update/variables/update.py:1773 msgid "save packages used during build" msgstr "" @@ -914,12 +914,12 @@ msgstr "" msgid "search for the most appropriate update server" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:804 +#: ../calculate-update/pym/update/variables/update.py:817 #, python-format msgid "select the location for templates %s" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1367 +#: ../calculate-update/pym/update/variables/update.py:1380 msgid "set interval for the updates checking" msgstr "" @@ -927,59 +927,59 @@ msgstr "" msgid "set references for repository (REPOSITORY:REF)" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:919 +#: ../calculate-update/pym/update/variables/update.py:932 msgid "set the profile repository" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1028 +#: ../calculate-update/pym/update/variables/update.py:1041 msgid "set the repository branch" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1192 +#: ../calculate-update/pym/update/variables/update.py:1205 msgid "set the system profile" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:547 +#: ../calculate-update/pym/update/variables/update.py:560 msgid "skip check Package signature" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1496 +#: ../calculate-update/pym/update/variables/update.py:1509 msgid "skip reverse dependencies check" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:476 +#: ../calculate-update/pym/update/variables/update.py:489 msgid "skip the ebuild metadata update" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:523 +#: ../calculate-update/pym/update/variables/update.py:536 msgid "skip the eix cache update" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1462 +#: ../calculate-update/pym/update/variables/update.py:1475 msgid "skip the system setup" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:500 +#: ../calculate-update/pym/update/variables/update.py:513 msgid "skip the update of the overlays cache" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:420 +#: ../calculate-update/pym/update/variables/update.py:434 msgid "synchronized repositories (all by default)" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:477 +#: ../calculate-update/pym/update/variables/update.py:490 msgid "update metadata if it is outdated" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:566 +#: ../calculate-update/pym/update/variables/update.py:579 msgid "update other overlays" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:524 +#: ../calculate-update/pym/update/variables/update.py:537 msgid "update the eix cache if it is outdated" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:501 +#: ../calculate-update/pym/update/variables/update.py:514 msgid "update the overlays cache if outdated" msgstr "" @@ -987,25 +987,25 @@ msgstr "" msgid "update the system packages list" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:1576 +#: ../calculate-update/pym/update/variables/update.py:1598 msgid "use only stable updates" msgstr "" -#: ../calculate-update/pym/update/variables/update.py:673 +#: ../calculate-update/pym/update/variables/update.py:686 msgid "wait until the running update is finished" msgstr "" -#: ../calculate-update/pym/update/update.py:831 +#: ../calculate-update/pym/update/update.py:832 #, python-brace-format msgid "{count} packages will be installed" msgstr "" -#: ../calculate-update/pym/update/update.py:836 +#: ../calculate-update/pym/update/update.py:837 #, python-brace-format msgid "{install}{size} will be downloaded" msgstr "" -#: ../calculate-update/pym/update/update.py:682 +#: ../calculate-update/pym/update/update.py:683 #, python-brace-format msgid "{part} {package}" msgstr "" diff --git a/ru/cl_builder3.po b/ru/cl_builder3.po index adc2929..54b1177 100644 --- a/ru/cl_builder3.po +++ b/ru/cl_builder3.po @@ -11,17 +11,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../calculate-builder/pym/builder/variables/builder.py:1725 +#: ../calculate-builder/pym/builder/variables/builder.py:1731 #, python-format msgid "%s is unavailable for the Grub" msgstr "%s недоступен для Grub" -#: ../calculate-builder/pym/builder/builder.py:2052 +#: ../calculate-builder/pym/builder/builder.py:2076 #, python-brace-format msgid "({num} of {nummax}) Inject dependences for {package} package" msgstr "({num} of {nummax}) Добавление зависимостей для пакета {package}" -#: ../calculate-builder/pym/builder/variables/images.py:323 +#: ../calculate-builder/pym/builder/variables/images.py:322 msgid "ALSA" msgstr "ALSA" @@ -29,30 +29,30 @@ msgstr "ALSA" msgid "Appling isohybrid feature for image" msgstr "Добавление isohybrid свойства к образу" -#: ../calculate-builder/pym/builder/builder.py:1121 +#: ../calculate-builder/pym/builder/builder.py:1149 msgid "Assigning files to packages" msgstr "Определение пакетов по файлам" -#: ../calculate-builder/pym/builder/variables/images.py:343 +#: ../calculate-builder/pym/builder/variables/images.py:342 msgid "Auto" msgstr "Авто" -#: ../calculate-builder/pym/builder/builder.py:1982 +#: ../calculate-builder/pym/builder/builder.py:2006 #, python-brace-format msgid "Auto depends for package {pkg} from {pkgs} will be cleared" msgstr "Автоматические зависимости для пакета {pkg} от пакетов {pkgs} будут удалены" -#: ../calculate-builder/pym/builder/builder.py:1976 +#: ../calculate-builder/pym/builder/builder.py:2000 #, python-brace-format msgid "Auto depends for package {pkg} from {pkgs} will be used" msgstr "Автоматические зависимости для пакета {pkg} от пакетов {pkgs} будут использованы" -#: ../calculate-builder/pym/builder/variables/builder.py:1645 -#: ../calculate-builder/pym/builder/variables/builder.py:1647 +#: ../calculate-builder/pym/builder/variables/builder.py:1651 +#: ../calculate-builder/pym/builder/variables/builder.py:1653 msgid "Boot Flash" msgstr "Загруженная Flash" -#: ../calculate-builder/pym/builder/variables/images.py:365 +#: ../calculate-builder/pym/builder/variables/images.py:364 msgid "Boot an image to RAM" msgstr "Загружать образ в память" @@ -80,18 +80,18 @@ msgstr "Прерывание сборки не удалось" msgid "Breaking {cl_builder_id} build" msgstr "Прерывание {cl_builder_id} сборки" -#: ../calculate-builder/pym/builder/variables/builder.py:623 +#: ../calculate-builder/pym/builder/variables/builder.py:624 #, python-format msgid "Build %s already exists" msgstr "Сборка %s уже существует" -#: ../calculate-builder/pym/builder/variables/builder.py:677 +#: ../calculate-builder/pym/builder/variables/builder.py:678 #, python-format msgid "Build %s is broken, try to restore build" msgstr "Сборка %s нарушена, попытайтесь восстановить сборку" -#: ../calculate-builder/pym/builder/variables/builder.py:673 -#: ../calculate-builder/pym/builder/variables/builder.py:728 +#: ../calculate-builder/pym/builder/variables/builder.py:674 +#: ../calculate-builder/pym/builder/variables/builder.py:729 #, python-format msgid "Build %s is not found" msgstr "Сборка %s не найдена" @@ -122,7 +122,7 @@ msgstr "Файлы сборки" msgid "Build prepared successfully in \"{cl_builder_path}\"" msgstr "Сборка успешно подготовлена в \"{cl_builder_path}\"" -#: ../calculate-builder/pym/builder/variables/linux.py:257 +#: ../calculate-builder/pym/builder/variables/linux.py:259 msgid "Build version" msgstr "Build версия" @@ -130,12 +130,12 @@ msgstr "Build версия" msgid "Build was restored successfully" msgstr "Сборка восстановлена успешно" -#: ../calculate-builder/pym/builder/variables/builder.py:688 +#: ../calculate-builder/pym/builder/variables/builder.py:689 #, python-format msgid "Build without %s can be container only" msgstr "Сборка без %s может быть только контейнером" -#: ../calculate-builder/pym/builder/variables/builder.py:690 +#: ../calculate-builder/pym/builder/variables/builder.py:691 msgid "Build without kernel can be container only" msgstr "Сборка без ядра может быть только контейнером" @@ -149,16 +149,16 @@ msgstr "Сборка без ядра может быть только конте msgid "Builder" msgstr "Сборка" -#: ../calculate-builder/pym/builder/builder.py:1560 +#: ../calculate-builder/pym/builder/builder.py:1582 #, python-format msgid "Builder action for %s is already running. Try to run later." msgstr "Действие со сборкой %s уже запущено. Попробуйте запустить позже." -#: ../calculate-builder/pym/builder/variables/linux.py:241 +#: ../calculate-builder/pym/builder/variables/linux.py:243 msgid "Building short name" msgstr "Короткое название сборки" -#: ../calculate-builder/pym/builder/variables/linux.py:249 +#: ../calculate-builder/pym/builder/variables/linux.py:251 msgid "Building system version" msgstr "Версия сборки" @@ -166,14 +166,14 @@ msgstr "Версия сборки" msgid "Calculating SHA256 checksum" msgstr "Вычисление контрольной суммы SHA256" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:170 -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:179 -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:199 -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:228 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:174 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:183 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:203 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:232 msgid "Calculating dependencies" msgstr "Вычисление зависимостей" -#: ../calculate-builder/pym/builder/builder.py:936 +#: ../calculate-builder/pym/builder/builder.py:963 #, python-format msgid "Calculating dependencies for %s" msgstr "Вычисление зависимостей для %s" @@ -182,17 +182,17 @@ msgstr "Вычисление зависимостей для %s" msgid "Change the Build Profile" msgstr "Изменить профиль сборки" -#: ../calculate-builder/pym/builder/builder.py:1920 +#: ../calculate-builder/pym/builder/builder.py:1942 #, python-brace-format msgid "Check ({cur} of {maxval}) {package}" msgstr "Проверка ({cur} of {maxval}) {package}" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:286 -#: ../calculate-builder/pym/builder/variables/builder.py:1870 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:290 +#: ../calculate-builder/pym/builder/variables/builder.py:1876 msgid "Check for auto depends" msgstr "Проверить на автоматические зависимости" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:266 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:270 msgid "Checking reverse dependencies" msgstr "Проверка обратных зависимостей" @@ -200,20 +200,20 @@ msgstr "Проверка обратных зависимостей" msgid "Checking the {eachvar:capitalize} repository" msgstr "Проверка обновлений {eachvar:capitalize}" -#: ../calculate-builder/pym/builder/builder.py:1451 +#: ../calculate-builder/pym/builder/builder.py:1474 msgid "Chroot command not found" msgstr "Chroot команда не найдена" -#: ../calculate-builder/pym/builder/builder.py:1574 +#: ../calculate-builder/pym/builder/builder.py:1596 #, python-brace-format msgid "Chrooted {cmd} has already run into {id}" msgstr "{cmd} уже запущена внутри {id}" -#: ../calculate-builder/pym/builder/builder.py:978 +#: ../calculate-builder/pym/builder/builder.py:1005 msgid "Cleaning and copying driver files" msgstr "Очистка и копирование файлов драйверов" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:309 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:313 msgid "Cleaning the binary repository" msgstr "Очистка бинарного репозитория" @@ -221,19 +221,19 @@ msgstr "Очистка бинарного репозитория" msgid "Cleaning the history of the {eachvar:capitalize} repository" msgstr "Удаление истории репозитория {eachvar:capitalize}" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:225 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:229 msgid "Cleaning the system from needless packages" msgstr "Очистка системы от ненужных пакетов" -#: ../calculate-builder/pym/builder/variables/builder.py:554 +#: ../calculate-builder/pym/builder/variables/builder.py:555 msgid "Clear after unmount" msgstr "Очистить после отключения" -#: ../calculate-builder/pym/builder/variables/builder.py:567 +#: ../calculate-builder/pym/builder/variables/builder.py:568 msgid "Clear binary packages after unmount" msgstr "Очистить бинарные пакеты после отключения" -#: ../calculate-builder/pym/builder/variables/builder.py:1609 +#: ../calculate-builder/pym/builder/variables/builder.py:1615 msgid "Clear the boot from ISO images" msgstr "Удалить загрузки с ISO образов" @@ -241,11 +241,11 @@ msgstr "Удалить загрузки с ISO образов" msgid "Clearing the ISO images menu" msgstr "Очистка меню ISO образов" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:301 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:305 msgid "Completion of the system update" msgstr "Завершение обновления системы" -#: ../calculate-builder/pym/builder/variables/builder.py:1367 +#: ../calculate-builder/pym/builder/variables/builder.py:1373 msgid "Compressor" msgstr "Сжатие" @@ -272,7 +272,7 @@ msgstr "Настройка сборки" msgid "Configuring squash filesystem image" msgstr "Настройка образа сжатой файловой системы" -#: ../calculate-builder/pym/builder/variables/builder.py:1899 +#: ../calculate-builder/pym/builder/variables/builder.py:1905 msgid "Container" msgstr "Контейнер" @@ -312,13 +312,13 @@ msgstr "Создание Live HDD меню" msgid "Creating the image is failed" msgstr "Создание образа не удалось" -#: ../calculate-builder/pym/builder/builder.py:900 -#: ../calculate-builder/pym/builder/builder.py:902 +#: ../calculate-builder/pym/builder/builder.py:926 +#: ../calculate-builder/pym/builder/builder.py:928 #, python-format msgid "Depends %s" msgstr "Зависимости %s" -#: ../calculate-builder/pym/builder/variables/builder.py:346 +#: ../calculate-builder/pym/builder/variables/builder.py:347 #, python-format msgid "Destination '%s' is already in use" msgstr "Местонахождение '%s' уже используется" @@ -327,7 +327,7 @@ msgstr "Местонахождение '%s' уже используется" msgid "Disabling the Live HDD menu from grub" msgstr "Отключение Live HDD меню из grub" -#: ../calculate-builder/pym/builder/variables/builder.py:1655 +#: ../calculate-builder/pym/builder/variables/builder.py:1661 #, python-format msgid "Distributions directory (%s)" msgstr "Директория дистрибутивов (%s)" @@ -341,22 +341,22 @@ msgstr "Выполнение prelink" msgid "Extracting kernels from ISO images" msgstr "Извлечение ядер из ISO образов" -#: ../calculate-builder/pym/builder/builder.py:1643 +#: ../calculate-builder/pym/builder/builder.py:1665 msgid "Failed to clean /boot directory on Flash drive" msgstr "Не удалось очистить /boot директорию на Flash-устройстве" -#: ../calculate-builder/pym/builder/builder.py:2138 -#: ../calculate-builder/pym/builder/builder.py:2166 +#: ../calculate-builder/pym/builder/builder.py:2162 +#: ../calculate-builder/pym/builder/builder.py:2190 #, python-format msgid "Failed to clear binary directory: %s" msgstr "Не удалось очистить директорию бинарных пакетов: %s" -#: ../calculate-builder/pym/builder/builder.py:1023 +#: ../calculate-builder/pym/builder/builder.py:1051 #, python-format msgid "Failed to determine path for %s repository" msgstr "Не удалось определить путь для %s репозитория" -#: ../calculate-builder/pym/builder/builder.py:371 +#: ../calculate-builder/pym/builder/builder.py:373 #, python-format msgid "Failed to determine profile %s" msgstr "Не удалось определить профиль %s" @@ -365,97 +365,97 @@ msgstr "Не удалось определить профиль %s" msgid "Failed to determine the isoscan path" msgstr "Не удалось определить isoscan путь" -#: ../calculate-builder/pym/builder/builder.py:768 +#: ../calculate-builder/pym/builder/builder.py:772 #, python-format msgid "Failed to execute %s" msgstr "Не удалось выполнить %s" -#: ../calculate-builder/pym/builder/builder.py:1666 +#: ../calculate-builder/pym/builder/builder.py:1688 #, python-format msgid "Failed to extract kernel from %s" msgstr "Не удалось извлечь ядро из %s" -#: ../calculate-builder/pym/builder/builder.py:968 +#: ../calculate-builder/pym/builder/builder.py:995 #, python-format msgid "Failed to fetch files for %s" msgstr "Не удалось получить файлы для %s" -#: ../calculate-builder/pym/builder/builder.py:1100 -#: ../calculate-builder/pym/builder/builder.py:1114 -#: ../calculate-builder/pym/builder/builder.py:1137 -#: ../calculate-builder/pym/builder/builder.py:2085 +#: ../calculate-builder/pym/builder/builder.py:1128 +#: ../calculate-builder/pym/builder/builder.py:1142 +#: ../calculate-builder/pym/builder/builder.py:1165 +#: ../calculate-builder/pym/builder/builder.py:2109 #, python-format msgid "Failed to find the %s command" msgstr "Не удалось найти %s команду" -#: ../calculate-builder/pym/builder/variables/images.py:123 +#: ../calculate-builder/pym/builder/variables/images.py:122 msgid "Failed to generate kernel name" msgstr "Не удалось сгенерировать имя для ядра" -#: ../calculate-builder/pym/builder/builder.py:962 +#: ../calculate-builder/pym/builder/builder.py:989 #, python-format msgid "Failed to get %s" msgstr "Не удалось получить %s" -#: ../calculate-builder/pym/builder/build_storage.py:271 +#: ../calculate-builder/pym/builder/build_storage.py:270 msgid "Failed to get distributive information" msgstr "Не удалось получить информацию о дистрибутиве" -#: ../calculate-builder/pym/builder/builder.py:1886 +#: ../calculate-builder/pym/builder/builder.py:1908 msgid "Failed to hide package database" msgstr "Не удалось скрыть пакеты" -#: ../calculate-builder/pym/builder/builder.py:317 +#: ../calculate-builder/pym/builder/builder.py:319 #, python-format msgid "Failed to index %s" msgstr "Не удалось проиндексировать %s" -#: ../calculate-builder/pym/builder/builder.py:2172 +#: ../calculate-builder/pym/builder/builder.py:2196 #, python-format msgid "Failed to merge prepared binaries: %s" msgstr "Не удалось объединить подготовленные бинарные пакеты: %s" -#: ../calculate-builder/pym/builder/builder.py:2038 +#: ../calculate-builder/pym/builder/builder.py:2062 #, python-brace-format msgid "Failed to merge {package} without {hidden_pkgs}" msgstr "Не удалось собрать {package} без {hidden_pkgs}" -#: ../calculate-builder/pym/builder/builder.py:1694 +#: ../calculate-builder/pym/builder/builder.py:1716 msgid "Failed to move the ISO images directory on the Flash" msgstr "Не удалось перенести директорию ISO образов на Flash" -#: ../calculate-builder/pym/builder/builder.py:2152 +#: ../calculate-builder/pym/builder/builder.py:2176 #, python-format msgid "Failed to prepare stable binaries: %s" msgstr "Не удалось подготовить стабильную ветку бинарных пакетов: %s" -#: ../calculate-builder/pym/builder/builder.py:1367 +#: ../calculate-builder/pym/builder/builder.py:1390 msgid "Failed to prepare variables for synchronization" msgstr "Не удалось подготовить переменные для синхронизации" -#: ../calculate-builder/pym/builder/builder.py:1930 +#: ../calculate-builder/pym/builder/builder.py:1952 msgid "Failed to receive the package list" msgstr "Не удалось получить список пакетов" -#: ../calculate-builder/pym/builder/builder.py:1619 +#: ../calculate-builder/pym/builder/builder.py:1641 msgid "Failed to remount Flash drive" msgstr "Не удалось переподключить Flash-устройство" -#: ../calculate-builder/pym/builder/builder.py:1772 +#: ../calculate-builder/pym/builder/builder.py:1794 #, python-format msgid "Failed to remove %s" msgstr "Не удалось удалить %s" -#: ../calculate-builder/pym/builder/builder.py:2035 +#: ../calculate-builder/pym/builder/builder.py:2059 msgid "Failed to save build log" msgstr "Не удалось сохранить журнал сборки" -#: ../calculate-builder/pym/builder/builder.py:382 +#: ../calculate-builder/pym/builder/builder.py:384 #, python-format msgid "Failed to set the profile: %s" msgstr "Не удалось установить профиль: %s" -#: ../calculate-builder/pym/builder/builder.py:1960 +#: ../calculate-builder/pym/builder/builder.py:1984 msgid "Failed to unhide package database" msgstr "Не удалось восстановить скрытые пакеты" @@ -467,26 +467,26 @@ msgstr "Не удалось обновить меню загрузки" msgid "Failed to update the profile" msgstr "Не удалось обновить профиль" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:331 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:335 msgid "Failed to update the system" msgstr "Не удалось обновить систему" -#: ../calculate-builder/pym/builder/builder.py:1170 +#: ../calculate-builder/pym/builder/builder.py:1198 #, python-brace-format msgid "Failed to update the {rname} repository" msgstr "Не удалось обновить репозиторий {rname}" -#: ../calculate-builder/pym/builder/builder.py:2145 +#: ../calculate-builder/pym/builder/builder.py:2169 #, python-format msgid "Failed to update trunk binaries: %s" msgstr "Не удалось обновить trunk ветку бинарных пакетов: %s" -#: ../calculate-builder/pym/builder/builder.py:1762 +#: ../calculate-builder/pym/builder/builder.py:1784 #, python-format msgid "Failed to write %s" msgstr "Не удалось записать %s" -#: ../calculate-builder/pym/builder/builder.py:945 +#: ../calculate-builder/pym/builder/builder.py:972 msgid "Fetching binary packages and sources tarballs" msgstr "Получение бинарных пакетов и архивов с исходным кодом" @@ -502,7 +502,7 @@ msgstr "Файл уже заблокирован другим сборщиком msgid "File must be downloaded manually." msgstr "Файл должен быть скачен вручную." -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:213 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:217 msgid "Find & rebuild packages and Perl header files broken due to a perl upgrade" msgstr "Поиск и пересборка пакетов и Perl header файлов, повреждённых при обновлении Perl" @@ -511,11 +511,11 @@ msgstr "Поиск и пересборка пакетов и Perl header фай msgid "Fixing the settings" msgstr "Исправление настроек" -#: ../calculate-builder/pym/builder/variables/builder.py:1563 +#: ../calculate-builder/pym/builder/variables/builder.py:1569 msgid "Flash" msgstr "Flash" -#: ../calculate-builder/pym/builder/variables/builder.py:1704 +#: ../calculate-builder/pym/builder/variables/builder.py:1710 #, python-format msgid "Flash drive %s not found" msgstr "Flash-устройство %s не найдено" @@ -524,35 +524,35 @@ msgstr "Flash-устройство %s не найдено" msgid "Formatting the partitions" msgstr "Форматирование разделов" -#: ../calculate-builder/pym/builder/variables/builder.py:383 +#: ../calculate-builder/pym/builder/variables/builder.py:384 msgid "Free disk space" msgstr "Свободное место на диске" -#: ../calculate-builder/pym/builder/variables/builder.py:404 +#: ../calculate-builder/pym/builder/variables/builder.py:405 msgid "Free disk space for ISO building" msgstr "Свободное место для сборки ISO" -#: ../calculate-builder/pym/builder/variables/builder.py:418 +#: ../calculate-builder/pym/builder/variables/builder.py:419 msgid "Free disk space for ISO image" msgstr "Свободное место для ISO образа" -#: ../calculate-builder/pym/builder/variables/builder.py:432 +#: ../calculate-builder/pym/builder/variables/builder.py:433 msgid "Free disk space for container image" msgstr "Свободное место для образа контейнера" -#: ../calculate-builder/pym/builder/variables/builder.py:1562 +#: ../calculate-builder/pym/builder/variables/builder.py:1568 msgid "Grub" msgstr "Grub" -#: ../calculate-builder/pym/builder/variables/builder.py:1651 +#: ../calculate-builder/pym/builder/variables/builder.py:1657 msgid "HDD Grub" msgstr "HDD Grub" -#: ../calculate-builder/pym/builder/variables/builder.py:1900 +#: ../calculate-builder/pym/builder/variables/builder.py:1906 msgid "ISO" msgstr "ISO" -#: ../calculate-builder/pym/builder/variables/builder.py:1414 +#: ../calculate-builder/pym/builder/variables/builder.py:1420 msgid "ISO hybrid feature" msgstr "ISO hybrid свойство" @@ -569,7 +569,7 @@ msgstr "Создние образа выполнено успешно" msgid "Image creating manually interrupted" msgstr "Создание образа прервано пользователем" -#: ../calculate-builder/pym/builder/builder.py:1391 +#: ../calculate-builder/pym/builder/builder.py:1414 msgid "Image not found" msgstr "Образ не найден" @@ -577,7 +577,7 @@ msgstr "Образ не найден" msgid "Image path" msgstr "Путь до образа" -#: ../calculate-builder/pym/builder/variables/builder.py:1895 +#: ../calculate-builder/pym/builder/variables/builder.py:1901 msgid "Image type" msgstr "Тип образа" @@ -585,23 +585,23 @@ msgstr "Тип образа" msgid "Include proprietary video drivers" msgstr "Включить проприетарные видео драйвера" -#: ../calculate-builder/pym/builder/variables/builder.py:1213 +#: ../calculate-builder/pym/builder/variables/builder.py:1219 msgid "Init RAM fs" msgstr "Init RAM fs" -#: ../calculate-builder/pym/builder/variables/builder.py:1418 +#: ../calculate-builder/pym/builder/variables/builder.py:1424 msgid "Iso hybrid is uncompatible with container" msgstr "Iso hybrid не совместим с контейнером" -#: ../calculate-builder/pym/builder/builder.py:1389 +#: ../calculate-builder/pym/builder/builder.py:1412 msgid "Isohybrid utility not found" msgstr "Isohybrid утилита не найдена" -#: ../calculate-builder/pym/builder/variables/builder.py:1436 +#: ../calculate-builder/pym/builder/variables/builder.py:1442 msgid "Keep portage tree" msgstr "Сохранить дерево портежей" -#: ../calculate-builder/pym/builder/variables/builder.py:1234 +#: ../calculate-builder/pym/builder/variables/builder.py:1240 msgid "Kernel file" msgstr "Файл ядра" @@ -609,19 +609,19 @@ msgstr "Файл ядра" msgid "Kernel version" msgstr "Версия ядра" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:318 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:322 msgid "Last news:" msgstr "Последние новости:" -#: ../calculate-builder/pym/builder/variables/builder.py:476 +#: ../calculate-builder/pym/builder/variables/builder.py:477 msgid "Layers are used for building from ISO image" msgstr "Слои используются только для сборки из ISO образа" -#: ../calculate-builder/pym/builder/variables/builder.py:472 +#: ../calculate-builder/pym/builder/variables/builder.py:473 msgid "Layers are used for building in a directory only" msgstr "Слои используются только для сборки в директории" -#: ../calculate-builder/pym/builder/builder.py:402 +#: ../calculate-builder/pym/builder/builder.py:404 msgid "List of worlds differences" msgstr "Изменения в world" @@ -644,19 +644,19 @@ msgstr "Имя" msgid "Next" msgstr "Далее" -#: ../calculate-builder/pym/builder/builder.py:713 +#: ../calculate-builder/pym/builder/builder.py:715 msgid "Nothing to merge" msgstr "Нечего устанавливать" -#: ../calculate-builder/pym/builder/builder.py:746 +#: ../calculate-builder/pym/builder/builder.py:750 msgid "Nothing to unmerge" msgstr "Нечего удалять" -#: ../calculate-builder/pym/builder/builder.py:1085 +#: ../calculate-builder/pym/builder/builder.py:1113 msgid "Obsolete packages list:" msgstr "Список устаревших пакетов:" -#: ../calculate-builder/pym/builder/builder.py:176 +#: ../calculate-builder/pym/builder/builder.py:178 msgid "Pack ISO image" msgstr "Запаковка ISO образа" @@ -664,40 +664,40 @@ msgstr "Запаковка ISO образа" msgid "Pack squash filesystem image" msgstr "Запаковка образа сжатой файловой системы" -#: ../calculate-builder/pym/builder/variables/builder.py:1613 +#: ../calculate-builder/pym/builder/variables/builder.py:1619 msgid "Path" msgstr "Путь" -#: ../calculate-builder/pym/builder/variables/builder.py:1487 +#: ../calculate-builder/pym/builder/variables/builder.py:1493 msgid "Perform prelink" msgstr "Выполнить prelink" -#: ../calculate-builder/pym/builder/variables/builder.py:670 -#: ../calculate-builder/pym/builder/variables/builder.py:725 +#: ../calculate-builder/pym/builder/variables/builder.py:671 +#: ../calculate-builder/pym/builder/variables/builder.py:726 msgid "Please select the build ID" msgstr "Пожалуйста выберите идентификатор сборки" -#: ../calculate-builder/pym/builder/variables/builder.py:1702 +#: ../calculate-builder/pym/builder/variables/builder.py:1708 msgid "Please specify the Flash drive" msgstr "Пожалуйста укажите Flash устройство" -#: ../calculate-builder/pym/builder/variables/builder.py:1730 +#: ../calculate-builder/pym/builder/variables/builder.py:1736 msgid "Please specify the LiveHDD directory" msgstr "Пожалуйста укажите LiveHDD директорию" -#: ../calculate-builder/pym/builder/variables/builder.py:619 +#: ../calculate-builder/pym/builder/variables/builder.py:620 msgid "Please specify the build ID" msgstr "Пожалуйста укажите идентификатор сборки" -#: ../calculate-builder/pym/builder/variables/builder.py:1713 +#: ../calculate-builder/pym/builder/variables/builder.py:1719 msgid "Please specify the directory" msgstr "Пожалуйста укажите директорию" -#: ../calculate-builder/pym/builder/variables/builder.py:1710 +#: ../calculate-builder/pym/builder/variables/builder.py:1716 msgid "Please specify the images directory" msgstr "Пожалуйста укажите директорию с образами" -#: ../calculate-builder/pym/builder/builder.py:171 +#: ../calculate-builder/pym/builder/builder.py:173 msgid "Prepare ISO data" msgstr "Подготовка ISO данных" @@ -739,23 +739,23 @@ msgstr "Профиль не найден в master-ветке" msgid "Profile update manually interrupted" msgstr "Обновление прервано пользователем" -#: ../calculate-builder/pym/builder/variables/images.py:322 +#: ../calculate-builder/pym/builder/variables/images.py:321 msgid "PulseAudio" msgstr "PulseAudio" -#: ../calculate-builder/pym/builder/variables/builder.py:1500 +#: ../calculate-builder/pym/builder/variables/builder.py:1506 msgid "Rebuild changed packages" msgstr "Пересобрать изменённые пакеты" -#: ../calculate-builder/pym/builder/variables/builder.py:1515 +#: ../calculate-builder/pym/builder/variables/builder.py:1521 msgid "Rebuild installed packages with binary packages" msgstr "Заменить установленные пакеты пересобранными бинарными" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:196 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:200 msgid "Rebuild modified packages" msgstr "Пересобрать изменённые пакеты" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:234 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:238 msgid "Rebuilding dependent modules" msgstr "Пересборка зависимых модулей" @@ -767,7 +767,7 @@ msgstr "Перегенерация меню в ISO образе" msgid "Recreating the Live USB menu" msgstr "Обновление Live USB меню" -#: ../calculate-builder/pym/builder/variables/builder.py:1336 +#: ../calculate-builder/pym/builder/variables/builder.py:1342 msgid "Reference" msgstr "Ссылка" @@ -775,8 +775,8 @@ msgstr "Ссылка" msgid "Remove the {eachvar:capitalize} repository" msgstr "Удаление репозитория {eachvar:capitalize}" -#: ../calculate-builder/pym/builder/variables/builder.py:1285 -#: ../calculate-builder/pym/builder/variables/builder.py:1303 +#: ../calculate-builder/pym/builder/variables/builder.py:1291 +#: ../calculate-builder/pym/builder/variables/builder.py:1309 msgid "Repositories references" msgstr "Ссылки репозиториев" @@ -784,12 +784,12 @@ msgstr "Ссылки репозиториев" msgid "Repositories synchronization" msgstr "Синхронизация репозиториев" -#: ../calculate-builder/pym/builder/variables/builder.py:1317 +#: ../calculate-builder/pym/builder/variables/builder.py:1323 #: ../calculate-builder/pym/builder/wsdl_builder.py:518 msgid "Repository" msgstr "Репозиторий" -#: ../calculate-builder/pym/builder/variables/builder.py:1291 +#: ../calculate-builder/pym/builder/variables/builder.py:1297 #, python-format msgid "Repository %s not found" msgstr "Репозиторий %s не найден" @@ -806,7 +806,7 @@ msgstr "Восстановление системных ресурсов сбо msgid "Restore the Build" msgstr "Восстановить сборку" -#: ../calculate-builder/pym/builder/builder.py:1211 +#: ../calculate-builder/pym/builder/builder.py:1239 msgid "Restoring file capabilities" msgstr "Восстановление файловых привилегий" @@ -840,7 +840,7 @@ msgstr "Выполнить" msgid "Save build information" msgstr "Сохранение информации о сборке" -#: ../calculate-builder/pym/builder/variables/builder.py:2012 +#: ../calculate-builder/pym/builder/variables/builder.py:2018 msgid "Save packages used during build" msgstr "Сохранять используемые при сборке пакеты" @@ -856,12 +856,12 @@ msgstr "Настройка профиля" msgid "Source image" msgstr "Исходный образ" -#: ../calculate-builder/pym/builder/builder.py:1988 +#: ../calculate-builder/pym/builder/builder.py:2012 #, python-brace-format msgid "Specified depends for package {pkg} from {pkgs} are obsolete" msgstr "Указанные зависимости для пакета {pkg} от пакетов {pkgs} устарели" -#: ../calculate-builder/pym/builder/variables/linux.py:340 +#: ../calculate-builder/pym/builder/variables/linux.py:352 msgid "Subname" msgstr "Дополнительное название" @@ -874,7 +874,7 @@ msgstr "Переключение на профиль {cl_builder_profile_system_ msgid "Synchronization finished" msgstr "Синхронизация завершена" -#: ../calculate-builder/pym/builder/variables/linux.py:319 +#: ../calculate-builder/pym/builder/variables/linux.py:331 msgid "System" msgstr "Система" @@ -882,7 +882,7 @@ msgstr "Система" msgid "System configuration" msgstr "Конфигурация системы" -#: ../calculate-builder/pym/builder/variables/linux.py:294 +#: ../calculate-builder/pym/builder/variables/linux.py:306 msgid "System name" msgstr "Имя системы" @@ -890,7 +890,7 @@ msgstr "Имя системы" msgid "System profile" msgstr "Профиль системы" -#: ../calculate-builder/pym/builder/variables/linux.py:307 +#: ../calculate-builder/pym/builder/variables/linux.py:319 msgid "System type" msgstr "Тип системы" @@ -898,13 +898,10 @@ msgstr "Тип системы" msgid "System update manually interrupted" msgstr "Обновление системы прервано пользователем" -#: ../calculate-builder/pym/builder/builder.py:1150 +#: ../calculate-builder/pym/builder/builder.py:1178 msgid "The Emerge tool is not found" msgstr "Утилита Emerge не найдена" -msgid "The Layman tool is not found" -msgstr "Утилита Layman не найдена" - #: ../calculate-builder/pym/builder/utils/cl_builder_profile.py:136 msgid "The build is being configured" msgstr "Конфигурирование сборки" @@ -921,7 +918,7 @@ msgstr "Образ не должен быть директорией" msgid "The profile was successfully updated" msgstr "Обновление профиля завершено успешно" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:340 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:344 msgid "The system was successfully updated" msgstr "Система успешно обновлена" @@ -933,7 +930,7 @@ msgstr "Этот параметр не совместим с ISO образом" msgid "This option is not compatible with container image" msgstr "Этот параметр не совместим с образом контейнера" -#: ../calculate-builder/pym/builder/variables/builder.py:1556 +#: ../calculate-builder/pym/builder/variables/builder.py:1562 msgid "Type" msgstr "Тип" @@ -954,7 +951,7 @@ msgstr "Отключение дистрибутивов" msgid "Unable to build the system {what} from {local}" msgstr "Не возможно собирать систему {what} из {local}" -#: ../calculate-builder/pym/builder/variables/images.py:292 +#: ../calculate-builder/pym/builder/variables/images.py:291 msgid "Unavailable for the USB Flash" msgstr "Недоступно для USB Flash" @@ -974,7 +971,7 @@ msgstr "Обновить меню загрузки" msgid "Update Live-Menu" msgstr "Обновить Live-меню" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:280 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:284 msgid "Update binary package directory" msgstr "Обновление директорий бинарных пакетов" @@ -984,28 +981,25 @@ msgstr "Обновление директорий бинарных пакето msgid "Update the Build" msgstr "Обновить сборку" -#: ../calculate-builder/pym/builder/variables/builder.py:1884 +#: ../calculate-builder/pym/builder/variables/builder.py:1890 msgid "Update themes" msgstr "Обновить темы" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:237 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:241 msgid "Updating Kernel modules" msgstr "Обновление модулей ядра" -msgid "Updating Perl" -msgstr "Обновить Perl" - -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:209 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:213 msgid "Updating Perl modules" msgstr "Обновление модулей Perl" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:246 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:250 msgid "Updating X.Org server modules" msgstr "Обновление модулей системы X.Org server" #: ../calculate-builder/pym/builder/utils/cl_builder_profile.py:151 #: ../calculate-builder/pym/builder/utils/cl_builder_update.py:154 -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:304 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:308 msgid "Updating configuration files" msgstr "Обновление конфигурационных файлов" @@ -1017,11 +1011,11 @@ msgstr "Обновление индекса контейнеров" msgid "Updating initramfs" msgstr "Обновление initramfs" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:167 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:171 msgid "Updating packages" msgstr "Обновление пакетов" -#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:255 +#: ../calculate-builder/pym/builder/utils/cl_builder_update.py:259 msgid "Updating preserved libraries" msgstr "Обновление сохранённых библиотек" @@ -1034,7 +1028,7 @@ msgstr "Обновление кэша eix для репозиториев {cl_bu msgid "Updating themes" msgstr "Обновление тем" -#: ../calculate-builder/pym/builder/variables/builder.py:450 +#: ../calculate-builder/pym/builder/variables/builder.py:451 msgid "Use layers for build" msgstr "Использовать слои для сборки" @@ -1042,11 +1036,11 @@ msgstr "Использовать слои для сборки" msgid "Use only live templates on startup" msgstr "При первой загрузке использовать только live шаблоны" -#: ../calculate-builder/pym/builder/variables/builder.py:1836 +#: ../calculate-builder/pym/builder/variables/builder.py:1842 msgid "Use only stable updates" msgstr "Использовать только стабильные обновления" -#: ../calculate-builder/pym/builder/builder.py:974 +#: ../calculate-builder/pym/builder/builder.py:1001 #, python-format msgid "Waiting for unlock %s" msgstr "Ожидание разблокировки %s" @@ -1056,24 +1050,24 @@ msgstr "Ожидание разблокировки %s" msgid "Will be used base binhost: {builder.cl_builder_binhost_base}" msgstr "Будет использован базовой сервер обновлений: {builder.cl_builder_binhost_base}" -#: ../calculate-builder/pym/builder/builder.py:706 +#: ../calculate-builder/pym/builder/builder.py:708 msgid "Would you like to merge these packages?" msgstr "Вы хотите установить эти пакеты?" -#: ../calculate-builder/pym/builder/builder.py:741 +#: ../calculate-builder/pym/builder/builder.py:745 msgid "Would you like to unmerge these unused packages (recommended)?" msgstr "Вы хотите удалить неиспользуемые пакеты (рекомендуется)?" -#: ../calculate-builder/pym/builder/builder.py:1860 +#: ../calculate-builder/pym/builder/builder.py:1882 msgid "Wrong build state: /var/db/pkg not found" msgstr "Некорректное состояние сборки: /var/db/pkg не найден" -#: ../calculate-builder/pym/builder/variables/builder.py:340 +#: ../calculate-builder/pym/builder/variables/builder.py:341 #, python-format msgid "Wrong device '%s'" msgstr "Неправильное устройство '%s'" -#: ../calculate-builder/pym/builder/variables/builder.py:343 +#: ../calculate-builder/pym/builder/variables/builder.py:344 #, python-format msgid "Wrong directory '%s'" msgstr "Неправильный каталог '%s'" @@ -1086,11 +1080,11 @@ msgstr "Неправильный файл образа" msgid "Wrong source distributive for layered build" msgstr "Неправильный исходный дистрибутив для многослойной сборки" -#: ../calculate-builder/pym/builder/variables/builder.py:621 +#: ../calculate-builder/pym/builder/variables/builder.py:622 msgid "Wrong symbols in the build ID" msgstr "Неправильные символы в идентификаторе сборки" -#: ../calculate-builder/pym/builder/variables/builder.py:1719 +#: ../calculate-builder/pym/builder/variables/builder.py:1725 msgid "You cannot change the images directory" msgstr "Вы не можете изменить директорию с образами" @@ -1102,12 +1096,12 @@ msgstr "Вы должны указать имя образа" msgid "You must specify image filename with 'iso' suffix" msgstr "Вы должны указать имя образа с 'iso' суффиксом" -#: ../calculate-builder/pym/builder/variables/builder.py:469 +#: ../calculate-builder/pym/builder/variables/builder.py:470 #, python-format msgid "You need kernel with %s for use layers" msgstr "Для использования слоёв необходимо ядро с %s" -#: ../calculate-builder/pym/builder/variables/builder.py:335 +#: ../calculate-builder/pym/builder/variables/builder.py:336 msgid "You need to select a destination for build" msgstr "Вам необходимо выбрать местонахождение сборки" @@ -1115,11 +1109,11 @@ msgstr "Вам необходимо выбрать местонахождени msgid "You need to select a source image" msgstr "Вам необходимо выбрать исходный образ" -#: ../calculate-builder/pym/builder/variables/images.py:366 +#: ../calculate-builder/pym/builder/variables/images.py:365 msgid "boot an image to RAM" msgstr "загружать образ в память" -#: ../calculate-builder/pym/builder/variables/builder.py:654 +#: ../calculate-builder/pym/builder/variables/builder.py:655 msgid "broken" msgstr "нарушенный" @@ -1127,19 +1121,19 @@ msgstr "нарушенный" msgid "build ID" msgstr "идентификатор сборки" -#: ../calculate-builder/pym/builder/variables/builder.py:1871 +#: ../calculate-builder/pym/builder/variables/builder.py:1877 msgid "check for auto depends" msgstr "проверить на автоматические зависимости" -#: ../calculate-builder/pym/builder/variables/builder.py:568 +#: ../calculate-builder/pym/builder/variables/builder.py:569 msgid "clear binary packages after unmount" msgstr "очистить бинарные пакеты после отключения" -#: ../calculate-builder/pym/builder/variables/builder.py:555 +#: ../calculate-builder/pym/builder/variables/builder.py:556 msgid "clear data after unmount" msgstr "очистить данные после отключения" -#: ../calculate-builder/pym/builder/variables/builder.py:1413 +#: ../calculate-builder/pym/builder/variables/builder.py:1419 msgid "create the ISO image with isohybrid" msgstr "создать ISO образ с isohybrid" @@ -1147,11 +1141,11 @@ msgstr "создать ISO образ с isohybrid" msgid "include proprietary video drivers" msgstr "включить проприетарные видео драйвера" -#: ../calculate-builder/pym/builder/variables/builder.py:1435 +#: ../calculate-builder/pym/builder/variables/builder.py:1441 msgid "keep portage tree in image" msgstr "сохранить дерево портежей в образе" -#: ../calculate-builder/pym/builder/variables/linux.py:343 +#: ../calculate-builder/pym/builder/variables/linux.py:355 msgid "no" msgstr "нет" @@ -1159,19 +1153,19 @@ msgstr "нет" msgid "partition or directory intended for build" msgstr "раздел или директория предназначенная для сборки" -#: ../calculate-builder/pym/builder/variables/builder.py:1486 +#: ../calculate-builder/pym/builder/variables/builder.py:1492 msgid "perform prelink" msgstr "выполнить prelink" -#: ../calculate-builder/pym/builder/variables/builder.py:1499 +#: ../calculate-builder/pym/builder/variables/builder.py:1505 msgid "rebuild changed packages" msgstr "пересобрать изменённые пакеты" -#: ../calculate-builder/pym/builder/variables/builder.py:1513 +#: ../calculate-builder/pym/builder/variables/builder.py:1519 msgid "replace installed packages with binary packages that have been rebuilt" msgstr "заменить установленные пакеты пересобранными бинарными" -#: ../calculate-builder/pym/builder/variables/builder.py:2011 +#: ../calculate-builder/pym/builder/variables/builder.py:2017 msgid "save packages used during build" msgstr "сохранять используемые при сборке пакеты" @@ -1179,24 +1173,24 @@ msgstr "сохранять используемые при сборке паке msgid "set image path" msgstr "установить путь до образа" -#: ../calculate-builder/pym/builder/variables/builder.py:1896 +#: ../calculate-builder/pym/builder/variables/builder.py:1902 msgid "set image type" msgstr "установить тип образа" -#: ../calculate-builder/pym/builder/variables/builder.py:1557 +#: ../calculate-builder/pym/builder/variables/builder.py:1563 msgid "set livemenu type" msgstr "установить тип live-меню" -#: ../calculate-builder/pym/builder/variables/builder.py:1612 +#: ../calculate-builder/pym/builder/variables/builder.py:1618 msgid "set path" msgstr "установить путь" -#: ../calculate-builder/pym/builder/variables/builder.py:1284 -#: ../calculate-builder/pym/builder/variables/builder.py:1302 +#: ../calculate-builder/pym/builder/variables/builder.py:1290 +#: ../calculate-builder/pym/builder/variables/builder.py:1308 msgid "set references for repository (REPOSITORY:REF)" msgstr "установить ссылки для репозиториев (REPOSITORY:REF)" -#: ../calculate-builder/pym/builder/variables/builder.py:1368 +#: ../calculate-builder/pym/builder/variables/builder.py:1374 msgid "set the compressor" msgstr "установить сжатие" @@ -1204,14 +1198,20 @@ msgstr "установить сжатие" msgid "source image" msgstr "исходный образ" -#: ../calculate-builder/pym/builder/variables/builder.py:1885 +#: ../calculate-builder/pym/builder/variables/builder.py:1891 msgid "update themes" msgstr "обновить темы" -#: ../calculate-builder/pym/builder/variables/builder.py:449 +#: ../calculate-builder/pym/builder/variables/builder.py:450 msgid "use layers for build" msgstr "использовать слои для сборки" #: ../calculate-builder/pym/builder/variables/builder.py:1028 msgid "use only live templates on startup" msgstr "при первой загрузке использовать только live шаблоны" + +#~ msgid "The Layman tool is not found" +#~ msgstr "Утилита Layman не найдена" + +#~ msgid "Updating Perl" +#~ msgstr "Обновить Perl" diff --git a/ru/cl_client3.po b/ru/cl_client3.po index c0fbf49..47a69c5 100644 --- a/ru/cl_client3.po +++ b/ru/cl_client3.po @@ -11,8 +11,8 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../calculate-client/pym/client/client.py:226 -#: ../calculate-client/pym/client/client.py:227 +#: ../calculate-client/pym/client/client.py:230 +#: ../calculate-client/pym/client/client.py:231 msgid ":" msgstr ":" @@ -27,7 +27,7 @@ msgstr ":" msgid ": " msgstr ": " -#: ../calculate-client/pym/client/utils/cl_client_sync.py:95 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:273 #, python-brace-format msgid "A second X session cannot be opened for user {ur_login}." msgstr "Вторая X сессия для пользователя {ur_login} не может быть открыта." @@ -36,11 +36,11 @@ msgstr "Вторая X сессия для пользователя {ur_login} msgid "Applying domain templates" msgstr "Применены шаблоны ввода в домен" -#: ../calculate-client/pym/client/utils/cl_client.py:108 +#: ../calculate-client/pym/client/utils/cl_client.py:113 msgid "Applying non-domain templates" msgstr "Применены шаблоны вывода из домена" -#: ../calculate-client/pym/client/variables/client.py:200 +#: ../calculate-client/pym/client/variables/client.py:202 msgid "Before joining the domain, you need to remove it from the previous domain" msgstr "Перед подключением к домену, вам необходимо вывести его из предыдущего домена" @@ -49,22 +49,22 @@ msgstr "Перед подключением к домену, вам необхо msgid "Checking {cl_remote_host_new} for domain resources" msgstr "Проверка {cl_remote_host_new} на наличие доменных ресурсов" -#: ../calculate-client/pym/client/client.py:470 +#: ../calculate-client/pym/client/client.py:475 msgid "Cleaning the local user profile" msgstr "Очистка локального пользовательского профиля" -#: ../calculate-client/pym/client/utils/cl_client.py:120 +#: ../calculate-client/pym/client/utils/cl_client.py:125 msgid "Clearing the user cache" msgstr "Очистка кэша пользователей" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:341 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:448 msgid "Clearing user keys" msgstr "Очистка пользовательских ключей" -#: ../calculate-client/pym/client/wsdl_client.py:46 -#: ../calculate-client/pym/client/wsdl_client.py:91 -#: ../calculate-client/pym/client/wsdl_client.py:126 -#: ../calculate-client/pym/client/wsdl_client.py:161 +#: ../calculate-client/pym/client/wsdl_client.py:47 +#: ../calculate-client/pym/client/wsdl_client.py:92 +#: ../calculate-client/pym/client/wsdl_client.py:128 +#: ../calculate-client/pym/client/wsdl_client.py:163 msgid "Client" msgstr "Клиент" @@ -72,90 +72,92 @@ msgstr "Клиент" msgid "Configuration manually interrupted" msgstr "Настройка прервана пользователем" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:62 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:247 #, python-brace-format msgid "Creating the home directory for {ur_login}" msgstr "Создание домашней директории для {ur_login}" -#: ../calculate-client/pym/client/variables/client.py:235 +#: ../calculate-client/pym/client/variables/client.py:237 msgid "Current password" msgstr "Текущий пароль" -#: ../calculate-client/pym/client/wsdl_client.py:48 -#: ../calculate-client/pym/client/wsdl_client.py:74 +#: ../calculate-client/pym/client/wsdl_client.py:49 +#: ../calculate-client/pym/client/wsdl_client.py:75 msgid "Domain" msgstr "Домен" -#: ../calculate-client/pym/client/variables/client.py:72 +#: ../calculate-client/pym/client/variables/client.py:74 msgid "Domain IP" msgstr "IP домена" -#: ../calculate-client/pym/client/wsdl_client.py:93 +#: ../calculate-client/pym/client/wsdl_client.py:94 msgid "Domain User Login" msgstr "Вход в сеанс доменного пользователя" -#: ../calculate-client/pym/client/wsdl_client.py:128 +#: ../calculate-client/pym/client/wsdl_client.py:130 msgid "Domain User Logout" msgstr "Выход из сеанса доменного пользователя" -#: ../calculate-client/pym/client/variables/client.py:117 +#: ../calculate-client/pym/client/variables/client.py:119 msgid "Domain password" msgstr "Пароль для ввода в домен" -#: ../calculate-client/pym/client/client.py:1131 +#: ../calculate-client/pym/client/client.py:1140 msgid "Domain password for the desktop" msgstr "Пароль для ввода рабочей станции в домен" -#: ../calculate-client/pym/client/wsdl_client.py:116 +#: ../calculate-client/pym/client/wsdl_client.py:117 msgid "Domain user login" msgstr "Вход в сеанс доменного пользователя" -#: ../calculate-client/pym/client/wsdl_client.py:151 +#: ../calculate-client/pym/client/wsdl_client.py:153 msgid "Domain user logout" msgstr "Выход из сеанса доменного пользователя" -#: ../calculate-client/pym/client/variables/client.py:189 +#: ../calculate-client/pym/client/variables/client.py:191 msgid "Domain workstation" msgstr "Доменная рабочая станция" -#: ../calculate-client/pym/client/client.py:231 -#: ../calculate-client/pym/client/client.py:1023 -#: ../calculate-client/pym/client/client.py:1036 -#: ../calculate-client/pym/client/client.py:1052 +#: ../calculate-client/pym/client/client.py:235 +#: ../calculate-client/pym/client/client.py:1032 +#: ../calculate-client/pym/client/client.py:1045 +#: ../calculate-client/pym/client/client.py:1061 msgid "ERROR" msgstr "ОШИБКА" -#: ../calculate-client/pym/client/variables/client.py:252 -#: ../calculate-client/pym/client/variables/client.py:281 +#: ../calculate-client/pym/client/variables/client.py:253 +#: ../calculate-client/pym/client/variables/client.py:282 msgid "Empty password" msgstr "Пустой пароль" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:147 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:92 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:194 #, python-brace-format msgid "Error synchronizing with the local server {cl_remote_host}" msgstr "Ошибка синхронизации с локальным сервером {cl_remote_host}" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:196 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:141 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:206 #, python-brace-format msgid "Error synchronizing with the {cl_replication_host} remote server" msgstr "Ошибка синхронизации с удалённым сервером {cl_replication_host}" -#: ../calculate-client/pym/client/wsdl_client.py:83 -#: ../calculate-client/pym/client/wsdl_client.py:118 -#: ../calculate-client/pym/client/wsdl_client.py:153 +#: ../calculate-client/pym/client/wsdl_client.py:84 +#: ../calculate-client/pym/client/wsdl_client.py:120 +#: ../calculate-client/pym/client/wsdl_client.py:155 msgid "Execute" msgstr "Выполнить" -#: ../calculate-client/pym/client/utils/cl_client.py:146 +#: ../calculate-client/pym/client/utils/cl_client.py:151 #, python-brace-format msgid "Failed to add the workstation to domain {cl_remote_host}" msgstr "Не удалось добавить компьютер в домен {cl_remote_host}" -#: ../calculate-client/pym/client/client.py:1053 +#: ../calculate-client/pym/client/client.py:1062 msgid "Failed to add to the default runlevel" msgstr "Не удалось добавить на уровень запуска по умолчанию" -#: ../calculate-client/pym/client/client.py:1174 +#: ../calculate-client/pym/client/client.py:1183 #, python-format msgid "Failed to authorize on %s" msgstr "Не удалось авторизоваться на %s" @@ -164,57 +166,60 @@ msgstr "Не удалось авторизоваться на %s" msgid "Failed to change the password" msgstr "Не удалось изменить пароль" -#: ../calculate-client/pym/client/client.py:957 +#: ../calculate-client/pym/client/client.py:961 #, python-format msgid "Failed to clear the kernel key for user %s" msgstr "Не удалось очистить ключ ядра для пользователя %s" -#: ../calculate-client/pym/client/client_cache.py:668 +#: ../calculate-client/pym/client/client_cache.py:669 msgid "Failed to connect to the LDAP server" msgstr "Не удалось подключиться к LDAP серверу" -#: ../calculate-client/pym/client/client.py:805 +#: ../calculate-client/pym/client/client.py:814 #, python-brace-format msgid "Failed to copy {ffrom} to {fto}" msgstr "Не удалось скопировать {ffrom} в {fto}" -#: ../calculate-client/pym/client/client_cache.py:283 +#: ../calculate-client/pym/client/client_cache.py:286 #, python-format msgid "Failed to create directory %s" msgstr "Не удалось создать директорию %s" -#: ../calculate-client/pym/client/client_cache.py:289 +#: ../calculate-client/pym/client/client_cache.py:292 #, python-format msgid "Failed to create file %s" msgstr "Не удалось создать файл %s" -#: ../calculate-client/pym/client/client.py:686 +#: ../calculate-client/pym/client/client.py:691 msgid "Failed to create the directory" msgstr "Не удалось создать директорию" -#: ../calculate-client/pym/client/client.py:1037 +#: ../calculate-client/pym/client/client.py:1046 msgid "Failed to delete from the default runlevel" msgstr "Не удалось удалить из уровня запуска по умолчанию" -#: ../calculate-client/pym/client/client.py:439 +#: ../calculate-client/pym/client/client.py:444 +#: ../calculate-client/pym/client/client.py:1357 +#: ../calculate-client/pym/client/client.py:1377 msgid "Failed to execute rsync" msgstr "Не удалось выполнить rsync" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:160 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:105 #, python-brace-format msgid "Failed to find the profile archive of {cl_replication_host}" msgstr "Не удалось найти архив с профилем от {cl_replication_host}" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:217 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:162 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:223 msgid "Failed to get the user profile from the domain" msgstr "Не удалось получить профиль пользователя из домена" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:321 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:422 msgid "Failed to make a links archive" msgstr "Не удалось создать архив символических ссылок" -#: ../calculate-client/pym/client/client.py:709 -#: ../calculate-client/pym/client/client.py:1271 +#: ../calculate-client/pym/client/client.py:714 +#: ../calculate-client/pym/client/client.py:1280 #, python-format msgid "Failed to mount the Samba volume [%s]" msgstr "Не удалось подключить Samba ресурс [%s]" @@ -223,19 +228,19 @@ msgstr "Не удалось подключить Samba ресурс [%s]" msgid "Failed to read the file" msgstr "Не удалось прочитать файл" -#: ../calculate-client/pym/client/client.py:809 +#: ../calculate-client/pym/client/client.py:818 msgid "Failed to remove " msgstr "Не удалось удалить" -#: ../calculate-client/pym/client/utils/cl_client.py:153 +#: ../calculate-client/pym/client/utils/cl_client.py:158 msgid "Failed to remove the workstation from the domain" msgstr "Не удалось удалить компьютер из домена" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:169 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:114 msgid "Failed to unpack" msgstr "Не удалось распаковать архив" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:227 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:303 msgid "Failed to unpack the links archive" msgstr "Не удалось распаковать архив символических ссылок" @@ -243,61 +248,66 @@ msgstr "Не удалось распаковать архив символиче msgid "Failed to write to file" msgstr "Не удалось записать в файл" -#: ../calculate-client/pym/client/client.py:189 +#: ../calculate-client/pym/client/client.py:193 #, python-format msgid "Failed to write variables in file %s" msgstr "Не удалось записать переменные в файл %s" -#: ../calculate-client/pym/client/client.py:385 +#: ../calculate-client/pym/client/client.py:390 #, python-format msgid "Fetching the file list from %s" msgstr "Получение списка файлов из %s" -#: ../calculate-client/pym/client/client.py:386 +#: ../calculate-client/pym/client/client.py:391 +#: ../calculate-client/pym/client/client.py:1424 #, python-format msgid "Fetching the user profile from %s" msgstr "Получение пользовательского профиля из %s" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:212 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:157 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:217 #, python-brace-format msgid "Got a user fallback profile from the {cl_remote_host} domain" msgstr "Получен запасной профиль пользователя из {cl_remote_host} домена" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:287 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:384 #, python-brace-format msgid "Home directory {ur_home_path} not found" msgstr "Пользовательская домашняя директория {ur_home_path} не найдена" -#: ../calculate-client/pym/client/client.py:1166 +#: ../calculate-client/pym/client/client.py:1175 msgid "Info not found on the server" msgstr "Не найдена информация на сервере" -#: ../calculate-client/pym/client/variables/client.py:190 +#: ../calculate-client/pym/client/variables/client.py:192 msgid "Local workstation" msgstr "Локальная рабочая станция" -#: ../calculate-client/pym/client/client.py:380 +#: ../calculate-client/pym/client/client.py:385 +#: ../calculate-client/pym/client/client.py:1420 #, python-format msgid "Method syncUser: wrong option sync=%s" msgstr "Метод syncUser: параметр sync=%s неправильный" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:351 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:458 msgid "Modified user profile saved in the domain" msgstr "Профиль пользователя сохранён в домене" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:357 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:464 msgid "Modified user profile saved in the domain with errors" msgstr "Изменения пользовательского профиля сохранены в домене с ошибками" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:73 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:258 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:357 msgid "Mounting encrypted data" msgstr "Подключение шифрованных данных" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:87 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:48 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:174 msgid "Mounting user resources" msgstr "Подключение пользовательских ресурсов" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:312 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:413 msgid "Moving non-profile files to the Home/Moved directory" msgstr "Перемещение не профильных файлов в Home/Moved каталог" @@ -306,15 +316,15 @@ msgstr "Перемещение не профильных файлов в Home/Mo msgid "New password" msgstr "Новый пароль" -#: ../calculate-client/pym/client/variables/client.py:220 +#: ../calculate-client/pym/client/variables/client.py:222 msgid "Only mount the domain resource" msgstr "Только подключить доменные ресурсы" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:157 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:102 msgid "Packing the archive on the server" msgstr "Упаковка архива на сервере" -#: ../calculate-client/pym/client/wsdl_client.py:163 +#: ../calculate-client/pym/client/wsdl_client.py:165 msgid "Password Modification" msgstr "Смена пароля" @@ -322,125 +332,124 @@ msgstr "Смена пароля" msgid "Password changing manually interrupted" msgstr "Смена пароля прервана пользователем" -#: ../calculate-client/pym/client/wsdl_client.py:188 +#: ../calculate-client/pym/client/wsdl_client.py:190 msgid "Password modification" msgstr "Смена пароля" -#: ../calculate-client/pym/client/client.py:1296 +#: ../calculate-client/pym/client/client.py:1306 msgid "Permission denied" msgstr "Недостаточно прав" -#: ../calculate-client/pym/client/client.py:687 +#: ../calculate-client/pym/client/client.py:692 #, python-format msgid "Permission denied: '%s'" msgstr "Нет доступа: '%s'" -#: ../calculate-client/pym/client/variables/client.py:80 +#: ../calculate-client/pym/client/variables/client.py:82 msgid "Please specify the domain" msgstr "Необходимо указать домен" -#: ../calculate-client/pym/client/variables/client.py:303 +#: ../calculate-client/pym/client/variables/client.py:304 msgid "Please specify the user" msgstr "Необходимо указать пользователя" -#: ../calculate-client/pym/client/variables/client.py:688 -#: ../calculate-client/pym/client/variables/client.py:709 +#: ../calculate-client/pym/client/variables/client.py:739 msgid "Remote profile not mounted" msgstr "Удалённый профиль не подключен" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:298 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:399 msgid "Remote user resources not found" msgstr "Удалённые ресурсы пользователя не найдены" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:331 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:438 msgid "Removing hindering files" msgstr "Удаление препятствующих файлов" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:336 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:443 msgid "Removing user private files" msgstr "Удаление пользовательских личных файлов" -#: ../calculate-client/pym/client/client.py:225 +#: ../calculate-client/pym/client/client.py:229 msgid "Retype the new password" msgstr "Повторите ввод нового пароля" -#: ../calculate-client/pym/client/client.py:111 +#: ../calculate-client/pym/client/client.py:115 msgid "RsyncProgressBar: Wrong pipe" msgstr "RsyncProgressBar: сбой соединения" -#: ../calculate-client/pym/client/client.py:1116 +#: ../calculate-client/pym/client/client.py:1125 #, python-format msgid "Samba server not found in %s" msgstr "Не найден Samba сервер в %s" -#: ../calculate-client/pym/client/client.py:1259 -#: ../calculate-client/pym/client/client.py:1273 +#: ../calculate-client/pym/client/client.py:1268 +#: ../calculate-client/pym/client/client.py:1282 #, python-format msgid "Samba volume [%s] mounted" msgstr "Samba ресурс [%s] подключен" -#: ../calculate-client/pym/client/wsdl_client.py:191 +#: ../calculate-client/pym/client/wsdl_client.py:193 msgid "Save" msgstr "Сохранить" -#: ../calculate-client/pym/client/client.py:390 +#: ../calculate-client/pym/client/client.py:395 #, python-format msgid "Sending the file list to %s" msgstr "Отправка списка файлов в %s" -#: ../calculate-client/pym/client/client.py:1107 +#: ../calculate-client/pym/client/client.py:1116 #, python-format msgid "Server %s does not respond" msgstr "Сервер %s не отвечает" #: ../calculate-client/pym/client/utils/cl_client_sync.py:43 -#: ../calculate-client/pym/client/utils/cl_client_sync.py:268 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:346 msgid "Synchronization manually interrupted" msgstr "Синхронизация прервана пользователем" -#: ../calculate-client/pym/client/variables/client.py:169 +#: ../calculate-client/pym/client/variables/client.py:171 msgid "Synchronize the user profile" msgstr "Синхронизировать пользовательский профиль" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:59 -#: ../calculate-client/pym/client/utils/cl_client_sync.py:276 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:244 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:354 msgid "The local profile will be used" msgstr "Будет использован локальный профиль" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:141 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:86 msgid "The local user profile does not need to be synchronized with the local domain" msgstr "Локальный профиль пользователя не нуждается в обновлении с локального домена" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:122 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:67 msgid "The local user profile does not need to be synchronized with the remote domain" msgstr "Локальный профиль пользователя не нуждается в синхронизации с удалённым доменом" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:308 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:409 msgid "The profile will not be uploaded to the domain" msgstr "Профиль не будет закачен в домен" -#: ../calculate-client/pym/client/variables/client.py:83 +#: ../calculate-client/pym/client/variables/client.py:85 msgid "The specified address is not available" msgstr "Указанный адрес недоступен" -#: ../calculate-client/pym/client/variables/client.py:198 +#: ../calculate-client/pym/client/variables/client.py:200 #, python-format msgid "The workstation is already in the domain %s" msgstr "Компьютер уже в домене %s" -#: ../calculate-client/pym/client/variables/client.py:195 +#: ../calculate-client/pym/client/variables/client.py:197 msgid "The workstation is not in the domain" msgstr "Компьютер не в домене" -#: ../calculate-client/pym/client/client.py:1200 +#: ../calculate-client/pym/client/client.py:1209 msgid "The workstation was configured for work in the domain" msgstr "Компьютер настроен для работы в домене" -#: ../calculate-client/pym/client/client.py:1204 +#: ../calculate-client/pym/client/client.py:1213 msgid "The workstation was configured for work outside the domain" msgstr "Компьютер настроен для работы без домена" -#: ../calculate-client/pym/client/variables/client.py:306 +#: ../calculate-client/pym/client/variables/client.py:307 msgid "This action can be executed by a non-root user only" msgstr "Действие не может быть выполнено root пользователем" @@ -448,79 +457,85 @@ msgstr "Действие не может быть выполнено root пол msgid "This workstation is not in the domain" msgstr "Этот компьютер не в домене" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:252 -#: ../calculate-client/pym/client/utils/cl_client_sync.py:346 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:329 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:453 msgid "Umounting user resources" msgstr "Отключение пользовательских ресурсов" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:83 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:268 msgid "Unable to cache user info" msgstr "Не удалось закэшировать информацию о пользователе" -#: ../calculate-client/pym/client/client.py:761 +#: ../calculate-client/pym/client/client.py:766 #, python-format msgid "Unable to mount %s" msgstr "Не удалось подключить %s" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:175 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:120 msgid "Unable to remove useless files" msgstr "Не удалось удалить ненужные файлы" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:166 +#: ../calculate-client/pym/client/variables/client.py:856 +msgid "Unmount user resources on error" +msgstr "Отключать пользовательские ресурсы при ошибке" + +#: ../calculate-client/pym/client/utils/cl_client_sync.py:111 msgid "Unpacking the profile" msgstr "Распаковка архива с профилем" -#: ../calculate-client/pym/client/client.py:391 +#: ../calculate-client/pym/client/client.py:396 +#: ../calculate-client/pym/client/client.py:1426 #, python-format msgid "Uploading the user profile to %s" msgstr "Закачка пользовательского профиля на %s" -#: ../calculate-client/pym/client/variables/client.py:310 +#: ../calculate-client/pym/client/variables/client.py:311 #, python-format msgid "User %s does not exist" msgstr "Пользователь %s не существует" -#: ../calculate-client/pym/client/client_cache.py:351 +#: ../calculate-client/pym/client/client_cache.py:354 #, python-format msgid "User %s not found in LDAP" msgstr "Не удалось найти пользователя %s в LDAP" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:70 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:255 msgid "User password not found" msgstr "Не найден пароль пользователя" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:232 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:308 msgid "User profile fetched from the domain" msgstr "Получен профиль пользователя из домена" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:240 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:316 msgid "User profile modifications will not be saved to the domain" msgstr "Изменения в пользовательском профиле не будут сохранены в домене" -#: ../calculate-client/pym/client/utils/cl_client_sync.py:280 +#: ../calculate-client/pym/client/utils/cl_client_sync.py:377 #, python-brace-format msgid "User {ur_login} is already on the X session" msgstr "Пользователь {ur_login} уже в X сессии" -#: ../calculate-client/pym/client/client.py:352 +#: ../calculate-client/pym/client/client.py:361 +#: ../calculate-client/pym/client/client.py:1392 msgid "Variable 'cl_sync_skip_path' empty" msgstr "Переменная 'cl_sync_skip_path' пуста" -#: ../calculate-client/pym/client/client.py:1263 +#: ../calculate-client/pym/client/client.py:1272 msgid "Variable not found" msgstr "Не найдена переменная" -#: ../calculate-client/pym/client/utils/cl_client.py:142 +#: ../calculate-client/pym/client/utils/cl_client.py:147 #, python-brace-format msgid "Workstation added to domain {cl_remote_host}" msgstr "Компьютер добавлен в домен {cl_remote_host}" -#: ../calculate-client/pym/client/utils/cl_client.py:150 +#: ../calculate-client/pym/client/utils/cl_client.py:155 #, python-brace-format msgid "Workstation removed from domain {cl_remote_host}" msgstr "Компьютер удалён из домена {cl_remote_host}" -#: ../calculate-client/pym/client/variables/client.py:185 +#: ../calculate-client/pym/client/variables/client.py:187 msgid "Workstation role" msgstr "Назначение компьютера" @@ -531,51 +546,55 @@ msgstr "Назначение компьютера" msgid "Wrong password" msgstr "Неправильный пароль" -#: ../calculate-client/pym/client/client.py:1176 +#: ../calculate-client/pym/client/client.py:1185 #, python-format msgid "Wrong value of variable sr_samba_host in %s" msgstr "Неправильное значение переменной sr_samba_host в %s" -#: ../calculate-client/pym/client/variables/client.py:301 +#: ../calculate-client/pym/client/variables/client.py:302 msgid "X session users not found" msgstr "Не удалось найти пользователей в X сессии" -#: ../calculate-client/pym/client/variables/client.py:236 +#: ../calculate-client/pym/client/variables/client.py:238 msgid "current user password" msgstr "текущий пароль пользователя" -#: ../calculate-client/pym/client/variables/client.py:73 +#: ../calculate-client/pym/client/variables/client.py:75 msgid "domain" msgstr "домен" -#: ../calculate-client/pym/client/variables/client.py:277 +#: ../calculate-client/pym/client/variables/client.py:278 msgid "new user password" msgstr "новый пароль пользователя" -#: ../calculate-client/pym/client/variables/client.py:221 +#: ../calculate-client/pym/client/variables/client.py:223 msgid "only mount the [remote] domain resource" msgstr "только подключить [remote] из домена" -#: ../calculate-client/pym/client/client.py:232 +#: ../calculate-client/pym/client/client.py:236 msgid "passwords do not match" msgstr "пароли не совпадают" -#: ../calculate-client/pym/client/variables/client.py:186 +#: ../calculate-client/pym/client/variables/client.py:188 msgid "remove the domain connection settings" msgstr "удалить настройки подключения к домену" -#: ../calculate-client/pym/client/client.py:1168 +#: ../calculate-client/pym/client/client.py:1177 msgid "services DN or unix DN or bind DN or bind password" msgstr "services DN или unix DN или bind DN или bind password" -#: ../calculate-client/pym/client/variables/client.py:118 +#: ../calculate-client/pym/client/variables/client.py:120 msgid "specify the domain password" msgstr "указать пароль домена" -#: ../calculate-client/pym/client/variables/client.py:170 +#: ../calculate-client/pym/client/variables/client.py:172 msgid "synchronize user preferences" msgstr "синхронизировать пользовательские настройки" +#: ../calculate-client/pym/client/variables/client.py:857 +msgid "unmount user resources on error" +msgstr "отключать пользовательские ресурсы при ошибке" + #: ../calculate-client/pym/client/utils/cl_passwd.py:39 #, python-brace-format msgid "" diff --git a/ru/cl_console3.po b/ru/cl_console3.po index 27a656d..f1a0175 100644 --- a/ru/cl_console3.po +++ b/ru/cl_console3.po @@ -34,7 +34,7 @@ msgstr "Номер Вашей сессии = %s" msgid "%s: permission denied" msgstr "Доступ запрещён %s" -#: ../calculate-console/pym/console/application/methods_func.py:61 +#: ../calculate-console/pym/console/application/methods_func.py:62 msgid "'list' for displaying possible values" msgstr "'list' для отображения возможных значений" @@ -62,15 +62,15 @@ msgstr "Активен" msgid "Active sessions on the server: " msgstr "Активные сессии на сервере: " -#: ../calculate-console/pym/console/application/client_class.py:308 +#: ../calculate-console/pym/console/application/client_class.py:392 msgid "Add the CA and root certificates" msgstr "Добавить корневой сертификат и сертификат ЦА" -#: ../calculate-console/pym/console/application/client_class.py:233 +#: ../calculate-console/pym/console/application/client_class.py:317 msgid "Add the CA certificate to trusted? y/[n]:" msgstr "Добавить сертификат Центра авторизации в доверенные? y/[n]:" -#: ../calculate-console/pym/console/application/client_class.py:257 +#: ../calculate-console/pym/console/application/client_class.py:341 msgid "Add this server certificate to trusted (s) or" msgstr "Добавить сертификат этого сервера в доверенные (s) или" @@ -86,7 +86,7 @@ msgstr "Сертификат Центра авторизации удалён и msgid "CA certificate deleted from the list of user trusted certificates" msgstr "Сертификат Центра авторизации удалён из пользовательского списка доверенных сертификатов" -#: ../calculate-console/pym/console/application/client_class.py:214 +#: ../calculate-console/pym/console/application/client_class.py:298 msgid "CA certificate not found on the server" msgstr "Сертификат Центра авторизации не найден на сервере" @@ -94,8 +94,8 @@ msgstr "Сертификат Центра авторизации не найде msgid "CRL added" msgstr "CRL добавлен" -#: ../calculate-console/pym/console/application/cert_func.py:330 -#: ../calculate-console/pym/console/application/client_class.py:198 +#: ../calculate-console/pym/console/application/cert_func.py:329 +#: ../calculate-console/pym/console/application/client_class.py:282 msgid "Certificate added" msgstr "Сертификат добавлен" @@ -104,16 +104,16 @@ msgstr "Сертификат добавлен" msgid "Certificate issued: %s" msgstr "Дата подписания сертификата: %s" -#: ../calculate-console/pym/console/application/client_class.py:238 +#: ../calculate-console/pym/console/application/client_class.py:322 msgid "Certificate not added to trusted" msgstr "Сертификат не добавлен в доверенные" -#: ../calculate-console/pym/console/application/client_class.py:114 +#: ../calculate-console/pym/console/application/client_class.py:198 msgid "Certificate not found on the client`s side" msgstr "Сертификат не найден на стороне клиента" #: ../calculate-console/pym/console/application/cert_func.py:55 -#: ../calculate-console/pym/console/application/cl_client.py:320 +#: ../calculate-console/pym/console/application/cl_client.py:321 #: ../calculate-console/pym/console/application/pid_information.py:150 msgid "Certificate not found on the server" msgstr "Не найден сертификат на сервере" @@ -127,7 +127,7 @@ msgstr "Сертификат не отправлен!" msgid "Certificate number: %s" msgstr "Номер сертификата: %s" -#: ../calculate-console/pym/console/application/cert_func.py:263 +#: ../calculate-console/pym/console/application/cert_func.py:262 #, python-format msgid "Certificate saved. Your certificate ID: %s" msgstr "Сертификат сохранён. Номер вашего сертификата - %s" @@ -136,8 +136,8 @@ msgstr "Сертификат сохранён. Номер вашего серт msgid "City: " msgstr "Город: " -#: ../calculate-console/pym/console/application/cert_func.py:158 -#: ../calculate-console/pym/console/application/cert_func.py:219 +#: ../calculate-console/pym/console/application/cert_func.py:157 +#: ../calculate-console/pym/console/application/cert_func.py:218 msgid "Closing. Connection error." msgstr "Ошибка соединения. Закрываюсь." @@ -150,7 +150,7 @@ msgstr "Завершён" msgid "Country (2 characters): [%s]" msgstr "Страна (2 символа): [%s]" -#: ../calculate-console/pym/console/application/cert_func.py:169 +#: ../calculate-console/pym/console/application/cert_func.py:168 msgid "Create a new private key and request? y/[n]: " msgstr "Создать новые секретный ключ и запрос на подпись сертификата? y/[n]: " @@ -167,45 +167,45 @@ msgstr "Ошибка очистки кэша сессии" msgid "Error fetching the PID list from the server" msgstr "Ошибка получения списка процессов с сервера" -#: ../calculate-console/pym/console/application/client_class.py:221 +#: ../calculate-console/pym/console/application/client_class.py:305 msgid "Error. Certificate not added to trusted" msgstr "Ошибка! Сертификат не добавлен в доверенные" -#: ../calculate-console/pym/console/application/cl_client.py:465 -#: ../calculate-console/pym/console/application/cl_client.py:477 -#: ../calculate-console/pym/console/application/cl_client.py:566 -#: ../calculate-console/pym/console/application/cl_client.py:583 +#: ../calculate-console/pym/console/application/cl_client.py:468 +#: ../calculate-console/pym/console/application/cl_client.py:480 +#: ../calculate-console/pym/console/application/cl_client.py:569 +#: ../calculate-console/pym/console/application/cl_client.py:586 msgid "Error: " msgstr "Ошибка: " -#: ../calculate-console/pym/console/application/cert_func.py:159 +#: ../calculate-console/pym/console/application/cert_func.py:158 #, python-format msgid "Error: %s" msgstr "Ошибка: %s" -#: ../calculate-console/pym/console/application/cl_client.py:493 #: ../calculate-console/pym/console/application/cl_client.py:496 -#: ../calculate-console/pym/console/application/cl_client.py:502 -#: ../calculate-console/pym/console/application/cl_client.py:601 +#: ../calculate-console/pym/console/application/cl_client.py:499 +#: ../calculate-console/pym/console/application/cl_client.py:505 #: ../calculate-console/pym/console/application/cl_client.py:604 -#: ../calculate-console/pym/console/application/cl_client.py:610 +#: ../calculate-console/pym/console/application/cl_client.py:607 +#: ../calculate-console/pym/console/application/cl_client.py:613 #, python-format msgid "Exception: %s" msgstr "Исключение: %s" -#: ../calculate-console/pym/console/application/function.py:54 +#: ../calculate-console/pym/console/application/function.py:58 msgid "Failed to clear the cache! " msgstr "Не удалось очистить кэша!" -#: ../calculate-console/pym/console/application/cl_client.py:517 -#: ../calculate-console/pym/console/application/methods_func.py:103 +#: ../calculate-console/pym/console/application/cl_client.py:520 +#: ../calculate-console/pym/console/application/methods_func.py:104 msgid "Failed to connect" msgstr "Не удалось подключиться" #: ../calculate-console/pym/console/application/cert_verify.py:104 #: ../calculate-console/pym/console/application/cert_verify.py:109 -#: ../calculate-console/pym/console/application/cl_client.py:411 -#: ../calculate-console/pym/console/application/client_class.py:305 +#: ../calculate-console/pym/console/application/cl_client.py:413 +#: ../calculate-console/pym/console/application/client_class.py:389 #, python-format msgid "Failed to create directory %s" msgstr "Ошибка при создании директории %s" @@ -214,22 +214,22 @@ msgstr "Ошибка при создании директории %s" msgid "Failed to obtain certificate data!" msgstr "Не удалось получить данные сертификата!" -#: ../calculate-console/pym/console/application/client_class.py:123 +#: ../calculate-console/pym/console/application/client_class.py:207 msgid "Failed to open the file" msgstr "Ошибка при открытии файла" -#: ../calculate-console/pym/console/application/cl_client.py:324 +#: ../calculate-console/pym/console/application/cl_client.py:325 #: ../calculate-console/pym/console/application/pid_information.py:154 msgid "Failed to terminate the process" msgstr "Не удалось завершить процесс" -#: ../calculate-console/pym/console/application/cert_func.py:317 -#: ../calculate-console/pym/console/application/client_class.py:186 +#: ../calculate-console/pym/console/application/cert_func.py:316 +#: ../calculate-console/pym/console/application/client_class.py:270 msgid "Field \"CN\" not found in the certificate!" msgstr "Не найдено поле \"CN\" в сертификате!" -#: ../calculate-console/pym/console/application/client_class.py:223 -#: ../calculate-console/pym/console/application/client_class.py:246 +#: ../calculate-console/pym/console/application/client_class.py:307 +#: ../calculate-console/pym/console/application/client_class.py:330 #, python-format msgid "Fingerprint = %s" msgstr "Отпечаток = %s" @@ -245,17 +245,17 @@ msgstr "Имя хоста [%s]: " msgid "ID: %s" msgstr "ID: %s" -#: ../calculate-console/pym/console/application/cl_client.py:459 -#: ../calculate-console/pym/console/application/cl_client.py:559 +#: ../calculate-console/pym/console/application/cl_client.py:462 +#: ../calculate-console/pym/console/application/cl_client.py:562 msgid "Invalid password" msgstr "Неверный пароль" -#: ../calculate-console/pym/console/application/client_class.py:210 +#: ../calculate-console/pym/console/application/client_class.py:294 msgid "Invalid server certificate!" msgstr "Сертификат сервера недействителен!" -#: ../calculate-console/pym/console/application/client_class.py:226 -#: ../calculate-console/pym/console/application/client_class.py:249 +#: ../calculate-console/pym/console/application/client_class.py:310 +#: ../calculate-console/pym/console/application/client_class.py:333 msgid "Issuer" msgstr "Подписчик" @@ -263,22 +263,22 @@ msgstr "Подписчик" msgid "Killed" msgstr "Прерван" -#: ../calculate-console/pym/console/application/cl_client.py:481 -#: ../calculate-console/pym/console/application/cl_client.py:500 -#: ../calculate-console/pym/console/application/cl_client.py:522 -#: ../calculate-console/pym/console/application/cl_client.py:587 -#: ../calculate-console/pym/console/application/cl_client.py:608 -#: ../calculate-console/pym/console/application/methods_func.py:199 +#: ../calculate-console/pym/console/application/cl_client.py:484 +#: ../calculate-console/pym/console/application/cl_client.py:503 +#: ../calculate-console/pym/console/application/cl_client.py:525 +#: ../calculate-console/pym/console/application/cl_client.py:590 +#: ../calculate-console/pym/console/application/cl_client.py:611 +#: ../calculate-console/pym/console/application/methods_func.py:200 #: ../calculate-console/pym/console/console_main.py:39 msgid "Manually interrupted" msgstr "Прервано пользователем" -#: ../calculate-console/pym/console/application/methods_func.py:170 -#: ../calculate-console/pym/console/application/methods_func.py:207 +#: ../calculate-console/pym/console/application/methods_func.py:171 +#: ../calculate-console/pym/console/application/methods_func.py:208 msgid "Method not available" msgstr "Метод недоступен" -#: ../calculate-console/pym/console/application/function.py:117 +#: ../calculate-console/pym/console/application/function.py:121 msgid "Method not found: " msgstr "Метод не найден: " @@ -309,7 +309,7 @@ msgstr "Процесс не найден" msgid "PIDs not found for this session!" msgstr "Не найдены процессы для вашей сессии!" -#: ../calculate-console/pym/console/application/cert_func.py:422 +#: ../calculate-console/pym/console/application/cert_func.py:421 msgid "Password: " msgstr "Пароль: " @@ -334,30 +334,30 @@ msgstr "Имя процесса: %s" msgid "Process not found" msgstr "Процесс не найден" -#: ../calculate-console/pym/console/application/cl_client.py:318 +#: ../calculate-console/pym/console/application/cl_client.py:319 msgid "Process terminated" msgstr "Процесс завершён" -#: ../calculate-console/pym/console/application/client_class.py:259 +#: ../calculate-console/pym/console/application/client_class.py:343 msgid "Quit (q)? s/c/[q]: " msgstr "Выйти (q)? s/c/[q]: " -#: ../calculate-console/pym/console/application/cert_func.py:226 +#: ../calculate-console/pym/console/application/cert_func.py:225 #, python-format msgid "Request %s not found on the client's side" msgstr "Запрос %s не найден на стороне клиента" -#: ../calculate-console/pym/console/application/cert_func.py:140 +#: ../calculate-console/pym/console/application/cert_func.py:139 #, python-format msgid "Request ID = %s" msgstr "Номер запроса = %s" -#: ../calculate-console/pym/console/application/cert_func.py:201 +#: ../calculate-console/pym/console/application/cert_func.py:200 #, python-format msgid "Request not sent or file %s deleted" msgstr "Запрос не был послан или удалён файл %s" -#: ../calculate-console/pym/console/application/cert_func.py:250 +#: ../calculate-console/pym/console/application/cert_func.py:249 msgid "Request or signature not matching earlier data." msgstr "Запрос или подпись не соответствуют отправленным ранее." @@ -365,11 +365,11 @@ msgstr "Запрос или подпись не соответствуют от msgid "Revoke date" msgstr "Дата отзыва" -#: ../calculate-console/pym/console/application/methods_func.py:195 +#: ../calculate-console/pym/console/application/methods_func.py:196 msgid "Run process?" msgstr "Запустить процесс? " -#: ../calculate-console/pym/console/application/cert_func.py:141 +#: ../calculate-console/pym/console/application/cert_func.py:140 msgid "Send a new request? y/[n]: " msgstr "Отправить навый запрос на подпись сертификата? y/[n]: " @@ -377,8 +377,8 @@ msgstr "Отправить навый запрос на подпись серт msgid "Serial" msgstr "Серийный номер" -#: ../calculate-console/pym/console/application/client_class.py:224 -#: ../calculate-console/pym/console/application/client_class.py:247 +#: ../calculate-console/pym/console/application/client_class.py:308 +#: ../calculate-console/pym/console/application/client_class.py:331 msgid "Serial Number = " msgstr "Серийный номер = " @@ -394,16 +394,16 @@ msgstr "Информация о сессии: " msgid "Session non registered on the server!" msgstr "Данная сессия не зарегистрирована на сервере!" -#: ../calculate-console/pym/console/application/cl_client.py:322 +#: ../calculate-console/pym/console/application/cl_client.py:323 #: ../calculate-console/pym/console/application/pid_information.py:152 msgid "Session not matching your certificate" msgstr "Сессия не соответствует Вашему сертификату" -#: ../calculate-console/pym/console/application/cert_func.py:244 +#: ../calculate-console/pym/console/application/cert_func.py:243 msgid "Signature request not examined yet." msgstr "Запрос на подписание сертификата ещё не рассмотрен." -#: ../calculate-console/pym/console/application/cert_func.py:241 +#: ../calculate-console/pym/console/application/cert_func.py:240 msgid "Signature request rejected!" msgstr "Запрос на подпись сертификата отвергнут!" @@ -417,8 +417,8 @@ msgstr "Время запуска: %s" msgid "Status: %s" msgstr "Статус: %s" -#: ../calculate-console/pym/console/application/client_class.py:230 -#: ../calculate-console/pym/console/application/client_class.py:253 +#: ../calculate-console/pym/console/application/client_class.py:314 +#: ../calculate-console/pym/console/application/client_class.py:337 msgid "Subject" msgstr "Субъект" @@ -436,20 +436,20 @@ msgstr "Время жизни сертификата истекло" msgid "The client uses certificate {certfile} (server ID {cert_id})" msgstr "Клиент использует сертификат {certfile} (ID сервера {cert_id})" -#: ../calculate-console/pym/console/application/cert_func.py:332 -#: ../calculate-console/pym/console/application/client_class.py:200 +#: ../calculate-console/pym/console/application/cert_func.py:331 +#: ../calculate-console/pym/console/application/client_class.py:284 msgid "The file containing the CA certificate now exists" msgstr "Файл с сертификатом удостоверяющего центра создан" -#: ../calculate-console/pym/console/application/function.py:166 +#: ../calculate-console/pym/console/application/function.py:170 msgid "The process does not exist or does not belong to your session" msgstr "Процесс не существует или принадлежит не вашей сессии" -#: ../calculate-console/pym/console/application/cert_func.py:253 +#: ../calculate-console/pym/console/application/cert_func.py:252 msgid "The request was sent from another IP." msgstr "Запрос был послан с другого адреса." -#: ../calculate-console/pym/console/application/cert_func.py:184 +#: ../calculate-console/pym/console/application/cert_func.py:183 msgid "The server has not signed the certificate!" msgstr "Сервер не подписал сертификат!" @@ -457,24 +457,24 @@ msgstr "Сервер не подписал сертификат!" msgid "This certificate has been revoked!" msgstr "Данный сертификат отозван!" -#: ../calculate-console/pym/console/application/client_class.py:437 +#: ../calculate-console/pym/console/application/client_class.py:510 msgid "This server is not trusted" msgstr "Сервер не является доверенным" -#: ../calculate-console/pym/console/application/cert_func.py:190 -#: ../calculate-console/pym/console/application/cert_func.py:246 +#: ../calculate-console/pym/console/application/cert_func.py:189 +#: ../calculate-console/pym/console/application/cert_func.py:245 msgid "To submit the certificate request on the server use command" msgstr "Для подписания сертификата на сервере используется команда" -#: ../calculate-console/pym/console/application/client_class.py:258 +#: ../calculate-console/pym/console/application/client_class.py:342 msgid "Try to add the CA and root certificates to trusted (c) or" msgstr "Попытаться добавить сертификат ЦА и корневой в доверенные (c) или" -#: ../calculate-console/pym/console/application/methods_func.py:157 +#: ../calculate-console/pym/console/application/methods_func.py:158 msgid "Unknown parameter" msgstr "Неизвестный параметр" -#: ../calculate-console/pym/console/application/client_class.py:243 +#: ../calculate-console/pym/console/application/client_class.py:327 msgid "Untrusted server certificate!" msgstr "Недоверенный сертификат сервера!" @@ -487,11 +487,11 @@ msgstr "Имя пользователя [%s]: " msgid "Using the upstream certificate" msgstr "Использование вышестоящиего сертификата" -#: ../calculate-console/pym/console/application/cl_client.py:249 +#: ../calculate-console/pym/console/application/cl_client.py:250 msgid "Wrong PID" msgstr "Неправильный PID" -#: ../calculate-console/pym/console/application/cert_func.py:139 +#: ../calculate-console/pym/console/application/cert_func.py:138 msgid "You already sent a certificate signature request." msgstr "У Вас уже есть отправленный запрос на подписание сертификата." @@ -499,38 +499,38 @@ msgstr "У Вас уже есть отправленный запрос на п msgid "You can generate a new certificate using options --gen-cert-by and --get-cert-from" msgstr "Вы можете сгенерировать новый сертификат, используя ключи --gen-cert-by и --get-cert-from" -#: ../calculate-console/pym/console/application/cert_func.py:346 +#: ../calculate-console/pym/console/application/cert_func.py:345 msgid "You do not have a certificate. Use option --gen-cert-by HOST to generate a new request or --get-cert-from HOST to get a new certificate from the server." msgstr "У Вас нет сертификата. Используйте ключ --gen-cert-by HOST для генерации запроса на сертификат или ключ --get-cert-from HOST, чтобы забрать сертификат с сервера." -#: ../calculate-console/pym/console/application/cert_func.py:189 -#: ../calculate-console/pym/console/application/cert_func.py:245 +#: ../calculate-console/pym/console/application/cert_func.py:188 +#: ../calculate-console/pym/console/application/cert_func.py:244 #, python-format msgid "Your request ID = %s" msgstr "Номер Вашего запроса = %s" -#: ../calculate-console/pym/console/application/methods_func.py:60 +#: ../calculate-console/pym/console/application/methods_func.py:61 msgid "attach to process" msgstr "подключиться к процессу" -#: ../calculate-console/pym/console/application/methods_func.py:41 +#: ../calculate-console/pym/console/application/methods_func.py:42 msgid "call method" msgstr "вызов метода" -#: ../calculate-console/pym/console/application/methods_func.py:71 +#: ../calculate-console/pym/console/application/methods_func.py:72 msgid "clear the session cache" msgstr "очистить кэш сессии" -#: ../calculate-console/pym/console/application/cert_func.py:151 -#: ../calculate-console/pym/console/application/cert_func.py:210 +#: ../calculate-console/pym/console/application/cert_func.py:150 +#: ../calculate-console/pym/console/application/cert_func.py:209 msgid "connecting..." msgstr "подключение..." -#: ../calculate-console/pym/console/application/methods_func.py:47 +#: ../calculate-console/pym/console/application/methods_func.py:48 msgid "destination host" msgstr "хост назначения" -#: ../calculate-console/pym/console/application/methods_func.py:91 +#: ../calculate-console/pym/console/application/methods_func.py:92 msgid "do not display the progress bar" msgstr "не отображать индикатор прогресса" @@ -539,44 +539,44 @@ msgstr "не отображать индикатор прогресса" msgid "fields CN and L in the CA certificate are incorrect!" msgstr "поля CN и L в сертификате CA некорректны!" -#: ../calculate-console/pym/console/application/cert_func.py:329 -#: ../calculate-console/pym/console/application/client_class.py:197 +#: ../calculate-console/pym/console/application/cert_func.py:328 +#: ../calculate-console/pym/console/application/client_class.py:281 msgid "filename = " msgstr "имя файла =" -#: ../calculate-console/pym/console/application/methods_func.py:53 +#: ../calculate-console/pym/console/application/methods_func.py:54 msgid "get the signed certificate from the server" msgstr "забрать подписанный сертификат с сервера" -#: ../calculate-console/pym/console/application/methods_func.py:64 +#: ../calculate-console/pym/console/application/methods_func.py:65 msgid "keep the cache of the process results" msgstr "сохранить кэш результата процесса" -#: ../calculate-console/pym/console/application/methods_func.py:68 +#: ../calculate-console/pym/console/application/methods_func.py:69 msgid "kill the selected process" msgstr "завершить выбранный процесс" -#: ../calculate-console/pym/console/application/cl_client.py:73 +#: ../calculate-console/pym/console/application/cl_client.py:74 msgid "no connection to the server!" msgstr "нет соединения с сервером!" -#: ../calculate-console/pym/console/application/methods_func.py:56 +#: ../calculate-console/pym/console/application/methods_func.py:57 msgid "path to the cert and key files" msgstr "путь к файлам сертификата и ключа" -#: ../calculate-console/pym/console/application/methods_func.py:44 +#: ../calculate-console/pym/console/application/methods_func.py:45 msgid "port number" msgstr "номер порта" -#: ../calculate-console/pym/console/application/methods_func.py:50 +#: ../calculate-console/pym/console/application/methods_func.py:51 msgid "send a certificate signature request to the server" msgstr "послать запрос подписания сертификата на сервер" -#: ../calculate-console/pym/console/application/methods_func.py:39 +#: ../calculate-console/pym/console/application/methods_func.py:40 msgid "show this help message and exit" msgstr "просмотр данной справки и выход" -#: ../calculate-console/pym/console/application/methods_func.py:88 +#: ../calculate-console/pym/console/application/methods_func.py:89 msgid "stop cl-consoled" msgstr "остановить cl-consoled" @@ -585,31 +585,31 @@ msgstr "остановить cl-consoled" msgid "the client uses certificate %s" msgstr "клиент использует сертификат %s" -#: ../calculate-console/pym/console/application/cert_func.py:168 +#: ../calculate-console/pym/console/application/cert_func.py:167 msgid "the private key and request now exist" msgstr "секретный ключ и запрос на подпись сертификата созданы" -#: ../calculate-console/pym/console/application/function.py:184 +#: ../calculate-console/pym/console/application/function.py:188 msgid "the server sent PID = " msgstr "сервер послал идентификатор процесса = " -#: ../calculate-console/pym/console/application/methods_func.py:85 +#: ../calculate-console/pym/console/application/methods_func.py:86 msgid "update the revocation list" msgstr "обновить список отзыва сертификатов" -#: ../calculate-console/pym/console/application/methods_func.py:95 +#: ../calculate-console/pym/console/application/methods_func.py:96 msgid "use passwords from standard input for users accounts" msgstr "использовать пароли для пользовательских учётных записей из стандартного ввода" -#: ../calculate-console/pym/console/application/methods_func.py:78 +#: ../calculate-console/pym/console/application/methods_func.py:79 msgid "view information about session = SID" msgstr "просмотр информации о сессии с номером SID" -#: ../calculate-console/pym/console/application/methods_func.py:82 +#: ../calculate-console/pym/console/application/methods_func.py:83 msgid "view the active server sessions" msgstr "просмотр списка активных сессий на сервере" -#: ../calculate-console/pym/console/application/methods_func.py:74 +#: ../calculate-console/pym/console/application/methods_func.py:75 msgid "view the session information" msgstr "просмотр информации о сессии" diff --git a/ru/cl_consolegui3.po b/ru/cl_consolegui3.po index 257d735..e7aaabf 100644 --- a/ru/cl_consolegui3.po +++ b/ru/cl_consolegui3.po @@ -19,7 +19,7 @@ msgstr "Новая сессия" msgid " Old session" msgstr "Предыдущая сессия" -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2693 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2708 msgid " Step " msgstr " Шаг " @@ -33,7 +33,7 @@ msgstr "Номер Вашего сертификата: %d" msgid " Your session ID: %s" msgstr "Номер Вашей сессии: %s" -#: ../calculate-console-gui/pym/consolegui/application/more.py:2518 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2539 #, python-format msgid "%s: Permission denied" msgstr "Доступ запрещён %s" @@ -42,48 +42,57 @@ msgstr "Доступ запрещён %s" msgid "0: hide images" msgstr "0 - скрыть изображения" +#: ../calculate-console-gui/pym/consolegui/application/user_update.py:80 +msgid ": " +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:107 +#, python-format +msgid ": %s" +msgstr "" + #: ../calculate-console-gui/pym/consolegui/application/tools.py:155 msgid "
Apply them?
" msgstr "
Применить их?
" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:375 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:484 msgid "A file with the CA certificate now exists" msgstr "Файл с сертификатом Центра авторизации создан" -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:178 -#: ../calculate-console-gui/pym/consolegui/application/more.py:186 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:179 +#: ../calculate-console-gui/pym/consolegui/application/more.py:197 msgid "About" msgstr "О программе" -#: ../calculate-console-gui/pym/consolegui/application/more.py:1188 -#: ../calculate-console-gui/pym/consolegui/application/more.py:1328 -#: ../calculate-console-gui/pym/consolegui/application/more.py:1395 -#: ../calculate-console-gui/pym/consolegui/application/more.py:1509 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1715 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1721 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1204 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1344 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1411 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1525 msgid "Add a row" msgstr "Добавить строку" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:114 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:183 msgid "Add the CA and root certificates" msgstr "Добавить корневой сертификат и сертификат ЦА" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:426 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:535 msgid "Add the CA certificate to trusted? " msgstr "Добавить сертификат Центра авторизации в доверенные? " -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:126 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:195 msgid "Add the certificate to trusted" msgstr "Добавить сертификат в доверенные" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:108 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:177 msgid "Add the server certificate" msgstr "Добавить сертификат сервера" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:95 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:164 msgid "Add this server certificate to trusted or " msgstr "Добавить сертификат этого сервера в доверенные или" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:428 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:537 msgid "Adding the certificate" msgstr "Добавление сертификата" @@ -103,8 +112,8 @@ msgstr "Все параметры" msgid "All settings" msgstr "Все параметры" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:371 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:383 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:379 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:391 msgid "Also you can generate administrator certificate by root command" msgstr "Также вы можете сгенерировать сертификат администратора командой от root пользователя" @@ -122,44 +131,44 @@ msgstr "Настройки приложения" msgid "Apply" msgstr "Применить" -#: ../calculate-console-gui/pym/consolegui/application/more.py:718 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2014 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1920 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2272 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1926 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2284 +#: ../calculate-console-gui/pym/consolegui/application/more.py:731 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2027 msgid "Auto" msgstr "Авто" -#: ../calculate-console-gui/pym/consolegui/application/more.py:2226 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2238 msgid "Break the process" msgstr "Прервать процесс" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:396 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:505 msgid "CA certificate not found on the server" msgstr "Сертификат Центра авторизации не найден на сервере" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:818 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:943 msgid "CA certificate removed from system trusted" msgstr "Сертификат Центра авторизации удалён из пользовательского списка доверенных сертификатов" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:800 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:925 msgid "CA certificate removed from user trusted" msgstr "Сертификат Центра авторизации удалён из пользовательского списка доверенных сертификатов" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:711 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:836 msgid "CRL added" msgstr "Список отзыва сертификатов добавлен" #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:119 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:162 -#: ../calculate-console-gui/pym/consolegui/application/DisplayMethod.py:232 -#: ../calculate-console-gui/pym/consolegui/application/LeftMenu.py:438 -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:170 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:161 +#: ../calculate-console-gui/pym/consolegui/application/DisplayMethod.py:245 +#: ../calculate-console-gui/pym/consolegui/application/LeftMenu.py:439 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:171 #: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1440 msgid "Calculate Console" msgstr "Calculate Console" #: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:93 -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:173 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:172 msgid "Calculate Console " msgstr "Calculate Console " @@ -167,16 +176,16 @@ msgstr "Calculate Console " msgid "Calculate company" msgstr "Компания \"Калкулэйт\"" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:441 -#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:246 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:121 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:50 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:132 -#: ../calculate-console-gui/pym/consolegui/application/more.py:929 -#: ../calculate-console-gui/pym/consolegui/application/more.py:1134 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2112 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:444 +#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:255 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:190 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:55 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:137 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:119 +#: ../calculate-console-gui/pym/consolegui/application/more.py:943 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1149 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2125 #: ../calculate-console-gui/pym/consolegui/application/tools.py:86 -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:118 msgid "Cancel" msgstr "Отмена" @@ -184,8 +193,8 @@ msgstr "Отмена" msgid "Certificate Directory" msgstr "Директория с сертификатами" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:170 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:373 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:239 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:482 msgid "Certificate added" msgstr "Сертификат добавлен" @@ -194,18 +203,18 @@ msgstr "Сертификат добавлен" msgid "Certificate expired" msgstr "Время жизни сертификата истекло" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:431 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:540 msgid "Certificate not added to trusted" msgstr "Сертификат не добавлен в доверенные" -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:583 -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:181 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:586 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:177 #: ../calculate-console-gui/pym/consolegui/application/session_function.py:57 #: ../calculate-console-gui/pym/consolegui/application/session_function.py:92 msgid "Certificate not found in the server!" msgstr "Не найден сертификат на сервере!" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:299 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:408 msgid "Certificate not found on the client's side" msgstr "Сертификат не найден на стороне клиента" @@ -214,7 +223,7 @@ msgstr "Сертификат не найден на стороне клиент msgid "Certificate not sent!" msgstr "Сертификат не отправлен!" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:286 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:284 #, python-format msgid "Certificate saved. Your certificate ID = %s" msgstr "Сертификат сохранён! Номер Вашего сертификата = %s" @@ -224,7 +233,7 @@ msgid "Certificate signature request" msgstr "Запрос на подпись сертификата" #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:91 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:206 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:205 #: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:90 #: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:160 msgid "Certificates" @@ -237,11 +246,11 @@ msgstr "Сертификаты" msgid "Certificates manager" msgstr "Окно работы с сертификатами" -#: ../calculate-console-gui/pym/consolegui/application/more.py:1245 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1261 msgid "Check all" msgstr "Отметить всё" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:83 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:84 msgid "City" msgstr "Город" @@ -257,31 +266,31 @@ msgstr "Очистить файл конфигурации" msgid "Clear the session cache" msgstr "Очистить кэш сессии" -#: ../calculate-console-gui/pym/consolegui/application/more.py:1084 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1746 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1752 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1098 msgid "Clear the table" msgstr "Очистить таблицу" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:205 -#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:244 -#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:364 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:209 +#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:253 +#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:397 #: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:57 -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:143 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:142 #: ../calculate-console-gui/pym/consolegui/application/session_function.py:127 msgid "Close" msgstr "Закрыть" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:423 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:426 msgid "Close this session" msgstr "Закрыть данную сессию" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:422 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:425 msgid "Closing session" msgstr "Закрытие сессии" #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:136 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:139 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:230 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:138 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:229 msgid "Closing. Connection error." msgstr "Ошибка соединения. Закрываюсь." @@ -289,7 +298,7 @@ msgstr "Ошибка соединения. Закрываюсь." msgid "Company" msgstr "Компания" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:125 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:130 #: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:81 #: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:84 #: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:85 @@ -299,39 +308,39 @@ msgstr "Компания" msgid "Connect" msgstr "Соединиться" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:159 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:164 msgid "Connection" msgstr "Соединение" -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:46 -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:51 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:174 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:362 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:47 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:52 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:179 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:370 msgid "Connection Error" msgstr "Ошибка соединения" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:368 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:371 msgid "Connection lost!" msgstr "Соединение потеряно!" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:90 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:91 msgid "Country (a two-character tag)" msgstr "Страна (2 символа)" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:160 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:159 msgid "Create a new private key and signature request?" msgstr "Создать новые секретный ключ и запрос на подпись сертификата?" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:111 -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:130 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:112 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:131 msgid "Create a signature request" msgstr "Создать запрос на подпись сертификата" -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1981 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1987 msgid "Delete the row" msgstr "Удалить строку" -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1725 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1731 msgid "Delete the selected rows" msgstr "Удалить выделенные строки" @@ -355,11 +364,11 @@ msgstr "Отсоединиться от текущего сервера" msgid "Distribution website" msgstr "Сайт дистрибутива" -#: ../calculate-console-gui/pym/consolegui/application/LeftMenu.py:436 +#: ../calculate-console-gui/pym/consolegui/application/LeftMenu.py:437 msgid "Do you want to continue?" msgstr "Вы хотите продолжить?" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:279 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:277 msgid "Either the request or the signature does not match the earlier ones." msgstr "Запрос или подпись не соответствуют отправленным ранее." @@ -371,23 +380,23 @@ msgstr "Оставьте пустым для выбора стандартног msgid "English" msgstr "Английский" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:199 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:198 msgid "Enter a valid email!" msgstr "Введите существующий адрес электронной почты!" #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:100 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:142 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:213 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:234 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:141 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:212 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:233 msgid "Enter the hostname or the IP address" msgstr "Введите имя хоста или IP-адрес" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:239 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:244 msgid "Enter the port correctly!" msgstr "Введите корректный порт!" #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:106 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:219 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:218 msgid "Enter the port number" msgstr "Введите номер порта" @@ -395,7 +404,7 @@ msgstr "Введите номер порта" msgid "Error" msgstr "Ошибка" -#: ../calculate-console-gui/pym/consolegui/application/LeftMenu.py:435 +#: ../calculate-console-gui/pym/consolegui/application/LeftMenu.py:436 msgid "Error at this step." msgstr "На текущем шаге есть ошибка." @@ -403,91 +412,105 @@ msgstr "На текущем шаге есть ошибка." msgid "Error clearing the session cache" msgstr "Ошибка удаления кэша сессии" -#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:387 +#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:420 msgid "Error closing the process" msgstr "Ошибка закрытия процесса" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:230 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:229 #, python-format msgid "Error code: %s" msgstr "Код ошибки: %s" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:187 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:630 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:635 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:256 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:755 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:760 #, python-format msgid "Error creating directory %s" msgstr "Ошибка при создании директории %s" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:308 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:417 msgid "Error opening file" msgstr "Ошибка при открытии файла" -#: ../calculate-console-gui/pym/consolegui/application/more.py:2529 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2550 msgid "Error removing the session from the server" msgstr "Ошибка удаления сессии на сервере" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:408 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:517 msgid "Error. Certificate not added to trusted" msgstr "Ошибка! Сертификат не добавлен в доверенные" -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:182 +#: ../calculate-console-gui/pym/consolegui/application/user_update.py:104 +#: ../calculate-console-gui/pym/consolegui/application/user_update.py:107 +#, python-format +msgid "Exception: %s" +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:183 msgid "Exit Program" msgstr "Выйти из программы" -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:733 +#: ../calculate-console-gui/pym/consolegui/application/utils.py:63 +msgid "Failed to clear the cache! " +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/user_update.py:80 +msgid "Failed to connect" +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:735 msgid "Failed to get a frame from the server." msgstr "Ошибка получения фрейма с сервера." -#: ../calculate-console-gui/pym/consolegui/application/pid_information.py:58 +#: ../calculate-console-gui/pym/consolegui/application/pid_information.py:60 msgid "Failed to get the PID list from the server" msgstr "Ошибка получения списка идентификаторов процессов с сервера" -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:814 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:815 msgid "Failed to get the complete frame from the server." msgstr "Ошибка получения полного фрейма с сервера." -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:890 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:891 msgid "Failed to get the progress status from the server" msgstr "Ошибка получения значения прогресса с сервера" -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:587 -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:185 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:590 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:181 msgid "Failed to kill the process!" msgstr "Не удалось завершить процесс!" -#: ../calculate-console-gui/pym/consolegui/application/more.py:2515 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2536 msgid "Failed to obtain certificate data!" msgstr "Не удалось получить данные сертификата!" -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1094 -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1166 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1096 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1167 msgid "Failed to send the message (password) to the server" msgstr "Ошибка отправки сообщения (пароля) на сервер" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:365 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:474 msgid "Field \"CN\" not found in the certificate!" msgstr "Не найдено поле \"CN\" в сертификате!" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:337 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:335 msgid "Field \"CN\" not found in the root certificate!" msgstr "Не найдено поле \"CN\" в корневом сертификате!" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:353 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:351 msgid "File with the CA certificate now exists" msgstr "Файл с сертификатом Центра авторизации создан" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:350 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:348 msgid "Filename = " msgstr "имя файла =" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:373 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:482 #, python-format msgid "Filename = %s" msgstr "Имя файла = %s" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:58 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:414 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:127 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:523 #, python-format msgid "Fingerprint = %s" msgstr "Отпечаток = %s" @@ -514,12 +537,12 @@ msgid "Help" msgstr "Помощь" #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:41 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:83 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:88 msgid "Host" msgstr "Хост" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:127 -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:130 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:126 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:129 msgid "If the email does not exist, you will receive no letter" msgstr "Если электронная почта не существует, то письмо не дойдёт" @@ -528,39 +551,39 @@ msgid "Image height" msgstr "Высота изображений" #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:101 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:214 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:213 msgid "Incorrect \"Host\" value!" msgstr "Ошибка в поле \"Хост\"!" #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:106 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:219 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:218 msgid "Incorrect \"Port\" value!" msgstr "Ошибка в поле \"Порт\"!" -#: ../calculate-console-gui/pym/consolegui/application/more.py:193 +#: ../calculate-console-gui/pym/consolegui/application/more.py:204 msgid "Info" msgstr "Справка" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:143 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:235 -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:143 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:142 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:234 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:144 msgid "Input error" msgstr "Ошибка ввода" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:361 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:369 msgid "Invalid password" msgstr "Пароль неверен" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:391 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:500 msgid "Invalid server certificate!" msgstr "Сертификат сервера недействителен!" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:74 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:418 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:143 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:527 msgid "Issuer" msgstr "Подписчик" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:86 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:81 msgid "Kill the process? (It's active)" msgstr "Убить процесс? (Процесс активен)" @@ -569,82 +592,87 @@ msgstr "Убить процесс? (Процесс активен)" msgid "Makes part of Calculate Utilities %s" msgstr "Входит в состав Calculate Utilities %s" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:224 +#: ../calculate-console-gui/pym/consolegui/application/user_update.py:83 +#: ../calculate-console-gui/pym/consolegui/application/user_update.py:109 +msgid "Manually interrupted" +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:223 msgid "Message sent!" msgstr "Письмо отправлено!" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:135 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:134 msgid "Message:" msgstr "Сообщение:" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:77 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:78 msgid "Network address" msgstr "Сетевой адрес" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:422 -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:495 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:429 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:502 msgid "New connection" msgstr "Новое соединение" -#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:312 +#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:322 msgid "Next" msgstr "Далее" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:440 -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:211 -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1182 -#: ../calculate-console-gui/pym/consolegui/application/more.py:722 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2012 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2364 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1917 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2270 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:443 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:215 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1183 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1923 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2282 +#: ../calculate-console-gui/pym/consolegui/application/more.py:735 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2025 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2386 msgid "No" msgstr "Нет" -#: ../calculate-console-gui/pym/consolegui/application/more.py:2512 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2533 msgid "No access to the file!" msgstr "Нет доступа к файлу!" -#: ../calculate-console-gui/pym/consolegui/application/more.py:2481 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2503 msgid "No methods available!" msgstr "Нет доступных методов!" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:113 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:108 msgid "No running processes in the current session" msgstr "Нет запущенных процессов в текущей сессии" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:152 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:186 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:242 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:259 -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:791 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:401 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:281 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:284 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:291 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:151 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:185 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:241 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:257 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:792 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:510 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:286 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:289 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:296 #: ../calculate-console-gui/pym/consolegui/application/session_function.py:85 msgid "Not connected!" msgstr "Соединение отсутствует!" -#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:300 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:43 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2106 +#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:310 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:48 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2119 #: ../calculate-console-gui/pym/consolegui/application/tools.py:76 msgid "Ok" msgstr "Ok" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:427 -#: ../calculate-console-gui/pym/consolegui/application/Box.py:431 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:430 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:434 #, python-format msgid "Once the session is closed, data on process %d will be lost!" msgstr "При закрытии сессии данные %d процессa будут удалены!" -#: ../calculate-console-gui/pym/consolegui/application/more.py:507 -#: ../calculate-console-gui/pym/consolegui/application/more.py:613 +#: ../calculate-console-gui/pym/consolegui/application/more.py:520 +#: ../calculate-console-gui/pym/consolegui/application/more.py:626 msgid "Open" msgstr "Открыть" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:71 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:72 msgid "Organization Name" msgstr "Название организации" @@ -654,16 +682,16 @@ msgstr "Название организации" msgid "Other" msgstr "Прочее" -#: ../calculate-console-gui/pym/consolegui/application/pid_information.py:80 +#: ../calculate-console-gui/pym/consolegui/application/pid_information.py:82 #, python-format msgid "PID %d not found" msgstr "Процесс ID %d не найден" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:36 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:85 -#: ../calculate-console-gui/pym/consolegui/application/more.py:1879 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2091 -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:104 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:41 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:90 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:105 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1893 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2104 msgid "Password" msgstr "Пароль" @@ -671,23 +699,21 @@ msgstr "Пароль" msgid "Path to Certificates" msgstr "Директория с сертификатами" -#: ../calculate-console-gui/pym/consolegui/application/DisplayMethod.py:275 -#: ../calculate-console-gui/pym/consolegui/application/LeftMenu.py:245 -#: ../calculate-console-gui/pym/consolegui/application/pid_information.py:83 +#: ../calculate-console-gui/pym/consolegui/application/pid_information.py:85 msgid "Permission denied" msgstr "Доступ запрещён" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:173 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:178 msgid "Please disconnect" msgstr "Пожалуйста, разорвите" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:126 -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:129 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:125 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:128 msgid "Please enter a valid email. " msgstr "Пожалуйста, введите существующий адрес электронной почты." #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:45 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:84 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:89 msgid "Port" msgstr "Порт" @@ -696,19 +722,19 @@ msgstr "Порт" msgid "Preferences" msgstr "Настройки" -#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:278 +#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:288 msgid "Previous" msgstr "Назад" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:179 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:175 msgid "Process completed" msgstr "Процесс завершён" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:97 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:92 msgid "Process failed" msgstr "Процесс завершился с ошибкой" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:94 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:89 msgid "Process successful completed" msgstr "Процесс успешно завершён" @@ -717,7 +743,7 @@ msgstr "Процесс успешно завершён" msgid "Processes" msgstr "Процессы" -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:180 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:181 msgid "Program settings" msgstr "Настройки программы" @@ -725,62 +751,69 @@ msgstr "Настройки программы" msgid "Quit" msgstr "Выход" -#: ../calculate-console-gui/pym/consolegui/application/DisplayMethod.py:363 +#: ../calculate-console-gui/pym/consolegui/application/DisplayMethod.py:381 msgid "Reconnect" msgstr "Переподключиться" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:401 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:404 msgid "Reconnecting to the server" msgstr "Выполняется повторное подключение к серверу" -#: ../calculate-console-gui/pym/consolegui/application/more.py:1200 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1736 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1742 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1216 msgid "Recover the table" msgstr "Восстановить таблицу" -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1054 -#: ../calculate-console-gui/pym/consolegui/application/more.py:1882 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2101 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1056 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1896 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2114 msgid "Repeat" msgstr "Повтор" -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:179 -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:177 -#: ../calculate-console-gui/pym/consolegui/application/more.py:200 -#: ../calculate-console-gui/pym/consolegui/application/more.py:346 -#: ../calculate-console-gui/pym/consolegui/application/more.py:389 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:180 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:176 +#: ../calculate-console-gui/pym/consolegui/application/more.py:211 +#: ../calculate-console-gui/pym/consolegui/application/more.py:357 +#: ../calculate-console-gui/pym/consolegui/application/more.py:400 msgid "Report a Bug" msgstr "Сообщить об ошибке" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:198 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:276 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:197 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:274 msgid "Request" msgstr "Запрос" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:246 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:245 #, python-format msgid "Request %s not found on the client`s side" msgstr "Запрос %s не найден на стороне клиента" +msgid "Request %s not found on the client’s side" +msgstr "Запрос %s не найден на стороне клиента" + #: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:115 #, python-format msgid "Request ID: %s" msgstr "Номер Вашего запроса - %s" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:204 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:203 #, python-format msgid "Request not sent, or file %s deleted" msgstr "Запрос не был послан, или удалён файл %s" -#: ../calculate-console-gui/pym/consolegui/application/more.py:1409 +#: ../calculate-console-gui/pym/consolegui/application/more.py:1425 msgid "Reset" msgstr "Сбросить изменения" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:120 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:115 msgid "Result" msgstr "Результат" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:351 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:107 +msgid "Revoke date" +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:349 msgid "Root certificate added" msgstr "Корневой сертификат добавлен" @@ -788,8 +821,8 @@ msgstr "Корневой сертификат добавлен" msgid "Rows in Table" msgstr "Кол-во строк в таблице" -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2697 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2703 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2712 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2719 msgid "Running" msgstr "Выполнение" @@ -805,11 +838,11 @@ msgstr "Сохранение изменений" msgid "Select Language" msgstr "Выбор языка" -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1061 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1063 msgid "Send" msgstr "Отправить" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:138 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:137 msgid "Send a Bug" msgstr "Отправить ошибку" @@ -821,25 +854,29 @@ msgstr "Отправить навый запрос на подпись серт msgid "Send a request" msgstr "Отправить запрос" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:228 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:227 msgid "Sending error" msgstr "Ошибка отправки" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:60 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:106 +msgid "Serial" +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:129 #, python-format msgid "Serial Number = %s" msgstr "Серийный номер = %s" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:415 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:524 #, python-format msgid "Serial Number = %s" msgstr "Серийный номер = %s" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:169 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:238 msgid "Server certificate added to trusted" msgstr "Сертификат сервера добавлен в доверенные" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:346 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:351 msgid "Server certificate verification error" msgstr "Ошибка проверки сертификата сервера" @@ -856,8 +893,8 @@ msgstr "Кэш сессии удалён" msgid "Session information" msgstr "Информация о сессии" -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:585 -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:183 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:588 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:179 msgid "Session not matching your certificate!" msgstr "Сессия не соответствует Вашему сертификату!" @@ -865,66 +902,69 @@ msgstr "Сессия не соответствует Вашему сертифи msgid "Set a fixed height image for actions" msgstr "Установка фиксированной высоты изображений для действий" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:269 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:267 msgid "Signature request rejected!" msgstr "Запрос на подпись сертификата отвергнут!" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:118 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:113 msgid "Start time" msgstr "Время запуска" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:119 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:114 msgid "Status" msgstr "Статус" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:86 -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:422 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:155 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:531 msgid "Subject" msgstr "Субъект" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:132 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:131 msgid "Subject:" msgstr "Тема:" -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:293 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:294 msgid "System Update" msgstr "Обновление системы" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:117 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:112 msgid "Task name" msgstr "Имя задачи" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:142 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:143 msgid "The \"Country\" field must be two-character" msgstr "Поле \"Страна\" должно состоять из двух символов" +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:80 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:86 +msgid "The CN and L fields in the CA certificate are incorrect!" +msgstr "" + #: ../calculate-console-gui/pym/consolegui/application/session_function.py:72 #: ../calculate-console-gui/pym/consolegui/application/session_function.py:112 #, python-format msgid "The certificate expires after %d days" msgstr "Время жизни сертификата истекает через %d дней" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:158 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:157 msgid "The private key and the request now exist!" msgstr "Секретный ключ и запрос на подпись сертификата созданы!" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:272 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:270 msgid "The request has not been reviewed yet." msgstr "Запрос на подписание сертификата ещё не рассмотрен." -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:190 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:189 msgid "The server has not signed the certificate!" msgstr "Сервер не подписал сертификат!" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:400 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:403 msgid "The server was restarted" msgstr "Сервер был перезапущен" -#: ../calculate-console-gui/pym/consolegui/application/more.py:87 msgid "The user must not be root" msgstr "Пользователь должен быть не root" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:22 msgid "The user should not be root" msgstr "Пользователь должен быть не root" @@ -933,13 +973,21 @@ msgstr "Пользователь должен быть не root" msgid "There are unsaved changes in tab %s" msgstr "На вкладке %s имеются несохранённые изменения" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:266 -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:281 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:91 +msgid "This certificate cannot be verified in the CRL." +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:105 +msgid "This certificate has been revoked!" +msgstr "" + +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:375 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:286 msgid "This server is not trusted" msgstr "Данный сервер не является доверенным" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:196 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:274 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:195 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:272 msgid "To submit the certificate request on the server use command" msgstr "Для подписания сертификата на сервере используется команда" @@ -951,15 +999,15 @@ msgstr "Настройки" msgid "Ukrainian" msgstr "Украинский" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:53 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:122 msgid "Untrusted Server Certificate!" msgstr "Недоверенный сертификат сервера!" -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:181 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:182 msgid "Update System" msgstr "Обновить систему" -#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:65 +#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:66 msgid "User Name" msgstr "Имя пользователя" @@ -981,50 +1029,50 @@ msgstr "Просмотр информации о запущенных проце msgid "View information about the current session" msgstr "Просмотр информации о текущей сессии" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:35 -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:43 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:30 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:38 msgid "View information about the running processes" msgstr "Просмотр информации о запущенных процессах" -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2105 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2111 msgid "View options" msgstr "Просмотреть параметры" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:102 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:97 #, python-format msgid "View the result, PID %s" msgstr "Просмотреть результат работы процесса ID %s" -#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:177 +#: ../calculate-console-gui/pym/consolegui/application/View_Process.py:173 msgid "Well killed!" msgstr "Успешно убит!" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:439 -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:210 -#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1180 -#: ../calculate-console-gui/pym/consolegui/application/more.py:720 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2010 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2363 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1915 -#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2268 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:442 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:214 +#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1181 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1921 +#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2280 +#: ../calculate-console-gui/pym/consolegui/application/more.py:733 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2023 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2385 msgid "Yes" msgstr "Да" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:172 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:177 msgid "You are connected to the server!" msgstr "Вы подсоединены к серверу!" -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:48 -#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:53 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:49 +#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:54 msgid "You are not connected to the localhost server" msgstr "Вы не подсоединены к локальному серверу!" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:377 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:385 msgid "You do not have a certificate or your certificate does not match the server certificate. Please generate a new request and get the new certificate from the server." msgstr "У вас нет сертификата или ваш сертификат не соответствует серверному сертификату. Пожалуйста, сгенерируйте запрос на сертификат и получите сертификат с сервера." -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:366 -#: ../calculate-console-gui/pym/consolegui/application/more.py:2397 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:374 +#: ../calculate-console-gui/pym/consolegui/application/more.py:2419 msgid "You do not have a certificate. Please generate a new request and get the new certificate from the server." msgstr "У Вас нет сертификата. Пожалуйста, сгенерируйте запрос на сертификат и получите сертификат с сервера." @@ -1044,16 +1092,16 @@ msgstr "Ваш MAC адрес: " msgid "Your certificate ID: " msgstr "Номер Вашего сертификата: " -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:125 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:124 msgid "Your email:" msgstr "Ваш email:" -#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:122 +#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:121 msgid "Your name:" msgstr "Ваше имя:" -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:195 -#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:273 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:194 +#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:271 #, python-format msgid "Your request ID: %s" msgstr "Номер Вашего запроса: %s" @@ -1062,42 +1110,39 @@ msgstr "Номер Вашего запроса: %s" msgid "Your session ID: " msgstr "Номер Вашей сессии: " -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:243 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:250 msgid "call method" msgstr "вызов метода" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:253 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:260 msgid "destination host" msgstr "хост назначения" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:250 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:257 msgid "port number" msgstr "номер порта" -#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:173 +#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:178 msgid "previous connection!" msgstr "предыдущее соединение!" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:247 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:254 msgid "run the method without options" msgstr "запустить метод без параметров" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:237 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:244 msgid "show this help message and exit" msgstr "вывод этой справки и выход" -#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:240 +#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:247 msgid "translation language" msgstr "язык для перевода" -#: ../calculate-console-gui/pym/consolegui/application/client_class.py:96 +#: ../calculate-console-gui/pym/consolegui/application/client_class.py:165 msgid "try adding the CA and root certificates to trusted?" msgstr "попытаться добавить сертификат ЦА и корневой в доверенные?" -#: ../calculate-console-gui/pym/consolegui/application/Box.py:423 +#: ../calculate-console-gui/pym/consolegui/application/Box.py:426 #, python-format msgid "with %s?" msgstr "c %s?" - -#~ msgid "Request %s not found on the client’s side" -#~ msgstr "Запрос %s не найден на стороне клиента" diff --git a/ru/cl_core3.po b/ru/cl_core3.po index 8bb5427..ec3a457 100644 --- a/ru/cl_core3.po +++ b/ru/cl_core3.po @@ -11,139 +11,139 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../calculate-core/pym/core/client/pid_information.py:165 +#: ../calculate-core/pym/core/client/pid_information.py:167 msgid " Certificate not found in the server database!" msgstr "Сертификат не найден в базе данных сервера!" -#: ../calculate-core/pym/core/client/pid_information.py:169 +#: ../calculate-core/pym/core/client/pid_information.py:171 msgid " Failed to terminate the process!" msgstr "Не удалось завершить процесс!" -#: ../calculate-core/pym/core/client/pid_information.py:161 +#: ../calculate-core/pym/core/client/pid_information.py:163 msgid " Killed successfully!" msgstr "Успешно убит!" -#: ../calculate-core/pym/core/client/sid_func.py:36 +#: ../calculate-core/pym/core/client/sid_func.py:38 msgid " New session" msgstr "Новая сессия" -#: ../calculate-core/pym/core/client/sid_func.py:38 +#: ../calculate-core/pym/core/client/sid_func.py:40 msgid " Old session" msgstr "Предыдущая сессия" -#: ../calculate-core/pym/core/client/pid_information.py:163 +#: ../calculate-core/pym/core/client/pid_information.py:165 msgid " Process completed!" msgstr "Процесс завершён!" -#: ../calculate-core/pym/core/client/pid_information.py:167 +#: ../calculate-core/pym/core/client/pid_information.py:169 msgid " Session not matching your certificate!" msgstr "Сессия не принадлежит Вашему сертификату!" -#: ../calculate-core/pym/core/client/cert_func.py:49 +#: ../calculate-core/pym/core/client/cert_func.py:51 #, python-format msgid " Your certifitate ID = %d" msgstr " Номер Вашего сертификата = %d" -#: ../calculate-core/pym/core/client/sid_func.py:39 +#: ../calculate-core/pym/core/client/sid_func.py:41 #, python-format msgid " Your session ID = %s" msgstr "Номер Вашей сессии = %s" -#: ../calculate-core/pym/core/server/func.py:1522 +#: ../calculate-core/pym/core/server/func.py:1551 msgid " is a file, not a link!" msgstr " файл, не ссылка!" -#: ../calculate-core/pym/core/variables/backup.py:102 +#: ../calculate-core/pym/core/variables/backup.py:103 #, python-format msgid "%d days" msgstr "%d дней" -#: ../calculate-core/pym/core/variables/backup.py:107 +#: ../calculate-core/pym/core/variables/backup.py:108 #, python-format msgid "%d hours" msgstr "%d часов" -#: ../calculate-core/pym/core/variables/backup.py:110 +#: ../calculate-core/pym/core/variables/backup.py:111 #, python-format msgid "%d minutes" msgstr "%d минут" -#: ../calculate-core/pym/core/variables/backup.py:113 +#: ../calculate-core/pym/core/variables/backup.py:114 #, python-format msgid "%d seconds" msgstr "%d секунд" -#: ../calculate-core/pym/core/variables/backup.py:114 +#: ../calculate-core/pym/core/variables/backup.py:115 #, python-format msgid "%s ago" msgstr "%s назад" -#: ../calculate-core/pym/core/server/methods_func.py:431 +#: ../calculate-core/pym/core/server/methods_func.py:433 #, python-format msgid "%s values:" msgstr "%s:" -#: ../calculate-core/pym/core/server/local_call.py:460 #: ../calculate-core/pym/core/server/local_call.py:468 -#: ../calculate-core/pym/core/result_viewer.py:315 +#: ../calculate-core/pym/core/server/local_call.py:476 +#: ../calculate-core/pym/core/result_viewer.py:313 #, python-format 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:293 +#: ../calculate-core/pym/core/client/sid_func.py:57 +#: ../calculate-core/pym/core/client/sid_func.py:81 #, python-format msgid "%s: Permission denied" msgstr "Доступ запрещён %s" -#: ../calculate-core/pym/core/client/pid_information.py:48 +#: ../calculate-core/pym/core/client/pid_information.py:50 #, python-format msgid "%s: Process started" msgstr "Процесс запущен %s" -#: ../calculate-core/pym/core/server/methods_func.py:271 +#: ../calculate-core/pym/core/server/methods_func.py:274 msgid "'list' for displaying possible values" msgstr "'list' для отображения возможных значений" -#: ../calculate-core/pym/core/server/methods_func.py:266 +#: ../calculate-core/pym/core/server/methods_func.py:269 msgid "'list' for displaying possible values, 'none' is never one" msgstr "'list' для отображения возможных значений, 'none' - ни один" -#: ../calculate-core/pym/core/server/methods_func.py:225 +#: ../calculate-core/pym/core/server/methods_func.py:228 msgid "(by default)" msgstr "(по умолчанию)" -#: ../calculate-core/pym/core/server/methods_func.py:244 -#: ../calculate-core/pym/core/server/methods_func.py:251 +#: ../calculate-core/pym/core/server/methods_func.py:247 +#: ../calculate-core/pym/core/server/methods_func.py:254 msgid "(enabled by default)" msgstr "(включено по умолчанию)" -#: ../calculate-core/pym/core/server/func.py:120 +#: ../calculate-core/pym/core/server/func.py:118 #, python-brace-format msgid "({one} of {_all}) -- {fname}" msgstr "({one} из {_all}) -- {fname}" -#: ../calculate-core/pym/core/server/cert_cmd.py:588 +#: ../calculate-core/pym/core/server/cert_cmd.py:592 msgid ", except:" msgstr ", кроме:" -#: ../calculate-core/pym/core/backup.py:636 -#: ../calculate-core/pym/core/result_viewer.py:304 +#: ../calculate-core/pym/core/backup.py:635 +#: ../calculate-core/pym/core/result_viewer.py:302 msgid ":" 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:561 -#: ../calculate-core/pym/core/variables/setup_package.py:112 -#: ../calculate-core/pym/core/variables/setup_package.py:245 +#: ../calculate-core/pym/core/client/cert_info.py:85 +#: ../calculate-core/pym/core/client/pid_information.py:93 +#: ../calculate-core/pym/core/server/methods_func.py:569 +#: ../calculate-core/pym/core/variables/setup_package.py:116 +#: ../calculate-core/pym/core/variables/setup_package.py:249 msgid ": " msgstr ": " -#: ../calculate-core/pym/core/client/cert_verify.py:88 -#: ../calculate-core/pym/core/backup.py:235 -#: ../calculate-core/pym/core/backup.py:292 +#: ../calculate-core/pym/core/client/cert_verify.py:90 +#: ../calculate-core/pym/core/backup.py:236 +#: ../calculate-core/pym/core/backup.py:293 #, python-format msgid ": %s" msgstr ": %s" @@ -163,27 +163,27 @@ msgstr "Действие выполнено!" msgid "Action {ac_custom_name} not found" msgstr "Действие {ac_custom_name} не найдено" -#: ../calculate-core/pym/core/wsdl_core.py:381 +#: ../calculate-core/pym/core/wsdl_core.py:382 msgid "Add" msgstr "Добавить" -#: ../calculate-core/pym/core/wsdl_core.py:357 +#: ../calculate-core/pym/core/wsdl_core.py:358 msgid "Add a Group" msgstr "Добавление группы" -#: ../calculate-core/pym/core/wsdl_core.py:377 +#: ../calculate-core/pym/core/wsdl_core.py:378 msgid "Add a group" msgstr "Добавление группы" -#: ../calculate-core/pym/core/client/client_class.py:292 +#: ../calculate-core/pym/core/client/client_class.py:294 msgid "Add the CA and root certificates" msgstr "Попробовать добавить корневой и сертификат центра авторизации" -#: ../calculate-core/pym/core/client/client_class.py:217 +#: ../calculate-core/pym/core/client/client_class.py:219 msgid "Add the CA certificate to trusted? y/[n]:" msgstr "Добавить сертификат центра авторизации в доверенные? y/[n]:" -#: ../calculate-core/pym/core/client/client_class.py:243 +#: ../calculate-core/pym/core/client/client_class.py:245 msgid "Add this server certificate to trusted (s) or" msgstr "Добавить данный сертификат сервера в доверенные (s) или" @@ -191,15 +191,15 @@ msgstr "Добавить данный сертификат сервера в д msgid "Adding manually interrupted" msgstr "Добавление прервано пользователем" -#: ../calculate-core/pym/core/variables/variable.py:279 +#: ../calculate-core/pym/core/variables/variable.py:273 msgid "All" msgstr "Все" -#: ../calculate-core/pym/core/server/baseClass.py:200 +#: ../calculate-core/pym/core/server/baseClass.py:223 msgid "All processes are closed." msgstr "Все процессы закрыты." -#: ../calculate-core/pym/core/result_viewer.py:297 +#: ../calculate-core/pym/core/result_viewer.py:296 msgid "Ambiguous answer:" msgstr "Неоднозначный ответ:" @@ -212,13 +212,13 @@ msgstr "Применение исправлений к исходному код msgid "Archive created: {core.cl_backup_file}" msgstr "Создан архивный файл: {core.cl_backup_file}" -#: ../calculate-core/pym/core/server/cert_cmd.py:650 +#: ../calculate-core/pym/core/server/cert_cmd.py:654 msgid "Are you sure? Delete all client certificates?" msgstr "Вы уверены? Удалить все клиентские сертификаты?" -#: ../calculate-core/pym/core/wsdl_core.py:234 -#: ../calculate-core/pym/core/wsdl_core.py:302 -#: ../calculate-core/pym/core/wsdl_core.py:481 +#: ../calculate-core/pym/core/wsdl_core.py:235 +#: ../calculate-core/pym/core/wsdl_core.py:303 +#: ../calculate-core/pym/core/wsdl_core.py:482 msgid "Back" msgstr "Назад" @@ -230,17 +230,17 @@ msgstr "Резервное копирование учётных записей" msgid "Backing up files configured by templates" msgstr "Резервное копирование файлов, настроенных шаблонами" -#: ../calculate-core/pym/core/wsdl_core.py:733 -#: ../calculate-core/pym/core/wsdl_core.py:735 -#: ../calculate-core/pym/core/wsdl_core.py:765 +#: ../calculate-core/pym/core/wsdl_core.py:734 +#: ../calculate-core/pym/core/wsdl_core.py:736 +#: ../calculate-core/pym/core/wsdl_core.py:766 msgid "Backup" msgstr "Резервная копия" -#: ../calculate-core/pym/core/variables/backup.py:80 +#: ../calculate-core/pym/core/variables/backup.py:81 msgid "Backup created" msgstr "Резервная копия создана" -#: ../calculate-core/pym/core/variables/backup.py:125 +#: ../calculate-core/pym/core/variables/backup.py:126 msgid "Backup file" msgstr "Файл резервной копии" @@ -252,43 +252,43 @@ msgstr "Создание резервной копии прервано поль msgid "Backup successfully completed!" msgstr "Создание резервной копии успешно завершено!" -#: ../calculate-core/pym/core/client/cert_verify.py:302 +#: ../calculate-core/pym/core/client/cert_verify.py:305 msgid "CA certificate deleted from the system trusted certificates list" msgstr "Сертификат центра авторизации удалён из системных доверенных сертификатов" -#: ../calculate-core/pym/core/client/cert_verify.py:283 +#: ../calculate-core/pym/core/client/cert_verify.py:286 msgid "CA certificate deleted from the user's trusted certificates list" msgstr "Сертификат центра авторизации удалён из доверенных сертификатов пользователя" -#: ../calculate-core/pym/core/client/client_class.py:196 +#: ../calculate-core/pym/core/client/client_class.py:198 msgid "CA certificate not found on the server" msgstr "Сертификат центра авторизации не найден на сервере" -#: ../calculate-core/pym/core/server/create_cert.py:159 +#: ../calculate-core/pym/core/server/create_cert.py:160 msgid "CA certitficate file {} not found" msgstr "Файл CA сертификата {} не найден" -#: ../calculate-core/pym/core/backup.py:135 +#: ../calculate-core/pym/core/backup.py:136 msgid "CONTENTS file not found" msgstr "Файл CONTENTS не найден" -#: ../calculate-core/pym/core/client/cert_verify.py:181 +#: ../calculate-core/pym/core/client/cert_verify.py:182 msgid "CRL added" msgstr "Список отзыва сертификатов (CRL) добавлен" -#: ../calculate-core/pym/core/server/cert_cmd.py:1052 +#: ../calculate-core/pym/core/server/cert_cmd.py:1056 msgid "CRL deleted" msgstr "Список отзыва сертификатов удалён" -#: ../calculate-core/pym/core/server/cert_cmd.py:1054 +#: ../calculate-core/pym/core/server/cert_cmd.py:1058 msgid "CRL does not exist" msgstr "Список отзыва сертификатов не создан" -#: ../calculate-core/pym/core/backup.py:635 +#: ../calculate-core/pym/core/backup.py:634 msgid "Calculate Utilities have backuped files" msgstr "Утилиты Calculate сделали резервную копию файлов" -#: ../calculate-core/pym/core/setup_package.py:333 +#: ../calculate-core/pym/core/setup_package.py:329 msgid "Calculate core is executing the following tasks" msgstr "Настройка" @@ -296,7 +296,7 @@ msgstr "Настройка" msgid "Calculating checksums" msgstr "Вычисление файловых контрольных сумм" -#: ../calculate-core/pym/core/server/cert_cmd.py:947 +#: ../calculate-core/pym/core/server/cert_cmd.py:951 msgid "Certificate \t" msgstr "Сертификат \t" @@ -305,48 +305,48 @@ msgstr "Сертификат \t" msgid "Certificate %s has been signed" msgstr "Сертифика %s подписан" -#: ../calculate-core/pym/core/server/cert_cmd.py:744 +#: ../calculate-core/pym/core/server/cert_cmd.py:748 #, python-format msgid "Certificate %s has not been signed" msgstr "Сертификат %s не подписан" -#: ../calculate-core/pym/core/server/cert_cmd.py:742 -#: ../calculate-core/pym/core/server/cert_cmd.py:798 +#: ../calculate-core/pym/core/server/cert_cmd.py:746 +#: ../calculate-core/pym/core/server/cert_cmd.py:802 #, python-format msgid "Certificate %s is signed" msgstr "Сертификат %s подписан" -#: ../calculate-core/pym/core/server/bootstrap.py:57 -#: ../calculate-core/pym/core/server/cert_cmd.py:1065 +#: ../calculate-core/pym/core/server/bootstrap.py:59 +#: ../calculate-core/pym/core/server/cert_cmd.py:1069 #, python-format msgid "Certificate %s not found" msgstr "Сертификат %s не найден" -#: ../calculate-core/pym/core/server/cert_cmd.py:699 -#: ../calculate-core/pym/core/server/cert_cmd.py:771 +#: ../calculate-core/pym/core/server/cert_cmd.py:703 +#: ../calculate-core/pym/core/server/cert_cmd.py:775 #, python-format msgid "Certificate %s now exists" msgstr "Сертификат %s уже существует" -#: ../calculate-core/pym/core/wsdl_core.py:213 +#: ../calculate-core/pym/core/wsdl_core.py:214 msgid "Certificate Details" msgstr "Просмотр сертификата" -#: ../calculate-core/pym/core/server/cert_cmd.py:638 +#: ../calculate-core/pym/core/server/cert_cmd.py:642 #, python-format msgid "Certificate ID = %s" msgstr "Номер сертификата = %s" -#: ../calculate-core/pym/core/client/cert_func.py:301 +#: ../calculate-core/pym/core/client/cert_func.py:303 msgid "Certificate ID: " msgstr "Номер сертификата: " -#: ../calculate-core/pym/core/client/cert_func.py:256 -#: ../calculate-core/pym/core/client/client_class.py:181 +#: ../calculate-core/pym/core/client/cert_func.py:258 +#: ../calculate-core/pym/core/client/client_class.py:183 msgid "Certificate added" msgstr "Сертификат добавлен" -#: ../calculate-core/pym/core/server/bootstrap.py:87 +#: ../calculate-core/pym/core/server/bootstrap.py:89 msgid "Certificate creation date later than current date" msgstr "Дата создания сертификата больше текущей даты" @@ -354,16 +354,16 @@ msgstr "Дата создания сертификата больше текущ msgid "Certificate deleted" msgstr "Сертификат удалён" -#: ../calculate-core/pym/core/wsdl_core.py:231 +#: ../calculate-core/pym/core/wsdl_core.py:232 msgid "Certificate details" msgstr "Просмотр сертификата" -#: ../calculate-core/pym/core/client/cert_func.py:52 -#: ../calculate-core/pym/core/server/bootstrap.py:90 +#: ../calculate-core/pym/core/client/cert_func.py:54 +#: ../calculate-core/pym/core/server/bootstrap.py:92 msgid "Certificate expired" msgstr "Срок годности сертификата истёк" -#: ../calculate-core/pym/core/variables/request.py:295 +#: ../calculate-core/pym/core/variables/request.py:294 msgid "Certificate group" msgstr "Группа сертификата" @@ -377,47 +377,47 @@ msgstr "Группы сертификата" msgid "Certificate identifier" msgstr "Идентификатор сертификата" -#: ../calculate-core/pym/core/client/sid_func.py:89 +#: ../calculate-core/pym/core/client/sid_func.py:91 #, python-format msgid "Certificate issued on %s" msgstr "Дата подписания сертификата - %s" -#: ../calculate-core/pym/core/client/client_class.py:222 +#: ../calculate-core/pym/core/client/client_class.py:224 msgid "Certificate not added to trusted" msgstr "Сертификат не добавлен в доверенные" -#: ../calculate-core/pym/core/server/cert_cmd.py:664 +#: ../calculate-core/pym/core/server/cert_cmd.py:668 msgid "Certificate not found" msgstr "Сертификат не найден" -#: ../calculate-core/pym/core/client/cert_func.py:43 +#: ../calculate-core/pym/core/client/cert_func.py:45 msgid "Certificate not found in the server database!" msgstr "Сертификат не найден в базе данных на сервере!" -#: ../calculate-core/pym/core/client/client_class.py:97 -#: ../calculate-core/pym/core/server/client_class.py:65 +#: ../calculate-core/pym/core/client/client_class.py:99 +#: ../calculate-core/pym/core/server/client_class.py:67 msgid "Certificate not found on the client's side" msgstr "Сертификат не найден на стороне клиента" -#: ../calculate-core/pym/core/client/cert_func.py:285 +#: ../calculate-core/pym/core/client/cert_func.py:287 msgid "Certificate not found on the server!" msgstr "Сертификат не найден на сервере!" -#: ../calculate-core/pym/core/server/cert_cmd.py:846 +#: ../calculate-core/pym/core/server/cert_cmd.py:850 msgid "Certificate not found!" msgstr "Сертификат не найден!" -#: ../calculate-core/pym/core/client/cert_func.py:47 +#: ../calculate-core/pym/core/client/cert_func.py:49 msgid "Certificate not sent!" msgstr "Сертификат не отправлен!" -#: ../calculate-core/pym/core/client/sid_func.py:88 +#: ../calculate-core/pym/core/client/sid_func.py:90 #, python-format msgid "Certificate number: %s" msgstr "Номер сертификата - %s" -#: ../calculate-core/pym/core/server/cert_cmd.py:918 -#: ../calculate-core/pym/core/server/cert_cmd.py:956 +#: ../calculate-core/pym/core/server/cert_cmd.py:922 +#: ../calculate-core/pym/core/server/cert_cmd.py:960 msgid "Certificate or request not found!" msgstr "Сертификат или запрос не найден!" @@ -426,12 +426,12 @@ msgstr "Сертификат или запрос не найден!" msgid "Certificate permissions" msgstr "Права сертификата" -#: ../calculate-core/pym/core/server/cert_cmd.py:253 +#: ../calculate-core/pym/core/server/cert_cmd.py:257 #, python-format msgid "Certificate saved. Your certificate ID = %s" msgstr "Сертификат сохранён. Номер Вашего сертификата = %s" -#: ../calculate-core/pym/core/server/bootstrap.py:362 +#: ../calculate-core/pym/core/server/bootstrap.py:364 #, python-format msgid "Certificate saved. Your certificate ID: %s" msgstr "Сертификат сохранён. Номер Вашего сертификата: %s" @@ -442,21 +442,21 @@ 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:201 +#: ../calculate-core/pym/core/wsdl_core.py:202 msgid "Certificates" msgstr "Сертификаты" -#: ../calculate-core/pym/core/wsdl_core.py:305 +#: ../calculate-core/pym/core/wsdl_core.py:306 msgid "Change" msgstr "Изменить" -#: ../calculate-core/pym/core/server/func.py:122 +#: ../calculate-core/pym/core/server/func.py:120 msgid "Choose a configuration action:" msgstr "Выберите действие для настройки:" -#: ../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 +#: ../calculate-core/pym/core/client/create_cert.py:83 +#: ../calculate-core/pym/core/server/cert_cmd.py:121 +#: ../calculate-core/pym/core/server/create_cert.py:98 msgid "City: " msgstr "Город: " @@ -464,35 +464,35 @@ msgstr "Город: " msgid "Clearing temporary files" msgstr "Очистка временных файлов" -#: ../calculate-core/pym/core/client/sid_func.py:92 +#: ../calculate-core/pym/core/client/sid_func.py:94 #, python-format msgid "Client type: %s" msgstr "Тип клиента - %s" -#: ../calculate-core/pym/core/server/cert_cmd.py:181 -#: ../calculate-core/pym/core/server/cert_cmd.py:226 +#: ../calculate-core/pym/core/server/cert_cmd.py:184 +#: ../calculate-core/pym/core/server/cert_cmd.py:230 msgid "Close. Connection Error." msgstr "Закрыто. Ошибка соединения." -#: ../calculate-core/pym/core/client/cert_func.py:161 +#: ../calculate-core/pym/core/client/cert_func.py:163 msgid "Closed. Connection error." msgstr "Закрыто. Ошибка соединения." -#: ../calculate-core/pym/core/server/baseClass.py:181 +#: ../calculate-core/pym/core/server/baseClass.py:204 msgid "Closing all processes" msgstr "Завершаю все процессы" -#: ../calculate-core/pym/core/server/methods_func.py:286 +#: ../calculate-core/pym/core/server/methods_func.py:289 msgid "Common arguments" msgstr "Общие параметры" -#: ../calculate-core/pym/core/wsdl_core.py:630 +#: ../calculate-core/pym/core/wsdl_core.py:631 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 +#: ../calculate-core/pym/core/wsdl_core.py:62 +#: ../calculate-core/pym/core/wsdl_core.py:107 +#: ../calculate-core/pym/core/wsdl_core.py:629 msgid "Configuration" msgstr "Настройка" @@ -500,30 +500,30 @@ msgstr "Настройка" 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 +#: ../calculate-core/pym/core/utils/cl_core_setup.py:38 msgid "Configuration manually interrupted" msgstr "Настройка прервана пользователем" -#: ../calculate-core/pym/core/wsdl_core.py:63 +#: ../calculate-core/pym/core/wsdl_core.py:64 msgid "Configure a Package" msgstr "Настройка пакета" -#: ../calculate-core/pym/core/wsdl_core.py:85 -#: ../calculate-core/pym/core/wsdl_core.py:130 -#: ../calculate-core/pym/core/wsdl_core.py:651 +#: ../calculate-core/pym/core/wsdl_core.py:86 +#: ../calculate-core/pym/core/wsdl_core.py:131 +#: ../calculate-core/pym/core/wsdl_core.py:652 msgid "Configure a package" msgstr "Настройка пакета" -#: ../calculate-core/pym/core/variables/setup_package.py:363 +#: ../calculate-core/pym/core/variables/setup_package.py:367 msgid "Configure dependent packages in root" msgstr "Настраивать зависимые пакеты в корне" -#: ../calculate-core/pym/core/variables/setup_package.py:323 +#: ../calculate-core/pym/core/variables/setup_package.py:327 msgid "Configure the system" msgstr "Конфигурировать систему" -#: ../calculate-core/pym/core/variables/setup_package.py:348 +#: ../calculate-core/pym/core/variables/setup_package.py:352 msgid "Configure users" msgstr "Настройка пользователей" @@ -532,46 +532,46 @@ msgstr "Настройка пользователей" msgid "Configuring dependencies: %s" msgstr "Настройка зависимых пакетов: %s" -#: ../calculate-core/pym/core/wsdl_core.py:345 -#: ../calculate-core/pym/core/wsdl_core.py:484 +#: ../calculate-core/pym/core/wsdl_core.py:346 +#: ../calculate-core/pym/core/wsdl_core.py:485 msgid "Confirm" msgstr "Подтвердить" -#: ../calculate-core/pym/core/wsdl_core.py:531 +#: ../calculate-core/pym/core/wsdl_core.py:532 msgid "Confirm the Request" msgstr "Подтвердить запрос" -#: ../calculate-core/pym/core/server/cert_cmd.py:124 +#: ../calculate-core/pym/core/server/cert_cmd.py:126 #, python-format msgid "Country (two letters only!) [%s]: " msgstr "Страна (только 2 символа!) [%s]: " -#: ../calculate-core/pym/core/server/create_cert.py:99 +#: ../calculate-core/pym/core/server/create_cert.py:100 msgid "Country (two letters only!): " msgstr "Страна (только 2 символа!): " -#: ../calculate-core/pym/core/client/create_cert.py:86 +#: ../calculate-core/pym/core/client/create_cert.py:85 #, python-format msgid "Country: [%s]" msgstr "Страна: [%s]" -#: ../calculate-core/pym/core/server/cert_cmd.py:188 +#: ../calculate-core/pym/core/server/cert_cmd.py:191 msgid "Create a new private key and request?" msgstr "Создать новый секретный ключ и запрос?" -#: ../calculate-core/pym/core/client/cert_func.py:116 +#: ../calculate-core/pym/core/client/cert_func.py:118 msgid "Create a new private key and request? y/[n]: " msgstr "Создать новый секретный ключ и запрос? y/[n]: " -#: ../calculate-core/pym/core/server/cert_cmd.py:1240 +#: ../calculate-core/pym/core/server/cert_cmd.py:1244 msgid "Create symlinks for methods" msgstr "Создание ссылок для методов" -#: ../calculate-core/pym/core/wsdl_core.py:668 +#: ../calculate-core/pym/core/wsdl_core.py:669 msgid "Custom Action" msgstr "Произвольное действие" -#: ../calculate-core/pym/core/wsdl_core.py:688 +#: ../calculate-core/pym/core/wsdl_core.py:689 msgid "Custom action" msgstr "Произвольное действие" @@ -579,41 +579,41 @@ msgstr "Произвольное действие" msgid "Date" msgstr "Дата" -#: ../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 +#: ../calculate-core/pym/core/wsdl_core.py:309 +#: ../calculate-core/pym/core/wsdl_core.py:414 +#: ../calculate-core/pym/core/wsdl_core.py:488 +#: ../calculate-core/pym/core/wsdl_core.py:522 +#: ../calculate-core/pym/core/wsdl_core.py:554 msgid "Delete" msgstr "Удалить" -#: ../calculate-core/pym/core/wsdl_core.py:391 +#: ../calculate-core/pym/core/wsdl_core.py:392 msgid "Delete the Group" msgstr "Удаление группы" -#: ../calculate-core/pym/core/wsdl_core.py:499 +#: ../calculate-core/pym/core/wsdl_core.py:500 msgid "Delete the Request" msgstr "Удаление запроса" -#: ../calculate-core/pym/core/server/cert_cmd.py:1000 +#: ../calculate-core/pym/core/server/cert_cmd.py:1004 msgid "Delete the certificate and the signature request? y/[n]: " msgstr "Удалить сертификат и запрос на подпись? y/[n]: " -#: ../calculate-core/pym/core/server/cert_cmd.py:673 +#: ../calculate-core/pym/core/server/cert_cmd.py:677 #, python-format msgid "Delete the client certificate with ID %d? y/[n]: " msgstr "Удалить сертификат клиента с ID %d? y/[n]: " -#: ../calculate-core/pym/core/wsdl_core.py:411 +#: ../calculate-core/pym/core/wsdl_core.py:412 msgid "Delete the group" msgstr "Удаление группы" -#: ../calculate-core/pym/core/wsdl_core.py:519 -#: ../calculate-core/pym/core/wsdl_core.py:551 +#: ../calculate-core/pym/core/wsdl_core.py:520 +#: ../calculate-core/pym/core/wsdl_core.py:552 msgid "Delete the request" msgstr "Удаление запроса" -#: ../calculate-core/pym/core/server/cert_cmd.py:676 +#: ../calculate-core/pym/core/server/cert_cmd.py:680 msgid "Deleted" msgstr "Удалено" @@ -622,7 +622,7 @@ msgstr "Удалено" msgid "Deleting manually interrupted" msgstr "Удаление прервано пользователем" -#: ../calculate-core/pym/core/variables/setup_package.py:309 +#: ../calculate-core/pym/core/variables/setup_package.py:313 #, python-format msgid "Directory %s not found" msgstr "Каталог %s не найден" @@ -635,21 +635,21 @@ msgstr "Обновление конфигурационных файлов вр msgid "Dispatching manually interrupted" msgstr "Обновление конфигурационных файлов прервано пользователем" -#: ../calculate-core/pym/core/server/cert_cmd.py:100 -#: ../calculate-core/pym/core/server/create_cert.py:66 +#: ../calculate-core/pym/core/server/cert_cmd.py:102 +#: ../calculate-core/pym/core/server/create_cert.py:67 msgid "Do not use spaces or tabs." msgstr "Не используйте символы пробела и табуляции." -#: ../calculate-core/pym/core/server/bootstrap.py:477 +#: ../calculate-core/pym/core/server/bootstrap.py:479 msgid "Do you really want to remove all certificates, requests and config files from the server?" msgstr "Вы действительно хотите удалить все сертификаты, запросы и конфигурационные файлы на сервере?" -#: ../calculate-core/pym/core/wsdl_core.py:344 +#: ../calculate-core/pym/core/wsdl_core.py:345 msgid "Done" msgstr "Готово" -#: ../calculate-core/pym/core/server/cert_cmd.py:65 -#: ../calculate-core/pym/core/server/create_cert.py:55 +#: ../calculate-core/pym/core/server/cert_cmd.py:67 +#: ../calculate-core/pym/core/server/create_cert.py:56 msgid "Enter the certificate date manually? [y]/n: " msgstr "Ввести дату сертификата вручную? y/[n]: " @@ -657,12 +657,12 @@ msgstr "Ввести дату сертификата вручную? y/[n]: " msgid "Enter the certificate date manually? y/[n]: " msgstr "Ввести дату сертификата вручную? y/[n]: " -#: ../calculate-core/pym/core/server/cert_cmd.py:706 +#: ../calculate-core/pym/core/server/cert_cmd.py:710 msgid "Enter the group of the new certificate (group name or 'all'): " msgstr "Введите группу нового сертификата (имя группы или 'all'): " -#: ../calculate-core/pym/core/client/cert_func.py:93 -#: ../calculate-core/pym/core/client/cert_func.py:146 +#: ../calculate-core/pym/core/client/cert_func.py:95 +#: ../calculate-core/pym/core/client/cert_func.py:148 msgid "Enter the port number: " msgstr "Введите номер порта: " @@ -670,41 +670,41 @@ msgstr "Введите номер порта: " msgid "Error" msgstr "Ошибка" -#: ../calculate-core/pym/core/client/cert_verify.py:104 -#: ../calculate-core/pym/core/client/cert_verify.py:109 -#: ../calculate-core/pym/core/client/client_class.py:289 +#: ../calculate-core/pym/core/client/cert_verify.py:106 +#: ../calculate-core/pym/core/client/cert_verify.py:111 +#: ../calculate-core/pym/core/client/client_class.py:291 #, python-format msgid "Error creating directory %s" msgstr "Ошибка создания директории %s" -#: ../calculate-core/pym/core/server/methods_func.py:778 +#: ../calculate-core/pym/core/server/methods_func.py:784 #, python-format msgid "Error in field '%s'. " msgstr "Ошибка в поле '%s'." -#: ../calculate-core/pym/core/server/methods_func.py:782 +#: ../calculate-core/pym/core/server/methods_func.py:788 msgid "Error in parameter " msgstr "Ошибка в параметре " -#: ../calculate-core/pym/core/server/clean.py:159 +#: ../calculate-core/pym/core/server/clean.py:162 msgid "Error reading SID files" msgstr "Ошибка чтения файлов с идентификаторами сессий" -#: ../calculate-core/pym/core/variables/variable.py:228 +#: ../calculate-core/pym/core/variables/variable.py:223 #, python-format msgid "Error writing to variable %s:" msgstr "Ошибка записи переменной %s :" -#: ../calculate-core/pym/core/client/client_class.py:205 +#: ../calculate-core/pym/core/client/client_class.py:207 msgid "Error. Certificate not added to the trusted list." msgstr "Ошибка. Сертификат не добавлен в доверенные." -#: ../calculate-core/pym/core/server/client_class.py:163 +#: ../calculate-core/pym/core/server/client_class.py:165 msgid "Error. The server certificate and the private key are probably invalid!" msgstr "Ошибка. Возможно, сертификат сервера и секретный ключ неверны!" -#: ../calculate-core/pym/core/client/cert_info.py:105 -#: ../calculate-core/pym/core/client/cert_info.py:108 +#: ../calculate-core/pym/core/client/cert_info.py:107 +#: ../calculate-core/pym/core/client/cert_info.py:110 #, python-format msgid "Exception: %s" msgstr "Исключение: %s" @@ -714,7 +714,7 @@ msgstr "Исключение: %s" msgid "Failed to add {cl_core_group} group" msgstr "Не удалось добавить группу {cl_core_group}" -#: ../calculate-core/pym/core/backup.py:290 +#: ../calculate-core/pym/core/backup.py:291 msgid "Failed to backup configuration files that were modified by templates" msgstr "Не удалось создать резервную копию конфигурационных файлов, изменённых шаблонами" @@ -723,38 +723,38 @@ msgstr "Не удалось создать резервную копию кон msgid "Failed to change {cl_core_group} group" msgstr "Не удалось изменить группу {cl_core_group}" -#: ../calculate-core/pym/core/client/function.py:48 +#: ../calculate-core/pym/core/client/function.py:49 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 +#: ../calculate-core/pym/core/utils/cl_core_setup.py:37 msgid "Failed to configure the system!" msgstr "Не удалось настроить систему!" -#: ../calculate-core/pym/core/client/cert_info.py:83 +#: ../calculate-core/pym/core/client/cert_info.py:85 msgid "Failed to connect" msgstr "Не удалось подключиться" -#: ../calculate-core/pym/core/server/func.py:142 +#: ../calculate-core/pym/core/server/func.py:140 #, python-brace-format msgid "Failed to copy {ffrom} to {fto}" msgstr "Не удалось скопировать {ffrom} в {fto}" -#: ../calculate-core/pym/core/backup.py:251 +#: ../calculate-core/pym/core/backup.py:252 #, python-format msgid "Failed to create directory %s" msgstr "Не удалось создать директорию %s" -#: ../calculate-core/pym/core/server/cert_cmd.py:131 +#: ../calculate-core/pym/core/server/cert_cmd.py:133 msgid "Failed to create root certificate" msgstr "Не удалось создать корневой сертификат" -#: ../calculate-core/pym/core/client/cert_func.py:288 +#: ../calculate-core/pym/core/client/cert_func.py:290 msgid "Failed to create the certificate ID!" msgstr "Ошибка создания номера сертификата!" -#: ../calculate-core/pym/core/client/sid_func.py:64 +#: ../calculate-core/pym/core/client/sid_func.py:66 msgid "Failed to delete the SID on the server" msgstr "Ошибка удаления ID сессии на сервере" @@ -763,7 +763,7 @@ msgstr "Ошибка удаления ID сессии на сервере" msgid "Failed to delete the request with ID={cl_req_id}" msgstr "Не удалось удалить запрос с ID={cl_req_id}" -#: ../calculate-core/pym/core/set_vars.py:52 +#: ../calculate-core/pym/core/set_vars.py:50 #, python-brace-format msgid "Failed to delete variable {var} from {location}" msgstr "Не удалось удалить переменную {var} из {location}" @@ -777,7 +777,7 @@ msgstr "Не удалось удалить группу {cl_core_group}" msgid "Failed to dispatch configuration files!" msgstr "Не удалось обновить конфигурационные файлы!" -#: ../calculate-core/pym/core/backup.py:234 +#: ../calculate-core/pym/core/backup.py:235 msgid "Failed to enable service at startup" msgstr "Не удалось сохранить сервис с автозапуском" @@ -785,38 +785,38 @@ msgstr "Не удалось сохранить сервис с автозапу msgid "Failed to find backup" msgstr "Не удалось найти резервную копию" -#: ../calculate-core/pym/core/client/pid_information.py:66 -#: ../calculate-core/pym/core/client/pid_information.py:84 +#: ../calculate-core/pym/core/client/pid_information.py:68 +#: ../calculate-core/pym/core/client/pid_information.py:86 msgid "Failed to get PIDs from the server" msgstr "Ошибка получения идентификаторов процессов на сервере" -#: ../calculate-core/pym/core/server/bootstrap.py:93 +#: ../calculate-core/pym/core/server/bootstrap.py:95 msgid "Failed to get certificate work date" msgstr "Не удалось получить рабочую дату сертификата" -#: ../calculate-core/pym/core/client/pid_information.py:107 -#: ../calculate-core/pym/core/client/sid_func.py:111 +#: ../calculate-core/pym/core/client/pid_information.py:109 +#: ../calculate-core/pym/core/client/sid_func.py:113 msgid "Failed to get data" msgstr "Ошибка получения данных" -#: ../calculate-core/pym/core/backup.py:337 +#: ../calculate-core/pym/core/backup.py:338 #, python-brace-format msgid "Failed to get status of {name} service" msgstr "Не удалось получить статус сервиса {name}" -#: ../calculate-core/pym/core/server/cl_server.py:30 -#: ../calculate-core/pym/core/core_main.py:51 +#: ../calculate-core/pym/core/server/cl_server.py:40 +#: ../calculate-core/pym/core/core_main.py:54 #, python-format msgid "Failed to import %s" msgstr "Невозможно импортировать %s" -#: ../calculate-core/pym/core/client/sid_func.py:52 -#: ../calculate-core/pym/core/client/sid_func.py:76 +#: ../calculate-core/pym/core/client/sid_func.py:54 +#: ../calculate-core/pym/core/client/sid_func.py:78 msgid "Failed to obtain the certificate data!" msgstr "Не удалось получить данные сертификата!" -#: ../calculate-core/pym/core/client/client_class.py:105 -#: ../calculate-core/pym/core/server/client_class.py:74 +#: ../calculate-core/pym/core/client/client_class.py:107 +#: ../calculate-core/pym/core/server/client_class.py:76 msgid "Failed to open the file" msgstr "Ошибка открытия файла" @@ -833,21 +833,21 @@ msgstr "Не удалось выполнить действие!" msgid "Failed to perform backup!" msgstr "Не удалось создать резервную копию!" -#: ../calculate-core/pym/core/server/func.py:155 +#: ../calculate-core/pym/core/server/func.py:153 #, python-format msgid "Failed to remove %s" msgstr "Не удалось удалить %s" -#: ../calculate-core/pym/core/backup.py:380 +#: ../calculate-core/pym/core/backup.py:381 #, python-format msgid "Failed to remove %s service" msgstr "Не удалось удалить сервис %s" -#: ../calculate-core/pym/core/server/bootstrap.py:298 +#: ../calculate-core/pym/core/server/bootstrap.py:300 msgid "Failed to remove local client certificate" msgstr "Не удалось удалить локальный клиентский сертификат" -#: ../calculate-core/pym/core/backup.py:333 +#: ../calculate-core/pym/core/backup.py:334 #, python-brace-format msgid "Failed to restart {name} service" msgstr "Не удалось перезапустить сервис {name}" @@ -856,7 +856,7 @@ msgstr "Не удалось перезапустить сервис {name}" msgid "Failed to restore from backup!" msgstr "Не удалось выполнить восстановление из резервной копии!" -#: ../calculate-core/pym/core/server/cert_cmd.py:719 +#: ../calculate-core/pym/core/server/cert_cmd.py:723 msgid "Failed to sign client certificate" msgstr "Не удалось подписать сертификат клиента" @@ -865,30 +865,30 @@ msgstr "Не удалось подписать сертификат клиент msgid "Failed to sign {cl_req_csr_path} request" msgstr "Не удалось подписать запрос {cl_req_csr_path}" -#: ../calculate-core/pym/core/backup.py:334 +#: ../calculate-core/pym/core/backup.py:335 #, python-brace-format msgid "Failed to start {name} service" msgstr "Не удалось запустить сервис {name}" -#: ../calculate-core/pym/core/backup.py:335 +#: ../calculate-core/pym/core/backup.py:336 #, python-brace-format msgid "Failed to stop {name} service" msgstr "Не удалось остановить сервис {name}" -#: ../calculate-core/pym/core/server/local_call.py:156 -#: ../calculate-core/pym/core/server/func.py:1082 +#: ../calculate-core/pym/core/server/func.py:1089 +#: ../calculate-core/pym/core/server/local_call.py:159 #, python-format msgid "Failed to write the PID file %s!" msgstr "Ошибка записи файла с идентификаторами процессов %s!" -#: ../calculate-core/pym/core/backup.py:336 +#: ../calculate-core/pym/core/backup.py:337 #, python-brace-format msgid "Failed to zap {name} service" msgstr "Не удалось сбросить сервис {name}" -#: ../calculate-core/pym/core/client/cert_func.py:244 -#: ../calculate-core/pym/core/client/client_class.py:170 -#: ../calculate-core/pym/core/server/bootstrap.py:414 +#: ../calculate-core/pym/core/client/cert_func.py:246 +#: ../calculate-core/pym/core/client/client_class.py:172 +#: ../calculate-core/pym/core/server/bootstrap.py:416 msgid "Field \"CN\" not found in the certificate!" msgstr "Нет поля \"CN\" в сертификате!" @@ -896,36 +896,36 @@ msgstr "Нет поля \"CN\" в сертификате!" msgid "Files successfully restored from backup!" msgstr "Восстановление из резервной копии успешно завершено!" -#: ../calculate-core/pym/core/variables/variable.py:263 +#: ../calculate-core/pym/core/variables/variable.py:257 msgid "Filter" msgstr "Фильтр" -#: ../calculate-core/pym/core/server/cert_cmd.py:527 -#: ../calculate-core/pym/core/server/cert_cmd.py:816 +#: ../calculate-core/pym/core/server/cert_cmd.py:531 +#: ../calculate-core/pym/core/server/cert_cmd.py:820 msgid "Fingerprint = " msgstr "Отпечаток = " -#: ../calculate-core/pym/core/client/client_class.py:207 -#: ../calculate-core/pym/core/client/client_class.py:232 -#: ../calculate-core/pym/core/server/client_class.py:85 +#: ../calculate-core/pym/core/client/client_class.py:209 +#: ../calculate-core/pym/core/client/client_class.py:234 +#: ../calculate-core/pym/core/server/client_class.py:87 #, python-format msgid "Fingerprint = %s" msgstr "Отпечаток = %s" -#: ../calculate-core/pym/core/server/cert_cmd.py:115 -#: ../calculate-core/pym/core/server/create_cert.py:94 +#: ../calculate-core/pym/core/server/cert_cmd.py:117 +#: ../calculate-core/pym/core/server/create_cert.py:95 msgid "Full network address (host:port)" msgstr "Полный сетевой адрес (хост:порт)" -#: ../calculate-core/pym/core/server/baseClass.py:163 +#: ../calculate-core/pym/core/server/baseClass.py:185 msgid "General monitoring started" msgstr "Общий мониторинг запущен" -#: ../calculate-core/pym/core/server/bootstrap.py:126 +#: ../calculate-core/pym/core/server/bootstrap.py:128 msgid "Generating the client certificate" msgstr "Генерация сертификата клиента" -#: ../calculate-core/pym/core/server/bootstrap.py:105 +#: ../calculate-core/pym/core/server/bootstrap.py:107 msgid "Generating the server certificate" msgstr "Генерация сертификата сервера" @@ -934,23 +934,23 @@ msgid "Group" msgstr "Группа" #: ../calculate-core/pym/core/server/groups.py:102 -#: ../calculate-core/pym/core/variables/groups.py:78 +#: ../calculate-core/pym/core/variables/groups.py:77 #, python-format msgid "Group %s already exists!" msgstr "Группа %s уже существует!" -#: ../calculate-core/pym/core/variables/groups.py:80 -#: ../calculate-core/pym/core/variables/request.py:344 +#: ../calculate-core/pym/core/variables/groups.py:79 +#: ../calculate-core/pym/core/variables/request.py:343 #, python-format msgid "Group %s does not exist" msgstr "Группа %s не существует" -#: ../calculate-core/pym/core/wsdl_core.py:280 +#: ../calculate-core/pym/core/wsdl_core.py:281 msgid "Group Details" msgstr "Подробности групп" -#: ../calculate-core/pym/core/wsdl_core.py:298 -#: ../calculate-core/pym/core/wsdl_core.py:475 +#: ../calculate-core/pym/core/wsdl_core.py:299 +#: ../calculate-core/pym/core/wsdl_core.py:476 msgid "Group details" msgstr "Подробности групп" @@ -962,12 +962,12 @@ msgstr "Имя группы" msgid "Group name is a required parameter" msgstr "Имя группы - обязательный параметр" +#: ../calculate-core/pym/core/variables/groups.py:91 #: ../calculate-core/pym/core/variables/groups.py:92 -#: ../calculate-core/pym/core/variables/groups.py:93 msgid "Group permissions" msgstr "Права группы" -#: ../calculate-core/pym/core/variables/request.py:332 +#: ../calculate-core/pym/core/variables/request.py:331 msgid "Group permissions is a required parameter" msgstr "Группа прав - обязательный параметр" @@ -988,52 +988,52 @@ 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:268 +#: ../calculate-core/pym/core/wsdl_core.py:269 msgid "Groups" msgstr "Группы" -#: ../calculate-core/pym/core/client/create_cert.py:73 -#: ../calculate-core/pym/core/server/cert_cmd.py:102 -#: ../calculate-core/pym/core/server/create_cert.py:88 +#: ../calculate-core/pym/core/client/create_cert.py:72 +#: ../calculate-core/pym/core/server/cert_cmd.py:104 +#: ../calculate-core/pym/core/server/create_cert.py:89 #, python-format msgid "Hostname [%s] : " msgstr "Имя хоста [%s]: " -#: ../calculate-core/pym/core/client/sid_func.py:90 +#: ../calculate-core/pym/core/client/sid_func.py:92 #, python-format msgid "IP: %s" msgstr "IP - %s" -#: ../calculate-core/pym/core/server/baseClass.py:170 +#: ../calculate-core/pym/core/server/baseClass.py:192 msgid "Inactive watchdog failed" msgstr "Не удалось запустить отслеживание осутствия активности" -#: ../calculate-core/pym/core/server/baseClass.py:169 +#: ../calculate-core/pym/core/server/baseClass.py:191 msgid "Inactive watchdog started" msgstr "Отслеживание отсутвия активности запущено" -#: ../calculate-core/pym/core/client/sid_func.py:103 +#: ../calculate-core/pym/core/client/sid_func.py:105 msgid "Invalid SID" msgstr "Ошибка сессии" -#: ../calculate-core/pym/core/client/cert_func.py:305 +#: ../calculate-core/pym/core/client/cert_func.py:307 msgid "Invalid certificate ID" msgstr "Ошибка номера сертификата" -#: ../calculate-core/pym/core/client/client_class.py:192 +#: ../calculate-core/pym/core/client/client_class.py:194 msgid "Invalid server certificate!" 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:530 -#: ../calculate-core/pym/core/server/cert_cmd.py:819 +#: ../calculate-core/pym/core/client/client_class.py:212 +#: ../calculate-core/pym/core/client/client_class.py:237 +#: ../calculate-core/pym/core/server/cert_cmd.py:534 +#: ../calculate-core/pym/core/server/cert_cmd.py:823 +#: ../calculate-core/pym/core/server/client_class.py:90 msgid "Issuer" msgstr "Подписчик" -#: ../calculate-core/pym/core/server/create_cert.py:118 -#: ../calculate-core/pym/core/server/create_cert.py:156 +#: ../calculate-core/pym/core/server/create_cert.py:119 +#: ../calculate-core/pym/core/server/create_cert.py:157 msgid "Key file {} not found" msgstr "Файл ключа {} не найден" @@ -1049,60 +1049,60 @@ msgstr "Список сертификатов" msgid "List of requests" msgstr "Список запросов" -#: ../calculate-core/pym/core/set_vars.py:43 -#: ../calculate-core/pym/core/set_vars.py:109 +#: ../calculate-core/pym/core/set_vars.py:41 +#: ../calculate-core/pym/core/set_vars.py:107 msgid "List of variables" msgstr "Список переменных" -#: ../calculate-core/pym/core/variables/variable.py:277 +#: ../calculate-core/pym/core/variables/variable.py:271 msgid "Local" msgstr "Локальные" #: ../calculate-core/pym/core/server/request.py:51 -#: ../calculate-core/pym/core/variables/variable.py:238 -#: ../calculate-core/pym/core/set_vars.py:42 -#: ../calculate-core/pym/core/set_vars.py:108 +#: ../calculate-core/pym/core/variables/variable.py:233 +#: ../calculate-core/pym/core/set_vars.py:40 +#: ../calculate-core/pym/core/set_vars.py:106 msgid "Location" msgstr "Расположение" -#: ../calculate-core/pym/core/client/sid_func.py:91 +#: ../calculate-core/pym/core/client/sid_func.py:93 #, python-format msgid "MAC: %s" msgstr "MAC - %s" -#: ../calculate-core/pym/core/variables/setup_package.py:396 +#: ../calculate-core/pym/core/variables/setup_package.py:400 msgid "Machine architecture" msgstr "Архитектура компьютера" -#: ../calculate-core/pym/core/client/cert_info.py:86 -#: ../calculate-core/pym/core/client/cert_info.py:110 -#: ../calculate-core/pym/core/server/local_call.py:252 -#: ../calculate-core/pym/core/server/local_call.py:379 +#: ../calculate-core/pym/core/client/cert_info.py:88 +#: ../calculate-core/pym/core/client/cert_info.py:112 +#: ../calculate-core/pym/core/server/local_call.py:256 +#: ../calculate-core/pym/core/server/local_call.py:383 msgid "Manually interrupted" msgstr "Прервано пользователем" -#: ../calculate-core/pym/core/server/local_call.py:336 +#: ../calculate-core/pym/core/server/local_call.py:340 msgid "Method not available" msgstr "Метод недоступен" -#: ../calculate-core/pym/core/server/local_call.py:191 +#: ../calculate-core/pym/core/server/local_call.py:195 #, python-format msgid "Method not found for %s" msgstr "Метод для %s не найден: " -#: ../calculate-core/pym/core/server/local_call.py:220 -#: ../calculate-core/pym/core/server/local_call.py:290 -#: ../calculate-core/pym/core/server/local_call.py:362 +#: ../calculate-core/pym/core/server/local_call.py:224 +#: ../calculate-core/pym/core/server/local_call.py:294 +#: ../calculate-core/pym/core/server/local_call.py:366 msgid "Method not found: " msgstr "Метод не найден: " -#: ../calculate-core/pym/core/server/func.py:456 +#: ../calculate-core/pym/core/server/func.py:457 #, python-brace-format msgid "Method {method} for {obj} not found" msgstr "Метод {method} для {obj} не найден" -#: ../calculate-core/pym/core/set_vars.py:42 -#: ../calculate-core/pym/core/set_vars.py:107 +#: ../calculate-core/pym/core/set_vars.py:40 +#: ../calculate-core/pym/core/set_vars.py:105 msgid "Mode" msgstr "Режим" @@ -1110,11 +1110,11 @@ msgstr "Режим" msgid "Modification of variables manually interrupted" msgstr "Изменение переменных прервано пользователем" -#: ../calculate-core/pym/core/wsdl_core.py:320 +#: ../calculate-core/pym/core/wsdl_core.py:321 msgid "Modify Group" msgstr "Изменить группу" -#: ../calculate-core/pym/core/wsdl_core.py:340 +#: ../calculate-core/pym/core/wsdl_core.py:341 msgid "Modify group" msgstr "Изменить группу" @@ -1122,28 +1122,28 @@ msgstr "Изменить группу" msgid "Modifying manually interrupted" msgstr "Изменение прервано пользователем" -#: ../calculate-core/pym/core/server/baseClass.py:164 +#: ../calculate-core/pym/core/server/baseClass.py:186 msgid "Monitoring error" msgstr "Ошибка мониторинга" -#: ../calculate-core/pym/core/variables/variable.py:130 +#: ../calculate-core/pym/core/variables/variable.py:128 msgid "Name" msgstr "Имя" -#: ../calculate-core/pym/core/client/create_cert.py:81 +#: ../calculate-core/pym/core/client/create_cert.py:80 #, python-format 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: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 +#: ../calculate-core/pym/core/server/func.py:123 +#: ../calculate-core/pym/core/server/func.py:1829 +#: ../calculate-core/pym/core/wsdl_core.py:204 +#: ../calculate-core/pym/core/wsdl_core.py:271 +#: ../calculate-core/pym/core/wsdl_core.py:448 msgid "Next" msgstr "Далее" -#: ../calculate-core/pym/core/client/sid_func.py:49 +#: ../calculate-core/pym/core/client/sid_func.py:51 msgid "No access to the file!" msgstr "Нет доступа к файлу!" @@ -1155,14 +1155,14 @@ msgstr "Нет сертификатов" msgid "No groups" 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:602 +#: ../calculate-core/pym/core/client/pid_information.py:123 +#: ../calculate-core/pym/core/client/pid_information.py:127 +#: ../calculate-core/pym/core/server/cert_cmd.py:606 msgid "No methods available" msgstr "Нет доступных методов" -#: ../calculate-core/pym/core/server/cl_server.py:31 -#: ../calculate-core/pym/core/core_main.py:54 +#: ../calculate-core/pym/core/server/cl_server.py:41 +#: ../calculate-core/pym/core/core_main.py:57 #, python-format msgid "No module named %s" msgstr "Нет модуля %s" @@ -1171,15 +1171,15 @@ msgstr "Нет модуля %s" msgid "No requests" msgstr "Нет запросов" -#: ../calculate-core/pym/core/server/cl_server.py:333 +#: ../calculate-core/pym/core/server/cl_server.py:353 msgid "No socket could be created" msgstr "Не получается создать сокет" -#: ../calculate-core/pym/core/set_vars.py:112 +#: ../calculate-core/pym/core/set_vars.py:110 msgid "No such variables" msgstr "Нет таких переменных" -#: ../calculate-core/pym/core/server/cert_cmd.py:1002 +#: ../calculate-core/pym/core/server/cert_cmd.py:1006 msgid "Not deleted" msgstr "Не удалён" @@ -1191,63 +1191,63 @@ msgstr "Нет запросов" msgid "Not signed" msgstr "Не подписан" -#: ../calculate-core/pym/core/server/cert_cmd.py:141 -#: ../calculate-core/pym/core/server/cert_cmd.py:166 +#: ../calculate-core/pym/core/server/cert_cmd.py:143 +#: ../calculate-core/pym/core/server/cert_cmd.py:168 msgid "OK" msgstr "OK" -#: ../calculate-core/pym/core/server/func.py:453 +#: ../calculate-core/pym/core/server/func.py:454 #, python-format msgid "Object %s not found" msgstr "Объект %s не найден" -#: ../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 +#: ../calculate-core/pym/core/client/create_cert.py:78 +#: ../calculate-core/pym/core/server/cert_cmd.py:112 +#: ../calculate-core/pym/core/server/create_cert.py:93 msgid "Organization name: " msgstr "Название организации: " -#: ../calculate-core/pym/core/server/cert_cmd.py:105 -#: ../calculate-core/pym/core/server/create_cert.py:90 +#: ../calculate-core/pym/core/server/cert_cmd.py:107 +#: ../calculate-core/pym/core/server/create_cert.py:91 msgid "Organization unit: " msgstr "Название отдела: " -#: ../calculate-core/pym/core/client/pid_information.py:91 +#: ../calculate-core/pym/core/client/pid_information.py:93 msgid "PID" msgstr "PID" -#: ../calculate-core/pym/core/server/clean.py:66 +#: ../calculate-core/pym/core/server/clean.py:68 #, python-format msgid "PID %d watcher error" msgstr "ошибка наблюдения за процессом с идентификатором %d" -#: ../calculate-core/pym/core/client/pid_information.py:95 -#: ../calculate-core/pym/core/client/pid_information.py:154 +#: ../calculate-core/pym/core/client/pid_information.py:97 +#: ../calculate-core/pym/core/client/pid_information.py:156 msgid "PID error" msgstr "Ошибка идентификатора процесса" -#: ../calculate-core/pym/core/client/pid_information.py:34 +#: ../calculate-core/pym/core/client/pid_information.py:36 msgid "PID not found" msgstr "ID процесса не найден" -#: ../calculate-core/pym/core/client/pid_information.py:150 +#: ../calculate-core/pym/core/client/pid_information.py:152 msgid "PID to be killed: " msgstr "Идентификатор процесса для закрытия: " -#: ../calculate-core/pym/core/client/pid_information.py:60 -#: ../calculate-core/pym/core/client/pid_information.py:78 +#: ../calculate-core/pym/core/client/pid_information.py:62 +#: ../calculate-core/pym/core/client/pid_information.py:80 msgid "PIDs not found for this session!" msgstr "Не найден ID процесса для данной сессии!" -#: ../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 +#: ../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:360 #, python-format msgid "Package %s" msgstr "Пакет %s" -#: ../calculate-core/pym/core/variables/setup_package.py:260 +#: ../calculate-core/pym/core/variables/setup_package.py:264 msgid "Package category" msgstr "Категория пакета" @@ -1259,13 +1259,13 @@ msgstr "Имя пакета" msgid "Package not found" msgstr "Пакет не найден" -#: ../calculate-core/pym/core/variables/setup_package.py:156 -#: ../calculate-core/pym/core/variables/setup_package.py:184 +#: ../calculate-core/pym/core/variables/setup_package.py:160 +#: ../calculate-core/pym/core/variables/setup_package.py:188 msgid "Package slot" msgstr "Слот пакета" -#: ../calculate-core/pym/core/variables/setup_package.py:80 -#: ../calculate-core/pym/core/variables/setup_package.py:126 +#: ../calculate-core/pym/core/variables/setup_package.py:84 +#: ../calculate-core/pym/core/variables/setup_package.py:130 msgid "Package version" msgstr "Версия пакета" @@ -1285,25 +1285,25 @@ msgstr "Предел для страницы" msgid "Page offset" msgstr "Смещение для страницы" -#: ../calculate-core/pym/core/server/methods_func.py:560 +#: ../calculate-core/pym/core/server/methods_func.py:568 msgid "Password" msgstr "Пароль" -#: ../calculate-core/pym/core/server/methods_func.py:681 +#: ../calculate-core/pym/core/server/methods_func.py:689 #, python-format msgid "Password for %s: " msgstr "Пароль для %s: " -#: ../calculate-core/pym/core/server/methods_func.py:101 +#: ../calculate-core/pym/core/server/methods_func.py:104 msgid "Password: " msgstr "Пароль: " -#: ../calculate-core/pym/core/server/methods_func.py:113 -#: ../calculate-core/pym/core/result_viewer.py:326 +#: ../calculate-core/pym/core/server/methods_func.py:116 +#: ../calculate-core/pym/core/result_viewer.py:324 msgid "Passwords do not match" msgstr "Пароли не совпадают" -#: ../calculate-core/pym/core/wsdl_core.py:108 +#: ../calculate-core/pym/core/wsdl_core.py:109 msgid "Patch" msgstr "Патч" @@ -1311,17 +1311,17 @@ msgstr "Патч" msgid "Patching manually interrupted" msgstr "Исправление прервано пользователем" -#: ../calculate-core/pym/core/setup_package.py:237 +#: ../calculate-core/pym/core/setup_package.py:233 #, python-format msgid "Path '%s' does not exist" msgstr "Путь %s не существует" -#: ../calculate-core/pym/core/variables/setup_package.py:304 +#: ../calculate-core/pym/core/variables/setup_package.py:308 msgid "Path for configuration" msgstr "Путь для настройки" -#: ../calculate-core/pym/core/client/cert_func.py:315 -#: ../calculate-core/pym/core/client/pid_information.py:37 +#: ../calculate-core/pym/core/client/cert_func.py:317 +#: ../calculate-core/pym/core/client/pid_information.py:39 msgid "Permission denied" msgstr "Доступ запрещён" @@ -1330,7 +1330,7 @@ msgstr "Доступ запрещён" msgid "Permissions" msgstr "Права" -#: ../calculate-core/pym/core/server/cert_cmd.py:538 +#: ../calculate-core/pym/core/server/cert_cmd.py:542 msgid "Permissions: " msgstr "Права: " @@ -1338,108 +1338,108 @@ msgstr "Права: " msgid "Please choose a package" msgstr "Пожалуйста, выберите пакет" -#: ../calculate-core/pym/core/variables/setup_package.py:291 +#: ../calculate-core/pym/core/variables/setup_package.py:295 msgid "Please choose the category" msgstr "Пожалуйста, выберите категорию" -#: ../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:176 #: ../calculate-core/pym/core/variables/setup_package.py:231 -#: ../calculate-core/pym/core/variables/setup_package.py:245 +#: ../calculate-core/pym/core/variables/setup_package.py:235 +#: ../calculate-core/pym/core/variables/setup_package.py:249 msgid "Please choose the slot" msgstr "Пожалуйста, выберите слот" -#: ../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 +#: ../calculate-core/pym/core/variables/setup_package.py:105 +#: ../calculate-core/pym/core/variables/setup_package.py:116 +#: ../calculate-core/pym/core/variables/setup_package.py:147 msgid "Please choose the version" msgstr "Пожалуйста, выберите версию" -#: ../calculate-core/pym/core/client/sid_func.py:109 +#: ../calculate-core/pym/core/client/sid_func.py:111 msgid "Please enter a correct SID" msgstr "Введите корректный идентификатор сессии" -#: ../calculate-core/pym/core/client/cert_func.py:312 +#: ../calculate-core/pym/core/client/cert_func.py:314 msgid "Please enter a valid certificate ID!" msgstr "Введите корректный номер сертификата!" -#: ../calculate-core/pym/core/server/cl_server.py:334 +#: ../calculate-core/pym/core/server/cl_server.py:354 #, python-format msgid "Port %d already in use" msgstr "Порт %d уже используется" -#: ../calculate-core/pym/core/server/api_types.py:325 +#: ../calculate-core/pym/core/server/api_types.py:321 msgid "Previous" msgstr "Назад" -#: ../calculate-core/pym/core/server/bootstrap.py:61 +#: ../calculate-core/pym/core/server/bootstrap.py:63 #, python-format msgid "Private key %s not found" msgstr "Секретный ключ %s не найден" -#: ../calculate-core/pym/core/client/pid_information.py:41 +#: ../calculate-core/pym/core/client/pid_information.py:43 #, python-format msgid "Process ID: %s" msgstr "ID процесса - %s" -#: ../calculate-core/pym/core/client/pid_information.py:43 +#: ../calculate-core/pym/core/client/pid_information.py:45 msgid "Process active" msgstr "Процесс активен" -#: ../calculate-core/pym/core/client/pid_information.py:45 +#: ../calculate-core/pym/core/client/pid_information.py:47 msgid "Process completed" msgstr "Процесс завершён" -#: ../calculate-core/pym/core/client/pid_information.py:47 +#: ../calculate-core/pym/core/client/pid_information.py:49 msgid "Process killed" msgstr "Процесс убит" -#: ../calculate-core/pym/core/client/pid_information.py:40 +#: ../calculate-core/pym/core/client/pid_information.py:42 #, python-format msgid "Process name: %s" msgstr "Имя процесса - %s" -#: ../calculate-core/pym/core/client/client_class.py:245 +#: ../calculate-core/pym/core/client/client_class.py:247 msgid "Quit (q)? s/c/[q]: " msgstr "Выйти (q)? s/c/[q]: " -#: ../calculate-core/pym/core/server/bootstrap.py:128 +#: ../calculate-core/pym/core/server/bootstrap.py:130 msgid "Regenerating the client certificate" msgstr "Перегенерация клиентского сертификата" -#: ../calculate-core/pym/core/variables/variable.py:278 +#: ../calculate-core/pym/core/variables/variable.py:272 msgid "Remote" msgstr "Удалённые" -#: ../calculate-core/pym/core/server/methods_func.py:682 +#: ../calculate-core/pym/core/server/methods_func.py:690 #, python-format msgid "Repeat password for %s: " msgstr "Повтор пароля для %s: " -#: ../calculate-core/pym/core/server/methods_func.py:562 +#: ../calculate-core/pym/core/server/methods_func.py:570 msgid "Repeat password: " msgstr "Повтор пароля: " -#: ../calculate-core/pym/core/server/methods_func.py:103 -#: ../calculate-core/pym/core/result_viewer.py:318 +#: ../calculate-core/pym/core/server/methods_func.py:106 +#: ../calculate-core/pym/core/result_viewer.py:316 msgid "Repeat: " msgstr "Повтор: " -#: ../calculate-core/pym/core/server/cert_cmd.py:915 -#: ../calculate-core/pym/core/server/cert_cmd.py:953 +#: ../calculate-core/pym/core/server/cert_cmd.py:919 +#: ../calculate-core/pym/core/server/cert_cmd.py:957 #, python-format msgid "Request \t%s" msgstr "Запрос \t%s" -#: ../calculate-core/pym/core/server/cert_cmd.py:913 -#: ../calculate-core/pym/core/server/cert_cmd.py:951 +#: ../calculate-core/pym/core/server/cert_cmd.py:917 +#: ../calculate-core/pym/core/server/cert_cmd.py:955 #, python-format msgid "Request \t%s: not signed" msgstr "Запрос \t%s - не подписан" -#: ../calculate-core/pym/core/client/cert_func.py:167 -#: ../calculate-core/pym/core/server/bootstrap.py:318 +#: ../calculate-core/pym/core/client/cert_func.py:169 +#: ../calculate-core/pym/core/server/bootstrap.py:320 #, python-format msgid "Request %s not found" msgstr "Запрос %s не найден" @@ -1449,36 +1449,36 @@ msgstr "Запрос %s не найден" msgid "Request %s not found!" msgstr "Запрос %s не найден" -#: ../calculate-core/pym/core/wsdl_core.py:457 +#: ../calculate-core/pym/core/wsdl_core.py:458 msgid "Request Details" msgstr "Подробности запроса на подпись сертификата" -#: ../calculate-core/pym/core/client/cert_func.py:88 +#: ../calculate-core/pym/core/client/cert_func.py:90 #, python-format msgid "Request ID = %s" msgstr "Номер запроса = %s" -#: ../calculate-core/pym/core/variables/request.py:199 +#: ../calculate-core/pym/core/variables/request.py:198 msgid "Request IP address" msgstr "IP-адрес" -#: ../calculate-core/pym/core/variables/request.py:215 +#: ../calculate-core/pym/core/variables/request.py:214 msgid "Request MAC address" msgstr "MAC-адрес" -#: ../calculate-core/pym/core/variables/request.py:231 +#: ../calculate-core/pym/core/variables/request.py:230 msgid "Request date" msgstr "Дата запроса" -#: ../calculate-core/pym/core/server/cert_cmd.py:998 +#: ../calculate-core/pym/core/server/cert_cmd.py:1002 msgid "Request duly signed" msgstr "Запрос успешно подписан" -#: ../calculate-core/pym/core/server/create_cert.py:162 +#: ../calculate-core/pym/core/server/create_cert.py:163 msgid "Request file {} not found" msgstr "Файл запроса {} не найден" -#: ../calculate-core/pym/core/server/cert_cmd.py:885 +#: ../calculate-core/pym/core/server/cert_cmd.py:889 msgid "Request for signature not found!" msgstr "Запрос на подпись не найден!" @@ -1486,17 +1486,17 @@ msgstr "Запрос на подпись не найден!" msgid "Request identifier" msgstr "Идентификатор запроса" -#: ../calculate-core/pym/core/variables/request.py:271 +#: ../calculate-core/pym/core/variables/request.py:270 msgid "Request location" msgstr "Расположение" +#: ../calculate-core/pym/core/server/cert_cmd.py:995 #: ../calculate-core/pym/core/server/request.py:126 -#: ../calculate-core/pym/core/server/cert_cmd.py:991 #, python-format msgid "Request or certificate with ID = %s not found!" msgstr "Запрос или сертификат с идентификатором = %s не найден!" -#: ../calculate-core/pym/core/variables/request.py:251 +#: ../calculate-core/pym/core/variables/request.py:250 msgid "Request owner username" msgstr "Имя владельца запроса" @@ -1504,15 +1504,15 @@ msgstr "Имя владельца запроса" msgid "Request signed" msgstr "Запрос подписан" -#: ../calculate-core/pym/core/wsdl_core.py:706 +#: ../calculate-core/pym/core/wsdl_core.py:707 msgid "Restart calculate-core" msgstr "Перезапуск calculate-core" -#: ../calculate-core/pym/core/server/baseClass.py:168 +#: ../calculate-core/pym/core/server/baseClass.py:190 msgid "Restart watchdog failed" msgstr "Не удалось запустить отслеживание перезагрузки" -#: ../calculate-core/pym/core/server/baseClass.py:167 +#: ../calculate-core/pym/core/server/baseClass.py:189 msgid "Restart watchdog started" msgstr "Отслеживание перезагрузки запущено" @@ -1524,19 +1524,19 @@ msgstr "Перезапуск calculate-core" msgid "Restoration from backup manually interrupted" msgstr "Восстановление из резервной копии прервано пользователем" -#: ../calculate-core/pym/core/wsdl_core.py:767 +#: ../calculate-core/pym/core/wsdl_core.py:768 msgid "Restore" msgstr "Восстановление" -#: ../calculate-core/pym/core/backup.py:695 +#: ../calculate-core/pym/core/backup.py:694 msgid "Restored groups:" msgstr "Восстановлены группы:" -#: ../calculate-core/pym/core/backup.py:714 +#: ../calculate-core/pym/core/backup.py:713 msgid "Restored user passwords:" msgstr "Восстановлены пароли пользователей:" -#: ../calculate-core/pym/core/backup.py:678 +#: ../calculate-core/pym/core/backup.py:677 msgid "Restored users:" msgstr "Восстановлены пользователи:" @@ -1556,25 +1556,25 @@ msgstr "Восстановление сервисов" msgid "Restoring user accounts" msgstr "Восстановление учётных записей" -#: ../calculate-core/pym/core/client/cert_verify.py:88 +#: ../calculate-core/pym/core/client/cert_verify.py:90 msgid "Revoke date" msgstr "Дата отзыва" -#: ../calculate-core/pym/core/server/cert_cmd.py:754 +#: ../calculate-core/pym/core/server/cert_cmd.py:758 msgid "Root certificate or private key not found" msgstr "Корневой сертификат или секретный ключ не найден" -#: ../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:99 +#: ../calculate-core/pym/core/wsdl_core.py:140 +#: ../calculate-core/pym/core/wsdl_core.py:659 +#: ../calculate-core/pym/core/wsdl_core.py:697 +#: ../calculate-core/pym/core/wsdl_core.py:758 #: ../calculate-core/pym/core/wsdl_core.py:792 +#: ../calculate-core/pym/core/wsdl_core.py:793 msgid "Run" msgstr "Выполнить" -#: ../calculate-core/pym/core/server/local_call.py:375 +#: ../calculate-core/pym/core/server/local_call.py:379 msgid "Run process?" msgstr "Запустить процесс?" @@ -1582,79 +1582,79 @@ msgstr "Запустить процесс?" msgid "Running stopped services" msgstr "Запуск остановленных сервисов" -#: ../calculate-core/pym/core/client/sid_func.py:62 +#: ../calculate-core/pym/core/client/sid_func.py:64 msgid "SID deleted!" msgstr "Сессия закрыта!" -#: ../calculate-core/pym/core/client/client_class.py:317 -#: ../calculate-core/pym/core/client/client_class.py:357 -#: ../calculate-core/pym/core/server/client_class.py:133 -#: ../calculate-core/pym/core/server/client_class.py:189 +#: ../calculate-core/pym/core/client/client_class.py:319 +#: ../calculate-core/pym/core/client/client_class.py:359 +#: ../calculate-core/pym/core/server/client_class.py:135 +#: ../calculate-core/pym/core/server/client_class.py:191 msgid "SSL library is not support TLSv1_2" msgstr "SSL библиотека не поддерживает TLSv1_2" -#: ../calculate-core/pym/core/wsdl_core.py:586 +#: ../calculate-core/pym/core/wsdl_core.py:587 msgid "Save" msgstr "Сохранить" -#: ../calculate-core/pym/core/client/cert_func.py:89 +#: ../calculate-core/pym/core/client/cert_func.py:91 msgid "Send a new request? y/[n]: " msgstr "Отправить новый запрос? y/[n]: " -#: ../calculate-core/pym/core/client/cert_verify.py:87 +#: ../calculate-core/pym/core/client/cert_verify.py:89 msgid "Serial" 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:528 -#: ../calculate-core/pym/core/server/cert_cmd.py:817 +#: ../calculate-core/pym/core/client/client_class.py:210 +#: ../calculate-core/pym/core/client/client_class.py:235 +#: ../calculate-core/pym/core/server/cert_cmd.py:532 +#: ../calculate-core/pym/core/server/cert_cmd.py:821 +#: ../calculate-core/pym/core/server/client_class.py:88 msgid "Serial number = " msgstr "Серийный номер = " -#: ../calculate-core/pym/core/server/cl_server.py:342 +#: ../calculate-core/pym/core/server/cl_server.py:362 msgid "Server certificate not found" msgstr "Сертификат сервера не найден" -#: ../calculate-core/pym/core/server/bootstrap.py:111 +#: ../calculate-core/pym/core/server/bootstrap.py:113 msgid "Server certificate now exists." msgstr "Сертификат сервера создан." -#: ../calculate-core/pym/core/server/cl_server.py:312 +#: ../calculate-core/pym/core/server/cl_server.py:332 msgid "Server started" msgstr "Сервер запущен" -#: ../calculate-core/pym/core/server/cl_server.py:328 +#: ../calculate-core/pym/core/server/cl_server.py:348 msgid "Server stopped" msgstr "Сервер остановлен" -#: ../calculate-core/pym/core/client/sid_func.py:85 +#: ../calculate-core/pym/core/client/sid_func.py:87 msgid "Session active" msgstr "Сессия активна" -#: ../calculate-core/pym/core/client/sid_func.py:87 +#: ../calculate-core/pym/core/client/sid_func.py:89 msgid "Session inactive" msgstr "Сессия неактивна" -#: ../calculate-core/pym/core/server/baseClass.py:166 +#: ../calculate-core/pym/core/server/baseClass.py:188 msgid "Session monitoring failed" msgstr "Ошибка мониторинга сессий" -#: ../calculate-core/pym/core/server/baseClass.py:165 +#: ../calculate-core/pym/core/server/baseClass.py:187 msgid "Session monitoring started" msgstr "Запущен мониторинг сессий" -#: ../calculate-core/pym/core/client/sid_func.py:73 +#: ../calculate-core/pym/core/client/sid_func.py:75 msgid "Session not registered on the server!" msgstr "Эта сессия не зарегистрирована на сервере!" -#: ../calculate-core/pym/core/client/sid_func.py:83 +#: ../calculate-core/pym/core/client/sid_func.py:85 #, python-format msgid "Session number: %s" msgstr "Номер сессии: %s" -#: ../calculate-core/pym/core/client/pid_information.py:142 +#: ../calculate-core/pym/core/client/pid_information.py:144 msgid "Sessions running:" msgstr "Запущенные сессии:" @@ -1662,47 +1662,47 @@ msgstr "Запущенные сессии:" msgid "Set the certificate group" msgstr "Выберите группу сертификата" -#: ../calculate-core/pym/core/backup.py:131 +#: ../calculate-core/pym/core/backup.py:132 #, python-format msgid "Settings ignored for following packages: %s" msgstr "Пропущены настройки следующих пакетов: %s" -#: ../calculate-core/pym/core/wsdl_core.py:563 +#: ../calculate-core/pym/core/wsdl_core.py:564 msgid "Setup Variables" msgstr "Настройка переменных" -#: ../calculate-core/pym/core/wsdl_core.py:584 -#: ../calculate-core/pym/core/wsdl_core.py:616 +#: ../calculate-core/pym/core/wsdl_core.py:585 +#: ../calculate-core/pym/core/wsdl_core.py:617 msgid "Setup variables" msgstr "Настройка переменных" -#: ../calculate-core/pym/core/wsdl_core.py:620 +#: ../calculate-core/pym/core/wsdl_core.py:621 msgid "Show" msgstr "Показать " -#: ../calculate-core/pym/core/wsdl_core.py:179 +#: ../calculate-core/pym/core/wsdl_core.py:180 msgid "Show Certificates" msgstr "Просмотр сертификатов" -#: ../calculate-core/pym/core/wsdl_core.py:246 +#: ../calculate-core/pym/core/wsdl_core.py:247 msgid "Show Groups" msgstr "Просмотр групп" -#: ../calculate-core/pym/core/wsdl_core.py:423 +#: ../calculate-core/pym/core/wsdl_core.py:424 msgid "Show Requests" msgstr "Просмотр запросов" -#: ../calculate-core/pym/core/wsdl_core.py:445 +#: ../calculate-core/pym/core/wsdl_core.py:446 msgid "Show requests" msgstr "Просмотр запросов" -#: ../calculate-core/pym/core/variables/variable.py:293 +#: ../calculate-core/pym/core/variables/variable.py:287 msgid "Show the value" msgstr "Показать значение" +#: ../calculate-core/pym/core/server/cert_cmd.py:699 +#: ../calculate-core/pym/core/server/cert_cmd.py:771 #: ../calculate-core/pym/core/server/request.py:87 -#: ../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 не найден" @@ -1715,51 +1715,51 @@ msgstr "Запрос на подпись сертификата удалён" msgid "Signing manually interrupted" msgstr "Процесс подписывания прерван пользователем" -#: ../calculate-core/pym/core/server/cert_cmd.py:1133 +#: ../calculate-core/pym/core/server/cert_cmd.py:1137 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:534 -#: ../calculate-core/pym/core/server/cert_cmd.py:823 -#: ../calculate-core/pym/core/server/cert_cmd.py:863 +#: ../calculate-core/pym/core/client/client_class.py:216 +#: ../calculate-core/pym/core/client/client_class.py:241 +#: ../calculate-core/pym/core/server/cert_cmd.py:538 +#: ../calculate-core/pym/core/server/cert_cmd.py:827 +#: ../calculate-core/pym/core/server/cert_cmd.py:867 +#: ../calculate-core/pym/core/server/client_class.py:94 msgid "Subject" msgstr "Субъект" -#: ../calculate-core/pym/core/server/func.py:1532 +#: ../calculate-core/pym/core/server/func.py:1561 #, python-format msgid "Symlink %s created" msgstr "Создана ссылка %s" -#: ../calculate-core/pym/core/server/func.py:1540 +#: ../calculate-core/pym/core/server/func.py:1569 #, python-format msgid "Symlink %s deleted" msgstr "Удалена ссылка %s" -#: ../calculate-core/pym/core/variables/variable.py:276 +#: ../calculate-core/pym/core/variables/variable.py:270 msgid "System" msgstr "Системные" -#: ../calculate-core/pym/core/wsdl_core.py:755 +#: ../calculate-core/pym/core/wsdl_core.py:756 msgid "System backup" msgstr "Резервная копия системы" -#: ../calculate-core/pym/core/setup_package.py:286 -#: ../calculate-core/pym/core/setup_package.py:407 +#: ../calculate-core/pym/core/setup_package.py:282 +#: ../calculate-core/pym/core/setup_package.py:403 #, python-brace-format msgid "System configuring for {nameProgram} package by Calculate Utilities" msgstr "Конфигурация утилитами Calculate системных настроек {nameProgram}" -#: ../calculate-core/pym/core/wsdl_core.py:788 -#: ../calculate-core/pym/core/wsdl_core.py:793 +#: ../calculate-core/pym/core/wsdl_core.py:789 +#: ../calculate-core/pym/core/wsdl_core.py:794 msgid "System restore" msgstr "Восстановление системы" -#: ../calculate-core/pym/core/server/func.py:778 +#: ../calculate-core/pym/core/server/func.py:777 #: ../calculate-core/pym/core/server/func.py:840 -#: ../calculate-core/pym/core/core_main.py:60 +#: ../calculate-core/pym/core/core_main.py:64 msgid "Task interrupted" msgstr "Задача прервана" @@ -1767,20 +1767,20 @@ msgstr "Задача прервана" msgid "Templates preparing for backup" msgstr "Подготовка резервной копии шаблонами" -#: ../calculate-core/pym/core/client/cert_verify.py:61 -#: ../calculate-core/pym/core/client/cert_verify.py:67 +#: ../calculate-core/pym/core/client/cert_verify.py:63 +#: ../calculate-core/pym/core/client/cert_verify.py:69 msgid "The CN and L fields in the CA certificate are incorrect!" msgstr "Поля CN и L в сертификате центра авторизации некорректны!" -#: ../calculate-core/pym/core/server/cert_cmd.py:982 +#: ../calculate-core/pym/core/server/cert_cmd.py:986 msgid "The ID must be int." msgstr "идентификатор должен быть целочисленным." -#: ../calculate-core/pym/core/server/cert_cmd.py:1060 +#: ../calculate-core/pym/core/server/cert_cmd.py:1064 msgid "The ID of a certificate to be revoked must be integer!" msgstr "Номер отзываемого сертификата должен быть целочисленным!" -#: ../calculate-core/pym/core/result_viewer.py:292 +#: ../calculate-core/pym/core/result_viewer.py:291 msgid "The answer is uncertain" msgstr "Ответ не понятен" @@ -1788,17 +1788,17 @@ msgstr "Ответ не понятен" msgid "The certificate ID must be int" msgstr "Номер сертификата должен быть целочисленным" -#: ../calculate-core/pym/core/server/bootstrap.py:72 +#: ../calculate-core/pym/core/server/bootstrap.py:74 msgid "The certificate does not match the private key" msgstr "Сертификат не соответствует секретному ключу" -#: ../calculate-core/pym/core/client/cert_func.py:54 +#: ../calculate-core/pym/core/client/cert_func.py:56 #, python-format msgid "The certificate expires after %d days" msgstr "Срок годности истекает через %d дней" -#: ../calculate-core/pym/core/server/cert_cmd.py:690 -#: ../calculate-core/pym/core/server/cert_cmd.py:762 +#: ../calculate-core/pym/core/server/cert_cmd.py:694 +#: ../calculate-core/pym/core/server/cert_cmd.py:766 msgid "The certificate number must be int" msgstr "Номер сертификата должен быть целочисленным" @@ -1807,7 +1807,7 @@ msgstr "Номер сертификата должен быть целочисл msgid "The certificate with ID %s not exists" msgstr "Сертификата с номером %s не существует" -#: ../calculate-core/pym/core/client/cert_func.py:294 +#: ../calculate-core/pym/core/client/cert_func.py:296 #, python-format msgid "The certificate with ID = %d can execute:" msgstr "Сертификат с номером = %d может запускать:" @@ -1824,8 +1824,8 @@ msgstr "Имя группы должно состоять из 2 - 20 симво msgid "The limit number must be int" msgstr "Предел должен быть целочисленным" -#: ../calculate-core/pym/core/client/cert_func.py:97 -#: ../calculate-core/pym/core/client/cert_func.py:150 +#: ../calculate-core/pym/core/client/cert_func.py:99 +#: ../calculate-core/pym/core/client/cert_func.py:152 msgid "The port number must be int" msgstr "Номер порта должен быть целочисленным" @@ -1837,76 +1837,76 @@ msgstr "ID запроса - обязательный параметр" msgid "The request ID must be int" msgstr "Идентификатор запроса должен быть целочисленным" -#: ../calculate-core/pym/core/client/cert_func.py:189 -#: ../calculate-core/pym/core/server/bootstrap.py:346 -#: ../calculate-core/pym/core/server/cert_cmd.py:247 +#: ../calculate-core/pym/core/client/cert_func.py:191 +#: ../calculate-core/pym/core/server/bootstrap.py:348 +#: ../calculate-core/pym/core/server/cert_cmd.py:251 msgid "The request was sent from another IP." msgstr "Запрос был послан с другого IP." -#: ../calculate-core/pym/core/client/cert_func.py:186 -#: ../calculate-core/pym/core/server/bootstrap.py:343 -#: ../calculate-core/pym/core/server/cert_cmd.py:244 +#: ../calculate-core/pym/core/client/cert_func.py:188 +#: ../calculate-core/pym/core/server/bootstrap.py:345 +#: ../calculate-core/pym/core/server/cert_cmd.py:248 msgid "The signature request does not match earlier data." msgstr "Запрос на подпись сертификата не соответствует отправленному ранее." -#: ../calculate-core/pym/core/client/cert_func.py:182 -#: ../calculate-core/pym/core/server/bootstrap.py:339 -#: ../calculate-core/pym/core/server/cert_cmd.py:240 +#: ../calculate-core/pym/core/client/cert_func.py:184 +#: ../calculate-core/pym/core/server/bootstrap.py:341 +#: ../calculate-core/pym/core/server/cert_cmd.py:244 msgid "The signature request has not been examined yet." msgstr "Запрос на подписание до сих пор не рассмотрены." -#: ../calculate-core/pym/core/client/cert_func.py:179 -#: ../calculate-core/pym/core/server/bootstrap.py:336 -#: ../calculate-core/pym/core/server/cert_cmd.py:237 +#: ../calculate-core/pym/core/client/cert_func.py:181 +#: ../calculate-core/pym/core/server/bootstrap.py:338 +#: ../calculate-core/pym/core/server/cert_cmd.py:241 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 +#: ../calculate-core/pym/core/utils/cl_core_setup.py:35 msgid "The system is being configured" msgstr "Конфигурирование системы" -#: ../calculate-core/pym/core/client/cert_verify.py:72 +#: ../calculate-core/pym/core/client/cert_verify.py:74 msgid "This certificate cannot be verified in the CRL." msgstr "Этот сертификат не может быть проверен в списке отзыва (CRL)." -#: ../calculate-core/pym/core/client/cert_verify.py:86 +#: ../calculate-core/pym/core/client/cert_verify.py:88 msgid "This certificate has been revoked!" msgstr "Сертификат отозван!" -#: ../calculate-core/pym/core/client/cert_func.py:127 -#: ../calculate-core/pym/core/server/cert_cmd.py:201 +#: ../calculate-core/pym/core/client/cert_func.py:129 +#: ../calculate-core/pym/core/server/cert_cmd.py:204 msgid "This server is not enabled to sign certificates!" msgstr "Данный сервер не может подписывать сертификаты!" -#: ../calculate-core/pym/core/server/cert_cmd.py:646 +#: ../calculate-core/pym/core/server/cert_cmd.py:650 #, python-format msgid "Total: %d certificates." msgstr "Всего %d сертификатов." -#: ../calculate-core/pym/core/client/client_class.py:244 +#: ../calculate-core/pym/core/client/client_class.py:246 msgid "Try to add the CA and root certificates to trusted (c) or" msgstr "Попробовать добавить корневой и сертификат центра авторизации для доверенных (с) или" -#: ../calculate-core/pym/core/variables/variable.py:158 +#: ../calculate-core/pym/core/variables/variable.py:156 msgid "Type" msgstr "Тип" -#: ../calculate-core/pym/core/server/func.py:1561 -#: ../calculate-core/pym/core/backup.py:617 +#: ../calculate-core/pym/core/server/func.py:1590 +#: ../calculate-core/pym/core/backup.py:616 #, python-format msgid "Unable to import %s" msgstr "Невозможно импортировать %s" -#: ../calculate-core/pym/core/variables/backup.py:116 +#: ../calculate-core/pym/core/variables/backup.py:117 msgid "Unknown" msgstr "Неизвестно" -#: ../calculate-core/pym/core/server/local_call.py:325 +#: ../calculate-core/pym/core/server/local_call.py:329 msgid "Unknown argument" msgstr "Неизвестный аргумент" -#: ../calculate-core/pym/core/server/local_call.py:322 +#: ../calculate-core/pym/core/server/local_call.py:326 msgid "Unknown parameter" msgstr "Неизвестный параметр" @@ -1918,16 +1918,16 @@ msgstr "Распаковка резервной копии" msgid "Unpacking configuration files" msgstr "Распаковка конфигурационных файлов" -#: ../calculate-core/pym/core/client/client_class.py:229 -#: ../calculate-core/pym/core/server/client_class.py:80 +#: ../calculate-core/pym/core/client/client_class.py:231 +#: ../calculate-core/pym/core/server/client_class.py:82 msgid "Untrusted server certificate!" msgstr "Ненадёжный сертификат сервера!" -#: ../calculate-core/pym/core/wsdl_core.py:147 +#: ../calculate-core/pym/core/wsdl_core.py:148 msgid "Update " msgstr "Обновление " -#: ../calculate-core/pym/core/wsdl_core.py:149 +#: ../calculate-core/pym/core/wsdl_core.py:150 msgid "Update Settings" msgstr "Обновление настроек" @@ -1935,43 +1935,43 @@ msgstr "Обновление настроек" msgid "Updating configuration files" msgstr "Обновление конфигурационых файлов" -#: ../calculate-core/pym/core/setup_package.py:235 -#: ../calculate-core/pym/core/setup_package.py:365 +#: ../calculate-core/pym/core/setup_package.py:231 +#: ../calculate-core/pym/core/setup_package.py:361 msgid "Updating system cofiguration files" msgstr "Обновление системных конфигурационных файлов" -#: ../calculate-core/pym/core/setup_package.py:175 +#: ../calculate-core/pym/core/setup_package.py:171 msgid "Updating user configuration files" msgstr "Обновление пользовательских конфигурационных файлов" -#: ../calculate-core/pym/core/server/func.py:124 +#: ../calculate-core/pym/core/server/func.py:122 msgid "Use new" msgstr "Использовать новый" -#: ../calculate-core/pym/core/server/methods_func.py:773 +#: ../calculate-core/pym/core/server/methods_func.py:779 msgid "Use the parameter" msgstr "Используйте параметр" -#: ../calculate-core/pym/core/server/cl_server.py:160 -#: ../calculate-core/pym/core/variables/setup_package.py:380 +#: ../calculate-core/pym/core/server/cl_server.py:171 +#: ../calculate-core/pym/core/variables/setup_package.py:384 #, python-format msgid "User %s does not exist" msgstr "Пользователь %s не существует" -#: ../calculate-core/pym/core/setup_package.py:206 +#: ../calculate-core/pym/core/setup_package.py:202 #, python-brace-format msgid "User configuring the {nameProgram} package by Calculate Utilities" msgstr "Конфигурация Calculate утилитами пользовательских настроек {nameProgram}" -#: ../calculate-core/pym/core/server/cl_server.py:29 +#: ../calculate-core/pym/core/server/cl_server.py:39 msgid "User must be root" msgstr "Пользователь должен быть root" -#: ../calculate-core/pym/core/server/bootstrap.py:137 +#: ../calculate-core/pym/core/server/bootstrap.py:139 msgid "User profile is encrypted. Please perform user login for complete of certificate generation" msgstr "Профиль пользователя зашифрован. Пожалуйста, выполните вход пользователем в сеанс для завершения создания сертификата" -#: ../calculate-core/pym/core/variables/variable.py:274 +#: ../calculate-core/pym/core/variables/variable.py:268 msgid "User set" msgstr "Изменены" @@ -1979,60 +1979,60 @@ msgstr "Изменены" msgid "UserName" msgstr "Имя пользователя" -#: ../calculate-core/pym/core/client/create_cert.py:76 +#: ../calculate-core/pym/core/client/create_cert.py:75 #, python-format msgid "Username [%s]: " msgstr "Имя пользователя [%s]: " -#: ../calculate-core/pym/core/setup_package.py:311 +#: ../calculate-core/pym/core/setup_package.py:307 #, python-brace-format msgid "Using patches for the {nameProgram} package by Calculate Utilities" msgstr "Применение патчей Calculate утилитами для {nameProgram}" -#: ../calculate-core/pym/core/server/cert_cmd.py:150 +#: ../calculate-core/pym/core/server/cert_cmd.py:152 msgid "Using the root certificate as the server certificate" msgstr "Использование корневого сертификата в качестве серверного сертификата" -#: ../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 +#: ../calculate-core/pym/core/wsdl_core.py:178 +#: ../calculate-core/pym/core/wsdl_core.py:245 +#: ../calculate-core/pym/core/wsdl_core.py:422 +#: ../calculate-core/pym/core/wsdl_core.py:562 +#: ../calculate-core/pym/core/wsdl_core.py:595 +#: ../calculate-core/pym/core/wsdl_core.py:667 +#: ../calculate-core/pym/core/wsdl_core.py:705 msgid "Utilities" msgstr "Утилиты" -#: ../calculate-core/pym/core/variables/variable.py:194 -#: ../calculate-core/pym/core/set_vars.py:42 -#: ../calculate-core/pym/core/set_vars.py:108 +#: ../calculate-core/pym/core/variables/variable.py:191 +#: ../calculate-core/pym/core/set_vars.py:40 +#: ../calculate-core/pym/core/set_vars.py:106 msgid "Value" msgstr "Значение" -#: ../calculate-core/pym/core/set_vars.py:42 -#: ../calculate-core/pym/core/set_vars.py:107 +#: ../calculate-core/pym/core/set_vars.py:40 +#: ../calculate-core/pym/core/set_vars.py:105 msgid "Variable" msgstr "Переменная" -#: ../calculate-core/pym/core/variables/variable.py:98 -#: ../calculate-core/pym/core/variables/variable.py:300 +#: ../calculate-core/pym/core/variables/variable.py:99 +#: ../calculate-core/pym/core/variables/variable.py:294 #, python-format msgid "Variable %s not found" msgstr "Переменная %s не найдена" -#: ../calculate-core/pym/core/server/clean.py:96 +#: ../calculate-core/pym/core/server/clean.py:99 msgid "Variable cl_core_monitor_period or cl_core_sid_live not found" msgstr "Не найдены переменные cl_core_monitor_period или cl_core_sid_live" -#: ../calculate-core/pym/core/variables/variable.py:86 +#: ../calculate-core/pym/core/variables/variable.py:87 msgid "Variables" msgstr "Переменные" -#: ../calculate-core/pym/core/variables/backup.py:167 +#: ../calculate-core/pym/core/variables/backup.py:168 msgid "Verbose output" msgstr "Подробный вывод" -#: ../calculate-core/pym/core/wsdl_core.py:596 +#: ../calculate-core/pym/core/wsdl_core.py:597 msgid "View Variables" msgstr "Просмотреть переменные" @@ -2043,56 +2043,56 @@ msgstr "Просмотреть переменные" msgid "Viewing manually interrupted" msgstr "Просмотр прерван пользователем" -#: ../calculate-core/pym/core/client/client_class.py:333 +#: ../calculate-core/pym/core/client/client_class.py:335 #, python-format msgid "WARNING! %s trying to replace the certificate!" msgstr "Внимание! %s пытается подменить сертификат!" -#: ../calculate-core/pym/core/server/client_class.py:157 +#: ../calculate-core/pym/core/server/client_class.py:159 #, python-format msgid "WARNING!!! %s trying to replace the certificate!" msgstr "Предупреждение!!! %s пытается подменить сертификат!" -#: ../calculate-core/pym/core/setup_package.py:343 +#: ../calculate-core/pym/core/setup_package.py:339 msgid "Would you like to terminate these tasks?" msgstr "Вы хотите завершить эти задачи?" -#: ../calculate-core/pym/core/variables/variable.py:275 +#: ../calculate-core/pym/core/variables/variable.py:269 msgid "Writable" msgstr "Перезаписываемые" -#: ../calculate-core/pym/core/server/methods_func.py:624 -#: ../calculate-core/pym/core/server/methods_func.py:646 +#: ../calculate-core/pym/core/server/methods_func.py:633 +#: ../calculate-core/pym/core/server/methods_func.py:654 #, python-format msgid "Wrong %s value syntax" msgstr "Неправильный %s синтаксис у значения" -#: ../calculate-core/pym/core/server/func.py:1720 +#: ../calculate-core/pym/core/server/func.py:1751 msgid "Wrong expert varaiables list" msgstr "Неправильный список экспертных переменных" -#: ../calculate-core/pym/core/server/func.py:450 +#: ../calculate-core/pym/core/server/func.py:451 #, python-format msgid "Wrong method for task %s" msgstr "Неправильный метод для задачи %s" -#: ../calculate-core/pym/core/server/func.py:1718 +#: ../calculate-core/pym/core/server/func.py:1749 msgid "Wrong normal varaiables list" msgstr "Неправильный список обычных переменных" -#: ../calculate-core/pym/core/server/methods_func.py:424 +#: ../calculate-core/pym/core/server/methods_func.py:427 msgid "Wrong option " msgstr "Неправильный параметр " -#: ../calculate-core/pym/core/setup_package.py:172 +#: ../calculate-core/pym/core/setup_package.py:168 msgid "X session users not found" msgstr "Не найден X сессия пользователей" -#: ../calculate-core/pym/core/client/cert_func.py:87 +#: ../calculate-core/pym/core/client/cert_func.py:89 msgid "You already sent a certificate signature request." msgstr "Вы уже отправили запрос на подписание сертификата." -#: ../calculate-core/pym/core/client/pid_information.py:129 +#: ../calculate-core/pym/core/client/pid_information.py:131 msgid "You can execute:" msgstr "Вы можете запускать:" @@ -2101,194 +2101,194 @@ msgstr "Вы можете запускать:" msgid "You cannot change the certificate permissions" msgstr "Вы не можете изменить права сертификата" -#: ../calculate-core/pym/core/client/cert_func.py:270 +#: ../calculate-core/pym/core/client/cert_func.py:272 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:344 +#: ../calculate-core/pym/core/variables/setup_package.py:348 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/bootstrap.py:340 -#: ../calculate-core/pym/core/server/cert_cmd.py:205 -#: ../calculate-core/pym/core/server/cert_cmd.py:241 +#: ../calculate-core/pym/core/client/cert_func.py:134 +#: ../calculate-core/pym/core/client/cert_func.py:185 +#: ../calculate-core/pym/core/server/bootstrap.py:342 +#: ../calculate-core/pym/core/server/cert_cmd.py:208 +#: ../calculate-core/pym/core/server/cert_cmd.py:245 #, python-format msgid "Your request ID = %s" msgstr "Номер Вашего запроса = %s" -#: ../calculate-core/pym/core/server/func.py:123 +#: ../calculate-core/pym/core/server/func.py:121 msgid "Zap new" msgstr "Удалить новый" -#: ../calculate-core/pym/core/server/cert_cmd.py:1177 +#: ../calculate-core/pym/core/server/cert_cmd.py:1181 msgid "add permissions for a certificate (or certificates, comma-separated) (use with option -c [ID])" msgstr "добавить права для сертификата (или списка через ',') (используйте с ключом -c [ID])" -#: ../calculate-core/pym/core/server/client_class.py:97 +#: ../calculate-core/pym/core/server/client_class.py:99 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:585 +#: ../calculate-core/pym/core/server/cert_cmd.py:589 msgid "all methods" msgstr "все методы" -#: ../calculate-core/pym/core/server/local_call.py:544 -#: ../calculate-core/pym/core/server/local_call.py:592 +#: ../calculate-core/pym/core/server/local_call.py:552 +#: ../calculate-core/pym/core/server/local_call.py:600 msgid "auto" msgstr "авто" -#: ../calculate-core/pym/core/server/cert_cmd.py:1151 +#: ../calculate-core/pym/core/server/cert_cmd.py:1155 msgid "bootstrap action" msgstr "начальные загрузки" -#: ../calculate-core/pym/core/server/cert_cmd.py:1214 +#: ../calculate-core/pym/core/server/cert_cmd.py:1218 msgid "call method" msgstr "запуск метода" -#: ../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 +#: ../calculate-core/pym/core/server/cert_cmd.py:273 +#: ../calculate-core/pym/core/server/cert_cmd.py:281 +#: ../calculate-core/pym/core/server/cert_cmd.py:287 +#: ../calculate-core/pym/core/server/cert_cmd.py:319 +#: ../calculate-core/pym/core/server/func.py:1538 #, python-format msgid "cannot create directory %s" msgstr "не удаётся создать директорию %s" -#: ../calculate-core/pym/core/server/cert_cmd.py:924 -#: ../calculate-core/pym/core/server/cert_cmd.py:962 +#: ../calculate-core/pym/core/server/cert_cmd.py:928 +#: ../calculate-core/pym/core/server/cert_cmd.py:966 msgid "certificate (request) number not int and not 'all'" msgstr "номер сертификата (запроса) не целочисленный и не 'all'" -#: ../calculate-core/pym/core/server/cert_cmd.py:1035 +#: ../calculate-core/pym/core/server/cert_cmd.py:1039 msgid "certificate deleted" msgstr "сертификат удалён" -#: ../calculate-core/pym/core/server/cert_cmd.py:658 +#: ../calculate-core/pym/core/server/cert_cmd.py:662 msgid "certificate number not int and not 'all'" msgstr "номер сертификата не целочисленный и не 'all'" -#: ../calculate-core/pym/core/server/cert_cmd.py:1237 +#: ../calculate-core/pym/core/server/cert_cmd.py:1241 msgid "configuration check" msgstr "проверка конфигурации" -#: ../calculate-core/pym/core/variables/setup_package.py:364 +#: ../calculate-core/pym/core/variables/setup_package.py:368 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:172 -#: ../calculate-core/pym/core/server/cert_cmd.py:217 +#: ../calculate-core/pym/core/client/cert_func.py:102 +#: ../calculate-core/pym/core/client/cert_func.py:155 +#: ../calculate-core/pym/core/server/cert_cmd.py:174 +#: ../calculate-core/pym/core/server/cert_cmd.py:220 msgid "connecting..." msgstr "соединение..." -#: ../calculate-core/pym/core/server/cert_cmd.py:1154 +#: ../calculate-core/pym/core/server/cert_cmd.py:1158 msgid "create certificate for local user" msgstr "создать сертификат для локального пользователя" -#: ../calculate-core/pym/core/server/cert_cmd.py:842 -#: ../calculate-core/pym/core/server/cert_cmd.py:882 +#: ../calculate-core/pym/core/server/cert_cmd.py:846 +#: ../calculate-core/pym/core/server/cert_cmd.py:886 msgid "date" msgstr "дата" -#: ../calculate-core/pym/core/server/cert_cmd.py:1169 +#: ../calculate-core/pym/core/server/cert_cmd.py:1173 msgid "debug" msgstr "режим отладки (debug)" -#: ../calculate-core/pym/core/server/cert_cmd.py:1208 +#: ../calculate-core/pym/core/server/cert_cmd.py:1212 msgid "decline client's request for signature" msgstr "отвергнуть клиентский запрос на подпись сертификата" -#: ../calculate-core/pym/core/server/cert_cmd.py:1217 +#: ../calculate-core/pym/core/server/cert_cmd.py:1221 msgid "display all available methods" msgstr "отобразить все доступные методы" -#: ../calculate-core/pym/core/server/cert_cmd.py:1223 +#: ../calculate-core/pym/core/server/cert_cmd.py:1227 msgid "display the GUI progress bar" msgstr "отображать индикатор прогресса GUI" -#: ../calculate-core/pym/core/variables/variable.py:264 +#: ../calculate-core/pym/core/variables/variable.py:258 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:1226 +#: ../calculate-core/pym/core/server/cert_cmd.py:1230 msgid "display warnings at the end" msgstr "отобразить предупреждения в конце" -#: ../calculate-core/pym/core/server/cert_cmd.py:1220 +#: ../calculate-core/pym/core/server/cert_cmd.py:1224 msgid "do not display the progress bar" msgstr "не отображать индикатор прогресса" -#: ../calculate-core/pym/core/server/cert_cmd.py:1166 +#: ../calculate-core/pym/core/server/cert_cmd.py:1170 msgid "dump (use with option -c [ID])" msgstr "дамп (используйте с ключом -c [ID])" -#: ../calculate-core/pym/core/server/cert_cmd.py:139 +#: ../calculate-core/pym/core/server/cert_cmd.py:141 #, python-format msgid "error writing to (reading from) files in directory %s" msgstr "ошибка записи (чтения) файла в директории %s" -#: ../calculate-core/pym/core/server/cl_server.py:302 +#: ../calculate-core/pym/core/server/cl_server.py:322 #, python-format msgid "failed to create PID file %s" msgstr "не удаётся создать PID файл %s" -#: ../calculate-core/pym/core/server/cert_cmd.py:387 +#: ../calculate-core/pym/core/server/cert_cmd.py:391 msgid "failed to delete the certificate!" msgstr "ошибка удаления сертификата!" -#: ../calculate-core/pym/core/server/cert_cmd.py:1037 +#: ../calculate-core/pym/core/server/cert_cmd.py:1041 msgid "failed to delete the file!" msgstr "ошибка удаления файла!" -#: ../calculate-core/pym/core/server/cert_cmd.py:1191 +#: ../calculate-core/pym/core/server/cert_cmd.py:1195 msgid "fetch the signed certificate from the server" msgstr "получить подписанный сертификат с сервера (хост сервера)" -#: ../calculate-core/pym/core/server/cert_cmd.py:506 -#: ../calculate-core/pym/core/server/cert_cmd.py:514 +#: ../calculate-core/pym/core/server/cert_cmd.py:510 +#: ../calculate-core/pym/core/server/cert_cmd.py:518 #, python-format msgid "file %s not found!" msgstr "файл %s не найден!" -#: ../calculate-core/pym/core/client/cert_func.py:258 -#: ../calculate-core/pym/core/client/client_class.py:183 +#: ../calculate-core/pym/core/client/cert_func.py:260 +#: ../calculate-core/pym/core/client/client_class.py:185 msgid "file containing the CA certificate now exists" msgstr "файл с сертификатом Центра авторизации создан" -#: ../calculate-core/pym/core/client/client_class.py:180 +#: ../calculate-core/pym/core/client/client_class.py:182 msgid "filename = " msgstr "имя файла = " -#: ../calculate-core/pym/core/server/cert_cmd.py:1185 +#: ../calculate-core/pym/core/server/cert_cmd.py:1189 msgid "generate a root (or CA) certificate" msgstr "генерировать корневой сертификат (сертификат удостоверяющего центра)" -#: ../calculate-core/pym/core/server/cl_server.py:268 +#: ../calculate-core/pym/core/server/cl_server.py:285 #, python-format msgid "listening to https://0.0.0.0:%d" msgstr "сервер прослушивает https://0.0.0.0:%d" -#: ../calculate-core/pym/core/server/local_call.py:389 +#: ../calculate-core/pym/core/server/local_call.py:393 msgid "method unavailable" msgstr "метод недоступен" -#: ../calculate-core/pym/core/server/local_call.py:544 -#: ../calculate-core/pym/core/server/local_call.py:592 +#: ../calculate-core/pym/core/server/local_call.py:552 +#: ../calculate-core/pym/core/server/local_call.py:600 msgid "no" msgstr "нет" -#: ../calculate-core/pym/core/server/bootstrap.py:186 +#: ../calculate-core/pym/core/server/bootstrap.py:188 msgid "no path to the client certificate" msgstr "не создан путь к сертификату клиента" -#: ../calculate-core/pym/core/server/cert_cmd.py:1140 +#: ../calculate-core/pym/core/server/cert_cmd.py:1144 msgid "operations with certificates (number or \"all\"). Server not running." msgstr "операции с сертификатами (номер или \"all\"). Сервер не запускается." -#: ../calculate-core/pym/core/variables/setup_package.py:261 +#: ../calculate-core/pym/core/variables/setup_package.py:265 msgid "package category name" msgstr "имя категории пакета" @@ -2296,13 +2296,13 @@ msgstr "имя категории пакета" msgid "package name" msgstr "имя пакета" -#: ../calculate-core/pym/core/variables/setup_package.py:157 -#: ../calculate-core/pym/core/variables/setup_package.py:185 +#: ../calculate-core/pym/core/variables/setup_package.py:161 +#: ../calculate-core/pym/core/variables/setup_package.py:189 msgid "package slot" msgstr "слот пакета" -#: ../calculate-core/pym/core/variables/setup_package.py:81 -#: ../calculate-core/pym/core/variables/setup_package.py:127 +#: ../calculate-core/pym/core/variables/setup_package.py:85 +#: ../calculate-core/pym/core/variables/setup_package.py:131 msgid "package version number with the revision" msgstr "версия пакета с ревизией" @@ -2313,48 +2313,48 @@ msgstr "версия пакета с ревизией" msgid "page %d from " msgstr "страница %d из " -#: ../calculate-core/pym/core/server/cert_cmd.py:1243 +#: ../calculate-core/pym/core/server/cert_cmd.py:1247 msgid "path to log files" msgstr "путь к файлам логов" -#: ../calculate-core/pym/core/server/cert_cmd.py:1130 +#: ../calculate-core/pym/core/server/cert_cmd.py:1134 msgid "port number" msgstr "номер порта" -#: ../calculate-core/pym/core/server/cert_cmd.py:1246 +#: ../calculate-core/pym/core/server/cert_cmd.py:1250 msgid "print the version number, then exit" msgstr "вывод версии программы и выход" -#: ../calculate-core/pym/core/server/cert_cmd.py:1204 +#: ../calculate-core/pym/core/server/cert_cmd.py:1208 msgid "refuse to sign the certificate at the server's request" msgstr "отвергнуть серверный запрос на подпись сертификата" -#: ../calculate-core/pym/core/server/cert_cmd.py:1158 +#: ../calculate-core/pym/core/server/cert_cmd.py:1162 msgid "remove all local user certificates" msgstr "удалить все локальные пользовательские сертификаты" -#: ../calculate-core/pym/core/server/cert_cmd.py:1181 +#: ../calculate-core/pym/core/server/cert_cmd.py:1185 msgid "remove permissions for a certificate (use with option -c [ID])" msgstr "удаление прав сертификата (используйте с -c [ID])" -#: ../calculate-core/pym/core/server/cert_cmd.py:1174 +#: ../calculate-core/pym/core/server/cert_cmd.py:1178 msgid "remove the selected certificate (use with option -c [ID])" msgstr "удалить выбранный сертификат (используйте с ключом -c [ID])" -#: ../calculate-core/pym/core/server/cert_cmd.py:995 +#: ../calculate-core/pym/core/server/cert_cmd.py:999 #, python-format msgid "request %s not found!" msgstr "запрос %s не найден!" -#: ../calculate-core/pym/core/variables/request.py:198 +#: ../calculate-core/pym/core/variables/request.py:197 msgid "request IP address" msgstr "IP-адрес запроса" -#: ../calculate-core/pym/core/variables/request.py:214 +#: ../calculate-core/pym/core/variables/request.py:213 msgid "request MAC adress" msgstr "MAC адрес запроса" -#: ../calculate-core/pym/core/variables/request.py:230 +#: ../calculate-core/pym/core/variables/request.py:229 msgid "request date" msgstr "дата запроса" @@ -2362,56 +2362,56 @@ msgstr "дата запроса" msgid "request identifier" msgstr "идентификатор запроса" -#: ../calculate-core/pym/core/variables/request.py:270 +#: ../calculate-core/pym/core/variables/request.py:269 msgid "request location" msgstr "расположение" -#: ../calculate-core/pym/core/client/cert_func.py:138 -#: ../calculate-core/pym/core/server/bootstrap.py:305 -#: ../calculate-core/pym/core/server/cert_cmd.py:211 +#: ../calculate-core/pym/core/client/cert_func.py:140 +#: ../calculate-core/pym/core/server/bootstrap.py:307 +#: ../calculate-core/pym/core/server/cert_cmd.py:214 #, python-format msgid "request not sent or file %s deleted" msgstr "запрос не был отправлен, или удалён файл %s" -#: ../calculate-core/pym/core/variables/request.py:250 +#: ../calculate-core/pym/core/variables/request.py:249 msgid "request owner username" msgstr "имя владельца запроса" -#: ../calculate-core/pym/core/server/cert_cmd.py:839 -#: ../calculate-core/pym/core/server/cert_cmd.py:879 +#: ../calculate-core/pym/core/server/cert_cmd.py:843 +#: ../calculate-core/pym/core/server/cert_cmd.py:883 msgid "request sent from:" msgstr "запрос на подпись отправлен от:" -#: ../calculate-core/pym/core/server/cert_cmd.py:1211 +#: ../calculate-core/pym/core/server/cert_cmd.py:1215 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:146 +#: ../calculate-core/pym/core/server/cert_cmd.py:148 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:305 +#: ../calculate-core/pym/core/variables/setup_package.py:309 msgid "root path for saving the updated configuration files" msgstr "корневой путь для сохранения обновлённых конфигурационных файлов" -#: ../calculate-core/pym/core/server/cert_cmd.py:755 +#: ../calculate-core/pym/core/server/cert_cmd.py:759 #, python-format msgid "see %s" msgstr "смотрите %s" -#: ../calculate-core/pym/core/server/cert_cmd.py:1188 +#: ../calculate-core/pym/core/server/cert_cmd.py:1192 msgid "send a signature request for the root certificate" msgstr "отправить запрос на подписание корневого сертификата" -#: ../calculate-core/pym/core/server/cert_cmd.py:1127 +#: ../calculate-core/pym/core/server/cert_cmd.py:1131 msgid "server started" msgstr "сервер запущен" -#: ../calculate-core/pym/core/variables/setup_package.py:397 +#: ../calculate-core/pym/core/variables/setup_package.py:401 msgid "set machine architecture" msgstr "установить архитектуру компьютера" -#: ../calculate-core/pym/core/variables/request.py:294 +#: ../calculate-core/pym/core/variables/request.py:293 msgid "set the certificate group" msgstr "установить группу сертификатов" @@ -2427,99 +2427,99 @@ msgstr "установите значение предела" msgid "set the page offset value" msgstr "установить смещение для страницы" -#: ../calculate-core/pym/core/variables/variable.py:294 +#: ../calculate-core/pym/core/variables/variable.py:288 msgid "show the variable value" msgstr "показать значение переменной" -#: ../calculate-core/pym/core/server/cert_cmd.py:1123 +#: ../calculate-core/pym/core/server/cert_cmd.py:1127 msgid "show this help message and exit" msgstr "вывод этой справки и выход" -#: ../calculate-core/pym/core/server/cert_cmd.py:1198 +#: ../calculate-core/pym/core/server/cert_cmd.py:1202 msgid "sign the client's request with the server certificate" msgstr "подписать запрос на подписание сертификата клиента сертификатом сервера" -#: ../calculate-core/pym/core/server/cert_cmd.py:1201 +#: ../calculate-core/pym/core/server/cert_cmd.py:1205 msgid "sign the server's request with the root certificate" msgstr "подписать запрос на подписание сертификата сервера корневым сертификатом" -#: ../calculate-core/pym/core/server/cert_cmd.py:1032 +#: ../calculate-core/pym/core/server/cert_cmd.py:1036 msgid "signature request deleted" msgstr "запрос на подпись сертификата удалён" -#: ../calculate-core/pym/core/server/cert_cmd.py:1229 -#: ../calculate-core/pym/core/server/methods_func.py:289 +#: ../calculate-core/pym/core/server/cert_cmd.py:1233 +#: ../calculate-core/pym/core/server/methods_func.py:292 msgid "silent during the process" msgstr "не задавать вопросы во время процесса" -#: ../calculate-core/pym/core/server/cert_cmd.py:1137 +#: ../calculate-core/pym/core/server/cert_cmd.py:1141 msgid "stop the server if there are no active sessions" msgstr "остановить сервер если нет активной сессии" -#: ../calculate-core/pym/core/client/cert_func.py:144 +#: ../calculate-core/pym/core/client/cert_func.py:146 msgid "the URL looks like" msgstr "URL имеет вид" -#: ../calculate-core/pym/core/client/cert_func.py:115 -#: ../calculate-core/pym/core/server/cert_cmd.py:187 +#: ../calculate-core/pym/core/client/cert_func.py:117 +#: ../calculate-core/pym/core/server/cert_cmd.py:190 msgid "the private key and request now exist" msgstr "секретный ключ и запрос созданы" -#: ../calculate-core/pym/core/server/methods_func.py:75 +#: ../calculate-core/pym/core/server/methods_func.py:78 #, python-brace-format msgid "the value may be {0}" msgstr "значение может быть {0}" -#: ../calculate-core/pym/core/server/cert_cmd.py:487 +#: ../calculate-core/pym/core/server/cert_cmd.py:491 msgid "to change permissions, the certificate number must be integer" msgstr "для изменения прав сертификата используйте целочисленное значение" -#: ../calculate-core/pym/core/variables/setup_package.py:349 +#: ../calculate-core/pym/core/variables/setup_package.py:353 msgid "updating desktop (user) configuration files" msgstr "обновление пользовательских конфигурационных файлов" -#: ../calculate-core/pym/core/variables/setup_package.py:324 +#: ../calculate-core/pym/core/variables/setup_package.py:328 msgid "updating system configuration files" msgstr "обновление системных конфигурационных файлов" -#: ../calculate-core/pym/core/server/cl_server.py:343 +#: ../calculate-core/pym/core/server/cl_server.py:363 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:1233 +#: ../calculate-core/pym/core/server/cert_cmd.py:1237 msgid "use passwords from standard input for users accounts" msgstr "использовать пароли для пользовательских учетных записей из стандартного ввода" -#: ../calculate-core/pym/core/server/cert_cmd.py:1194 +#: ../calculate-core/pym/core/server/cert_cmd.py:1198 msgid "use the root certificate as the server certificate" msgstr "использовать корневой сертификат как сертификат сервера" -#: ../calculate-core/pym/core/server/cert_cmd.py:1162 +#: ../calculate-core/pym/core/server/cert_cmd.py:1166 msgid "use with option --bootstrap to remove all certificates, requests and config files on the server" msgstr "используйте с ключом --bootstrap, удаление всех сертификатов, запросов и конфигурационных файлов на сервере" -#: ../calculate-core/pym/core/variables/backup.py:166 +#: ../calculate-core/pym/core/variables/backup.py:167 msgid "verbose output" msgstr "подробный вывод" -#: ../calculate-core/pym/core/server/cert_cmd.py:1144 +#: ../calculate-core/pym/core/server/cert_cmd.py:1148 msgid "view client requests (number or \"all\")" msgstr "просмотр клиентских запросов (номер или \"all\")" -#: ../calculate-core/pym/core/server/cert_cmd.py:1147 +#: ../calculate-core/pym/core/server/cert_cmd.py:1151 msgid "view servers certificates (number or \"all\"). Server not running." msgstr "просмотр серверных сертификатов (номер или \"all\"). Сервер не запускается." -#: ../calculate-core/pym/core/variables/variable.py:87 +#: ../calculate-core/pym/core/variables/variable.py:88 msgid "write to the variable. VAR is the variable name. VALUE is the new variable value. LOCATION is where the env file is located (system,local,remote). Variable will be removed from all env files if only VAR is specified." msgstr "записать переменную. VAR - имя переменной. VALUE - новое значение переменной. LOCATION - местоположение файла (system,local,remote). Если указать только имя переменной, переменная будет удалена из всех файлов." -#: ../calculate-core/pym/core/server/cl_server.py:269 +#: ../calculate-core/pym/core/server/cl_server.py:286 #, python-format msgid "wsdl is located at: https://0.0.0.0:%d/?wsdl" msgstr "wsdl находится на: https://0.0.0.0:%d/?wsdl" -#: ../calculate-core/pym/core/server/local_call.py:544 -#: ../calculate-core/pym/core/server/local_call.py:592 +#: ../calculate-core/pym/core/server/local_call.py:552 +#: ../calculate-core/pym/core/server/local_call.py:600 msgid "yes" msgstr "да" diff --git a/ru/cl_desktop3.po b/ru/cl_desktop3.po index a11b4a9..46e26fe 100644 --- a/ru/cl_desktop3.po +++ b/ru/cl_desktop3.po @@ -70,7 +70,7 @@ msgstr "Не удалось подключить шифрованные данн msgid "Failed to unmount directory %s" msgstr "Не удалось отмонтировать путь %s" -#: ../calculate-desktop/pym/desktop/variables/desktop.py:434 +#: ../calculate-desktop/pym/desktop/variables/desktop.py:440 msgid "Force configuration" msgstr "Настроить принудительно" @@ -82,7 +82,7 @@ msgstr "Завершение сессии прервано пользовате msgid "Mounting encrypted data" msgstr "Подключение шифрованных данных" -#: ../calculate-desktop/pym/desktop/variables/desktop.py:343 +#: ../calculate-desktop/pym/desktop/variables/desktop.py:348 msgid "No X session user found" msgstr "Не найден пользователь в X сессии" @@ -91,7 +91,7 @@ msgstr "Не найден пользователь в X сессии" msgid "Path %s exists" msgstr "Путь %s существует" -#: ../calculate-desktop/pym/desktop/variables/desktop.py:345 +#: ../calculate-desktop/pym/desktop/variables/desktop.py:350 msgid "Please specify the user name" msgstr "Необходимо указать пользователя" @@ -107,19 +107,23 @@ msgstr "Настройка пользовательского профиля" msgid "The home directory contains mount points" msgstr "Пользовательский каталог содержит точки монтирования" -#: ../calculate-desktop/pym/desktop/desktop.py:285 +#: ../calculate-desktop/pym/desktop/desktop.py:318 msgid "Unable to detect the X session" msgstr "Не удалось определить X сессию" +#: ../calculate-desktop/pym/desktop/desktop.py:290 +msgid "Unable to detect user session id" +msgstr "Не удалось определить идентификатор пользовательской сессии" + #: ../calculate-desktop/pym/desktop/utils/cl_desktop.py:39 msgid "Unable to log out" msgstr "Не удалось завершить сеанс пользователя" -#: ../calculate-desktop/pym/desktop/desktop.py:288 +#: ../calculate-desktop/pym/desktop/desktop.py:321 msgid "Unable to send the logout command" msgstr "Не удалось отправить команду завершения сеанса" -#: ../calculate-desktop/pym/desktop/desktop.py:319 +#: ../calculate-desktop/pym/desktop/desktop.py:349 msgid "Unable to wait for completion of the user logout" msgstr "Не удалось дождаться завершения сеанса пользователя" @@ -127,7 +131,7 @@ msgstr "Не удалось дождаться завершения сеанса msgid "Unmouning user resources" msgstr "Отключение пользовательских ресурсов" -#: ../calculate-desktop/pym/desktop/variables/desktop.py:349 +#: ../calculate-desktop/pym/desktop/variables/desktop.py:354 #, python-format msgid "User %s does not exist" msgstr "Пользователь %s не существует" @@ -165,6 +169,6 @@ msgstr "Не найден пароль пользователя" msgid "Waiting for the logout" msgstr "Ожидание завершения сеанса пользователя" -#: ../calculate-desktop/pym/desktop/variables/desktop.py:435 +#: ../calculate-desktop/pym/desktop/variables/desktop.py:441 msgid "force configuration" msgstr "настроить принудительно" diff --git a/ru/cl_install3.po b/ru/cl_install3.po index 8fc1ce4..05ecebd 100644 --- a/ru/cl_install3.po +++ b/ru/cl_install3.po @@ -11,12 +11,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../calculate-install/pym/install/variables/disk.py:2454 +#: ../calculate-install/pym/install/variables/disk.py:2447 #, python-format msgid "%s is not mounted" msgstr "%s не подключен" -#: ../calculate-install/pym/install/distr.py:371 +#: ../calculate-install/pym/install/distr.py:372 #, python-format msgid "'%s' not found" msgstr "Не удалось найти '%s'" @@ -24,9 +24,9 @@ msgstr "Не удалось найти '%s'" msgid "/var/calculate partition" msgstr "Раздел /var/calculate" -#: ../calculate-install/pym/install/migrate_users.py:421 -#: ../calculate-install/pym/install/migrate_users.py:425 -#: ../calculate-install/pym/install/migrate_users.py:436 +#: ../calculate-install/pym/install/migrate_users.py:393 +#: ../calculate-install/pym/install/migrate_users.py:397 +#: ../calculate-install/pym/install/migrate_users.py:407 msgid ": " msgstr ": " @@ -34,19 +34,19 @@ msgstr ": " msgid "ALSA" msgstr "ALSA" -#: ../calculate-install/pym/install/variables/X11.py:55 +#: ../calculate-install/pym/install/variables/X11.py:56 msgid "AMD AMDGPU (amdgpu)" msgstr "AMD AMDGPU (amdgpu)" -#: ../calculate-install/pym/install/variables/X11.py:56 +#: ../calculate-install/pym/install/variables/X11.py:57 msgid "AMD Catalyst (fglrx)" msgstr "AMD Catalyst (fglrx)" -#: ../calculate-install/pym/install/variables/X11.py:54 +#: ../calculate-install/pym/install/variables/X11.py:55 msgid "AMD Radeon (radeon)" msgstr "AMD Radeon (radeon)" -#: ../calculate-install/pym/install/variables/net.py:215 +#: ../calculate-install/pym/install/variables/net.py:214 msgid "Addresses" msgstr "Адреса" @@ -54,19 +54,19 @@ msgstr "Адреса" msgid "Administrator" msgstr "Администратор" -#: ../calculate-install/pym/install/variables/autopartition.py:488 +#: ../calculate-install/pym/install/variables/autopartition.py:499 msgid "Allocate drive space" msgstr "Распределение места на диске" -#: ../calculate-install/pym/install/variables/disk.py:2100 +#: ../calculate-install/pym/install/variables/disk.py:2094 msgid "Architecture of the target system must be x86_64" msgstr "Архитектура устанавливаемой системы должна быть x86_64" -#: ../calculate-install/pym/install/variables/autopartition.py:561 +#: ../calculate-install/pym/install/variables/autopartition.py:572 msgid "Architecture of the target system must be x86_64 for using the UEFI bootloader" msgstr "Для использования UEFI загрузчика архитектура устанавливаемой системы должна быть x86_64" -#: ../calculate-install/pym/install/distr.py:1402 +#: ../calculate-install/pym/install/distr.py:1387 #, python-format msgid "Archive type '%s' is not supported" msgstr "Архив типа '%s' не поддерживается" @@ -78,11 +78,11 @@ msgid "Audio" msgstr "Аудио" #: ../calculate-install/pym/install/variables/audio.py:69 -#: ../calculate-install/pym/install/variables/audio.py:273 +#: ../calculate-install/pym/install/variables/audio.py:271 msgid "Audio configuration unavailable for Flash install" msgstr "Конфигурация аудио не доступна при установке на Flash" -#: ../calculate-install/pym/install/utils/cl_setup.py:123 +#: ../calculate-install/pym/install/utils/cl_setup.py:118 msgid "Audio settings configured!" msgstr "Настройка аудио выполнена!" @@ -90,25 +90,25 @@ msgstr "Настройка аудио выполнена!" msgid "Audio system" msgstr "Звуковая система" -#: ../calculate-install/pym/install/variables/distr.py:411 -#: ../calculate-install/pym/install/variables/X11.py:358 -#: ../calculate-install/pym/install/variables/net.py:405 +#: ../calculate-install/pym/install/variables/X11.py:365 +#: ../calculate-install/pym/install/variables/distr.py:406 +#: ../calculate-install/pym/install/variables/net.py:398 msgid "Auto" msgstr "Автоматически" -#: ../calculate-install/pym/install/variables/X11.py:53 +#: ../calculate-install/pym/install/variables/X11.py:54 msgid "Auto detection" msgstr "Автоопределение системой" -#: ../calculate-install/pym/install/variables/system.py:558 +#: ../calculate-install/pym/install/variables/system.py:571 msgid "Autologin" msgstr "Автовход" -#: ../calculate-install/pym/install/variables/system.py:59 +#: ../calculate-install/pym/install/variables/system.py:60 msgid "Autologin is available for Xorg sessions only" msgstr "Автовход возможен только для Xorg-сессии" -#: ../calculate-install/pym/install/variables/system.py:596 +#: ../calculate-install/pym/install/variables/system.py:609 #, python-format msgid "Autologin is unavailable for user %s" msgstr "Автовход не возможен для пользователя %s" @@ -117,7 +117,7 @@ msgstr "Автовход не возможен для пользователя % msgid "Autopartition options are not available with manual partitioning" msgstr "Параметры авторазметки не доступны при ручной разметке" -#: ../calculate-install/pym/install/variables/disk.py:1474 +#: ../calculate-install/pym/install/variables/disk.py:1454 msgid "Bind mount points should not be formatted" msgstr "Bind-точка монтирования не должна форматироваться" @@ -126,23 +126,23 @@ msgstr "Bind-точка монтирования не должна формат msgid "Boot" msgstr "Загрузка" -#: ../calculate-install/pym/install/variables/system.py:831 +#: ../calculate-install/pym/install/variables/system.py:863 msgid "Boot configuration is not available on a LiveCD" msgstr "Настройка загрузки не доступна на LiveCD" -#: ../calculate-install/pym/install/variables/disk.py:2156 +#: ../calculate-install/pym/install/variables/disk.py:2152 msgid "Boot disk" msgstr "Загрузочный диск" -#: ../calculate-install/pym/install/utils/cl_setup.py:179 +#: ../calculate-install/pym/install/utils/cl_setup.py:174 msgid "Boot parameters configured!" msgstr "Параметры загрузки настроены!" -#: ../calculate-install/pym/install/variables/disk.py:1964 +#: ../calculate-install/pym/install/variables/disk.py:1955 msgid "Bootloader" msgstr "Загрузчик" -#: ../calculate-install/pym/install/variables/net.py:454 +#: ../calculate-install/pym/install/variables/net.py:447 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:311 +#: ../calculate-install/pym/install/variables/X11.py:318 msgid "Composite" msgstr "Композит" @@ -176,7 +176,7 @@ msgstr "Настройка" msgid "Configuration manually interrupted" msgstr "Настройка прервана пользователем" -#: ../calculate-install/pym/install/variables/system.py:843 +#: ../calculate-install/pym/install/variables/system.py:875 msgid "Configure dynamic options only" msgstr "Конфигурировать только динамические параметры" @@ -184,7 +184,6 @@ msgstr "Конфигурировать только динамические п msgid "Configuring Flash install" msgstr "Конфигурирование Flash-установки" -#: ../calculate-install/pym/install/utils/cl_setup.py:62 msgid "Configuring OpenGL" msgstr "Настройка OpenGL" @@ -205,75 +204,75 @@ msgid "Creating a new partition table" msgstr "Создание новой таблицы разделов" #: ../calculate-install/pym/install/variables/net.py:187 -#: ../calculate-install/pym/install/variables/net.py:403 -#: ../calculate-install/pym/install/variables/net.py:514 +#: ../calculate-install/pym/install/variables/net.py:396 +#: ../calculate-install/pym/install/variables/net.py:505 msgid "DHCP" msgstr "DHCP" -#: ../calculate-install/pym/install/variables/disk.py:971 +#: ../calculate-install/pym/install/variables/disk.py:959 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:548 +#: ../calculate-install/pym/install/variables/autopartition.py:559 msgid "Data partition" msgstr "Раздел для данных" #: ../calculate-install/pym/install/variables/kernel.py:92 -#: ../calculate-install/pym/install/variables/system.py:485 +#: ../calculate-install/pym/install/variables/system.py:501 msgid "Default" msgstr "По умолчанию" -#: ../calculate-install/pym/install/variables/audio.py:247 +#: ../calculate-install/pym/install/variables/audio.py:245 msgid "Default audio card" msgstr "Звуковая карта по умолчанию" -#: ../calculate-install/pym/install/variables/autopartition.py:321 +#: ../calculate-install/pym/install/variables/autopartition.py:332 #, python-format msgid "Device %s is already in use by the current system" msgstr "Диск %s уже используется текущей системой" -#: ../calculate-install/pym/install/variables/disk.py:1089 +#: ../calculate-install/pym/install/variables/disk.py:1075 #, python-format msgid "Device '%s' is used more than once" msgstr "Устройство '%s' используется более одного раза" -#: ../calculate-install/pym/install/variables/disk.py:2248 +#: ../calculate-install/pym/install/variables/disk.py:2243 #, python-brace-format msgid "Device {device} has not BIOS Boot partition" msgstr "На устройстве {device} нет BIOS Boot раздела" -#: ../calculate-install/pym/install/variables/autopartition.py:283 +#: ../calculate-install/pym/install/variables/autopartition.py:282 #, python-brace-format msgid "Device {device} is used for {selected}" msgstr "Устройство {device} используется для {selected}" -#: ../calculate-install/pym/install/variables/autopartition.py:212 +#: ../calculate-install/pym/install/variables/autopartition.py:210 msgid "Devices for install" msgstr "Устройства для установки" -#: ../calculate-install/pym/install/variables/autopartition.py:278 +#: ../calculate-install/pym/install/variables/autopartition.py:277 #, python-brace-format msgid "Devices {devices} are used for {selected}" msgstr "Устройства {devices} используются для {selected}" -#: ../calculate-install/pym/install/distr.py:457 +#: ../calculate-install/pym/install/distr.py:455 msgid "Directory already mounted" msgstr "Директория уже смонтирована" -#: ../calculate-install/pym/install/variables/net.py:404 +#: ../calculate-install/pym/install/variables/net.py:397 msgid "Disabled" msgstr "Выключен" -#: ../calculate-install/pym/install/variables/disk.py:2216 +#: ../calculate-install/pym/install/variables/disk.py:2211 #, python-format msgid "Disk '%s' needs a partition table for the boot record" msgstr "Диск '%s' без таблицы разделов не может содержать загрузчик" -#: ../calculate-install/pym/install/variables/disk.py:990 +#: ../calculate-install/pym/install/variables/disk.py:978 msgid "Disk or directory" msgstr "Диск или директория" -#: ../calculate-install/pym/install/variables/autopartition.py:236 +#: ../calculate-install/pym/install/variables/autopartition.py:234 #, python-brace-format msgid "" "Disks {selecteddisk} are part of {agrtype}\n" @@ -286,7 +285,7 @@ msgstr "" msgid "Distribution" msgstr "Выбор дистрибутива" -#: ../calculate-install/pym/install/variables/net.py:890 +#: ../calculate-install/pym/install/variables/net.py:881 msgid "Domain name server" msgstr "Сервер доменных имен" @@ -294,13 +293,13 @@ msgstr "Сервер доменных имен" msgid "Encrypt user profiles" msgstr "Шифровать пользовательские профили" -#: ../calculate-install/pym/install/variables/system.py:168 -#: ../calculate-install/pym/install/variables/system.py:534 +#: ../calculate-install/pym/install/variables/system.py:169 +#: ../calculate-install/pym/install/variables/system.py:548 #, python-format msgid "Enter password for user %s" msgstr "Введите пароль для пользователя %s" -#: ../calculate-install/pym/install/variables/autopartition.py:493 +#: ../calculate-install/pym/install/variables/autopartition.py:504 #, python-format msgid "Erase disk and install %s" msgstr "Очистить диск и установить %s" @@ -309,28 +308,28 @@ msgstr "Очистить диск и установить %s" msgid "Example" msgstr "Пример" -#: ../calculate-install/pym/install/distr.py:730 +#: ../calculate-install/pym/install/distr.py:727 msgid "Failed to clean directory" msgstr "Не удалось очистить директорию" -#: ../calculate-install/pym/install/utils/cl_setup.py:124 +#: ../calculate-install/pym/install/utils/cl_setup.py:119 msgid "Failed to configure the audio parameters!" msgstr "Не удалось выполнить настройку аудио!" -#: ../calculate-install/pym/install/utils/cl_setup.py:180 +#: ../calculate-install/pym/install/utils/cl_setup.py:175 msgid "Failed to configure the boot parameters!" msgstr "Не удалось настроить параметры загрузки!" -#: ../calculate-install/pym/install/utils/cl_setup.py:161 +#: ../calculate-install/pym/install/utils/cl_setup.py:156 msgid "Failed to configure the network settings!" msgstr "Не удалось выполнить настройку сети!" -#: ../calculate-install/pym/install/utils/cl_setup.py:171 +#: ../calculate-install/pym/install/utils/cl_setup.py:166 msgid "Failed to configure the session settings!" msgstr "Не удалось настроить параметры сессии!" -#: ../calculate-install/pym/install/utils/cl_setup.py:113 -#: ../calculate-install/pym/install/utils/cl_setup.py:151 +#: ../calculate-install/pym/install/utils/cl_setup.py:108 +#: ../calculate-install/pym/install/utils/cl_setup.py:146 msgid "Failed to configure the system!" msgstr "Не удалось настроить систему!" @@ -338,13 +337,13 @@ msgstr "Не удалось настроить систему!" msgid "Failed to configure the video settings!" msgstr "Не удалось настроить параметры видео!" -#: ../calculate-install/pym/install/distr.py:278 +#: ../calculate-install/pym/install/distr.py:279 msgid "Failed to convert" msgstr "Не удалось конвертировать" -#: ../calculate-install/pym/install/distr.py:353 -#: ../calculate-install/pym/install/distr.py:360 -#: ../calculate-install/pym/install/distr.py:363 +#: ../calculate-install/pym/install/distr.py:354 +#: ../calculate-install/pym/install/distr.py:361 +#: ../calculate-install/pym/install/distr.py:364 msgid "Failed to copy" msgstr "Не удалось копировать" @@ -352,107 +351,107 @@ msgstr "Не удалось копировать" msgid "Failed to copy files from" msgstr "Не удалось копировать файлы из" -#: ../calculate-install/pym/install/variables/disk.py:2461 +#: ../calculate-install/pym/install/variables/disk.py:2454 msgid "Failed to create data in /run" msgstr "Не удалось создать данные в /run" -#: ../calculate-install/pym/install/distr.py:1594 +#: ../calculate-install/pym/install/distr.py:1579 msgid "Failed to create squash" msgstr "Не удалось создать squash" -#: ../calculate-install/pym/install/distr.py:1614 +#: ../calculate-install/pym/install/distr.py:1599 msgid "Failed to create squashfs" msgstr "Не удалось создать squashfs" -#: ../calculate-install/pym/install/distr.py:1746 -#: ../calculate-install/pym/install/distr.py:1801 +#: ../calculate-install/pym/install/distr.py:1731 +#: ../calculate-install/pym/install/distr.py:1786 msgid "Failed to create the ISO image" msgstr "Не удалось создать ISO-образ" -#: ../calculate-install/pym/install/install.py:464 +#: ../calculate-install/pym/install/install.py:484 msgid "Failed to create the UEFI boot record" msgstr "Не удалось создать загрузочную запись UEFI" -#: ../calculate-install/pym/install/distr.py:1446 -#: ../calculate-install/pym/install/distr.py:1511 +#: ../calculate-install/pym/install/distr.py:1431 +#: ../calculate-install/pym/install/distr.py:1496 msgid "Failed to create the archive" msgstr "Не удалось создать архив" -#: ../calculate-install/pym/install/distr.py:323 -#: ../calculate-install/pym/install/distr.py:326 +#: ../calculate-install/pym/install/distr.py:324 +#: ../calculate-install/pym/install/distr.py:327 msgid "Failed to create the directory" msgstr "Не удалось создать директорию" -#: ../calculate-install/pym/install/migrate_users.py:489 +#: ../calculate-install/pym/install/migrate_users.py:458 msgid "Failed to create the user's home directory" msgstr "Не удалось создать домашнюю директорию пользователя" -#: ../calculate-install/pym/install/install.py:491 +#: ../calculate-install/pym/install/install.py:511 msgid "Failed to determine mbr" msgstr "Не удалось найти mbr (главную загрузочную запись) диска" -#: ../calculate-install/pym/install/install.py:484 +#: ../calculate-install/pym/install/install.py:504 msgid "Failed to determine the boot disk" msgstr "Не удалось определить загрузочный диск" -#: ../calculate-install/pym/install/distr.py:1252 -#: ../calculate-install/pym/install/install.py:106 +#: ../calculate-install/pym/install/distr.py:1236 +#: ../calculate-install/pym/install/install.py:104 #, python-format msgid "Failed to determine the parent device for %s" msgstr "Не удалось определить родительское устройство для %s" -#: ../calculate-install/pym/install/distr.py:1263 -#: ../calculate-install/pym/install/install.py:128 +#: ../calculate-install/pym/install/distr.py:1247 +#: ../calculate-install/pym/install/install.py:126 #, python-format msgid "Failed to determine the partition number for %s" msgstr "Не удалось определить номер раздела для %s" -#: ../calculate-install/pym/install/distr.py:1300 +#: ../calculate-install/pym/install/distr.py:1285 #, python-format msgid "Failed to execute 'mkswap %s': the swap partition is used by the current system" msgstr "Не удалось выполнить 'mkswap %s', раздел подкачки используется текущей системой" -#: ../calculate-install/pym/install/install.py:192 +#: ../calculate-install/pym/install/install.py:212 #, python-format msgid "Failed to find partition %s after changing the activity" msgstr "Не удалось найти раздел %s после смены флага активности" -#: ../calculate-install/pym/install/distr.py:1211 -#: ../calculate-install/pym/install/distr.py:1305 -#: ../calculate-install/pym/install/distr.py:1877 +#: ../calculate-install/pym/install/distr.py:1196 +#: ../calculate-install/pym/install/distr.py:1290 +#: ../calculate-install/pym/install/distr.py:1862 #, python-format msgid "Failed to format %s: this partition is mounted" msgstr "Не удалось форматировать раздел %s, раздел используется как точка монтирования" -#: ../calculate-install/pym/install/distr.py:1222 +#: ../calculate-install/pym/install/distr.py:1206 #, python-format msgid "Failed to format %s: this partition is used as swap" msgstr "Не удалось форматировать раздел %s, раздел используется как диск подкачки" -#: ../calculate-install/pym/install/distr.py:1225 -#: ../calculate-install/pym/install/distr.py:1232 +#: ../calculate-install/pym/install/distr.py:1209 +#: ../calculate-install/pym/install/distr.py:1216 msgid "Failed to format the partition" msgstr "Не удалось форматировать раздел" -#: ../calculate-install/pym/install/distr.py:1309 +#: ../calculate-install/pym/install/distr.py:1294 msgid "Failed to format the swap partition" msgstr "Не удалось отформатировать раздел подкачки" -#: ../calculate-install/pym/install/distr.py:1292 +#: ../calculate-install/pym/install/distr.py:1278 #, python-format msgid "Failed to found partition %s after changing the system ID" msgstr "Не удалось найти раздел %s после смены ID" -#: ../calculate-install/pym/install/install.py:634 +#: ../calculate-install/pym/install/install.py:620 #, python-format msgid "Failed to found partition %s after creating the partition table" msgstr "Не удалось найти раздел %s после создания таблицы разделов" -#: ../calculate-install/pym/install/distr.py:1690 +#: ../calculate-install/pym/install/distr.py:1675 msgid "Failed to get size of the squash image" msgstr "Не удалось получить размер squash образа" -#: ../calculate-install/pym/install/install.py:215 +#: ../calculate-install/pym/install/install.py:235 #, python-format msgid "" "Failed to install syslinux\n" @@ -461,11 +460,11 @@ msgstr "" "Не удалось установить syslinux\n" "%s" -#: ../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 +#: ../calculate-install/pym/install/install.py:247 +#: ../calculate-install/pym/install/install.py:312 +#: ../calculate-install/pym/install/install.py:469 +#: ../calculate-install/pym/install/install.py:494 +#: ../calculate-install/pym/install/install.py:517 msgid "Failed to install the bootloader" msgstr "Не удалось установить загрузчик" @@ -473,61 +472,60 @@ msgstr "Не удалось установить загрузчик" msgid "Failed to install the system!" msgstr "Не удалось установить систему!" -#: ../calculate-install/pym/install/install.py:758 +#: ../calculate-install/pym/install/install.py:744 msgid "Failed to migrate users onto the new system" msgstr "Не удалось перенести пользователей в новую систему" -#: ../calculate-install/pym/install/distr.py:144 +#: ../calculate-install/pym/install/distr.py:145 msgid "Failed to mount" msgstr "Не удалось cмонтировать" -#: ../calculate-install/pym/install/distr.py:456 +#: ../calculate-install/pym/install/distr.py:454 #, python-format msgid "Failed to mount to the directory: %s\n" msgstr "Не удалось смонтировать в директорию: %s\n" -#: ../calculate-install/pym/install/migrate_users.py:421 +#: ../calculate-install/pym/install/migrate_users.py:393 msgid "Failed to read files" msgstr "Не удалось прочитать файлы" -#: ../calculate-install/pym/install/distr.py:1783 +#: ../calculate-install/pym/install/distr.py:1768 msgid "Failed to remove" msgstr "Не удалось удалить" -#: ../calculate-install/pym/install/distr.py:1895 +#: ../calculate-install/pym/install/distr.py:1880 #, python-format msgid "Failed to remove %s" msgstr "Не удалось удалить %s" -#: ../calculate-install/pym/install/distr.py:343 -#: ../calculate-install/pym/install/distr.py:346 +#: ../calculate-install/pym/install/distr.py:344 +#: ../calculate-install/pym/install/distr.py:347 msgid "Failed to remove the directory from" msgstr "Не удалось удалить директорию" -#: ../calculate-install/pym/install/distr.py:1006 msgid "Failed to set btrfs compression for {}" msgstr "Не удалось установить сжатие btrfs для {}" -#: ../calculate-install/pym/install/distr.py:488 +#: ../calculate-install/pym/install/distr.py:485 msgid "Failed to umount" msgstr "Не удалось отмонтировать" -#: ../calculate-install/pym/install/distr.py:606 +#: ../calculate-install/pym/install/distr.py:603 #, python-format msgid "Failed to unserialize %s" msgstr "Не удалось получить %s" -#: ../calculate-install/pym/install/distr.py:596 +#: ../calculate-install/pym/install/distr.py:593 #, python-format msgid "Failed to unserialize type %s" msgstr "Не удалось получить тип %s" -#: ../calculate-install/pym/install/distr.py:811 +#: ../calculate-install/pym/install/distr.py:805 #, python-format msgid "Failed to use attributes (%s) " msgstr "Не удалось использовать атрибуты (%s) " -#: ../calculate-install/pym/install/install.py:207 +#: ../calculate-install/pym/install/install.py:227 #, python-format msgid "" "Failed to write the master boot record\n" @@ -536,37 +534,37 @@ msgstr "" "Не удалось записать главную загрузочную запись\n" "%s" -#: ../calculate-install/pym/install/migrate_users.py:425 -#: ../calculate-install/pym/install/migrate_users.py:436 +#: ../calculate-install/pym/install/migrate_users.py:397 +#: ../calculate-install/pym/install/migrate_users.py:407 msgid "Failed to write to files" msgstr "Не удалось записать в файлы" -#: ../calculate-install/pym/install/distr.py:1374 +#: ../calculate-install/pym/install/distr.py:1359 #, python-format msgid "File '%s' not found" msgstr "Файл '%s' не найден" -#: ../calculate-install/pym/install/variables/disk.py:1301 +#: ../calculate-install/pym/install/variables/disk.py:1277 msgid "Filesystem" msgstr "Файловая система" -#: ../calculate-install/pym/install/variables/disk.py:1471 +#: ../calculate-install/pym/install/variables/disk.py:1451 #, python-format msgid "Filesystem '%s' is not available" msgstr "Файловая система '%s' недоступна" -#: ../calculate-install/pym/install/variables/autopartition.py:466 +#: ../calculate-install/pym/install/variables/autopartition.py:477 msgid "Filesystem for data partition" msgstr "Файловая система для раздела с данными" -#: ../calculate-install/pym/install/variables/autopartition.py:451 +#: ../calculate-install/pym/install/variables/autopartition.py:462 msgid "Filesystem for root partition" msgstr "Файловая система для корневого раздела" -#: ../calculate-install/pym/install/variables/distr.py:401 -#: ../calculate-install/pym/install/variables/distr.py:429 -#: ../calculate-install/pym/install/variables/distr.py:454 -#: ../calculate-install/pym/install/variables/distr.py:468 +#: ../calculate-install/pym/install/variables/distr.py:396 +#: ../calculate-install/pym/install/variables/distr.py:424 +#: ../calculate-install/pym/install/variables/distr.py:449 +#: ../calculate-install/pym/install/variables/distr.py:463 msgid "Filter" msgstr "Фильтр" @@ -578,51 +576,51 @@ msgstr "Установка на Flash" msgid "Flash install" msgstr "Установка на Flash" -#: ../calculate-install/pym/install/distr.py:1950 +#: ../calculate-install/pym/install/distr.py:1935 #, python-format msgid "Flash install does not support %s" msgstr "Установка на Flash не поддерживает %s" -#: ../calculate-install/pym/install/variables/disk.py:1277 +#: ../calculate-install/pym/install/variables/disk.py:1254 msgid "Flash install does not support multipartition mode" msgstr "Установка на несколько разделов не поддерживается для Flash-диска" -#: ../calculate-install/pym/install/variables/disk.py:1280 +#: ../calculate-install/pym/install/variables/disk.py:1257 msgid "Flash install does not support swap disks" msgstr "Установка на Flash-диск не поддерживает диски подкачки" -#: ../calculate-install/pym/install/variables/disk.py:2200 +#: ../calculate-install/pym/install/variables/disk.py:2195 msgid "For Flash install, you need only one disk" msgstr "Для установки на Flash необходим только один диск" -#: ../calculate-install/pym/install/variables/system.py:865 +#: ../calculate-install/pym/install/variables/system.py:897 #, python-format msgid "For PXE install, you need to install package %s" msgstr "Вы должны установить пакет %s для PXE-установки" -#: ../calculate-install/pym/install/variables/autopartition.py:302 +#: ../calculate-install/pym/install/variables/autopartition.py:319 msgid "For autopartition, please select the device" msgstr "Для авторазметки необходимо выбрать диск" -#: ../calculate-install/pym/install/variables/disk.py:1403 +#: ../calculate-install/pym/install/variables/disk.py:1382 msgid "Format" msgstr "Форматировать" -#: ../calculate-install/pym/install/variables/disk.py:2536 +#: ../calculate-install/pym/install/variables/disk.py:2529 msgid "Format the USB Flash" msgstr "Форматировать USB Flash" -#: ../calculate-install/pym/install/install.py:334 #: ../calculate-install/pym/install/utils/cl_install.py:54 +#: ../calculate-install/pym/install/install.py:354 msgid "Formatting the partitions" msgstr "Форматирование разделов" -#: ../calculate-install/pym/install/variables/X11.py:57 +#: ../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 +#: ../calculate-install/pym/install/variables/X11.py:362 +#: ../calculate-install/pym/install/variables/X11.py:387 msgid "Framebuffer resolution" msgstr "Разрешение фреймбуфера" @@ -630,29 +628,29 @@ msgstr "Разрешение фреймбуфера" msgid "Full access" msgstr "Полный доступ" -#: ../calculate-install/pym/install/variables/net.py:620 +#: ../calculate-install/pym/install/variables/net.py:609 msgid "Gateway" msgstr "Шлюз" -#: ../calculate-install/pym/install/variables/net.py:643 +#: ../calculate-install/pym/install/variables/net.py:627 #, python-format msgid "Gateways %s are unreachable" msgstr "Шлюзы %s не доступны" -#: ../calculate-install/pym/install/variables/X11.py:58 +#: ../calculate-install/pym/install/variables/X11.py:59 msgid "Generic VESA (vesa)" msgstr "Generic VESA (vesa)" -#: ../calculate-install/pym/install/variables/net.py:877 -#: ../calculate-install/pym/install/variables/net.py:911 +#: ../calculate-install/pym/install/variables/net.py:868 +#: ../calculate-install/pym/install/variables/net.py:901 msgid "Get via DHCP" msgstr "Получать по DHCP" -#: ../calculate-install/pym/install/variables/system.py:448 +#: ../calculate-install/pym/install/variables/system.py:465 msgid "Groups" msgstr "Группы" -#: ../calculate-install/pym/install/variables/system.py:938 +#: ../calculate-install/pym/install/variables/system.py:970 msgid "Grub configuration unavailable for Flash install" msgstr "Конфигурация загрузки недоступна при установке на Flash" @@ -660,19 +658,19 @@ msgstr "Конфигурация загрузки недоступна при у msgid "Grub password" msgstr "Пароль Grub" -#: ../calculate-install/pym/install/variables/system.py:913 +#: ../calculate-install/pym/install/variables/system.py:945 msgid "Grub terminal" msgstr "Grub терминал" -#: ../calculate-install/pym/install/variables/disk.py:2312 +#: ../calculate-install/pym/install/variables/disk.py:2307 msgid "Hard disk" msgstr "Жёсткий диск" -#: ../calculate-install/pym/install/variables/locale.py:360 +#: ../calculate-install/pym/install/variables/locale.py:355 msgid "Hardware clock type" msgstr "Тип аппаратных часов" -#: ../calculate-install/pym/install/variables/net.py:246 +#: ../calculate-install/pym/install/variables/net.py:245 msgid "Hostname" msgstr "Имя хоста" @@ -684,44 +682,44 @@ msgstr "I/O планировщик" msgid "I/O scheduler unavailable for Flash install" msgstr "I/O планировщик недоступен при установке на Flash" -#: ../calculate-install/pym/install/variables/net.py:363 -#: ../calculate-install/pym/install/variables/net.py:415 +#: ../calculate-install/pym/install/variables/net.py:359 +#: ../calculate-install/pym/install/variables/net.py:408 msgid "IP address" msgstr "IP-адрес" -#: ../calculate-install/pym/install/distr.py:1720 +#: ../calculate-install/pym/install/distr.py:1705 #, python-format msgid "ISO %s contains no live image" msgstr "ISO %s не содержит live-образ" -#: ../calculate-install/pym/install/distr.py:1673 +#: ../calculate-install/pym/install/distr.py:1658 #, python-format msgid "ISO image %s" msgstr "ISO-образ %s" -#: ../calculate-install/pym/install/variables/distr.py:300 +#: ../calculate-install/pym/install/variables/distr.py:297 msgid "ISO image for installation" msgstr "ISO-образ для установки" -#: ../calculate-install/pym/install/variables/disk.py:1572 +#: ../calculate-install/pym/install/variables/disk.py:1551 msgid "Impossible to use UUID for Flash install" msgstr "Использование UUID недоступно при установке на Flash" -#: ../calculate-install/pym/install/variables/disk.py:1216 +#: ../calculate-install/pym/install/variables/disk.py:1194 #, python-format msgid "Incorrect mount point (bind '%(bindSrc)s' to '%(bindDst)s')" msgstr "Неправильная точка монтирования (bind-монтирование '%(bindSrc)s' в '%(bindDst)s')" -#: ../calculate-install/pym/install/variables/X11.py:267 +#: ../calculate-install/pym/install/variables/X11.py:275 #, python-format msgid "Install driver %s with:" msgstr "Установите %s драйвер командой:" -#: ../calculate-install/pym/install/variables/distr.py:619 +#: ../calculate-install/pym/install/variables/distr.py:610 msgid "Install the newer image only" msgstr "Установить только более новый образ" -#: ../calculate-install/pym/install/distr.py:2075 +#: ../calculate-install/pym/install/distr.py:2062 #, python-format msgid "Install with layers does not support %s" msgstr "Установка в несколько слоев не поддерживает %s" @@ -733,11 +731,11 @@ msgstr "Установка в несколько слоев не поддерж msgid "Installation" msgstr "Установка" -#: ../calculate-install/pym/install/variables/disk.py:2475 +#: ../calculate-install/pym/install/variables/disk.py:2468 msgid "Installation disk" msgstr "Диск для установки" -#: ../calculate-install/pym/install/variables/distr.py:299 +#: ../calculate-install/pym/install/variables/distr.py:296 msgid "Installation image" msgstr "Установочный образ" @@ -745,33 +743,33 @@ msgstr "Установочный образ" msgid "Installation manually interrupted" msgstr "Установка прервана пользователем" -#: ../calculate-install/pym/install/variables/system.py:890 +#: ../calculate-install/pym/install/variables/system.py:922 msgid "Installation path" msgstr "Путь для установки" +#: ../calculate-install/pym/install/variables/disk.py:2287 #: ../calculate-install/pym/install/wsdl_install.py:82 -#: ../calculate-install/pym/install/variables/disk.py:2292 msgid "Installation type" msgstr "Тип установки" -#: ../calculate-install/pym/install/utils/cl_setup.py:186 +#: ../calculate-install/pym/install/utils/cl_setup.py:181 msgid "Installing the bootloader" msgstr "Установка загрузчика" -#: ../calculate-install/pym/install/variables/X11.py:59 +#: ../calculate-install/pym/install/variables/X11.py:60 msgid "Intel (intel)" msgstr "Intel (intel)" #: ../calculate-install/pym/install/variables/net.py:156 -#: ../calculate-install/pym/install/variables/net.py:656 +#: ../calculate-install/pym/install/variables/net.py:640 msgid "Interface" msgstr "Интерфейс" -#: ../calculate-install/pym/install/distr.py:1839 +#: ../calculate-install/pym/install/distr.py:1824 msgid "Keyboard interruption" msgstr "Прерывание с клавиатуры" -#: ../calculate-install/pym/install/variables/locale.py:154 +#: ../calculate-install/pym/install/variables/locale.py:150 msgid "Keyboard layout" msgstr "Раскладка клавиатуры" @@ -783,7 +781,7 @@ msgstr "Язык и локаль" msgid "Layout" msgstr "Разметка диска" -#: ../calculate-install/pym/install/variables/disk.py:2265 +#: ../calculate-install/pym/install/variables/disk.py:2260 msgid "Legacy grub requires a separate /boot partition to support boot from a RAID or a LVM" msgstr "Legacy grub не поддерживает загрузки с RAID или LVM без выделенного раздела /boot" @@ -791,9 +789,9 @@ msgstr "Legacy grub не поддерживает загрузки с RAID ил msgid "Letting go the source distribution" msgstr "Отключение устанавливаемого дистрибутива" +#: ../calculate-install/pym/install/variables/locale.py:128 #: ../calculate-install/pym/install/wsdl_install.py:353 #: ../calculate-install/pym/install/wsdl_install.py:366 -#: ../calculate-install/pym/install/variables/locale.py:132 msgid "Locale" msgstr "Локализация" @@ -801,15 +799,15 @@ msgstr "Локализация" msgid "Locale configuration unavailable for Flash install" msgstr "Конфигурация локали недоступна при установке на Flash" -#: ../calculate-install/pym/install/variables/net.py:349 +#: ../calculate-install/pym/install/variables/net.py:346 msgid "MAC" msgstr "MAC" -#: ../calculate-install/pym/install/variables/disk.py:2202 +#: ../calculate-install/pym/install/variables/disk.py:2197 msgid "MBR is not used with the UEFI bootloader" msgstr "MBR не используется вместе с UEFI загрузчиком" -#: ../calculate-install/pym/install/variables/net.py:328 +#: ../calculate-install/pym/install/variables/net.py:325 msgid "Mac type" msgstr "Mac тип" @@ -817,7 +815,7 @@ msgstr "Mac тип" msgid "Manually network configuration" msgstr "Настроить сеть вручную" -#: ../calculate-install/pym/install/variables/net.py:471 +#: ../calculate-install/pym/install/variables/net.py:463 msgid "Mask" msgstr "Маска" @@ -831,17 +829,17 @@ msgstr "Переносить сетевые настройки" msgid "Migrating users" msgstr "Перенос пользователей" -#: ../calculate-install/pym/install/variables/disk.py:1104 +#: ../calculate-install/pym/install/variables/disk.py:1090 msgid "Mount point" msgstr "Точка монтирования" -#: ../calculate-install/pym/install/variables/disk.py:1207 +#: ../calculate-install/pym/install/variables/disk.py:1185 #, python-format msgid "Mount point '%s' is used more than once" msgstr "Точка монтирования '%s' используется более одного раза" -#: ../calculate-install/pym/install/variables/disk.py:879 -#: ../calculate-install/pym/install/variables/disk.py:977 +#: ../calculate-install/pym/install/variables/disk.py:867 +#: ../calculate-install/pym/install/variables/disk.py:965 msgid "Mount points" msgstr "Точки монтирования" @@ -849,19 +847,19 @@ msgstr "Точки монтирования" msgid "NTP server" msgstr "Сервер времени" -#: ../calculate-install/pym/install/variables/net.py:297 +#: ../calculate-install/pym/install/variables/net.py:296 msgid "Name" msgstr "Название" +#: ../calculate-install/pym/install/variables/net.py:92 +#: ../calculate-install/pym/install/variables/net.py:432 +#: ../calculate-install/pym/install/variables/net.py:582 #: ../calculate-install/pym/install/wsdl_install.py:243 #: ../calculate-install/pym/install/wsdl_install.py:258 -#: ../calculate-install/pym/install/variables/net.py:92 -#: ../calculate-install/pym/install/variables/net.py:439 -#: ../calculate-install/pym/install/variables/net.py:592 msgid "Network" msgstr "Сеть" -#: ../calculate-install/pym/install/variables/net.py:609 +#: ../calculate-install/pym/install/variables/net.py:598 #, python-format msgid "Network '%s' is used more than once" msgstr "Сеть '%s' используется более одного раза" @@ -870,17 +868,17 @@ msgstr "Сеть '%s' используется более одного раза" msgid "Network configuration is unavailable for Flash install" msgstr "Конфигурация сети недоступна при установке на Flash" -#: ../calculate-install/pym/install/variables/net.py:226 +#: ../calculate-install/pym/install/variables/net.py:225 #, python-format msgid "Network interface %s not found" msgstr "Сетевой интерфейс %s не найден" -#: ../calculate-install/pym/install/variables/net.py:217 +#: ../calculate-install/pym/install/variables/net.py:216 #, 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:820 +#: ../calculate-install/pym/install/variables/net.py:813 msgid "Network manager" msgstr "Менеджер сети" @@ -892,7 +890,7 @@ msgstr "Если все интерфейсы настроены на DHCP, па msgid "Network settings" msgstr "Сетевые настройки" -#: ../calculate-install/pym/install/utils/cl_setup.py:160 +#: ../calculate-install/pym/install/utils/cl_setup.py:155 msgid "Network settings configured!" msgstr "Настройка сети выполнена!" @@ -900,44 +898,44 @@ msgstr "Настройка сети выполнена!" msgid "Network settings unavailable with use settings migration" msgstr "Настройка сети недоступна при использовании переноса сетевых настроек" -#: ../calculate-install/pym/install/variables/net.py:795 +#: ../calculate-install/pym/install/variables/net.py:790 msgid "NetworkManager" msgstr "NetworkManager" -#: ../calculate-install/pym/install/variables/system.py:583 +#: ../calculate-install/pym/install/variables/system.py:596 msgid "No autologin" msgstr "Без автовхода" -#: ../calculate-install/pym/install/variables/disk.py:1467 +#: ../calculate-install/pym/install/variables/disk.py:1447 #, python-brace-format msgid "No need to format unused device {dev}" msgstr "Нет необходимости форматировать неиспользуемый диск {dev}" -#: ../calculate-install/pym/install/variables/audio.py:266 +#: ../calculate-install/pym/install/variables/audio.py:264 msgid "Not available" msgstr "Не доступно" -#: ../calculate-install/pym/install/variables/disk.py:2576 +#: ../calculate-install/pym/install/variables/disk.py:2569 msgid "Not enough free space on the USB Flash" msgstr "Не достаточно свободного места на USB Flash" +#: ../calculate-install/pym/install/variables/distr.py:405 #: ../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/net.py:879 -#: ../calculate-install/pym/install/variables/net.py:913 -#: ../calculate-install/pym/install/variables/system.py:599 +#: ../calculate-install/pym/install/variables/distr.py:428 +#: ../calculate-install/pym/install/variables/distr.py:439 +#: ../calculate-install/pym/install/variables/distr.py:453 +#: ../calculate-install/pym/install/variables/distr.py:467 +#: ../calculate-install/pym/install/variables/net.py:870 +#: ../calculate-install/pym/install/variables/net.py:903 +#: ../calculate-install/pym/install/variables/system.py:612 msgid "Not used" msgstr "Не используется" -#: ../calculate-install/pym/install/variables/X11.py:61 +#: ../calculate-install/pym/install/variables/X11.py:62 msgid "Nvidia Graphics Driver (nvidia)" msgstr "Nvidia Graphics Driver (nvidia)" -#: ../calculate-install/pym/install/variables/X11.py:60 +#: ../calculate-install/pym/install/variables/X11.py:61 msgid "Nvidia Nouveau (nouveau)" msgstr "Nvidia Nouveau (nouveau)" @@ -945,12 +943,12 @@ msgstr "Nvidia Nouveau (nouveau)" msgid "Off" msgstr "Выкл" -#: ../calculate-install/pym/install/variables/X11.py:260 +#: ../calculate-install/pym/install/variables/X11.py:268 #, python-format msgid "Only %s drivers are available" msgstr "Доступны только драйвера %s" -#: ../calculate-install/pym/install/variables/net.py:796 +#: ../calculate-install/pym/install/variables/net.py:791 msgid "OpenRC" msgstr "OpenRC" @@ -962,79 +960,79 @@ msgstr "Установка PXE" msgid "PXE install" msgstr "Установка PXE" -#: ../calculate-install/pym/install/distr.py:1978 +#: ../calculate-install/pym/install/distr.py:1963 #, python-format msgid "PXE install does not support %s" msgstr "Установка PXE не поддерживается %s" -#: ../calculate-install/pym/install/variables/system.py:859 +#: ../calculate-install/pym/install/variables/system.py:891 msgid "PXE install is available for Calculate Directory Server only" msgstr "Установка PXE доступна только на Calculate Directory Server" -#: ../calculate-install/pym/install/variables/system.py:877 +#: ../calculate-install/pym/install/variables/system.py:909 msgid "PXE install is only available if the DHCP service has been configured first" msgstr "PXE установка доступна только при настроенном DHCP-сервисе" -#: ../calculate-install/pym/install/variables/net.py:936 +#: ../calculate-install/pym/install/variables/net.py:926 msgid "PXE server IP" msgstr "IP адрес PXE сервера" -#: ../calculate-install/pym/install/variables/autopartition.py:644 +#: ../calculate-install/pym/install/variables/autopartition.py:655 msgid "Partition table" msgstr "Таблица разделов" -#: ../calculate-install/pym/install/variables/disk.py:2114 +#: ../calculate-install/pym/install/variables/disk.py:2108 #, python-brace-format msgid "Partition {disk} already used by the current system" msgstr "Раздел {disk} уже используется текущей системой" -#: ../calculate-install/pym/install/variables/disk.py:2128 +#: ../calculate-install/pym/install/variables/disk.py:2124 #, python-brace-format msgid "Partition {disk} already used for installation" msgstr "Раздел {disk} уже используется для установки" -#: ../calculate-install/pym/install/variables/autopartition.py:532 +#: ../calculate-install/pym/install/variables/autopartition.py:543 msgid "Partitions options" msgstr "Параметры разделов" -#: ../calculate-install/pym/install/variables/system.py:495 +#: ../calculate-install/pym/install/variables/system.py:511 msgid "Password" msgstr "Пароль" msgid "Password for user %s missing" msgstr "Пропущен пароль для пользователя %s" -#: ../calculate-install/pym/install/distr.py:1226 +#: ../calculate-install/pym/install/distr.py:1210 msgid "Permission denied" msgstr "Нет доступа" -#: ../calculate-install/pym/install/variables/system.py:174 +#: ../calculate-install/pym/install/variables/system.py:175 msgid "Please enter a root password for Grub" msgstr "Пожалуйста, введите root-пароль для меню Grub" -#: ../calculate-install/pym/install/variables/disk.py:1198 +#: ../calculate-install/pym/install/variables/disk.py:1178 msgid "Please specify EFI partition by UEFI option" msgstr "Пожалуйста, укажите EFI раздел через UEFI параметр" -#: ../calculate-install/pym/install/variables/disk.py:1194 +#: ../calculate-install/pym/install/variables/disk.py:1174 msgid "Please specify EFI partition by UEFI parameter in advanced options" msgstr "Пожалуйста, укажите EFI раздел через UEFI параметр в дополнительных настройках" msgid "Please specify a root password for Grub" msgstr "Пожалуйста, укажите root-пароль для меню Grub" -#: ../calculate-install/pym/install/variables/disk.py:1483 +#: ../calculate-install/pym/install/variables/disk.py:1464 #, python-brace-format msgid "Please unmount disk {device} to use it for install" msgstr "Пожалуйста, отключите диск {device} для использования его в установке" -#: ../calculate-install/pym/install/variables/disk.py:1457 -#: ../calculate-install/pym/install/variables/disk.py:2121 +#: ../calculate-install/pym/install/variables/disk.py:1437 +#: ../calculate-install/pym/install/variables/disk.py:2117 #, python-brace-format msgid "Please unmount {device}, as it will be used for installation" msgstr "Пожалуйста, отключите диск {device} для использования его в установке" -#: ../calculate-install/pym/install/variables/autopartition.py:326 +#: ../calculate-install/pym/install/variables/autopartition.py:337 #, python-brace-format msgid "Please unmount {disks}, as {device} will be used for installation" msgstr "Пожалуйста, отключите {disks}, для использования {device} в установке" @@ -1051,7 +1049,7 @@ msgstr "Подготовим систему для перезагрузки" msgid "PulseAudio" msgstr "PulseAudio" -#: ../calculate-install/pym/install/variables/autopartition.py:296 +#: ../calculate-install/pym/install/variables/autopartition.py:295 #, python-format msgid "RAID %s is wrong" msgstr "Неправильное RAID устройство %s" @@ -1060,7 +1058,7 @@ msgstr "Неправильное RAID устройство %s" msgid "Reconfigure network" msgstr "Перенастроить сеть" -#: ../calculate-install/pym/install/distr.py:614 +#: ../calculate-install/pym/install/distr.py:611 msgid "Recovery is not implemented" msgstr "Восстановление не поддерживается" @@ -1068,15 +1066,15 @@ msgstr "Восстановление не поддерживается" msgid "Remove the password protection on Grub" msgstr "Удалить пароль на меню Grub" -#: ../calculate-install/pym/install/variables/autopartition.py:606 +#: ../calculate-install/pym/install/variables/autopartition.py:617 msgid "Root partition size" msgstr "Размер корневого раздела" -#: ../calculate-install/pym/install/variables/system.py:164 +#: ../calculate-install/pym/install/variables/system.py:165 msgid "Root password" msgstr "Пароль пользователя root" -#: ../calculate-install/pym/install/variables/net.py:537 +#: ../calculate-install/pym/install/variables/net.py:528 msgid "Routing" msgstr "Маршрутизация" @@ -1102,15 +1100,15 @@ msgstr "Сохранить" msgid "Screen resolution" msgstr "Разрешение экрана" -#: ../calculate-install/pym/install/variables/net.py:852 +#: ../calculate-install/pym/install/variables/net.py:844 msgid "Search domains" msgstr "Домены для поиска" -#: ../calculate-install/pym/install/variables/autopartition.py:348 +#: ../calculate-install/pym/install/variables/autopartition.py:359 msgid "Selected devices have not BIOS boot partition" msgstr "На выбранных устройствах нет BIOS boot раздела" -#: ../calculate-install/pym/install/variables/autopartition.py:344 +#: ../calculate-install/pym/install/variables/autopartition.py:355 msgid "Selected devices have not EFI partition" msgstr "На выбранных устройствах нет EFI раздела" @@ -1120,24 +1118,24 @@ msgstr "На выбранных устройствах нет EFI раздела msgid "Session" msgstr "Сессия" -#: ../calculate-install/pym/install/utils/cl_setup.py:170 +#: ../calculate-install/pym/install/utils/cl_setup.py:165 msgid "Session settings configured!" msgstr "Настройка сессии выполнена!" -#: ../calculate-install/pym/install/variables/disk.py:1525 +#: ../calculate-install/pym/install/variables/disk.py:1504 msgid "Size" msgstr "Размер" -#: ../calculate-install/pym/install/variables/net.py:671 +#: ../calculate-install/pym/install/variables/net.py:655 msgid "Source IP" msgstr "Исходный IP" -#: ../calculate-install/pym/install/variables/disk.py:1265 +#: ../calculate-install/pym/install/variables/disk.py:1242 #, python-format msgid "Source directory %(src)s is already used for binding '%(bindSrc)s' to '%(bindDst)s'" msgstr "Директория-источник %(src)s уже используется для bind-монтирования '%(bindSrc)s' в '%(bindDst)s'" -#: ../calculate-install/pym/install/distr.py:334 +#: ../calculate-install/pym/install/distr.py:335 #, python-format msgid "Squash size unsupported for %s" msgstr "Размер squash не поддерживается для %s" @@ -1148,15 +1146,15 @@ msgstr "Размер squash не поддерживается для %s" msgid "Start installing" msgstr "Начать установку" -#: ../calculate-install/pym/install/variables/autopartition.py:546 +#: ../calculate-install/pym/install/variables/autopartition.py:557 msgid "Swap partition" msgstr "Раздел подкачки" -#: ../calculate-install/pym/install/variables/autopartition.py:124 +#: ../calculate-install/pym/install/variables/autopartition.py:122 msgid "Swap partition size" msgstr "Размер раздела подкачки" -#: ../calculate-install/pym/install/variables/autopartition.py:136 +#: ../calculate-install/pym/install/variables/autopartition.py:134 msgid "Swap size should not be less that 1MiB" msgstr "Размер раздела подкачки должен быть не меньше 1MiB" @@ -1168,8 +1166,8 @@ msgstr "Система" msgid "System Install" msgstr "Установка системы" -#: ../calculate-install/pym/install/utils/cl_setup.py:112 -#: ../calculate-install/pym/install/utils/cl_setup.py:150 +#: ../calculate-install/pym/install/utils/cl_setup.py:107 +#: ../calculate-install/pym/install/utils/cl_setup.py:145 msgid "System configured!" msgstr "Система настроена!" @@ -1185,109 +1183,109 @@ msgstr "Система установлена!" msgid "System update" msgstr "Обновление системы" -#: ../calculate-install/pym/install/utils/cl_setup.py:122 +#: ../calculate-install/pym/install/utils/cl_setup.py:117 msgid "The audio settings are being configured" msgstr "Настройка аудио параметров" -#: ../calculate-install/pym/install/variables/system.py:609 +#: ../calculate-install/pym/install/variables/system.py:622 msgid "The autologin is not available with domain workstations" msgstr "Автовход не доступен для доменных рабочих станций" -#: ../calculate-install/pym/install/variables/disk.py:1378 +#: ../calculate-install/pym/install/variables/disk.py:1357 msgid "The bind mount point does not use filesystem" msgstr "Bind-точка монтирования не использует файловую систему" -#: ../calculate-install/pym/install/utils/cl_setup.py:178 +#: ../calculate-install/pym/install/utils/cl_setup.py:173 msgid "The boot parameters are being configured" msgstr "Настройка параметров загрузки" -#: ../calculate-install/pym/install/utils/cl_setup.py:194 +#: ../calculate-install/pym/install/utils/cl_setup.py:189 msgid "The builder mode is no longer supported" msgstr "Режим сборки больше не поддерживается" -#: ../calculate-install/pym/install/variables/disk.py:1388 +#: ../calculate-install/pym/install/variables/disk.py:1367 #, python-format msgid "The filesystem for '%(mp)s' should not be '%(opt)s'" msgstr "'%(opt)s' не может быть файловой системой для '%(mp)s'" -#: ../calculate-install/pym/install/distr.py:804 +#: ../calculate-install/pym/install/distr.py:799 #, python-format msgid "The following attributes are not specified: (%s)" msgstr "Не указаны следующие атрибуты: (%s)" -#: ../calculate-install/pym/install/variables/net.py:261 +#: ../calculate-install/pym/install/variables/net.py:260 #, python-format msgid "The hostname length should be less than %d" msgstr "Длина имени хоста должна быть меньше чем %d" -#: ../calculate-install/pym/install/variables/distr.py:648 +#: ../calculate-install/pym/install/variables/distr.py:639 msgid "The image for update not found" msgstr "Нет образа для обновления" -#: ../calculate-install/pym/install/variables/distr.py:333 +#: ../calculate-install/pym/install/variables/distr.py:330 msgid "The image is not compatible with the current kernel" msgstr "Образ не совместим с текущим ядром" -#: ../calculate-install/pym/install/variables/disk.py:859 -#: ../calculate-install/pym/install/variables/disk.py:2137 -#: ../calculate-install/pym/install/variables/disk.py:2278 +#: ../calculate-install/pym/install/variables/disk.py:847 +#: ../calculate-install/pym/install/variables/disk.py:2133 +#: ../calculate-install/pym/install/variables/disk.py:2273 msgid "The layout is not available with autopartitioning" msgstr "Разметка не доступна при авторазметке" -#: ../calculate-install/pym/install/utils/cl_setup.py:149 +#: ../calculate-install/pym/install/utils/cl_setup.py:144 msgid "The localization and time options are being configured" msgstr "Настройка локализации и времени" -#: ../calculate-install/pym/install/utils/cl_setup.py:159 +#: ../calculate-install/pym/install/utils/cl_setup.py:154 msgid "The network settings are being configured" msgstr "Настройка параметров сети" -#: ../calculate-install/pym/install/variables/autopartition.py:547 +#: ../calculate-install/pym/install/variables/autopartition.py:558 msgid "The partition for the update" msgstr "Раздел для обновлений" -#: ../calculate-install/pym/install/variables/autopartition.py:565 +#: ../calculate-install/pym/install/variables/autopartition.py:576 msgid "The partition table must be GPT for using UEFI bootloader" msgstr "Для использования UEFI загрузчика таблица разделов должна быть GPT" -#: ../calculate-install/pym/install/variables/disk.py:2503 +#: ../calculate-install/pym/install/variables/disk.py:2496 #, python-brace-format msgid "The partition {dev} is already in use as {mp}" msgstr "Раздел {dev} уже используется как {mp}" -#: ../calculate-install/pym/install/variables/disk.py:1171 +#: ../calculate-install/pym/install/variables/disk.py:1153 #, python-format msgid "The root partition should be at least %s" msgstr "Корневой раздел должен быть не менее %s" -#: ../calculate-install/pym/install/variables/autopartition.py:627 +#: ../calculate-install/pym/install/variables/autopartition.py:638 #, python-brace-format msgid "The root partition should be at least {size}" msgstr "Размер корневого раздела не может быть меньше {size}" -#: ../calculate-install/pym/install/utils/cl_setup.py:169 +#: ../calculate-install/pym/install/utils/cl_setup.py:164 msgid "The session settings are being configured" msgstr "Настройка параметров сессии" -#: ../calculate-install/pym/install/distr.py:1217 +#: ../calculate-install/pym/install/distr.py:1202 #, python-format msgid "The specified format of '%s' is not supported" msgstr "Указанный формат '%s' не поддерживается" -#: ../calculate-install/pym/install/variables/disk.py:1395 +#: ../calculate-install/pym/install/variables/disk.py:1374 #, python-brace-format msgid "The swap partition {dev} must be formatted as swap" msgstr "Раздел подкачки {dev} должен быть отформатирован как swap" -#: ../calculate-install/pym/install/utils/cl_setup.py:111 +#: ../calculate-install/pym/install/utils/cl_setup.py:106 msgid "The system is being configured" msgstr "Настройка системы" -#: ../calculate-install/pym/install/utils/cl_setup.py:137 +#: ../calculate-install/pym/install/utils/cl_setup.py:132 msgid "The themes are being configured" msgstr "Настройка тем" -#: ../calculate-install/pym/install/utils/cl_setup.py:139 +#: ../calculate-install/pym/install/utils/cl_setup.py:134 msgid "Theme configuration failed!" msgstr "Не удалось настроить темы!" @@ -1295,120 +1293,120 @@ msgstr "Не удалось настроить темы!" msgid "Themes" msgstr "Темы" -#: ../calculate-install/pym/install/utils/cl_setup.py:138 +#: ../calculate-install/pym/install/utils/cl_setup.py:133 msgid "Themes configured!" msgstr "Темы настроены!" -#: ../calculate-install/pym/install/variables/X11.py:74 +#: ../calculate-install/pym/install/variables/X11.py:75 msgid "This distribution does not provide a Xorg server" msgstr "Устанавливаемый дистрибутив не содержит Xorg-сервер" #: ../calculate-install/pym/install/variables/audio.py:71 -#: ../calculate-install/pym/install/variables/audio.py:275 +#: ../calculate-install/pym/install/variables/audio.py:273 msgid "This distribution does not provide the ALSA sound" msgstr "Устанавливаемый дистрибутив не поддерживает звуковую систему ALSA" -#: ../calculate-install/pym/install/variables/autopartition.py:516 -#: ../calculate-install/pym/install/variables/disk.py:2140 +#: ../calculate-install/pym/install/variables/autopartition.py:527 +#: ../calculate-install/pym/install/variables/disk.py:2136 msgid "This option not used for Flash install" msgstr "Этот параметр не используется при установке на Flash" -#: ../calculate-install/pym/install/variables/locale.py:212 +#: ../calculate-install/pym/install/variables/locale.py:208 msgid "Timezone" msgstr "Часовой пояс" -#: ../calculate-install/pym/install/utils/cl_setup.py:70 +#: ../calculate-install/pym/install/utils/cl_setup.py:65 msgid "To apply the changes, reboot the system" msgstr "Для применения изменений необходимо перезагрузить систему" -#: ../calculate-install/pym/install/utils/cl_setup.py:80 +#: ../calculate-install/pym/install/utils/cl_setup.py:75 msgid "To apply the changes, restart the X server" msgstr "Для применения изменений необходимо перезагрузить X-сервер" -#: ../calculate-install/pym/install/variables/disk.py:974 +#: ../calculate-install/pym/install/variables/disk.py:962 msgid "To change the filesystem, you have to specify it as FS. FORMAT is used for the specifying the need to format partition or not" msgstr "Вы может изменить файловую систему, указав её как FS. FORMAT используется для того чтобы указать форматировать или нет раздел" -#: ../calculate-install/pym/install/variables/disk.py:1066 -#: ../calculate-install/pym/install/variables/disk.py:1179 +#: ../calculate-install/pym/install/variables/disk.py:1054 +#: ../calculate-install/pym/install/variables/disk.py:1161 msgid "To install the system, you need to specify the root device" msgstr "Для установки необходимо указать корневое устройство" -#: ../calculate-install/pym/install/variables/disk.py:2269 +#: ../calculate-install/pym/install/variables/disk.py:2264 #, python-format msgid "To support booting from %s, legacy grub needs a separate /boot partition" msgstr "Legacy grub не поддерживает загрузки с %s без выделенного /boot раздела" -#: ../calculate-install/pym/install/variables/disk.py:1974 +#: ../calculate-install/pym/install/variables/disk.py:1965 msgid "UEFI" msgstr "UEFI" -#: ../calculate-install/pym/install/variables/disk.py:2024 +#: ../calculate-install/pym/install/variables/disk.py:2015 msgid "UEFI boot" msgstr "UEFI загрузка" -#: ../calculate-install/pym/install/variables/disk.py:2092 +#: ../calculate-install/pym/install/variables/disk.py:2086 #, python-format msgid "UEFI installation is unavailable, because '%s' command not found" msgstr "UEFI установка недоступна, так как не найдена команда '%s'" -#: ../calculate-install/pym/install/variables/disk.py:2313 +#: ../calculate-install/pym/install/variables/disk.py:2308 msgid "USB Flash" msgstr "USB Flash" -#: ../calculate-install/pym/install/variables/disk.py:2314 +#: ../calculate-install/pym/install/variables/disk.py:2309 msgid "USB Hard Disk" msgstr "Жёсткий диск USB" -#: ../calculate-install/pym/install/distr.py:1900 +#: ../calculate-install/pym/install/distr.py:1885 #, python-format msgid "USB flash %s" msgstr "USB-flash %s" -#: ../calculate-install/pym/install/install.py:568 +#: ../calculate-install/pym/install/install.py:554 msgid "Unable to change the I/O scheduler" msgstr "Не удалось изменить I/O планировщик" -#: ../calculate-install/pym/install/install.py:738 +#: ../calculate-install/pym/install/install.py:724 #, python-format msgid "Unable to remove directory %s" msgstr "Не удалось удалить директорию %s" -#: ../calculate-install/pym/install/install.py:732 +#: ../calculate-install/pym/install/install.py:718 #, python-format msgid "Unable to umount %s" msgstr "Не удалось отмонтировать %s" -#: ../calculate-install/pym/install/variables/disk.py:1252 -#: ../calculate-install/pym/install/variables/disk.py:2519 +#: ../calculate-install/pym/install/variables/disk.py:1230 +#: ../calculate-install/pym/install/variables/disk.py:2512 #, python-format msgid "Unable to use CDROM %s for installation" msgstr "Невозможно использовать CDROM %s для установки" -#: ../calculate-install/pym/install/variables/disk.py:1243 -#: ../calculate-install/pym/install/variables/disk.py:2516 +#: ../calculate-install/pym/install/variables/disk.py:1221 +#: ../calculate-install/pym/install/variables/disk.py:2509 #, python-format msgid "Unable to use extended partition %s for installation" msgstr "Невозможно использовать расширенный раздел %s для установки" -#: ../calculate-install/pym/install/variables/disk.py:1291 +#: ../calculate-install/pym/install/variables/disk.py:1267 #, python-brace-format msgid "Unable to use {part} partition used by active {typepart} for installation" msgstr "Невозможно использовать раздел {part}, используемый активным {typepart} для установки" -#: ../calculate-install/pym/install/variables/autopartition.py:163 -#: ../calculate-install/pym/install/variables/disk.py:2083 -#: ../calculate-install/pym/install/variables/disk.py:2185 -#: ../calculate-install/pym/install/variables/disk.py:2485 -#: ../calculate-install/pym/install/variables/net.py:315 +#: ../calculate-install/pym/install/variables/autopartition.py:161 +#: ../calculate-install/pym/install/variables/disk.py:2077 +#: ../calculate-install/pym/install/variables/disk.py:2180 +#: ../calculate-install/pym/install/variables/disk.py:2478 +#: ../calculate-install/pym/install/variables/net.py:313 msgid "Unknown" msgstr "Неизвестный" -#: ../calculate-install/pym/install/distr.py:1547 +#: ../calculate-install/pym/install/distr.py:1532 msgid "Unknown Container" msgstr "Неизвестный контейнер" -#: ../calculate-install/pym/install/distr.py:1399 +#: ../calculate-install/pym/install/distr.py:1384 #, python-format msgid "Unknown archive type '%s'" msgstr "Неизвестный тип архива '%s'" @@ -1417,7 +1415,7 @@ msgstr "Неизвестный тип архива '%s'" msgid "Unmounting the target system volume" msgstr "Отмонтирование ресурсов устанавливаемой системы" -#: ../calculate-install/pym/install/distr.py:1414 +#: ../calculate-install/pym/install/distr.py:1399 #, python-format msgid "" "Unpacking error\n" @@ -1430,7 +1428,7 @@ msgstr "" msgid "Unpacking the system image to the target" msgstr "Распаковка образа системы" -#: ../calculate-install/pym/install/distr.py:1423 +#: ../calculate-install/pym/install/distr.py:1408 msgid "Unsupported" msgstr "Не поддерживается" @@ -1438,11 +1436,11 @@ msgstr "Не поддерживается" msgid "Update" msgstr "Обновление" -#: ../calculate-install/pym/install/variables/system.py:1001 +#: ../calculate-install/pym/install/variables/system.py:1040 msgid "Update configuration unavailable for Flash install" msgstr "Настройка обновлений недоступна при установке на Flash" -#: ../calculate-install/pym/install/variables/system.py:1031 +#: ../calculate-install/pym/install/variables/system.py:1070 msgid "Update packages at first boot" msgstr "Обновить пакеты при первой загрузке" @@ -1454,19 +1452,19 @@ msgstr "Обновить настройки системы" msgid "Updating the configuration" msgstr "Обновление конфигурации" -#: ../calculate-install/pym/install/variables/autopartition.py:550 +#: ../calculate-install/pym/install/variables/autopartition.py:561 msgid "Use LVM" msgstr "Использовать LVM" -#: ../calculate-install/pym/install/variables/disk.py:1564 +#: ../calculate-install/pym/install/variables/disk.py:1543 msgid "Use UUID" msgstr "Использовать UUID" -#: ../calculate-install/pym/install/variables/autopartition.py:494 +#: ../calculate-install/pym/install/variables/autopartition.py:505 msgid "Use current partitions" msgstr "Использовать существующие разделы" -#: ../calculate-install/pym/install/variables/autopartition.py:549 +#: ../calculate-install/pym/install/variables/autopartition.py:560 msgid "Use the UEFI bootloader" msgstr "Использовать UEFI загрузчик" @@ -1478,17 +1476,17 @@ msgstr "Использовать root-пароль для редактирова msgid "User" msgstr "Пользователь" -#: ../calculate-install/pym/install/variables/system.py:593 +#: ../calculate-install/pym/install/variables/system.py:606 #, python-format msgid "User %s does not exist" msgstr "Пользователь %s не существует" -#: ../calculate-install/pym/install/migrate_users.py:356 +#: ../calculate-install/pym/install/migrate_users.py:329 #, python-format msgid "User %s not found" msgstr "Не найден пользователь %s" -#: ../calculate-install/pym/install/variables/system.py:57 +#: ../calculate-install/pym/install/variables/system.py:58 msgid "User configuration unavailable for Flash install" msgstr "Конфигурация пользователей недоступна при установке на Flash" @@ -1510,8 +1508,8 @@ msgstr "Пользователи" msgid "Video" msgstr "Видео" -#: ../calculate-install/pym/install/variables/X11.py:70 -#: ../calculate-install/pym/install/variables/X11.py:284 +#: ../calculate-install/pym/install/variables/X11.py:71 +#: ../calculate-install/pym/install/variables/X11.py:291 msgid "Video configuration unavailable for Flash install" msgstr "Конфигурация видео не доступна при установке на Flash" @@ -1531,67 +1529,71 @@ msgstr "Настройка параметров видео выполнена!" msgid "Would you like to reboot your computer now to complete the installation?" msgstr "Вы хотите перезагрузить компьютер сейчас, чтобы завершить установку?" -#: ../calculate-install/pym/install/variables/disk.py:2105 +#: ../calculate-install/pym/install/variables/disk.py:2099 #, python-format msgid "Wrong EFI device %s" msgstr "Неправильное EFI устройство %s" -#: ../calculate-install/pym/install/variables/net.py:400 +#: ../calculate-install/pym/install/variables/net.py:393 #, python-format msgid "Wrong IP address %s" msgstr "Неправильный IP-адрес %s" -#: ../calculate-install/pym/install/variables/net.py:685 +#: ../calculate-install/pym/install/variables/net.py:668 #, python-format msgid "Wrong IP address %s in the specified source IP" msgstr "Неправильный IP-адрес %s в указанном исходном IP" -#: ../calculate-install/pym/install/variables/net.py:908 +#: ../calculate-install/pym/install/variables/net.py:898 msgid "Wrong IP address for DNS" msgstr "Неправильный IP-адрес для DNS" -#: ../calculate-install/pym/install/variables/disk.py:1081 +#: ../calculate-install/pym/install/variables/disk.py:1068 #, python-format msgid "Wrong bind mount point '%s'" msgstr "Неправильная bind точка монтирования '%s'" -#: ../calculate-install/pym/install/variables/disk.py:1077 -#: ../calculate-install/pym/install/variables/disk.py:2493 -#: ../calculate-install/pym/install/variables/disk.py:2498 +#: ../calculate-install/pym/install/variables/disk.py:2586 +msgid "Wrong btrfs compression" +msgstr "Неправильное сжатие btrfs" + +#: ../calculate-install/pym/install/variables/disk.py:1064 +#: ../calculate-install/pym/install/variables/disk.py:2486 +#: ../calculate-install/pym/install/variables/disk.py:2491 #, python-format msgid "Wrong device '%s'" msgstr "Неправильное устройство '%s'" -#: ../calculate-install/pym/install/distr.py:197 +#: ../calculate-install/pym/install/distr.py:198 msgid "Wrong distribution" msgstr "Неподходящий дистрибутив" -#: ../calculate-install/pym/install/variables/net.py:634 +#: ../calculate-install/pym/install/variables/net.py:623 #, python-format msgid "Wrong gateway IP %s" msgstr "Неверный IP-шлюза %s" -#: ../calculate-install/pym/install/variables/net.py:258 +#: ../calculate-install/pym/install/variables/net.py:257 msgid "Wrong hostname" msgstr "Неправильное имя хоста" -#: ../calculate-install/pym/install/variables/distr.py:322 -#: ../calculate-install/pym/install/variables/distr.py:330 -#: ../calculate-install/pym/install/variables/distr.py:643 +#: ../calculate-install/pym/install/variables/distr.py:319 +#: ../calculate-install/pym/install/variables/distr.py:327 +#: ../calculate-install/pym/install/variables/distr.py:634 msgid "Wrong image file" msgstr "Неправильный файл образа" -#: ../calculate-install/pym/install/variables/net.py:497 +#: ../calculate-install/pym/install/variables/net.py:488 #, python-format msgid "Wrong mask %s" msgstr "Неправильная маска %s" -#: ../calculate-install/pym/install/variables/disk.py:1226 +#: ../calculate-install/pym/install/variables/disk.py:1204 #, python-format msgid "Wrong mount point '%s'" msgstr "Неправильная точка монтирования '%s'" -#: ../calculate-install/pym/install/variables/net.py:604 +#: ../calculate-install/pym/install/variables/net.py:594 #, python-format msgid "Wrong network %s" msgstr "Неправильная сеть %s" @@ -1601,21 +1603,21 @@ msgstr "Неправильная сеть %s" msgid "Wrong resolution {resolution} {example}" msgstr "Неправильное разрешение {resolution} {example}" -#: ../calculate-install/pym/install/variables/net.py:679 +#: ../calculate-install/pym/install/variables/net.py:663 #, python-format msgid "Wrong source IP %s" msgstr "Неверный исходный IP %s" -#: ../calculate-install/pym/install/variables/locale.py:221 +#: ../calculate-install/pym/install/variables/locale.py:217 #, python-format msgid "Wrong timezone %s" msgstr "Неправильный часовой пояс %s" -#: ../calculate-install/pym/install/variables/disk.py:2557 +#: ../calculate-install/pym/install/variables/disk.py:2550 msgid "You cannot format the USB Flash which contains the current system" msgstr "Вы не может отформатировать USB Flash, которая содержит текущую систему" -#: ../calculate-install/pym/install/variables/disk.py:2511 +#: ../calculate-install/pym/install/variables/disk.py:2504 msgid "You cannot install the new system instead current" msgstr "Вы не можете установить новую систему вместо текущей" @@ -1623,32 +1625,32 @@ msgstr "Вы не можете установить новую систему в msgid "You cannot set a password and remove the existing password at a time" msgstr "Установка пароля несовместима с удалением пароля" -#: ../calculate-install/pym/install/variables/disk.py:1233 +#: ../calculate-install/pym/install/variables/disk.py:1211 #, python-format msgid "You may not use the current root partition %s for installation" msgstr "Текущий корневой раздел %s не может использоваться для установки" -#: ../calculate-install/pym/install/variables/disk.py:2220 -#: ../calculate-install/pym/install/variables/disk.py:2522 +#: ../calculate-install/pym/install/variables/disk.py:2215 +#: ../calculate-install/pym/install/variables/disk.py:2515 msgid "You need a disk with a dos table for Flash install" msgstr "Для установки на Flash необходим диск с таблицей разделов dos" -#: ../calculate-install/pym/install/variables/distr.py:318 +#: ../calculate-install/pym/install/variables/distr.py:315 msgid "You need to select a distribution image" msgstr "Необходимо выбрать образ дистрибутива" -#: ../calculate-install/pym/install/variables/disk.py:2235 -#: ../calculate-install/pym/install/variables/disk.py:2243 +#: ../calculate-install/pym/install/variables/disk.py:2230 +#: ../calculate-install/pym/install/variables/disk.py:2238 #, python-brace-format msgid "Your boot device must have a BIOS Boot partition ({minsize})" msgstr "На загрузочном диске должен присутствовать BIOS Boot раздел ({minsize})" -#: ../calculate-install/pym/install/variables/autopartition.py:557 -#: ../calculate-install/pym/install/variables/disk.py:2096 +#: ../calculate-install/pym/install/variables/autopartition.py:568 +#: ../calculate-install/pym/install/variables/disk.py:2090 msgid "Your system must be loaded in UEFI for using this bootloader" msgstr "Система должна быть загружена как UEFI для того, чтобы использовать этот загрузчик" -#: ../calculate-install/pym/install/variables/net.py:539 +#: ../calculate-install/pym/install/variables/net.py:530 msgid "add a routing rule (specified as NETWORK:GATEWAY[:DEV[:SOURCE]])" msgstr "добавить правило маршрутизации (формат NETWORK:GATEWAY[:DEV[:SOURCE]])" @@ -1660,68 +1662,68 @@ msgstr "добавить пользователя в устанавливаем msgid "add a user to the installed system. USER is username. ADMIN is administrator rights ({alllist}, {none_value} by default). GROUPS is list user supplimentary groups (comma delimeter). Use '{none_value}' value to discard user migration" msgstr "добавить пользователя в устанавливаемую систему. USER - имя пользователя. ADMIN - права администратора ({alllist}, {none_value} по умолчанию). GROUPS список пользовательских дополнительных групп (через запятую). Используйте '{none_value}' значение для отмены переноса пользователей" -#: ../calculate-install/pym/install/distr.py:1346 +#: ../calculate-install/pym/install/distr.py:1331 #, python-format msgid "archive %s" msgstr "архив %s" -#: ../calculate-install/pym/install/variables/system.py:822 +#: ../calculate-install/pym/install/variables/system.py:854 msgid "audio parameters" msgstr "звуковые параметры" -#: ../calculate-install/pym/install/variables/autopartition.py:531 +#: ../calculate-install/pym/install/variables/autopartition.py:542 msgid "autopartition options" msgstr "параметры авторазметки" -#: ../calculate-install/pym/install/variables/disk.py:2157 +#: ../calculate-install/pym/install/variables/disk.py:2153 msgid "boot disk for the system bound for install" msgstr "загрузочный диск для устанавливаемой системы" -#: ../calculate-install/pym/install/variables/system.py:821 +#: ../calculate-install/pym/install/variables/system.py:853 msgid "boot parameters" msgstr "параметры загрузки" -#: ../calculate-install/pym/install/variables/distr.py:468 +#: ../calculate-install/pym/install/variables/distr.py:463 msgid "by build" msgstr "по сборке" -#: ../calculate-install/pym/install/variables/distr.py:429 +#: ../calculate-install/pym/install/variables/distr.py:424 msgid "by distribution" msgstr "по дистрибутиву" -#: ../calculate-install/pym/install/variables/distr.py:401 +#: ../calculate-install/pym/install/variables/distr.py:396 msgid "by processor architecture" msgstr "по архитектуре процессора" -#: ../calculate-install/pym/install/variables/distr.py:454 +#: ../calculate-install/pym/install/variables/distr.py:449 msgid "by version" msgstr "по версии" -#: ../calculate-install/pym/install/distr.py:862 -#: ../calculate-install/pym/install/distr.py:1595 -#: ../calculate-install/pym/install/distr.py:1747 +#: ../calculate-install/pym/install/distr.py:856 +#: ../calculate-install/pym/install/distr.py:1580 +#: ../calculate-install/pym/install/distr.py:1732 #, python-format msgid "command '%s' not found" msgstr "команда '%s' не найдена" -#: ../calculate-install/pym/install/variables/system.py:844 +#: ../calculate-install/pym/install/variables/system.py:876 msgid "configure dynamic options only" msgstr "конфигурировать только динамические параметры" -#: ../calculate-install/pym/install/variables/disk.py:2291 +#: ../calculate-install/pym/install/variables/disk.py:2286 msgid "device type for the system bound for install" msgstr "тип устройства для устанавливаемой системы" -#: ../calculate-install/pym/install/distr.py:691 +#: ../calculate-install/pym/install/distr.py:688 #, python-format msgid "directory '%s'" msgstr "директория '%s'" -#: ../calculate-install/pym/install/variables/net.py:891 +#: ../calculate-install/pym/install/variables/net.py:882 msgid "domain name server (comma-separated)" msgstr "сервера доменных имен (разделитель - запятая)" -#: ../calculate-install/pym/install/distr.py:201 +#: ../calculate-install/pym/install/distr.py:202 msgid "empty" msgstr "пусто" @@ -1729,60 +1731,60 @@ msgstr "пусто" msgid "encrypt user profiles" msgstr "шифровать пользовательские профили" -#: ../calculate-install/pym/install/variables/disk.py:1390 +#: ../calculate-install/pym/install/variables/disk.py:1369 #, python-brace-format msgid "for {typedisk} install" msgstr "для {typedisk} установки" -#: ../calculate-install/pym/install/variables/system.py:914 +#: ../calculate-install/pym/install/variables/system.py:946 msgid "grub terminal" msgstr "grub терминал" -#: ../calculate-install/pym/install/distr.py:1671 +#: ../calculate-install/pym/install/distr.py:1656 #, python-format msgid "image directory %s" msgstr "директория с образом %s" -#: ../calculate-install/pym/install/variables/distr.py:620 +#: ../calculate-install/pym/install/variables/distr.py:611 msgid "install the newer image only" msgstr "установить только более новый образ" -#: ../calculate-install/pym/install/distr.py:2011 +#: ../calculate-install/pym/install/distr.py:1996 #, python-brace-format msgid "layered '{file} {diff}'" msgstr "со слоями '{file} {diff}'" -#: ../calculate-install/pym/install/distr.py:1669 +#: ../calculate-install/pym/install/distr.py:1654 #, python-format msgid "live image %s" msgstr "live-образ %s" -#: ../calculate-install/pym/install/variables/system.py:819 +#: ../calculate-install/pym/install/variables/system.py:851 msgid "localization and time options" msgstr "параметры локализации и времени" -#: ../calculate-install/pym/install/variables/net.py:821 +#: ../calculate-install/pym/install/variables/net.py:814 msgid "network manager" msgstr "менеджер сети" -#: ../calculate-install/pym/install/variables/system.py:818 +#: ../calculate-install/pym/install/variables/system.py:850 msgid "network settings" msgstr "сетевые параметры" -#: ../calculate-install/pym/install/variables/disk.py:1978 +#: ../calculate-install/pym/install/variables/disk.py:1969 msgid "no" msgstr "нет" -#: ../calculate-install/pym/install/distr.py:1052 +#: ../calculate-install/pym/install/distr.py:1039 #, python-format msgid "partition '%s'" msgstr "раздел '%s'" -#: ../calculate-install/pym/install/variables/system.py:891 +#: ../calculate-install/pym/install/variables/system.py:923 msgid "path for PXE install" msgstr "путь для PXE-установки" -#: ../calculate-install/pym/install/variables/disk.py:2537 +#: ../calculate-install/pym/install/variables/disk.py:2530 msgid "perform the formatting of the USB Flash drive" msgstr "выполнить форматирование USB Flash" @@ -1794,47 +1796,47 @@ msgstr "перенастроить сеть" msgid "remove the password protection for editing the Grub menu" msgstr "удалить пароль на редактирование меню Grub" -#: ../calculate-install/pym/install/variables/net.py:853 +#: ../calculate-install/pym/install/variables/net.py:845 msgid "search domains (comma-separated)" msgstr "домены для поиска (разделитель - запятая)" -#: ../calculate-install/pym/install/variables/distr.py:430 +#: ../calculate-install/pym/install/variables/distr.py:425 msgid "select the operation system" msgstr "выбор операционной системы" -#: ../calculate-install/pym/install/variables/distr.py:469 +#: ../calculate-install/pym/install/variables/distr.py:464 msgid "select the operation system by build" msgstr "выбрать операционную систему по сборке" -#: ../calculate-install/pym/install/variables/distr.py:455 +#: ../calculate-install/pym/install/variables/distr.py:450 msgid "select the operation system by version" msgstr "выбрать операционную систему по версии" -#: ../calculate-install/pym/install/variables/distr.py:402 +#: ../calculate-install/pym/install/variables/distr.py:397 msgid "select the processor architecture" msgstr "выбор архитектуры процессора" -#: ../calculate-install/pym/install/variables/system.py:824 +#: ../calculate-install/pym/install/variables/system.py:856 msgid "session settings" msgstr "настройки сессии" -#: ../calculate-install/pym/install/variables/disk.py:2025 +#: ../calculate-install/pym/install/variables/disk.py:2016 msgid "set UEFI boot disks" msgstr "установить диски для UEFI загрузки" -#: ../calculate-install/pym/install/variables/system.py:559 +#: ../calculate-install/pym/install/variables/system.py:572 msgid "set an autologin for the user, 'off' for disable" msgstr "установить автоматический вход в систему для пользователя, 'off' для отключения" -#: ../calculate-install/pym/install/variables/net.py:247 +#: ../calculate-install/pym/install/variables/net.py:246 msgid "set either the short or the full hostname" msgstr "установить короткое или полное имя хоста" -#: ../calculate-install/pym/install/variables/autopartition.py:467 +#: ../calculate-install/pym/install/variables/autopartition.py:478 msgid "set filesystem for data partititon" msgstr "установить файловую систему для раздела с данными" -#: ../calculate-install/pym/install/variables/autopartition.py:452 +#: ../calculate-install/pym/install/variables/autopartition.py:463 msgid "set filesystem for root partititon" msgstr "установить файловую систему для корневого раздела" @@ -1842,7 +1844,7 @@ msgstr "установить файловую систему для корнев msgid "set grub password" msgstr "установить пароль на grub" -#: ../calculate-install/pym/install/variables/locale.py:361 +#: ../calculate-install/pym/install/variables/locale.py:356 msgid "set hardware clock type" msgstr "установить тип аппаратных часов" @@ -1850,7 +1852,7 @@ msgstr "установить тип аппаратных часов" msgid "set the NTP server for the system" msgstr "установка NTP сервера для системы" -#: ../calculate-install/pym/install/variables/disk.py:2476 +#: ../calculate-install/pym/install/variables/disk.py:2469 msgid "set the USB Flash device" msgstr "установить USB Flash" @@ -1862,40 +1864,40 @@ msgstr "установить разрешение Xorg" msgid "set the audio system" msgstr "установить звуковую систему" -#: ../calculate-install/pym/install/variables/audio.py:248 +#: ../calculate-install/pym/install/variables/audio.py:246 msgid "set the default audio" msgstr "установить звуковую карту по умолчанию" -#: ../calculate-install/pym/install/variables/autopartition.py:211 +#: ../calculate-install/pym/install/variables/autopartition.py:209 msgid "set the device for autopartition" msgstr "установить диск для авторазметки" -#: ../calculate-install/pym/install/variables/X11.py:354 -#: ../calculate-install/pym/install/variables/X11.py:379 +#: ../calculate-install/pym/install/variables/X11.py:361 +#: ../calculate-install/pym/install/variables/X11.py:386 msgid "set the framebuffer resolution" msgstr "установить разрешение фреймбуфера" -#: ../calculate-install/pym/install/variables/locale.py:155 +#: ../calculate-install/pym/install/variables/locale.py:151 msgid "set the keyboard layout" msgstr "установить раскладку клавиатуры" -#: ../calculate-install/pym/install/variables/locale.py:133 +#: ../calculate-install/pym/install/variables/locale.py:129 msgid "set the locale" msgstr "установить локаль" -#: ../calculate-install/pym/install/variables/autopartition.py:645 +#: ../calculate-install/pym/install/variables/autopartition.py:656 msgid "set the partition table for autopartition" msgstr "установить таблицу разделов для авторазметки" -#: ../calculate-install/pym/install/variables/autopartition.py:607 +#: ../calculate-install/pym/install/variables/autopartition.py:618 msgid "set the root partition size for autopartition" msgstr "установить размер корневого раздела для авторазметки" -#: ../calculate-install/pym/install/variables/autopartition.py:125 +#: ../calculate-install/pym/install/variables/autopartition.py:123 msgid "set the swap partition size for autopartition" msgstr "установить размер раздела подкачки для авторазметки" -#: ../calculate-install/pym/install/variables/locale.py:213 +#: ../calculate-install/pym/install/variables/locale.py:209 msgid "set the timezone" msgstr "установить часовой пояс" @@ -1903,21 +1905,21 @@ msgstr "установить часовой пояс" msgid "set the video driver" msgstr "установить видеодрайвер" -#: ../calculate-install/pym/install/variables/system.py:163 +#: ../calculate-install/pym/install/variables/system.py:164 msgid "specify the root password" msgstr "указать пароль пользователя root" -#: ../calculate-install/pym/install/distr.py:1562 +#: ../calculate-install/pym/install/distr.py:1547 #, python-format msgid "squash image %s" msgstr "squash-образ %s" -#: ../calculate-install/pym/install/distr.py:279 +#: ../calculate-install/pym/install/distr.py:280 #: ../calculate-install/pym/install/distr.py:407 msgid "to" msgstr "в" -#: ../calculate-install/pym/install/variables/X11.py:310 +#: ../calculate-install/pym/install/variables/X11.py:317 msgid "toggle composite" msgstr "установить композит" @@ -1925,19 +1927,19 @@ msgstr "установить композит" msgid "toggle the I/O scheduler" msgstr "установить I/O планировщик" -#: ../calculate-install/pym/install/variables/system.py:1030 +#: ../calculate-install/pym/install/variables/system.py:1069 msgid "update packages at first boot" msgstr "обновить пакеты при первой загрузке" -#: ../calculate-install/pym/install/variables/system.py:823 +#: ../calculate-install/pym/install/variables/system.py:855 msgid "update themes" msgstr "обновить темы" -#: ../calculate-install/pym/install/variables/disk.py:1565 +#: ../calculate-install/pym/install/variables/disk.py:1544 msgid "use UUID" msgstr "использовать UUID" -#: ../calculate-install/pym/install/variables/autopartition.py:489 +#: ../calculate-install/pym/install/variables/autopartition.py:500 msgid "use the autopartition" msgstr "использовать авторазметку" @@ -1949,31 +1951,31 @@ msgstr "использовать миграцию сетевых настрое msgid "use the root password to edit Grub" msgstr "использовать root-пароль для редактирования меню grub" -#: ../calculate-install/pym/install/variables/system.py:825 +#: ../calculate-install/pym/install/variables/system.py:857 msgid "user settings" msgstr "настройки пользователей" -#: ../calculate-install/pym/install/variables/net.py:316 +#: ../calculate-install/pym/install/variables/net.py:313 msgid "vendor" msgstr "производитель" -#: ../calculate-install/pym/install/variables/X11.py:265 +#: ../calculate-install/pym/install/variables/X11.py:273 #, python-format msgid "video driver %s is unavailable" msgstr "%s видеодрайвер недоступен" -#: ../calculate-install/pym/install/variables/system.py:820 +#: ../calculate-install/pym/install/variables/system.py:852 msgid "video settings" msgstr "параметры видео" -#: ../calculate-install/pym/install/variables/disk.py:1462 -#: ../calculate-install/pym/install/variables/disk.py:2562 +#: ../calculate-install/pym/install/variables/disk.py:1442 +#: ../calculate-install/pym/install/variables/disk.py:2555 #, python-brace-format msgid "{device} must be formatted" msgstr "Диск {device} должен быть отформатирован" -#: ../calculate-install/pym/install/variables/disk.py:1452 -#: ../calculate-install/pym/install/variables/disk.py:1478 +#: ../calculate-install/pym/install/variables/disk.py:1431 +#: ../calculate-install/pym/install/variables/disk.py:1458 #, python-brace-format msgid "{device} must but cannot be formatted, as it is mounted to {mountpoint} on the current system" msgstr "Диск {device} должен быть отформатирован, но не может, потому что подключен к {mountpoint} в текущей системе" diff --git a/ru/cl_lib3.po b/ru/cl_lib3.po index ce4807b..e5e849f 100644 --- a/ru/cl_lib3.po +++ b/ru/cl_lib3.po @@ -11,12 +11,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3539 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3550 #, python-format msgid "%(name)s does not match %(nameElement)s in size" msgstr "размер %(name)s не равен размеру %(nameElement)s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1932 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1944 #, python-format msgid "%d argumens" msgstr "%d аргументов" @@ -28,90 +28,90 @@ msgstr "%d аргументов" msgid "%s command not found" msgstr "Команда не найдена %s" -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1339 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1352 #, python-format msgid "%s is not directory" msgstr "%s не директория" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3467 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3478 #, python-format msgid "'%s' is not a number" msgstr "'%s' не число" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1934 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1946 msgid "1 argument" 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:4625 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:242 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:252 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4640 msgid ":" msgstr ":" -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:133 -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:143 -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:147 -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:225 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1041 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1043 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1231 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1233 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2283 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4590 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5091 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5124 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5146 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5157 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5231 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5254 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5269 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5286 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5291 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5484 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5495 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5517 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5529 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5562 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5569 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5578 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5580 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5595 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5597 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5606 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:138 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:148 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:152 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:231 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1049 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1051 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1240 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1242 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2298 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4608 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5114 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5145 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5167 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5178 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5252 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5275 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5290 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5307 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5312 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5497 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5508 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5530 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5542 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5575 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5582 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5591 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5593 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5608 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5641 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5643 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5610 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5619 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5621 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5654 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5656 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5665 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5667 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5688 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5691 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5718 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5720 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5728 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5730 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5739 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5768 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5785 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5807 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5824 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5835 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5841 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5872 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5874 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5669 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5678 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5680 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5701 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5704 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5731 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5733 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5741 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5743 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5753 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5782 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5799 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5821 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5838 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5849 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5855 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5886 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5887 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6209 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6240 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6284 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6312 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6339 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6372 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6408 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6418 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6435 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6445 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5888 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5900 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5901 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6230 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6261 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6304 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6332 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6359 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6392 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6427 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6437 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6455 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6465 msgid ": " msgstr ": " @@ -121,42 +121,42 @@ msgstr ": " msgid "Access denied to repository {url}" msgstr "Нет доступа к репозиторию {url}" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:193 -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:98 -#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:189 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:196 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:99 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:188 #: ../calculate-lib/pym/calculate/lib/format/xml_xfcepanel.py:123 msgid "Ambiguity in this template: the same nodes are on a same level" msgstr "Неопредёленность в этом шаблоне: одни и те же узлы на одном уровне" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1905 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1894 #, python-format msgid "Ambiguous choice:%s" msgstr "Неоднозначный выбор: %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6198 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6219 msgid "Appling patch" msgstr "Применение патча" -#: ../calculate-lib/pym/calculate/lib/datavars.py:788 +#: ../calculate-lib/pym/calculate/lib/datavars.py:809 #, python-brace-format msgid "Attempting to rewrite a readonly index field {fieldname} in variable {variablename}" msgstr "Попытка переписать неизменяемое индексное поле {fieldname} в переменной {variablename}" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1614 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1603 #, python-format msgid "Attempting to rewrite readonly variable %s" msgstr "Попытка перезаписать переменную только для чтения %s" -#: ../calculate-lib/pym/calculate/lib/datavars.py:400 +#: ../calculate-lib/pym/calculate/lib/datavars.py:421 #, python-format msgid "Attempting to rewrite readonly variable %s via calculate.env" msgstr "Попытка перезаписать переменную только для чтения %s через файл calculate.env" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:125 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:128 msgid "Attribute \"name\" not found in the tag entry" msgstr "Не найден атрибут \"name\" внутри тега" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:134 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:137 msgid "Attribute \"type\" not found in the tag entry" msgstr "Не найден атрибут \"type\" внутри тега" @@ -171,30 +171,30 @@ msgstr "Ветка {branch} не найдена в {rpath} репозитори msgid "Branch {branch} not found in repository {url}" msgstr "Ветка {branch} не найдена в {url} репозитории" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:852 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:853 msgid "Break package building" msgstr "Прервать сборку пакета" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4625 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4640 msgid "Calculate Utilities have changed files" msgstr "Утилиты Calculate изменили файлы" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1757 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1746 msgid "Click for advanced settings" msgstr "Нажмите для дополнительных настроек" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:432 -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:535 -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:542 #: ../calculate-lib/pym/calculate/lib/utils/files.py:171 -#: ../calculate-lib/pym/calculate/lib/utils/files.py:912 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2254 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:932 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:427 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:530 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:537 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2265 #, python-format msgid "Command not found '%s'" msgstr "Команда не найдена '%s'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4937 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4946 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4959 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4968 #, python-format msgid "Config action is not support '%s' parameter" msgstr "Действие Config не поддерживает параметр '%s'" @@ -221,74 +221,74 @@ msgstr "Пропущено создание изображения с разре msgid "Custom action" msgstr "Произвольное действие" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:189 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:187 #, python-format msgid "Device %s must be mounted" msgstr "Диск %s должен быть подключен" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:270 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:282 msgid "Device not found" msgstr "Устройство не найдено" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:709 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:711 msgid "Distribution templates" 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:4048 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4060 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:73 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:123 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:127 msgid "ERROR" msgstr "ОШИБКА" -#: ../calculate-lib/pym/calculate/lib/datavars.py:770 +#: ../calculate-lib/pym/calculate/lib/datavars.py:791 #, python-format msgid "Each entry must contains %d field(s)" msgstr "Каждая запись должна содержать %d поля(ей)" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4033 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4045 msgid "Empty oct value" msgstr "Пустое значение восьмеричного числа" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1035 -#: ../calculate-lib/pym/calculate/lib/datavars.py:1380 -#: ../calculate-lib/pym/calculate/lib/datavars.py:1444 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1025 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1367 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1431 #, python-format msgid "Error in %s" msgstr "Ошибка в %s" -#: ../calculate-lib/pym/calculate/lib/cl_ldap.py:421 +#: ../calculate-lib/pym/calculate/lib/cl_ldap.py:424 msgid "Error in LDIF file" msgstr "Ошибка в LDIF-файле" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1030 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1020 msgid "Error in calculate.env in profile" msgstr "Ошибка в calculate.env профиле" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1438 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1425 msgid "Error in profile calculate.env" msgstr "Ошибка в профиле calculate.env" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6404 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6423 #, python-format msgid "Error in template %s" msgstr "Ошибка в шаблоне %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4361 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4379 msgid "Example:" msgstr "Пример:" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5010 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5018 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5033 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5041 #, python-format msgid "Failed to apply template file %s" msgstr "Ошибка при применении файла шаблона %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5771 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5785 msgid "Failed to change the current directory to" msgstr "Не удалось изменить текущую директорию на" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4929 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4951 #, python-format msgid "Failed to change version of %s" msgstr "Не удалось изменить версию %s" @@ -298,7 +298,7 @@ msgstr "Не удалось изменить версию %s" msgid "Failed to clean the {rpath} repository" msgstr "Не удалось очистить {rpath} репозиторий" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5580 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5593 msgid "Failed to clear the file" msgstr "Не удалось очистить файл" @@ -310,80 +310,90 @@ msgstr "Не удалось очистить файл" msgid "Failed to clone repository {url}" msgstr "Не удалось клонировать {url} репозиторий" -#: ../calculate-lib/pym/calculate/lib/format/patch.py:67 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1666 +#, python-format +msgid "Failed to compose %s" +msgstr "" + +#: ../calculate-lib/pym/calculate/lib/format/patch.py:69 msgid "Failed to convert the text template to XML" msgstr "Не удалось преобразовать текстовый шаблон в XML" -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1091 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1108 #, python-format msgid "Failed to copy '%(src)s' to '%(dst)s'" msgstr "Не удалось скопировать '%(src)s' в '%(dst)s'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4709 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4724 #, python-brace-format msgid "Failed to copy {ffrom} to {fto}" msgstr "Не удалось скопировать {ffrom} в {fto}" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:729 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:734 msgid "Failed to create DOS partition table" msgstr "Не удалось создать DOS таблицу разделов" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:772 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:777 msgid "Failed to create GPT partition table" msgstr "Не удалось создать GPT таблицу разделов" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:862 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:867 msgid "Failed to create LVM" msgstr "Не удалось создать LVM" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5887 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5901 msgid "Failed to create a symbolic link" msgstr "Не удалось создать символическую ссылку" -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1375 #: ../calculate-lib/pym/calculate/lib/utils/files.py:1388 -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1391 -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1406 -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1423 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1401 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1404 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1419 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1436 #, python-format msgid "Failed to create tarball: %s" msgstr "Не удалось создать tar: %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4085 #: ../calculate-lib/pym/calculate/lib/cl_template.py:4097 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4109 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:5643 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5741 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:147 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5656 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5755 msgid "Failed to create the file" msgstr "Не удалось создать файл" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:872 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:877 #, python-format msgid "Failed to create volume %s" msgstr "Не удалось создать том %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5188 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5203 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1656 +#, python-format +msgid "Failed to decompose %s" +msgstr "" + +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5209 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5224 msgid "Failed to delete the directory: " msgstr "Не удалось удалить директорию: " -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5608 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5667 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5691 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5730 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5874 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5621 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5680 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5704 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5743 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5888 msgid "Failed to delete the file" msgstr "Не удалось удалить файл" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5597 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5656 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5610 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5669 msgid "Failed to delete the link" msgstr "Не удалось удалить ссылку" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5210 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5231 msgid "Failed to delete: " msgstr "Не удалось удалить: " @@ -392,7 +402,7 @@ msgstr "Не удалось удалить: " msgid "Failed to detect resolution for image '%s'" msgstr "Не удалось определить разрешение изображения '%s'" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:775 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:776 msgid "Failed to detect the system profile." msgstr "Не удалось определить профиль системы." @@ -401,40 +411,48 @@ msgstr "Не удалось определить профиль системы." msgid "Failed to determine domain name on %s" msgstr "Не удалось определить имя домена %s" -#: ../calculate-lib/pym/calculate/lib/variables/linux.py:283 +#: ../calculate-lib/pym/calculate/lib/variables/linux.py:279 msgid "Failed to determine the system profile" msgstr "Не удалось определить профиль системы" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2283 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4590 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6209 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6284 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6312 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6339 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6435 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2298 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4608 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6230 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6304 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6332 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6359 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6455 msgid "Failed to execute" msgstr "Не удалось выполнить" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5563 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5576 #, python-format msgid "Failed to execute %s" msgstr "Не удалось выполнить %s" -#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:295 +#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:299 #, python-format msgid "Failed to fetch Packages from binary host %s" msgstr "Не удалось получить Packages из бинарного хоста %s" -#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:320 +#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:324 msgid "Failed to fetch Packages signature" msgstr "Не удалось получить подпись Packages" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:388 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:384 #, python-format msgid "Failed to find %s volume" msgstr "Не удалось найти %s том" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:305 +#: ../calculate-lib/pym/calculate/lib/utils/video.py:62 +msgid "Failed to get Base EDID block" +msgstr "" + +#: ../calculate-lib/pym/calculate/lib/utils/video.py:66 +msgid "Failed to get DTD record" +msgstr "" + +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:317 msgid "Failed to get btrfs compression" msgstr "Не удалось получить сжатие btrfs" @@ -444,47 +462,47 @@ msgstr "Не удалось получить сжатие btrfs" msgid "Failed to get the repository status for {rpath}" msgstr "Не удалось получить состояние репозитория в {rpath} директории" -#: ../calculate-lib/pym/calculate/lib/datavars.py:976 +#: ../calculate-lib/pym/calculate/lib/datavars.py:966 #, python-format msgid "Failed to get value %s" msgstr "Не удалось получить значение %s" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1579 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1578 #, python-brace-format msgid "Failed to hide {packages}: {error}" msgstr "Не удалось спрятать {packages}: {error}" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1604 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1603 #, python-brace-format msgid "Failed to hide {package}: {error}" msgstr "Не удалось спрятать {package}: {error}" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1317 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1304 #, python-format msgid "Failed to import module %s" msgstr "Не удалось импортировать модуль %s" #: ../calculate-lib/pym/calculate/lib/format/json.py:73 #: ../calculate-lib/pym/calculate/lib/format/kernel.py:85 -#: ../calculate-lib/pym/calculate/lib/format/world.py:81 -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:270 -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:180 +#: ../calculate-lib/pym/calculate/lib/format/world.py:83 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:268 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:177 #: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:87 -#: ../calculate-lib/pym/calculate/lib/format/xml_xfcepanel.py:195 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfcepanel.py:193 msgid "Failed to join the template" msgstr "Не удалось объединить шаблон" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4722 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4737 #, python-format msgid "Failed to modify %s contents" msgstr "Не удалось изменить содержимое %s" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:243 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:239 #, python-brace-format msgid "Failed to mount {source} to {target}" msgstr "Не удалось подключить {source} к {target}" -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1630 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1643 #, python-format msgid "Failed to move data: %s" msgstr "Не удалось переместить данные: %s" @@ -494,12 +512,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:5720 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5733 msgid "Failed to open the file" msgstr "Не удалось открыть файл" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5091 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5484 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5114 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5497 msgid "Failed to open the template" msgstr "Ошибка открытия шаблона" @@ -509,83 +527,91 @@ msgstr "Ошибка открытия шаблона" msgid "Failed to optimize repository %s" msgstr "Не удалось оптимизировать репозиторий %s" -#: ../calculate-lib/pym/calculate/lib/utils/common.py:552 +#: ../calculate-lib/pym/calculate/lib/utils/video.py:56 +msgid "Failed to parse EDID information: {}" +msgstr "" + +#: ../calculate-lib/pym/calculate/lib/utils/common.py:536 msgid "Failed to parse Private.sig" msgstr "Не удалось распознать Private.sig" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4762 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4864 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4777 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4886 #, python-format msgid "Failed to read templates directory %s" msgstr "Не удалось прочитать директорию с шаблонами %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4964 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:654 +msgid "Failed to receive portage config" +msgstr "" + +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4986 #, 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:4718 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4733 #, python-format msgid "Failed to remove %s" msgstr "Не удалось удалить %s" -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1624 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1637 #, python-format msgid "Failed to rename data: %s" msgstr "Не удалось переименовать данные: %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5933 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5947 #, python-format msgid "Failed to restart %s service" msgstr "Не удалось перезапустить %s сервис" -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1464 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1477 #, python-brace-format msgid "Failed to rsync {src} to {dst}: {error}" msgstr "Не удалось выполнить rsync {src} to {dst}: {error}" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:322 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:332 msgid "Failed to set btrfs compression" msgstr "Не удалось установить btrfs сжатие" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5935 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5949 #, python-format msgid "Failed to start %s service" msgstr "Не удалось запустить %s сервис" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5934 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5948 #, python-format msgid "Failed to stop %s service" msgstr "Не удалось остановить %s сервис" -#: ../calculate-lib/pym/calculate/lib/encrypt.py:126 -#: ../calculate-lib/pym/calculate/lib/encrypt.py:130 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:124 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:128 #, python-format msgid "Failed to support '%s' encryption algorithm" msgstr "Нет поддержки алгоритма шифрования '%s'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5337 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5358 #, python-brace-format msgid "Failed to synchronize directory {dn}: {error}" msgstr "Не удалось синхронизировать директорию {dn}: {error}" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:254 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:250 #, python-brace-format msgid "Failed to umount {target}" msgstr "Не удалось отключить {target}" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1622 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1621 #, python-brace-format msgid "Failed to unhide packages: {error}" msgstr "Не удалось восстановить спрятанные пакеты: {error}" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1632 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1631 #, python-brace-format msgid "Failed to unhide: {error}" msgstr "Не удалось восстановить спрятанные: {error}" -#: ../calculate-lib/pym/calculate/lib/utils/common.py:538 +#: ../calculate-lib/pym/calculate/lib/utils/common.py:522 msgid "Failed to unwrap the passphrase" msgstr "Не удалось расшифровать фразу-пароль" @@ -595,47 +621,47 @@ msgstr "Не удалось расшифровать фразу-пароль" msgid "Failed to update the repository in {rpath}" msgstr "Не удалось обновить репозиторий в {rpath}" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6188 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6208 #, python-format msgid "Failed to use %s " msgstr "Не удалось использовать %s " -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6192 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6194 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6212 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6214 msgid "Failed to use patch " msgstr "Не удалось применить патч " -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:132 -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:146 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:137 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:151 msgid "Failed to write to file" msgstr "Не удалось записать в файл" -#: ../calculate-lib/pym/calculate/lib/datavars.py:884 +#: ../calculate-lib/pym/calculate/lib/datavars.py:909 msgid "Field variable got not iterable value" msgstr "Field variable got not iterable value" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3330 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3341 #, python-brace-format msgid "Function '{funcname}' used by {template} is deprecated and will be removed in the future" msgstr "Функция '{funcname}', использующаяся шаблоном {template} , устарела и будет удалена в будущем" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1953 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1965 #, python-brace-format msgid "Function takes at least {num}" msgstr "Функция принимает не менее {num}" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1963 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1975 #, python-brace-format msgid "Function takes at most {num}" msgstr "Функция принимает не более {num}" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1957 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1967 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1969 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1979 #, python-brace-format msgid "Function takes exactly {num}" msgstr "Функция принимает ровно {num}" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1949 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1961 msgid "Function takes no arguments" msgstr "Функция не принимает аргументов" @@ -643,22 +669,22 @@ msgstr "Функция не принимает аргументов" msgid "GPG is not initialized" msgstr "GPG не инициализирован" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:329 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:341 #, python-format msgid "Group ID %s not found" msgstr "Не удалось найти идентификатор группы %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5265 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5821 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5286 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5835 msgid "Group not found on the system: " msgstr "Отсутствует группа в системе: " -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4358 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4376 msgid "Headers of directory templates and headers of files on the first level should include an action variable" msgstr "Заголовки шаблонов директорий и файлов первого уровня должны включать в себя переменную действия." -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:61 -#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:150 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:62 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:149 #: ../calculate-lib/pym/calculate/lib/format/xml_xfcepanel.py:81 msgid "" "In the text of the XML template, reserved attribute 'action' comes with an incorrect value.\n" @@ -667,8 +693,8 @@ msgstr "" "В тексте XML-шаблона найден атрибут \"action\" с неправильным значением.\n" "Правильные значения атрибута 'action': (action=\"join\", action=\"replace\", action=\"drop\")" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:151 -#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:101 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:154 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:100 msgid "" "In the text of the XML template, reserved attribute 'action' comes with an incorrect value.\n" "Valid values of the 'action' attribute are: (action=\"join\", action=\"replace\",action=\"drop\")" @@ -676,76 +702,76 @@ msgstr "" "В тексте XML-шаблона найден атрибут \"action\" с неправильным значением.\n" "Правильные значения атрибута 'action': (action=\"join\", action=\"replace\", \"action=\"drop\")" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:143 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:146 #, python-format msgid "Incorrect \"type\" attribute : " msgstr "Неправильный атрибут \"type\" : " -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:187 -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:92 -#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:183 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:190 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:93 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:182 #: ../calculate-lib/pym/calculate/lib/format/xml_xfcepanel.py:111 msgid "Incorrect action=\"drop\" in the root node" msgstr "Неправильно action=\"drop\" в корневой ноде" -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:225 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:231 msgid "Incorrect file format" msgstr "Неправильный формат файла" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1040 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1230 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5124 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5495 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1048 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1239 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5145 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5508 msgid "Incorrect template" msgstr "Неправильный шаблон" -#: ../calculate-lib/pym/calculate/lib/format/patch.py:77 -#: ../calculate-lib/pym/calculate/lib/format/patch.py:90 -#: ../calculate-lib/pym/calculate/lib/format/patch.py:115 +#: ../calculate-lib/pym/calculate/lib/format/patch.py:79 +#: ../calculate-lib/pym/calculate/lib/format/patch.py:92 +#: ../calculate-lib/pym/calculate/lib/format/patch.py:117 msgid "Incorrect template text" msgstr "Неправильный текст шаблона" -#: ../calculate-lib/pym/calculate/lib/format/patch.py:99 -#: ../calculate-lib/pym/calculate/lib/format/patch.py:106 +#: ../calculate-lib/pym/calculate/lib/format/patch.py:101 +#: ../calculate-lib/pym/calculate/lib/format/patch.py:108 #, python-format msgid "Incorrect text of template '%s'" msgstr "Неправильный текст шаблона '%s'" -#: ../calculate-lib/pym/calculate/lib/format/patch.py:95 +#: ../calculate-lib/pym/calculate/lib/format/patch.py:97 msgid "Incorrect text of template ''" msgstr "Неправильный текст шаблона ''" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4029 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4041 msgid "Invalid oct value: " msgstr "Ошибочное значение восьмеричной переменной" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:708 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:710 msgid "Local templates" msgstr "Локальные шаблоны" -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:79 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:84 #, python-format msgid "Lock timeout of %s" msgstr "Таймаут блокировки %s" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1515 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1504 #, python-format msgid "Loop dependence of variables '%s'" msgstr "Циклическая зависимость у переменных '%s'" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:336 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:331 msgid "Manually update config files" msgstr "Обновить конфигурационные файлы вручную" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:295 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:290 msgid "Mark as human modification" msgstr "Отметить как изменено человеком" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:328 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:323 msgid "Method for updating config files" msgstr "Метод обновления конфигурационных файлов" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5760 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5774 #, python-format msgid "Missed source link in template '%s'" msgstr "Пропущено исходное имя ссылки в шаблоне '%s'" @@ -755,36 +781,36 @@ msgstr "Пропущено исходное имя ссылки в шаблон msgid "Need to install {packages}" msgstr "Необходимо установить {packages}" -#: ../calculate-lib/pym/calculate/lib/variables/action.py:59 +#: ../calculate-lib/pym/calculate/lib/variables/action.py:58 msgid "Need to specify an action name" msgstr "Необходимо указать действие" -#: ../calculate-lib/pym/calculate/lib/variables/user.py:98 +#: ../calculate-lib/pym/calculate/lib/variables/user.py:97 msgid "Need to specify user" msgstr "Необходимо указать пользователя" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1756 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1745 msgid "Next" msgstr "Далее" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4067 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4079 msgid "No access to the directory: " msgstr "Нет доступа к директории:" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4342 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4360 msgid "No conditions for checking the value of an action variable" msgstr "Нет условий проверки значения переменной действия" -#: ../calculate-lib/pym/calculate/lib/variables/action.py:62 +#: ../calculate-lib/pym/calculate/lib/variables/action.py:61 msgid "No custom action on this system" msgstr "В системе нет ни одного пользовательского действия" -#: ../calculate-lib/pym/calculate/lib/utils/files.py:1330 +#: ../calculate-lib/pym/calculate/lib/utils/files.py:1343 #, python-format msgid "No directory name available for %s" msgstr "Не удалось найти доступное имя директории для %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2280 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2295 #, python-format msgid "No packages in %s category" msgstr "В категории %s нет пакетов" @@ -794,58 +820,58 @@ msgstr "В категории %s нет пакетов" msgid "No reply from %s" msgstr "Нет ответа от %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:78 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:77 msgid "No space left on device" msgstr "На устройстве не свободного места" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5250 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5804 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5271 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5818 msgid "No such user on the system: " msgstr "Не найден пользователь в системе: " -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:53 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:54 #, python-format msgid "Not found attribute \"name\" in %(tag)s" msgstr "Не найден атрибут \"name\" в %(tag)s" -#: ../calculate-lib/pym/calculate/lib/format/world.py:118 +#: ../calculate-lib/pym/calculate/lib/format/world.py:120 #, python-brace-format msgid "Not found {package} in world" msgstr "Пакет {package} не найден в world" -#: ../calculate-lib/pym/calculate/lib/variables/hardware.py:74 +#: ../calculate-lib/pym/calculate/lib/variables/hardware.py:73 msgid "Number of processors" msgstr "Число процессоров" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6125 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6145 #, python-format msgid "Option %s should be used for format=backgrounds only" msgstr "Параметр %s должен быть использован только с format=backgrounds" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6117 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6137 #, python-format msgid "Option %s should be used for format=dconf only" msgstr "Параметр %s должен быть использован только для format=dconf" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6109 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6129 #, python-format msgid "Option %s should be used for format=patch only" msgstr "Параметр %s должен быть использован только для format=patch" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5171 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5192 #, python-format msgid "Option '%(opt)s' should be used with %(appends)s only" msgstr "Параметр '%(opt)s' должен использоваться только с %(appends)s" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:707 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:709 msgid "Overlay templates" msgstr "Overlay-Шаблоны" -#: ../calculate-lib/pym/calculate/lib/encrypt.py:147 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:145 msgid "Password encryption error, method getHash()" msgstr "Ошибка шифрования пароля, метод getHash()" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:1085 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:1088 msgid "Please select devices for partitions changing" msgstr "Пожалуйста выберите устройства для изменения разделов" @@ -855,7 +881,7 @@ msgstr "Пожалуйста выберите устройства для изм msgid "Reference {mark} not found in repository {url}" msgstr "Ссылка {mark} не найдена в {url} репозитории" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:710 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:712 msgid "Remote templates" msgstr "Удалённые шаблоны" @@ -869,85 +895,85 @@ msgstr "Репозиторий {path} не является Git репозито msgid "Repository {path} is not a directory" msgstr "Репозиторий {path} не является директорией" -#: ../calculate-lib/pym/calculate/lib/utils/ip.py:435 +#: ../calculate-lib/pym/calculate/lib/utils/ip.py:446 msgid "Request timed out" msgstr "Время ожидания истекло" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:1118 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:1121 msgid "Root to all free size should not use with update partition or calculate partition" msgstr "Корень на всё свободное место не должен быть использован с разделом для обновлений или calculate разделом" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:776 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:777 #, python-brace-format msgid "Select the profile with command {cmd}" msgstr "Выберите профиль с помощью команды {cmd}" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5928 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5942 #, python-format msgid "Service %s has been restarted" msgstr "Сервис %s перезапущен" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5930 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5944 #, python-format msgid "Service %s has been started" msgstr "Сервис %s запущен" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5929 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5943 #, python-format msgid "Service %s has been stopped" msgstr "Сервис %s остановлен" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:851 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:852 msgid "Show warning" msgstr "Вывести предупреждение" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:335 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:330 msgid "Skip the update of config files" msgstr "Пропустить обновление конфигурационных файлов" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4354 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4372 msgid "Skipped directories:" msgstr "Пропущенные директории:" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4350 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4368 msgid "Skipped templates:" msgstr "Пропущенные шаблоны:" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4727 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4741 msgid "Some config files need updating. Perform run dispatch-conf." msgstr "Некоторые конфигурационные файлы нуждаются в обновлении. Выполните dispatch-conf." -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5318 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5339 #, python-format msgid "Source path %s is not a directory" msgstr "Исходный путь %s не является директорией" -#: ../calculate-lib/pym/calculate/lib/datavars.py:702 +#: ../calculate-lib/pym/calculate/lib/datavars.py:726 #, python-format msgid "Source variable %s does not contain a list" msgstr "Исходная переменная %s не содержит список" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5578 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5595 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5606 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5641 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5591 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5608 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5619 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5654 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5665 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5688 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5718 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5728 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5739 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5768 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5872 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5667 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5678 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5701 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5731 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5741 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5753 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5782 #: ../calculate-lib/pym/calculate/lib/cl_template.py:5886 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5900 msgid "Template error" msgstr "Ошибка в шаблоне" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6448 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6468 msgid "Template type not found: " msgstr "Тип шаблона не найден: " -#: ../calculate-lib/pym/calculate/lib/variables/env.py:714 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:716 msgid "Templates location" msgstr "Местонахождение шаблонов" @@ -967,11 +993,11 @@ msgstr "Формат 'sqlite' недоступен" msgid "The Git tool is not found" msgstr "Утилита Git не найдена" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:705 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:714 msgid "The function value is not a version" msgstr "Значение функции не является версией" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2397 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2412 msgid "The second argument of the function is not 'root'" msgstr "Второй аргумент функции не 'root'" @@ -979,13 +1005,13 @@ msgstr "Второй аргумент функции не 'root'" msgid "The source text file is not JSON" msgstr "Исходный текст не JSON" -#: ../calculate-lib/pym/calculate/lib/format/world.py:127 +#: ../calculate-lib/pym/calculate/lib/format/world.py:129 msgid "The source text file is not world" msgstr "Исходный текст не является world файлом" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:76 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:78 #: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:75 -#: ../calculate-lib/pym/calculate/lib/format/xml_xfcepanel.py:48 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfcepanel.py:49 msgid "The template content is not XML" msgstr "Текст шаблона не является XML" @@ -993,53 +1019,53 @@ msgstr "Текст шаблона не является XML" msgid "The template text file is not JSON" msgstr "Текст шаблона не JSON" -#: ../calculate-lib/pym/calculate/lib/format/world.py:130 +#: ../calculate-lib/pym/calculate/lib/format/world.py:132 msgid "The template text file is not world" msgstr "Текст шаблона я является world форматом" #: ../calculate-lib/pym/calculate/lib/format/kernel.py:103 #: ../calculate-lib/pym/calculate/lib/format/kernel.py:106 +#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:238 #: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:241 -#: ../calculate-lib/pym/calculate/lib/format/xml_xfce.py:244 msgid "The text file is not XML" msgstr "Текстовый файл не является XML" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:48 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:49 #, python-format msgid "The text is not a valid gconf-XML format (found '<%(tag)s>..')" msgstr "Неправильный текст в gconf-XML формате (найден '<%(tag)s>..')" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:120 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:123 #, python-format msgid "The text is not a valid gconf-XML format (found '<%(tag)s>..')" msgstr "Текст не является правильным gconf-XML-форматом (найдено '<%(tag)s>..')" -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:112 -#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:43 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf.py:115 +#: ../calculate-lib/pym/calculate/lib/format/xml_gconf_tree.py:44 msgid "The text is not a valid gconf-XML format (not found '...')" msgstr "Текст не является правильным gconf-XML форматом (не найдено '...')" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2452 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2467 msgid "The third argument of the function is not 'root'" msgstr "Третий аргумент функции не 'root'" -#: ../calculate-lib/pym/calculate/lib/datavars.py:578 +#: ../calculate-lib/pym/calculate/lib/datavars.py:604 #, python-brace-format msgid "The value for variable '{varname}' may be {vartype}" msgstr "Значение для {varname} может быть {vartype}" -#: ../calculate-lib/pym/calculate/lib/datavars.py:541 -#: ../calculate-lib/pym/calculate/lib/datavars.py:549 +#: ../calculate-lib/pym/calculate/lib/datavars.py:568 +#: ../calculate-lib/pym/calculate/lib/datavars.py:576 #, python-brace-format msgid "The value for variable '{varname}' may be {vartype} only" msgstr "Значение для {varname} может быть только {vartype}" -#: ../calculate-lib/pym/calculate/lib/datavars.py:759 +#: ../calculate-lib/pym/calculate/lib/datavars.py:780 #, python-brace-format msgid "The value for {varname} may be '{vartype}' only" msgstr "Значение для {varname} может быть только '{vartype}'" -#: ../calculate-lib/pym/calculate/lib/datavars.py:536 +#: ../calculate-lib/pym/calculate/lib/datavars.py:563 #, python-brace-format msgid "The value of variable '{varname}' must be integer" msgstr "Значение для {varname} должно быть целым числом" @@ -1047,79 +1073,78 @@ 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 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:214 #, python-brace-format msgid "There is not enough space on this device, to perform the autopartition need {need}" msgstr "На устройстве не хватает свободного места, для выполнения авторазметки необходимо {need}" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:698 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:707 msgid "This value is not a version" msgstr "Значение не версия" -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:279 -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:345 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:285 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:351 #, python-format msgid "Trying to fetch a variable of 'samba' format from file %s ('plasma' format)" msgstr "Из файла %s (format - 'plasma') пытаемся получить переменную в формате 'samba'" -#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:172 +#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:177 #, python-format msgid "Trying to write a variable of 'samba' format to file %s ('plasma' format)" msgstr "В файл %s (format - 'plasma') пытаемся записать переменную в формате 'samba'" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1682 -#: ../calculate-lib/pym/calculate/lib/datavars.py:1717 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1671 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1706 #, python-format msgid "Unable to find alias '%s' for the template variables path" msgstr "Не удалось найти псевдоним '%s' пути хранения переменных шаблонов" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1677 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1666 #, python-brace-format msgid "Unable to write variable {varname} into '{location}'" msgstr "Не удалось записать переменную {varname} в '{location}'" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:334 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:329 msgid "Use the new config files" msgstr "Использовать новые конфигурационные файлы" -#: ../calculate-lib/pym/calculate/lib/variables/user.py:102 +#: ../calculate-lib/pym/calculate/lib/variables/user.py:101 #, python-format msgid "User %s does not exist" msgstr "Пользователь %s не существует" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:322 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:334 #, python-format msgid "User %s not found" msgstr "Не найден пользователь %s" -#: ../calculate-lib/pym/calculate/lib/variables/user.py:89 +#: ../calculate-lib/pym/calculate/lib/variables/user.py:88 msgid "User name" msgstr "Имя пользователя" -#: ../calculate-lib/pym/calculate/lib/datavars.py:574 +#: ../calculate-lib/pym/calculate/lib/datavars.py:600 #, python-brace-format msgid "Values for variable '{varname}' may be {vartype}" msgstr "Значения для {varname} может быть {vartype}" -#: ../calculate-lib/pym/calculate/lib/datavars.py:545 +#: ../calculate-lib/pym/calculate/lib/datavars.py:572 #, python-brace-format msgid "Values for variable '{varname}' may be {vartype} only" msgstr "Значения для '{varname}' может быть только {vartype}" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1313 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1300 #, python-format msgid "Variable %s not found" msgstr "Не найдена переменная %s" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:424 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:418 msgid "Verbose output" msgstr "Подробный вывод" -#: ../calculate-lib/pym/calculate/lib/variables/hardware.py:199 +#: ../calculate-lib/pym/calculate/lib/variables/hardware.py:196 msgid "Videocard" msgstr "Видеокарта" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3857 msgid "Waiting for emerge to be complete" msgstr "Ожидание завершения выполнения emerge" @@ -1134,12 +1159,12 @@ msgstr "Неправильное разрешение формата 'background msgid "Wrong 'contents' format rule: %s" msgstr "Неправильное правило формата 'contents': %s" -#: ../calculate-lib/pym/calculate/lib/utils/accounts.py:201 +#: ../calculate-lib/pym/calculate/lib/utils/accounts.py:204 #, python-brace-format msgid "Wrong GIDs {gid1} {gid2}" msgstr "Неправильные идентификаторы групп {gid1} {gid2}" -#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:308 +#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:312 msgid "Wrong Packages signature" msgstr "Неправильная подпись Packages" @@ -1148,7 +1173,7 @@ msgstr "Неправильная подпись Packages" msgid "Wrong UIDs {uid1} {uid2}" msgstr "Неправильные идентификаторы пользователей {uid1} {uid2}" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:199 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:197 #, python-format msgid "" "Wrong df output:\n" @@ -1157,24 +1182,24 @@ msgstr "" "Неправильный вывод df:\n" "%s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3382 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3393 #, python-brace-format msgid "Wrong entry '{data}' for {var_name}" msgstr "Неправильная запись '{data}' для '{var_name}'" -#: ../calculate-lib/pym/calculate/lib/datavars.py:767 +#: ../calculate-lib/pym/calculate/lib/datavars.py:788 #, python-brace-format msgid "Wrong entry '{entry}' for table variable '{varname}'" msgstr "Неправильная запись '{entry}' для табличной переменной '{varname}'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6169 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6189 #, python-format msgid "Wrong header parameter 'format=%s' in template" msgstr "Неправильный параметр заголовка 'format=%s' в шаблоне" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6233 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6355 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6365 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6254 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6375 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6385 #, python-brace-format msgid "Wrong header parameter '{var}={val}' in template" msgstr "Неправильный параметр заголовка '{var}={val}' в шаблоне" @@ -1184,24 +1209,24 @@ msgstr "Неправильный параметр заголовка '{var}={val msgid "Wrong image format '%s'" msgstr "Неправильный формат изображения '%s'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:525 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:674 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:716 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:534 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:683 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:725 msgid "Wrong interval operator" msgstr "Неправильный оператор интервалов" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6134 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6154 #, 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:6296 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6324 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6316 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6344 #, python-brace-format msgid "Wrong option '{var}={val}' in template {fn}" msgstr "Неправильный параметр '{var}={val}' в шаблоне {fn}" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2611 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2622 msgid "Wrong regular expression" msgstr "Неправильное регулярное выражение" @@ -1211,51 +1236,55 @@ msgstr "Неправильное регулярное выражение" msgid "Wrong repository in the {rpath} directory" msgstr "Не правильный репозиторий в {rpath} директории" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6240 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6372 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6408 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6418 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6261 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6392 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6427 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6437 msgid "Wrong template" msgstr "Ошибка шаблона" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6444 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6464 msgid "Wrong template option (type append)" msgstr "Неправильный параметр (type append) шаблона" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5145 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5156 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5230 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5253 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5268 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5285 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5290 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5516 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5528 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5561 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5784 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5806 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5823 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5834 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5840 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5166 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5177 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5251 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5274 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5289 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5306 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5311 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5529 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5541 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5574 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5798 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5820 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5837 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5848 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5854 #, python-format msgid "Wrong value '%s' in the template" msgstr "Неправильное значение '%s' в шаблоне" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5567 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5580 #, python-brace-format msgid "Wrong value '{var}={val}' in template" msgstr "Неправильное значение '{var}={val}' в шаблоне" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1485 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1476 #, python-format msgid "Wrong variable name %s" msgstr "Неправильное имя переменной %s" -#: ../calculate-lib/pym/calculate/lib/utils/partition.py:1095 +#: ../calculate-lib/pym/calculate/lib/utils/partition.py:1098 msgid "You should use LVM to install on more that one device" msgstr "Вы должны использовать LVM для установки на более, чем одно устройство" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:711 +#: ../calculate-lib/pym/calculate/contrib/passlib/ext/django/utils.py:957 +msgid "algorithm" +msgstr "" + +#: ../calculate-lib/pym/calculate/lib/variables/env.py:713 msgid "clt templates" msgstr "clt шаблоны" @@ -1263,144 +1292,144 @@ msgstr "clt шаблоны" msgid "custom action" msgstr "произвольное действие" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1623 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1622 msgid "directory not found" msgstr "директория не найдена" -#: ../calculate-lib/pym/calculate/lib/encrypt.py:76 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:74 msgid "empty password" msgstr "пароль пуст" -#: ../calculate-lib/pym/calculate/lib/datavars.py:1318 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3729 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5011 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:5019 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3740 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5034 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:5042 +#: ../calculate-lib/pym/calculate/lib/datavars.py:1305 msgid "error" msgstr "ошибка" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:303 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2752 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3609 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:315 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2763 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3620 #, python-format msgid "error in template %s" msgstr "ошибка в шаблоне %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3610 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3621 #, python-format msgid "error, template term '%s'" msgstr "ошибка, часть шаблона '%s'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2845 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2856 msgid "error: global variables stack empty" msgstr "ошибка: стек глобальных переменных пуст" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2183 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2194 #, python-format msgid "error: local variable %s not defined" msgstr "ошибка: локальная переменная %s не определена" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2189 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2200 #, python-format msgid "error: template term %s, incorrect data" msgstr "ошибка: часть шаблона %s, неправильные данные" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2331 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2783 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2818 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3474 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3517 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2346 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2794 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2829 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3485 #: ../calculate-lib/pym/calculate/lib/cl_template.py:3528 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3539 #, python-format msgid "error: variable %s does not exist" msgstr "ошибка: переменная %s не существует" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2812 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2823 #, python-format msgid "error: variable %s exists" msgstr "ошибка: переменная %s существует" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2172 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2179 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2183 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2190 #, python-format msgid "error: variable %s is not integer" msgstr "ошибка: переменная %s не является числом" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2753 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2764 #, python-format msgid "error: variable %s not found" msgstr "ошибка: переменная %s не найдена" -#: ../calculate-lib/pym/calculate/lib/utils/ip.py:415 +#: ../calculate-lib/pym/calculate/lib/utils/ip.py:426 #, python-format msgid "failed. (socket error: '%s')" msgstr "неудача. (ошибка сокета: '%s')" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2659 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2670 msgid "first parameter must be number" msgstr "первый параметр должен быть числом" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3666 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3677 #, python-format msgid "function of templates '%s' not found" msgstr "не найдена функция шаблонов '%s'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2687 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2698 msgid "function rnd support one or two arguments only" msgstr "функция rnd поддерживает только один или два аргумента" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3032 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3043 msgid "function support two or three parameters" msgstr "функция поддерживает только два или три параметра" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:593 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:604 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:612 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:622 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:672 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:696 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:703 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:714 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:765 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:776 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:602 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:613 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:621 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:631 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:681 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:705 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:712 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:723 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:774 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:785 msgid "incorrect" msgstr "неправильно" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1085 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1108 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1274 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1291 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1093 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1116 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1283 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1300 #, python-format msgid "incorrect header parameter: '%s'" msgstr "неправильный параметр заголовка - '%s'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1219 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1228 #, python-format msgid "incorrect text in the template: '%s'" msgstr "неправильный текст в шаблоне: '%s'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4143 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4155 msgid "invalid template content: " msgstr "шаблон содержит ошибку: " -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4159 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4170 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4171 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4182 msgid "invalid template name: " msgstr "имя шаблона неправильно:" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2699 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2710 #, python-brace-format msgid "length of UUID must not be above {maxlen}" msgstr "длина UUID не должна превышать {maxlen}" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:327 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:322 msgid "manually update config files" msgstr "обновить конфигурационные файлы вручную" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:294 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:289 msgid "mark as human modification" msgstr "отметить как изменено человеком" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3553 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3564 #, python-format msgid "mount point '/' or '/%s' not found in the value of variable os_disk_install" msgstr "в значении переменной os_disk_install не найдена точка монтирования '' или '\\%s'" @@ -1408,145 +1437,145 @@ msgstr "в значении переменной os_disk_install не найде msgid "need {need}" msgstr "необходимо {need}" -#: ../calculate-lib/pym/calculate/lib/utils/text.py:391 +#: ../calculate-lib/pym/calculate/lib/utils/text.py:388 msgid "or" msgstr "или" -#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1581 +#: ../calculate-lib/pym/calculate/lib/utils/portage.py:1580 msgid "package is already hidden" msgstr "пакет уже спрятан" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1101 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1283 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1109 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1292 #, python-format msgid "redefine header parameter: '%s'" msgstr "переопределение параметра заголовка: %s" -#: ../calculate-lib/pym/calculate/lib/utils/text.py:256 +#: ../calculate-lib/pym/calculate/lib/utils/text.py:253 msgid "rows" msgstr "строки" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:715 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:717 #, python-format msgid "select location for templates %s" msgstr "выбор местонахождения шаблонов %s" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:326 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:321 msgid "skip the update of config files" msgstr "пропустить обновление конфигурационных файлов" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1042 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1232 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1050 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1241 msgid "template header not valid" msgstr "неправильный заголовок шаблона" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3241 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3252 #, python-format msgid "template variable '%s' not found" msgstr "не найдена переменная шаблонов '%s'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4877 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4899 #, python-brace-format msgid "templates in {tempath} are skipped" msgstr "шаблоны в {tempath} пропущены" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2741 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2752 msgid "the first argument of the function is neither 'upper' or 'lower' or 'capitalize'" msgstr "первый аргумент функции не 'upper' или 'lower' или 'capitalize'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2456 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2471 msgid "the first argument of the function is neither 'ver' or 'num' or 'char' or 'empty'" msgstr "первый аргумент функции не 'ver' или 'num' или 'char' или 'empty'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2710 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2721 msgid "the first argument of the function must be 'num', 'pas' or 'uuid'" msgstr "первый аргумент функции должен быть 'num', 'pas' или 'uuid'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3043 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3054 msgid "the first parameter must be the resolution" msgstr "первый параметр должен быть разрешением" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2583 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2594 msgid "the option name should not starts with CONFIG_" msgstr "имя параметра не должно начинаться с CONFIG_" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2692 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2703 msgid "the second argument of the function is not a number" msgstr "второй аргумент функции не является числом" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3168 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3176 msgid "the third argument of the function is neither 'url' or 'purl' or 'unicode'" msgstr "третий аргумент функции не 'url', не 'purl' и не 'unicode'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3027 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3038 msgid "third parameter may be 'file' only" msgstr "третий параметр может быть только 'file'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1559 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1574 #, python-format msgid "unable to execute '%s'" msgstr "Не удалось выполнить '%s'" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1593 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1608 msgid "unable to open the directory as file:" msgstr "не удалось открыть директорию как файл:" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1548 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1568 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:1598 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1563 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1583 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:1613 msgid "unable to open the file:" msgstr "не удалось открыть файл:" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4416 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:6667 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4433 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:6690 msgid "undefined variable: " msgstr "не определена переменная:" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:325 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:320 msgid "use the new config files" msgstr "использовать новые конфигурационные файлы" -#: ../calculate-lib/pym/calculate/lib/variables/user.py:88 +#: ../calculate-lib/pym/calculate/lib/variables/user.py:87 msgid "username" msgstr "имя пользователя" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3478 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3536 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3489 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3547 #, python-format msgid "value of %s is not a list or a tuple" msgstr "значение %s не является списком или кортежем" -#: ../calculate-lib/pym/calculate/lib/variables/env.py:423 +#: ../calculate-lib/pym/calculate/lib/variables/env.py:417 msgid "verbose output" msgstr "подробный вывод" -#: ../calculate-lib/pym/calculate/lib/encrypt.py:127 +#: ../calculate-lib/pym/calculate/lib/encrypt.py:125 msgid "without py-smbpasswd" msgstr "без py-smbpasswd" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3510 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3527 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3521 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3538 #, python-format msgid "wrong %s" msgstr "%s ошибочно" -#: ../calculate-lib/pym/calculate/lib/utils/text.py:316 +#: ../calculate-lib/pym/calculate/lib/utils/text.py:313 #, python-format msgid "wrong dict value: %s" msgstr "неправильное значение словаря: %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:3638 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:3649 #, python-format msgid "wrong function syntax %s" msgstr "неправильный синтаксис функции %s" -#: ../calculate-lib/pym/calculate/lib/utils/text.py:343 +#: ../calculate-lib/pym/calculate/lib/utils/text.py:340 #, python-format msgid "wrong list value: %s" msgstr "неправильное значение списка: %s" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2403 -#: ../calculate-lib/pym/calculate/lib/cl_template.py:2468 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2418 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:2483 #, python-format msgid "wrong path '%s'" msgstr "неправильный путь '%s'" @@ -1554,7 +1583,7 @@ msgstr "неправильный путь '%s'" msgid "{avail} available, need at {need} more" msgstr "{avail} доступно, необходимо на {need} больше" -#: ../calculate-lib/pym/calculate/lib/cl_template.py:4875 +#: ../calculate-lib/pym/calculate/lib/cl_template.py:4897 #, python-brace-format msgid "{dirpath} is a file" msgstr "{dirpath} файл" @@ -1564,6 +1593,10 @@ msgstr "{dirpath} файл" msgid "{url} does not appear to be a git repository" msgstr "{url} не является git репозиторием" -#: ../calculate-lib/pym/calculate/lib/utils/mount.py:284 +#: ../calculate-lib/pym/calculate/lib/utils/mount.py:296 msgid "{} is not btrfs" msgstr "{} не btrfs" + +#: ../calculate-lib/pym/calculate/lib/utils/video.py:46 +msgid "{} not found" +msgstr "" diff --git a/ru/cl_update3.po b/ru/cl_update3.po index 8b556d3..983470b 100644 --- a/ru/cl_update3.po +++ b/ru/cl_update3.po @@ -11,60 +11,60 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../calculate-update/pym/update/update.py:720 +#: ../calculate-update/pym/update/update.py:721 #, python-brace-format msgid " ({current} of {maximum})" msgstr " ({current} из {maximum})" -#: ../calculate-update/pym/update/variables/update.py:816 +#: ../calculate-update/pym/update/variables/update.py:829 #, python-format msgid "%s overlay templates" msgstr "Шаблоны %s оверлея" -#: ../calculate-update/pym/update/update.py:666 +#: ../calculate-update/pym/update/update.py:667 #, python-brace-format msgid "({current} of {maximum})" msgstr "({current} из {maximum})" -#: ../calculate-update/pym/update/update.py:438 +#: ../calculate-update/pym/update/update.py:439 msgid ": " msgstr ": " -#: ../calculate-update/pym/update/update.py:755 +#: ../calculate-update/pym/update/update.py:756 msgid "Assigning files to packages" msgstr "Определение пакетов по файлам" -#: ../calculate-update/pym/update/variables/update.py:1353 +#: ../calculate-update/pym/update/variables/update.py:1366 msgid "Automatically check updates" msgstr "Автоматически проверять обновления" -#: ../calculate-update/pym/update/update.py:1632 +#: ../calculate-update/pym/update/update.py:1633 msgid "Binary packages on the current binhost {} are older than local" msgstr "Бинарные пакеты на текущем сервере обновлений {} старее локальных" -#: ../calculate-update/pym/update/variables/update.py:796 +#: ../calculate-update/pym/update/variables/update.py:809 msgid "Calculate overlay templates" msgstr "Шаблоны оверлея Calculate" -#: ../calculate-update/pym/update/utils/cl_update.py:264 -#: ../calculate-update/pym/update/utils/cl_update.py:282 -#: ../calculate-update/pym/update/utils/cl_update.py:306 +#: ../calculate-update/pym/update/utils/cl_update.py:271 +#: ../calculate-update/pym/update/utils/cl_update.py:302 +#: ../calculate-update/pym/update/utils/cl_update.py:326 msgid "Calculating dependencies" msgstr "Вычисление зависимостей" -#: ../calculate-update/pym/update/wsdl_update.py:102 +#: ../calculate-update/pym/update/wsdl_update.py:103 msgid "Change the Profile" msgstr "Смена профиля" -#: ../calculate-update/pym/update/variables/update.py:549 +#: ../calculate-update/pym/update/variables/update.py:562 msgid "Check Package signature" msgstr "Проверить подпись Packages" -#: ../calculate-update/pym/update/update.py:1466 +#: ../calculate-update/pym/update/update.py:1467 msgid "Check packages index signature" msgstr "Проверка подписи индекса пакетов" -#: ../calculate-update/pym/update/variables/update.py:1624 +#: ../calculate-update/pym/update/variables/update.py:1646 msgid "Check the repositories integrity" msgstr "Проверить целостность репозиториев" @@ -72,11 +72,11 @@ msgstr "Проверить целостность репозиториев" msgid "Checking current binhost" msgstr "Проверка текущего сервера обновлений" -#: ../calculate-update/pym/update/utils/cl_update.py:261 +#: ../calculate-update/pym/update/utils/cl_update.py:268 msgid "Checking for updates" msgstr "Проверка обновлений" -#: ../calculate-update/pym/update/utils/cl_update.py:343 +#: ../calculate-update/pym/update/utils/cl_update.py:363 msgid "Checking reverse dependencies" msgstr "Проверка обратных зависимостей" @@ -85,7 +85,7 @@ msgstr "Проверка обратных зависимостей" msgid "Checking {eachvar:capitalize} updates" msgstr "Проверка обновлений {eachvar:capitalize}" -#: ../calculate-update/pym/update/variables/update.py:1474 +#: ../calculate-update/pym/update/variables/update.py:1487 msgid "Clean obsolete programs archives" msgstr "Удалять устаревшие архивы программ" @@ -93,15 +93,15 @@ msgstr "Удалять устаревшие архивы программ" msgid "Cleaning the history of the {eachvar:capitalize} repository" msgstr "Удаление истории репозитория {eachvar:capitalize}" -#: ../calculate-update/pym/update/utils/cl_update.py:303 +#: ../calculate-update/pym/update/utils/cl_update.py:323 msgid "Cleaning the system from needless packages" msgstr "Очистка системы от ненужных пакетов" -#: ../calculate-update/pym/update/variables/update.py:1652 +#: ../calculate-update/pym/update/variables/update.py:1674 msgid "Clear the history of repositories" msgstr "Очистить историю репозиториев" -#: ../calculate-update/pym/update/wsdl_update.py:154 +#: ../calculate-update/pym/update/wsdl_update.py:155 msgid "Configuration" msgstr "Настройка" @@ -109,57 +109,57 @@ msgstr "Настройка" msgid "Configuration manually interrupted" msgstr "Настройка прервана пользователем" -#: ../calculate-update/pym/update/update.py:389 +#: ../calculate-update/pym/update/update.py:390 msgid "Configuration variables for repositories are not setup" msgstr "Переменные конфигурации репозиториев не настроены" -#: ../calculate-update/pym/update/variables/update.py:1385 +#: ../calculate-update/pym/update/variables/update.py:1398 msgid "Consider the autocheck schedule" msgstr "Учитывать график автопроверки" -#: ../calculate-update/pym/update/update.py:1612 +#: ../calculate-update/pym/update/update.py:1613 msgid "Current binhost is absent in list of update servers" msgstr "Текущий сервер обновлений отсутствует в списке серверов обновлений" -#: ../calculate-update/pym/update/update.py:1655 +#: ../calculate-update/pym/update/update.py:1656 msgid "Current binhost {} has wrong signature" msgstr "Текущий сервер обновлений {} содержит неверную подпись" -#: ../calculate-update/pym/update/update.py:1626 +#: ../calculate-update/pym/update/update.py:1627 msgid "Current binhost {} is not valid" msgstr "Текущий сервер обновлений {} нерабочий" -#: ../calculate-update/pym/update/update.py:1629 +#: ../calculate-update/pym/update/update.py:1630 msgid "Current binhost {} is outdated" msgstr "Текущий сервер обновлений {} устарел" -#: ../calculate-update/pym/update/variables/update.py:729 +#: ../calculate-update/pym/update/variables/update.py:742 msgid "Distribution name" msgstr "Название дистрибутива" -#: ../calculate-update/pym/update/variables/update.py:797 -#: ../calculate-update/pym/update/variables/update.py:798 +#: ../calculate-update/pym/update/variables/update.py:810 +#: ../calculate-update/pym/update/variables/update.py:811 msgid "Distribution templates" msgstr "Шаблоны дистрибутива" -#: ../calculate-update/pym/update/emerge_parser.py:395 +#: ../calculate-update/pym/update/emerge_parser.py:398 msgid "Emerge failed" msgstr "Выполнение Emerge завершилось с ошибкой" -#: ../calculate-update/pym/update/update.py:332 +#: ../calculate-update/pym/update/update.py:334 msgid "Emerge is running. Try to run later." msgstr "Emerge уже запущен. Попытайтесь запустить позже." -#: ../calculate-update/pym/update/variables/update.py:1398 +#: ../calculate-update/pym/update/variables/update.py:1411 msgid "Emerge-like packages list" msgstr "Список пакетов в формате emerge" -#: ../calculate-update/pym/update/update.py:684 +#: ../calculate-update/pym/update/update.py:685 #, python-brace-format msgid "Emerging {package}" msgstr "Сборка {package}" -#: ../calculate-update/pym/update/update.py:1183 +#: ../calculate-update/pym/update/update.py:1184 msgid "Failed to apply profiles templates" msgstr "Не удалось выполнить шаблоны профиля" @@ -167,28 +167,28 @@ msgstr "Не удалось выполнить шаблоны профиля" msgid "Failed to configure the updates autocheck procedure!" msgstr "Не удалось настроить параметры автопроверки обновлений!" -#: ../calculate-update/pym/update/update.py:614 +#: ../calculate-update/pym/update/update.py:615 msgid "Failed to create previous eix" msgstr "Не удалось создать предыдущую копию базы eix" -#: ../calculate-update/pym/update/update.py:1149 +#: ../calculate-update/pym/update/update.py:1150 #, python-format msgid "Failed to determine profile %s" msgstr "Не удалось определить профиль %s" -#: ../calculate-update/pym/update/variables/update.py:945 -#: ../calculate-update/pym/update/variables/update.py:950 +#: ../calculate-update/pym/update/variables/update.py:958 +#: ../calculate-update/pym/update/variables/update.py:963 msgid "Failed to determine the repository host" msgstr "Не удалось определить хост репозитория" -#: ../calculate-update/pym/update/emerge_parser.py:629 +#: ../calculate-update/pym/update/emerge_parser.py:633 #, python-format msgid "Failed to emerge %s" msgstr "Не удалось собрать %s" -#: ../calculate-update/pym/update/update.py:736 -#: ../calculate-update/pym/update/update.py:748 -#: ../calculate-update/pym/update/update.py:1687 +#: ../calculate-update/pym/update/update.py:737 +#: ../calculate-update/pym/update/update.py:749 +#: ../calculate-update/pym/update/update.py:1688 #, python-format msgid "Failed to find the %s command" msgstr "Не удалось найти %s команду" @@ -197,29 +197,29 @@ msgstr "Не удалось найти %s команду" msgid "Failed to find the binary updates server" msgstr "Не удалось найти сервер бинарных обновлений" -#: ../calculate-update/pym/update/update.py:1598 +#: ../calculate-update/pym/update/update.py:1599 msgid "Failed to find the reliable server with appropriate updates" msgstr "Не удалось найти доверенный сервер с актуальными обновлениями" -#: ../calculate-update/pym/update/update.py:1292 -#: ../calculate-update/pym/update/update.py:1602 +#: ../calculate-update/pym/update/update.py:1293 +#: ../calculate-update/pym/update/update.py:1603 msgid "Failed to find the server with appropriate updates" msgstr "Не удалось найти сервер с актуальными обновлениями" -#: ../calculate-update/pym/update/update.py:1604 +#: ../calculate-update/pym/update/update.py:1605 msgid "Failed to find the working server with updates" msgstr "Не удалось найти рабочий сервер обновлений" -#: ../calculate-update/pym/update/update.py:1402 +#: ../calculate-update/pym/update/update.py:1403 msgid "Failed to get values for binhost search" msgstr "Не удалось получить значения для поиска серверов обновлений" -#: ../calculate-update/pym/update/update.py:1444 +#: ../calculate-update/pym/update/update.py:1445 #, python-format msgid "Failed to load public keys from '%s' for signature checking" msgstr "Не удалось загрузить открытые ключи из '%s' для проверки подписи" -#: ../calculate-update/pym/update/update.py:436 +#: ../calculate-update/pym/update/update.py:437 #, python-brace-format msgid "Failed to modify the {repname} repository" msgstr "Не удалось изменить репозиторий {repname}" @@ -229,34 +229,34 @@ msgstr "Не удалось изменить репозиторий {repname}" msgid "Failed to move the profile: %s" msgstr "Не удалось переместить профиль: %s" -#: ../calculate-update/pym/update/update.py:1373 +#: ../calculate-update/pym/update/update.py:1374 msgid "Failed to remove cached Package index" msgstr "Не удалось удалить кэш индекса пакетов" -#: ../calculate-update/pym/update/update.py:1364 +#: ../calculate-update/pym/update/update.py:1365 msgid "Failed to remove cached ini.env of binary repository" msgstr "Не удалось удалить закэшированный ini.env бинарного репозитория" -#: ../calculate-update/pym/update/update.py:1464 +#: ../calculate-update/pym/update/update.py:1465 msgid "Failed to save Packages" msgstr "Не удалось сохранить Packages" -#: ../calculate-update/pym/update/update.py:1157 -#: ../calculate-update/pym/update/update.py:1164 +#: ../calculate-update/pym/update/update.py:1158 +#: ../calculate-update/pym/update/update.py:1165 #, python-format msgid "Failed to set the profile: %s" msgstr "Не удалось установить профиль: %s" -#: ../calculate-update/pym/update/update.py:637 +#: ../calculate-update/pym/update/update.py:638 msgid "Failed to update eix cache" msgstr "Не удалось обновить кэш eix" -#: ../calculate-update/pym/update/update.py:593 +#: ../calculate-update/pym/update/update.py:594 msgid "Failed to update metadata" msgstr "Не удалось обновить метаданные" -#: ../calculate-update/pym/update/update.py:561 -#: ../calculate-update/pym/update/update.py:572 +#: ../calculate-update/pym/update/update.py:562 +#: ../calculate-update/pym/update/update.py:573 #, python-brace-format msgid "Failed to update the cache of the {rname} repository" msgstr "Не удалось обновить кэш {rname} репозитория" @@ -265,7 +265,7 @@ msgstr "Не удалось обновить кэш {rname} репозитори msgid "Failed to update the profile" msgstr "Не удалось обновить профиль" -#: ../calculate-update/pym/update/update.py:532 +#: ../calculate-update/pym/update/update.py:533 #, python-brace-format msgid "Failed to update the {rname} repository" msgstr "Не удалось обновить репозиторий {rname}" @@ -274,7 +274,7 @@ msgstr "Не удалось обновить репозиторий {rname}" msgid "Failed to use base binhost" msgstr "Ну удалось использовать базовый сервер обновлений" -#: ../calculate-update/pym/update/update.py:1124 +#: ../calculate-update/pym/update/update.py:1125 msgid "Failed to use the new profile. Try again." msgstr "Не удалось установить профиль. Попытайтесь еще раз." @@ -282,72 +282,69 @@ msgstr "Не удалось установить профиль. Попытай msgid "Fallback syncing the {eachvar:capitalize} repository" msgstr "Резервная синхронизация репозитория {eachvar:capitalize}" -#: ../calculate-update/pym/update/update.py:709 +#: ../calculate-update/pym/update/update.py:710 msgid "Fetching binary packages" msgstr "Получение бинарных пакетов" -#: ../calculate-update/pym/update/utils/cl_update.py:293 +#: ../calculate-update/pym/update/utils/cl_update.py:313 msgid "Find & rebuild packages and Perl header files broken due to a perl upgrade" msgstr "Поиск и пересборка пакетов и Perl header файлов, повреждённых при обновлении Perl" -#: ../calculate-update/pym/update/utils/cl_update.py:384 +#: ../calculate-update/pym/update/utils/cl_update.py:406 #: ../calculate-update/pym/update/utils/cl_update_profile.py:127 msgid "Fixing the settings" msgstr "Исправление настроек" -#: ../calculate-update/pym/update/variables/update.py:481 -#: ../calculate-update/pym/update/variables/update.py:505 -#: ../calculate-update/pym/update/variables/update.py:529 -#: ../calculate-update/pym/update/variables/update.py:552 +#: ../calculate-update/pym/update/variables/update.py:494 +#: ../calculate-update/pym/update/variables/update.py:518 +#: ../calculate-update/pym/update/variables/update.py:542 +#: ../calculate-update/pym/update/variables/update.py:565 msgid "Force" msgstr "Принудительно" -#: ../calculate-update/pym/update/variables/update.py:1638 +#: ../calculate-update/pym/update/variables/update.py:1660 msgid "Force fix the settings" msgstr "Принудительно исправлять настройки" -#: ../calculate-update/pym/update/update.py:393 +#: ../calculate-update/pym/update/update.py:394 #, python-format msgid "Git %s is unavailable" msgstr "Git %s недоступен" -#: ../calculate-update/pym/update/variables/update.py:554 +#: ../calculate-update/pym/update/variables/update.py:567 msgid "If has passibility" msgstr "Если возможно" -#: ../calculate-update/pym/update/variables/update.py:483 -#: ../calculate-update/pym/update/variables/update.py:507 -#: ../calculate-update/pym/update/variables/update.py:531 +#: ../calculate-update/pym/update/variables/update.py:496 +#: ../calculate-update/pym/update/variables/update.py:520 +#: ../calculate-update/pym/update/variables/update.py:544 msgid "If needed" msgstr "По необходимости" -#: ../calculate-update/pym/update/update.py:702 +#: ../calculate-update/pym/update/update.py:703 #, python-format msgid "Installing %s" msgstr "Установка %s" -#: ../calculate-update/pym/update/update.py:698 +#: ../calculate-update/pym/update/update.py:699 #, python-brace-format msgid "Installing {pkg} [{oldver}]" msgstr "Установка {pkg} [{oldver}]" -#: ../calculate-update/pym/update/variables/update.py:1366 +#: ../calculate-update/pym/update/variables/update.py:1379 msgid "Interval for the updates checking" msgstr "Интервал проверки обновлений" -msgid "Layman cache update" -msgstr "Обновление кэша Layman" - -#: ../calculate-update/pym/update/update.py:823 +#: ../calculate-update/pym/update/update.py:824 msgid "Listing packages for installation" msgstr "Список пакетов для установки" -#: ../calculate-update/pym/update/update.py:827 -#: ../calculate-update/pym/update/update.py:852 +#: ../calculate-update/pym/update/update.py:828 +#: ../calculate-update/pym/update/update.py:853 msgid "Listing packages for removal" msgstr "Список удаляемых пакетов" -#: ../calculate-update/pym/update/variables/update.py:795 +#: ../calculate-update/pym/update/variables/update.py:808 msgid "Local templates" msgstr "Локальные шаблоны" @@ -363,41 +360,41 @@ msgstr "Объединить" msgid "Metadata transfer" msgstr "Перемещение метаданных" -#: ../calculate-update/pym/update/update.py:362 +#: ../calculate-update/pym/update/update.py:364 #, python-brace-format msgid "Move {repname} from {laymandir} to {reposdir}" msgstr "Перемещение {repname} из {laymandir} в {reposdir}" -#: ../calculate-update/pym/update/variables/update.py:826 +#: ../calculate-update/pym/update/variables/update.py:839 msgid "Name" msgstr "Название" -#: ../calculate-update/pym/update/variables/update.py:650 +#: ../calculate-update/pym/update/variables/update.py:663 msgid "Only synchronize repositories" msgstr "Только синхронизировать репозитории" -#: ../calculate-update/pym/update/variables/update.py:1219 +#: ../calculate-update/pym/update/variables/update.py:1232 #, python-format msgid "Overlay %s is not specified in cl_update_rep_name" msgstr "Оверлей %s не указан в переменной cl_update_rep_name" -#: ../calculate-update/pym/update/variables/update.py:794 +#: ../calculate-update/pym/update/variables/update.py:807 msgid "Overlay templates" msgstr "Шаблоны оверлея" -#: ../calculate-update/pym/update/update.py:296 +#: ../calculate-update/pym/update/update.py:298 msgid "Please wait for the update time" msgstr "Время для проверки обновлений еще не пришло" -#: ../calculate-update/pym/update/variables/update.py:635 +#: ../calculate-update/pym/update/variables/update.py:648 msgid "Pretend a package update" msgstr "Симулировать обновление пакетов" -#: ../calculate-update/pym/update/wsdl_update.py:131 +#: ../calculate-update/pym/update/wsdl_update.py:132 msgid "Profile" msgstr "Профиль" -#: ../calculate-update/pym/update/update.py:1157 +#: ../calculate-update/pym/update/update.py:1158 msgid "Profile not found" msgstr "Профиль не найден" @@ -405,7 +402,7 @@ msgstr "Профиль не найден" msgid "Profile not found in master" msgstr "Профиль не найден в master ветке" -#: ../calculate-update/pym/update/variables/update.py:918 +#: ../calculate-update/pym/update/variables/update.py:931 msgid "Profile repository" msgstr "Репозиторий профиля" @@ -413,11 +410,11 @@ msgstr "Репозиторий профиля" msgid "Profile update manually interrupted" msgstr "Обновление прервано пользователем" -#: ../calculate-update/pym/update/update.py:1448 +#: ../calculate-update/pym/update/update.py:1449 msgid "Public keys for Packages signature checking not found" msgstr "Открытые ключи для проверки подписи Packages не найдены" -#: ../calculate-update/pym/update/update.py:424 +#: ../calculate-update/pym/update/update.py:425 #, python-brace-format msgid "Re-fetching the {name} repository" msgstr "Повторное получение {name} репозитория" @@ -431,15 +428,15 @@ msgstr "Переформировать" msgid "Rebuild world" msgstr "переформировать world файл" -#: ../calculate-update/pym/update/utils/cl_update.py:315 +#: ../calculate-update/pym/update/utils/cl_update.py:335 msgid "Rebuilding dependent modules" msgstr "Пересборка зависимых модулей" -#: ../calculate-update/pym/update/variables/update.py:388 +#: ../calculate-update/pym/update/variables/update.py:402 msgid "Reference" msgstr "Ссылка" -#: ../calculate-update/pym/update/variables/update.py:799 +#: ../calculate-update/pym/update/variables/update.py:812 msgid "Remote templates" msgstr "Удалённые шаблоны" @@ -457,16 +454,16 @@ msgid "Repositories synchronization" msgstr "Синхронизация репозиториев" #: ../calculate-update/pym/update/variables/update.py:282 -#: ../calculate-update/pym/update/wsdl_update.py:125 +#: ../calculate-update/pym/update/wsdl_update.py:126 msgid "Repository" msgstr "Репозиторий" -#: ../calculate-update/pym/update/update.py:566 +#: ../calculate-update/pym/update/update.py:567 #, python-format msgid "Repository %s has its own cache" msgstr "У репозитория %s есть свой кэш" -#: ../calculate-update/pym/update/variables/update.py:966 +#: ../calculate-update/pym/update/variables/update.py:979 #, python-format msgid "Repository %s has no profiles" msgstr "В репозитории %s нет профилей" @@ -476,12 +473,12 @@ msgstr "В репозитории %s нет профилей" msgid "Repository %s not found" msgstr "Репозиторий %s не найден" -#: ../calculate-update/pym/update/update.py:558 +#: ../calculate-update/pym/update/update.py:559 #, python-brace-format msgid "Repository '{repo_name}' called '{repname}' in cl_update_rep_name" msgstr "Репозиторий '{repo_name}' назван '{repname} в cl_update_rep_name" -#: ../calculate-update/pym/update/variables/update.py:1027 +#: ../calculate-update/pym/update/variables/update.py:1040 msgid "Repository branch" msgstr "Ветка репозитория" @@ -489,7 +486,7 @@ msgstr "Ветка репозитория" msgid "Repository cache update" msgstr "Обновление кэша репозиториев" -#: ../calculate-update/pym/update/variables/update.py:998 +#: ../calculate-update/pym/update/variables/update.py:1011 msgid "Repository name" msgstr "Название репозитория" @@ -497,24 +494,24 @@ msgstr "Название репозитория" msgid "Repository transfer" msgstr "Перенос репозитория" -#: ../calculate-update/pym/update/variables/update.py:1213 +#: ../calculate-update/pym/update/variables/update.py:1226 msgid "Repository variables were not configured for the profile" msgstr "В профиле не настроены переменные репозитория" -#: ../calculate-update/pym/update/wsdl_update.py:92 -#: ../calculate-update/pym/update/wsdl_update.py:145 +#: ../calculate-update/pym/update/wsdl_update.py:93 +#: ../calculate-update/pym/update/wsdl_update.py:146 msgid "Run" msgstr "Выполнить" -#: ../calculate-update/pym/update/variables/update.py:1509 +#: ../calculate-update/pym/update/variables/update.py:1522 msgid "Run reverse dependencies check" msgstr "Запустить проверку обратных зависимостей" -#: ../calculate-update/pym/update/wsdl_update.py:182 +#: ../calculate-update/pym/update/wsdl_update.py:183 msgid "Save" msgstr "Сохранить" -#: ../calculate-update/pym/update/variables/update.py:1752 +#: ../calculate-update/pym/update/variables/update.py:1774 msgid "Save packages used during build" msgstr "Сохранять используемые при сборке пакеты" @@ -522,15 +519,15 @@ msgstr "Сохранять используемые при сборке паке msgid "Search for the most appropriate update server" msgstr "Искать наиболее подходящий сервер обновлений" -#: ../calculate-update/pym/update/update.py:1669 +#: ../calculate-update/pym/update/update.py:1670 msgid "Searching new binhost" msgstr "Поиск нового сервера обновлений" -#: ../calculate-update/pym/update/variables/update.py:660 +#: ../calculate-update/pym/update/variables/update.py:673 msgid "Select at least one sync repository" msgstr "Выберите хотя бы один репозиторий для синхронизации" -#: ../calculate-update/pym/update/wsdl_update.py:146 +#: ../calculate-update/pym/update/wsdl_update.py:147 msgid "Set the profile" msgstr "Установить профиль" @@ -538,18 +535,18 @@ msgstr "Установить профиль" msgid "Setting up the profile" msgstr "Настройка профиля" -#: ../calculate-update/pym/update/variables/update.py:482 -#: ../calculate-update/pym/update/variables/update.py:506 -#: ../calculate-update/pym/update/variables/update.py:530 -#: ../calculate-update/pym/update/variables/update.py:553 +#: ../calculate-update/pym/update/variables/update.py:495 +#: ../calculate-update/pym/update/variables/update.py:519 +#: ../calculate-update/pym/update/variables/update.py:543 +#: ../calculate-update/pym/update/variables/update.py:566 msgid "Skip" msgstr "Пропустить" -#: ../calculate-update/pym/update/variables/update.py:1495 +#: ../calculate-update/pym/update/variables/update.py:1508 msgid "Skip reverse dependencies check" msgstr "Пропустить проверку обратных зависимостей" -#: ../calculate-update/pym/update/variables/update.py:1461 +#: ../calculate-update/pym/update/variables/update.py:1474 msgid "Skip the system setup" msgstr "Пропустить настройку системы" @@ -563,7 +560,7 @@ msgstr "Переключение на профиль {cl_update_profile_system}" msgid "Synchronization finished" msgstr "Синхронизация завершена" -#: ../calculate-update/pym/update/variables/update.py:421 +#: ../calculate-update/pym/update/variables/update.py:435 msgid "Synchronized repositories" msgstr "Синхронизируемые репозитории" @@ -572,13 +569,13 @@ msgstr "Синхронизируемые репозитории" msgid "Syncing the {eachvar:capitalize} repository" msgstr "Синхронизация репозитория {eachvar:capitalize}" -#: ../calculate-update/pym/update/update.py:211 -#: ../calculate-update/pym/update/update.py:235 +#: ../calculate-update/pym/update/update.py:213 +#: ../calculate-update/pym/update/update.py:237 #, python-brace-format msgid "Syncing the {rep} repository" msgstr "Синхронизация {rep} репозитория" -#: ../calculate-update/pym/update/utils/cl_update.py:378 +#: ../calculate-update/pym/update/utils/cl_update.py:400 msgid "System configuration" msgstr "Конфигурация системы" @@ -586,38 +583,35 @@ msgstr "Конфигурация системы" msgid "System packages list" msgstr "Список пакетов системы" -#: ../calculate-update/pym/update/variables/update.py:1191 +#: ../calculate-update/pym/update/variables/update.py:1204 msgid "System profile" msgstr "Профиль системы" -#: ../calculate-update/pym/update/variables/update.py:871 +#: ../calculate-update/pym/update/variables/update.py:884 msgid "System profile version" msgstr "Версия профиля системы" -#: ../calculate-update/pym/update/utils/cl_update.py:417 +#: ../calculate-update/pym/update/utils/cl_update.py:448 msgid "System update finished!" msgstr "Обновление системы завершено!" -#: ../calculate-update/pym/update/variables/update.py:803 +#: ../calculate-update/pym/update/variables/update.py:816 msgid "Templates location" msgstr "Местонахождение шаблонов" -#: ../calculate-update/pym/update/update.py:630 +#: ../calculate-update/pym/update/update.py:631 msgid "The Eix tool is not found" msgstr "Утилита Eix не найдена" -#: ../calculate-update/pym/update/update.py:515 +#: ../calculate-update/pym/update/update.py:516 msgid "The Emerge is not found" msgstr "Утилита Emerge не найдена" -#: ../calculate-update/pym/update/update.py:583 +#: ../calculate-update/pym/update/update.py:584 msgid "The Emerge tool is not found" msgstr "Утилита Emerge не найдена" -msgid "The Layman tool is not found" -msgstr "Утилита Layman не найдена" - -#: ../calculate-update/pym/update/update.py:549 +#: ../calculate-update/pym/update/update.py:550 msgid "The Portage tool is not found" msgstr "Утилита Portage не найдена" @@ -625,7 +619,7 @@ msgstr "Утилита Portage не найдена" msgid "The profile was successfully updated" msgstr "Обновление профиля завершено успешно" -#: ../calculate-update/pym/update/variables/update.py:1226 +#: ../calculate-update/pym/update/variables/update.py:1239 msgid "The selected profile is not Calculate" msgstr "Профиль не Calculate" @@ -633,20 +627,20 @@ msgstr "Профиль не Calculate" msgid "The system is being configured" msgstr "Конфигурирование системы" -#: ../calculate-update/pym/update/update.py:883 -#: ../calculate-update/pym/update/update.py:1022 +#: ../calculate-update/pym/update/update.py:884 +#: ../calculate-update/pym/update/update.py:1023 msgid "The system is up to date" msgstr "Система находится в актуальном состоянии" -#: ../calculate-update/pym/update/emerge_parser.py:506 +#: ../calculate-update/pym/update/emerge_parser.py:509 msgid "This action requires superuser access" msgstr "Действие требует права суперпользователя" -#: ../calculate-update/pym/update/variables/update.py:835 +#: ../calculate-update/pym/update/variables/update.py:848 msgid "URL" msgstr "URL" -#: ../calculate-update/pym/update/update.py:727 +#: ../calculate-update/pym/update/update.py:728 #, python-brace-format msgid "Unmerging{part} {package}" msgstr "Удаление{part} {package}" @@ -655,20 +649,20 @@ msgstr "Удаление{part} {package}" msgid "Update" msgstr "Обновить" -#: ../calculate-update/pym/update/wsdl_update.py:43 -#: ../calculate-update/pym/update/wsdl_update.py:100 +#: ../calculate-update/pym/update/wsdl_update.py:44 +#: ../calculate-update/pym/update/wsdl_update.py:101 msgid "Update " msgstr "Обновление " -#: ../calculate-update/pym/update/wsdl_update.py:156 +#: ../calculate-update/pym/update/wsdl_update.py:157 msgid "Update Check" msgstr "Проверка обновлений" -#: ../calculate-update/pym/update/utils/cl_update.py:408 +#: ../calculate-update/pym/update/utils/cl_update.py:430 msgid "Update failed" msgstr "Не удалось обновить" -#: ../calculate-update/pym/update/update.py:311 +#: ../calculate-update/pym/update/update.py:313 msgid "Update is already running. Try to run later." msgstr "Обновление уже запущено. Попытайтесь запустить позже." @@ -676,11 +670,11 @@ msgstr "Обновление уже запущено. Попытайтесь з msgid "Update manually interrupted" msgstr "Обновление прервано пользователем" -#: ../calculate-update/pym/update/variables/update.py:478 +#: ../calculate-update/pym/update/variables/update.py:491 msgid "Update metadata" msgstr "Обновление метаданных" -#: ../calculate-update/pym/update/variables/update.py:567 +#: ../calculate-update/pym/update/variables/update.py:580 msgid "Update other overlays" msgstr "Обновлять остальные оверлеи" @@ -688,34 +682,34 @@ msgstr "Обновлять остальные оверлеи" msgid "Update packages index" msgstr "Обновление индекса пакетов" -#: ../calculate-update/pym/update/update.py:1352 +#: ../calculate-update/pym/update/update.py:1353 #, python-format msgid "Update server %s" msgstr "Сервер обновлений %s" -#: ../calculate-update/pym/update/update.py:1347 +#: ../calculate-update/pym/update/update.py:1348 #, python-format msgid "Update server was changed to %s" msgstr "Сервер обновлений изменён на %s" -#: ../calculate-update/pym/update/wsdl_update.py:45 +#: ../calculate-update/pym/update/wsdl_update.py:46 msgid "Update the System" msgstr "Обновление системы" -#: ../calculate-update/pym/update/variables/update.py:1340 -#: ../calculate-update/pym/update/variables/update.py:1341 +#: ../calculate-update/pym/update/variables/update.py:1353 +#: ../calculate-update/pym/update/variables/update.py:1354 msgid "Update the cache" msgstr "Обновить кэш" -#: ../calculate-update/pym/update/variables/update.py:526 +#: ../calculate-update/pym/update/variables/update.py:539 msgid "Update the eix cache" msgstr "Обновление кэша eix" -#: ../calculate-update/pym/update/variables/update.py:502 +#: ../calculate-update/pym/update/variables/update.py:515 msgid "Update the overlays cache" msgstr "Обновить кэш оверлеев" -#: ../calculate-update/pym/update/wsdl_update.py:66 +#: ../calculate-update/pym/update/wsdl_update.py:67 msgid "Update the system" msgstr "Обновление системы" @@ -723,48 +717,45 @@ msgstr "Обновление системы" msgid "Updates autocheck configured!" msgstr "Параметры автопроверки обновлений настроены!" -#: ../calculate-update/pym/update/update.py:275 +#: ../calculate-update/pym/update/update.py:277 msgid "Updates autocheck is not enabled" msgstr "Автопроверка обновлений не включена" -#: ../calculate-update/pym/update/wsdl_update.py:177 +#: ../calculate-update/pym/update/wsdl_update.py:178 msgid "Updates autocheck settings" msgstr "Параметры автопроверки обновлений" -#: ../calculate-update/pym/update/utils/cl_update.py:318 +#: ../calculate-update/pym/update/utils/cl_update.py:338 msgid "Updating Kernel modules" msgstr "Обновление модулей ядра" -msgid "Updating Perl" -msgstr "Обновление Perl" - -#: ../calculate-update/pym/update/utils/cl_update.py:290 +#: ../calculate-update/pym/update/utils/cl_update.py:310 msgid "Updating Perl modules" msgstr "Обновление модулей Perl" -#: ../calculate-update/pym/update/utils/cl_update.py:326 +#: ../calculate-update/pym/update/utils/cl_update.py:346 msgid "Updating X.Org server modules" msgstr "Обновление модулей системы X.Org server" -#: ../calculate-update/pym/update/update.py:1326 +#: ../calculate-update/pym/update/update.py:1327 msgid "Updating binary build dependences" msgstr "Обновление сборочных зависимостей для бинарных пакетов" -#: ../calculate-update/pym/update/utils/cl_update.py:353 -#: ../calculate-update/pym/update/utils/cl_update.py:395 +#: ../calculate-update/pym/update/utils/cl_update.py:373 +#: ../calculate-update/pym/update/utils/cl_update.py:417 #: ../calculate-update/pym/update/utils/cl_update_profile.py:141 msgid "Updating configuration files" msgstr "Обновление конфигурационных файлов" -#: ../calculate-update/pym/update/utils/cl_update.py:279 +#: ../calculate-update/pym/update/utils/cl_update.py:299 msgid "Updating packages" msgstr "Обновление пакетов" -#: ../calculate-update/pym/update/utils/cl_update.py:334 +#: ../calculate-update/pym/update/utils/cl_update.py:354 msgid "Updating preserved libraries" msgstr "Обновление сохранённых библиотек" -#: ../calculate-update/pym/update/update.py:568 +#: ../calculate-update/pym/update/update.py:569 #, python-format msgid "Updating the %s repository cache" msgstr "Обновление кэша репозитория %s" @@ -787,56 +778,56 @@ msgstr "Обновление кэша eix для репозиториев {updat msgid "Updating the {eachvar:capitalize} repository cache" msgstr "Обновление кэша репозитория {eachvar:capitalize}" -#: ../calculate-update/pym/update/variables/update.py:1575 +#: ../calculate-update/pym/update/variables/update.py:1597 msgid "Use only stable updates" msgstr "Использовать только стабильные обновления" -#: ../calculate-update/pym/update/variables/update.py:757 +#: ../calculate-update/pym/update/variables/update.py:770 msgid "Used repositories" msgstr "Используемые репозитории" -#: ../calculate-update/pym/update/variables/update.py:672 +#: ../calculate-update/pym/update/variables/update.py:685 msgid "Wait for another update to be complete" msgstr "Ждать пока завершится другое обновление" -#: ../calculate-update/pym/update/update.py:314 +#: ../calculate-update/pym/update/update.py:316 msgid "Waiting for another update to be complete" msgstr "Ожидание завершения другого обновления" -#: ../calculate-update/pym/update/update.py:335 +#: ../calculate-update/pym/update/update.py:337 msgid "Waiting for emerge to be complete" msgstr "Ожидание завершения выполнения emerge" -#: ../calculate-update/pym/update/utils/cl_update.py:423 +#: ../calculate-update/pym/update/utils/cl_update.py:454 msgid "World rebuild finished!" msgstr "Завершена перегенерация world!" -#: ../calculate-update/pym/update/update.py:901 -#: ../calculate-update/pym/update/update.py:1014 +#: ../calculate-update/pym/update/update.py:902 +#: ../calculate-update/pym/update/update.py:1015 msgid "Would you like to merge these packages?" msgstr "Вы хотите установить эти пакеты?" -#: ../calculate-update/pym/update/update.py:1076 +#: ../calculate-update/pym/update/update.py:1077 msgid "Would you like to unmerge these unused packages (recommended)?" msgstr "Вы хотите удалить неиспользуемые пакеты (рекомендуется)?" -#: ../calculate-update/pym/update/variables/update.py:1229 +#: ../calculate-update/pym/update/variables/update.py:1242 msgid "Wrong Calculate profile" msgstr "Неправильный Calculate профиль" -#: ../calculate-update/pym/update/update.py:1139 +#: ../calculate-update/pym/update/update.py:1140 msgid "Wrong profile" msgstr "Неправильный профиль" -#: ../calculate-update/pym/update/variables/update.py:931 +#: ../calculate-update/pym/update/variables/update.py:944 msgid "Wrong repository URL" msgstr "Неправильный URL репозитория" -#: ../calculate-update/pym/update/variables/update.py:1196 +#: ../calculate-update/pym/update/variables/update.py:1209 msgid "You must specify the profile" msgstr "Вы должны указать профиль" -#: ../calculate-update/pym/update/variables/update.py:986 +#: ../calculate-update/pym/update/variables/update.py:999 msgid "You need to update the repositories before you change the profile" msgstr "Вам необходимо обновить репозитории перед сменой профиля" @@ -844,75 +835,75 @@ msgstr "Вам необходимо обновить репозитории пе msgid "append the profile packages list" msgstr "добавить список пакетов профиля" -#: ../calculate-update/pym/update/variables/update.py:1354 +#: ../calculate-update/pym/update/variables/update.py:1367 msgid "automatically check updates" msgstr "автоматически проверять обновления" -#: ../calculate-update/pym/update/variables/update.py:1625 +#: ../calculate-update/pym/update/variables/update.py:1647 msgid "check and fix the repositories integrity" msgstr "проверить и исправить целостность репозиториев" -#: ../calculate-update/pym/update/variables/update.py:548 +#: ../calculate-update/pym/update/variables/update.py:561 msgid "check signature if system has public keys" msgstr "проверить подпись если система содержит открытые ключи" -#: ../calculate-update/pym/update/variables/update.py:1475 +#: ../calculate-update/pym/update/variables/update.py:1488 msgid "clean obsolete programs archives" msgstr "удалять устаревшие архивы программ" -#: ../calculate-update/pym/update/variables/update.py:1653 +#: ../calculate-update/pym/update/variables/update.py:1675 msgid "clear the history of repositories" msgstr "очистить историю репозиториев" -#: ../calculate-update/pym/update/variables/update.py:800 +#: ../calculate-update/pym/update/variables/update.py:813 msgid "clt templates" msgstr "clt шаблоны" -#: ../calculate-update/pym/update/variables/update.py:1386 +#: ../calculate-update/pym/update/variables/update.py:1399 msgid "consider the autocheck schedule" msgstr "учитывать график автопроверки" -#: ../calculate-update/pym/update/variables/update.py:1372 +#: ../calculate-update/pym/update/variables/update.py:1385 msgid "daily" msgstr "раз в сутки" -#: ../calculate-update/pym/update/variables/update.py:1399 +#: ../calculate-update/pym/update/variables/update.py:1412 msgid "display the packages list in emerge format" msgstr "отобразить список пакетов в emerge формате" -#: ../calculate-update/pym/update/variables/update.py:651 +#: ../calculate-update/pym/update/variables/update.py:664 msgid "do not update packages" msgstr "не обновлять пакеты" -#: ../calculate-update/pym/update/variables/update.py:1370 +#: ../calculate-update/pym/update/variables/update.py:1383 msgid "every six hours" msgstr "раз в шесть часов" -#: ../calculate-update/pym/update/variables/update.py:1371 +#: ../calculate-update/pym/update/variables/update.py:1384 msgid "every twelve hours" msgstr "раз в двенадцать часов" -#: ../calculate-update/pym/update/variables/update.py:546 +#: ../calculate-update/pym/update/variables/update.py:559 msgid "force check Package signature" msgstr "принудительно проверить подпись Packages" -#: ../calculate-update/pym/update/variables/update.py:1639 +#: ../calculate-update/pym/update/variables/update.py:1661 msgid "force fix the settings" msgstr "принудительно исправлять настройки" -#: ../calculate-update/pym/update/variables/update.py:522 +#: ../calculate-update/pym/update/variables/update.py:535 msgid "force the eix cache update" msgstr "принудительно обновить eix кэш" -#: ../calculate-update/pym/update/variables/update.py:475 +#: ../calculate-update/pym/update/variables/update.py:488 msgid "force the update ebuilds metadata" msgstr "принудительно обновить ebuild метаданные" -#: ../calculate-update/pym/update/variables/update.py:499 +#: ../calculate-update/pym/update/variables/update.py:512 msgid "force the update of the overlays cache" msgstr "принудительно обновить кэш оверлеев" -#: ../calculate-update/pym/update/variables/update.py:636 +#: ../calculate-update/pym/update/variables/update.py:649 msgid "instead of actually performing the update, simply display the list of packages that will be installed" msgstr "вместо действительного обновления пакетов, только отобразить что будет установлено" @@ -924,11 +915,11 @@ msgstr "обновить ревизию" msgid "rebuild the system packages list" msgstr "переформировать список пакетов системы" -#: ../calculate-update/pym/update/variables/update.py:1510 +#: ../calculate-update/pym/update/variables/update.py:1523 msgid "run reverse dependencies check" msgstr "запустить проверку обратных зависимостей" -#: ../calculate-update/pym/update/variables/update.py:1751 +#: ../calculate-update/pym/update/variables/update.py:1773 msgid "save packages used during build" msgstr "cохранять используемые при сборке пакеты" @@ -936,12 +927,12 @@ msgstr "cохранять используемые при сборке паке msgid "search for the most appropriate update server" msgstr "искать наиболее подходящий сервер обновлений" -#: ../calculate-update/pym/update/variables/update.py:804 +#: ../calculate-update/pym/update/variables/update.py:817 #, python-format msgid "select the location for templates %s" msgstr "выбор местонахождения шаблонов %s" -#: ../calculate-update/pym/update/variables/update.py:1367 +#: ../calculate-update/pym/update/variables/update.py:1380 msgid "set interval for the updates checking" msgstr "установить интервал для проверки обновлений" @@ -949,59 +940,59 @@ msgstr "установить интервал для проверки обнов msgid "set references for repository (REPOSITORY:REF)" msgstr "установить ссылки для репозиториев (REPOSITORY:REF)" -#: ../calculate-update/pym/update/variables/update.py:919 +#: ../calculate-update/pym/update/variables/update.py:932 msgid "set the profile repository" msgstr "установить репозиторий профиля" -#: ../calculate-update/pym/update/variables/update.py:1028 +#: ../calculate-update/pym/update/variables/update.py:1041 msgid "set the repository branch" msgstr "установить ветку репозитория" -#: ../calculate-update/pym/update/variables/update.py:1192 +#: ../calculate-update/pym/update/variables/update.py:1205 msgid "set the system profile" msgstr "установить профиль системы" -#: ../calculate-update/pym/update/variables/update.py:547 +#: ../calculate-update/pym/update/variables/update.py:560 msgid "skip check Package signature" msgstr "пропустить проверку подписи Packages" -#: ../calculate-update/pym/update/variables/update.py:1496 +#: ../calculate-update/pym/update/variables/update.py:1509 msgid "skip reverse dependencies check" msgstr "пропустить проверку обратных зависимостей" -#: ../calculate-update/pym/update/variables/update.py:476 +#: ../calculate-update/pym/update/variables/update.py:489 msgid "skip the ebuild metadata update" msgstr "пропустить обновление ebuild метаданных" -#: ../calculate-update/pym/update/variables/update.py:523 +#: ../calculate-update/pym/update/variables/update.py:536 msgid "skip the eix cache update" msgstr "пропустить обновление eix кэша" -#: ../calculate-update/pym/update/variables/update.py:1462 +#: ../calculate-update/pym/update/variables/update.py:1475 msgid "skip the system setup" msgstr "пропустить настройку системы" -#: ../calculate-update/pym/update/variables/update.py:500 +#: ../calculate-update/pym/update/variables/update.py:513 msgid "skip the update of the overlays cache" msgstr "пропустить обновление кэша оверлеев" -#: ../calculate-update/pym/update/variables/update.py:420 +#: ../calculate-update/pym/update/variables/update.py:434 msgid "synchronized repositories (all by default)" msgstr "синхронизируемые репозитории (все по умолчанию)" -#: ../calculate-update/pym/update/variables/update.py:477 +#: ../calculate-update/pym/update/variables/update.py:490 msgid "update metadata if it is outdated" msgstr "обновить метаданные если они устарели" -#: ../calculate-update/pym/update/variables/update.py:566 +#: ../calculate-update/pym/update/variables/update.py:579 msgid "update other overlays" msgstr "обновлять остальные оверлеи" -#: ../calculate-update/pym/update/variables/update.py:524 +#: ../calculate-update/pym/update/variables/update.py:537 msgid "update the eix cache if it is outdated" msgstr "обновить eix кэш если он устарел" -#: ../calculate-update/pym/update/variables/update.py:501 +#: ../calculate-update/pym/update/variables/update.py:514 msgid "update the overlays cache if outdated" msgstr "обновить кэш оверлеев если он устарел" @@ -1009,25 +1000,34 @@ msgstr "обновить кэш оверлеев если он устарел" msgid "update the system packages list" msgstr "обновить список пакетов системы" -#: ../calculate-update/pym/update/variables/update.py:1576 +#: ../calculate-update/pym/update/variables/update.py:1598 msgid "use only stable updates" msgstr "использовать только стабильные обновления" -#: ../calculate-update/pym/update/variables/update.py:673 +#: ../calculate-update/pym/update/variables/update.py:686 msgid "wait until the running update is finished" msgstr "ждать завершения" -#: ../calculate-update/pym/update/update.py:831 +#: ../calculate-update/pym/update/update.py:832 #, python-brace-format msgid "{count} packages will be installed" msgstr "{count} пакетов будет установлено" -#: ../calculate-update/pym/update/update.py:836 +#: ../calculate-update/pym/update/update.py:837 #, python-brace-format msgid "{install}{size} will be downloaded" msgstr "{install}{size} будет загружено" -#: ../calculate-update/pym/update/update.py:682 +#: ../calculate-update/pym/update/update.py:683 #, python-brace-format msgid "{part} {package}" msgstr "{part} {package}" + +#~ msgid "Layman cache update" +#~ msgstr "Обновление кэша Layman" + +#~ msgid "The Layman tool is not found" +#~ msgstr "Утилита Layman не найдена" + +#~ msgid "Updating Perl" +#~ msgstr "Обновление Perl"