diff --git a/server/src/uds/core/util/connection.py b/server/src/uds/core/util/connection.py index e100522c8..a3f2ec437 100644 --- a/server/src/uds/core/util/connection.py +++ b/server/src/uds/core/util/connection.py @@ -37,7 +37,7 @@ import socket logger = logging.getLogger(__name__) -def testServer(host: str, port: typing.Union[int, str], timeOut: int = 4) -> bool: +def testServer(host: str, port: typing.Union[int, str], timeOut: float = 4) -> bool: try: logger.debug('Checking connection to %s:%s with %s seconds timeout', host, port, timeOut) sock = socket.create_connection((host, int(port)), timeOut) diff --git a/server/src/uds/locale/ar/LC_MESSAGES/django.po b/server/src/uds/locale/ar/LC_MESSAGES/django.po index 9d036a529..4708bdb30 100644 --- a/server/src/uds/locale/ar/LC_MESSAGES/django.po +++ b/server/src/uds/locale/ar/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:01+0200\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" "PO-Revision-Date: 2020-05-07 09:52+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: Arabic (http://www.transifex.com/openuds/openuds/language/" @@ -29,7 +29,7 @@ msgstr "حسابات" #: REST/methods/meta_pools.py:70 REST/methods/networks.py:60 #: REST/methods/osmanagers.py:55 REST/methods/providers.py:70 #: REST/methods/proxies.py:59 REST/methods/reports.py:57 -#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:96 +#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:99 #: REST/methods/transports.py:57 REST/methods/user_services.py:255 #: REST/methods/user_services.py:295 REST/methods/users_groups.py:117 #: REST/model.py:139 @@ -55,7 +55,7 @@ msgstr "علامة الوقت" #: REST/methods/calendars.py:63 REST/methods/meta_pools.py:77 #: REST/methods/networks.py:63 REST/methods/osmanagers.py:59 #: REST/methods/providers.py:76 REST/methods/proxies.py:63 -#: REST/methods/services.py:226 REST/methods/services_pools.py:105 +#: REST/methods/services.py:226 REST/methods/services_pools.py:108 #: REST/methods/transports.py:61 msgid "tags" msgstr "العلامات" @@ -121,7 +121,7 @@ msgstr "الرموز الفاعلة" #: REST/methods/actor_token.py:54 reports/stats/pools_performance.py:198 #: reports/stats/pools_performance.py:213 reports/stats/pools_usage_day.py:65 -#: reports/stats/usage_by_pool.py:160 reports/stats/user_access.py:174 +#: reports/stats/usage_by_pool.py:158 reports/stats/user_access.py:174 msgid "Date" msgstr "تاريخ" @@ -175,13 +175,13 @@ msgstr "نوع" #: REST/methods/authenticators.py:68 REST/methods/meta_service_pools.py:85 #: REST/methods/op_calendars.py:80 REST/methods/services_pool_groups.py:61 #: REST/methods/transports.py:56 REST/methods/user_services.py:294 -#: REST/model.py:166 models/meta_pool.py:72 +#: REST/model.py:166 models/meta_pool.py:73 msgid "Priority" msgstr "الأولوية" #: REST/methods/authenticators.py:69 REST/methods/authenticators.py:101 #: REST/methods/meta_pools.py:75 REST/methods/meta_pools.py:150 -#: REST/methods/services_pools.py:101 REST/methods/services_pools.py:253 +#: REST/methods/services_pools.py:104 REST/methods/services_pools.py:277 msgid "Visible" msgstr "مرئي" @@ -197,15 +197,15 @@ msgstr "التسمية" msgid "Users" msgstr "المستخدمين" -#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:254 +#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:278 msgid "If active, transport will be visible for users" msgstr "إذا كان نشطًا ، فسيكون النقل مرئيًا للمستخدمين" #: REST/methods/authenticators.py:105 REST/methods/meta_pools.py:138 #: REST/methods/meta_pools.py:146 REST/methods/meta_pools.py:154 -#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:257 -#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 -#: REST/methods/services_pools.py:281 core/ui/user_interface.py:99 +#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:281 +#: REST/methods/services_pools.py:289 REST/methods/services_pools.py:297 +#: REST/methods/services_pools.py:305 core/ui/user_interface.py:99 #: services/OVirt/service.py:186 msgid "Display" msgstr "عرض" @@ -230,7 +230,7 @@ msgstr "ويكرر" msgid "Every" msgstr "كل" -#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:160 +#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:158 msgid "Duration" msgstr "المدة" @@ -285,11 +285,11 @@ msgid "Policy" msgstr "سياسات" #: REST/methods/meta_pools.py:73 REST/methods/services.py:225 -#: REST/methods/services_pools.py:98 +#: REST/methods/services_pools.py:101 msgid "User services" msgstr "خدمات المستخدم" -#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:99 +#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:102 msgid "In Preparation" msgstr "قيد التهيئ " @@ -298,8 +298,8 @@ msgid "Pool Group" msgstr "تجمع مجموعات" #: REST/methods/meta_pools.py:86 REST/methods/meta_pools.py:141 -#: REST/methods/services_pools.py:123 REST/methods/services_pools.py:175 -#: REST/methods/services_pools.py:268 +#: REST/methods/services_pools.py:141 REST/methods/services_pools.py:198 +#: REST/methods/services_pools.py:292 msgid "Default" msgstr "افتراضي" @@ -308,21 +308,21 @@ msgid "Service pool policy" msgstr "سياسة تجمع الخدمة" #: REST/methods/meta_pools.py:134 REST/methods/services_pool_groups.py:85 -#: REST/methods/services_pools.py:261 +#: REST/methods/services_pools.py:285 msgid "Associated Image" msgstr "الصورة المرتبطة بها" #: REST/methods/meta_pools.py:135 REST/methods/services_pool_groups.py:86 -#: REST/methods/services_pools.py:262 +#: REST/methods/services_pools.py:286 msgid "Image assocciated with this service" msgstr "الصورة المرتبطة مع هذه الخدمة" -#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:103 -#: REST/methods/services_pools.py:269 +#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:106 +#: REST/methods/services_pools.py:293 msgid "Pool group" msgstr "تجمع مجموعات" -#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:270 +#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:294 msgid "Pool group for this pool (for pool classify on display)" msgstr "تجمع الفريق لهذا التجمع (لتصنيف تجمع في العرض)" @@ -330,11 +330,11 @@ msgstr "تجمع الفريق لهذا التجمع (لتصنيف تجمع في msgid "If active, metapool will be visible for users" msgstr "إذا كانت نشطة ، فسيكون metapool مرئيًا للمستخدمين" -#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:277 +#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:301 msgid "Calendar access denied text" msgstr "تم رفض الوصول إلى التقويم" -#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:278 +#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:302 msgid "" "Custom message to be shown to users if access is limited by calendar rules." msgstr "يتم عرض رسالة مخصصة للمستخدمين إذا كان الوصول مقيدًا بقواعد التقويم." @@ -361,12 +361,13 @@ msgid "Creation date" msgstr "تاريخ الإنشاء" #: REST/methods/meta_service_pools.py:172 REST/methods/services_usage.py:119 -#: reports/stats/pool_usage_summary.py:59 +#: reports/stats/pool_users_summary.py:59 #: reports/stats/pools_performance.py:258 reports/stats/pools_usage_day.py:166 -#: reports/stats/usage_by_pool.py:60 reports/stats/usage_by_pool.py:160 -#: services/Proxmox/service.py:110 +#: reports/stats/pools_usage_summary.py:137 reports/stats/usage_by_pool.py:60 +#: reports/stats/usage_by_pool.py:158 services/Proxmox/service.py:110 #: templates/uds/reports/stats/pools-performance.html:33 #: templates/uds/reports/stats/pools-usage-day.html:27 +#: templates/uds/reports/stats/pools-usage-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:17 msgid "Pool" msgstr "تجمع" @@ -504,7 +505,7 @@ msgstr "لا يمكن حذف إدارة نظام التشغيل المرتبطة msgid "Service providers" msgstr "مقدمي الخدمات" -#: REST/methods/providers.py:73 REST/methods/services_pools.py:97 +#: REST/methods/providers.py:73 REST/methods/services_pools.py:100 msgid "Status" msgstr "مركز" @@ -651,9 +652,9 @@ msgstr "الوكيل" msgid "Proxy for services behind a firewall" msgstr "وكيل للخدمات وراء جدار الحماية" -#: REST/methods/services.py:270 REST/methods/services_pools.py:233 -#: REST/methods/services_pools.py:241 REST/methods/services_pools.py:249 -#: REST/methods/services_pools.py:324 REST/methods/services_pools.py:332 +#: REST/methods/services.py:270 REST/methods/services_pools.py:257 +#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 +#: REST/methods/services_pools.py:348 REST/methods/services_pools.py:356 #: auths/RegexLdap/authenticator.py:78 core/ui/user_interface.py:95 #: osmanagers/WindowsOsManager/windows_domain.py:71 #: osmanagers/WindowsOsManager/windows_domain.py:72 @@ -677,47 +678,47 @@ msgstr "موافق" msgid "Services Pool Groups" msgstr "خدمات تجمع مجموعات" -#: REST/methods/services_pools.py:94 REST/methods/transports.py:104 +#: REST/methods/services_pools.py:97 REST/methods/transports.py:104 msgid "Service Pools" msgstr "تجمعات الخدمة " -#: REST/methods/services_pools.py:100 +#: REST/methods/services_pools.py:103 msgid "Usage" msgstr "استعمال" -#: REST/methods/services_pools.py:102 +#: REST/methods/services_pools.py:105 msgid "Shows transports" msgstr "تبين عمليات النقل" -#: REST/methods/services_pools.py:104 +#: REST/methods/services_pools.py:107 msgid "Parent service" msgstr "خدمة الوالدين" -#: REST/methods/services_pools.py:206 +#: REST/methods/services_pools.py:230 msgid "Create at least a service before creating a new service pool" msgstr "قم بإنشاء على الأقل خدمة قبل إنشاء تجمع جديد للخدمة" -#: REST/methods/services_pools.py:213 +#: REST/methods/services_pools.py:237 msgid "Base service" msgstr "خدمة قاعدة" -#: REST/methods/services_pools.py:214 +#: REST/methods/services_pools.py:238 msgid "Service used as base of this service pool" msgstr "الخدمة التي تستخدم كقاعدة لهذا التجمع للخدمة" -#: REST/methods/services_pools.py:221 +#: REST/methods/services_pools.py:245 msgid "OS Manager" msgstr "إدارة نظام التشغيل" -#: REST/methods/services_pools.py:222 +#: REST/methods/services_pools.py:246 msgid "OS Manager used as base of this service pool" msgstr "إدارة نظام التشغيل يستخدم كقاعدة لهذا التجمع للخدمة" -#: REST/methods/services_pools.py:229 +#: REST/methods/services_pools.py:253 msgid "Allow removal by users" msgstr "السماح بمسح المستخدم" -#: REST/methods/services_pools.py:230 +#: REST/methods/services_pools.py:254 msgid "" "If active, the user will be allowed to remove the service \"manually\". Be " "careful with this, because the user will have the \"power\" to delete it's " @@ -726,19 +727,19 @@ msgstr "" "إذا نشط، فسيسمح للمستخدم بإزالة الخدمة \"يدويا\". كن حذرا مع هذا، لأن " "المستخدم سوف يكون \"السلطة\" لحذف انها الخدمة الخاصة" -#: REST/methods/services_pools.py:237 +#: REST/methods/services_pools.py:261 msgid "Allow reset by users" msgstr "السماح بإعادة برمجة المصنع قبل المستخدمين" -#: REST/methods/services_pools.py:238 +#: REST/methods/services_pools.py:262 msgid "If active, the user will be allowed to reset the service" msgstr "في حالة التفعيل، سيسمح للمستخدم بإعادة برمجة الخدمة" -#: REST/methods/services_pools.py:245 +#: REST/methods/services_pools.py:269 msgid "Ignores unused" msgstr "تجاهل غير المستخدمة" -#: REST/methods/services_pools.py:246 +#: REST/methods/services_pools.py:270 msgid "" "If the option is enabled, UDS will not attempt to detect and remove the user " "services assigned but not in use." @@ -746,40 +747,40 @@ msgstr "" "إذا تم تمكين الخيار، فإن UDS لا تحاول الكشف عن خدمات المستخدم التي تم " "تعيينها ولكن التي ليست قيد الاستخدام." -#: REST/methods/services_pools.py:286 +#: REST/methods/services_pools.py:310 msgid "Initial available services" msgstr "أولى الخدمات المتاحة" -#: REST/methods/services_pools.py:287 +#: REST/methods/services_pools.py:311 msgid "Services created initially for this service pool" msgstr "الخدمات التي تم إنشاؤها في البداية لتجمع هذه الخدمة" -#: REST/methods/services_pools.py:290 REST/methods/services_pools.py:299 -#: REST/methods/services_pools.py:308 REST/methods/services_pools.py:317 +#: REST/methods/services_pools.py:314 REST/methods/services_pools.py:323 +#: REST/methods/services_pools.py:332 REST/methods/services_pools.py:341 msgid "Availability" msgstr "توافر" -#: REST/methods/services_pools.py:295 +#: REST/methods/services_pools.py:319 msgid "Services to keep in cache" msgstr "خدمات تبقى في ذاكرة التخزين المؤقت" -#: REST/methods/services_pools.py:296 +#: REST/methods/services_pools.py:320 msgid "Services kept in cache for improved user service assignation" msgstr "خدمات الاحتفاظ بها في ذاكرة التخزين المؤقت لإسناد خدمة مستخدم محسنة" -#: REST/methods/services_pools.py:304 +#: REST/methods/services_pools.py:328 msgid "Services to keep in L2 cache" msgstr "خدمات تبقى في ذاكرة التخزين المؤقت L2" -#: REST/methods/services_pools.py:305 +#: REST/methods/services_pools.py:329 msgid "Services kept in cache of level2 for improved service generation" msgstr "خدمات الاحتفاظ بها في ذاكرة التخزين المؤقت من L2 لتحسين خدمة الجيل" -#: REST/methods/services_pools.py:313 +#: REST/methods/services_pools.py:337 msgid "Maximum number of services to provide" msgstr "الحد الأقصى لعدد الخدمات المتوفرة" -#: REST/methods/services_pools.py:314 +#: REST/methods/services_pools.py:338 msgid "" "Maximum number of service (assigned and L1 cache) that can be created for " "this service" @@ -787,27 +788,27 @@ msgstr "" "الحد الأقصى لعدد من الخدمات (المعينة ومخبأة في L1) التي يمكن أن تنشأ عن هذه " "الخدمة" -#: REST/methods/services_pools.py:321 +#: REST/methods/services_pools.py:345 msgid "Show transports" msgstr "إظهار النقل" -#: REST/methods/services_pools.py:322 +#: REST/methods/services_pools.py:346 msgid "If active, alternative transports for user will be shown" msgstr "في حالة نشطة، سيظهر النقل البديل للمستخدم" -#: REST/methods/services_pools.py:329 +#: REST/methods/services_pools.py:353 msgid "Accounting" msgstr "محاسبة" -#: REST/methods/services_pools.py:330 +#: REST/methods/services_pools.py:354 msgid "Account associated to this service pool" msgstr "الحساب المرتبط ببركة الخدمة هذه" -#: REST/methods/services_pools.py:346 +#: REST/methods/services_pools.py:370 msgid "Base service does not exist anymore" msgstr "خدمة قاعدة غير موجود بعد الآن" -#: REST/methods/services_pools.py:380 +#: REST/methods/services_pools.py:404 msgid "This service requires an OS Manager" msgstr "تتطلب هذه الخدمة إدارة نظام التشغيل" @@ -935,8 +936,8 @@ msgstr "موظف" #: auths/AzureAD_enterprise/azure_ad.py:92 #: auths/EDirectory_enterprise/authenticator.py:47 #: auths/RegexLdap/authenticator.py:67 auths/SAML_enterprise/saml.py:117 -#: reports/stats/pool_usage_summary.py:166 reports/stats/usage_by_pool.py:160 -#: templates/uds/reports/stats/pool-usage-summary.html:14 +#: reports/stats/pool_users_summary.py:166 reports/stats/usage_by_pool.py:158 +#: templates/uds/reports/stats/pool-users-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:15 msgid "User" msgstr "المستخدم" @@ -1751,27 +1752,27 @@ msgstr "لا يمكن إزالة عنصر غير نشط" msgid "Can't remove nor cancel {} cause its state don't allow it" msgstr "لا يمكن إزالة أو إلغاء {} لأن حالته لا تسمح بذلك" -#: core/managers/user_service.py:318 +#: core/managers/user_service.py:317 msgid "The requested service is restrained" msgstr "الخدمة المطلوبة مقيدة" -#: core/managers/user_service.py:556 +#: core/managers/user_service.py:555 msgid "The requested service is not available" msgstr "الخدمة المطلوبة غير متاحة" -#: core/managers/user_service.py:586 +#: core/managers/user_service.py:585 msgid "The requested transport {} is not valid for {}" msgstr "النقل المطلوب {} غير صالح لـ {}" -#: core/managers/user_service.py:710 +#: core/managers/user_service.py:709 msgid "The service is not accessible from this device" msgstr "لا يمكن الوصول إلى الخدمة من هذا الجهاز" -#: core/module.py:208 +#: core/module.py:207 msgid "No connection checking method is implemented." msgstr "لم ينفذ أي اتصال بالتحقق من الأسلوب." -#: core/module.py:277 +#: core/module.py:276 msgid "No check method provided." msgstr "لم يقدم أسلوب الاختيار ." @@ -2146,8 +2147,8 @@ msgstr "أيام الأسبوع" msgid "Minutes" msgstr "دقائق" -#: models/calendar_rule.py:76 reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:16 +#: models/calendar_rule.py:76 reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:16 msgid "Hours" msgstr "ساعات" @@ -2159,11 +2160,11 @@ msgstr "أيام" msgid "Weeks" msgstr "أسابيع" -#: models/meta_pool.py:71 +#: models/meta_pool.py:72 msgid "Evenly distributed" msgstr "وزعت بالتساوي" -#: models/meta_pool.py:73 +#: models/meta_pool.py:74 msgid "Greater % available" msgstr "أكبر ٪ المتاحة" @@ -2529,7 +2530,7 @@ msgstr "قائمة المستخدمين من المنصة" msgid "Users List for {}" msgstr "قائمة المستخدمين ل {}" -#: reports/lists/users.py:86 reports/stats/pool_usage_summary.py:145 +#: reports/lists/users.py:86 reports/stats/pool_users_summary.py:145 msgid "UDS Report of users in {}" msgstr "تقرير UDS للمستخدمين في {}" @@ -2545,49 +2546,51 @@ msgstr "الاسم الحقيقي" msgid "Statistics" msgstr "الإحصاء" -#: reports/stats/pool_usage_summary.py:52 -msgid "Summary of pools usage" -msgstr "ملخص استخدام تجمعات" +#: reports/stats/pool_users_summary.py:52 +#| msgid "Pools usage by users" +msgid "Pool Usage by users" +msgstr "استخدام تجمع من قبل المستخدمين" -#: reports/stats/pool_usage_summary.py:53 -msgid "Generates a report with the summary of a pool usage" -msgstr "يقوم بإنشاء تقرير مع ملخص استخدام تجمع" +#: reports/stats/pool_users_summary.py:53 +#| msgid "Generates a report with the summary of a pool usage" +msgid "Generates a report with the summary of users usage for a pool" +msgstr "يقوم بإنشاء تقرير بملخص استخدام المستخدمين للتجمع" -#: reports/stats/pool_usage_summary.py:60 reports/stats/usage_by_pool.py:61 +#: reports/stats/pool_users_summary.py:60 reports/stats/usage_by_pool.py:61 msgid "Pool for report" msgstr "تجمع للتقارير" -#: reports/stats/pool_usage_summary.py:66 reports/stats/pools_performance.py:74 +#: reports/stats/pool_users_summary.py:66 reports/stats/pools_performance.py:74 #: reports/stats/usage_by_pool.py:67 reports/stats/user_access.py:66 msgid "Starting date" msgstr "تاريخ البدء" -#: reports/stats/pool_usage_summary.py:67 reports/stats/pools_performance.py:75 +#: reports/stats/pool_users_summary.py:67 reports/stats/pools_performance.py:75 #: reports/stats/usage_by_pool.py:68 reports/stats/user_access.py:67 msgid "starting date for report" msgstr "تاريخ البدء للتقرير" -#: reports/stats/pool_usage_summary.py:74 reports/stats/pools_performance.py:82 +#: reports/stats/pool_users_summary.py:74 reports/stats/pools_performance.py:82 #: reports/stats/usage_by_pool.py:75 reports/stats/user_access.py:74 msgid "Finish date" msgstr "تاريخ الانتهاء" -#: reports/stats/pool_usage_summary.py:75 reports/stats/pools_performance.py:83 +#: reports/stats/pool_users_summary.py:75 reports/stats/pools_performance.py:83 #: reports/stats/usage_by_pool.py:76 reports/stats/user_access.py:75 msgid "finish date for report" msgstr "تاريخ الانتهاء للتقرير" -#: reports/stats/pool_usage_summary.py:144 +#: reports/stats/pool_users_summary.py:144 msgid "Users usage list for {}" msgstr "قائمة استخدام المستخدمين ل{}" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:15 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:15 msgid "Sessions" msgstr "دورات" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:17 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:17 msgid "Average" msgstr "في المتوسط" @@ -2674,6 +2677,47 @@ msgstr "تقرير استخدام الخدمات لمدة يوم" msgid "Service usage report" msgstr "تقرير استخدام الخدمة" +#: reports/stats/pools_usage_summary.py:47 +msgid "Summary of pools usage" +msgstr "ملخص استخدام تجمعات" + +#: reports/stats/pools_usage_summary.py:48 +msgid "" +"Summary of Pools usage with time totals, accesses totals, time total by pool" +msgstr "" +"ملخص استخدام التجمعات مع إجماليات الوقت ، والوصول إلى الإجماليات ، والوقت " +"الإجمالي حسب التجمع" + +#: reports/stats/pools_usage_summary.py:116 +#| msgid "Summary of pools usage" +msgid "Summary of Pools usage" +msgstr "ملخص استخدام تجمعات" + +#: reports/stats/pools_usage_summary.py:116 +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "to" +msgstr "إلى" + +#: reports/stats/pools_usage_summary.py:117 +#| msgid "Summary of pools usage" +msgid "UDS Report Summary of pools usage" +msgstr "ملخص تقرير UDS لاستخدام المسابح" + +#: reports/stats/pools_usage_summary.py:137 +msgid "Total Time (seconds)" +msgstr "الوقت الإجمالي (بالثواني)" + +#: reports/stats/pools_usage_summary.py:137 +#| msgid "Accesses" +msgid "Total Accesses" +msgstr "إجمالي المداخل" + +#: reports/stats/pools_usage_summary.py:142 +#: templates/uds/reports/stats/pools-usage-summary.html:30 +msgid "Total" +msgstr "مجموع" + #: reports/stats/usage_by_pool.py:53 msgid "Pools usage by users" msgstr "استخدام التجمعات من قبل المستخدمين" @@ -2686,16 +2730,17 @@ msgstr "تقرير استخدام التجمعات من قبل المستخدم msgid "ALL POOLS" msgstr "جميع المسابح" -#: reports/stats/usage_by_pool.py:138 +#: reports/stats/usage_by_pool.py:136 #: templates/uds/reports/stats/usage-by-pool.html:4 +#: templates/uds/reports/stats/usage-by-pool.html:6 msgid "Users usage list" msgstr "قائمة استخدام المستخدمين" -#: reports/stats/usage_by_pool.py:139 +#: reports/stats/usage_by_pool.py:137 msgid "UDS Report of users usage" msgstr "تقرير UDS لاستخدام المستخدمين" -#: reports/stats/usage_by_pool.py:160 +#: reports/stats/usage_by_pool.py:158 #: templates/uds/reports/stats/usage-by-pool.html:16 msgid "Seconds" msgstr "ثواني" @@ -3029,7 +3074,7 @@ msgstr "اختبار اتصال ناجح" #: services/HyperV_enterprise/legacy/provider.py:268 #: services/Nutanix_enterprise/provider.py:214 services/OVirt/provider.py:457 -#: services/Proxmox/provider.py:202 services/Vmware_enterprise/provider.py:178 +#: services/Proxmox/provider.py:205 services/Vmware_enterprise/provider.py:178 msgid "Connection failed. Check connection params" msgstr "فشل الاتصال. تحقق اتصال params" @@ -3041,12 +3086,10 @@ msgid "UDS pub for {0} at {1}" msgstr "UDS pub for {0} at {1}" #: services/HyperV_enterprise/legacy/service.py:57 -#: services/HyperV_enterprise/service.py:57 msgid "HyperV Linked Clone (Experimental)" msgstr "HyperV استنساخ مرتبط (تجريبي)" #: services/HyperV_enterprise/legacy/service.py:59 -#: services/HyperV_enterprise/service.py:59 msgid "Hyper Services based on templates and differential disks (experimental)" msgstr "الخدمات فرط استنادا إلى قوالب والأقراص التفاضلية (تجريبي)" @@ -3222,6 +3265,17 @@ msgstr "" "بالنسبة للمجموعات ، يجب أن يكون اسم المستخدم اسم مستخدم مجال (user @ domain " "أو DOMAIN \\ user" +#: services/HyperV_enterprise/service.py:57 +#| msgid "Xen Linked Clone" +msgid "HyperV Linked Clone" +msgstr "استنساخ HyperV مرتبط" + +#: services/HyperV_enterprise/service.py:59 +#| msgid "" +#| "Hyper Services based on templates and differential disks (experimental)" +msgid "Hyper Services based on templates and differential disks" +msgstr "خدمات عالية تعتمد على القوالب والأقراص التفاضلية" + #: services/Nutanix_enterprise/provider.py:30 msgid "Nutanix Acropolis Platform Provider" msgstr "مزود منصة Nutanix أكروبوليس " @@ -3706,12 +3760,12 @@ msgstr "ثابت IP آلات مزود" msgid "Provides connection to machines by IP" msgstr "يوفر اتصال إلى الأجهزة عن طريق IP" -#: services/PhysicalMachines/service_multi.py:59 +#: services/PhysicalMachines/service_multi.py:60 #: services/Vmware_enterprise/service_fixed.py:54 msgid "Service Token" msgstr "رمز الخدمة" -#: services/PhysicalMachines/service_multi.py:61 +#: services/PhysicalMachines/service_multi.py:62 #: services/Vmware_enterprise/service_fixed.py:56 msgid "" "Service token that will be used by actors to communicate with service. Leave " @@ -3720,20 +3774,32 @@ msgstr "" "رمز الخدمة الذي سيتم استخدامه بواسطة الجهات الفاعلة للتواصل مع الخدمة. اتركه " "فارغًا للتخصيص المستمر." -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 #: services/RDS_enterprise/provider.py:47 msgid "List of servers" msgstr "قائمة ملقمات" -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 msgid "List of servers available for this service" msgstr "قائمة الخوادم المتاحة لهذه الخدمة" -#: services/PhysicalMachines/service_multi.py:71 +#: services/PhysicalMachines/service_multi.py:70 +#| msgid "Check Cert." +msgid "Check Port" +msgstr "تحقق من المنفذ" + +#: services/PhysicalMachines/service_multi.py:70 +msgid "" +"If non zero, only Machines responding to connection on that port will be used" +msgstr "" +"في حالة عدم الصفر ، سيتم استخدام الأجهزة التي تستجيب للاتصال على هذا المنفذ " +"فقط" + +#: services/PhysicalMachines/service_multi.py:73 msgid "Static Multiple IP" msgstr "IP ثابت متعدد." -#: services/PhysicalMachines/service_multi.py:73 +#: services/PhysicalMachines/service_multi.py:75 msgid "This service provides access to POWERED-ON Machines by IP" msgstr "توفر هذه الخدمة إمكانية الوصول إلى آلات مشتغلة ب IP" @@ -4658,9 +4724,31 @@ msgstr "تاريخ:" msgid "Services assignation" msgstr "تعيين الخدمات" -#: templates/uds/reports/stats/usage-by-pool.html:6 -msgid "Users usage list for" -msgstr "قائمة استخدام المستخدمين لـ" +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +#| msgid "Pools usage on a day" +msgid "Pools usage summary" +msgstr "ملخص استخدام حمامات السباحة" + +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "from" +msgstr "من عند" + +#: templates/uds/reports/stats/pools-usage-summary.html:15 +#| msgid "Max.Idle time" +msgid "Total time" +msgstr "الوقت الكلي" + +#: templates/uds/reports/stats/pools-usage-summary.html:16 +#| msgid "Last access" +msgid "Total accesses" +msgstr "إجمالي المداخل" + +#: templates/uds/reports/stats/pools-usage-summary.html:17 +#| msgid "Current users" +msgid "Unique users" +msgstr "المستخدمون الفريدون" #: templates/uds/reports/stats/usage-by-pool.html:14 msgid "Access date/time" @@ -5681,7 +5769,7 @@ msgid "" msgstr "" "إعادة تحميل هذه الصفحة غير مدعومة. من فضلك ، إعادة فتح الخدمة من الأصل." -#: web/util/services.py:190 +#: web/util/services.py:196 msgid "" "This service is about to be replaced by a new version. Please, close the " "session before {} and save all your work to avoid loosing it." diff --git a/server/src/uds/locale/ar/LC_MESSAGES/djangojs.po b/server/src/uds/locale/ar/LC_MESSAGES/djangojs.po index f9b95eb80..f1b120651 100644 --- a/server/src/uds/locale/ar/LC_MESSAGES/djangojs.po +++ b/server/src/uds/locale/ar/LC_MESSAGES/djangojs.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:02+0200\n" -"PO-Revision-Date: 2020-05-07 09:52+0000\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" +"PO-Revision-Date: 2020-05-11 12:06+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: Arabic (http://www.transifex.com/openuds/openuds/language/" "ar/)\n" @@ -1568,12 +1568,10 @@ msgstr "حول" #: static/modern/translations-fakejs.js:35 #: static/modern/translations-fakejs.js:36 -#| msgid "UDS Client" msgid "Client IP" msgstr "العميل IP" #: static/modern/translations-fakejs.js:37 -#| msgid "Delete Proxy" msgid "Detected proxy ip" msgstr "تم اكتشاف عنوان IP للخادم الوكيل" diff --git a/server/src/uds/locale/ca/LC_MESSAGES/django.po b/server/src/uds/locale/ca/LC_MESSAGES/django.po index 4daca7273..356b7413f 100644 --- a/server/src/uds/locale/ca/LC_MESSAGES/django.po +++ b/server/src/uds/locale/ca/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:01+0200\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" "PO-Revision-Date: 2020-05-07 09:52+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: Catalan (http://www.transifex.com/openuds/openuds/language/" @@ -30,7 +30,7 @@ msgstr "Comptes" #: REST/methods/meta_pools.py:70 REST/methods/networks.py:60 #: REST/methods/osmanagers.py:55 REST/methods/providers.py:70 #: REST/methods/proxies.py:59 REST/methods/reports.py:57 -#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:96 +#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:99 #: REST/methods/transports.py:57 REST/methods/user_services.py:255 #: REST/methods/user_services.py:295 REST/methods/users_groups.py:117 #: REST/model.py:139 @@ -56,7 +56,7 @@ msgstr "Marca de temps" #: REST/methods/calendars.py:63 REST/methods/meta_pools.py:77 #: REST/methods/networks.py:63 REST/methods/osmanagers.py:59 #: REST/methods/providers.py:76 REST/methods/proxies.py:63 -#: REST/methods/services.py:226 REST/methods/services_pools.py:105 +#: REST/methods/services.py:226 REST/methods/services_pools.py:108 #: REST/methods/transports.py:61 msgid "tags" msgstr "etiquetes" @@ -122,7 +122,7 @@ msgstr "Tokens de l'actor" #: REST/methods/actor_token.py:54 reports/stats/pools_performance.py:198 #: reports/stats/pools_performance.py:213 reports/stats/pools_usage_day.py:65 -#: reports/stats/usage_by_pool.py:160 reports/stats/user_access.py:174 +#: reports/stats/usage_by_pool.py:158 reports/stats/user_access.py:174 msgid "Date" msgstr "Data" @@ -176,13 +176,13 @@ msgstr "Tipus" #: REST/methods/authenticators.py:68 REST/methods/meta_service_pools.py:85 #: REST/methods/op_calendars.py:80 REST/methods/services_pool_groups.py:61 #: REST/methods/transports.py:56 REST/methods/user_services.py:294 -#: REST/model.py:166 models/meta_pool.py:72 +#: REST/model.py:166 models/meta_pool.py:73 msgid "Priority" msgstr "Prioritat" #: REST/methods/authenticators.py:69 REST/methods/authenticators.py:101 #: REST/methods/meta_pools.py:75 REST/methods/meta_pools.py:150 -#: REST/methods/services_pools.py:101 REST/methods/services_pools.py:253 +#: REST/methods/services_pools.py:104 REST/methods/services_pools.py:277 msgid "Visible" msgstr "Visible" @@ -198,15 +198,15 @@ msgstr "Etiqueta" msgid "Users" msgstr "Usuaris" -#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:254 +#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:278 msgid "If active, transport will be visible for users" msgstr "Si està activat, el transport serà visible per als usuaris" #: REST/methods/authenticators.py:105 REST/methods/meta_pools.py:138 #: REST/methods/meta_pools.py:146 REST/methods/meta_pools.py:154 -#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:257 -#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 -#: REST/methods/services_pools.py:281 core/ui/user_interface.py:99 +#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:281 +#: REST/methods/services_pools.py:289 REST/methods/services_pools.py:297 +#: REST/methods/services_pools.py:305 core/ui/user_interface.py:99 #: services/OVirt/service.py:186 msgid "Display" msgstr "Pantalla" @@ -231,7 +231,7 @@ msgstr "Es repeteix" msgid "Every" msgstr "Cada" -#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:160 +#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:158 msgid "Duration" msgstr "Durada" @@ -286,11 +286,11 @@ msgid "Policy" msgstr "Política" #: REST/methods/meta_pools.py:73 REST/methods/services.py:225 -#: REST/methods/services_pools.py:98 +#: REST/methods/services_pools.py:101 msgid "User services" msgstr "Serveis d'usuari" -#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:99 +#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:102 msgid "In Preparation" msgstr "En preparació" @@ -299,8 +299,8 @@ msgid "Pool Group" msgstr "Grup de pool" #: REST/methods/meta_pools.py:86 REST/methods/meta_pools.py:141 -#: REST/methods/services_pools.py:123 REST/methods/services_pools.py:175 -#: REST/methods/services_pools.py:268 +#: REST/methods/services_pools.py:141 REST/methods/services_pools.py:198 +#: REST/methods/services_pools.py:292 msgid "Default" msgstr "Per defecte" @@ -309,21 +309,21 @@ msgid "Service pool policy" msgstr "Política de pool de servei" #: REST/methods/meta_pools.py:134 REST/methods/services_pool_groups.py:85 -#: REST/methods/services_pools.py:261 +#: REST/methods/services_pools.py:285 msgid "Associated Image" msgstr "Imatge associada" #: REST/methods/meta_pools.py:135 REST/methods/services_pool_groups.py:86 -#: REST/methods/services_pools.py:262 +#: REST/methods/services_pools.py:286 msgid "Image assocciated with this service" msgstr "Imatge associada amb aquest servei" -#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:103 -#: REST/methods/services_pools.py:269 +#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:106 +#: REST/methods/services_pools.py:293 msgid "Pool group" msgstr "Grup de pool" -#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:270 +#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:294 msgid "Pool group for this pool (for pool classify on display)" msgstr "" "Grup de pool per a aquest pool (per a classificar el pool en pantalla)" @@ -332,11 +332,11 @@ msgstr "" msgid "If active, metapool will be visible for users" msgstr "Si està activat, el metapool serà visible per als usuaris" -#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:277 +#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:301 msgid "Calendar access denied text" msgstr "Text denegat al calendari d'accés" -#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:278 +#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:302 msgid "" "Custom message to be shown to users if access is limited by calendar rules." msgstr "" @@ -365,12 +365,13 @@ msgid "Creation date" msgstr "Data de creació" #: REST/methods/meta_service_pools.py:172 REST/methods/services_usage.py:119 -#: reports/stats/pool_usage_summary.py:59 +#: reports/stats/pool_users_summary.py:59 #: reports/stats/pools_performance.py:258 reports/stats/pools_usage_day.py:166 -#: reports/stats/usage_by_pool.py:60 reports/stats/usage_by_pool.py:160 -#: services/Proxmox/service.py:110 +#: reports/stats/pools_usage_summary.py:137 reports/stats/usage_by_pool.py:60 +#: reports/stats/usage_by_pool.py:158 services/Proxmox/service.py:110 #: templates/uds/reports/stats/pools-performance.html:33 #: templates/uds/reports/stats/pools-usage-day.html:27 +#: templates/uds/reports/stats/pools-usage-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:17 msgid "Pool" msgstr "Pool" @@ -508,7 +509,7 @@ msgstr "No es pot suprimir un Gestor de SO amb pools de serveis associats" msgid "Service providers" msgstr "Proveïdors de servei" -#: REST/methods/providers.py:73 REST/methods/services_pools.py:97 +#: REST/methods/providers.py:73 REST/methods/services_pools.py:100 msgid "Status" msgstr "Estat" @@ -655,9 +656,9 @@ msgstr "Proxy" msgid "Proxy for services behind a firewall" msgstr "Proxy per a serveis darrere d'un tallafoc" -#: REST/methods/services.py:270 REST/methods/services_pools.py:233 -#: REST/methods/services_pools.py:241 REST/methods/services_pools.py:249 -#: REST/methods/services_pools.py:324 REST/methods/services_pools.py:332 +#: REST/methods/services.py:270 REST/methods/services_pools.py:257 +#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 +#: REST/methods/services_pools.py:348 REST/methods/services_pools.py:356 #: auths/RegexLdap/authenticator.py:78 core/ui/user_interface.py:95 #: osmanagers/WindowsOsManager/windows_domain.py:71 #: osmanagers/WindowsOsManager/windows_domain.py:72 @@ -681,47 +682,47 @@ msgstr "D'acord" msgid "Services Pool Groups" msgstr "Grups de pool de serveis" -#: REST/methods/services_pools.py:94 REST/methods/transports.py:104 +#: REST/methods/services_pools.py:97 REST/methods/transports.py:104 msgid "Service Pools" msgstr "Pools de servei" -#: REST/methods/services_pools.py:100 +#: REST/methods/services_pools.py:103 msgid "Usage" msgstr "Ús" -#: REST/methods/services_pools.py:102 +#: REST/methods/services_pools.py:105 msgid "Shows transports" msgstr "Mostra transports" -#: REST/methods/services_pools.py:104 +#: REST/methods/services_pools.py:107 msgid "Parent service" msgstr "Servei antecessor" -#: REST/methods/services_pools.py:206 +#: REST/methods/services_pools.py:230 msgid "Create at least a service before creating a new service pool" msgstr "Abans de crear un pool de servei nou cal crear al menys un servei" -#: REST/methods/services_pools.py:213 +#: REST/methods/services_pools.py:237 msgid "Base service" msgstr "Servei base" -#: REST/methods/services_pools.py:214 +#: REST/methods/services_pools.py:238 msgid "Service used as base of this service pool" msgstr "Servei utilitzat com a base d'aquest pool de servei" -#: REST/methods/services_pools.py:221 +#: REST/methods/services_pools.py:245 msgid "OS Manager" msgstr "Gestor de SO" -#: REST/methods/services_pools.py:222 +#: REST/methods/services_pools.py:246 msgid "OS Manager used as base of this service pool" msgstr "Gestor de SO utilitzat com a base d'aquest pool de servei" -#: REST/methods/services_pools.py:229 +#: REST/methods/services_pools.py:253 msgid "Allow removal by users" msgstr "Permetre als usuaris l'eliminació" -#: REST/methods/services_pools.py:230 +#: REST/methods/services_pools.py:254 msgid "" "If active, the user will be allowed to remove the service \"manually\". Be " "careful with this, because the user will have the \"power\" to delete it's " @@ -730,19 +731,19 @@ msgstr "" "Si està activat, l'usuari podrà eliminar el servei \"manualment\". Aneu amb " "compte, perquè l'usuari podrà suprimir el seu propi servei" -#: REST/methods/services_pools.py:237 +#: REST/methods/services_pools.py:261 msgid "Allow reset by users" msgstr "Permetre als usuaris el reinici" -#: REST/methods/services_pools.py:238 +#: REST/methods/services_pools.py:262 msgid "If active, the user will be allowed to reset the service" msgstr "Si està activat, l'usuari podrà reiniciar el servei" -#: REST/methods/services_pools.py:245 +#: REST/methods/services_pools.py:269 msgid "Ignores unused" msgstr "Ignora els que no s'utilitzen" -#: REST/methods/services_pools.py:246 +#: REST/methods/services_pools.py:270 msgid "" "If the option is enabled, UDS will not attempt to detect and remove the user " "services assigned but not in use." @@ -750,44 +751,44 @@ msgstr "" "Si l'opció està habilitada, UDS no intentarà detectar ni eliminar els " "serveis d'usuari assignats que no s'utilitzin." -#: REST/methods/services_pools.py:286 +#: REST/methods/services_pools.py:310 msgid "Initial available services" msgstr "Serveis inicialment disponibles" -#: REST/methods/services_pools.py:287 +#: REST/methods/services_pools.py:311 msgid "Services created initially for this service pool" msgstr "Serveis creats inicialment per a aquest pool de serveis" -#: REST/methods/services_pools.py:290 REST/methods/services_pools.py:299 -#: REST/methods/services_pools.py:308 REST/methods/services_pools.py:317 +#: REST/methods/services_pools.py:314 REST/methods/services_pools.py:323 +#: REST/methods/services_pools.py:332 REST/methods/services_pools.py:341 msgid "Availability" msgstr "Disponibilitat" -#: REST/methods/services_pools.py:295 +#: REST/methods/services_pools.py:319 msgid "Services to keep in cache" msgstr "Serveis per a mantenir en memòria cau" -#: REST/methods/services_pools.py:296 +#: REST/methods/services_pools.py:320 msgid "Services kept in cache for improved user service assignation" msgstr "" "Serveis guardats en memòria cau per a millorar l'assignació de servei " "d'usuari" -#: REST/methods/services_pools.py:304 +#: REST/methods/services_pools.py:328 msgid "Services to keep in L2 cache" msgstr "Serveis per a mantenir en memòria cau nivell 2" -#: REST/methods/services_pools.py:305 +#: REST/methods/services_pools.py:329 msgid "Services kept in cache of level2 for improved service generation" msgstr "" "Serveis guardats en memòria cau de nivell 2 per a millorar la generació de " "serveis" -#: REST/methods/services_pools.py:313 +#: REST/methods/services_pools.py:337 msgid "Maximum number of services to provide" msgstr "Nombre màxim de serveis a proveir" -#: REST/methods/services_pools.py:314 +#: REST/methods/services_pools.py:338 msgid "" "Maximum number of service (assigned and L1 cache) that can be created for " "this service" @@ -795,27 +796,27 @@ msgstr "" "Nombre màxim de serveis (assignats i en memòria cau nivell 1) que poden " "crear-se per a aquest servei" -#: REST/methods/services_pools.py:321 +#: REST/methods/services_pools.py:345 msgid "Show transports" msgstr "Mostrar transports" -#: REST/methods/services_pools.py:322 +#: REST/methods/services_pools.py:346 msgid "If active, alternative transports for user will be shown" msgstr "Si està activat, es mostraran transports alternatius per a l'usuari" -#: REST/methods/services_pools.py:329 +#: REST/methods/services_pools.py:353 msgid "Accounting" msgstr "Comptabilització" -#: REST/methods/services_pools.py:330 +#: REST/methods/services_pools.py:354 msgid "Account associated to this service pool" msgstr "Compte associat a aquest pool de servei" -#: REST/methods/services_pools.py:346 +#: REST/methods/services_pools.py:370 msgid "Base service does not exist anymore" msgstr "El servei base ja no existeix" -#: REST/methods/services_pools.py:380 +#: REST/methods/services_pools.py:404 msgid "This service requires an OS Manager" msgstr "Aquest servei requereix un gestor de SO" @@ -945,8 +946,8 @@ msgstr "Membre del personal" #: auths/AzureAD_enterprise/azure_ad.py:92 #: auths/EDirectory_enterprise/authenticator.py:47 #: auths/RegexLdap/authenticator.py:67 auths/SAML_enterprise/saml.py:117 -#: reports/stats/pool_usage_summary.py:166 reports/stats/usage_by_pool.py:160 -#: templates/uds/reports/stats/pool-usage-summary.html:14 +#: reports/stats/pool_users_summary.py:166 reports/stats/usage_by_pool.py:158 +#: templates/uds/reports/stats/pool-users-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:15 msgid "User" msgstr "Usuari" @@ -1787,27 +1788,27 @@ msgstr "No es pot eliminar un element no actiu" msgid "Can't remove nor cancel {} cause its state don't allow it" msgstr "No es pot eliminar ni cancel·lar {} perquè el seu estat no ho permet" -#: core/managers/user_service.py:318 +#: core/managers/user_service.py:317 msgid "The requested service is restrained" msgstr "El servei sol·licitat està restringit" -#: core/managers/user_service.py:556 +#: core/managers/user_service.py:555 msgid "The requested service is not available" msgstr "El servei sol·licitat no està disponible" -#: core/managers/user_service.py:586 +#: core/managers/user_service.py:585 msgid "The requested transport {} is not valid for {}" msgstr "El transport sol·licitat {} no és vàlid per a {}" -#: core/managers/user_service.py:710 +#: core/managers/user_service.py:709 msgid "The service is not accessible from this device" msgstr "El servei no és accessible des d'aquest dispositiu" -#: core/module.py:208 +#: core/module.py:207 msgid "No connection checking method is implemented." msgstr "No s'ha implementat cap mètode per a comprovar la connexió" -#: core/module.py:277 +#: core/module.py:276 msgid "No check method provided." msgstr "No s'ha proporcionat cap mètode de verificació" @@ -2184,8 +2185,8 @@ msgstr "Dies de la setmana" msgid "Minutes" msgstr "Minuts" -#: models/calendar_rule.py:76 reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:16 +#: models/calendar_rule.py:76 reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:16 msgid "Hours" msgstr "Hores" @@ -2197,11 +2198,11 @@ msgstr "Dies" msgid "Weeks" msgstr "Setmanes" -#: models/meta_pool.py:71 +#: models/meta_pool.py:72 msgid "Evenly distributed" msgstr "Distribuït de manera uniforme" -#: models/meta_pool.py:73 +#: models/meta_pool.py:74 msgid "Greater % available" msgstr "Major % disponible" @@ -2577,7 +2578,7 @@ msgstr "Llistar usuaris de la plataforma" msgid "Users List for {}" msgstr "Llista d'usuaris per a {}" -#: reports/lists/users.py:86 reports/stats/pool_usage_summary.py:145 +#: reports/lists/users.py:86 reports/stats/pool_users_summary.py:145 msgid "UDS Report of users in {}" msgstr "Informe UDS d'usuaris a {}" @@ -2593,49 +2594,51 @@ msgstr "Nom real" msgid "Statistics" msgstr "Estadístiques" -#: reports/stats/pool_usage_summary.py:52 -msgid "Summary of pools usage" -msgstr "Resum d'ús de pools" +#: reports/stats/pool_users_summary.py:52 +#| msgid "Pools usage by users" +msgid "Pool Usage by users" +msgstr "Ús de la piscina per part dels usuaris" -#: reports/stats/pool_usage_summary.py:53 -msgid "Generates a report with the summary of a pool usage" -msgstr "Genera un informe amb el resum d'ús d'un pool" +#: reports/stats/pool_users_summary.py:53 +#| msgid "Generates a report with the summary of a pool usage" +msgid "Generates a report with the summary of users usage for a pool" +msgstr "Genera un informe amb el resum de l’ús dels usuaris d’una piscina" -#: reports/stats/pool_usage_summary.py:60 reports/stats/usage_by_pool.py:61 +#: reports/stats/pool_users_summary.py:60 reports/stats/usage_by_pool.py:61 msgid "Pool for report" msgstr "Pool per a l'informe" -#: reports/stats/pool_usage_summary.py:66 reports/stats/pools_performance.py:74 +#: reports/stats/pool_users_summary.py:66 reports/stats/pools_performance.py:74 #: reports/stats/usage_by_pool.py:67 reports/stats/user_access.py:66 msgid "Starting date" msgstr "Data d'inici" -#: reports/stats/pool_usage_summary.py:67 reports/stats/pools_performance.py:75 +#: reports/stats/pool_users_summary.py:67 reports/stats/pools_performance.py:75 #: reports/stats/usage_by_pool.py:68 reports/stats/user_access.py:67 msgid "starting date for report" msgstr "data d'inici de l'informe" -#: reports/stats/pool_usage_summary.py:74 reports/stats/pools_performance.py:82 +#: reports/stats/pool_users_summary.py:74 reports/stats/pools_performance.py:82 #: reports/stats/usage_by_pool.py:75 reports/stats/user_access.py:74 msgid "Finish date" msgstr "Data de finalització" -#: reports/stats/pool_usage_summary.py:75 reports/stats/pools_performance.py:83 +#: reports/stats/pool_users_summary.py:75 reports/stats/pools_performance.py:83 #: reports/stats/usage_by_pool.py:76 reports/stats/user_access.py:75 msgid "finish date for report" msgstr "data de finalització de l'informe" -#: reports/stats/pool_usage_summary.py:144 +#: reports/stats/pool_users_summary.py:144 msgid "Users usage list for {}" msgstr "Llista d'ús dels usuaris per {}" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:15 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:15 msgid "Sessions" msgstr "Sessions" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:17 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:17 msgid "Average" msgstr "Mitjana" @@ -2722,6 +2725,47 @@ msgstr "Informe d'ús dels serveis durant un dia" msgid "Service usage report" msgstr "Informe d'ús del servei" +#: reports/stats/pools_usage_summary.py:47 +msgid "Summary of pools usage" +msgstr "Resum d'ús de pools" + +#: reports/stats/pools_usage_summary.py:48 +msgid "" +"Summary of Pools usage with time totals, accesses totals, time total by pool" +msgstr "" +"Resum de l’ús de les piscines amb els totals del temps, els accessos totals, " +"el temps total per la piscina" + +#: reports/stats/pools_usage_summary.py:116 +#| msgid "Summary of pools usage" +msgid "Summary of Pools usage" +msgstr "Resum de l’ús de piscines" + +#: reports/stats/pools_usage_summary.py:116 +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "to" +msgstr "a" + +#: reports/stats/pools_usage_summary.py:117 +#| msgid "Summary of pools usage" +msgid "UDS Report Summary of pools usage" +msgstr "Informe UDS Resum de l’ús de piscines" + +#: reports/stats/pools_usage_summary.py:137 +msgid "Total Time (seconds)" +msgstr "Temps total (segons)" + +#: reports/stats/pools_usage_summary.py:137 +#| msgid "Accesses" +msgid "Total Accesses" +msgstr "Accés total" + +#: reports/stats/pools_usage_summary.py:142 +#: templates/uds/reports/stats/pools-usage-summary.html:30 +msgid "Total" +msgstr "Total" + #: reports/stats/usage_by_pool.py:53 msgid "Pools usage by users" msgstr "Ús de pools per usuari" @@ -2734,16 +2778,17 @@ msgstr "Informe d'ús de pools per usuari" msgid "ALL POOLS" msgstr "TOTS ELS POOLS" -#: reports/stats/usage_by_pool.py:138 +#: reports/stats/usage_by_pool.py:136 #: templates/uds/reports/stats/usage-by-pool.html:4 +#: templates/uds/reports/stats/usage-by-pool.html:6 msgid "Users usage list" msgstr "Llista d’ús d’usuaris" -#: reports/stats/usage_by_pool.py:139 +#: reports/stats/usage_by_pool.py:137 msgid "UDS Report of users usage" msgstr "Informe UDS d’ús d’usuaris" -#: reports/stats/usage_by_pool.py:160 +#: reports/stats/usage_by_pool.py:158 #: templates/uds/reports/stats/usage-by-pool.html:16 msgid "Seconds" msgstr "Segons" @@ -3085,7 +3130,7 @@ msgstr "La prova de connexió s'ha realitzat correctament" #: services/HyperV_enterprise/legacy/provider.py:268 #: services/Nutanix_enterprise/provider.py:214 services/OVirt/provider.py:457 -#: services/Proxmox/provider.py:202 services/Vmware_enterprise/provider.py:178 +#: services/Proxmox/provider.py:205 services/Vmware_enterprise/provider.py:178 msgid "Connection failed. Check connection params" msgstr "La connexió ha fallat. Verifiqueu els paràmetres de connexió" @@ -3097,12 +3142,10 @@ msgid "UDS pub for {0} at {1}" msgstr "Publicació d'UDS per a {0} a {1}" #: services/HyperV_enterprise/legacy/service.py:57 -#: services/HyperV_enterprise/service.py:57 msgid "HyperV Linked Clone (Experimental)" msgstr "HyperV Linked Clone (experimental)" #: services/HyperV_enterprise/legacy/service.py:59 -#: services/HyperV_enterprise/service.py:59 msgid "Hyper Services based on templates and differential disks (experimental)" msgstr "" "Serveis HyperV basats en plantilles i discs diferencials (experimental)" @@ -3286,6 +3329,17 @@ msgstr "" "Per als clústers, el nom d’usuari ha de ser un nom d’usuari de domini " "(usuari@domini o DOMINI\\usuari)" +#: services/HyperV_enterprise/service.py:57 +#| msgid "Xen Linked Clone" +msgid "HyperV Linked Clone" +msgstr "Clon vinculat a l’HiperV" + +#: services/HyperV_enterprise/service.py:59 +#| msgid "" +#| "Hyper Services based on templates and differential disks (experimental)" +msgid "Hyper Services based on templates and differential disks" +msgstr "Serveis hiper basats en plantilles i discs diferencials" + #: services/Nutanix_enterprise/provider.py:30 msgid "Nutanix Acropolis Platform Provider" msgstr "Proveïdor de la plataforma Nutanix Acropolis" @@ -3782,12 +3836,12 @@ msgstr "Proveïdor de màquines amb IP estàtica" msgid "Provides connection to machines by IP" msgstr "Proporciona connexió a màquines mitjançant IP" -#: services/PhysicalMachines/service_multi.py:59 +#: services/PhysicalMachines/service_multi.py:60 #: services/Vmware_enterprise/service_fixed.py:54 msgid "Service Token" msgstr "Token de servei" -#: services/PhysicalMachines/service_multi.py:61 +#: services/PhysicalMachines/service_multi.py:62 #: services/Vmware_enterprise/service_fixed.py:56 msgid "" "Service token that will be used by actors to communicate with service. Leave " @@ -3796,20 +3850,32 @@ msgstr "" "Token de servei que faran servir els actors per comunicar-se amb el servei. " "Deixeu-lo buit per a una assignació persistent." -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 #: services/RDS_enterprise/provider.py:47 msgid "List of servers" msgstr "Llistat de servidors" -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 msgid "List of servers available for this service" msgstr "Llistat de servidors disponibles per a aquest servei" -#: services/PhysicalMachines/service_multi.py:71 +#: services/PhysicalMachines/service_multi.py:70 +#| msgid "Check Cert." +msgid "Check Port" +msgstr "Consulteu Port" + +#: services/PhysicalMachines/service_multi.py:70 +msgid "" +"If non zero, only Machines responding to connection on that port will be used" +msgstr "" +"Si no és zero, només s’utilitzaran les màquines que responen a la connexió " +"en aquest port" + +#: services/PhysicalMachines/service_multi.py:73 msgid "Static Multiple IP" msgstr "IP múltiple estàtica" -#: services/PhysicalMachines/service_multi.py:73 +#: services/PhysicalMachines/service_multi.py:75 msgid "This service provides access to POWERED-ON Machines by IP" msgstr "Aquest servei proporciona accés per IP a màquines engegades" @@ -4768,9 +4834,31 @@ msgstr "Data:" msgid "Services assignation" msgstr "Assignació de serveis" -#: templates/uds/reports/stats/usage-by-pool.html:6 -msgid "Users usage list for" -msgstr "Llista d’ús d’usuaris per" +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +#| msgid "Pools usage on a day" +msgid "Pools usage summary" +msgstr "Resum d’ús de piscines" + +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "from" +msgstr "des de" + +#: templates/uds/reports/stats/pools-usage-summary.html:15 +#| msgid "Max.Idle time" +msgid "Total time" +msgstr "Temps total" + +#: templates/uds/reports/stats/pools-usage-summary.html:16 +#| msgid "Last access" +msgid "Total accesses" +msgstr "Accessos totals" + +#: templates/uds/reports/stats/pools-usage-summary.html:17 +#| msgid "Current users" +msgid "Unique users" +msgstr "Usuaris únics" #: templates/uds/reports/stats/usage-by-pool.html:14 msgid "Access date/time" @@ -5836,7 +5924,7 @@ msgstr "" "No es pot recarregar aquesta pàgina. Si us plau, torneu a obrir el servei " "des de l'origen." -#: web/util/services.py:190 +#: web/util/services.py:196 msgid "" "This service is about to be replaced by a new version. Please, close the " "session before {} and save all your work to avoid loosing it." diff --git a/server/src/uds/locale/ca/LC_MESSAGES/djangojs.po b/server/src/uds/locale/ca/LC_MESSAGES/djangojs.po index 52644974e..1a33f5dc3 100644 --- a/server/src/uds/locale/ca/LC_MESSAGES/djangojs.po +++ b/server/src/uds/locale/ca/LC_MESSAGES/djangojs.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:02+0200\n" -"PO-Revision-Date: 2020-05-07 09:52+0000\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" +"PO-Revision-Date: 2020-05-11 12:06+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: Catalan (http://www.transifex.com/openuds/openuds/language/" "ca/)\n" @@ -1570,12 +1570,10 @@ msgstr "Quant a" #: static/modern/translations-fakejs.js:35 #: static/modern/translations-fakejs.js:36 -#| msgid "UDS Client" msgid "Client IP" msgstr "IP del client" #: static/modern/translations-fakejs.js:37 -#| msgid "Delete Proxy" msgid "Detected proxy ip" msgstr "Proxy ip detectat" diff --git a/server/src/uds/locale/de/LC_MESSAGES/django.po b/server/src/uds/locale/de/LC_MESSAGES/django.po index a4c88d468..903e37ed8 100644 --- a/server/src/uds/locale/de/LC_MESSAGES/django.po +++ b/server/src/uds/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:01+0200\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" "PO-Revision-Date: 2020-05-07 09:52+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: German (http://www.transifex.com/openuds/openuds/language/" @@ -28,7 +28,7 @@ msgstr "Konten" #: REST/methods/meta_pools.py:70 REST/methods/networks.py:60 #: REST/methods/osmanagers.py:55 REST/methods/providers.py:70 #: REST/methods/proxies.py:59 REST/methods/reports.py:57 -#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:96 +#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:99 #: REST/methods/transports.py:57 REST/methods/user_services.py:255 #: REST/methods/user_services.py:295 REST/methods/users_groups.py:117 #: REST/model.py:139 @@ -54,7 +54,7 @@ msgstr "Zeitmarke" #: REST/methods/calendars.py:63 REST/methods/meta_pools.py:77 #: REST/methods/networks.py:63 REST/methods/osmanagers.py:59 #: REST/methods/providers.py:76 REST/methods/proxies.py:63 -#: REST/methods/services.py:226 REST/methods/services_pools.py:105 +#: REST/methods/services.py:226 REST/methods/services_pools.py:108 #: REST/methods/transports.py:61 msgid "tags" msgstr "Stichworte" @@ -120,7 +120,7 @@ msgstr "Schauspieler-Token" #: REST/methods/actor_token.py:54 reports/stats/pools_performance.py:198 #: reports/stats/pools_performance.py:213 reports/stats/pools_usage_day.py:65 -#: reports/stats/usage_by_pool.py:160 reports/stats/user_access.py:174 +#: reports/stats/usage_by_pool.py:158 reports/stats/user_access.py:174 msgid "Date" msgstr "Datum" @@ -174,13 +174,13 @@ msgstr "Art" #: REST/methods/authenticators.py:68 REST/methods/meta_service_pools.py:85 #: REST/methods/op_calendars.py:80 REST/methods/services_pool_groups.py:61 #: REST/methods/transports.py:56 REST/methods/user_services.py:294 -#: REST/model.py:166 models/meta_pool.py:72 +#: REST/model.py:166 models/meta_pool.py:73 msgid "Priority" msgstr "Priorität" #: REST/methods/authenticators.py:69 REST/methods/authenticators.py:101 #: REST/methods/meta_pools.py:75 REST/methods/meta_pools.py:150 -#: REST/methods/services_pools.py:101 REST/methods/services_pools.py:253 +#: REST/methods/services_pools.py:104 REST/methods/services_pools.py:277 msgid "Visible" msgstr "Sichtbar" @@ -196,15 +196,15 @@ msgstr "Etikette" msgid "Users" msgstr "Benutzer" -#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:254 +#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:278 msgid "If active, transport will be visible for users" msgstr "Wenn aktiv, ist der Transport für Benutzer sichtbar" #: REST/methods/authenticators.py:105 REST/methods/meta_pools.py:138 #: REST/methods/meta_pools.py:146 REST/methods/meta_pools.py:154 -#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:257 -#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 -#: REST/methods/services_pools.py:281 core/ui/user_interface.py:99 +#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:281 +#: REST/methods/services_pools.py:289 REST/methods/services_pools.py:297 +#: REST/methods/services_pools.py:305 core/ui/user_interface.py:99 #: services/OVirt/service.py:186 msgid "Display" msgstr "Anzeige" @@ -229,7 +229,7 @@ msgstr "Wiederholt" msgid "Every" msgstr "Jeden" -#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:160 +#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:158 msgid "Duration" msgstr "Dauer" @@ -284,11 +284,11 @@ msgid "Policy" msgstr "Politik" #: REST/methods/meta_pools.py:73 REST/methods/services.py:225 -#: REST/methods/services_pools.py:98 +#: REST/methods/services_pools.py:101 msgid "User services" msgstr "Benutzerdienste" -#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:99 +#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:102 msgid "In Preparation" msgstr "In Vorbereitung" @@ -297,8 +297,8 @@ msgid "Pool Group" msgstr "Poolgruppe" #: REST/methods/meta_pools.py:86 REST/methods/meta_pools.py:141 -#: REST/methods/services_pools.py:123 REST/methods/services_pools.py:175 -#: REST/methods/services_pools.py:268 +#: REST/methods/services_pools.py:141 REST/methods/services_pools.py:198 +#: REST/methods/services_pools.py:292 msgid "Default" msgstr "Standard" @@ -307,21 +307,21 @@ msgid "Service pool policy" msgstr "Service-Pool-Richtlinie" #: REST/methods/meta_pools.py:134 REST/methods/services_pool_groups.py:85 -#: REST/methods/services_pools.py:261 +#: REST/methods/services_pools.py:285 msgid "Associated Image" msgstr "Zugeordnetes Bild" #: REST/methods/meta_pools.py:135 REST/methods/services_pool_groups.py:86 -#: REST/methods/services_pools.py:262 +#: REST/methods/services_pools.py:286 msgid "Image assocciated with this service" msgstr "Bild mit diesem Dienst verbunden" -#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:103 -#: REST/methods/services_pools.py:269 +#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:106 +#: REST/methods/services_pools.py:293 msgid "Pool group" msgstr "Poolgruppe" -#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:270 +#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:294 msgid "Pool group for this pool (for pool classify on display)" msgstr "Poolgruppe für diesen Pool (für Poolklassifizierung auf dem Display)" @@ -329,11 +329,11 @@ msgstr "Poolgruppe für diesen Pool (für Poolklassifizierung auf dem Display)" msgid "If active, metapool will be visible for users" msgstr "Wenn aktiv, ist der Metapool für Benutzer sichtbar" -#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:277 +#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:301 msgid "Calendar access denied text" msgstr "Kalenderzugriff verweigert Text" -#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:278 +#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:302 msgid "" "Custom message to be shown to users if access is limited by calendar rules." msgstr "" @@ -362,12 +362,13 @@ msgid "Creation date" msgstr "Erstellungsdatum" #: REST/methods/meta_service_pools.py:172 REST/methods/services_usage.py:119 -#: reports/stats/pool_usage_summary.py:59 +#: reports/stats/pool_users_summary.py:59 #: reports/stats/pools_performance.py:258 reports/stats/pools_usage_day.py:166 -#: reports/stats/usage_by_pool.py:60 reports/stats/usage_by_pool.py:160 -#: services/Proxmox/service.py:110 +#: reports/stats/pools_usage_summary.py:137 reports/stats/usage_by_pool.py:60 +#: reports/stats/usage_by_pool.py:158 services/Proxmox/service.py:110 #: templates/uds/reports/stats/pools-performance.html:33 #: templates/uds/reports/stats/pools-usage-day.html:27 +#: templates/uds/reports/stats/pools-usage-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:17 msgid "Pool" msgstr "Schwimmbad" @@ -506,7 +507,7 @@ msgstr "" msgid "Service providers" msgstr "Dienstleister" -#: REST/methods/providers.py:73 REST/methods/services_pools.py:97 +#: REST/methods/providers.py:73 REST/methods/services_pools.py:100 msgid "Status" msgstr "Status" @@ -653,9 +654,9 @@ msgstr "Proxy" msgid "Proxy for services behind a firewall" msgstr "Proxy für Dienste hinter einer Firewall" -#: REST/methods/services.py:270 REST/methods/services_pools.py:233 -#: REST/methods/services_pools.py:241 REST/methods/services_pools.py:249 -#: REST/methods/services_pools.py:324 REST/methods/services_pools.py:332 +#: REST/methods/services.py:270 REST/methods/services_pools.py:257 +#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 +#: REST/methods/services_pools.py:348 REST/methods/services_pools.py:356 #: auths/RegexLdap/authenticator.py:78 core/ui/user_interface.py:95 #: osmanagers/WindowsOsManager/windows_domain.py:71 #: osmanagers/WindowsOsManager/windows_domain.py:72 @@ -679,49 +680,49 @@ msgstr "OK" msgid "Services Pool Groups" msgstr "Dienstleistungen Pool Gruppen" -#: REST/methods/services_pools.py:94 REST/methods/transports.py:104 +#: REST/methods/services_pools.py:97 REST/methods/transports.py:104 msgid "Service Pools" msgstr "Service-Pools" -#: REST/methods/services_pools.py:100 +#: REST/methods/services_pools.py:103 msgid "Usage" msgstr "Verwendungszweck" -#: REST/methods/services_pools.py:102 +#: REST/methods/services_pools.py:105 msgid "Shows transports" msgstr "Zeigt Transporte" -#: REST/methods/services_pools.py:104 +#: REST/methods/services_pools.py:107 msgid "Parent service" msgstr "Elternservice" -#: REST/methods/services_pools.py:206 +#: REST/methods/services_pools.py:230 msgid "Create at least a service before creating a new service pool" msgstr "" "Erstellen Sie mindestens einen Dienst, bevor Sie einen neuen Dienstpool " "erstellen" -#: REST/methods/services_pools.py:213 +#: REST/methods/services_pools.py:237 msgid "Base service" msgstr "Basisservice" -#: REST/methods/services_pools.py:214 +#: REST/methods/services_pools.py:238 msgid "Service used as base of this service pool" msgstr "Dienst, der als Basis für diesen Dienstpool verwendet wird" -#: REST/methods/services_pools.py:221 +#: REST/methods/services_pools.py:245 msgid "OS Manager" msgstr "OS Manager" -#: REST/methods/services_pools.py:222 +#: REST/methods/services_pools.py:246 msgid "OS Manager used as base of this service pool" msgstr "OS Manager wird als Basis dieses Service-Pools verwendet" -#: REST/methods/services_pools.py:229 +#: REST/methods/services_pools.py:253 msgid "Allow removal by users" msgstr "Entfernung von Benutzern zulassen" -#: REST/methods/services_pools.py:230 +#: REST/methods/services_pools.py:254 msgid "" "If active, the user will be allowed to remove the service \"manually\". Be " "careful with this, because the user will have the \"power\" to delete it's " @@ -731,19 +732,19 @@ msgstr "" "vorsichtig, denn der Benutzer hat die Möglichkeit, seinen eigenen Dienst zu " "löschen" -#: REST/methods/services_pools.py:237 +#: REST/methods/services_pools.py:261 msgid "Allow reset by users" msgstr "Zurücksetzen durch Benutzer zulassen" -#: REST/methods/services_pools.py:238 +#: REST/methods/services_pools.py:262 msgid "If active, the user will be allowed to reset the service" msgstr "Wenn aktiv, kann der Benutzer den Dienst zurücksetzen" -#: REST/methods/services_pools.py:245 +#: REST/methods/services_pools.py:269 msgid "Ignores unused" msgstr "Ignoriert ungenutzte" -#: REST/methods/services_pools.py:246 +#: REST/methods/services_pools.py:270 msgid "" "If the option is enabled, UDS will not attempt to detect and remove the user " "services assigned but not in use." @@ -751,44 +752,44 @@ msgstr "" "Wenn die Option aktiviert ist, versucht UDS nicht, die zugewiesenen, jedoch " "nicht verwendeten Benutzerdienste zu erkennen und zu entfernen." -#: REST/methods/services_pools.py:286 +#: REST/methods/services_pools.py:310 msgid "Initial available services" msgstr "Anfangs verfügbare Dienste" -#: REST/methods/services_pools.py:287 +#: REST/methods/services_pools.py:311 msgid "Services created initially for this service pool" msgstr "Services, die ursprünglich für diesen Servicepool erstellt wurden" -#: REST/methods/services_pools.py:290 REST/methods/services_pools.py:299 -#: REST/methods/services_pools.py:308 REST/methods/services_pools.py:317 +#: REST/methods/services_pools.py:314 REST/methods/services_pools.py:323 +#: REST/methods/services_pools.py:332 REST/methods/services_pools.py:341 msgid "Availability" msgstr "Verfügbarkeit" -#: REST/methods/services_pools.py:295 +#: REST/methods/services_pools.py:319 msgid "Services to keep in cache" msgstr "Dienste, die im Cache aufbewahrt werden sollen" -#: REST/methods/services_pools.py:296 +#: REST/methods/services_pools.py:320 msgid "Services kept in cache for improved user service assignation" msgstr "" "Dienste werden im Cache gehalten, um die Benutzerdienstzuweisung zu " "verbessern" -#: REST/methods/services_pools.py:304 +#: REST/methods/services_pools.py:328 msgid "Services to keep in L2 cache" msgstr "Dienste, die im L2-Cache aufbewahrt werden sollen" -#: REST/methods/services_pools.py:305 +#: REST/methods/services_pools.py:329 msgid "Services kept in cache of level2 for improved service generation" msgstr "" "Dienste, die im Cache von Level 2 gehalten werden, um die Service-" "Generierung zu verbessern" -#: REST/methods/services_pools.py:313 +#: REST/methods/services_pools.py:337 msgid "Maximum number of services to provide" msgstr "Maximale Anzahl der zu erbringenden Dienste" -#: REST/methods/services_pools.py:314 +#: REST/methods/services_pools.py:338 msgid "" "Maximum number of service (assigned and L1 cache) that can be created for " "this service" @@ -796,27 +797,27 @@ msgstr "" "Maximale Anzahl von Services (zugewiesen und L1-Cache), die für diesen " "Service erstellt werden können" -#: REST/methods/services_pools.py:321 +#: REST/methods/services_pools.py:345 msgid "Show transports" msgstr "Transporte anzeigen" -#: REST/methods/services_pools.py:322 +#: REST/methods/services_pools.py:346 msgid "If active, alternative transports for user will be shown" msgstr "Wenn aktiv, werden alternative Transporte für Benutzer angezeigt" -#: REST/methods/services_pools.py:329 +#: REST/methods/services_pools.py:353 msgid "Accounting" msgstr "Buchhaltung" -#: REST/methods/services_pools.py:330 +#: REST/methods/services_pools.py:354 msgid "Account associated to this service pool" msgstr "Konto, das diesem Service-Pool zugeordnet ist" -#: REST/methods/services_pools.py:346 +#: REST/methods/services_pools.py:370 msgid "Base service does not exist anymore" msgstr "Base Service existiert nicht mehr" -#: REST/methods/services_pools.py:380 +#: REST/methods/services_pools.py:404 msgid "This service requires an OS Manager" msgstr "Dieser Dienst erfordert einen OS Manager" @@ -946,8 +947,8 @@ msgstr "Mitarbeiter" #: auths/AzureAD_enterprise/azure_ad.py:92 #: auths/EDirectory_enterprise/authenticator.py:47 #: auths/RegexLdap/authenticator.py:67 auths/SAML_enterprise/saml.py:117 -#: reports/stats/pool_usage_summary.py:166 reports/stats/usage_by_pool.py:160 -#: templates/uds/reports/stats/pool-usage-summary.html:14 +#: reports/stats/pool_users_summary.py:166 reports/stats/usage_by_pool.py:158 +#: templates/uds/reports/stats/pool-users-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:15 msgid "User" msgstr "Nutzer" @@ -1802,27 +1803,27 @@ msgstr "" "{} Kann nicht entfernt oder abgebrochen werden, da der Status dies nicht " "zulässt" -#: core/managers/user_service.py:318 +#: core/managers/user_service.py:317 msgid "The requested service is restrained" msgstr "Der angeforderte Service ist eingeschränkt" -#: core/managers/user_service.py:556 +#: core/managers/user_service.py:555 msgid "The requested service is not available" msgstr "Der angeforderte Dienst ist nicht verfügbar" -#: core/managers/user_service.py:586 +#: core/managers/user_service.py:585 msgid "The requested transport {} is not valid for {}" msgstr "Der angeforderte Transport {} ist für {} nicht gültig" -#: core/managers/user_service.py:710 +#: core/managers/user_service.py:709 msgid "The service is not accessible from this device" msgstr "Der Dienst ist von diesem Gerät nicht erreichbar" -#: core/module.py:208 +#: core/module.py:207 msgid "No connection checking method is implemented." msgstr "Es wird keine Verbindungsüberprüfungsmethode implementiert." -#: core/module.py:277 +#: core/module.py:276 msgid "No check method provided." msgstr "Keine Prüfmethode angegeben." @@ -2200,8 +2201,8 @@ msgstr "Wochentage" msgid "Minutes" msgstr "Protokoll" -#: models/calendar_rule.py:76 reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:16 +#: models/calendar_rule.py:76 reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:16 msgid "Hours" msgstr "Std" @@ -2213,11 +2214,11 @@ msgstr "Tage" msgid "Weeks" msgstr "Wochen" -#: models/meta_pool.py:71 +#: models/meta_pool.py:72 msgid "Evenly distributed" msgstr "Gleichmäßig verteilt" -#: models/meta_pool.py:73 +#: models/meta_pool.py:74 msgid "Greater % available" msgstr "Größere% verfügbar" @@ -2592,7 +2593,7 @@ msgstr "Liste der Benutzer der Plattform" msgid "Users List for {}" msgstr "Benutzerliste für {}" -#: reports/lists/users.py:86 reports/stats/pool_usage_summary.py:145 +#: reports/lists/users.py:86 reports/stats/pool_users_summary.py:145 msgid "UDS Report of users in {}" msgstr "UDS-Bericht von Nutzern in {}" @@ -2608,49 +2609,53 @@ msgstr "Echter Name" msgid "Statistics" msgstr "Statistiken" -#: reports/stats/pool_usage_summary.py:52 -msgid "Summary of pools usage" -msgstr "Zusammenfassung der Poolnutzung" +#: reports/stats/pool_users_summary.py:52 +#| msgid "Pools usage by users" +msgid "Pool Usage by users" +msgstr "Poolnutzung durch Benutzer" -#: reports/stats/pool_usage_summary.py:53 -msgid "Generates a report with the summary of a pool usage" -msgstr "Erzeugt einen Bericht mit einer Zusammenfassung der Poolnutzung" +#: reports/stats/pool_users_summary.py:53 +#| msgid "Generates a report with the summary of a pool usage" +msgid "Generates a report with the summary of users usage for a pool" +msgstr "" +"Generiert einen Bericht mit einer Zusammenfassung der Benutzernutzung für " +"einen Pool" -#: reports/stats/pool_usage_summary.py:60 reports/stats/usage_by_pool.py:61 +#: reports/stats/pool_users_summary.py:60 reports/stats/usage_by_pool.py:61 msgid "Pool for report" msgstr "Pool für Bericht" -#: reports/stats/pool_usage_summary.py:66 reports/stats/pools_performance.py:74 +#: reports/stats/pool_users_summary.py:66 reports/stats/pools_performance.py:74 #: reports/stats/usage_by_pool.py:67 reports/stats/user_access.py:66 msgid "Starting date" msgstr "Anfangsdatum" -#: reports/stats/pool_usage_summary.py:67 reports/stats/pools_performance.py:75 +#: reports/stats/pool_users_summary.py:67 reports/stats/pools_performance.py:75 #: reports/stats/usage_by_pool.py:68 reports/stats/user_access.py:67 msgid "starting date for report" msgstr "Startdatum für den Bericht" -#: reports/stats/pool_usage_summary.py:74 reports/stats/pools_performance.py:82 +#: reports/stats/pool_users_summary.py:74 reports/stats/pools_performance.py:82 #: reports/stats/usage_by_pool.py:75 reports/stats/user_access.py:74 msgid "Finish date" msgstr "Enddatum" -#: reports/stats/pool_usage_summary.py:75 reports/stats/pools_performance.py:83 +#: reports/stats/pool_users_summary.py:75 reports/stats/pools_performance.py:83 #: reports/stats/usage_by_pool.py:76 reports/stats/user_access.py:75 msgid "finish date for report" msgstr "Enddatum für den Bericht" -#: reports/stats/pool_usage_summary.py:144 +#: reports/stats/pool_users_summary.py:144 msgid "Users usage list for {}" msgstr "Nutzerverwendungsliste für {}" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:15 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:15 msgid "Sessions" msgstr "Sitzungen" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:17 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:17 msgid "Average" msgstr "Durchschnittlich" @@ -2737,6 +2742,47 @@ msgstr "Dienstnutzungsbericht für einen Tag" msgid "Service usage report" msgstr "Dienstnutzungsbericht" +#: reports/stats/pools_usage_summary.py:47 +msgid "Summary of pools usage" +msgstr "Zusammenfassung der Poolnutzung" + +#: reports/stats/pools_usage_summary.py:48 +msgid "" +"Summary of Pools usage with time totals, accesses totals, time total by pool" +msgstr "" +"Zusammenfassung der Poolnutzung mit Zeitsummen, Zugriffssummen, Zeitsumme " +"nach Pool" + +#: reports/stats/pools_usage_summary.py:116 +#| msgid "Summary of pools usage" +msgid "Summary of Pools usage" +msgstr "Zusammenfassung der Poolnutzung" + +#: reports/stats/pools_usage_summary.py:116 +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "to" +msgstr "zu" + +#: reports/stats/pools_usage_summary.py:117 +#| msgid "Summary of pools usage" +msgid "UDS Report Summary of pools usage" +msgstr "UDS-Bericht Zusammenfassung der Poolnutzung" + +#: reports/stats/pools_usage_summary.py:137 +msgid "Total Time (seconds)" +msgstr "Gesamtzeit (Sekunden)" + +#: reports/stats/pools_usage_summary.py:137 +#| msgid "Accesses" +msgid "Total Accesses" +msgstr "Gesamtzugriffe" + +#: reports/stats/pools_usage_summary.py:142 +#: templates/uds/reports/stats/pools-usage-summary.html:30 +msgid "Total" +msgstr "Gesamt" + #: reports/stats/usage_by_pool.py:53 msgid "Pools usage by users" msgstr "Verwendet Pools von Benutzern" @@ -2749,16 +2795,17 @@ msgstr "Pools Verwendung nach Benutzerbericht" msgid "ALL POOLS" msgstr "ALLE POOLS" -#: reports/stats/usage_by_pool.py:138 +#: reports/stats/usage_by_pool.py:136 #: templates/uds/reports/stats/usage-by-pool.html:4 +#: templates/uds/reports/stats/usage-by-pool.html:6 msgid "Users usage list" msgstr "Nutzungsliste der Benutzer" -#: reports/stats/usage_by_pool.py:139 +#: reports/stats/usage_by_pool.py:137 msgid "UDS Report of users usage" msgstr "UDS-Nutzungsbericht" -#: reports/stats/usage_by_pool.py:160 +#: reports/stats/usage_by_pool.py:158 #: templates/uds/reports/stats/usage-by-pool.html:16 msgid "Seconds" msgstr "Sekunden" @@ -3097,7 +3144,7 @@ msgstr "Verbindungstest erfolgreich" #: services/HyperV_enterprise/legacy/provider.py:268 #: services/Nutanix_enterprise/provider.py:214 services/OVirt/provider.py:457 -#: services/Proxmox/provider.py:202 services/Vmware_enterprise/provider.py:178 +#: services/Proxmox/provider.py:205 services/Vmware_enterprise/provider.py:178 msgid "Connection failed. Check connection params" msgstr "Verbindung fehlgeschlagen. Überprüfen Sie die Verbindungsparameter" @@ -3109,12 +3156,10 @@ msgid "UDS pub for {0} at {1}" msgstr "UDS-Pub für {0} um {1}" #: services/HyperV_enterprise/legacy/service.py:57 -#: services/HyperV_enterprise/service.py:57 msgid "HyperV Linked Clone (Experimental)" msgstr "HyperV-verknüpfter Klon (experimentell)" #: services/HyperV_enterprise/legacy/service.py:59 -#: services/HyperV_enterprise/service.py:59 msgid "Hyper Services based on templates and differential disks (experimental)" msgstr "" "Hyper Services basierend auf Vorlagen und Differentialplatten (experimentell)" @@ -3299,6 +3344,17 @@ msgstr "" "Bei Clustern muss der Benutzername ein Domänenbenutzername sein (user @ " "domain oder DOMAIN \\ user)" +#: services/HyperV_enterprise/service.py:57 +#| msgid "Xen Linked Clone" +msgid "HyperV Linked Clone" +msgstr "HyperV Linked Clone" + +#: services/HyperV_enterprise/service.py:59 +#| msgid "" +#| "Hyper Services based on templates and differential disks (experimental)" +msgid "Hyper Services based on templates and differential disks" +msgstr "Hyper Services basierend auf Vorlagen und differenziellen Datenträgern" + #: services/Nutanix_enterprise/provider.py:30 msgid "Nutanix Acropolis Platform Provider" msgstr "Nutanix Acropolis-Plattformanbieter" @@ -3795,12 +3851,12 @@ msgstr "Anbieter statischer IP-Maschinen" msgid "Provides connection to machines by IP" msgstr "Bietet eine Verbindung zu Computern per IP" -#: services/PhysicalMachines/service_multi.py:59 +#: services/PhysicalMachines/service_multi.py:60 #: services/Vmware_enterprise/service_fixed.py:54 msgid "Service Token" msgstr "Service-Token" -#: services/PhysicalMachines/service_multi.py:61 +#: services/PhysicalMachines/service_multi.py:62 #: services/Vmware_enterprise/service_fixed.py:56 msgid "" "Service token that will be used by actors to communicate with service. Leave " @@ -3809,20 +3865,32 @@ msgstr "" "Service-Token, das von den Akteuren zur Kommunikation mit dem Service " "verwendet wird. Für dauerhafte Zuordnung leer lassen." -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 #: services/RDS_enterprise/provider.py:47 msgid "List of servers" msgstr "Liste der Server" -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 msgid "List of servers available for this service" msgstr "Liste der für diesen Dienst verfügbaren Server" -#: services/PhysicalMachines/service_multi.py:71 +#: services/PhysicalMachines/service_multi.py:70 +#| msgid "Check Cert." +msgid "Check Port" +msgstr "Überprüfen Sie den Port" + +#: services/PhysicalMachines/service_multi.py:70 +msgid "" +"If non zero, only Machines responding to connection on that port will be used" +msgstr "" +"Wenn nicht Null, werden nur Maschinen verwendet, die auf die Verbindung an " +"diesem Port reagieren" + +#: services/PhysicalMachines/service_multi.py:73 msgid "Static Multiple IP" msgstr "Statische mehrfache IP" -#: services/PhysicalMachines/service_multi.py:73 +#: services/PhysicalMachines/service_multi.py:75 msgid "This service provides access to POWERED-ON Machines by IP" msgstr "Dieser Dienst ermöglicht den Zugriff auf POWERED-ON-Rechner über IP" @@ -4780,9 +4848,31 @@ msgstr "Datum:" msgid "Services assignation" msgstr "Dienstezuweisung" -#: templates/uds/reports/stats/usage-by-pool.html:6 -msgid "Users usage list for" -msgstr "Benutzerverwendungsliste für" +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +#| msgid "Pools usage on a day" +msgid "Pools usage summary" +msgstr "Zusammenfassung der Poolnutzung" + +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "from" +msgstr "von" + +#: templates/uds/reports/stats/pools-usage-summary.html:15 +#| msgid "Max.Idle time" +msgid "Total time" +msgstr "Gesamtzeit" + +#: templates/uds/reports/stats/pools-usage-summary.html:16 +#| msgid "Last access" +msgid "Total accesses" +msgstr "Gesamtzugriffe" + +#: templates/uds/reports/stats/pools-usage-summary.html:17 +#| msgid "Current users" +msgid "Unique users" +msgstr "Einzigartige Benutzer" #: templates/uds/reports/stats/usage-by-pool.html:14 msgid "Access date/time" @@ -5853,7 +5943,7 @@ msgstr "" "Das erneute Laden dieser Seite wird nicht unterstützt. Bitte öffnen Sie den " "Dienst wieder vom Ursprung." -#: web/util/services.py:190 +#: web/util/services.py:196 msgid "" "This service is about to be replaced by a new version. Please, close the " "session before {} and save all your work to avoid loosing it." diff --git a/server/src/uds/locale/de/LC_MESSAGES/djangojs.po b/server/src/uds/locale/de/LC_MESSAGES/djangojs.po index c9d810c5e..662e1bcc2 100644 --- a/server/src/uds/locale/de/LC_MESSAGES/djangojs.po +++ b/server/src/uds/locale/de/LC_MESSAGES/djangojs.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:02+0200\n" -"PO-Revision-Date: 2020-05-07 09:52+0000\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" +"PO-Revision-Date: 2020-05-11 12:06+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: German (http://www.transifex.com/openuds/openuds/language/" "de/)\n" @@ -1577,12 +1577,10 @@ msgstr "Über" #: static/modern/translations-fakejs.js:35 #: static/modern/translations-fakejs.js:36 -#| msgid "UDS Client" msgid "Client IP" msgstr "Client-IP" #: static/modern/translations-fakejs.js:37 -#| msgid "Delete Proxy" msgid "Detected proxy ip" msgstr "Erkannte Proxy-IP" diff --git a/server/src/uds/locale/en/LC_MESSAGES/django.po b/server/src/uds/locale/en/LC_MESSAGES/django.po index 346cb8c2d..3a2663052 100644 --- a/server/src/uds/locale/en/LC_MESSAGES/django.po +++ b/server/src/uds/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:01+0200\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,7 +26,7 @@ msgstr "" #: REST/methods/meta_pools.py:70 REST/methods/networks.py:60 #: REST/methods/osmanagers.py:55 REST/methods/providers.py:70 #: REST/methods/proxies.py:59 REST/methods/reports.py:57 -#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:96 +#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:99 #: REST/methods/transports.py:57 REST/methods/user_services.py:255 #: REST/methods/user_services.py:295 REST/methods/users_groups.py:117 #: REST/model.py:139 @@ -52,7 +52,7 @@ msgstr "" #: REST/methods/calendars.py:63 REST/methods/meta_pools.py:77 #: REST/methods/networks.py:63 REST/methods/osmanagers.py:59 #: REST/methods/providers.py:76 REST/methods/proxies.py:63 -#: REST/methods/services.py:226 REST/methods/services_pools.py:105 +#: REST/methods/services.py:226 REST/methods/services_pools.py:108 #: REST/methods/transports.py:61 msgid "tags" msgstr "" @@ -118,7 +118,7 @@ msgstr "" #: REST/methods/actor_token.py:54 reports/stats/pools_performance.py:198 #: reports/stats/pools_performance.py:213 reports/stats/pools_usage_day.py:65 -#: reports/stats/usage_by_pool.py:160 reports/stats/user_access.py:174 +#: reports/stats/usage_by_pool.py:158 reports/stats/user_access.py:174 msgid "Date" msgstr "" @@ -172,13 +172,13 @@ msgstr "" #: REST/methods/authenticators.py:68 REST/methods/meta_service_pools.py:85 #: REST/methods/op_calendars.py:80 REST/methods/services_pool_groups.py:61 #: REST/methods/transports.py:56 REST/methods/user_services.py:294 -#: REST/model.py:166 models/meta_pool.py:72 +#: REST/model.py:166 models/meta_pool.py:73 msgid "Priority" msgstr "" #: REST/methods/authenticators.py:69 REST/methods/authenticators.py:101 #: REST/methods/meta_pools.py:75 REST/methods/meta_pools.py:150 -#: REST/methods/services_pools.py:101 REST/methods/services_pools.py:253 +#: REST/methods/services_pools.py:104 REST/methods/services_pools.py:277 msgid "Visible" msgstr "" @@ -194,15 +194,15 @@ msgstr "" msgid "Users" msgstr "" -#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:254 +#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:278 msgid "If active, transport will be visible for users" msgstr "" #: REST/methods/authenticators.py:105 REST/methods/meta_pools.py:138 #: REST/methods/meta_pools.py:146 REST/methods/meta_pools.py:154 -#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:257 -#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 -#: REST/methods/services_pools.py:281 core/ui/user_interface.py:99 +#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:281 +#: REST/methods/services_pools.py:289 REST/methods/services_pools.py:297 +#: REST/methods/services_pools.py:305 core/ui/user_interface.py:99 #: services/OVirt/service.py:186 msgid "Display" msgstr "" @@ -227,7 +227,7 @@ msgstr "" msgid "Every" msgstr "" -#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:160 +#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:158 msgid "Duration" msgstr "" @@ -282,11 +282,11 @@ msgid "Policy" msgstr "" #: REST/methods/meta_pools.py:73 REST/methods/services.py:225 -#: REST/methods/services_pools.py:98 +#: REST/methods/services_pools.py:101 msgid "User services" msgstr "" -#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:99 +#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:102 msgid "In Preparation" msgstr "" @@ -295,8 +295,8 @@ msgid "Pool Group" msgstr "" #: REST/methods/meta_pools.py:86 REST/methods/meta_pools.py:141 -#: REST/methods/services_pools.py:123 REST/methods/services_pools.py:175 -#: REST/methods/services_pools.py:268 +#: REST/methods/services_pools.py:141 REST/methods/services_pools.py:198 +#: REST/methods/services_pools.py:292 msgid "Default" msgstr "" @@ -305,21 +305,21 @@ msgid "Service pool policy" msgstr "" #: REST/methods/meta_pools.py:134 REST/methods/services_pool_groups.py:85 -#: REST/methods/services_pools.py:261 +#: REST/methods/services_pools.py:285 msgid "Associated Image" msgstr "" #: REST/methods/meta_pools.py:135 REST/methods/services_pool_groups.py:86 -#: REST/methods/services_pools.py:262 +#: REST/methods/services_pools.py:286 msgid "Image assocciated with this service" msgstr "" -#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:103 -#: REST/methods/services_pools.py:269 +#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:106 +#: REST/methods/services_pools.py:293 msgid "Pool group" msgstr "" -#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:270 +#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:294 msgid "Pool group for this pool (for pool classify on display)" msgstr "" @@ -327,11 +327,11 @@ msgstr "" msgid "If active, metapool will be visible for users" msgstr "" -#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:277 +#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:301 msgid "Calendar access denied text" msgstr "" -#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:278 +#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:302 msgid "" "Custom message to be shown to users if access is limited by calendar rules." msgstr "" @@ -358,12 +358,13 @@ msgid "Creation date" msgstr "" #: REST/methods/meta_service_pools.py:172 REST/methods/services_usage.py:119 -#: reports/stats/pool_usage_summary.py:59 +#: reports/stats/pool_users_summary.py:59 #: reports/stats/pools_performance.py:258 reports/stats/pools_usage_day.py:166 -#: reports/stats/usage_by_pool.py:60 reports/stats/usage_by_pool.py:160 -#: services/Proxmox/service.py:110 +#: reports/stats/pools_usage_summary.py:137 reports/stats/usage_by_pool.py:60 +#: reports/stats/usage_by_pool.py:158 services/Proxmox/service.py:110 #: templates/uds/reports/stats/pools-performance.html:33 #: templates/uds/reports/stats/pools-usage-day.html:27 +#: templates/uds/reports/stats/pools-usage-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:17 msgid "Pool" msgstr "" @@ -499,7 +500,7 @@ msgstr "" msgid "Service providers" msgstr "" -#: REST/methods/providers.py:73 REST/methods/services_pools.py:97 +#: REST/methods/providers.py:73 REST/methods/services_pools.py:100 msgid "Status" msgstr "" @@ -642,9 +643,9 @@ msgstr "" msgid "Proxy for services behind a firewall" msgstr "" -#: REST/methods/services.py:270 REST/methods/services_pools.py:233 -#: REST/methods/services_pools.py:241 REST/methods/services_pools.py:249 -#: REST/methods/services_pools.py:324 REST/methods/services_pools.py:332 +#: REST/methods/services.py:270 REST/methods/services_pools.py:257 +#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 +#: REST/methods/services_pools.py:348 REST/methods/services_pools.py:356 #: auths/RegexLdap/authenticator.py:78 core/ui/user_interface.py:95 #: osmanagers/WindowsOsManager/windows_domain.py:71 #: osmanagers/WindowsOsManager/windows_domain.py:72 @@ -668,131 +669,131 @@ msgstr "" msgid "Services Pool Groups" msgstr "" -#: REST/methods/services_pools.py:94 REST/methods/transports.py:104 +#: REST/methods/services_pools.py:97 REST/methods/transports.py:104 msgid "Service Pools" msgstr "" -#: REST/methods/services_pools.py:100 +#: REST/methods/services_pools.py:103 msgid "Usage" msgstr "" -#: REST/methods/services_pools.py:102 +#: REST/methods/services_pools.py:105 msgid "Shows transports" msgstr "" -#: REST/methods/services_pools.py:104 +#: REST/methods/services_pools.py:107 msgid "Parent service" msgstr "" -#: REST/methods/services_pools.py:206 +#: REST/methods/services_pools.py:230 msgid "Create at least a service before creating a new service pool" msgstr "" -#: REST/methods/services_pools.py:213 +#: REST/methods/services_pools.py:237 msgid "Base service" msgstr "" -#: REST/methods/services_pools.py:214 +#: REST/methods/services_pools.py:238 msgid "Service used as base of this service pool" msgstr "" -#: REST/methods/services_pools.py:221 +#: REST/methods/services_pools.py:245 msgid "OS Manager" msgstr "" -#: REST/methods/services_pools.py:222 +#: REST/methods/services_pools.py:246 msgid "OS Manager used as base of this service pool" msgstr "" -#: REST/methods/services_pools.py:229 +#: REST/methods/services_pools.py:253 msgid "Allow removal by users" msgstr "" -#: REST/methods/services_pools.py:230 +#: REST/methods/services_pools.py:254 msgid "" "If active, the user will be allowed to remove the service \"manually\". Be " "careful with this, because the user will have the \"power\" to delete it's " "own service" msgstr "" -#: REST/methods/services_pools.py:237 +#: REST/methods/services_pools.py:261 msgid "Allow reset by users" msgstr "" -#: REST/methods/services_pools.py:238 +#: REST/methods/services_pools.py:262 msgid "If active, the user will be allowed to reset the service" msgstr "" -#: REST/methods/services_pools.py:245 +#: REST/methods/services_pools.py:269 msgid "Ignores unused" msgstr "" -#: REST/methods/services_pools.py:246 +#: REST/methods/services_pools.py:270 msgid "" "If the option is enabled, UDS will not attempt to detect and remove the user " "services assigned but not in use." msgstr "" -#: REST/methods/services_pools.py:286 +#: REST/methods/services_pools.py:310 msgid "Initial available services" msgstr "" -#: REST/methods/services_pools.py:287 +#: REST/methods/services_pools.py:311 msgid "Services created initially for this service pool" msgstr "" -#: REST/methods/services_pools.py:290 REST/methods/services_pools.py:299 -#: REST/methods/services_pools.py:308 REST/methods/services_pools.py:317 +#: REST/methods/services_pools.py:314 REST/methods/services_pools.py:323 +#: REST/methods/services_pools.py:332 REST/methods/services_pools.py:341 msgid "Availability" msgstr "" -#: REST/methods/services_pools.py:295 +#: REST/methods/services_pools.py:319 msgid "Services to keep in cache" msgstr "" -#: REST/methods/services_pools.py:296 +#: REST/methods/services_pools.py:320 msgid "Services kept in cache for improved user service assignation" msgstr "" -#: REST/methods/services_pools.py:304 +#: REST/methods/services_pools.py:328 msgid "Services to keep in L2 cache" msgstr "" -#: REST/methods/services_pools.py:305 +#: REST/methods/services_pools.py:329 msgid "Services kept in cache of level2 for improved service generation" msgstr "" -#: REST/methods/services_pools.py:313 +#: REST/methods/services_pools.py:337 msgid "Maximum number of services to provide" msgstr "" -#: REST/methods/services_pools.py:314 +#: REST/methods/services_pools.py:338 msgid "" "Maximum number of service (assigned and L1 cache) that can be created for " "this service" msgstr "" -#: REST/methods/services_pools.py:321 +#: REST/methods/services_pools.py:345 msgid "Show transports" msgstr "" -#: REST/methods/services_pools.py:322 +#: REST/methods/services_pools.py:346 msgid "If active, alternative transports for user will be shown" msgstr "" -#: REST/methods/services_pools.py:329 +#: REST/methods/services_pools.py:353 msgid "Accounting" msgstr "" -#: REST/methods/services_pools.py:330 +#: REST/methods/services_pools.py:354 msgid "Account associated to this service pool" msgstr "" -#: REST/methods/services_pools.py:346 +#: REST/methods/services_pools.py:370 msgid "Base service does not exist anymore" msgstr "" -#: REST/methods/services_pools.py:380 +#: REST/methods/services_pools.py:404 msgid "This service requires an OS Manager" msgstr "" @@ -914,8 +915,8 @@ msgstr "" #: auths/AzureAD_enterprise/azure_ad.py:92 #: auths/EDirectory_enterprise/authenticator.py:47 #: auths/RegexLdap/authenticator.py:67 auths/SAML_enterprise/saml.py:117 -#: reports/stats/pool_usage_summary.py:166 reports/stats/usage_by_pool.py:160 -#: templates/uds/reports/stats/pool-usage-summary.html:14 +#: reports/stats/pool_users_summary.py:166 reports/stats/usage_by_pool.py:158 +#: templates/uds/reports/stats/pool-users-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:15 msgid "User" msgstr "" @@ -1701,27 +1702,27 @@ msgstr "" msgid "Can't remove nor cancel {} cause its state don't allow it" msgstr "" -#: core/managers/user_service.py:318 +#: core/managers/user_service.py:317 msgid "The requested service is restrained" msgstr "" -#: core/managers/user_service.py:556 +#: core/managers/user_service.py:555 msgid "The requested service is not available" msgstr "" -#: core/managers/user_service.py:586 +#: core/managers/user_service.py:585 msgid "The requested transport {} is not valid for {}" msgstr "" -#: core/managers/user_service.py:710 +#: core/managers/user_service.py:709 msgid "The service is not accessible from this device" msgstr "" -#: core/module.py:208 +#: core/module.py:207 msgid "No connection checking method is implemented." msgstr "" -#: core/module.py:277 +#: core/module.py:276 msgid "No check method provided." msgstr "" @@ -2094,8 +2095,8 @@ msgstr "" msgid "Minutes" msgstr "" -#: models/calendar_rule.py:76 reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:16 +#: models/calendar_rule.py:76 reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:16 msgid "Hours" msgstr "" @@ -2107,11 +2108,11 @@ msgstr "" msgid "Weeks" msgstr "" -#: models/meta_pool.py:71 +#: models/meta_pool.py:72 msgid "Evenly distributed" msgstr "" -#: models/meta_pool.py:73 +#: models/meta_pool.py:74 msgid "Greater % available" msgstr "" @@ -2450,7 +2451,7 @@ msgstr "" msgid "Users List for {}" msgstr "" -#: reports/lists/users.py:86 reports/stats/pool_usage_summary.py:145 +#: reports/lists/users.py:86 reports/stats/pool_users_summary.py:145 msgid "UDS Report of users in {}" msgstr "" @@ -2466,49 +2467,49 @@ msgstr "" msgid "Statistics" msgstr "" -#: reports/stats/pool_usage_summary.py:52 -msgid "Summary of pools usage" +#: reports/stats/pool_users_summary.py:52 +msgid "Pool Usage by users" msgstr "" -#: reports/stats/pool_usage_summary.py:53 -msgid "Generates a report with the summary of a pool usage" +#: reports/stats/pool_users_summary.py:53 +msgid "Generates a report with the summary of users usage for a pool" msgstr "" -#: reports/stats/pool_usage_summary.py:60 reports/stats/usage_by_pool.py:61 +#: reports/stats/pool_users_summary.py:60 reports/stats/usage_by_pool.py:61 msgid "Pool for report" msgstr "" -#: reports/stats/pool_usage_summary.py:66 reports/stats/pools_performance.py:74 +#: reports/stats/pool_users_summary.py:66 reports/stats/pools_performance.py:74 #: reports/stats/usage_by_pool.py:67 reports/stats/user_access.py:66 msgid "Starting date" msgstr "" -#: reports/stats/pool_usage_summary.py:67 reports/stats/pools_performance.py:75 +#: reports/stats/pool_users_summary.py:67 reports/stats/pools_performance.py:75 #: reports/stats/usage_by_pool.py:68 reports/stats/user_access.py:67 msgid "starting date for report" msgstr "" -#: reports/stats/pool_usage_summary.py:74 reports/stats/pools_performance.py:82 +#: reports/stats/pool_users_summary.py:74 reports/stats/pools_performance.py:82 #: reports/stats/usage_by_pool.py:75 reports/stats/user_access.py:74 msgid "Finish date" msgstr "" -#: reports/stats/pool_usage_summary.py:75 reports/stats/pools_performance.py:83 +#: reports/stats/pool_users_summary.py:75 reports/stats/pools_performance.py:83 #: reports/stats/usage_by_pool.py:76 reports/stats/user_access.py:75 msgid "finish date for report" msgstr "" -#: reports/stats/pool_usage_summary.py:144 +#: reports/stats/pool_users_summary.py:144 msgid "Users usage list for {}" msgstr "" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:15 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:15 msgid "Sessions" msgstr "" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:17 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:17 msgid "Average" msgstr "" @@ -2595,6 +2596,42 @@ msgstr "" msgid "Service usage report" msgstr "" +#: reports/stats/pools_usage_summary.py:47 +msgid "Summary of pools usage" +msgstr "" + +#: reports/stats/pools_usage_summary.py:48 +msgid "" +"Summary of Pools usage with time totals, accesses totals, time total by pool" +msgstr "" + +#: reports/stats/pools_usage_summary.py:116 +msgid "Summary of Pools usage" +msgstr "" + +#: reports/stats/pools_usage_summary.py:116 +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "to" +msgstr "" + +#: reports/stats/pools_usage_summary.py:117 +msgid "UDS Report Summary of pools usage" +msgstr "" + +#: reports/stats/pools_usage_summary.py:137 +msgid "Total Time (seconds)" +msgstr "" + +#: reports/stats/pools_usage_summary.py:137 +msgid "Total Accesses" +msgstr "" + +#: reports/stats/pools_usage_summary.py:142 +#: templates/uds/reports/stats/pools-usage-summary.html:30 +msgid "Total" +msgstr "" + #: reports/stats/usage_by_pool.py:53 msgid "Pools usage by users" msgstr "" @@ -2607,16 +2644,17 @@ msgstr "" msgid "ALL POOLS" msgstr "" -#: reports/stats/usage_by_pool.py:138 +#: reports/stats/usage_by_pool.py:136 #: templates/uds/reports/stats/usage-by-pool.html:4 +#: templates/uds/reports/stats/usage-by-pool.html:6 msgid "Users usage list" msgstr "" -#: reports/stats/usage_by_pool.py:139 +#: reports/stats/usage_by_pool.py:137 msgid "UDS Report of users usage" msgstr "" -#: reports/stats/usage_by_pool.py:160 +#: reports/stats/usage_by_pool.py:158 #: templates/uds/reports/stats/usage-by-pool.html:16 msgid "Seconds" msgstr "" @@ -2946,7 +2984,7 @@ msgstr "" #: services/HyperV_enterprise/legacy/provider.py:268 #: services/Nutanix_enterprise/provider.py:214 services/OVirt/provider.py:457 -#: services/Proxmox/provider.py:202 services/Vmware_enterprise/provider.py:178 +#: services/Proxmox/provider.py:205 services/Vmware_enterprise/provider.py:178 msgid "Connection failed. Check connection params" msgstr "" @@ -2958,12 +2996,10 @@ msgid "UDS pub for {0} at {1}" msgstr "" #: services/HyperV_enterprise/legacy/service.py:57 -#: services/HyperV_enterprise/service.py:57 msgid "HyperV Linked Clone (Experimental)" msgstr "" #: services/HyperV_enterprise/legacy/service.py:59 -#: services/HyperV_enterprise/service.py:59 msgid "Hyper Services based on templates and differential disks (experimental)" msgstr "" @@ -3134,6 +3170,14 @@ msgid "" "\\user" msgstr "" +#: services/HyperV_enterprise/service.py:57 +msgid "HyperV Linked Clone" +msgstr "" + +#: services/HyperV_enterprise/service.py:59 +msgid "Hyper Services based on templates and differential disks" +msgstr "" + #: services/Nutanix_enterprise/provider.py:30 msgid "Nutanix Acropolis Platform Provider" msgstr "" @@ -3601,32 +3645,41 @@ msgstr "" msgid "Provides connection to machines by IP" msgstr "" -#: services/PhysicalMachines/service_multi.py:59 +#: services/PhysicalMachines/service_multi.py:60 #: services/Vmware_enterprise/service_fixed.py:54 msgid "Service Token" msgstr "" -#: services/PhysicalMachines/service_multi.py:61 +#: services/PhysicalMachines/service_multi.py:62 #: services/Vmware_enterprise/service_fixed.py:56 msgid "" "Service token that will be used by actors to communicate with service. Leave " "empty for persistent assignation." msgstr "" -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 #: services/RDS_enterprise/provider.py:47 msgid "List of servers" msgstr "" -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 msgid "List of servers available for this service" msgstr "" -#: services/PhysicalMachines/service_multi.py:71 -msgid "Static Multiple IP" +#: services/PhysicalMachines/service_multi.py:70 +msgid "Check Port" +msgstr "" + +#: services/PhysicalMachines/service_multi.py:70 +msgid "" +"If non zero, only Machines responding to connection on that port will be used" msgstr "" #: services/PhysicalMachines/service_multi.py:73 +msgid "Static Multiple IP" +msgstr "" + +#: services/PhysicalMachines/service_multi.py:75 msgid "This service provides access to POWERED-ON Machines by IP" msgstr "" @@ -4524,8 +4577,26 @@ msgstr "" msgid "Services assignation" msgstr "" -#: templates/uds/reports/stats/usage-by-pool.html:6 -msgid "Users usage list for" +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "Pools usage summary" +msgstr "" + +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "from" +msgstr "" + +#: templates/uds/reports/stats/pools-usage-summary.html:15 +msgid "Total time" +msgstr "" + +#: templates/uds/reports/stats/pools-usage-summary.html:16 +msgid "Total accesses" +msgstr "" + +#: templates/uds/reports/stats/pools-usage-summary.html:17 +msgid "Unique users" msgstr "" #: templates/uds/reports/stats/usage-by-pool.html:14 @@ -5502,7 +5573,7 @@ msgid "" "Reloading this page is not supported. Please, reopen service from origin." msgstr "" -#: web/util/services.py:190 +#: web/util/services.py:196 msgid "" "This service is about to be replaced by a new version. Please, close the " "session before {} and save all your work to avoid loosing it." diff --git a/server/src/uds/locale/en/LC_MESSAGES/djangojs.po b/server/src/uds/locale/en/LC_MESSAGES/djangojs.po index 0e6d40e3a..d4cbed77a 100644 --- a/server/src/uds/locale/en/LC_MESSAGES/djangojs.po +++ b/server/src/uds/locale/en/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:02+0200\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/server/src/uds/locale/es/LC_MESSAGES/django.po b/server/src/uds/locale/es/LC_MESSAGES/django.po index 3a9f00b97..bdbf57688 100644 --- a/server/src/uds/locale/es/LC_MESSAGES/django.po +++ b/server/src/uds/locale/es/LC_MESSAGES/django.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:01+0200\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" "PO-Revision-Date: 2020-05-07 09:52+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: Spanish (http://www.transifex.com/openuds/openuds/language/" @@ -39,7 +39,7 @@ msgstr "Cuentas" #: REST/methods/meta_pools.py:70 REST/methods/networks.py:60 #: REST/methods/osmanagers.py:55 REST/methods/providers.py:70 #: REST/methods/proxies.py:59 REST/methods/reports.py:57 -#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:96 +#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:99 #: REST/methods/transports.py:57 REST/methods/user_services.py:255 #: REST/methods/user_services.py:295 REST/methods/users_groups.py:117 #: REST/model.py:139 @@ -65,7 +65,7 @@ msgstr "Marca de tiempo" #: REST/methods/calendars.py:63 REST/methods/meta_pools.py:77 #: REST/methods/networks.py:63 REST/methods/osmanagers.py:59 #: REST/methods/providers.py:76 REST/methods/proxies.py:63 -#: REST/methods/services.py:226 REST/methods/services_pools.py:105 +#: REST/methods/services.py:226 REST/methods/services_pools.py:108 #: REST/methods/transports.py:61 msgid "tags" msgstr "Etiquetas" @@ -131,7 +131,7 @@ msgstr "Tokens del Actor" #: REST/methods/actor_token.py:54 reports/stats/pools_performance.py:198 #: reports/stats/pools_performance.py:213 reports/stats/pools_usage_day.py:65 -#: reports/stats/usage_by_pool.py:160 reports/stats/user_access.py:174 +#: reports/stats/usage_by_pool.py:158 reports/stats/user_access.py:174 msgid "Date" msgstr "Fecha" @@ -185,13 +185,13 @@ msgstr "Tipo" #: REST/methods/authenticators.py:68 REST/methods/meta_service_pools.py:85 #: REST/methods/op_calendars.py:80 REST/methods/services_pool_groups.py:61 #: REST/methods/transports.py:56 REST/methods/user_services.py:294 -#: REST/model.py:166 models/meta_pool.py:72 +#: REST/model.py:166 models/meta_pool.py:73 msgid "Priority" msgstr "Prioridad" #: REST/methods/authenticators.py:69 REST/methods/authenticators.py:101 #: REST/methods/meta_pools.py:75 REST/methods/meta_pools.py:150 -#: REST/methods/services_pools.py:101 REST/methods/services_pools.py:253 +#: REST/methods/services_pools.py:104 REST/methods/services_pools.py:277 msgid "Visible" msgstr "Visible" @@ -207,15 +207,15 @@ msgstr "Etiqueta" msgid "Users" msgstr "Usuarios" -#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:254 +#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:278 msgid "If active, transport will be visible for users" msgstr "Si está activo, el transporte será visible para los usuarios." #: REST/methods/authenticators.py:105 REST/methods/meta_pools.py:138 #: REST/methods/meta_pools.py:146 REST/methods/meta_pools.py:154 -#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:257 -#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 -#: REST/methods/services_pools.py:281 core/ui/user_interface.py:99 +#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:281 +#: REST/methods/services_pools.py:289 REST/methods/services_pools.py:297 +#: REST/methods/services_pools.py:305 core/ui/user_interface.py:99 #: services/OVirt/service.py:186 msgid "Display" msgstr "Visualización" @@ -240,7 +240,7 @@ msgstr "Se repite" msgid "Every" msgstr "Cada" -#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:160 +#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:158 msgid "Duration" msgstr "Duración" @@ -296,11 +296,11 @@ msgid "Policy" msgstr "Política" #: REST/methods/meta_pools.py:73 REST/methods/services.py:225 -#: REST/methods/services_pools.py:98 +#: REST/methods/services_pools.py:101 msgid "User services" msgstr "Servicios de usuario" -#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:99 +#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:102 msgid "In Preparation" msgstr "En preparación" @@ -309,8 +309,8 @@ msgid "Pool Group" msgstr "Grupo de Pool" #: REST/methods/meta_pools.py:86 REST/methods/meta_pools.py:141 -#: REST/methods/services_pools.py:123 REST/methods/services_pools.py:175 -#: REST/methods/services_pools.py:268 +#: REST/methods/services_pools.py:141 REST/methods/services_pools.py:198 +#: REST/methods/services_pools.py:292 msgid "Default" msgstr "Por defecto" @@ -319,21 +319,21 @@ msgid "Service pool policy" msgstr "Política del service pool" #: REST/methods/meta_pools.py:134 REST/methods/services_pool_groups.py:85 -#: REST/methods/services_pools.py:261 +#: REST/methods/services_pools.py:285 msgid "Associated Image" msgstr "Imagen asociada" #: REST/methods/meta_pools.py:135 REST/methods/services_pool_groups.py:86 -#: REST/methods/services_pools.py:262 +#: REST/methods/services_pools.py:286 msgid "Image assocciated with this service" msgstr "Imagen asociada a este servicio" -#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:103 -#: REST/methods/services_pools.py:269 +#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:106 +#: REST/methods/services_pools.py:293 msgid "Pool group" msgstr "Grupo de Pool" -#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:270 +#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:294 msgid "Pool group for this pool (for pool classify on display)" msgstr "" "Grupo de Pool para este pool (para la visualización del pool en pantalla)" @@ -342,11 +342,11 @@ msgstr "" msgid "If active, metapool will be visible for users" msgstr "Si está activo, el metapool será visible para los usuarios." -#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:277 +#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:301 msgid "Calendar access denied text" msgstr "Texto de acceso denegado al calendario" -#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:278 +#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:302 msgid "" "Custom message to be shown to users if access is limited by calendar rules." msgstr "" @@ -375,12 +375,13 @@ msgid "Creation date" msgstr "Fecha de creación" #: REST/methods/meta_service_pools.py:172 REST/methods/services_usage.py:119 -#: reports/stats/pool_usage_summary.py:59 +#: reports/stats/pool_users_summary.py:59 #: reports/stats/pools_performance.py:258 reports/stats/pools_usage_day.py:166 -#: reports/stats/usage_by_pool.py:60 reports/stats/usage_by_pool.py:160 -#: services/Proxmox/service.py:110 +#: reports/stats/pools_usage_summary.py:137 reports/stats/usage_by_pool.py:60 +#: reports/stats/usage_by_pool.py:158 services/Proxmox/service.py:110 #: templates/uds/reports/stats/pools-performance.html:33 #: templates/uds/reports/stats/pools-usage-day.html:27 +#: templates/uds/reports/stats/pools-usage-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:17 msgid "Pool" msgstr "Pool" @@ -518,7 +519,7 @@ msgstr "No se puede eliminar OS Manager con pools de servicios asociados" msgid "Service providers" msgstr "Proveedores de servicios" -#: REST/methods/providers.py:73 REST/methods/services_pools.py:97 +#: REST/methods/providers.py:73 REST/methods/services_pools.py:100 msgid "Status" msgstr "Estado" @@ -665,9 +666,9 @@ msgstr "Proxy" msgid "Proxy for services behind a firewall" msgstr "Proxy para servicios detrás de un firewall" -#: REST/methods/services.py:270 REST/methods/services_pools.py:233 -#: REST/methods/services_pools.py:241 REST/methods/services_pools.py:249 -#: REST/methods/services_pools.py:324 REST/methods/services_pools.py:332 +#: REST/methods/services.py:270 REST/methods/services_pools.py:257 +#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 +#: REST/methods/services_pools.py:348 REST/methods/services_pools.py:356 #: auths/RegexLdap/authenticator.py:78 core/ui/user_interface.py:95 #: osmanagers/WindowsOsManager/windows_domain.py:71 #: osmanagers/WindowsOsManager/windows_domain.py:72 @@ -691,47 +692,47 @@ msgstr "Ok" msgid "Services Pool Groups" msgstr "Grupos de Service Pools" -#: REST/methods/services_pools.py:94 REST/methods/transports.py:104 +#: REST/methods/services_pools.py:97 REST/methods/transports.py:104 msgid "Service Pools" msgstr "Pools de servicios" -#: REST/methods/services_pools.py:100 +#: REST/methods/services_pools.py:103 msgid "Usage" msgstr "Uso" -#: REST/methods/services_pools.py:102 +#: REST/methods/services_pools.py:105 msgid "Shows transports" msgstr "Muestra transportes" -#: REST/methods/services_pools.py:104 +#: REST/methods/services_pools.py:107 msgid "Parent service" msgstr "Servicio de padres" -#: REST/methods/services_pools.py:206 +#: REST/methods/services_pools.py:230 msgid "Create at least a service before creating a new service pool" msgstr "Cree al menos un servicio antes de crear un nuevo pool de servicios" -#: REST/methods/services_pools.py:213 +#: REST/methods/services_pools.py:237 msgid "Base service" msgstr "Servicio base" -#: REST/methods/services_pools.py:214 +#: REST/methods/services_pools.py:238 msgid "Service used as base of this service pool" msgstr "Servicio utilizado como base de este pool de servicios" -#: REST/methods/services_pools.py:221 +#: REST/methods/services_pools.py:245 msgid "OS Manager" msgstr "OS Manager" -#: REST/methods/services_pools.py:222 +#: REST/methods/services_pools.py:246 msgid "OS Manager used as base of this service pool" msgstr "OS Manager utilizado como base de este pool de servicios" -#: REST/methods/services_pools.py:229 +#: REST/methods/services_pools.py:253 msgid "Allow removal by users" msgstr "Permitir a los usuarios eliminar" -#: REST/methods/services_pools.py:230 +#: REST/methods/services_pools.py:254 msgid "" "If active, the user will be allowed to remove the service \"manually\". Be " "careful with this, because the user will have the \"power\" to delete it's " @@ -741,19 +742,19 @@ msgstr "" "cuidado con esto, ya que el usuario tendrá el \"poder\" para borrar el " "servicio propio." -#: REST/methods/services_pools.py:237 +#: REST/methods/services_pools.py:261 msgid "Allow reset by users" msgstr "Permitir resetear a los usuarios" -#: REST/methods/services_pools.py:238 +#: REST/methods/services_pools.py:262 msgid "If active, the user will be allowed to reset the service" msgstr "Si está activo, el usuario podrá resetear el servicio" -#: REST/methods/services_pools.py:245 +#: REST/methods/services_pools.py:269 msgid "Ignores unused" msgstr "Ignora no usadas" -#: REST/methods/services_pools.py:246 +#: REST/methods/services_pools.py:270 msgid "" "If the option is enabled, UDS will not attempt to detect and remove the user " "services assigned but not in use." @@ -761,44 +762,44 @@ msgstr "" "Si la opción está activada, UDS no intentará detectar y eliminar el servicio " "de usuario asignado pero no en uso." -#: REST/methods/services_pools.py:286 +#: REST/methods/services_pools.py:310 msgid "Initial available services" msgstr "Servicios disponibles inicialmente" -#: REST/methods/services_pools.py:287 +#: REST/methods/services_pools.py:311 msgid "Services created initially for this service pool" msgstr "Servicios creados inicialmente para este pool de servicios" -#: REST/methods/services_pools.py:290 REST/methods/services_pools.py:299 -#: REST/methods/services_pools.py:308 REST/methods/services_pools.py:317 +#: REST/methods/services_pools.py:314 REST/methods/services_pools.py:323 +#: REST/methods/services_pools.py:332 REST/methods/services_pools.py:341 msgid "Availability" msgstr "Disponibilidad " -#: REST/methods/services_pools.py:295 +#: REST/methods/services_pools.py:319 msgid "Services to keep in cache" msgstr "Servicios para mantener en la caché" -#: REST/methods/services_pools.py:296 +#: REST/methods/services_pools.py:320 msgid "Services kept in cache for improved user service assignation" msgstr "" "Servicios guardado en caché para mejorar la asignación de servicio de " "usuario " -#: REST/methods/services_pools.py:304 +#: REST/methods/services_pools.py:328 msgid "Services to keep in L2 cache" msgstr "Servicios para mantener en la caché L2" -#: REST/methods/services_pools.py:305 +#: REST/methods/services_pools.py:329 msgid "Services kept in cache of level2 for improved service generation" msgstr "" "Servicios guardados en la caché de nivel 2 para mejorar la generación de " "servicios " -#: REST/methods/services_pools.py:313 +#: REST/methods/services_pools.py:337 msgid "Maximum number of services to provide" msgstr "Número máximo de servicios a proveer" -#: REST/methods/services_pools.py:314 +#: REST/methods/services_pools.py:338 msgid "" "Maximum number of service (assigned and L1 cache) that can be created for " "this service" @@ -806,27 +807,27 @@ msgstr "" "Número máximo de servicios (asignados y caché L1) que pueden crearse para " "este servicio" -#: REST/methods/services_pools.py:321 +#: REST/methods/services_pools.py:345 msgid "Show transports" msgstr "Mostrar transportes" -#: REST/methods/services_pools.py:322 +#: REST/methods/services_pools.py:346 msgid "If active, alternative transports for user will be shown" msgstr "Si está activo, se mostrarán transportes alternativos para el usuario " -#: REST/methods/services_pools.py:329 +#: REST/methods/services_pools.py:353 msgid "Accounting" msgstr "Contabilidad" -#: REST/methods/services_pools.py:330 +#: REST/methods/services_pools.py:354 msgid "Account associated to this service pool" msgstr "Cuenta asociada a este grupo de servicios" -#: REST/methods/services_pools.py:346 +#: REST/methods/services_pools.py:370 msgid "Base service does not exist anymore" msgstr "Ya no existe servicio base" -#: REST/methods/services_pools.py:380 +#: REST/methods/services_pools.py:404 msgid "This service requires an OS Manager" msgstr "Este servicio requiere un OS Manager" @@ -955,8 +956,8 @@ msgstr "Miembro del personal" #: auths/AzureAD_enterprise/azure_ad.py:92 #: auths/EDirectory_enterprise/authenticator.py:47 #: auths/RegexLdap/authenticator.py:67 auths/SAML_enterprise/saml.py:117 -#: reports/stats/pool_usage_summary.py:166 reports/stats/usage_by_pool.py:160 -#: templates/uds/reports/stats/pool-usage-summary.html:14 +#: reports/stats/pool_users_summary.py:166 reports/stats/usage_by_pool.py:158 +#: templates/uds/reports/stats/pool-users-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:15 msgid "User" msgstr "Usuario" @@ -1800,27 +1801,27 @@ msgstr "No se puede eliminar un elemento que no está activo" msgid "Can't remove nor cancel {} cause its state don't allow it" msgstr "No se puede eliminar ni cancelar {} porque su estado no lo permite" -#: core/managers/user_service.py:318 +#: core/managers/user_service.py:317 msgid "The requested service is restrained" msgstr "El servicio solicitado está restringido." -#: core/managers/user_service.py:556 +#: core/managers/user_service.py:555 msgid "The requested service is not available" msgstr "El servicio solicitado no está disponible." -#: core/managers/user_service.py:586 +#: core/managers/user_service.py:585 msgid "The requested transport {} is not valid for {}" msgstr "El transporte solicitado {} no es válido para {}" -#: core/managers/user_service.py:710 +#: core/managers/user_service.py:709 msgid "The service is not accessible from this device" msgstr "El servicio no es accesible desde este dispositivo." -#: core/module.py:208 +#: core/module.py:207 msgid "No connection checking method is implemented." msgstr "No se ha implementado ningún metodo de verificación de conexión" -#: core/module.py:277 +#: core/module.py:276 msgid "No check method provided." msgstr "No se ha proporcionado ningún método de verificación." @@ -2198,8 +2199,8 @@ msgstr "Días de la semana" msgid "Minutes" msgstr "Minutos" -#: models/calendar_rule.py:76 reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:16 +#: models/calendar_rule.py:76 reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:16 msgid "Hours" msgstr "Horas" @@ -2211,11 +2212,11 @@ msgstr "Días" msgid "Weeks" msgstr "Semanas" -#: models/meta_pool.py:71 +#: models/meta_pool.py:72 msgid "Evenly distributed" msgstr "Distribuidos equitativamente" -#: models/meta_pool.py:73 +#: models/meta_pool.py:74 msgid "Greater % available" msgstr "Mayor% disponible" @@ -2592,7 +2593,7 @@ msgstr "Lista de usuarios de la plataforma" msgid "Users List for {}" msgstr "Lista de usuarios para {}" -#: reports/lists/users.py:86 reports/stats/pool_usage_summary.py:145 +#: reports/lists/users.py:86 reports/stats/pool_users_summary.py:145 msgid "UDS Report of users in {}" msgstr "Informe UDS de usuarios en {}" @@ -2608,49 +2609,51 @@ msgstr "Nombre real" msgid "Statistics" msgstr "Estadísticas" -#: reports/stats/pool_usage_summary.py:52 -msgid "Summary of pools usage" -msgstr "Resumen de uso de pools" +#: reports/stats/pool_users_summary.py:52 +#| msgid "Pools usage by users" +msgid "Pool Usage by users" +msgstr "Uso de la agrupación por parte de los usuarios" -#: reports/stats/pool_usage_summary.py:53 -msgid "Generates a report with the summary of a pool usage" -msgstr "Genera un informe con el Resumen de un uso de un pool" +#: reports/stats/pool_users_summary.py:53 +#| msgid "Generates a report with the summary of a pool usage" +msgid "Generates a report with the summary of users usage for a pool" +msgstr "Genera un informe con el resumen del uso de los usuarios para un grupo" -#: reports/stats/pool_usage_summary.py:60 reports/stats/usage_by_pool.py:61 +#: reports/stats/pool_users_summary.py:60 reports/stats/usage_by_pool.py:61 msgid "Pool for report" msgstr "Pool para informe" -#: reports/stats/pool_usage_summary.py:66 reports/stats/pools_performance.py:74 +#: reports/stats/pool_users_summary.py:66 reports/stats/pools_performance.py:74 #: reports/stats/usage_by_pool.py:67 reports/stats/user_access.py:66 msgid "Starting date" msgstr "Fecha de inicio" -#: reports/stats/pool_usage_summary.py:67 reports/stats/pools_performance.py:75 +#: reports/stats/pool_users_summary.py:67 reports/stats/pools_performance.py:75 #: reports/stats/usage_by_pool.py:68 reports/stats/user_access.py:67 msgid "starting date for report" msgstr "fecha de inicio para informe" -#: reports/stats/pool_usage_summary.py:74 reports/stats/pools_performance.py:82 +#: reports/stats/pool_users_summary.py:74 reports/stats/pools_performance.py:82 #: reports/stats/usage_by_pool.py:75 reports/stats/user_access.py:74 msgid "Finish date" msgstr "Fecha de finalización" -#: reports/stats/pool_usage_summary.py:75 reports/stats/pools_performance.py:83 +#: reports/stats/pool_users_summary.py:75 reports/stats/pools_performance.py:83 #: reports/stats/usage_by_pool.py:76 reports/stats/user_access.py:75 msgid "finish date for report" msgstr "fecha de finalización para informe" -#: reports/stats/pool_usage_summary.py:144 +#: reports/stats/pool_users_summary.py:144 msgid "Users usage list for {}" msgstr "Lista de usos de usuarios para {}" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:15 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:15 msgid "Sessions" msgstr "Sesiones" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:17 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:17 msgid "Average" msgstr "Promedio" @@ -2737,6 +2740,47 @@ msgstr "Informe de uso de servicios por un día." msgid "Service usage report" msgstr "Informe de uso del servicio" +#: reports/stats/pools_usage_summary.py:47 +msgid "Summary of pools usage" +msgstr "Resumen de uso de pools" + +#: reports/stats/pools_usage_summary.py:48 +msgid "" +"Summary of Pools usage with time totals, accesses totals, time total by pool" +msgstr "" +"Resumen del uso de agrupaciones con totales de tiempo, totales de accesos, " +"total de tiempo por agrupación" + +#: reports/stats/pools_usage_summary.py:116 +#| msgid "Summary of pools usage" +msgid "Summary of Pools usage" +msgstr "Resumen del uso de piscinas" + +#: reports/stats/pools_usage_summary.py:116 +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "to" +msgstr "a" + +#: reports/stats/pools_usage_summary.py:117 +#| msgid "Summary of pools usage" +msgid "UDS Report Summary of pools usage" +msgstr "Resumen del informe UDS del uso de grupos" + +#: reports/stats/pools_usage_summary.py:137 +msgid "Total Time (seconds)" +msgstr "Tiempo total (segundos)" + +#: reports/stats/pools_usage_summary.py:137 +#| msgid "Accesses" +msgid "Total Accesses" +msgstr "Accesos totales" + +#: reports/stats/pools_usage_summary.py:142 +#: templates/uds/reports/stats/pools-usage-summary.html:30 +msgid "Total" +msgstr "Total" + #: reports/stats/usage_by_pool.py:53 msgid "Pools usage by users" msgstr "Uso de Pools por usuarios" @@ -2749,16 +2793,17 @@ msgstr "Uso de Pools por informe de usuario" msgid "ALL POOLS" msgstr "TODAS LAS PISCINAS" -#: reports/stats/usage_by_pool.py:138 +#: reports/stats/usage_by_pool.py:136 #: templates/uds/reports/stats/usage-by-pool.html:4 +#: templates/uds/reports/stats/usage-by-pool.html:6 msgid "Users usage list" msgstr "Lista de uso de usuarios" -#: reports/stats/usage_by_pool.py:139 +#: reports/stats/usage_by_pool.py:137 msgid "UDS Report of users usage" msgstr "Informe UDS del uso de los usuarios" -#: reports/stats/usage_by_pool.py:160 +#: reports/stats/usage_by_pool.py:158 #: templates/uds/reports/stats/usage-by-pool.html:16 msgid "Seconds" msgstr "Segundos" @@ -3095,7 +3140,7 @@ msgstr "Test de conexión realizado con éxito" #: services/HyperV_enterprise/legacy/provider.py:268 #: services/Nutanix_enterprise/provider.py:214 services/OVirt/provider.py:457 -#: services/Proxmox/provider.py:202 services/Vmware_enterprise/provider.py:178 +#: services/Proxmox/provider.py:205 services/Vmware_enterprise/provider.py:178 msgid "Connection failed. Check connection params" msgstr "La conexión ha fallado. Compruebe los parámetros de conexión" @@ -3107,12 +3152,10 @@ msgid "UDS pub for {0} at {1}" msgstr "Publicación de UDS para {0} en {1}" #: services/HyperV_enterprise/legacy/service.py:57 -#: services/HyperV_enterprise/service.py:57 msgid "HyperV Linked Clone (Experimental)" msgstr "HyperV Linked Clone (Experimental)" #: services/HyperV_enterprise/legacy/service.py:59 -#: services/HyperV_enterprise/service.py:59 msgid "Hyper Services based on templates and differential disks (experimental)" msgstr "" "Servicios HyperV basados en plantillas y discos diferenciales (experimental)" @@ -3296,6 +3339,17 @@ msgstr "" "Para los clusters, el usuario debe ser un nombre de usuario de dominio " "(usuario @ dominio o DOMINIO\\usuario)" +#: services/HyperV_enterprise/service.py:57 +#| msgid "Xen Linked Clone" +msgid "HyperV Linked Clone" +msgstr "HyperV Linked Clone" + +#: services/HyperV_enterprise/service.py:59 +#| msgid "" +#| "Hyper Services based on templates and differential disks (experimental)" +msgid "Hyper Services based on templates and differential disks" +msgstr "Hyper Services basado en plantillas y discos diferenciales" + #: services/Nutanix_enterprise/provider.py:30 msgid "Nutanix Acropolis Platform Provider" msgstr "Proveedor de Plataforma Nutanix Acrópolis" @@ -3791,12 +3845,12 @@ msgstr "Proveedor de máquinas de IP estática" msgid "Provides connection to machines by IP" msgstr "Proporciona conexión a máquinas por IP" -#: services/PhysicalMachines/service_multi.py:59 +#: services/PhysicalMachines/service_multi.py:60 #: services/Vmware_enterprise/service_fixed.py:54 msgid "Service Token" msgstr "Token de servicio" -#: services/PhysicalMachines/service_multi.py:61 +#: services/PhysicalMachines/service_multi.py:62 #: services/Vmware_enterprise/service_fixed.py:56 msgid "" "Service token that will be used by actors to communicate with service. Leave " @@ -3805,20 +3859,32 @@ msgstr "" "Token de servicio que serán utilizados por los actores para comunicarse con " "el servicio. Deje en blanco para la asignación persistente." -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 #: services/RDS_enterprise/provider.py:47 msgid "List of servers" msgstr "Lista de servidores" -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 msgid "List of servers available for this service" msgstr "Lista de servidores disponibles para este servicio." -#: services/PhysicalMachines/service_multi.py:71 +#: services/PhysicalMachines/service_multi.py:70 +#| msgid "Check Cert." +msgid "Check Port" +msgstr "Comprobar puerto" + +#: services/PhysicalMachines/service_multi.py:70 +msgid "" +"If non zero, only Machines responding to connection on that port will be used" +msgstr "" +"Si no es cero, solo se utilizarán máquinas que respondan a la conexión en " +"ese puerto" + +#: services/PhysicalMachines/service_multi.py:73 msgid "Static Multiple IP" msgstr "Estatica, Multiples IPs" -#: services/PhysicalMachines/service_multi.py:73 +#: services/PhysicalMachines/service_multi.py:75 msgid "This service provides access to POWERED-ON Machines by IP" msgstr "Este servicio proporciona acceso a las máquinas POWERED-ON por IP" @@ -4773,9 +4839,31 @@ msgstr "Fecha:" msgid "Services assignation" msgstr "Servicios asignados" -#: templates/uds/reports/stats/usage-by-pool.html:6 -msgid "Users usage list for" -msgstr "Lista de uso de usuarios para" +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +#| msgid "Pools usage on a day" +msgid "Pools usage summary" +msgstr "Resumen de uso de piscinas" + +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "from" +msgstr "desde" + +#: templates/uds/reports/stats/pools-usage-summary.html:15 +#| msgid "Max.Idle time" +msgid "Total time" +msgstr "Tiempo Total" + +#: templates/uds/reports/stats/pools-usage-summary.html:16 +#| msgid "Last access" +msgid "Total accesses" +msgstr "Accesos totales" + +#: templates/uds/reports/stats/pools-usage-summary.html:17 +#| msgid "Current users" +msgid "Unique users" +msgstr "Usuarios únicos" #: templates/uds/reports/stats/usage-by-pool.html:14 msgid "Access date/time" @@ -5835,7 +5923,7 @@ msgstr "" "No se admite la recarga de esta página. Por favor, vuelva a abrir el " "servicio desde el origen." -#: web/util/services.py:190 +#: web/util/services.py:196 msgid "" "This service is about to be replaced by a new version. Please, close the " "session before {} and save all your work to avoid loosing it." diff --git a/server/src/uds/locale/es/LC_MESSAGES/djangojs.po b/server/src/uds/locale/es/LC_MESSAGES/djangojs.po index 787aab241..8d5b8dd66 100644 --- a/server/src/uds/locale/es/LC_MESSAGES/djangojs.po +++ b/server/src/uds/locale/es/LC_MESSAGES/djangojs.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:02+0200\n" -"PO-Revision-Date: 2020-05-11 11:58+0000\n" -"Last-Translator: Javier \n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" +"PO-Revision-Date: 2020-05-11 12:06+0000\n" +"Last-Translator: Adolfo Gómez \n" "Language-Team: Spanish (http://www.transifex.com/openuds/openuds/language/" "es/)\n" "Language: es\n" @@ -1582,12 +1582,10 @@ msgstr "Acerca de" #: static/modern/translations-fakejs.js:35 #: static/modern/translations-fakejs.js:36 -#| msgid "UDS Client" msgid "Client IP" msgstr "IP del cliente" #: static/modern/translations-fakejs.js:37 -#| msgid "Delete Proxy" msgid "Detected proxy ip" msgstr "IP proxy detectada" diff --git a/server/src/uds/locale/eu/LC_MESSAGES/django.po b/server/src/uds/locale/eu/LC_MESSAGES/django.po index 2683c9ac0..f4c0cb37e 100644 --- a/server/src/uds/locale/eu/LC_MESSAGES/django.po +++ b/server/src/uds/locale/eu/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:01+0200\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" "PO-Revision-Date: 2020-05-07 09:52+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: Basque (http://www.transifex.com/openuds/openuds/language/" @@ -29,7 +29,7 @@ msgstr "kontuak" #: REST/methods/meta_pools.py:70 REST/methods/networks.py:60 #: REST/methods/osmanagers.py:55 REST/methods/providers.py:70 #: REST/methods/proxies.py:59 REST/methods/reports.py:57 -#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:96 +#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:99 #: REST/methods/transports.py:57 REST/methods/user_services.py:255 #: REST/methods/user_services.py:295 REST/methods/users_groups.py:117 #: REST/model.py:139 @@ -55,7 +55,7 @@ msgstr "Denbora-marka" #: REST/methods/calendars.py:63 REST/methods/meta_pools.py:77 #: REST/methods/networks.py:63 REST/methods/osmanagers.py:59 #: REST/methods/providers.py:76 REST/methods/proxies.py:63 -#: REST/methods/services.py:226 REST/methods/services_pools.py:105 +#: REST/methods/services.py:226 REST/methods/services_pools.py:108 #: REST/methods/transports.py:61 msgid "tags" msgstr "Etiketak" @@ -121,7 +121,7 @@ msgstr "Aktoreen tokenak" #: REST/methods/actor_token.py:54 reports/stats/pools_performance.py:198 #: reports/stats/pools_performance.py:213 reports/stats/pools_usage_day.py:65 -#: reports/stats/usage_by_pool.py:160 reports/stats/user_access.py:174 +#: reports/stats/usage_by_pool.py:158 reports/stats/user_access.py:174 msgid "Date" msgstr "Data" @@ -175,13 +175,13 @@ msgstr "Mota" #: REST/methods/authenticators.py:68 REST/methods/meta_service_pools.py:85 #: REST/methods/op_calendars.py:80 REST/methods/services_pool_groups.py:61 #: REST/methods/transports.py:56 REST/methods/user_services.py:294 -#: REST/model.py:166 models/meta_pool.py:72 +#: REST/model.py:166 models/meta_pool.py:73 msgid "Priority" msgstr "Lehentasuna" #: REST/methods/authenticators.py:69 REST/methods/authenticators.py:101 #: REST/methods/meta_pools.py:75 REST/methods/meta_pools.py:150 -#: REST/methods/services_pools.py:101 REST/methods/services_pools.py:253 +#: REST/methods/services_pools.py:104 REST/methods/services_pools.py:277 msgid "Visible" msgstr "Ikusgai" @@ -197,15 +197,15 @@ msgstr "Etiketa" msgid "Users" msgstr "Erabiltzaileak" -#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:254 +#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:278 msgid "If active, transport will be visible for users" msgstr "Aktibatuta badago, garraioa ikusgai egongo da erabiltzaileentzat" #: REST/methods/authenticators.py:105 REST/methods/meta_pools.py:138 #: REST/methods/meta_pools.py:146 REST/methods/meta_pools.py:154 -#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:257 -#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 -#: REST/methods/services_pools.py:281 core/ui/user_interface.py:99 +#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:281 +#: REST/methods/services_pools.py:289 REST/methods/services_pools.py:297 +#: REST/methods/services_pools.py:305 core/ui/user_interface.py:99 #: services/OVirt/service.py:186 msgid "Display" msgstr "Pantaila" @@ -230,7 +230,7 @@ msgstr "Errepikapenak" msgid "Every" msgstr "Bakoitza" -#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:160 +#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:158 msgid "Duration" msgstr "Iraupena" @@ -286,11 +286,11 @@ msgid "Policy" msgstr "politika" #: REST/methods/meta_pools.py:73 REST/methods/services.py:225 -#: REST/methods/services_pools.py:98 +#: REST/methods/services_pools.py:101 msgid "User services" msgstr "Erabiltzaile Zerbitzuak" -#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:99 +#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:102 msgid "In Preparation" msgstr "Prestatzen" @@ -299,8 +299,8 @@ msgid "Pool Group" msgstr "Pool taldea" #: REST/methods/meta_pools.py:86 REST/methods/meta_pools.py:141 -#: REST/methods/services_pools.py:123 REST/methods/services_pools.py:175 -#: REST/methods/services_pools.py:268 +#: REST/methods/services_pools.py:141 REST/methods/services_pools.py:198 +#: REST/methods/services_pools.py:292 msgid "Default" msgstr "Lehenetsia" @@ -309,21 +309,21 @@ msgid "Service pool policy" msgstr "Zerbitzu publikoko gidalerroa" #: REST/methods/meta_pools.py:134 REST/methods/services_pool_groups.py:85 -#: REST/methods/services_pools.py:261 +#: REST/methods/services_pools.py:285 msgid "Associated Image" msgstr "Erlazionaturiko irudia" #: REST/methods/meta_pools.py:135 REST/methods/services_pool_groups.py:86 -#: REST/methods/services_pools.py:262 +#: REST/methods/services_pools.py:286 msgid "Image assocciated with this service" msgstr "Zerbitzu honekin erlazionatutako irudia" -#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:103 -#: REST/methods/services_pools.py:269 +#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:106 +#: REST/methods/services_pools.py:293 msgid "Pool group" msgstr "Pool Taldea" -#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:270 +#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:294 msgid "Pool group for this pool (for pool classify on display)" msgstr "" "Igerileku honetarako igerileku taldea (igerilekuan sailkatzeko aukera dago)" @@ -332,11 +332,11 @@ msgstr "" msgid "If active, metapool will be visible for users" msgstr "Aktibatuta badago, metapak erabiltzaileentzat ikusgai egongo da" -#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:277 +#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:301 msgid "Calendar access denied text" msgstr "Egutegiaren sarbidea ukatu gabeko testua da" -#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:278 +#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:302 msgid "" "Custom message to be shown to users if access is limited by calendar rules." msgstr "" @@ -365,12 +365,13 @@ msgid "Creation date" msgstr "Sortze data" #: REST/methods/meta_service_pools.py:172 REST/methods/services_usage.py:119 -#: reports/stats/pool_usage_summary.py:59 +#: reports/stats/pool_users_summary.py:59 #: reports/stats/pools_performance.py:258 reports/stats/pools_usage_day.py:166 -#: reports/stats/usage_by_pool.py:60 reports/stats/usage_by_pool.py:160 -#: services/Proxmox/service.py:110 +#: reports/stats/pools_usage_summary.py:137 reports/stats/usage_by_pool.py:60 +#: reports/stats/usage_by_pool.py:158 services/Proxmox/service.py:110 #: templates/uds/reports/stats/pools-performance.html:33 #: templates/uds/reports/stats/pools-usage-day.html:27 +#: templates/uds/reports/stats/pools-usage-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:17 msgid "Pool" msgstr "Pool" @@ -510,7 +511,7 @@ msgstr "" msgid "Service providers" msgstr "Zerbitzu Hornitzaileak" -#: REST/methods/providers.py:73 REST/methods/services_pools.py:97 +#: REST/methods/providers.py:73 REST/methods/services_pools.py:100 msgid "Status" msgstr "Egoera" @@ -657,9 +658,9 @@ msgstr "Proxy" msgid "Proxy for services behind a firewall" msgstr "Suebaki baten atzean zerbitzuen proxya" -#: REST/methods/services.py:270 REST/methods/services_pools.py:233 -#: REST/methods/services_pools.py:241 REST/methods/services_pools.py:249 -#: REST/methods/services_pools.py:324 REST/methods/services_pools.py:332 +#: REST/methods/services.py:270 REST/methods/services_pools.py:257 +#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 +#: REST/methods/services_pools.py:348 REST/methods/services_pools.py:356 #: auths/RegexLdap/authenticator.py:78 core/ui/user_interface.py:95 #: osmanagers/WindowsOsManager/windows_domain.py:71 #: osmanagers/WindowsOsManager/windows_domain.py:72 @@ -683,47 +684,47 @@ msgstr "Ondo" msgid "Services Pool Groups" msgstr "Pool-zerbitzu taldeak" -#: REST/methods/services_pools.py:94 REST/methods/transports.py:104 +#: REST/methods/services_pools.py:97 REST/methods/transports.py:104 msgid "Service Pools" msgstr "Pool-Zerbitzua" -#: REST/methods/services_pools.py:100 +#: REST/methods/services_pools.py:103 msgid "Usage" msgstr "Usage" -#: REST/methods/services_pools.py:102 +#: REST/methods/services_pools.py:105 msgid "Shows transports" msgstr "Garraioak erakutsi" -#: REST/methods/services_pools.py:104 +#: REST/methods/services_pools.py:107 msgid "Parent service" msgstr "Guraso zerbitzua" -#: REST/methods/services_pools.py:206 +#: REST/methods/services_pools.py:230 msgid "Create at least a service before creating a new service pool" msgstr "Zerbitzu bat behar da gutxienez zerbitzu-pool berri bat egiteko" -#: REST/methods/services_pools.py:213 +#: REST/methods/services_pools.py:237 msgid "Base service" msgstr "Oinarrizko Zerbitzua" -#: REST/methods/services_pools.py:214 +#: REST/methods/services_pools.py:238 msgid "Service used as base of this service pool" msgstr "Zerbitzu-pool honen oinarritzat erabilitako zerbitzua" -#: REST/methods/services_pools.py:221 +#: REST/methods/services_pools.py:245 msgid "OS Manager" msgstr "SE kudeatzailea" -#: REST/methods/services_pools.py:222 +#: REST/methods/services_pools.py:246 msgid "OS Manager used as base of this service pool" msgstr "Zerbitzu-pool honen oinarritzat erabilitako SE kudeatzailea" -#: REST/methods/services_pools.py:229 +#: REST/methods/services_pools.py:253 msgid "Allow removal by users" msgstr "Baimendu erabiltzaileak kentzea" -#: REST/methods/services_pools.py:230 +#: REST/methods/services_pools.py:254 msgid "" "If active, the user will be allowed to remove the service \"manually\". Be " "careful with this, because the user will have the \"power\" to delete it's " @@ -733,19 +734,19 @@ msgstr "" "Kontuz ibili, erabiltzaileak \"boterea\" izango duelako bere zerbitzua " "ezabatzeko" -#: REST/methods/services_pools.py:237 +#: REST/methods/services_pools.py:261 msgid "Allow reset by users" msgstr "Baimendu berrezarri erabiltzaileek" -#: REST/methods/services_pools.py:238 +#: REST/methods/services_pools.py:262 msgid "If active, the user will be allowed to reset the service" msgstr "Aktibatuta badago, erabiltzaileak zerbitzua berrezarriko du" -#: REST/methods/services_pools.py:245 +#: REST/methods/services_pools.py:269 msgid "Ignores unused" msgstr "Ez erabiltzen" -#: REST/methods/services_pools.py:246 +#: REST/methods/services_pools.py:270 msgid "" "If the option is enabled, UDS will not attempt to detect and remove the user " "services assigned but not in use." @@ -753,41 +754,41 @@ msgstr "" "Aukera hori gaituta badago, UDS-k ez du erabiltzaileari esleitutako " "zerbitzuen detekzioa eta kentzea saiatuko." -#: REST/methods/services_pools.py:286 +#: REST/methods/services_pools.py:310 msgid "Initial available services" msgstr "Azierako zerbitzu erabilgarriak" -#: REST/methods/services_pools.py:287 +#: REST/methods/services_pools.py:311 msgid "Services created initially for this service pool" msgstr "Hasiera baten zerbitzu-pool honentzat sortutako zerbitzuak" -#: REST/methods/services_pools.py:290 REST/methods/services_pools.py:299 -#: REST/methods/services_pools.py:308 REST/methods/services_pools.py:317 +#: REST/methods/services_pools.py:314 REST/methods/services_pools.py:323 +#: REST/methods/services_pools.py:332 REST/methods/services_pools.py:341 msgid "Availability" msgstr "Erabilgarritasuna" -#: REST/methods/services_pools.py:295 +#: REST/methods/services_pools.py:319 msgid "Services to keep in cache" msgstr "Cache-an edukitzeko zerbitzuak" -#: REST/methods/services_pools.py:296 +#: REST/methods/services_pools.py:320 msgid "Services kept in cache for improved user service assignation" msgstr "" "Cachean gordetako zerbitzuak erabiltzaileen zerbitzuen esleipen hobetzeko" -#: REST/methods/services_pools.py:304 +#: REST/methods/services_pools.py:328 msgid "Services to keep in L2 cache" msgstr "L2 cache-an edukitzeko zerbitzuak" -#: REST/methods/services_pools.py:305 +#: REST/methods/services_pools.py:329 msgid "Services kept in cache of level2 for improved service generation" msgstr "Zerbitzuen maila2 cachean gordetako zerbitzuen zerbitzua hobetzeko" -#: REST/methods/services_pools.py:313 +#: REST/methods/services_pools.py:337 msgid "Maximum number of services to provide" msgstr "Gehienezko zerbitzu kopurua" -#: REST/methods/services_pools.py:314 +#: REST/methods/services_pools.py:338 msgid "" "Maximum number of service (assigned and L1 cache) that can be created for " "this service" @@ -795,27 +796,27 @@ msgstr "" "Zerbitzu honetarako sor daitekeen zerbitzu kopurua (esleitutakoa eta L1 " "cachea)" -#: REST/methods/services_pools.py:321 +#: REST/methods/services_pools.py:345 msgid "Show transports" msgstr "Garraioak erakutsi" -#: REST/methods/services_pools.py:322 +#: REST/methods/services_pools.py:346 msgid "If active, alternative transports for user will be shown" msgstr "Aktibo izan ezkero, erabiltzaileari garraio aukerak erakutsi" -#: REST/methods/services_pools.py:329 +#: REST/methods/services_pools.py:353 msgid "Accounting" msgstr "Kontabilitatea" -#: REST/methods/services_pools.py:330 +#: REST/methods/services_pools.py:354 msgid "Account associated to this service pool" msgstr "Kontu honi lotutako zerbitzuari lotutako kontua" -#: REST/methods/services_pools.py:346 +#: REST/methods/services_pools.py:370 msgid "Base service does not exist anymore" msgstr "Zerbitzu-oinarria ez dago" -#: REST/methods/services_pools.py:380 +#: REST/methods/services_pools.py:404 msgid "This service requires an OS Manager" msgstr "Zerbitzu honek SE kudeatzailea behar du" @@ -944,8 +945,8 @@ msgstr "Langile Kidea" #: auths/AzureAD_enterprise/azure_ad.py:92 #: auths/EDirectory_enterprise/authenticator.py:47 #: auths/RegexLdap/authenticator.py:67 auths/SAML_enterprise/saml.py:117 -#: reports/stats/pool_usage_summary.py:166 reports/stats/usage_by_pool.py:160 -#: templates/uds/reports/stats/pool-usage-summary.html:14 +#: reports/stats/pool_users_summary.py:166 reports/stats/usage_by_pool.py:158 +#: templates/uds/reports/stats/pool-users-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:15 msgid "User" msgstr "Erabiltzailea" @@ -1780,27 +1781,27 @@ msgstr "Ezin da elementu ez aktiboa ezabatu" msgid "Can't remove nor cancel {} cause its state don't allow it" msgstr "Ezin da {} kendu edo ezeztatu {} egoera ez baimendu horrek" -#: core/managers/user_service.py:318 +#: core/managers/user_service.py:317 msgid "The requested service is restrained" msgstr "Eskatutako zerbitzua geldiarazi egiten da" -#: core/managers/user_service.py:556 +#: core/managers/user_service.py:555 msgid "The requested service is not available" msgstr "Eskatutako zerbitzua ez dago erabilgarri" -#: core/managers/user_service.py:586 +#: core/managers/user_service.py:585 msgid "The requested transport {} is not valid for {}" msgstr "Eskatutako garraioa {} ez da {} baliozkoa" -#: core/managers/user_service.py:710 +#: core/managers/user_service.py:709 msgid "The service is not accessible from this device" msgstr "Zerbitzua ez dago gailutik eskura" -#: core/module.py:208 +#: core/module.py:207 msgid "No connection checking method is implemented." msgstr "Ez da konexio-egiaztapen metodo bat inplementatu." -#: core/module.py:277 +#: core/module.py:276 msgid "No check method provided." msgstr "Ez da emandako egiaztapen metodorik." @@ -2175,8 +2176,8 @@ msgstr "Astegunak" msgid "Minutes" msgstr "Minutu" -#: models/calendar_rule.py:76 reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:16 +#: models/calendar_rule.py:76 reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:16 msgid "Hours" msgstr "Ordu" @@ -2188,11 +2189,11 @@ msgstr "Egun" msgid "Weeks" msgstr "Aste" -#: models/meta_pool.py:71 +#: models/meta_pool.py:72 msgid "Evenly distributed" msgstr "Nahiz banatutako" -#: models/meta_pool.py:73 +#: models/meta_pool.py:74 msgid "Greater % available" msgstr "Handiagorik eskuragarri" @@ -2564,7 +2565,7 @@ msgstr "List plataforma erabiltzaileak" msgid "Users List for {}" msgstr "Erabiltzaileen zerrenda {}" -#: reports/lists/users.py:86 reports/stats/pool_usage_summary.py:145 +#: reports/lists/users.py:86 reports/stats/pool_users_summary.py:145 msgid "UDS Report of users in {}" msgstr "UDS Erabiltzaileen txostena {}" @@ -2580,49 +2581,53 @@ msgstr "Benetazko Izena" msgid "Statistics" msgstr "Estadistikak" -#: reports/stats/pool_usage_summary.py:52 -msgid "Summary of pools usage" -msgstr "Igerilekuen erabilera laburpena" +#: reports/stats/pool_users_summary.py:52 +#| msgid "Pools usage by users" +msgid "Pool Usage by users" +msgstr "Igerilekuen erabilera erabiltzaileek" -#: reports/stats/pool_usage_summary.py:53 -msgid "Generates a report with the summary of a pool usage" -msgstr "Errenta-erabilera baten laburpena duen txostena sortzen du" +#: reports/stats/pool_users_summary.py:53 +#| msgid "Generates a report with the summary of a pool usage" +msgid "Generates a report with the summary of users usage for a pool" +msgstr "" +"Txosten bat sortzen du igerileku bateko erabiltzaileen erabileraren " +"laburpenarekin" -#: reports/stats/pool_usage_summary.py:60 reports/stats/usage_by_pool.py:61 +#: reports/stats/pool_users_summary.py:60 reports/stats/usage_by_pool.py:61 msgid "Pool for report" msgstr "Txostena egiteko igerilekua" -#: reports/stats/pool_usage_summary.py:66 reports/stats/pools_performance.py:74 +#: reports/stats/pool_users_summary.py:66 reports/stats/pools_performance.py:74 #: reports/stats/usage_by_pool.py:67 reports/stats/user_access.py:66 msgid "Starting date" msgstr "Hasiera data" -#: reports/stats/pool_usage_summary.py:67 reports/stats/pools_performance.py:75 +#: reports/stats/pool_users_summary.py:67 reports/stats/pools_performance.py:75 #: reports/stats/usage_by_pool.py:68 reports/stats/user_access.py:67 msgid "starting date for report" msgstr "txostenaren hasierako data" -#: reports/stats/pool_usage_summary.py:74 reports/stats/pools_performance.py:82 +#: reports/stats/pool_users_summary.py:74 reports/stats/pools_performance.py:82 #: reports/stats/usage_by_pool.py:75 reports/stats/user_access.py:74 msgid "Finish date" msgstr "Amaiera data" -#: reports/stats/pool_usage_summary.py:75 reports/stats/pools_performance.py:83 +#: reports/stats/pool_users_summary.py:75 reports/stats/pools_performance.py:83 #: reports/stats/usage_by_pool.py:76 reports/stats/user_access.py:75 msgid "finish date for report" msgstr "txostena amaitzeko data" -#: reports/stats/pool_usage_summary.py:144 +#: reports/stats/pool_users_summary.py:144 msgid "Users usage list for {}" msgstr "Erabiltzaileen erabilera zerrenda {}" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:15 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:15 msgid "Sessions" msgstr "Sesioak" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:17 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:17 msgid "Average" msgstr "Batazbeztekoa" @@ -2709,6 +2714,47 @@ msgstr "Zerbitzuen erabilera txostena egun baterako" msgid "Service usage report" msgstr "Zerbitzuaren erabilera txostena" +#: reports/stats/pools_usage_summary.py:47 +msgid "Summary of pools usage" +msgstr "Igerilekuen erabilera laburpena" + +#: reports/stats/pools_usage_summary.py:48 +msgid "" +"Summary of Pools usage with time totals, accesses totals, time total by pool" +msgstr "" +"Igerilekuen erabileraren laburpena denbora guztiekin, sarbideen " +"guztizkoarekin, denbora guztia igerilekuaren arabera" + +#: reports/stats/pools_usage_summary.py:116 +#| msgid "Summary of pools usage" +msgid "Summary of Pools usage" +msgstr "Igerilekuen erabileraren laburpena" + +#: reports/stats/pools_usage_summary.py:116 +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "to" +msgstr "to" + +#: reports/stats/pools_usage_summary.py:117 +#| msgid "Summary of pools usage" +msgid "UDS Report Summary of pools usage" +msgstr "UDS Txostena Igerilekuen erabileraren laburpena" + +#: reports/stats/pools_usage_summary.py:137 +msgid "Total Time (seconds)" +msgstr "Denbora osoa (segundotan)" + +#: reports/stats/pools_usage_summary.py:137 +#| msgid "Accesses" +msgid "Total Accesses" +msgstr "Sarbide osoak" + +#: reports/stats/pools_usage_summary.py:142 +#: templates/uds/reports/stats/pools-usage-summary.html:30 +msgid "Total" +msgstr "Guztira" + #: reports/stats/usage_by_pool.py:53 msgid "Pools usage by users" msgstr "Igerilekuen erabilera erabiltzaileek" @@ -2721,16 +2767,17 @@ msgstr "Igerilekuen erabilera erabiltzaileen txostenaren bidez" msgid "ALL POOLS" msgstr "PISTA GUZTIAK" -#: reports/stats/usage_by_pool.py:138 +#: reports/stats/usage_by_pool.py:136 #: templates/uds/reports/stats/usage-by-pool.html:4 +#: templates/uds/reports/stats/usage-by-pool.html:6 msgid "Users usage list" msgstr "Erabiltzaileen erabilera zerrenda" -#: reports/stats/usage_by_pool.py:139 +#: reports/stats/usage_by_pool.py:137 msgid "UDS Report of users usage" msgstr "Erabiltzaileen erabileraren txostena" -#: reports/stats/usage_by_pool.py:160 +#: reports/stats/usage_by_pool.py:158 #: templates/uds/reports/stats/usage-by-pool.html:16 msgid "Seconds" msgstr "Segunduak" @@ -3065,7 +3112,7 @@ msgstr "Konexioaren proba arrakastatsua" #: services/HyperV_enterprise/legacy/provider.py:268 #: services/Nutanix_enterprise/provider.py:214 services/OVirt/provider.py:457 -#: services/Proxmox/provider.py:202 services/Vmware_enterprise/provider.py:178 +#: services/Proxmox/provider.py:205 services/Vmware_enterprise/provider.py:178 msgid "Connection failed. Check connection params" msgstr "Konexioa huts egin du. Egiaztatu konexioaren parametak" @@ -3077,12 +3124,10 @@ msgid "UDS pub for {0} at {1}" msgstr "UDS pub {0} at {1}" #: services/HyperV_enterprise/legacy/service.py:57 -#: services/HyperV_enterprise/service.py:57 msgid "HyperV Linked Clone (Experimental)" msgstr "HyperV Linked Clone (esperimentala)" #: services/HyperV_enterprise/legacy/service.py:59 -#: services/HyperV_enterprise/service.py:59 msgid "Hyper Services based on templates and differential disks (experimental)" msgstr "" "Hyper Zerbitzuak txantiloietan eta disko diferentetan oinarrituta " @@ -3263,6 +3308,17 @@ msgstr "" "Klusterrentzako, erabiltzaile izena domeinuaren erabiltzaile izena izan " "behar da (user @ domain edo DOMAIN \\ user)" +#: services/HyperV_enterprise/service.py:57 +#| msgid "Xen Linked Clone" +msgid "HyperV Linked Clone" +msgstr "HyperV lotutako klonea" + +#: services/HyperV_enterprise/service.py:59 +#| msgid "" +#| "Hyper Services based on templates and differential disks (experimental)" +msgid "Hyper Services based on templates and differential disks" +msgstr "Hyper Zerbitzuak txantiloietan eta disko diferentzialetan oinarrituta" + #: services/Nutanix_enterprise/provider.py:30 msgid "Nutanix Acropolis Platform Provider" msgstr "Nutanix Acropolis plataformako hornitzailea" @@ -3754,12 +3810,12 @@ msgstr "IP Makinen hornitzaile estatikoa" msgid "Provides connection to machines by IP" msgstr "Makinen konexioa eskaintzen du IP bidez" -#: services/PhysicalMachines/service_multi.py:59 +#: services/PhysicalMachines/service_multi.py:60 #: services/Vmware_enterprise/service_fixed.py:54 msgid "Service Token" msgstr "Zerbitzuaren toka" -#: services/PhysicalMachines/service_multi.py:61 +#: services/PhysicalMachines/service_multi.py:62 #: services/Vmware_enterprise/service_fixed.py:56 msgid "" "Service token that will be used by actors to communicate with service. Leave " @@ -3768,20 +3824,32 @@ msgstr "" "Aktoreek zerbitzuarekin komunikatzeko erabiliko duten token zerbitzua. Utzi " "hutsik iraunkorra esleitzeko." -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 #: services/RDS_enterprise/provider.py:47 msgid "List of servers" msgstr "Zerbitzari zerrenda" -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 msgid "List of servers available for this service" msgstr "Zerbitzu honetarako erabilgarri dauden zerbitzuen zerrenda" -#: services/PhysicalMachines/service_multi.py:71 +#: services/PhysicalMachines/service_multi.py:70 +#| msgid "Check Cert." +msgid "Check Port" +msgstr "Begiratu Portua" + +#: services/PhysicalMachines/service_multi.py:70 +msgid "" +"If non zero, only Machines responding to connection on that port will be used" +msgstr "" +"Zero ez bada, portu horretako konexioei erantzuten dieten makinak soilik " +"erabiliko dira" + +#: services/PhysicalMachines/service_multi.py:73 msgid "Static Multiple IP" msgstr "IP estatiko anitz" -#: services/PhysicalMachines/service_multi.py:73 +#: services/PhysicalMachines/service_multi.py:75 msgid "This service provides access to POWERED-ON Machines by IP" msgstr "Zerbitzu honek POWERED-ON makinak IP bidez sarbidea eskaintzen du" @@ -4740,9 +4808,31 @@ msgstr "data:" msgid "Services assignation" msgstr "Zerbitzuen esleipena" -#: templates/uds/reports/stats/usage-by-pool.html:6 -msgid "Users usage list for" -msgstr "Erabiltzaileen erabilera zerrenda" +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +#| msgid "Pools usage on a day" +msgid "Pools usage summary" +msgstr "Igerilekuen erabileraren laburpena" + +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "from" +msgstr "batetik" + +#: templates/uds/reports/stats/pools-usage-summary.html:15 +#| msgid "Max.Idle time" +msgid "Total time" +msgstr "Denbora osoa" + +#: templates/uds/reports/stats/pools-usage-summary.html:16 +#| msgid "Last access" +msgid "Total accesses" +msgstr "Sarbide guztira" + +#: templates/uds/reports/stats/pools-usage-summary.html:17 +#| msgid "Current users" +msgid "Unique users" +msgstr "Erabiltzaile bakarrak" #: templates/uds/reports/stats/usage-by-pool.html:14 msgid "Access date/time" @@ -5791,7 +5881,7 @@ msgstr "" "Orrialde hau berriro kargatzen ez da onartzen. Mesedez, berriro ireki " "zerbitzua jatorrian." -#: web/util/services.py:190 +#: web/util/services.py:196 msgid "" "This service is about to be replaced by a new version. Please, close the " "session before {} and save all your work to avoid loosing it." diff --git a/server/src/uds/locale/eu/LC_MESSAGES/djangojs.po b/server/src/uds/locale/eu/LC_MESSAGES/djangojs.po index 1b95c0cdc..6f772210d 100644 --- a/server/src/uds/locale/eu/LC_MESSAGES/djangojs.po +++ b/server/src/uds/locale/eu/LC_MESSAGES/djangojs.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:02+0200\n" -"PO-Revision-Date: 2020-05-07 09:52+0000\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" +"PO-Revision-Date: 2020-05-11 12:06+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: Basque (http://www.transifex.com/openuds/openuds/language/" "eu/)\n" @@ -1570,12 +1570,10 @@ msgstr "About" #: static/modern/translations-fakejs.js:35 #: static/modern/translations-fakejs.js:36 -#| msgid "UDS Client" msgid "Client IP" msgstr "Bezeroaren IPa" #: static/modern/translations-fakejs.js:37 -#| msgid "Delete Proxy" msgid "Detected proxy ip" msgstr "Detektatutako proxy ip" diff --git a/server/src/uds/locale/fr/LC_MESSAGES/django.po b/server/src/uds/locale/fr/LC_MESSAGES/django.po index 67a47b7b1..411498ef6 100644 --- a/server/src/uds/locale/fr/LC_MESSAGES/django.po +++ b/server/src/uds/locale/fr/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:01+0200\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" "PO-Revision-Date: 2020-05-07 09:52+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: French (http://www.transifex.com/openuds/openuds/language/" @@ -29,7 +29,7 @@ msgstr "Comptes" #: REST/methods/meta_pools.py:70 REST/methods/networks.py:60 #: REST/methods/osmanagers.py:55 REST/methods/providers.py:70 #: REST/methods/proxies.py:59 REST/methods/reports.py:57 -#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:96 +#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:99 #: REST/methods/transports.py:57 REST/methods/user_services.py:255 #: REST/methods/user_services.py:295 REST/methods/users_groups.py:117 #: REST/model.py:139 @@ -55,7 +55,7 @@ msgstr "Marque de temps" #: REST/methods/calendars.py:63 REST/methods/meta_pools.py:77 #: REST/methods/networks.py:63 REST/methods/osmanagers.py:59 #: REST/methods/providers.py:76 REST/methods/proxies.py:63 -#: REST/methods/services.py:226 REST/methods/services_pools.py:105 +#: REST/methods/services.py:226 REST/methods/services_pools.py:108 #: REST/methods/transports.py:61 msgid "tags" msgstr "Tags" @@ -121,7 +121,7 @@ msgstr "Jetons d'acteur" #: REST/methods/actor_token.py:54 reports/stats/pools_performance.py:198 #: reports/stats/pools_performance.py:213 reports/stats/pools_usage_day.py:65 -#: reports/stats/usage_by_pool.py:160 reports/stats/user_access.py:174 +#: reports/stats/usage_by_pool.py:158 reports/stats/user_access.py:174 msgid "Date" msgstr "Date" @@ -175,13 +175,13 @@ msgstr "Type" #: REST/methods/authenticators.py:68 REST/methods/meta_service_pools.py:85 #: REST/methods/op_calendars.py:80 REST/methods/services_pool_groups.py:61 #: REST/methods/transports.py:56 REST/methods/user_services.py:294 -#: REST/model.py:166 models/meta_pool.py:72 +#: REST/model.py:166 models/meta_pool.py:73 msgid "Priority" msgstr "Priorité" #: REST/methods/authenticators.py:69 REST/methods/authenticators.py:101 #: REST/methods/meta_pools.py:75 REST/methods/meta_pools.py:150 -#: REST/methods/services_pools.py:101 REST/methods/services_pools.py:253 +#: REST/methods/services_pools.py:104 REST/methods/services_pools.py:277 msgid "Visible" msgstr "Visible" @@ -197,15 +197,15 @@ msgstr "Étiquette" msgid "Users" msgstr "Utilisateurs" -#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:254 +#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:278 msgid "If active, transport will be visible for users" msgstr "Si actif, le transport sera visible pour les utilisateurs" #: REST/methods/authenticators.py:105 REST/methods/meta_pools.py:138 #: REST/methods/meta_pools.py:146 REST/methods/meta_pools.py:154 -#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:257 -#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 -#: REST/methods/services_pools.py:281 core/ui/user_interface.py:99 +#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:281 +#: REST/methods/services_pools.py:289 REST/methods/services_pools.py:297 +#: REST/methods/services_pools.py:305 core/ui/user_interface.py:99 #: services/OVirt/service.py:186 msgid "Display" msgstr "Affichage" @@ -230,7 +230,7 @@ msgstr "Se répète" msgid "Every" msgstr "Chaque" -#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:160 +#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:158 msgid "Duration" msgstr "Durée" @@ -287,11 +287,11 @@ msgid "Policy" msgstr "Politique" #: REST/methods/meta_pools.py:73 REST/methods/services.py:225 -#: REST/methods/services_pools.py:98 +#: REST/methods/services_pools.py:101 msgid "User services" msgstr "Services aux utilisateurs" -#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:99 +#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:102 msgid "In Preparation" msgstr "En préparation" @@ -300,8 +300,8 @@ msgid "Pool Group" msgstr "Groupe de pools" #: REST/methods/meta_pools.py:86 REST/methods/meta_pools.py:141 -#: REST/methods/services_pools.py:123 REST/methods/services_pools.py:175 -#: REST/methods/services_pools.py:268 +#: REST/methods/services_pools.py:141 REST/methods/services_pools.py:198 +#: REST/methods/services_pools.py:292 msgid "Default" msgstr "Par défaut" @@ -310,21 +310,21 @@ msgid "Service pool policy" msgstr "Politique de pool de services" #: REST/methods/meta_pools.py:134 REST/methods/services_pool_groups.py:85 -#: REST/methods/services_pools.py:261 +#: REST/methods/services_pools.py:285 msgid "Associated Image" msgstr "Image associée" #: REST/methods/meta_pools.py:135 REST/methods/services_pool_groups.py:86 -#: REST/methods/services_pools.py:262 +#: REST/methods/services_pools.py:286 msgid "Image assocciated with this service" msgstr "Image associée à ce service" -#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:103 -#: REST/methods/services_pools.py:269 +#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:106 +#: REST/methods/services_pools.py:293 msgid "Pool group" msgstr "Groupe de pools" -#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:270 +#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:294 msgid "Pool group for this pool (for pool classify on display)" msgstr "Pool group pour ce pool (classification des pool par affichage)" @@ -332,11 +332,11 @@ msgstr "Pool group pour ce pool (classification des pool par affichage)" msgid "If active, metapool will be visible for users" msgstr "Si actif, metapool sera visible pour les utilisateurs" -#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:277 +#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:301 msgid "Calendar access denied text" msgstr "Accès au calendrier refusé" -#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:278 +#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:302 msgid "" "Custom message to be shown to users if access is limited by calendar rules." msgstr "" @@ -365,12 +365,13 @@ msgid "Creation date" msgstr "Date de création" #: REST/methods/meta_service_pools.py:172 REST/methods/services_usage.py:119 -#: reports/stats/pool_usage_summary.py:59 +#: reports/stats/pool_users_summary.py:59 #: reports/stats/pools_performance.py:258 reports/stats/pools_usage_day.py:166 -#: reports/stats/usage_by_pool.py:60 reports/stats/usage_by_pool.py:160 -#: services/Proxmox/service.py:110 +#: reports/stats/pools_usage_summary.py:137 reports/stats/usage_by_pool.py:60 +#: reports/stats/usage_by_pool.py:158 services/Proxmox/service.py:110 #: templates/uds/reports/stats/pools-performance.html:33 #: templates/uds/reports/stats/pools-usage-day.html:27 +#: templates/uds/reports/stats/pools-usage-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:17 msgid "Pool" msgstr "Pool" @@ -508,7 +509,7 @@ msgstr "Impossible de supprimer un gestionnaire d'OS avec services associés" msgid "Service providers" msgstr "Fournisseurs de services" -#: REST/methods/providers.py:73 REST/methods/services_pools.py:97 +#: REST/methods/providers.py:73 REST/methods/services_pools.py:100 msgid "Status" msgstr "Statut" @@ -657,9 +658,9 @@ msgstr "Procuration" msgid "Proxy for services behind a firewall" msgstr "Proxy pour les services derrière un pare-feu" -#: REST/methods/services.py:270 REST/methods/services_pools.py:233 -#: REST/methods/services_pools.py:241 REST/methods/services_pools.py:249 -#: REST/methods/services_pools.py:324 REST/methods/services_pools.py:332 +#: REST/methods/services.py:270 REST/methods/services_pools.py:257 +#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 +#: REST/methods/services_pools.py:348 REST/methods/services_pools.py:356 #: auths/RegexLdap/authenticator.py:78 core/ui/user_interface.py:95 #: osmanagers/WindowsOsManager/windows_domain.py:71 #: osmanagers/WindowsOsManager/windows_domain.py:72 @@ -683,47 +684,47 @@ msgstr "Bien" msgid "Services Pool Groups" msgstr "Groupes de pool de services" -#: REST/methods/services_pools.py:94 REST/methods/transports.py:104 +#: REST/methods/services_pools.py:97 REST/methods/transports.py:104 msgid "Service Pools" msgstr "Service pool" -#: REST/methods/services_pools.py:100 +#: REST/methods/services_pools.py:103 msgid "Usage" msgstr "Usage" -#: REST/methods/services_pools.py:102 +#: REST/methods/services_pools.py:105 msgid "Shows transports" msgstr "Montrer les transports" -#: REST/methods/services_pools.py:104 +#: REST/methods/services_pools.py:107 msgid "Parent service" msgstr "Service parent" -#: REST/methods/services_pools.py:206 +#: REST/methods/services_pools.py:230 msgid "Create at least a service before creating a new service pool" msgstr "Créez au moins un service avant de créer un nouveau pool de service" -#: REST/methods/services_pools.py:213 +#: REST/methods/services_pools.py:237 msgid "Base service" msgstr "Service de base" -#: REST/methods/services_pools.py:214 +#: REST/methods/services_pools.py:238 msgid "Service used as base of this service pool" msgstr "Service utilisé comme base de ce pool de service" -#: REST/methods/services_pools.py:221 +#: REST/methods/services_pools.py:245 msgid "OS Manager" msgstr "OS Manager" -#: REST/methods/services_pools.py:222 +#: REST/methods/services_pools.py:246 msgid "OS Manager used as base of this service pool" msgstr "Gestionnaire de l'OS utilisé comme base de ce pool de service" -#: REST/methods/services_pools.py:229 +#: REST/methods/services_pools.py:253 msgid "Allow removal by users" msgstr "Permettre la supression par utilisateurs" -#: REST/methods/services_pools.py:230 +#: REST/methods/services_pools.py:254 msgid "" "If active, the user will be allowed to remove the service \"manually\". Be " "careful with this, because the user will have the \"power\" to delete it's " @@ -733,20 +734,20 @@ msgstr "" "\"manuellement\". Soyez prudent avec cela, car l'utilisateur aura le " "\"pouvoir\" de supprimer son propre service" -#: REST/methods/services_pools.py:237 +#: REST/methods/services_pools.py:261 msgid "Allow reset by users" msgstr "Permettre la remise à zéro par les utilisateurs" -#: REST/methods/services_pools.py:238 +#: REST/methods/services_pools.py:262 msgid "If active, the user will be allowed to reset the service" msgstr "" "S’il est activé, l’utilisateur sera autorisé pour réinitialiser le service" -#: REST/methods/services_pools.py:245 +#: REST/methods/services_pools.py:269 msgid "Ignores unused" msgstr "Ignore les non utilisés" -#: REST/methods/services_pools.py:246 +#: REST/methods/services_pools.py:270 msgid "" "If the option is enabled, UDS will not attempt to detect and remove the user " "services assigned but not in use." @@ -754,44 +755,44 @@ msgstr "" "Si l’option est activée, UDS ne va pas tenter de détecter et supprimer les " "services d’utilisateurs affectés, Sinon ceux qui sont en cours d’utilisation." -#: REST/methods/services_pools.py:286 +#: REST/methods/services_pools.py:310 msgid "Initial available services" msgstr "Services initiaux disponibles" -#: REST/methods/services_pools.py:287 +#: REST/methods/services_pools.py:311 msgid "Services created initially for this service pool" msgstr "Services créés initialement pour ce pool de service" -#: REST/methods/services_pools.py:290 REST/methods/services_pools.py:299 -#: REST/methods/services_pools.py:308 REST/methods/services_pools.py:317 +#: REST/methods/services_pools.py:314 REST/methods/services_pools.py:323 +#: REST/methods/services_pools.py:332 REST/methods/services_pools.py:341 msgid "Availability" msgstr "Disponibilité" -#: REST/methods/services_pools.py:295 +#: REST/methods/services_pools.py:319 msgid "Services to keep in cache" msgstr "Services pour conserver en cache" -#: REST/methods/services_pools.py:296 +#: REST/methods/services_pools.py:320 msgid "Services kept in cache for improved user service assignation" msgstr "" "Services conservés dans le cache pour l'assignation de service utilisateur " "améliorée" -#: REST/methods/services_pools.py:304 +#: REST/methods/services_pools.py:328 msgid "Services to keep in L2 cache" msgstr "Services á garder en mémoire cache L2" -#: REST/methods/services_pools.py:305 +#: REST/methods/services_pools.py:329 msgid "Services kept in cache of level2 for improved service generation" msgstr "" "Services conservés dans le cache de niveau 2 pour la production d'un service " "amélioré" -#: REST/methods/services_pools.py:313 +#: REST/methods/services_pools.py:337 msgid "Maximum number of services to provide" msgstr "Nombre maximum de services à fournir" -#: REST/methods/services_pools.py:314 +#: REST/methods/services_pools.py:338 msgid "" "Maximum number of service (assigned and L1 cache) that can be created for " "this service" @@ -799,28 +800,28 @@ msgstr "" "Nombre maximal de service (assignés et cache L1) qui peuvent être créés pour " "ce service" -#: REST/methods/services_pools.py:321 +#: REST/methods/services_pools.py:345 msgid "Show transports" msgstr "Voir les transports" -#: REST/methods/services_pools.py:322 +#: REST/methods/services_pools.py:346 msgid "If active, alternative transports for user will be shown" msgstr "" "S'il est activé, les transports alternatifs pour utilisateur seront affichés" -#: REST/methods/services_pools.py:329 +#: REST/methods/services_pools.py:353 msgid "Accounting" msgstr "Comptabilité" -#: REST/methods/services_pools.py:330 +#: REST/methods/services_pools.py:354 msgid "Account associated to this service pool" msgstr "Compte associé à ce pool de services" -#: REST/methods/services_pools.py:346 +#: REST/methods/services_pools.py:370 msgid "Base service does not exist anymore" msgstr "Service de base n'existe plus" -#: REST/methods/services_pools.py:380 +#: REST/methods/services_pools.py:404 msgid "This service requires an OS Manager" msgstr "Ce service nécessite un gestionnaire de système d'exploitation" @@ -950,8 +951,8 @@ msgstr "Membre du personnel" #: auths/AzureAD_enterprise/azure_ad.py:92 #: auths/EDirectory_enterprise/authenticator.py:47 #: auths/RegexLdap/authenticator.py:67 auths/SAML_enterprise/saml.py:117 -#: reports/stats/pool_usage_summary.py:166 reports/stats/usage_by_pool.py:160 -#: templates/uds/reports/stats/pool-usage-summary.html:14 +#: reports/stats/pool_users_summary.py:166 reports/stats/usage_by_pool.py:158 +#: templates/uds/reports/stats/pool-users-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:15 msgid "User" msgstr "Utilisateur" @@ -1804,27 +1805,27 @@ msgid "Can't remove nor cancel {} cause its state don't allow it" msgstr "" "Impossible de supprimer ni d'annuler {} car son état ne le permet pas" -#: core/managers/user_service.py:318 +#: core/managers/user_service.py:317 msgid "The requested service is restrained" msgstr "Le service demandé est restreint" -#: core/managers/user_service.py:556 +#: core/managers/user_service.py:555 msgid "The requested service is not available" msgstr "Le service demandé n'est pas disponible" -#: core/managers/user_service.py:586 +#: core/managers/user_service.py:585 msgid "The requested transport {} is not valid for {}" msgstr "Le transport demandé {} n'est pas valide pour {}." -#: core/managers/user_service.py:710 +#: core/managers/user_service.py:709 msgid "The service is not accessible from this device" msgstr "Le service n'est pas accessible depuis cet appareil" -#: core/module.py:208 +#: core/module.py:207 msgid "No connection checking method is implemented." msgstr "Aucun lien pour vérifier la méthode n'est implémentée." -#: core/module.py:277 +#: core/module.py:276 msgid "No check method provided." msgstr "Aucune méthode de vérification fournie." @@ -2202,8 +2203,8 @@ msgstr "Lundi au vendredi" msgid "Minutes" msgstr "Minutes" -#: models/calendar_rule.py:76 reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:16 +#: models/calendar_rule.py:76 reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:16 msgid "Hours" msgstr "Heures" @@ -2215,11 +2216,11 @@ msgstr "Jours" msgid "Weeks" msgstr "Semaines" -#: models/meta_pool.py:71 +#: models/meta_pool.py:72 msgid "Evenly distributed" msgstr "Distribué équitablement" -#: models/meta_pool.py:73 +#: models/meta_pool.py:74 msgid "Greater % available" msgstr "Plus grand% disponible" @@ -2595,7 +2596,7 @@ msgstr "Liste des utilisateurs de la plate-forme" msgid "Users List for {}" msgstr "Liste des utilisateurs des {}" -#: reports/lists/users.py:86 reports/stats/pool_usage_summary.py:145 +#: reports/lists/users.py:86 reports/stats/pool_users_summary.py:145 msgid "UDS Report of users in {}" msgstr "Rapport UDS des utilisateurs dans {}" @@ -2611,49 +2612,53 @@ msgstr "Vrai nom" msgid "Statistics" msgstr "Statistiques" -#: reports/stats/pool_usage_summary.py:52 -msgid "Summary of pools usage" -msgstr "Résumé de l’utilisation des Pools" +#: reports/stats/pool_users_summary.py:52 +#| msgid "Pools usage by users" +msgid "Pool Usage by users" +msgstr "Utilisation du pool par les utilisateurs" -#: reports/stats/pool_usage_summary.py:53 -msgid "Generates a report with the summary of a pool usage" -msgstr "Génère un rapport avec l’aperçu de l’utilisation d’un Pool" +#: reports/stats/pool_users_summary.py:53 +#| msgid "Generates a report with the summary of a pool usage" +msgid "Generates a report with the summary of users usage for a pool" +msgstr "" +"Génère un rapport avec le résumé de l'utilisation des utilisateurs pour " +"un pool" -#: reports/stats/pool_usage_summary.py:60 reports/stats/usage_by_pool.py:61 +#: reports/stats/pool_users_summary.py:60 reports/stats/usage_by_pool.py:61 msgid "Pool for report" msgstr "Pool pour rapport" -#: reports/stats/pool_usage_summary.py:66 reports/stats/pools_performance.py:74 +#: reports/stats/pool_users_summary.py:66 reports/stats/pools_performance.py:74 #: reports/stats/usage_by_pool.py:67 reports/stats/user_access.py:66 msgid "Starting date" msgstr "Date de départ" -#: reports/stats/pool_usage_summary.py:67 reports/stats/pools_performance.py:75 +#: reports/stats/pool_users_summary.py:67 reports/stats/pools_performance.py:75 #: reports/stats/usage_by_pool.py:68 reports/stats/user_access.py:67 msgid "starting date for report" msgstr "date de début de rapport" -#: reports/stats/pool_usage_summary.py:74 reports/stats/pools_performance.py:82 +#: reports/stats/pool_users_summary.py:74 reports/stats/pools_performance.py:82 #: reports/stats/usage_by_pool.py:75 reports/stats/user_access.py:74 msgid "Finish date" msgstr "Date de fin" -#: reports/stats/pool_usage_summary.py:75 reports/stats/pools_performance.py:83 +#: reports/stats/pool_users_summary.py:75 reports/stats/pools_performance.py:83 #: reports/stats/usage_by_pool.py:76 reports/stats/user_access.py:75 msgid "finish date for report" msgstr "la date fin du rapport" -#: reports/stats/pool_usage_summary.py:144 +#: reports/stats/pool_users_summary.py:144 msgid "Users usage list for {}" msgstr "Liste d'utilisation aux utilisateurs pour {}" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:15 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:15 msgid "Sessions" msgstr "Sessions" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:17 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:17 msgid "Average" msgstr "Moyenne" @@ -2740,6 +2745,47 @@ msgstr "Rapport d'utilisation des services pour un jour" msgid "Service usage report" msgstr "Rapport d'utilisation du service" +#: reports/stats/pools_usage_summary.py:47 +msgid "Summary of pools usage" +msgstr "Résumé de l’utilisation des Pools" + +#: reports/stats/pools_usage_summary.py:48 +msgid "" +"Summary of Pools usage with time totals, accesses totals, time total by pool" +msgstr "" +"Récapitulatif de l'utilisation des pools avec totaux de temps, totaux " +"d'accès, total de temps par pool" + +#: reports/stats/pools_usage_summary.py:116 +#| msgid "Summary of pools usage" +msgid "Summary of Pools usage" +msgstr "Résumé de l'utilisation des pools" + +#: reports/stats/pools_usage_summary.py:116 +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "to" +msgstr "à" + +#: reports/stats/pools_usage_summary.py:117 +#| msgid "Summary of pools usage" +msgid "UDS Report Summary of pools usage" +msgstr "Rapport UDS Résumé de l'utilisation des pools" + +#: reports/stats/pools_usage_summary.py:137 +msgid "Total Time (seconds)" +msgstr "Temps total (secondes)" + +#: reports/stats/pools_usage_summary.py:137 +#| msgid "Accesses" +msgid "Total Accesses" +msgstr "Total des accès" + +#: reports/stats/pools_usage_summary.py:142 +#: templates/uds/reports/stats/pools-usage-summary.html:30 +msgid "Total" +msgstr "Total" + #: reports/stats/usage_by_pool.py:53 msgid "Pools usage by users" msgstr "Utilisation des Pools par les utilisateurs" @@ -2752,16 +2798,17 @@ msgstr "Utilisation des Pools par le rapport de l'utilisateur" msgid "ALL POOLS" msgstr "TOUTES LES PISCINES" -#: reports/stats/usage_by_pool.py:138 +#: reports/stats/usage_by_pool.py:136 #: templates/uds/reports/stats/usage-by-pool.html:4 +#: templates/uds/reports/stats/usage-by-pool.html:6 msgid "Users usage list" msgstr "Liste d'utilisation des utilisateurs" -#: reports/stats/usage_by_pool.py:139 +#: reports/stats/usage_by_pool.py:137 msgid "UDS Report of users usage" msgstr "Rapport UDS sur l'utilisation des utilisateurs" -#: reports/stats/usage_by_pool.py:160 +#: reports/stats/usage_by_pool.py:158 #: templates/uds/reports/stats/usage-by-pool.html:16 msgid "Seconds" msgstr "Secondes" @@ -3101,7 +3148,7 @@ msgstr "Test de connexion réussie" #: services/HyperV_enterprise/legacy/provider.py:268 #: services/Nutanix_enterprise/provider.py:214 services/OVirt/provider.py:457 -#: services/Proxmox/provider.py:202 services/Vmware_enterprise/provider.py:178 +#: services/Proxmox/provider.py:205 services/Vmware_enterprise/provider.py:178 msgid "Connection failed. Check connection params" msgstr "La connexion a échoué. Vérifiez les paramètres de connexion" @@ -3113,12 +3160,10 @@ msgid "UDS pub for {0} at {1}" msgstr "Pub UDS {0} sur {1}" #: services/HyperV_enterprise/legacy/service.py:57 -#: services/HyperV_enterprise/service.py:57 msgid "HyperV Linked Clone (Experimental)" msgstr "HyperV Clone lié (expérimental)" #: services/HyperV_enterprise/legacy/service.py:59 -#: services/HyperV_enterprise/service.py:59 msgid "Hyper Services based on templates and differential disks (experimental)" msgstr "" "Hyper Services basés sur des modèles et des disques différentiels " @@ -3305,6 +3350,17 @@ msgstr "" "Pour les clusters, le nom d'utilisateur doit être un nom d'" "utilisateur de domaine (utilisateur @ domaine ou DOMAINE \\ utilisateur" +#: services/HyperV_enterprise/service.py:57 +#| msgid "Xen Linked Clone" +msgid "HyperV Linked Clone" +msgstr "Clone lié HyperV" + +#: services/HyperV_enterprise/service.py:59 +#| msgid "" +#| "Hyper Services based on templates and differential disks (experimental)" +msgid "Hyper Services based on templates and differential disks" +msgstr "Hyper Services basés sur des modèles et des disques différentiels" + #: services/Nutanix_enterprise/provider.py:30 msgid "Nutanix Acropolis Platform Provider" msgstr "Fournisseur de plates-formes Nutanix Acropolis" @@ -3806,12 +3862,12 @@ msgstr "Fournisseur de machines IP statiques" msgid "Provides connection to machines by IP" msgstr "Fournit une connexion aux machines par IP" -#: services/PhysicalMachines/service_multi.py:59 +#: services/PhysicalMachines/service_multi.py:60 #: services/Vmware_enterprise/service_fixed.py:54 msgid "Service Token" msgstr "Jeton de service" -#: services/PhysicalMachines/service_multi.py:61 +#: services/PhysicalMachines/service_multi.py:62 #: services/Vmware_enterprise/service_fixed.py:56 msgid "" "Service token that will be used by actors to communicate with service. Leave " @@ -3820,20 +3876,32 @@ msgstr "" "Jeton de service qui sera utilisé par les acteurs pour communiquer avec le " "service. Laissez vide pour une affectation persistante." -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 #: services/RDS_enterprise/provider.py:47 msgid "List of servers" msgstr "Liste des serveurs" -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 msgid "List of servers available for this service" msgstr "Liste des serveurs disponibles pour ce service" -#: services/PhysicalMachines/service_multi.py:71 +#: services/PhysicalMachines/service_multi.py:70 +#| msgid "Check Cert." +msgid "Check Port" +msgstr "Vérifier le port" + +#: services/PhysicalMachines/service_multi.py:70 +msgid "" +"If non zero, only Machines responding to connection on that port will be used" +msgstr "" +"Si différent de zéro, seules les machines répondant à la connexion sur ce " +"port seront utilisées" + +#: services/PhysicalMachines/service_multi.py:73 msgid "Static Multiple IP" msgstr "IP statique multiple" -#: services/PhysicalMachines/service_multi.py:73 +#: services/PhysicalMachines/service_multi.py:75 msgid "This service provides access to POWERED-ON Machines by IP" msgstr "Ce service fournit un accès aux machines sous tension par IP" @@ -4797,9 +4865,31 @@ msgstr "Rendez-vous amoureux:" msgid "Services assignation" msgstr "Assignation de services" -#: templates/uds/reports/stats/usage-by-pool.html:6 -msgid "Users usage list for" -msgstr "Liste d'utilisation des utilisateurs pour" +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +#| msgid "Pools usage on a day" +msgid "Pools usage summary" +msgstr "Résumé de l'utilisation des pools" + +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "from" +msgstr "de" + +#: templates/uds/reports/stats/pools-usage-summary.html:15 +#| msgid "Max.Idle time" +msgid "Total time" +msgstr "Temps total" + +#: templates/uds/reports/stats/pools-usage-summary.html:16 +#| msgid "Last access" +msgid "Total accesses" +msgstr "Total accès" + +#: templates/uds/reports/stats/pools-usage-summary.html:17 +#| msgid "Current users" +msgid "Unique users" +msgstr "Utilisateurs uniques" #: templates/uds/reports/stats/usage-by-pool.html:14 msgid "Access date/time" @@ -5860,7 +5950,7 @@ msgstr "" "Le rechargement de cette page n'est pas pris en charge. S'il vous " "plaît, rouvrez le service d'origine." -#: web/util/services.py:190 +#: web/util/services.py:196 msgid "" "This service is about to be replaced by a new version. Please, close the " "session before {} and save all your work to avoid loosing it." diff --git a/server/src/uds/locale/fr/LC_MESSAGES/djangojs.po b/server/src/uds/locale/fr/LC_MESSAGES/djangojs.po index 24f545256..3c252e964 100644 --- a/server/src/uds/locale/fr/LC_MESSAGES/djangojs.po +++ b/server/src/uds/locale/fr/LC_MESSAGES/djangojs.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:02+0200\n" -"PO-Revision-Date: 2020-05-07 09:52+0000\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" +"PO-Revision-Date: 2020-05-11 12:06+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: French (http://www.transifex.com/openuds/openuds/language/" "fr/)\n" @@ -1579,12 +1579,10 @@ msgstr "Sur" #: static/modern/translations-fakejs.js:35 #: static/modern/translations-fakejs.js:36 -#| msgid "UDS Client" msgid "Client IP" msgstr "IP client" #: static/modern/translations-fakejs.js:37 -#| msgid "Delete Proxy" msgid "Detected proxy ip" msgstr "IP proxy détectée" diff --git a/server/src/uds/locale/it/LC_MESSAGES/django.po b/server/src/uds/locale/it/LC_MESSAGES/django.po index 55c2c6463..e97ff41e7 100644 --- a/server/src/uds/locale/it/LC_MESSAGES/django.po +++ b/server/src/uds/locale/it/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:01+0200\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" "PO-Revision-Date: 2020-05-07 09:52+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: Italian (http://www.transifex.com/openuds/openuds/language/" @@ -30,7 +30,7 @@ msgstr "conti" #: REST/methods/meta_pools.py:70 REST/methods/networks.py:60 #: REST/methods/osmanagers.py:55 REST/methods/providers.py:70 #: REST/methods/proxies.py:59 REST/methods/reports.py:57 -#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:96 +#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:99 #: REST/methods/transports.py:57 REST/methods/user_services.py:255 #: REST/methods/user_services.py:295 REST/methods/users_groups.py:117 #: REST/model.py:139 @@ -56,7 +56,7 @@ msgstr "Segno di tempo" #: REST/methods/calendars.py:63 REST/methods/meta_pools.py:77 #: REST/methods/networks.py:63 REST/methods/osmanagers.py:59 #: REST/methods/providers.py:76 REST/methods/proxies.py:63 -#: REST/methods/services.py:226 REST/methods/services_pools.py:105 +#: REST/methods/services.py:226 REST/methods/services_pools.py:108 #: REST/methods/transports.py:61 msgid "tags" msgstr "tag" @@ -122,7 +122,7 @@ msgstr "Token attore" #: REST/methods/actor_token.py:54 reports/stats/pools_performance.py:198 #: reports/stats/pools_performance.py:213 reports/stats/pools_usage_day.py:65 -#: reports/stats/usage_by_pool.py:160 reports/stats/user_access.py:174 +#: reports/stats/usage_by_pool.py:158 reports/stats/user_access.py:174 msgid "Date" msgstr "Data" @@ -176,13 +176,13 @@ msgstr "genere" #: REST/methods/authenticators.py:68 REST/methods/meta_service_pools.py:85 #: REST/methods/op_calendars.py:80 REST/methods/services_pool_groups.py:61 #: REST/methods/transports.py:56 REST/methods/user_services.py:294 -#: REST/model.py:166 models/meta_pool.py:72 +#: REST/model.py:166 models/meta_pool.py:73 msgid "Priority" msgstr "Priorità" #: REST/methods/authenticators.py:69 REST/methods/authenticators.py:101 #: REST/methods/meta_pools.py:75 REST/methods/meta_pools.py:150 -#: REST/methods/services_pools.py:101 REST/methods/services_pools.py:253 +#: REST/methods/services_pools.py:104 REST/methods/services_pools.py:277 msgid "Visible" msgstr "Visibile" @@ -198,15 +198,15 @@ msgstr "Etichetta" msgid "Users" msgstr "utenti" -#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:254 +#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:278 msgid "If active, transport will be visible for users" msgstr "Se attivo, il trasporto sarà visibile agli utenti" #: REST/methods/authenticators.py:105 REST/methods/meta_pools.py:138 #: REST/methods/meta_pools.py:146 REST/methods/meta_pools.py:154 -#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:257 -#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 -#: REST/methods/services_pools.py:281 core/ui/user_interface.py:99 +#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:281 +#: REST/methods/services_pools.py:289 REST/methods/services_pools.py:297 +#: REST/methods/services_pools.py:305 core/ui/user_interface.py:99 #: services/OVirt/service.py:186 msgid "Display" msgstr "Display" @@ -231,7 +231,7 @@ msgstr "ripetizioni" msgid "Every" msgstr "Ogni" -#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:160 +#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:158 msgid "Duration" msgstr "Durata" @@ -288,11 +288,11 @@ msgid "Policy" msgstr "Politica" #: REST/methods/meta_pools.py:73 REST/methods/services.py:225 -#: REST/methods/services_pools.py:98 +#: REST/methods/services_pools.py:101 msgid "User services" msgstr "Servizi utente" -#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:99 +#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:102 msgid "In Preparation" msgstr "In preparazione" @@ -301,8 +301,8 @@ msgid "Pool Group" msgstr "Pool Group" #: REST/methods/meta_pools.py:86 REST/methods/meta_pools.py:141 -#: REST/methods/services_pools.py:123 REST/methods/services_pools.py:175 -#: REST/methods/services_pools.py:268 +#: REST/methods/services_pools.py:141 REST/methods/services_pools.py:198 +#: REST/methods/services_pools.py:292 msgid "Default" msgstr "Predefinito" @@ -311,21 +311,21 @@ msgid "Service pool policy" msgstr "Politica del pool di servizi" #: REST/methods/meta_pools.py:134 REST/methods/services_pool_groups.py:85 -#: REST/methods/services_pools.py:261 +#: REST/methods/services_pools.py:285 msgid "Associated Image" msgstr "Immagine associata" #: REST/methods/meta_pools.py:135 REST/methods/services_pool_groups.py:86 -#: REST/methods/services_pools.py:262 +#: REST/methods/services_pools.py:286 msgid "Image assocciated with this service" msgstr "Immagine associata a questo servizio" -#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:103 -#: REST/methods/services_pools.py:269 +#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:106 +#: REST/methods/services_pools.py:293 msgid "Pool group" msgstr "Gruppo di pool" -#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:270 +#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:294 msgid "Pool group for this pool (for pool classify on display)" msgstr "Gruppo di poll per questa piscina (per classificare sul display)" @@ -333,11 +333,11 @@ msgstr "Gruppo di poll per questa piscina (per classificare sul display)" msgid "If active, metapool will be visible for users" msgstr "Se attivo, metapool sarà visibile agli utenti" -#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:277 +#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:301 msgid "Calendar access denied text" msgstr "Accesso negato al testo" -#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:278 +#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:302 msgid "" "Custom message to be shown to users if access is limited by calendar rules." msgstr "" @@ -366,12 +366,13 @@ msgid "Creation date" msgstr "Data di creazione" #: REST/methods/meta_service_pools.py:172 REST/methods/services_usage.py:119 -#: reports/stats/pool_usage_summary.py:59 +#: reports/stats/pool_users_summary.py:59 #: reports/stats/pools_performance.py:258 reports/stats/pools_usage_day.py:166 -#: reports/stats/usage_by_pool.py:60 reports/stats/usage_by_pool.py:160 -#: services/Proxmox/service.py:110 +#: reports/stats/pools_usage_summary.py:137 reports/stats/usage_by_pool.py:60 +#: reports/stats/usage_by_pool.py:158 services/Proxmox/service.py:110 #: templates/uds/reports/stats/pools-performance.html:33 #: templates/uds/reports/stats/pools-usage-day.html:27 +#: templates/uds/reports/stats/pools-usage-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:17 msgid "Pool" msgstr "Pool" @@ -511,7 +512,7 @@ msgstr "" msgid "Service providers" msgstr "Fornitori di servizi" -#: REST/methods/providers.py:73 REST/methods/services_pools.py:97 +#: REST/methods/providers.py:73 REST/methods/services_pools.py:100 msgid "Status" msgstr "Stato" @@ -658,9 +659,9 @@ msgstr "delega" msgid "Proxy for services behind a firewall" msgstr "Proxy per servizi dietro un firewall" -#: REST/methods/services.py:270 REST/methods/services_pools.py:233 -#: REST/methods/services_pools.py:241 REST/methods/services_pools.py:249 -#: REST/methods/services_pools.py:324 REST/methods/services_pools.py:332 +#: REST/methods/services.py:270 REST/methods/services_pools.py:257 +#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 +#: REST/methods/services_pools.py:348 REST/methods/services_pools.py:356 #: auths/RegexLdap/authenticator.py:78 core/ui/user_interface.py:95 #: osmanagers/WindowsOsManager/windows_domain.py:71 #: osmanagers/WindowsOsManager/windows_domain.py:72 @@ -684,48 +685,48 @@ msgstr "Ok" msgid "Services Pool Groups" msgstr "Servizi Pool Groups" -#: REST/methods/services_pools.py:94 REST/methods/transports.py:104 +#: REST/methods/services_pools.py:97 REST/methods/transports.py:104 msgid "Service Pools" msgstr "Pool di servizi" -#: REST/methods/services_pools.py:100 +#: REST/methods/services_pools.py:103 msgid "Usage" msgstr "uso" -#: REST/methods/services_pools.py:102 +#: REST/methods/services_pools.py:105 msgid "Shows transports" msgstr "Mostra i trasporti" -#: REST/methods/services_pools.py:104 +#: REST/methods/services_pools.py:107 msgid "Parent service" msgstr "Servizio genitore" -#: REST/methods/services_pools.py:206 +#: REST/methods/services_pools.py:230 msgid "Create at least a service before creating a new service pool" msgstr "Creare almeno un servizio prima di creare un nuovo pool di servizi" -#: REST/methods/services_pools.py:213 +#: REST/methods/services_pools.py:237 msgid "Base service" msgstr "Servizio di base" -#: REST/methods/services_pools.py:214 +#: REST/methods/services_pools.py:238 msgid "Service used as base of this service pool" msgstr "Servizio utilizzato come base di questo pool di servizi" -#: REST/methods/services_pools.py:221 +#: REST/methods/services_pools.py:245 msgid "OS Manager" msgstr "OS Manager" -#: REST/methods/services_pools.py:222 +#: REST/methods/services_pools.py:246 msgid "OS Manager used as base of this service pool" msgstr "" "Gestore del sistema operativo utilizzato come base di questo pool di servizi" -#: REST/methods/services_pools.py:229 +#: REST/methods/services_pools.py:253 msgid "Allow removal by users" msgstr "Consenti la rimozione da parte degli utenti" -#: REST/methods/services_pools.py:230 +#: REST/methods/services_pools.py:254 msgid "" "If active, the user will be allowed to remove the service \"manually\". Be " "careful with this, because the user will have the \"power\" to delete it's " @@ -735,19 +736,19 @@ msgstr "" "\"manualmente\". Fai attenzione, perché l'utente avrà il \"potere\" di " "cancellare il proprio servizio" -#: REST/methods/services_pools.py:237 +#: REST/methods/services_pools.py:261 msgid "Allow reset by users" msgstr "Permetti il reset da parte degli utenti" -#: REST/methods/services_pools.py:238 +#: REST/methods/services_pools.py:262 msgid "If active, the user will be allowed to reset the service" msgstr "Se attivo, l'utente sarà autorizzato a ripristinare il servizio" -#: REST/methods/services_pools.py:245 +#: REST/methods/services_pools.py:269 msgid "Ignores unused" msgstr "Ignora inutilizzato" -#: REST/methods/services_pools.py:246 +#: REST/methods/services_pools.py:270 msgid "" "If the option is enabled, UDS will not attempt to detect and remove the user " "services assigned but not in use." @@ -755,43 +756,43 @@ msgstr "" "Se l'opzione è abilitata, UDS non tenterà di rilevare e rimuovere i " "servizi utente assegnati ma non in uso." -#: REST/methods/services_pools.py:286 +#: REST/methods/services_pools.py:310 msgid "Initial available services" msgstr "Servizi disponibili iniziali" -#: REST/methods/services_pools.py:287 +#: REST/methods/services_pools.py:311 msgid "Services created initially for this service pool" msgstr "Servizi creati inizialmente per questo pool di servizi" -#: REST/methods/services_pools.py:290 REST/methods/services_pools.py:299 -#: REST/methods/services_pools.py:308 REST/methods/services_pools.py:317 +#: REST/methods/services_pools.py:314 REST/methods/services_pools.py:323 +#: REST/methods/services_pools.py:332 REST/methods/services_pools.py:341 msgid "Availability" msgstr "Disponibilità" -#: REST/methods/services_pools.py:295 +#: REST/methods/services_pools.py:319 msgid "Services to keep in cache" msgstr "Servizi da tenere nella cache" -#: REST/methods/services_pools.py:296 +#: REST/methods/services_pools.py:320 msgid "Services kept in cache for improved user service assignation" msgstr "" "Servizi tenuti nella cache per una migliore assegnazione del servizio utente" -#: REST/methods/services_pools.py:304 +#: REST/methods/services_pools.py:328 msgid "Services to keep in L2 cache" msgstr "Servizi da tenere nella cache L2" -#: REST/methods/services_pools.py:305 +#: REST/methods/services_pools.py:329 msgid "Services kept in cache of level2 for improved service generation" msgstr "" "Servizi mantenuti nella cache di level2 per una migliore generazione di " "servizi" -#: REST/methods/services_pools.py:313 +#: REST/methods/services_pools.py:337 msgid "Maximum number of services to provide" msgstr "Numero massimo di servizi da fornire" -#: REST/methods/services_pools.py:314 +#: REST/methods/services_pools.py:338 msgid "" "Maximum number of service (assigned and L1 cache) that can be created for " "this service" @@ -799,27 +800,27 @@ msgstr "" "Numero massimo di servizi (assegnati e cache L1) che possono essere creati " "per questo servizio" -#: REST/methods/services_pools.py:321 +#: REST/methods/services_pools.py:345 msgid "Show transports" msgstr "Mostra trasporti" -#: REST/methods/services_pools.py:322 +#: REST/methods/services_pools.py:346 msgid "If active, alternative transports for user will be shown" msgstr "Se attivo, verranno mostrati i trasporti alternativi per l'utente" -#: REST/methods/services_pools.py:329 +#: REST/methods/services_pools.py:353 msgid "Accounting" msgstr "Contabilità" -#: REST/methods/services_pools.py:330 +#: REST/methods/services_pools.py:354 msgid "Account associated to this service pool" msgstr "Account associato a questo pool di servizi" -#: REST/methods/services_pools.py:346 +#: REST/methods/services_pools.py:370 msgid "Base service does not exist anymore" msgstr "Il servizio base non esiste più" -#: REST/methods/services_pools.py:380 +#: REST/methods/services_pools.py:404 msgid "This service requires an OS Manager" msgstr "Questo servizio richiede un gestore del sistema operativo" @@ -948,8 +949,8 @@ msgstr "Membro del personale" #: auths/AzureAD_enterprise/azure_ad.py:92 #: auths/EDirectory_enterprise/authenticator.py:47 #: auths/RegexLdap/authenticator.py:67 auths/SAML_enterprise/saml.py:117 -#: reports/stats/pool_usage_summary.py:166 reports/stats/usage_by_pool.py:160 -#: templates/uds/reports/stats/pool-usage-summary.html:14 +#: reports/stats/pool_users_summary.py:166 reports/stats/usage_by_pool.py:158 +#: templates/uds/reports/stats/pool-users-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:15 msgid "User" msgstr "Utente" @@ -1795,27 +1796,27 @@ msgid "Can't remove nor cancel {} cause its state don't allow it" msgstr "" "Impossibile rimuovere o annullare {} perché il suo stato non lo consente" -#: core/managers/user_service.py:318 +#: core/managers/user_service.py:317 msgid "The requested service is restrained" msgstr "Il servizio richiesto è limitato" -#: core/managers/user_service.py:556 +#: core/managers/user_service.py:555 msgid "The requested service is not available" msgstr "Il servizio richiesto non è disponibile" -#: core/managers/user_service.py:586 +#: core/managers/user_service.py:585 msgid "The requested transport {} is not valid for {}" msgstr "Il trasporto richiesto {} non è valido per {}" -#: core/managers/user_service.py:710 +#: core/managers/user_service.py:709 msgid "The service is not accessible from this device" msgstr "Il servizio non è accessibile da questo dispositivo" -#: core/module.py:208 +#: core/module.py:207 msgid "No connection checking method is implemented." msgstr "Non è implementato alcun metodo di controllo della connessione." -#: core/module.py:277 +#: core/module.py:276 msgid "No check method provided." msgstr "Nessun metodo di controllo fornito." @@ -2192,8 +2193,8 @@ msgstr "Nei giorni feriali" msgid "Minutes" msgstr "Minuti" -#: models/calendar_rule.py:76 reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:16 +#: models/calendar_rule.py:76 reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:16 msgid "Hours" msgstr "Ore" @@ -2205,11 +2206,11 @@ msgstr "giorni" msgid "Weeks" msgstr "settimane" -#: models/meta_pool.py:71 +#: models/meta_pool.py:72 msgid "Evenly distributed" msgstr "Uniformemente distribuito" -#: models/meta_pool.py:73 +#: models/meta_pool.py:74 msgid "Greater % available" msgstr "Maggiore% disponibile" @@ -2584,7 +2585,7 @@ msgstr "Elenca gli utenti della piattaforma" msgid "Users List for {}" msgstr "Elenco utenti per {}" -#: reports/lists/users.py:86 reports/stats/pool_usage_summary.py:145 +#: reports/lists/users.py:86 reports/stats/pool_users_summary.py:145 msgid "UDS Report of users in {}" msgstr "Rapporto UDS degli utenti in {}" @@ -2600,49 +2601,53 @@ msgstr "Vero nome" msgid "Statistics" msgstr "statistica" -#: reports/stats/pool_usage_summary.py:52 -msgid "Summary of pools usage" -msgstr "Riepilogo dell'utilizzo dei pool" +#: reports/stats/pool_users_summary.py:52 +#| msgid "Pools usage by users" +msgid "Pool Usage by users" +msgstr "Utilizzo del pool da parte degli utenti" -#: reports/stats/pool_usage_summary.py:53 -msgid "Generates a report with the summary of a pool usage" -msgstr "Genera un report con il riepilogo di un utilizzo del pool" +#: reports/stats/pool_users_summary.py:53 +#| msgid "Generates a report with the summary of a pool usage" +msgid "Generates a report with the summary of users usage for a pool" +msgstr "" +"Genera un rapporto con il riepilogo dell'utilizzo degli utenti per un " +"pool" -#: reports/stats/pool_usage_summary.py:60 reports/stats/usage_by_pool.py:61 +#: reports/stats/pool_users_summary.py:60 reports/stats/usage_by_pool.py:61 msgid "Pool for report" msgstr "Pool per report" -#: reports/stats/pool_usage_summary.py:66 reports/stats/pools_performance.py:74 +#: reports/stats/pool_users_summary.py:66 reports/stats/pools_performance.py:74 #: reports/stats/usage_by_pool.py:67 reports/stats/user_access.py:66 msgid "Starting date" msgstr "Data di inizio" -#: reports/stats/pool_usage_summary.py:67 reports/stats/pools_performance.py:75 +#: reports/stats/pool_users_summary.py:67 reports/stats/pools_performance.py:75 #: reports/stats/usage_by_pool.py:68 reports/stats/user_access.py:67 msgid "starting date for report" msgstr "data di inizio per la relazione" -#: reports/stats/pool_usage_summary.py:74 reports/stats/pools_performance.py:82 +#: reports/stats/pool_users_summary.py:74 reports/stats/pools_performance.py:82 #: reports/stats/usage_by_pool.py:75 reports/stats/user_access.py:74 msgid "Finish date" msgstr "Data di fine" -#: reports/stats/pool_usage_summary.py:75 reports/stats/pools_performance.py:83 +#: reports/stats/pool_users_summary.py:75 reports/stats/pools_performance.py:83 #: reports/stats/usage_by_pool.py:76 reports/stats/user_access.py:75 msgid "finish date for report" msgstr "data di fine per la relazione" -#: reports/stats/pool_usage_summary.py:144 +#: reports/stats/pool_users_summary.py:144 msgid "Users usage list for {}" msgstr "Elenco di utilizzo degli utenti per {}" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:15 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:15 msgid "Sessions" msgstr "sessioni" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:17 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:17 msgid "Average" msgstr "Media" @@ -2729,6 +2734,47 @@ msgstr "Rapporto sull'utilizzo dei servizi per un giorno" msgid "Service usage report" msgstr "Rapporto sull'utilizzo del servizio" +#: reports/stats/pools_usage_summary.py:47 +msgid "Summary of pools usage" +msgstr "Riepilogo dell'utilizzo dei pool" + +#: reports/stats/pools_usage_summary.py:48 +msgid "" +"Summary of Pools usage with time totals, accesses totals, time total by pool" +msgstr "" +"Riepilogo dell'utilizzo dei pool con totali dei tempi, totali degli " +"accessi, totale dei tempi per pool" + +#: reports/stats/pools_usage_summary.py:116 +#| msgid "Summary of pools usage" +msgid "Summary of Pools usage" +msgstr "Riepilogo dell'utilizzo dei pool" + +#: reports/stats/pools_usage_summary.py:116 +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "to" +msgstr "per" + +#: reports/stats/pools_usage_summary.py:117 +#| msgid "Summary of pools usage" +msgid "UDS Report Summary of pools usage" +msgstr "Rapporto UDS Riepilogo dell'utilizzo dei pool" + +#: reports/stats/pools_usage_summary.py:137 +msgid "Total Time (seconds)" +msgstr "Tempo totale (secondi)" + +#: reports/stats/pools_usage_summary.py:137 +#| msgid "Accesses" +msgid "Total Accesses" +msgstr "Totale accessi" + +#: reports/stats/pools_usage_summary.py:142 +#: templates/uds/reports/stats/pools-usage-summary.html:30 +msgid "Total" +msgstr "Totale" + #: reports/stats/usage_by_pool.py:53 msgid "Pools usage by users" msgstr "Utilizzo dei pool da parte degli utenti" @@ -2741,16 +2787,17 @@ msgstr "Utilizzo dei pool per rapporto utente" msgid "ALL POOLS" msgstr "TUTTE LE PISCINE" -#: reports/stats/usage_by_pool.py:138 +#: reports/stats/usage_by_pool.py:136 #: templates/uds/reports/stats/usage-by-pool.html:4 +#: templates/uds/reports/stats/usage-by-pool.html:6 msgid "Users usage list" msgstr "Elenco di utilizzo degli utenti" -#: reports/stats/usage_by_pool.py:139 +#: reports/stats/usage_by_pool.py:137 msgid "UDS Report of users usage" msgstr "Rapporto UDS sull'utilizzo degli utenti" -#: reports/stats/usage_by_pool.py:160 +#: reports/stats/usage_by_pool.py:158 #: templates/uds/reports/stats/usage-by-pool.html:16 msgid "Seconds" msgstr "secondi" @@ -3088,7 +3135,7 @@ msgstr "Test di connessione riuscito" #: services/HyperV_enterprise/legacy/provider.py:268 #: services/Nutanix_enterprise/provider.py:214 services/OVirt/provider.py:457 -#: services/Proxmox/provider.py:202 services/Vmware_enterprise/provider.py:178 +#: services/Proxmox/provider.py:205 services/Vmware_enterprise/provider.py:178 msgid "Connection failed. Check connection params" msgstr "Connessione fallita. Controlla i parametri di connessione" @@ -3100,12 +3147,10 @@ msgid "UDS pub for {0} at {1}" msgstr "Pub UDS per {0} a {1}" #: services/HyperV_enterprise/legacy/service.py:57 -#: services/HyperV_enterprise/service.py:57 msgid "HyperV Linked Clone (Experimental)" msgstr "Clone HyperV collegato (sperimentale)" #: services/HyperV_enterprise/legacy/service.py:59 -#: services/HyperV_enterprise/service.py:59 msgid "Hyper Services based on templates and differential disks (experimental)" msgstr "Servizi Hyper basati su modelli e dischi differenziali (sperimentali)" @@ -3286,6 +3331,17 @@ msgstr "" "Per i cluster, il nome utente deve essere un nome utente di dominio (utente " "@ dominio o DOMINIO \\ utente" +#: services/HyperV_enterprise/service.py:57 +#| msgid "Xen Linked Clone" +msgid "HyperV Linked Clone" +msgstr "Clone collegato HyperV" + +#: services/HyperV_enterprise/service.py:59 +#| msgid "" +#| "Hyper Services based on templates and differential disks (experimental)" +msgid "Hyper Services based on templates and differential disks" +msgstr "Hyper Services basati su modelli e dischi differenziali" + #: services/Nutanix_enterprise/provider.py:30 msgid "Nutanix Acropolis Platform Provider" msgstr "Provider di piattaforme Acropolis Nutanix" @@ -3779,12 +3835,12 @@ msgstr "Fornitore di macchine IP statiche" msgid "Provides connection to machines by IP" msgstr "Fornisce la connessione alle macchine tramite IP" -#: services/PhysicalMachines/service_multi.py:59 +#: services/PhysicalMachines/service_multi.py:60 #: services/Vmware_enterprise/service_fixed.py:54 msgid "Service Token" msgstr "Token di servizio" -#: services/PhysicalMachines/service_multi.py:61 +#: services/PhysicalMachines/service_multi.py:62 #: services/Vmware_enterprise/service_fixed.py:56 msgid "" "Service token that will be used by actors to communicate with service. Leave " @@ -3793,20 +3849,32 @@ msgstr "" "Token di servizio che verrà utilizzato dagli attori per comunicare con il " "servizio. Lascia vuoto per assegnazione persistente." -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 #: services/RDS_enterprise/provider.py:47 msgid "List of servers" msgstr "Elenco di server" -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 msgid "List of servers available for this service" msgstr "Elenco dei server disponibili per questo servizio" -#: services/PhysicalMachines/service_multi.py:71 +#: services/PhysicalMachines/service_multi.py:70 +#| msgid "Check Cert." +msgid "Check Port" +msgstr "Controlla la porta" + +#: services/PhysicalMachines/service_multi.py:70 +msgid "" +"If non zero, only Machines responding to connection on that port will be used" +msgstr "" +"Se diverso da zero, verranno utilizzate solo le macchine che rispondono alla " +"connessione su quella porta" + +#: services/PhysicalMachines/service_multi.py:73 msgid "Static Multiple IP" msgstr "IP statico multiplo" -#: services/PhysicalMachines/service_multi.py:73 +#: services/PhysicalMachines/service_multi.py:75 msgid "This service provides access to POWERED-ON Machines by IP" msgstr "" "Questo servizio fornisce l'accesso ai computer POWERED-ON tramite IP" @@ -4762,9 +4830,31 @@ msgstr "Data:" msgid "Services assignation" msgstr "Assegnazione dei servizi" -#: templates/uds/reports/stats/usage-by-pool.html:6 -msgid "Users usage list for" -msgstr "Elenco di utilizzo degli utenti per" +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +#| msgid "Pools usage on a day" +msgid "Pools usage summary" +msgstr "Riepilogo dell'utilizzo dei pool" + +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "from" +msgstr "a partire dal" + +#: templates/uds/reports/stats/pools-usage-summary.html:15 +#| msgid "Max.Idle time" +msgid "Total time" +msgstr "Tempo totale" + +#: templates/uds/reports/stats/pools-usage-summary.html:16 +#| msgid "Last access" +msgid "Total accesses" +msgstr "Totale accessi" + +#: templates/uds/reports/stats/pools-usage-summary.html:17 +#| msgid "Current users" +msgid "Unique users" +msgstr "Utenti unici" #: templates/uds/reports/stats/usage-by-pool.html:14 msgid "Access date/time" @@ -5829,7 +5919,7 @@ msgstr "" "Il ricaricamento di questa pagina non è supportato. Si prega di riaprire il " "servizio dall'origine." -#: web/util/services.py:190 +#: web/util/services.py:196 msgid "" "This service is about to be replaced by a new version. Please, close the " "session before {} and save all your work to avoid loosing it." diff --git a/server/src/uds/locale/it/LC_MESSAGES/djangojs.po b/server/src/uds/locale/it/LC_MESSAGES/djangojs.po index 15187cbe1..24a769b6a 100644 --- a/server/src/uds/locale/it/LC_MESSAGES/djangojs.po +++ b/server/src/uds/locale/it/LC_MESSAGES/djangojs.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:02+0200\n" -"PO-Revision-Date: 2020-05-07 09:52+0000\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" +"PO-Revision-Date: 2020-05-11 12:06+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: Italian (http://www.transifex.com/openuds/openuds/language/" "it/)\n" @@ -1576,12 +1576,10 @@ msgstr "Di" #: static/modern/translations-fakejs.js:35 #: static/modern/translations-fakejs.js:36 -#| msgid "UDS Client" msgid "Client IP" msgstr "IP client" #: static/modern/translations-fakejs.js:37 -#| msgid "Delete Proxy" msgid "Detected proxy ip" msgstr "IP proxy rilevato" diff --git a/server/src/uds/locale/pt/LC_MESSAGES/django.po b/server/src/uds/locale/pt/LC_MESSAGES/django.po index 5212658a3..4c24151ba 100644 --- a/server/src/uds/locale/pt/LC_MESSAGES/django.po +++ b/server/src/uds/locale/pt/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:01+0200\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" "PO-Revision-Date: 2020-05-07 09:52+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: Portuguese (http://www.transifex.com/openuds/openuds/language/" @@ -28,7 +28,7 @@ msgstr "Contas" #: REST/methods/meta_pools.py:70 REST/methods/networks.py:60 #: REST/methods/osmanagers.py:55 REST/methods/providers.py:70 #: REST/methods/proxies.py:59 REST/methods/reports.py:57 -#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:96 +#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:99 #: REST/methods/transports.py:57 REST/methods/user_services.py:255 #: REST/methods/user_services.py:295 REST/methods/users_groups.py:117 #: REST/model.py:139 @@ -54,7 +54,7 @@ msgstr "Marca de tempo" #: REST/methods/calendars.py:63 REST/methods/meta_pools.py:77 #: REST/methods/networks.py:63 REST/methods/osmanagers.py:59 #: REST/methods/providers.py:76 REST/methods/proxies.py:63 -#: REST/methods/services.py:226 REST/methods/services_pools.py:105 +#: REST/methods/services.py:226 REST/methods/services_pools.py:108 #: REST/methods/transports.py:61 msgid "tags" msgstr "Tag" @@ -120,7 +120,7 @@ msgstr "Tokens de ator" #: REST/methods/actor_token.py:54 reports/stats/pools_performance.py:198 #: reports/stats/pools_performance.py:213 reports/stats/pools_usage_day.py:65 -#: reports/stats/usage_by_pool.py:160 reports/stats/user_access.py:174 +#: reports/stats/usage_by_pool.py:158 reports/stats/user_access.py:174 msgid "Date" msgstr "Encontro" @@ -174,13 +174,13 @@ msgstr "Tipo" #: REST/methods/authenticators.py:68 REST/methods/meta_service_pools.py:85 #: REST/methods/op_calendars.py:80 REST/methods/services_pool_groups.py:61 #: REST/methods/transports.py:56 REST/methods/user_services.py:294 -#: REST/model.py:166 models/meta_pool.py:72 +#: REST/model.py:166 models/meta_pool.py:73 msgid "Priority" msgstr "Prioridade" #: REST/methods/authenticators.py:69 REST/methods/authenticators.py:101 #: REST/methods/meta_pools.py:75 REST/methods/meta_pools.py:150 -#: REST/methods/services_pools.py:101 REST/methods/services_pools.py:253 +#: REST/methods/services_pools.py:104 REST/methods/services_pools.py:277 msgid "Visible" msgstr "Visível" @@ -196,15 +196,15 @@ msgstr "Rótulo" msgid "Users" msgstr "Comercial" -#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:254 +#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:278 msgid "If active, transport will be visible for users" msgstr "Se estiver ativo, o transporte ficará visível para os usuários" #: REST/methods/authenticators.py:105 REST/methods/meta_pools.py:138 #: REST/methods/meta_pools.py:146 REST/methods/meta_pools.py:154 -#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:257 -#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 -#: REST/methods/services_pools.py:281 core/ui/user_interface.py:99 +#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:281 +#: REST/methods/services_pools.py:289 REST/methods/services_pools.py:297 +#: REST/methods/services_pools.py:305 core/ui/user_interface.py:99 #: services/OVirt/service.py:186 msgid "Display" msgstr "Exibição" @@ -229,7 +229,7 @@ msgstr "Repete" msgid "Every" msgstr "Cada" -#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:160 +#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:158 msgid "Duration" msgstr "Duração" @@ -284,11 +284,11 @@ msgid "Policy" msgstr "Política" #: REST/methods/meta_pools.py:73 REST/methods/services.py:225 -#: REST/methods/services_pools.py:98 +#: REST/methods/services_pools.py:101 msgid "User services" msgstr "Serviços do usuário" -#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:99 +#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:102 msgid "In Preparation" msgstr "Em preparação" @@ -297,8 +297,8 @@ msgid "Pool Group" msgstr "Grupo de Pool" #: REST/methods/meta_pools.py:86 REST/methods/meta_pools.py:141 -#: REST/methods/services_pools.py:123 REST/methods/services_pools.py:175 -#: REST/methods/services_pools.py:268 +#: REST/methods/services_pools.py:141 REST/methods/services_pools.py:198 +#: REST/methods/services_pools.py:292 msgid "Default" msgstr "Padrão" @@ -307,21 +307,21 @@ msgid "Service pool policy" msgstr "Política de pool de serviços" #: REST/methods/meta_pools.py:134 REST/methods/services_pool_groups.py:85 -#: REST/methods/services_pools.py:261 +#: REST/methods/services_pools.py:285 msgid "Associated Image" msgstr "Imagem associada" #: REST/methods/meta_pools.py:135 REST/methods/services_pool_groups.py:86 -#: REST/methods/services_pools.py:262 +#: REST/methods/services_pools.py:286 msgid "Image assocciated with this service" msgstr "Imagem associada a este serviço" -#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:103 -#: REST/methods/services_pools.py:269 +#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:106 +#: REST/methods/services_pools.py:293 msgid "Pool group" msgstr "Grupo de pool" -#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:270 +#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:294 msgid "Pool group for this pool (for pool classify on display)" msgstr "Grupo de pool para este pool (para pool classificar em exibição)" @@ -329,11 +329,11 @@ msgstr "Grupo de pool para este pool (para pool classificar em exibição)" msgid "If active, metapool will be visible for users" msgstr "Se ativo, metapool será visível para os usuários" -#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:277 +#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:301 msgid "Calendar access denied text" msgstr "Texto de acesso negado ao calendário" -#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:278 +#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:302 msgid "" "Custom message to be shown to users if access is limited by calendar rules." msgstr "" @@ -362,12 +362,13 @@ msgid "Creation date" msgstr "Data de criação" #: REST/methods/meta_service_pools.py:172 REST/methods/services_usage.py:119 -#: reports/stats/pool_usage_summary.py:59 +#: reports/stats/pool_users_summary.py:59 #: reports/stats/pools_performance.py:258 reports/stats/pools_usage_day.py:166 -#: reports/stats/usage_by_pool.py:60 reports/stats/usage_by_pool.py:160 -#: services/Proxmox/service.py:110 +#: reports/stats/pools_usage_summary.py:137 reports/stats/usage_by_pool.py:60 +#: reports/stats/usage_by_pool.py:158 services/Proxmox/service.py:110 #: templates/uds/reports/stats/pools-performance.html:33 #: templates/uds/reports/stats/pools-usage-day.html:27 +#: templates/uds/reports/stats/pools-usage-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:17 msgid "Pool" msgstr "Piscina" @@ -506,7 +507,7 @@ msgstr "" msgid "Service providers" msgstr "Provedores de serviço" -#: REST/methods/providers.py:73 REST/methods/services_pools.py:97 +#: REST/methods/providers.py:73 REST/methods/services_pools.py:100 msgid "Status" msgstr "Status" @@ -653,9 +654,9 @@ msgstr "Procuração" msgid "Proxy for services behind a firewall" msgstr "Proxy para serviços atrás de um firewall" -#: REST/methods/services.py:270 REST/methods/services_pools.py:233 -#: REST/methods/services_pools.py:241 REST/methods/services_pools.py:249 -#: REST/methods/services_pools.py:324 REST/methods/services_pools.py:332 +#: REST/methods/services.py:270 REST/methods/services_pools.py:257 +#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 +#: REST/methods/services_pools.py:348 REST/methods/services_pools.py:356 #: auths/RegexLdap/authenticator.py:78 core/ui/user_interface.py:95 #: osmanagers/WindowsOsManager/windows_domain.py:71 #: osmanagers/WindowsOsManager/windows_domain.py:72 @@ -679,47 +680,47 @@ msgstr "Está bem" msgid "Services Pool Groups" msgstr "Grupos de Piscina" -#: REST/methods/services_pools.py:94 REST/methods/transports.py:104 +#: REST/methods/services_pools.py:97 REST/methods/transports.py:104 msgid "Service Pools" msgstr "Piscinas de Serviço" -#: REST/methods/services_pools.py:100 +#: REST/methods/services_pools.py:103 msgid "Usage" msgstr "Uso" -#: REST/methods/services_pools.py:102 +#: REST/methods/services_pools.py:105 msgid "Shows transports" msgstr "Mostra transportes" -#: REST/methods/services_pools.py:104 +#: REST/methods/services_pools.py:107 msgid "Parent service" msgstr "Serviço pai" -#: REST/methods/services_pools.py:206 +#: REST/methods/services_pools.py:230 msgid "Create at least a service before creating a new service pool" msgstr "Crie pelo menos um serviço antes de criar um novo pool de serviços" -#: REST/methods/services_pools.py:213 +#: REST/methods/services_pools.py:237 msgid "Base service" msgstr "Serviço base" -#: REST/methods/services_pools.py:214 +#: REST/methods/services_pools.py:238 msgid "Service used as base of this service pool" msgstr "Serviço usado como base desse pool de serviços" -#: REST/methods/services_pools.py:221 +#: REST/methods/services_pools.py:245 msgid "OS Manager" msgstr "Gerenciador de SO" -#: REST/methods/services_pools.py:222 +#: REST/methods/services_pools.py:246 msgid "OS Manager used as base of this service pool" msgstr "OS Manager usado como base desse pool de serviços" -#: REST/methods/services_pools.py:229 +#: REST/methods/services_pools.py:253 msgid "Allow removal by users" msgstr "Permitir remoção por usuários" -#: REST/methods/services_pools.py:230 +#: REST/methods/services_pools.py:254 msgid "" "If active, the user will be allowed to remove the service \"manually\". Be " "careful with this, because the user will have the \"power\" to delete it's " @@ -728,19 +729,19 @@ msgstr "" "Se ativo, o usuário poderá remover o serviço \"manualmente\". Tenha cuidado " "com isso, porque o usuário terá o \"poder\" para excluir seu próprio serviço" -#: REST/methods/services_pools.py:237 +#: REST/methods/services_pools.py:261 msgid "Allow reset by users" msgstr "Permitir redefinir pelos usuários" -#: REST/methods/services_pools.py:238 +#: REST/methods/services_pools.py:262 msgid "If active, the user will be allowed to reset the service" msgstr "Se ativo, o usuário poderá redefinir o serviço" -#: REST/methods/services_pools.py:245 +#: REST/methods/services_pools.py:269 msgid "Ignores unused" msgstr "Ignora não utilizado" -#: REST/methods/services_pools.py:246 +#: REST/methods/services_pools.py:270 msgid "" "If the option is enabled, UDS will not attempt to detect and remove the user " "services assigned but not in use." @@ -748,41 +749,41 @@ msgstr "" "Se a opção estiver ativada, o UDS não tentará detectar e remover os serviços " "do usuário atribuídos, mas não em uso." -#: REST/methods/services_pools.py:286 +#: REST/methods/services_pools.py:310 msgid "Initial available services" msgstr "Serviços iniciais disponíveis" -#: REST/methods/services_pools.py:287 +#: REST/methods/services_pools.py:311 msgid "Services created initially for this service pool" msgstr "Serviços criados inicialmente para este conjunto de serviços" -#: REST/methods/services_pools.py:290 REST/methods/services_pools.py:299 -#: REST/methods/services_pools.py:308 REST/methods/services_pools.py:317 +#: REST/methods/services_pools.py:314 REST/methods/services_pools.py:323 +#: REST/methods/services_pools.py:332 REST/methods/services_pools.py:341 msgid "Availability" msgstr "Disponibilidade" -#: REST/methods/services_pools.py:295 +#: REST/methods/services_pools.py:319 msgid "Services to keep in cache" msgstr "Serviços para manter em cache" -#: REST/methods/services_pools.py:296 +#: REST/methods/services_pools.py:320 msgid "Services kept in cache for improved user service assignation" msgstr "" "Serviços mantidos em cache para melhor designação de serviço do usuário" -#: REST/methods/services_pools.py:304 +#: REST/methods/services_pools.py:328 msgid "Services to keep in L2 cache" msgstr "Serviços para manter no cache L2" -#: REST/methods/services_pools.py:305 +#: REST/methods/services_pools.py:329 msgid "Services kept in cache of level2 for improved service generation" msgstr "Serviços mantidos no cache de level2 para melhor geração de serviços" -#: REST/methods/services_pools.py:313 +#: REST/methods/services_pools.py:337 msgid "Maximum number of services to provide" msgstr "Número máximo de serviços a fornecer" -#: REST/methods/services_pools.py:314 +#: REST/methods/services_pools.py:338 msgid "" "Maximum number of service (assigned and L1 cache) that can be created for " "this service" @@ -790,27 +791,27 @@ msgstr "" "Número máximo de serviço (atribuído e cache L1) que pode ser criado para " "este serviço" -#: REST/methods/services_pools.py:321 +#: REST/methods/services_pools.py:345 msgid "Show transports" msgstr "Mostrar transportes" -#: REST/methods/services_pools.py:322 +#: REST/methods/services_pools.py:346 msgid "If active, alternative transports for user will be shown" msgstr "Se ativo, os transportes alternativos para o usuário serão mostrados" -#: REST/methods/services_pools.py:329 +#: REST/methods/services_pools.py:353 msgid "Accounting" msgstr "Contabilidade" -#: REST/methods/services_pools.py:330 +#: REST/methods/services_pools.py:354 msgid "Account associated to this service pool" msgstr "Conta associada a este conjunto de serviços" -#: REST/methods/services_pools.py:346 +#: REST/methods/services_pools.py:370 msgid "Base service does not exist anymore" msgstr "O serviço base não existe mais" -#: REST/methods/services_pools.py:380 +#: REST/methods/services_pools.py:404 msgid "This service requires an OS Manager" msgstr "Este serviço requer um gerenciador de sistema operacional" @@ -939,8 +940,8 @@ msgstr "Membro da equipe" #: auths/AzureAD_enterprise/azure_ad.py:92 #: auths/EDirectory_enterprise/authenticator.py:47 #: auths/RegexLdap/authenticator.py:67 auths/SAML_enterprise/saml.py:117 -#: reports/stats/pool_usage_summary.py:166 reports/stats/usage_by_pool.py:160 -#: templates/uds/reports/stats/pool-usage-summary.html:14 +#: reports/stats/pool_users_summary.py:166 reports/stats/usage_by_pool.py:158 +#: templates/uds/reports/stats/pool-users-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:15 msgid "User" msgstr "Do utilizador" @@ -1779,27 +1780,27 @@ msgstr "Não é possível remover um elemento não ativo" msgid "Can't remove nor cancel {} cause its state don't allow it" msgstr "Não é possível remover nem cancelar {} porque seu estado não permite" -#: core/managers/user_service.py:318 +#: core/managers/user_service.py:317 msgid "The requested service is restrained" msgstr "O serviço solicitado é restrito" -#: core/managers/user_service.py:556 +#: core/managers/user_service.py:555 msgid "The requested service is not available" msgstr "O serviço solicitado não está disponível" -#: core/managers/user_service.py:586 +#: core/managers/user_service.py:585 msgid "The requested transport {} is not valid for {}" msgstr "O transporte solicitado {} não é válido para {}" -#: core/managers/user_service.py:710 +#: core/managers/user_service.py:709 msgid "The service is not accessible from this device" msgstr "O serviço não está acessível a partir deste dispositivo" -#: core/module.py:208 +#: core/module.py:207 msgid "No connection checking method is implemented." msgstr "Nenhum método de verificação de conexão é implementado." -#: core/module.py:277 +#: core/module.py:276 msgid "No check method provided." msgstr "Nenhum método de verificação fornecido." @@ -2177,8 +2178,8 @@ msgstr "Dias úteis" msgid "Minutes" msgstr "Minutos" -#: models/calendar_rule.py:76 reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:16 +#: models/calendar_rule.py:76 reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:16 msgid "Hours" msgstr "Horas" @@ -2190,11 +2191,11 @@ msgstr "Dias" msgid "Weeks" msgstr "Semanas" -#: models/meta_pool.py:71 +#: models/meta_pool.py:72 msgid "Evenly distributed" msgstr "Distribuído uniformemente" -#: models/meta_pool.py:73 +#: models/meta_pool.py:74 msgid "Greater % available" msgstr "Maior% disponível" @@ -2567,7 +2568,7 @@ msgstr "Listar usuários da plataforma" msgid "Users List for {}" msgstr "Lista de usuários para {}" -#: reports/lists/users.py:86 reports/stats/pool_usage_summary.py:145 +#: reports/lists/users.py:86 reports/stats/pool_users_summary.py:145 msgid "UDS Report of users in {}" msgstr "Relatório de usuários do UDS em {}" @@ -2583,49 +2584,51 @@ msgstr "Nome real" msgid "Statistics" msgstr "Estatisticas" -#: reports/stats/pool_usage_summary.py:52 -msgid "Summary of pools usage" -msgstr "Resumo do uso de pools" +#: reports/stats/pool_users_summary.py:52 +#| msgid "Pools usage by users" +msgid "Pool Usage by users" +msgstr "Uso do pool pelos usuários" -#: reports/stats/pool_usage_summary.py:53 -msgid "Generates a report with the summary of a pool usage" -msgstr "Gera um relatório com o resumo de um uso do pool" +#: reports/stats/pool_users_summary.py:53 +#| msgid "Generates a report with the summary of a pool usage" +msgid "Generates a report with the summary of users usage for a pool" +msgstr "Gera um relatório com o resumo do uso dos usuários para um pool" -#: reports/stats/pool_usage_summary.py:60 reports/stats/usage_by_pool.py:61 +#: reports/stats/pool_users_summary.py:60 reports/stats/usage_by_pool.py:61 msgid "Pool for report" msgstr "Piscina para relatório" -#: reports/stats/pool_usage_summary.py:66 reports/stats/pools_performance.py:74 +#: reports/stats/pool_users_summary.py:66 reports/stats/pools_performance.py:74 #: reports/stats/usage_by_pool.py:67 reports/stats/user_access.py:66 msgid "Starting date" msgstr "Data de início" -#: reports/stats/pool_usage_summary.py:67 reports/stats/pools_performance.py:75 +#: reports/stats/pool_users_summary.py:67 reports/stats/pools_performance.py:75 #: reports/stats/usage_by_pool.py:68 reports/stats/user_access.py:67 msgid "starting date for report" msgstr "data de início do relatório" -#: reports/stats/pool_usage_summary.py:74 reports/stats/pools_performance.py:82 +#: reports/stats/pool_users_summary.py:74 reports/stats/pools_performance.py:82 #: reports/stats/usage_by_pool.py:75 reports/stats/user_access.py:74 msgid "Finish date" msgstr "Data de término" -#: reports/stats/pool_usage_summary.py:75 reports/stats/pools_performance.py:83 +#: reports/stats/pool_users_summary.py:75 reports/stats/pools_performance.py:83 #: reports/stats/usage_by_pool.py:76 reports/stats/user_access.py:75 msgid "finish date for report" msgstr "data de conclusão do relatório" -#: reports/stats/pool_usage_summary.py:144 +#: reports/stats/pool_users_summary.py:144 msgid "Users usage list for {}" msgstr "Lista de uso de usuários para {}" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:15 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:15 msgid "Sessions" msgstr "Sessões" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:17 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:17 msgid "Average" msgstr "Média" @@ -2712,6 +2715,47 @@ msgstr "Relatório de uso de serviços por um dia" msgid "Service usage report" msgstr "Relatório de uso de serviço" +#: reports/stats/pools_usage_summary.py:47 +msgid "Summary of pools usage" +msgstr "Resumo do uso de pools" + +#: reports/stats/pools_usage_summary.py:48 +msgid "" +"Summary of Pools usage with time totals, accesses totals, time total by pool" +msgstr "" +"Resumo do uso de Conjuntos com totais de tempo, totais de acessos e tempo " +"total por conjunto" + +#: reports/stats/pools_usage_summary.py:116 +#| msgid "Summary of pools usage" +msgid "Summary of Pools usage" +msgstr "Resumo do uso de Pools" + +#: reports/stats/pools_usage_summary.py:116 +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "to" +msgstr "para" + +#: reports/stats/pools_usage_summary.py:117 +#| msgid "Summary of pools usage" +msgid "UDS Report Summary of pools usage" +msgstr "Resumo do relatório UDS do uso de conjuntos" + +#: reports/stats/pools_usage_summary.py:137 +msgid "Total Time (seconds)" +msgstr "Tempo total (segundos)" + +#: reports/stats/pools_usage_summary.py:137 +#| msgid "Accesses" +msgid "Total Accesses" +msgstr "Total de Acessos" + +#: reports/stats/pools_usage_summary.py:142 +#: templates/uds/reports/stats/pools-usage-summary.html:30 +msgid "Total" +msgstr "Total" + #: reports/stats/usage_by_pool.py:53 msgid "Pools usage by users" msgstr "Uso de pools por usuários" @@ -2724,16 +2768,17 @@ msgstr "Uso de pools pelo relatório do usuário" msgid "ALL POOLS" msgstr "TODAS AS PISCINAS" -#: reports/stats/usage_by_pool.py:138 +#: reports/stats/usage_by_pool.py:136 #: templates/uds/reports/stats/usage-by-pool.html:4 +#: templates/uds/reports/stats/usage-by-pool.html:6 msgid "Users usage list" msgstr "Lista de usuários" -#: reports/stats/usage_by_pool.py:139 +#: reports/stats/usage_by_pool.py:137 msgid "UDS Report of users usage" msgstr "Relatório UDS de uso dos usuários" -#: reports/stats/usage_by_pool.py:160 +#: reports/stats/usage_by_pool.py:158 #: templates/uds/reports/stats/usage-by-pool.html:16 msgid "Seconds" msgstr "Segundos" @@ -3069,7 +3114,7 @@ msgstr "Teste de conexão bem sucedido" #: services/HyperV_enterprise/legacy/provider.py:268 #: services/Nutanix_enterprise/provider.py:214 services/OVirt/provider.py:457 -#: services/Proxmox/provider.py:202 services/Vmware_enterprise/provider.py:178 +#: services/Proxmox/provider.py:205 services/Vmware_enterprise/provider.py:178 msgid "Connection failed. Check connection params" msgstr "Conexão falhou. Verifique os parâmetros de conexão" @@ -3081,12 +3126,10 @@ msgid "UDS pub for {0} at {1}" msgstr "Publicação de UDS para {0} em {1}" #: services/HyperV_enterprise/legacy/service.py:57 -#: services/HyperV_enterprise/service.py:57 msgid "HyperV Linked Clone (Experimental)" msgstr "Clone de HyperV Linked (Experimental)" #: services/HyperV_enterprise/legacy/service.py:59 -#: services/HyperV_enterprise/service.py:59 msgid "Hyper Services based on templates and differential disks (experimental)" msgstr "" "Serviços Hyper baseados em modelos e discos diferenciais (experimental)" @@ -3269,6 +3312,17 @@ msgstr "" "Para clusters, o nome de usuário deve ser um nome de usuário de domínio " "(usuário @ domínio ou DOMAIN \\ user" +#: services/HyperV_enterprise/service.py:57 +#| msgid "Xen Linked Clone" +msgid "HyperV Linked Clone" +msgstr "Clone vinculado ao HyperV" + +#: services/HyperV_enterprise/service.py:59 +#| msgid "" +#| "Hyper Services based on templates and differential disks (experimental)" +msgid "Hyper Services based on templates and differential disks" +msgstr "Serviços Hiper baseados em modelos e discos diferenciais" + #: services/Nutanix_enterprise/provider.py:30 msgid "Nutanix Acropolis Platform Provider" msgstr "Fornecedor de plataformas Nutanix Acropolis" @@ -3759,12 +3813,12 @@ msgstr "Fornecedor de máquinas IP estáticas" msgid "Provides connection to machines by IP" msgstr "Fornece conexão com máquinas por IP" -#: services/PhysicalMachines/service_multi.py:59 +#: services/PhysicalMachines/service_multi.py:60 #: services/Vmware_enterprise/service_fixed.py:54 msgid "Service Token" msgstr "Token de Serviço" -#: services/PhysicalMachines/service_multi.py:61 +#: services/PhysicalMachines/service_multi.py:62 #: services/Vmware_enterprise/service_fixed.py:56 msgid "" "Service token that will be used by actors to communicate with service. Leave " @@ -3773,20 +3827,32 @@ msgstr "" "Token de serviço que será usado pelos atores para se comunicar com o " "serviço. Deixe em branco para atribuição persistente." -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 #: services/RDS_enterprise/provider.py:47 msgid "List of servers" msgstr "Lista de servidores" -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 msgid "List of servers available for this service" msgstr "Lista de servidores disponíveis para este serviço" -#: services/PhysicalMachines/service_multi.py:71 +#: services/PhysicalMachines/service_multi.py:70 +#| msgid "Check Cert." +msgid "Check Port" +msgstr "Verificar porta" + +#: services/PhysicalMachines/service_multi.py:70 +msgid "" +"If non zero, only Machines responding to connection on that port will be used" +msgstr "" +"Se diferente de zero, somente as máquinas que responderem à conexão nessa " +"porta serão usadas" + +#: services/PhysicalMachines/service_multi.py:73 msgid "Static Multiple IP" msgstr "IP múltiplo estático" -#: services/PhysicalMachines/service_multi.py:73 +#: services/PhysicalMachines/service_multi.py:75 msgid "This service provides access to POWERED-ON Machines by IP" msgstr "Este serviço fornece acesso a máquinas POWERED-ON por IP" @@ -4744,9 +4810,31 @@ msgstr "Encontro:" msgid "Services assignation" msgstr "Atribuição de serviços" -#: templates/uds/reports/stats/usage-by-pool.html:6 -msgid "Users usage list for" -msgstr "Lista de uso de usuários para" +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +#| msgid "Pools usage on a day" +msgid "Pools usage summary" +msgstr "Resumo de uso de conjuntos" + +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "from" +msgstr "de" + +#: templates/uds/reports/stats/pools-usage-summary.html:15 +#| msgid "Max.Idle time" +msgid "Total time" +msgstr "Tempo total" + +#: templates/uds/reports/stats/pools-usage-summary.html:16 +#| msgid "Last access" +msgid "Total accesses" +msgstr "Total de acessos" + +#: templates/uds/reports/stats/pools-usage-summary.html:17 +#| msgid "Current users" +msgid "Unique users" +msgstr "Utilizadores únicos" #: templates/uds/reports/stats/usage-by-pool.html:14 msgid "Access date/time" @@ -5797,7 +5885,7 @@ msgstr "" "Recarregar esta página não é suportado. Por favor, reabra o serviço de " "origem." -#: web/util/services.py:190 +#: web/util/services.py:196 msgid "" "This service is about to be replaced by a new version. Please, close the " "session before {} and save all your work to avoid loosing it." diff --git a/server/src/uds/locale/pt/LC_MESSAGES/djangojs.po b/server/src/uds/locale/pt/LC_MESSAGES/djangojs.po index e83c33937..0d40d2389 100644 --- a/server/src/uds/locale/pt/LC_MESSAGES/djangojs.po +++ b/server/src/uds/locale/pt/LC_MESSAGES/djangojs.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:02+0200\n" -"PO-Revision-Date: 2020-05-07 09:52+0000\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" +"PO-Revision-Date: 2020-05-11 12:06+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: Portuguese (http://www.transifex.com/openuds/openuds/language/" "pt/)\n" @@ -1570,12 +1570,10 @@ msgstr "Sobre" #: static/modern/translations-fakejs.js:35 #: static/modern/translations-fakejs.js:36 -#| msgid "UDS Client" msgid "Client IP" msgstr "IP do cliente" #: static/modern/translations-fakejs.js:37 -#| msgid "Delete Proxy" msgid "Detected proxy ip" msgstr "IP do proxy detectado" diff --git a/server/src/uds/locale/ru/LC_MESSAGES/django.po b/server/src/uds/locale/ru/LC_MESSAGES/django.po index dcef86802..f062d8865 100644 --- a/server/src/uds/locale/ru/LC_MESSAGES/django.po +++ b/server/src/uds/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:01+0200\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" "PO-Revision-Date: 2020-05-07 09:52+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: Russian (http://www.transifex.com/openuds/openuds/language/" @@ -30,7 +30,7 @@ msgstr "Счета" #: REST/methods/meta_pools.py:70 REST/methods/networks.py:60 #: REST/methods/osmanagers.py:55 REST/methods/providers.py:70 #: REST/methods/proxies.py:59 REST/methods/reports.py:57 -#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:96 +#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:99 #: REST/methods/transports.py:57 REST/methods/user_services.py:255 #: REST/methods/user_services.py:295 REST/methods/users_groups.py:117 #: REST/model.py:139 @@ -56,7 +56,7 @@ msgstr "Отметка времени" #: REST/methods/calendars.py:63 REST/methods/meta_pools.py:77 #: REST/methods/networks.py:63 REST/methods/osmanagers.py:59 #: REST/methods/providers.py:76 REST/methods/proxies.py:63 -#: REST/methods/services.py:226 REST/methods/services_pools.py:105 +#: REST/methods/services.py:226 REST/methods/services_pools.py:108 #: REST/methods/transports.py:61 msgid "tags" msgstr "Тэг" @@ -122,7 +122,7 @@ msgstr "Актерские жетоны" #: REST/methods/actor_token.py:54 reports/stats/pools_performance.py:198 #: reports/stats/pools_performance.py:213 reports/stats/pools_usage_day.py:65 -#: reports/stats/usage_by_pool.py:160 reports/stats/user_access.py:174 +#: reports/stats/usage_by_pool.py:158 reports/stats/user_access.py:174 msgid "Date" msgstr "Дата" @@ -176,13 +176,13 @@ msgstr "Тип" #: REST/methods/authenticators.py:68 REST/methods/meta_service_pools.py:85 #: REST/methods/op_calendars.py:80 REST/methods/services_pool_groups.py:61 #: REST/methods/transports.py:56 REST/methods/user_services.py:294 -#: REST/model.py:166 models/meta_pool.py:72 +#: REST/model.py:166 models/meta_pool.py:73 msgid "Priority" msgstr "Приоритет" #: REST/methods/authenticators.py:69 REST/methods/authenticators.py:101 #: REST/methods/meta_pools.py:75 REST/methods/meta_pools.py:150 -#: REST/methods/services_pools.py:101 REST/methods/services_pools.py:253 +#: REST/methods/services_pools.py:104 REST/methods/services_pools.py:277 msgid "Visible" msgstr "видимый" @@ -198,15 +198,15 @@ msgstr "Метка" msgid "Users" msgstr "Пользователь" -#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:254 +#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:278 msgid "If active, transport will be visible for users" msgstr "Если активен, транспорт будет виден пользователям" #: REST/methods/authenticators.py:105 REST/methods/meta_pools.py:138 #: REST/methods/meta_pools.py:146 REST/methods/meta_pools.py:154 -#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:257 -#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 -#: REST/methods/services_pools.py:281 core/ui/user_interface.py:99 +#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:281 +#: REST/methods/services_pools.py:289 REST/methods/services_pools.py:297 +#: REST/methods/services_pools.py:305 core/ui/user_interface.py:99 #: services/OVirt/service.py:186 msgid "Display" msgstr "Экран/Дисплей" @@ -231,7 +231,7 @@ msgstr "Повтор" msgid "Every" msgstr "Каждый" -#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:160 +#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:158 msgid "Duration" msgstr "Длительность" @@ -286,11 +286,11 @@ msgid "Policy" msgstr "политика" #: REST/methods/meta_pools.py:73 REST/methods/services.py:225 -#: REST/methods/services_pools.py:98 +#: REST/methods/services_pools.py:101 msgid "User services" msgstr "Сервисы пользователя" -#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:99 +#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:102 msgid "In Preparation" msgstr "Подготавливается" @@ -299,8 +299,8 @@ msgid "Pool Group" msgstr "Группы пулов" #: REST/methods/meta_pools.py:86 REST/methods/meta_pools.py:141 -#: REST/methods/services_pools.py:123 REST/methods/services_pools.py:175 -#: REST/methods/services_pools.py:268 +#: REST/methods/services_pools.py:141 REST/methods/services_pools.py:198 +#: REST/methods/services_pools.py:292 msgid "Default" msgstr "По умолчанию" @@ -309,21 +309,21 @@ msgid "Service pool policy" msgstr "Политика пула услуг" #: REST/methods/meta_pools.py:134 REST/methods/services_pool_groups.py:85 -#: REST/methods/services_pools.py:261 +#: REST/methods/services_pools.py:285 msgid "Associated Image" msgstr "Привязанный образ" #: REST/methods/meta_pools.py:135 REST/methods/services_pool_groups.py:86 -#: REST/methods/services_pools.py:262 +#: REST/methods/services_pools.py:286 msgid "Image assocciated with this service" msgstr "Образ приваязанный с сервисом" -#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:103 -#: REST/methods/services_pools.py:269 +#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:106 +#: REST/methods/services_pools.py:293 msgid "Pool group" msgstr "Пул группа" -#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:270 +#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:294 msgid "Pool group for this pool (for pool classify on display)" msgstr "Пул-группа для этого пула (для классификации пула на дисплее)" @@ -331,11 +331,11 @@ msgstr "Пул-группа для этого пула (для классифи msgid "If active, metapool will be visible for users" msgstr "Если активен, metapool будет виден пользователям" -#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:277 +#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:301 msgid "Calendar access denied text" msgstr "Доступ к календарю запрещен" -#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:278 +#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:302 msgid "" "Custom message to be shown to users if access is limited by calendar rules." msgstr "" @@ -364,12 +364,13 @@ msgid "Creation date" msgstr "Создать дату" #: REST/methods/meta_service_pools.py:172 REST/methods/services_usage.py:119 -#: reports/stats/pool_usage_summary.py:59 +#: reports/stats/pool_users_summary.py:59 #: reports/stats/pools_performance.py:258 reports/stats/pools_usage_day.py:166 -#: reports/stats/usage_by_pool.py:60 reports/stats/usage_by_pool.py:160 -#: services/Proxmox/service.py:110 +#: reports/stats/pools_usage_summary.py:137 reports/stats/usage_by_pool.py:60 +#: reports/stats/usage_by_pool.py:158 services/Proxmox/service.py:110 #: templates/uds/reports/stats/pools-performance.html:33 #: templates/uds/reports/stats/pools-usage-day.html:27 +#: templates/uds/reports/stats/pools-usage-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:17 msgid "Pool" msgstr "Пул" @@ -507,7 +508,7 @@ msgstr "Нельзя удалить ОС Менеджер с привязанн msgid "Service providers" msgstr "Поставщики услуг" -#: REST/methods/providers.py:73 REST/methods/services_pools.py:97 +#: REST/methods/providers.py:73 REST/methods/services_pools.py:100 msgid "Status" msgstr "Статус" @@ -655,9 +656,9 @@ msgstr "полномочие" msgid "Proxy for services behind a firewall" msgstr "Прокси для служб за брандмауэром" -#: REST/methods/services.py:270 REST/methods/services_pools.py:233 -#: REST/methods/services_pools.py:241 REST/methods/services_pools.py:249 -#: REST/methods/services_pools.py:324 REST/methods/services_pools.py:332 +#: REST/methods/services.py:270 REST/methods/services_pools.py:257 +#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 +#: REST/methods/services_pools.py:348 REST/methods/services_pools.py:356 #: auths/RegexLdap/authenticator.py:78 core/ui/user_interface.py:95 #: osmanagers/WindowsOsManager/windows_domain.py:71 #: osmanagers/WindowsOsManager/windows_domain.py:72 @@ -681,47 +682,47 @@ msgstr "ОК" msgid "Services Pool Groups" msgstr "Группы сервис-пулов" -#: REST/methods/services_pools.py:94 REST/methods/transports.py:104 +#: REST/methods/services_pools.py:97 REST/methods/transports.py:104 msgid "Service Pools" msgstr "Сервис-пулы" -#: REST/methods/services_pools.py:100 +#: REST/methods/services_pools.py:103 msgid "Usage" msgstr "использование" -#: REST/methods/services_pools.py:102 +#: REST/methods/services_pools.py:105 msgid "Shows transports" msgstr "Показать транспорты" -#: REST/methods/services_pools.py:104 +#: REST/methods/services_pools.py:107 msgid "Parent service" msgstr "Родительский сервис" -#: REST/methods/services_pools.py:206 +#: REST/methods/services_pools.py:230 msgid "Create at least a service before creating a new service pool" msgstr "Создайте сервис перед созданием нового сервисного пула" -#: REST/methods/services_pools.py:213 +#: REST/methods/services_pools.py:237 msgid "Base service" msgstr "Базовый сервис" -#: REST/methods/services_pools.py:214 +#: REST/methods/services_pools.py:238 msgid "Service used as base of this service pool" msgstr "Сервис используется как базовый в этом сервисном пуле" -#: REST/methods/services_pools.py:221 +#: REST/methods/services_pools.py:245 msgid "OS Manager" msgstr "ОС менеджер" -#: REST/methods/services_pools.py:222 +#: REST/methods/services_pools.py:246 msgid "OS Manager used as base of this service pool" msgstr " ОС менеджер используется как базовый в этом сервисном пуле" -#: REST/methods/services_pools.py:229 +#: REST/methods/services_pools.py:253 msgid "Allow removal by users" msgstr "Разрешить удаление пользователями" -#: REST/methods/services_pools.py:230 +#: REST/methods/services_pools.py:254 msgid "" "If active, the user will be allowed to remove the service \"manually\". Be " "careful with this, because the user will have the \"power\" to delete it's " @@ -730,19 +731,19 @@ msgstr "" "Если активно, пользователю будет разрешено удалить службу вручную. Будьте " "осторожны с этим, не рекомендуется давать пользователю такие права" -#: REST/methods/services_pools.py:237 +#: REST/methods/services_pools.py:261 msgid "Allow reset by users" msgstr "Разрешить сброс пользователям" -#: REST/methods/services_pools.py:238 +#: REST/methods/services_pools.py:262 msgid "If active, the user will be allowed to reset the service" msgstr "Если активно, пользователю будет разрешено сбросить сервис" -#: REST/methods/services_pools.py:245 +#: REST/methods/services_pools.py:269 msgid "Ignores unused" msgstr "Игнорирует неиспользуемые" -#: REST/methods/services_pools.py:246 +#: REST/methods/services_pools.py:270 msgid "" "If the option is enabled, UDS will not attempt to detect and remove the user " "services assigned but not in use." @@ -750,42 +751,42 @@ msgstr "" "Если опция включена, UDS не будет пытаться обнаружить и удалить пользователя " "услуги, назначенные, но не используемые." -#: REST/methods/services_pools.py:286 +#: REST/methods/services_pools.py:310 msgid "Initial available services" msgstr "Первоначально доступные сервисы" -#: REST/methods/services_pools.py:287 +#: REST/methods/services_pools.py:311 msgid "Services created initially for this service pool" msgstr "Сервисы, созданные для этого сервис-пула" -#: REST/methods/services_pools.py:290 REST/methods/services_pools.py:299 -#: REST/methods/services_pools.py:308 REST/methods/services_pools.py:317 +#: REST/methods/services_pools.py:314 REST/methods/services_pools.py:323 +#: REST/methods/services_pools.py:332 REST/methods/services_pools.py:341 msgid "Availability" msgstr "Доступность" -#: REST/methods/services_pools.py:295 +#: REST/methods/services_pools.py:319 msgid "Services to keep in cache" msgstr "Сервисы для удержания в кэше" -#: REST/methods/services_pools.py:296 +#: REST/methods/services_pools.py:320 msgid "Services kept in cache for improved user service assignation" msgstr "" "Службы, хранящиеся в кэше, для улучшения назначения обслуживания " "пользователей" -#: REST/methods/services_pools.py:304 +#: REST/methods/services_pools.py:328 msgid "Services to keep in L2 cache" msgstr "Сервисы, хранящиеся в L2 кэше" -#: REST/methods/services_pools.py:305 +#: REST/methods/services_pools.py:329 msgid "Services kept in cache of level2 for improved service generation" msgstr "Сервисы хранящиесы в кэше уровня 2 для улучшения генерации сервисов" -#: REST/methods/services_pools.py:313 +#: REST/methods/services_pools.py:337 msgid "Maximum number of services to provide" msgstr "Максимальное количество предоставляемых сервисов" -#: REST/methods/services_pools.py:314 +#: REST/methods/services_pools.py:338 msgid "" "Maximum number of service (assigned and L1 cache) that can be created for " "this service" @@ -793,28 +794,28 @@ msgstr "" "Максимальное количество сервисов (привязанных и находящихся в кэше), которые " "могут быть созданы для этого сервиса" -#: REST/methods/services_pools.py:321 +#: REST/methods/services_pools.py:345 msgid "Show transports" msgstr "Показать транспорты" -#: REST/methods/services_pools.py:322 +#: REST/methods/services_pools.py:346 msgid "If active, alternative transports for user will be shown" msgstr "" "Если активен, для пользователя будут показаны альтернативные транспорты" -#: REST/methods/services_pools.py:329 +#: REST/methods/services_pools.py:353 msgid "Accounting" msgstr "бухгалтерский учет" -#: REST/methods/services_pools.py:330 +#: REST/methods/services_pools.py:354 msgid "Account associated to this service pool" msgstr "Учетная запись, связанная с этим пулом услуг" -#: REST/methods/services_pools.py:346 +#: REST/methods/services_pools.py:370 msgid "Base service does not exist anymore" msgstr "Базовый сервис больше не существует" -#: REST/methods/services_pools.py:380 +#: REST/methods/services_pools.py:404 msgid "This service requires an OS Manager" msgstr "Этот сервис требует наличия ОС менеджера" @@ -942,8 +943,8 @@ msgstr "Штатный сотрудник" #: auths/AzureAD_enterprise/azure_ad.py:92 #: auths/EDirectory_enterprise/authenticator.py:47 #: auths/RegexLdap/authenticator.py:67 auths/SAML_enterprise/saml.py:117 -#: reports/stats/pool_usage_summary.py:166 reports/stats/usage_by_pool.py:160 -#: templates/uds/reports/stats/pool-usage-summary.html:14 +#: reports/stats/pool_users_summary.py:166 reports/stats/usage_by_pool.py:158 +#: templates/uds/reports/stats/pool-users-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:15 msgid "User" msgstr "Пользователь" @@ -1784,27 +1785,27 @@ msgid "Can't remove nor cancel {} cause its state don't allow it" msgstr "" "Невозможно удалить или отменить {}, потому что его состояние не позволяет" -#: core/managers/user_service.py:318 +#: core/managers/user_service.py:317 msgid "The requested service is restrained" msgstr "Запрашиваемая услуга ограничена" -#: core/managers/user_service.py:556 +#: core/managers/user_service.py:555 msgid "The requested service is not available" msgstr "Запрашиваемая услуга недоступна" -#: core/managers/user_service.py:586 +#: core/managers/user_service.py:585 msgid "The requested transport {} is not valid for {}" msgstr "Запрошенный транспорт {} недействителен для {}" -#: core/managers/user_service.py:710 +#: core/managers/user_service.py:709 msgid "The service is not accessible from this device" msgstr "Сервис недоступен с этого устройства" -#: core/module.py:208 +#: core/module.py:207 msgid "No connection checking method is implemented." msgstr "Не применяется метод проверки соединения." -#: core/module.py:277 +#: core/module.py:276 msgid "No check method provided." msgstr "Не проверять предоставленный метод" @@ -2180,8 +2181,8 @@ msgstr "Будни" msgid "Minutes" msgstr "Минуты" -#: models/calendar_rule.py:76 reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:16 +#: models/calendar_rule.py:76 reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:16 msgid "Hours" msgstr "Часы" @@ -2193,11 +2194,11 @@ msgstr "Дни" msgid "Weeks" msgstr "Недели" -#: models/meta_pool.py:71 +#: models/meta_pool.py:72 msgid "Evenly distributed" msgstr "Равномерно распределены" -#: models/meta_pool.py:73 +#: models/meta_pool.py:74 msgid "Greater % available" msgstr "Больше% доступно" @@ -2566,7 +2567,7 @@ msgstr "Список пользователей платформы" msgid "Users List for {}" msgstr "Список пользователей для {}" -#: reports/lists/users.py:86 reports/stats/pool_usage_summary.py:145 +#: reports/lists/users.py:86 reports/stats/pool_users_summary.py:145 msgid "UDS Report of users in {}" msgstr "UDS Отчет пользователей в {}" @@ -2582,49 +2583,52 @@ msgstr "Реальное имя" msgid "Statistics" msgstr "Статистика" -#: reports/stats/pool_usage_summary.py:52 -msgid "Summary of pools usage" -msgstr "Резюме использования пулов" +#: reports/stats/pool_users_summary.py:52 +#| msgid "Pools usage by users" +msgid "Pool Usage by users" +msgstr "Использование пула пользователями" -#: reports/stats/pool_usage_summary.py:53 -msgid "Generates a report with the summary of a pool usage" -msgstr "Создает отчет с резюме использования пула" +#: reports/stats/pool_users_summary.py:53 +#| msgid "Generates a report with the summary of a pool usage" +msgid "Generates a report with the summary of users usage for a pool" +msgstr "" +"Создает отчет с краткой информацией об использовании пользователей для пула." -#: reports/stats/pool_usage_summary.py:60 reports/stats/usage_by_pool.py:61 +#: reports/stats/pool_users_summary.py:60 reports/stats/usage_by_pool.py:61 msgid "Pool for report" msgstr "Пул для отчета" -#: reports/stats/pool_usage_summary.py:66 reports/stats/pools_performance.py:74 +#: reports/stats/pool_users_summary.py:66 reports/stats/pools_performance.py:74 #: reports/stats/usage_by_pool.py:67 reports/stats/user_access.py:66 msgid "Starting date" msgstr "Начальная дата" -#: reports/stats/pool_usage_summary.py:67 reports/stats/pools_performance.py:75 +#: reports/stats/pool_users_summary.py:67 reports/stats/pools_performance.py:75 #: reports/stats/usage_by_pool.py:68 reports/stats/user_access.py:67 msgid "starting date for report" msgstr "начальная дата для отчета" -#: reports/stats/pool_usage_summary.py:74 reports/stats/pools_performance.py:82 +#: reports/stats/pool_users_summary.py:74 reports/stats/pools_performance.py:82 #: reports/stats/usage_by_pool.py:75 reports/stats/user_access.py:74 msgid "Finish date" msgstr "Конечная дата" -#: reports/stats/pool_usage_summary.py:75 reports/stats/pools_performance.py:83 +#: reports/stats/pool_users_summary.py:75 reports/stats/pools_performance.py:83 #: reports/stats/usage_by_pool.py:76 reports/stats/user_access.py:75 msgid "finish date for report" msgstr "конечная дата для отчета" -#: reports/stats/pool_usage_summary.py:144 +#: reports/stats/pool_users_summary.py:144 msgid "Users usage list for {}" msgstr "Список использования пользователей для {}" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:15 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:15 msgid "Sessions" msgstr "Сесии" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:17 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:17 msgid "Average" msgstr "В среднем" @@ -2711,6 +2715,47 @@ msgstr "Отчет об использовании услуг за день" msgid "Service usage report" msgstr "Отчет об использовании сервиса" +#: reports/stats/pools_usage_summary.py:47 +msgid "Summary of pools usage" +msgstr "Резюме использования пулов" + +#: reports/stats/pools_usage_summary.py:48 +msgid "" +"Summary of Pools usage with time totals, accesses totals, time total by pool" +msgstr "" +"Сводка использования пулов с итогами времени, итогами доступа, итогами " +"времени по пулу" + +#: reports/stats/pools_usage_summary.py:116 +#| msgid "Summary of pools usage" +msgid "Summary of Pools usage" +msgstr "Сводка использования пулов" + +#: reports/stats/pools_usage_summary.py:116 +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "to" +msgstr "в" + +#: reports/stats/pools_usage_summary.py:117 +#| msgid "Summary of pools usage" +msgid "UDS Report Summary of pools usage" +msgstr "Отчет UDS Сводка использования пулов" + +#: reports/stats/pools_usage_summary.py:137 +msgid "Total Time (seconds)" +msgstr "Общее время (в секундах)" + +#: reports/stats/pools_usage_summary.py:137 +#| msgid "Accesses" +msgid "Total Accesses" +msgstr "Всего доступов" + +#: reports/stats/pools_usage_summary.py:142 +#: templates/uds/reports/stats/pools-usage-summary.html:30 +msgid "Total" +msgstr "Всего" + #: reports/stats/usage_by_pool.py:53 msgid "Pools usage by users" msgstr "Использование пулов пользователями" @@ -2723,16 +2768,17 @@ msgstr "Отчет использования пулов пользовател msgid "ALL POOLS" msgstr "ВСЕ БАССЕЙНЫ" -#: reports/stats/usage_by_pool.py:138 +#: reports/stats/usage_by_pool.py:136 #: templates/uds/reports/stats/usage-by-pool.html:4 +#: templates/uds/reports/stats/usage-by-pool.html:6 msgid "Users usage list" msgstr "Список пользователей" -#: reports/stats/usage_by_pool.py:139 +#: reports/stats/usage_by_pool.py:137 msgid "UDS Report of users usage" msgstr "UDS Отчет об использовании пользователей" -#: reports/stats/usage_by_pool.py:160 +#: reports/stats/usage_by_pool.py:158 #: templates/uds/reports/stats/usage-by-pool.html:16 msgid "Seconds" msgstr "Секунды" @@ -3068,7 +3114,7 @@ msgstr "Тест соединения успешен" #: services/HyperV_enterprise/legacy/provider.py:268 #: services/Nutanix_enterprise/provider.py:214 services/OVirt/provider.py:457 -#: services/Proxmox/provider.py:202 services/Vmware_enterprise/provider.py:178 +#: services/Proxmox/provider.py:205 services/Vmware_enterprise/provider.py:178 msgid "Connection failed. Check connection params" msgstr "Ошибка подключения. Проверьте параметры подключения" @@ -3080,12 +3126,10 @@ msgid "UDS pub for {0} at {1}" msgstr "UDS pub для {0} в {1}" #: services/HyperV_enterprise/legacy/service.py:57 -#: services/HyperV_enterprise/service.py:57 msgid "HyperV Linked Clone (Experimental)" msgstr "HyperV слинкованный клон (эксперимент)" #: services/HyperV_enterprise/legacy/service.py:59 -#: services/HyperV_enterprise/service.py:59 msgid "Hyper Services based on templates and differential disks (experimental)" msgstr "" "Hyper Services на основе шаблонов и дифференциальных дисков " @@ -3268,6 +3312,17 @@ msgstr "" "Для кластеров имя пользователя должно быть именем пользователя домена (user " "@ domain или DOMAIN \\ user" +#: services/HyperV_enterprise/service.py:57 +#| msgid "Xen Linked Clone" +msgid "HyperV Linked Clone" +msgstr "HyperV Связанный клон" + +#: services/HyperV_enterprise/service.py:59 +#| msgid "" +#| "Hyper Services based on templates and differential disks (experimental)" +msgid "Hyper Services based on templates and differential disks" +msgstr "Hyper Services на основе шаблонов и дифференциальных дисков" + #: services/Nutanix_enterprise/provider.py:30 msgid "Nutanix Acropolis Platform Provider" msgstr "Поставщик платформы Nutanix Acropolis" @@ -3757,12 +3812,12 @@ msgstr "Поставщик статических IP-машин" msgid "Provides connection to machines by IP" msgstr "Обеспечивает подключение к машинам по IP" -#: services/PhysicalMachines/service_multi.py:59 +#: services/PhysicalMachines/service_multi.py:60 #: services/Vmware_enterprise/service_fixed.py:54 msgid "Service Token" msgstr "Сервисный токен" -#: services/PhysicalMachines/service_multi.py:61 +#: services/PhysicalMachines/service_multi.py:62 #: services/Vmware_enterprise/service_fixed.py:56 msgid "" "Service token that will be used by actors to communicate with service. Leave " @@ -3771,20 +3826,32 @@ msgstr "" "Сервисный токен, который будет использоваться субъектами для связи с " "сервисом. Оставьте пустым для постоянного присваивания." -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 #: services/RDS_enterprise/provider.py:47 msgid "List of servers" msgstr "Список серверов" -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 msgid "List of servers available for this service" msgstr "Список серверов, доступных для этой услуги" -#: services/PhysicalMachines/service_multi.py:71 +#: services/PhysicalMachines/service_multi.py:70 +#| msgid "Check Cert." +msgid "Check Port" +msgstr "Проверьте порт" + +#: services/PhysicalMachines/service_multi.py:70 +msgid "" +"If non zero, only Machines responding to connection on that port will be used" +msgstr "" +"Если не ноль, будут использоваться только машины, отвечающие на соединение " +"через этот порт" + +#: services/PhysicalMachines/service_multi.py:73 msgid "Static Multiple IP" msgstr "Статический множественный IP-адрес" -#: services/PhysicalMachines/service_multi.py:73 +#: services/PhysicalMachines/service_multi.py:75 msgid "This service provides access to POWERED-ON Machines by IP" msgstr "Эта услуга обеспечивает доступ к включенным машинам по IP" @@ -4738,9 +4805,31 @@ msgstr "Дата:" msgid "Services assignation" msgstr "Предоставление услуг" -#: templates/uds/reports/stats/usage-by-pool.html:6 -msgid "Users usage list for" -msgstr "Список пользователей для" +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +#| msgid "Pools usage on a day" +msgid "Pools usage summary" +msgstr "Сводка использования пулов" + +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "from" +msgstr "от" + +#: templates/uds/reports/stats/pools-usage-summary.html:15 +#| msgid "Max.Idle time" +msgid "Total time" +msgstr "Общее время" + +#: templates/uds/reports/stats/pools-usage-summary.html:16 +#| msgid "Last access" +msgid "Total accesses" +msgstr "Всего доступов" + +#: templates/uds/reports/stats/pools-usage-summary.html:17 +#| msgid "Current users" +msgid "Unique users" +msgstr "Уникальные пользователи" #: templates/uds/reports/stats/usage-by-pool.html:14 msgid "Access date/time" @@ -5802,7 +5891,7 @@ msgstr "" "Перезагрузка этой страницы не поддерживается. Пожалуйста, заново откройте " "сервис от источника." -#: web/util/services.py:190 +#: web/util/services.py:196 msgid "" "This service is about to be replaced by a new version. Please, close the " "session before {} and save all your work to avoid loosing it." diff --git a/server/src/uds/locale/ru/LC_MESSAGES/djangojs.po b/server/src/uds/locale/ru/LC_MESSAGES/djangojs.po index c6f70a806..75162e1fd 100644 --- a/server/src/uds/locale/ru/LC_MESSAGES/djangojs.po +++ b/server/src/uds/locale/ru/LC_MESSAGES/djangojs.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:02+0200\n" -"PO-Revision-Date: 2020-05-07 09:53+0000\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" +"PO-Revision-Date: 2020-05-11 12:06+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: Russian (http://www.transifex.com/openuds/openuds/language/" "ru/)\n" @@ -1570,12 +1570,10 @@ msgstr "Около" #: static/modern/translations-fakejs.js:35 #: static/modern/translations-fakejs.js:36 -#| msgid "UDS Client" msgid "Client IP" msgstr "IP-адрес клиента" #: static/modern/translations-fakejs.js:37 -#| msgid "Delete Proxy" msgid "Detected proxy ip" msgstr "Обнаружен прокси ip" diff --git a/server/src/uds/locale/zh_Hans/LC_MESSAGES/django.po b/server/src/uds/locale/zh_Hans/LC_MESSAGES/django.po index 2898d4e90..29f417abc 100644 --- a/server/src/uds/locale/zh_Hans/LC_MESSAGES/django.po +++ b/server/src/uds/locale/zh_Hans/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:01+0200\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" "PO-Revision-Date: 2020-05-07 09:52+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: Chinese (http://www.transifex.com/openuds/openuds/language/" @@ -27,7 +27,7 @@ msgstr "帐号" #: REST/methods/meta_pools.py:70 REST/methods/networks.py:60 #: REST/methods/osmanagers.py:55 REST/methods/providers.py:70 #: REST/methods/proxies.py:59 REST/methods/reports.py:57 -#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:96 +#: REST/methods/services_pool_groups.py:63 REST/methods/services_pools.py:99 #: REST/methods/transports.py:57 REST/methods/user_services.py:255 #: REST/methods/user_services.py:295 REST/methods/users_groups.py:117 #: REST/model.py:139 @@ -53,7 +53,7 @@ msgstr "时间标记" #: REST/methods/calendars.py:63 REST/methods/meta_pools.py:77 #: REST/methods/networks.py:63 REST/methods/osmanagers.py:59 #: REST/methods/providers.py:76 REST/methods/proxies.py:63 -#: REST/methods/services.py:226 REST/methods/services_pools.py:105 +#: REST/methods/services.py:226 REST/methods/services_pools.py:108 #: REST/methods/transports.py:61 msgid "tags" msgstr "标签" @@ -119,7 +119,7 @@ msgstr "演员代币" #: REST/methods/actor_token.py:54 reports/stats/pools_performance.py:198 #: reports/stats/pools_performance.py:213 reports/stats/pools_usage_day.py:65 -#: reports/stats/usage_by_pool.py:160 reports/stats/user_access.py:174 +#: reports/stats/usage_by_pool.py:158 reports/stats/user_access.py:174 msgid "Date" msgstr "日期" @@ -173,13 +173,13 @@ msgstr "类型" #: REST/methods/authenticators.py:68 REST/methods/meta_service_pools.py:85 #: REST/methods/op_calendars.py:80 REST/methods/services_pool_groups.py:61 #: REST/methods/transports.py:56 REST/methods/user_services.py:294 -#: REST/model.py:166 models/meta_pool.py:72 +#: REST/model.py:166 models/meta_pool.py:73 msgid "Priority" msgstr "优先" #: REST/methods/authenticators.py:69 REST/methods/authenticators.py:101 #: REST/methods/meta_pools.py:75 REST/methods/meta_pools.py:150 -#: REST/methods/services_pools.py:101 REST/methods/services_pools.py:253 +#: REST/methods/services_pools.py:104 REST/methods/services_pools.py:277 msgid "Visible" msgstr "可见" @@ -195,15 +195,15 @@ msgstr "标签" msgid "Users" msgstr "用户" -#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:254 +#: REST/methods/authenticators.py:102 REST/methods/services_pools.py:278 msgid "If active, transport will be visible for users" msgstr "如果处于活动状态，则用户可以看到传输" #: REST/methods/authenticators.py:105 REST/methods/meta_pools.py:138 #: REST/methods/meta_pools.py:146 REST/methods/meta_pools.py:154 -#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:257 -#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 -#: REST/methods/services_pools.py:281 core/ui/user_interface.py:99 +#: REST/methods/meta_pools.py:162 REST/methods/services_pools.py:281 +#: REST/methods/services_pools.py:289 REST/methods/services_pools.py:297 +#: REST/methods/services_pools.py:305 core/ui/user_interface.py:99 #: services/OVirt/service.py:186 msgid "Display" msgstr "显示" @@ -228,7 +228,7 @@ msgstr "重复" msgid "Every" msgstr "一切" -#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:160 +#: REST/methods/calendarrules.py:103 reports/stats/usage_by_pool.py:158 msgid "Duration" msgstr "持续时间" @@ -283,11 +283,11 @@ msgid "Policy" msgstr "政策" #: REST/methods/meta_pools.py:73 REST/methods/services.py:225 -#: REST/methods/services_pools.py:98 +#: REST/methods/services_pools.py:101 msgid "User services" msgstr "用户服务" -#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:99 +#: REST/methods/meta_pools.py:74 REST/methods/services_pools.py:102 msgid "In Preparation" msgstr "在筹备" @@ -296,8 +296,8 @@ msgid "Pool Group" msgstr "池组" #: REST/methods/meta_pools.py:86 REST/methods/meta_pools.py:141 -#: REST/methods/services_pools.py:123 REST/methods/services_pools.py:175 -#: REST/methods/services_pools.py:268 +#: REST/methods/services_pools.py:141 REST/methods/services_pools.py:198 +#: REST/methods/services_pools.py:292 msgid "Default" msgstr "默认" @@ -306,21 +306,21 @@ msgid "Service pool policy" msgstr "服务池策略" #: REST/methods/meta_pools.py:134 REST/methods/services_pool_groups.py:85 -#: REST/methods/services_pools.py:261 +#: REST/methods/services_pools.py:285 msgid "Associated Image" msgstr "相关图像" #: REST/methods/meta_pools.py:135 REST/methods/services_pool_groups.py:86 -#: REST/methods/services_pools.py:262 +#: REST/methods/services_pools.py:286 msgid "Image assocciated with this service" msgstr "图像与此服务相关联" -#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:103 -#: REST/methods/services_pools.py:269 +#: REST/methods/meta_pools.py:142 REST/methods/services_pools.py:106 +#: REST/methods/services_pools.py:293 msgid "Pool group" msgstr "池组" -#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:270 +#: REST/methods/meta_pools.py:143 REST/methods/services_pools.py:294 msgid "Pool group for this pool (for pool classify on display)" msgstr "此池的池组（用于显示池分类）" @@ -328,11 +328,11 @@ msgstr "此池的池组（用于显示池分类）" msgid "If active, metapool will be visible for users" msgstr "如果处于活动状态，则元数将对用户可见" -#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:277 +#: REST/methods/meta_pools.py:158 REST/methods/services_pools.py:301 msgid "Calendar access denied text" msgstr "日历访问被拒绝的文本" -#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:278 +#: REST/methods/meta_pools.py:159 REST/methods/services_pools.py:302 msgid "" "Custom message to be shown to users if access is limited by calendar rules." msgstr "如果访问受日历规则限制，则向用户显示的自定义消息。" @@ -359,12 +359,13 @@ msgid "Creation date" msgstr "创立日期" #: REST/methods/meta_service_pools.py:172 REST/methods/services_usage.py:119 -#: reports/stats/pool_usage_summary.py:59 +#: reports/stats/pool_users_summary.py:59 #: reports/stats/pools_performance.py:258 reports/stats/pools_usage_day.py:166 -#: reports/stats/usage_by_pool.py:60 reports/stats/usage_by_pool.py:160 -#: services/Proxmox/service.py:110 +#: reports/stats/pools_usage_summary.py:137 reports/stats/usage_by_pool.py:60 +#: reports/stats/usage_by_pool.py:158 services/Proxmox/service.py:110 #: templates/uds/reports/stats/pools-performance.html:33 #: templates/uds/reports/stats/pools-usage-day.html:27 +#: templates/uds/reports/stats/pools-usage-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:17 msgid "Pool" msgstr "池" @@ -500,7 +501,7 @@ msgstr "无法删除与关联的服务池的OS Manager" msgid "Service providers" msgstr "服务供应商" -#: REST/methods/providers.py:73 REST/methods/services_pools.py:97 +#: REST/methods/providers.py:73 REST/methods/services_pools.py:100 msgid "Status" msgstr "状态" @@ -643,9 +644,9 @@ msgstr "代理" msgid "Proxy for services behind a firewall" msgstr "防火墙后面的服务代理" -#: REST/methods/services.py:270 REST/methods/services_pools.py:233 -#: REST/methods/services_pools.py:241 REST/methods/services_pools.py:249 -#: REST/methods/services_pools.py:324 REST/methods/services_pools.py:332 +#: REST/methods/services.py:270 REST/methods/services_pools.py:257 +#: REST/methods/services_pools.py:265 REST/methods/services_pools.py:273 +#: REST/methods/services_pools.py:348 REST/methods/services_pools.py:356 #: auths/RegexLdap/authenticator.py:78 core/ui/user_interface.py:95 #: osmanagers/WindowsOsManager/windows_domain.py:71 #: osmanagers/WindowsOsManager/windows_domain.py:72 @@ -669,47 +670,47 @@ msgstr "好" msgid "Services Pool Groups" msgstr "服务池组" -#: REST/methods/services_pools.py:94 REST/methods/transports.py:104 +#: REST/methods/services_pools.py:97 REST/methods/transports.py:104 msgid "Service Pools" msgstr "服务池" -#: REST/methods/services_pools.py:100 +#: REST/methods/services_pools.py:103 msgid "Usage" msgstr "用法" -#: REST/methods/services_pools.py:102 +#: REST/methods/services_pools.py:105 msgid "Shows transports" msgstr "显示运输" -#: REST/methods/services_pools.py:104 +#: REST/methods/services_pools.py:107 msgid "Parent service" msgstr "家长服务" -#: REST/methods/services_pools.py:206 +#: REST/methods/services_pools.py:230 msgid "Create at least a service before creating a new service pool" msgstr "在创建新服务池之前至少创建一个服务" -#: REST/methods/services_pools.py:213 +#: REST/methods/services_pools.py:237 msgid "Base service" msgstr "基本服务" -#: REST/methods/services_pools.py:214 +#: REST/methods/services_pools.py:238 msgid "Service used as base of this service pool" msgstr "用作此服务池基础的服务" -#: REST/methods/services_pools.py:221 +#: REST/methods/services_pools.py:245 msgid "OS Manager" msgstr "OS经理" -#: REST/methods/services_pools.py:222 +#: REST/methods/services_pools.py:246 msgid "OS Manager used as base of this service pool" msgstr "OS Manager用作此服务池的基础" -#: REST/methods/services_pools.py:229 +#: REST/methods/services_pools.py:253 msgid "Allow removal by users" msgstr "允许用户删除" -#: REST/methods/services_pools.py:230 +#: REST/methods/services_pools.py:254 msgid "" "If active, the user will be allowed to remove the service \"manually\". Be " "careful with this, because the user will have the \"power\" to delete it's " @@ -718,84 +719,84 @@ msgstr "" "如果激活，则允许用户“手动”删除服务。请注意这一点，因为用户将拥有“权力”来删除" "它自己的服务" -#: REST/methods/services_pools.py:237 +#: REST/methods/services_pools.py:261 msgid "Allow reset by users" msgstr "允许用户重置" -#: REST/methods/services_pools.py:238 +#: REST/methods/services_pools.py:262 msgid "If active, the user will be allowed to reset the service" msgstr "如果处于活动状态，则允许用户重置服务" -#: REST/methods/services_pools.py:245 +#: REST/methods/services_pools.py:269 msgid "Ignores unused" msgstr "忽略未使用的" -#: REST/methods/services_pools.py:246 +#: REST/methods/services_pools.py:270 msgid "" "If the option is enabled, UDS will not attempt to detect and remove the user " "services assigned but not in use." msgstr "如果启用该选项，UDS将不会尝试检测并删除已分配但未使用的用户服务。" -#: REST/methods/services_pools.py:286 +#: REST/methods/services_pools.py:310 msgid "Initial available services" msgstr "初始可用服务" -#: REST/methods/services_pools.py:287 +#: REST/methods/services_pools.py:311 msgid "Services created initially for this service pool" msgstr "最初为此服务池创建的服务" -#: REST/methods/services_pools.py:290 REST/methods/services_pools.py:299 -#: REST/methods/services_pools.py:308 REST/methods/services_pools.py:317 +#: REST/methods/services_pools.py:314 REST/methods/services_pools.py:323 +#: REST/methods/services_pools.py:332 REST/methods/services_pools.py:341 msgid "Availability" msgstr "可用性" -#: REST/methods/services_pools.py:295 +#: REST/methods/services_pools.py:319 msgid "Services to keep in cache" msgstr "保留在缓存中的服务" -#: REST/methods/services_pools.py:296 +#: REST/methods/services_pools.py:320 msgid "Services kept in cache for improved user service assignation" msgstr "保留在缓存中的服务用于改进用户服务分配" -#: REST/methods/services_pools.py:304 +#: REST/methods/services_pools.py:328 msgid "Services to keep in L2 cache" msgstr "要保留在L2缓存中的服务" -#: REST/methods/services_pools.py:305 +#: REST/methods/services_pools.py:329 msgid "Services kept in cache of level2 for improved service generation" msgstr "服务保留在level2的缓存中以改进服务生成" -#: REST/methods/services_pools.py:313 +#: REST/methods/services_pools.py:337 msgid "Maximum number of services to provide" msgstr "要提供的最大服务数" -#: REST/methods/services_pools.py:314 +#: REST/methods/services_pools.py:338 msgid "" "Maximum number of service (assigned and L1 cache) that can be created for " "this service" msgstr "可以为此服务创建的最大服务数（已分配和L1缓存）" -#: REST/methods/services_pools.py:321 +#: REST/methods/services_pools.py:345 msgid "Show transports" msgstr "显示运输" -#: REST/methods/services_pools.py:322 +#: REST/methods/services_pools.py:346 msgid "If active, alternative transports for user will be shown" msgstr "如果激活，将显示用户的替代传输" -#: REST/methods/services_pools.py:329 +#: REST/methods/services_pools.py:353 msgid "Accounting" msgstr "会计" -#: REST/methods/services_pools.py:330 +#: REST/methods/services_pools.py:354 msgid "Account associated to this service pool" msgstr "与此服务池关联的帐户" -#: REST/methods/services_pools.py:346 +#: REST/methods/services_pools.py:370 msgid "Base service does not exist anymore" msgstr "基本服务不再存在" -#: REST/methods/services_pools.py:380 +#: REST/methods/services_pools.py:404 msgid "This service requires an OS Manager" msgstr "此服务需要OS Manager" @@ -917,8 +918,8 @@ msgstr "工作人员" #: auths/AzureAD_enterprise/azure_ad.py:92 #: auths/EDirectory_enterprise/authenticator.py:47 #: auths/RegexLdap/authenticator.py:67 auths/SAML_enterprise/saml.py:117 -#: reports/stats/pool_usage_summary.py:166 reports/stats/usage_by_pool.py:160 -#: templates/uds/reports/stats/pool-usage-summary.html:14 +#: reports/stats/pool_users_summary.py:166 reports/stats/usage_by_pool.py:158 +#: templates/uds/reports/stats/pool-users-summary.html:14 #: templates/uds/reports/stats/usage-by-pool.html:15 msgid "User" msgstr "用户" @@ -1707,27 +1708,27 @@ msgstr "无法删除非活动元素" msgid "Can't remove nor cancel {} cause its state don't allow it" msgstr "无法删除或取消{}，导致其状态不允许" -#: core/managers/user_service.py:318 +#: core/managers/user_service.py:317 msgid "The requested service is restrained" msgstr "请求的服务被限制" -#: core/managers/user_service.py:556 +#: core/managers/user_service.py:555 msgid "The requested service is not available" msgstr "请求的服务不可用" -#: core/managers/user_service.py:586 +#: core/managers/user_service.py:585 msgid "The requested transport {} is not valid for {}" msgstr "请求的传输{}对{}无效" -#: core/managers/user_service.py:710 +#: core/managers/user_service.py:709 msgid "The service is not accessible from this device" msgstr "无法从此设备访问该服务" -#: core/module.py:208 +#: core/module.py:207 msgid "No connection checking method is implemented." msgstr "没有实现连接检查方法。" -#: core/module.py:277 +#: core/module.py:276 msgid "No check method provided." msgstr "没有提供检查方法。" @@ -2102,8 +2103,8 @@ msgstr "平日" msgid "Minutes" msgstr "分钟" -#: models/calendar_rule.py:76 reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:16 +#: models/calendar_rule.py:76 reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:16 msgid "Hours" msgstr "小时" @@ -2115,11 +2116,11 @@ msgstr "天" msgid "Weeks" msgstr "周" -#: models/meta_pool.py:71 +#: models/meta_pool.py:72 msgid "Evenly distributed" msgstr "平均分配" -#: models/meta_pool.py:73 +#: models/meta_pool.py:74 msgid "Greater % available" msgstr "更高％可用" @@ -2470,7 +2471,7 @@ msgstr "列出平台的用户" msgid "Users List for {}" msgstr "{}的用户列表" -#: reports/lists/users.py:86 reports/stats/pool_usage_summary.py:145 +#: reports/lists/users.py:86 reports/stats/pool_users_summary.py:145 msgid "UDS Report of users in {}" msgstr "用户的UDS报告{}" @@ -2486,49 +2487,51 @@ msgstr "真正的名字" msgid "Statistics" msgstr "统计" -#: reports/stats/pool_usage_summary.py:52 -msgid "Summary of pools usage" -msgstr "池使用情况摘要" +#: reports/stats/pool_users_summary.py:52 +#| msgid "Pools usage by users" +msgid "Pool Usage by users" +msgstr "用户的池使用情况" -#: reports/stats/pool_usage_summary.py:53 -msgid "Generates a report with the summary of a pool usage" -msgstr "生成包含池使用情况摘要的报告" +#: reports/stats/pool_users_summary.py:53 +#| msgid "Generates a report with the summary of a pool usage" +msgid "Generates a report with the summary of users usage for a pool" +msgstr "生成包含池用户使用情况摘要的报告" -#: reports/stats/pool_usage_summary.py:60 reports/stats/usage_by_pool.py:61 +#: reports/stats/pool_users_summary.py:60 reports/stats/usage_by_pool.py:61 msgid "Pool for report" msgstr "报告池" -#: reports/stats/pool_usage_summary.py:66 reports/stats/pools_performance.py:74 +#: reports/stats/pool_users_summary.py:66 reports/stats/pools_performance.py:74 #: reports/stats/usage_by_pool.py:67 reports/stats/user_access.py:66 msgid "Starting date" msgstr "开始日期" -#: reports/stats/pool_usage_summary.py:67 reports/stats/pools_performance.py:75 +#: reports/stats/pool_users_summary.py:67 reports/stats/pools_performance.py:75 #: reports/stats/usage_by_pool.py:68 reports/stats/user_access.py:67 msgid "starting date for report" msgstr "报告的开始日期" -#: reports/stats/pool_usage_summary.py:74 reports/stats/pools_performance.py:82 +#: reports/stats/pool_users_summary.py:74 reports/stats/pools_performance.py:82 #: reports/stats/usage_by_pool.py:75 reports/stats/user_access.py:74 msgid "Finish date" msgstr "完成日期" -#: reports/stats/pool_usage_summary.py:75 reports/stats/pools_performance.py:83 +#: reports/stats/pool_users_summary.py:75 reports/stats/pools_performance.py:83 #: reports/stats/usage_by_pool.py:76 reports/stats/user_access.py:75 msgid "finish date for report" msgstr "完成报告日期" -#: reports/stats/pool_usage_summary.py:144 +#: reports/stats/pool_users_summary.py:144 msgid "Users usage list for {}" msgstr "{}的用户使用列表" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:15 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:15 msgid "Sessions" msgstr "会议" -#: reports/stats/pool_usage_summary.py:166 -#: templates/uds/reports/stats/pool-usage-summary.html:17 +#: reports/stats/pool_users_summary.py:166 +#: templates/uds/reports/stats/pool-users-summary.html:17 msgid "Average" msgstr "平均" @@ -2615,6 +2618,45 @@ msgstr "一天的服务使用情况报告" msgid "Service usage report" msgstr "服务使用报告" +#: reports/stats/pools_usage_summary.py:47 +msgid "Summary of pools usage" +msgstr "池使用情况摘要" + +#: reports/stats/pools_usage_summary.py:48 +msgid "" +"Summary of Pools usage with time totals, accesses totals, time total by pool" +msgstr "汇总池使用情况，包括时间总计，访问总数，每个池的时间总计" + +#: reports/stats/pools_usage_summary.py:116 +#| msgid "Summary of pools usage" +msgid "Summary of Pools usage" +msgstr "池使用摘要" + +#: reports/stats/pools_usage_summary.py:116 +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "to" +msgstr "至" + +#: reports/stats/pools_usage_summary.py:117 +#| msgid "Summary of pools usage" +msgid "UDS Report Summary of pools usage" +msgstr "UDS报告池使用摘要" + +#: reports/stats/pools_usage_summary.py:137 +msgid "Total Time (seconds)" +msgstr "总时间（秒）" + +#: reports/stats/pools_usage_summary.py:137 +#| msgid "Accesses" +msgid "Total Accesses" +msgstr "总访问量" + +#: reports/stats/pools_usage_summary.py:142 +#: templates/uds/reports/stats/pools-usage-summary.html:30 +msgid "Total" +msgstr "总" + #: reports/stats/usage_by_pool.py:53 msgid "Pools usage by users" msgstr "用户使用的池" @@ -2627,16 +2669,17 @@ msgstr "按用户报告使用池" msgid "ALL POOLS" msgstr "所有池" -#: reports/stats/usage_by_pool.py:138 +#: reports/stats/usage_by_pool.py:136 #: templates/uds/reports/stats/usage-by-pool.html:4 +#: templates/uds/reports/stats/usage-by-pool.html:6 msgid "Users usage list" msgstr "用户使用情况列表" -#: reports/stats/usage_by_pool.py:139 +#: reports/stats/usage_by_pool.py:137 msgid "UDS Report of users usage" msgstr "UDS用户使用情况报告" -#: reports/stats/usage_by_pool.py:160 +#: reports/stats/usage_by_pool.py:158 #: templates/uds/reports/stats/usage-by-pool.html:16 msgid "Seconds" msgstr "秒" @@ -2968,7 +3011,7 @@ msgstr "连接测试成功" #: services/HyperV_enterprise/legacy/provider.py:268 #: services/Nutanix_enterprise/provider.py:214 services/OVirt/provider.py:457 -#: services/Proxmox/provider.py:202 services/Vmware_enterprise/provider.py:178 +#: services/Proxmox/provider.py:205 services/Vmware_enterprise/provider.py:178 msgid "Connection failed. Check connection params" msgstr "连接失败。检查连接参数" @@ -2980,12 +3023,10 @@ msgid "UDS pub for {0} at {1}" msgstr "{1}的{0}的UDS发布" #: services/HyperV_enterprise/legacy/service.py:57 -#: services/HyperV_enterprise/service.py:57 msgid "HyperV Linked Clone (Experimental)" msgstr "HyperV链接克隆（实验性）" #: services/HyperV_enterprise/legacy/service.py:59 -#: services/HyperV_enterprise/service.py:59 msgid "Hyper Services based on templates and differential disks (experimental)" msgstr "基于模板和差异磁盘的超级服务（实验性）" @@ -3156,6 +3197,17 @@ msgid "" "\\user" msgstr "对于群集，用户名必须是域用户名（user @ domain或DOMAIN \\ user" +#: services/HyperV_enterprise/service.py:57 +#| msgid "Xen Linked Clone" +msgid "HyperV Linked Clone" +msgstr "HyperV链接克隆" + +#: services/HyperV_enterprise/service.py:59 +#| msgid "" +#| "Hyper Services based on templates and differential disks (experimental)" +msgid "Hyper Services based on templates and differential disks" +msgstr "基于模板和差异磁盘的超级服务" + #: services/Nutanix_enterprise/provider.py:30 msgid "Nutanix Acropolis Platform Provider" msgstr "Nutanix雅典卫城平台提供商" @@ -3625,32 +3677,42 @@ msgstr "静态IP机器提供商" msgid "Provides connection to machines by IP" msgstr "通过IP提供与机器的连接" -#: services/PhysicalMachines/service_multi.py:59 +#: services/PhysicalMachines/service_multi.py:60 #: services/Vmware_enterprise/service_fixed.py:54 msgid "Service Token" msgstr "服务令牌" -#: services/PhysicalMachines/service_multi.py:61 +#: services/PhysicalMachines/service_multi.py:62 #: services/Vmware_enterprise/service_fixed.py:56 msgid "" "Service token that will be used by actors to communicate with service. Leave " "empty for persistent assignation." msgstr "参与者将用于与服务进行通信的服务令牌。留空以进行永久分配。" -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 #: services/RDS_enterprise/provider.py:47 msgid "List of servers" msgstr "服务器列表" -#: services/PhysicalMachines/service_multi.py:67 +#: services/PhysicalMachines/service_multi.py:68 msgid "List of servers available for this service" msgstr "可用于此服务的服务器列表" -#: services/PhysicalMachines/service_multi.py:71 +#: services/PhysicalMachines/service_multi.py:70 +#| msgid "Check Cert." +msgid "Check Port" +msgstr "检查端口" + +#: services/PhysicalMachines/service_multi.py:70 +msgid "" +"If non zero, only Machines responding to connection on that port will be used" +msgstr "如果非零，则仅使用响应该端口连接的计算机" + +#: services/PhysicalMachines/service_multi.py:73 msgid "Static Multiple IP" msgstr "静态多IP" -#: services/PhysicalMachines/service_multi.py:73 +#: services/PhysicalMachines/service_multi.py:75 msgid "This service provides access to POWERED-ON Machines by IP" msgstr "此服务可通过IP访问POWERED-ON机器" @@ -4561,9 +4623,31 @@ msgstr "日期：" msgid "Services assignation" msgstr "服务分配" -#: templates/uds/reports/stats/usage-by-pool.html:6 -msgid "Users usage list for" -msgstr "的用户使用情况列表" +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +#| msgid "Pools usage on a day" +msgid "Pools usage summary" +msgstr "池使用摘要" + +#: templates/uds/reports/stats/pools-usage-summary.html:4 +#: templates/uds/reports/stats/pools-usage-summary.html:6 +msgid "from" +msgstr "从" + +#: templates/uds/reports/stats/pools-usage-summary.html:15 +#| msgid "Max.Idle time" +msgid "Total time" +msgstr "总时间" + +#: templates/uds/reports/stats/pools-usage-summary.html:16 +#| msgid "Last access" +msgid "Total accesses" +msgstr "总访问量" + +#: templates/uds/reports/stats/pools-usage-summary.html:17 +#| msgid "Current users" +msgid "Unique users" +msgstr "不重复使用者" #: templates/uds/reports/stats/usage-by-pool.html:14 msgid "Access date/time" @@ -5554,7 +5638,7 @@ msgid "" "Reloading this page is not supported. Please, reopen service from origin." msgstr "不支持重新加载此页面。请从原点重新开始服务。" -#: web/util/services.py:190 +#: web/util/services.py:196 msgid "" "This service is about to be replaced by a new version. Please, close the " "session before {} and save all your work to avoid loosing it." diff --git a/server/src/uds/locale/zh_Hans/LC_MESSAGES/djangojs.po b/server/src/uds/locale/zh_Hans/LC_MESSAGES/djangojs.po index d204f4a93..89fc63080 100644 --- a/server/src/uds/locale/zh_Hans/LC_MESSAGES/djangojs.po +++ b/server/src/uds/locale/zh_Hans/LC_MESSAGES/djangojs.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenUDS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 14:02+0200\n" -"PO-Revision-Date: 2020-05-07 09:52+0000\n" +"POT-Creation-Date: 2020-05-26 16:18+0200\n" +"PO-Revision-Date: 2020-05-11 12:06+0000\n" "Last-Translator: Adolfo Gómez \n" "Language-Team: Chinese (http://www.transifex.com/openuds/openuds/language/" "zh/)\n" @@ -1563,12 +1563,10 @@ msgstr "关于" #: static/modern/translations-fakejs.js:35 #: static/modern/translations-fakejs.js:36 -#| msgid "UDS Client" msgid "Client IP" msgstr "客户IP" #: static/modern/translations-fakejs.js:37 -#| msgid "Delete Proxy" msgid "Detected proxy ip" msgstr "检测到代理IP" diff --git a/server/src/uds/services/PhysicalMachines/service_multi.py b/server/src/uds/services/PhysicalMachines/service_multi.py index dce1792d4..c9196a32f 100644 --- a/server/src/uds/services/PhysicalMachines/service_multi.py +++ b/server/src/uds/services/PhysicalMachines/service_multi.py @@ -118,15 +118,14 @@ class IPMachinesService(IPServiceBase): def unmarshal(self, data: bytes) -> None: values: typing.List[bytes] = data.split(b'\0') d = self.storage.readData('ips') - if values[0] == b'v1': - if isinstance(d, bytes): - self._ips = pickle.loads(d) - elif isinstance(d, str): # "legacy" saved elements - self._ips = pickle.loads(d.encode('utf8')) - self.marshal() # Ensure now is bytes.. - else: - self._ips = [] + if isinstance(d, bytes): + self._ips = pickle.loads(d) + elif isinstance(d, str): # "legacy" saved elements + self._ips = pickle.loads(d.encode('utf8')) + self.marshal() # Ensure now is bytes.. else: + self._ips = [] + if values[0] != b'v1': self._token = values[1].decode() if values[0] == b'v3': self._port = int(values[2].decode()) @@ -140,7 +139,7 @@ class IPMachinesService(IPServiceBase): self.storage.saveData(theIP, theIP) # Now, check if it is available on port, if required... if self._port > 0: - if testServer(theIP, self._port) is False: + if testServer(theIP, self._port, timeOut=0.5) is False: self.storage.remove(theIP) # Return Machine to pool continue return theIP