From e6e3d5c5ce1e19a5f7a03bc588555c7d815e9f01 Mon Sep 17 00:00:00 2001 From: icingabot <65761963+icingabot@users.noreply.github.com> Date: Sat, 17 Dec 2022 01:36:30 +0100 Subject: [PATCH] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: icinga/icingaweb2-module-director Translate-URL: https://translate.icinga.com/projects/icinga/icingaweb2-module-director/ --- .../ar_SA/LC_MESSAGES/icinga.po | 135 +++++++++------- .../de_DE/LC_MESSAGES/icinga.po | 137 +++++++++------- .../es_AR/LC_MESSAGES/icinga.po | 135 +++++++++------- .../fi_FI/LC_MESSAGES/icinga.po | 135 +++++++++------- .../fr_FR/LC_MESSAGES/icinga.po | 128 ++++++++------- .../it_IT/LC_MESSAGES/icinga.po | 137 +++++++++------- .../ja_JP/LC_MESSAGES/icinga.po | 137 +++++++++------- .../pl/LC_MESSAGES/icinga.po | 128 ++++++++------- .../pt_BR/LC_MESSAGES/icinga.po | 135 +++++++++------- .../ru_RU/LC_MESSAGES/icinga.po | 136 +++++++++------- .../uk_UA/LC_MESSAGES/icinga.po | 148 +++++++++++------- 11 files changed, 857 insertions(+), 634 deletions(-) diff --git a/src/icingaweb2-module-director/ar_SA/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/ar_SA/LC_MESSAGES/icinga.po index 3f653f2e..7943dc31 100644 --- a/src/icingaweb2-module-director/ar_SA/LC_MESSAGES/icinga.po +++ b/src/icingaweb2-module-director/ar_SA/LC_MESSAGES/icinga.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-01 11:10+0000\n" +"POT-Creation-Date: 2022-12-16 14:09+0000\n" "PO-Revision-Date: 2020-04-27 14:37+0200\n" "Last-Translator: Munzir Taha \n" "Language-Team: English \n" @@ -54,7 +54,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/JobController.php:89 #: sources.d/icingaweb2-module-director/application/controllers/ServicesController.php:36 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:673 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:414 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:418 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:129 msgid "Add to Basket" msgstr "" @@ -74,8 +74,8 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:612 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/DirectorBaseActionBar.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ActionController.php:182 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:275 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:635 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:279 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:647 msgid "back" msgstr "" @@ -330,20 +330,20 @@ msgid "Diff" msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:443 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:715 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 #, php-format msgid "The following modifications are visible in this %s only..." msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:447 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:719 -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:731 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:29 #, fuzzy msgid "configuration branch" msgstr "إعدادات" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:452 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:739 msgid "...and the modifications below are already in the main branch:" msgstr "" @@ -697,7 +697,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ImportsourceController.php:148 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:548 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/AutomationObjectActionBar.php:44 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:378 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:382 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneImportSourceForm.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneSyncRuleForm.php:35 msgid "Clone" @@ -930,7 +930,7 @@ msgid "Apply \"%s\"" msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:147 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:173 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 msgid "Modifying Templates" msgstr "" @@ -1506,7 +1506,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:159 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:133 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:102 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52 @@ -1588,7 +1588,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:150 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:125 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126 msgid "Caption" msgstr "" @@ -2656,56 +2656,56 @@ msgstr "" msgid "Argument macros" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:103 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104 msgid "Other available fields" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:117 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118 msgid "" "There are no data fields available. Please ask an administrator to create " "such" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:129 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130 msgid "The caption which should be displayed" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135 msgid "A description about the field" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51 msgid "Mandatory" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144 msgid "Whether this field should be mandatory" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:146 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 msgid "Optional" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:169 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170 msgid "" "You might want to show this field only when certain conditions are met. " "Otherwise it will not be available and values eventually set before will be " "cleared once stored" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:183 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184 msgid "Show based on filter" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:193 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:927 msgid "Delete" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:196 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197 msgid "Field has been removed" msgstr "" @@ -4028,7 +4028,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:62 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:612 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:624 msgid "Merge" msgstr "" @@ -4279,12 +4279,16 @@ msgstr "" msgid "Automate all tasks" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:19 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:21 #, php-format msgid "You're currently working in a Configuration Branch: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:28 +msgid "You're currently working in the main Configuration Branch" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:34 msgid "Prepare your configuration in a safe Environment" msgstr "" @@ -5915,7 +5919,7 @@ msgid "Create a new object" msgstr "" #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/TemplateActionBar.php:23 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:146 msgid "Create a new Template" msgstr "" @@ -5935,75 +5939,75 @@ msgstr "" msgid "Switch to Table view" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:103 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:104 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectTabs.php:51 #, php-format msgid "Add %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:144 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 msgid "Creating Templates" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:181 #, fuzzy msgid "Modifying Apply Rules" msgstr "تنبيهات" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:211 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:215 #, php-format msgid "Clone: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:214 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 msgid "Cloning Templates" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:222 #, fuzzy msgid "Cloning Apply Rules" msgstr "تنبيهات" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:247 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 #, php-format msgid "Custom fields: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:255 msgid "Managing Fields" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:301 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:305 #, php-format msgid "Activity Log: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:326 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:330 #, php-format msgid "Group membership: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:345 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:349 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:116 #, php-format msgid "Template: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:364 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:368 msgid "Usage" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:432 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:436 #, php-format msgid "Add new Icinga %s template" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:443 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:447 #, php-format msgid "Add %s: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:449 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:453 #, php-format msgid "Add new Icinga %s" msgstr "" @@ -7055,36 +7059,51 @@ msgstr "" msgid "Process List" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:27 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:24 +#, fuzzy +msgid "the main configuration branch" +msgstr "لا يوجد إعداد للخلفية %s" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:25 +msgid "This will be part of the next deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:32 +msgid "This will not be part of any deployment, unless being merged" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:36 #, fuzzy msgid "this configuration branch" msgstr "لا يوجد إعداد للخلفية %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:34 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:45 +#, fuzzy, php-format +msgid "This object will be created in %s." +msgstr "تم إزالة لوحة المعلومات" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:52 #, php-format -msgid "" -"This object will be created in %s. It will not be part of any deployment " -"unless being merged" +msgid "Your changes are going to be stored in %s." msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:42 -#, php-format -msgid "" -"Your changes will be stored in %s. The'll not be part of any deployment " -"unless being merged" -msgstr "" - -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:57 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:69 #, fuzzy, php-format msgid "This object has been created in %s" msgstr "تم إزالة لوحة المعلومات" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:62 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:74 #, php-format msgid "This object has modifications visible only in %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:23 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:21 +msgid "" +"You're currently in the master branch, your changes will make part of the " +"next Deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:28 #, php-format msgid "" "Showing a branched view, with potential changes being visible only in this %s" diff --git a/src/icingaweb2-module-director/de_DE/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/de_DE/LC_MESSAGES/icinga.po index 39bfd6f8..385692b0 100644 --- a/src/icingaweb2-module-director/de_DE/LC_MESSAGES/icinga.po +++ b/src/icingaweb2-module-director/de_DE/LC_MESSAGES/icinga.po @@ -25,7 +25,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-01 11:10+0000\n" +"POT-Creation-Date: 2022-12-16 14:09+0000\n" "PO-Revision-Date: 2022-07-15 07:40+0000\n" "Last-Translator: Johannes Meyer \n" "Language-Team: German \n" "Language-Team: \n" @@ -53,7 +53,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/JobController.php:89 #: sources.d/icingaweb2-module-director/application/controllers/ServicesController.php:36 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:673 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:414 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:418 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:129 msgid "Add to Basket" msgstr "" @@ -73,8 +73,8 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:612 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/DirectorBaseActionBar.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ActionController.php:182 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:275 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:635 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:279 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:647 msgid "back" msgstr "" @@ -329,20 +329,20 @@ msgid "Diff" msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:443 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:715 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 #, php-format msgid "The following modifications are visible in this %s only..." msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:447 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:719 -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:731 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:29 #, fuzzy msgid "configuration branch" msgstr "Configuración" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:452 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:739 msgid "...and the modifications below are already in the main branch:" msgstr "" @@ -696,7 +696,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ImportsourceController.php:148 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:548 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/AutomationObjectActionBar.php:44 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:378 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:382 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneImportSourceForm.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneSyncRuleForm.php:35 msgid "Clone" @@ -930,7 +930,7 @@ msgid "Apply \"%s\"" msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:147 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:173 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 msgid "Modifying Templates" msgstr "" @@ -1507,7 +1507,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:159 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:133 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:102 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52 @@ -1589,7 +1589,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:150 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:125 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126 msgid "Caption" msgstr "" @@ -2658,56 +2658,56 @@ msgstr "" msgid "Argument macros" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:103 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104 msgid "Other available fields" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:117 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118 msgid "" "There are no data fields available. Please ask an administrator to create " "such" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:129 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130 msgid "The caption which should be displayed" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135 msgid "A description about the field" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51 msgid "Mandatory" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144 msgid "Whether this field should be mandatory" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:146 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 msgid "Optional" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:169 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170 msgid "" "You might want to show this field only when certain conditions are met. " "Otherwise it will not be available and values eventually set before will be " "cleared once stored" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:183 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184 msgid "Show based on filter" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:193 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:927 msgid "Delete" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:196 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197 msgid "Field has been removed" msgstr "" @@ -4030,7 +4030,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:62 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:612 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:624 msgid "Merge" msgstr "" @@ -4284,12 +4284,16 @@ msgstr "" msgid "Automate all tasks" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:19 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:21 #, php-format msgid "You're currently working in a Configuration Branch: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:28 +msgid "You're currently working in the main Configuration Branch" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:34 msgid "Prepare your configuration in a safe Environment" msgstr "" @@ -5920,7 +5924,7 @@ msgid "Create a new object" msgstr "" #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/TemplateActionBar.php:23 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:146 msgid "Create a new Template" msgstr "" @@ -5940,76 +5944,76 @@ msgstr "" msgid "Switch to Table view" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:103 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:104 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectTabs.php:51 #, php-format msgid "Add %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:144 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 #, fuzzy msgid "Creating Templates" msgstr "Creando detalles de acceso \"%s\"..." -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:181 #, fuzzy msgid "Modifying Apply Rules" msgstr "Notificaciones" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:211 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:215 #, php-format msgid "Clone: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:214 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 msgid "Cloning Templates" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:222 #, fuzzy msgid "Cloning Apply Rules" msgstr "Notificaciones" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:247 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 #, php-format msgid "Custom fields: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:255 msgid "Managing Fields" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:301 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:305 #, php-format msgid "Activity Log: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:326 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:330 #, php-format msgid "Group membership: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:345 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:349 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:116 #, php-format msgid "Template: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:364 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:368 msgid "Usage" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:432 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:436 #, php-format msgid "Add new Icinga %s template" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:443 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:447 #, php-format msgid "Add %s: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:449 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:453 #, php-format msgid "Add new Icinga %s" msgstr "" @@ -7062,36 +7066,51 @@ msgstr "" msgid "Process List" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:27 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:24 +#, fuzzy +msgid "the main configuration branch" +msgstr "¿Usar esta configuración?" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:25 +msgid "This will be part of the next deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:32 +msgid "This will not be part of any deployment, unless being merged" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:36 #, fuzzy msgid "this configuration branch" msgstr "¿Usar esta configuración?" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:34 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:45 +#, fuzzy, php-format +msgid "This object will be created in %s." +msgstr "Se elimino el tablero de control" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:52 #, php-format -msgid "" -"This object will be created in %s. It will not be part of any deployment " -"unless being merged" +msgid "Your changes are going to be stored in %s." msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:42 -#, php-format -msgid "" -"Your changes will be stored in %s. The'll not be part of any deployment " -"unless being merged" -msgstr "" - -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:57 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:69 #, fuzzy, php-format msgid "This object has been created in %s" msgstr "Se elimino el tablero de control" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:62 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:74 #, php-format msgid "This object has modifications visible only in %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:23 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:21 +msgid "" +"You're currently in the master branch, your changes will make part of the " +"next Deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:28 #, php-format msgid "" "Showing a branched view, with potential changes being visible only in this %s" diff --git a/src/icingaweb2-module-director/fi_FI/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/fi_FI/LC_MESSAGES/icinga.po index 985016ed..7c69a77a 100644 --- a/src/icingaweb2-module-director/fi_FI/LC_MESSAGES/icinga.po +++ b/src/icingaweb2-module-director/fi_FI/LC_MESSAGES/icinga.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-01 11:10+0000\n" +"POT-Creation-Date: 2022-12-16 14:09+0000\n" "PO-Revision-Date: 2020-04-27 14:34+0200\n" "Last-Translator: Mikko Peltokangas \n" "Language-Team: \n" @@ -53,7 +53,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/JobController.php:89 #: sources.d/icingaweb2-module-director/application/controllers/ServicesController.php:36 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:673 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:414 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:418 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:129 msgid "Add to Basket" msgstr "" @@ -73,8 +73,8 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:612 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/DirectorBaseActionBar.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ActionController.php:182 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:275 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:635 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:279 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:647 msgid "back" msgstr "" @@ -329,20 +329,20 @@ msgid "Diff" msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:443 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:715 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 #, php-format msgid "The following modifications are visible in this %s only..." msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:447 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:719 -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:731 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:29 #, fuzzy msgid "configuration branch" msgstr "Asetukset" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:452 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:739 msgid "...and the modifications below are already in the main branch:" msgstr "" @@ -694,7 +694,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ImportsourceController.php:148 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:548 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/AutomationObjectActionBar.php:44 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:378 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:382 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneImportSourceForm.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneSyncRuleForm.php:35 msgid "Clone" @@ -927,7 +927,7 @@ msgid "Apply \"%s\"" msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:147 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:173 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 msgid "Modifying Templates" msgstr "" @@ -1500,7 +1500,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:159 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:133 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:102 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52 @@ -1582,7 +1582,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:150 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:125 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126 msgid "Caption" msgstr "" @@ -2648,56 +2648,56 @@ msgstr "" msgid "Argument macros" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:103 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104 msgid "Other available fields" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:117 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118 msgid "" "There are no data fields available. Please ask an administrator to create " "such" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:129 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130 msgid "The caption which should be displayed" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135 msgid "A description about the field" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51 msgid "Mandatory" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144 msgid "Whether this field should be mandatory" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:146 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 msgid "Optional" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:169 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170 msgid "" "You might want to show this field only when certain conditions are met. " "Otherwise it will not be available and values eventually set before will be " "cleared once stored" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:183 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184 msgid "Show based on filter" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:193 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:927 msgid "Delete" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:196 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197 msgid "Field has been removed" msgstr "" @@ -4017,7 +4017,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:62 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:612 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:624 msgid "Merge" msgstr "" @@ -4266,12 +4266,16 @@ msgstr "" msgid "Automate all tasks" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:19 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:21 #, php-format msgid "You're currently working in a Configuration Branch: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:28 +msgid "You're currently working in the main Configuration Branch" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:34 msgid "Prepare your configuration in a safe Environment" msgstr "" @@ -5897,7 +5901,7 @@ msgid "Create a new object" msgstr "" #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/TemplateActionBar.php:23 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:146 msgid "Create a new Template" msgstr "" @@ -5917,73 +5921,73 @@ msgstr "" msgid "Switch to Table view" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:103 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:104 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectTabs.php:51 #, php-format msgid "Add %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:144 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 msgid "Creating Templates" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:181 msgid "Modifying Apply Rules" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:211 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:215 #, php-format msgid "Clone: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:214 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 msgid "Cloning Templates" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:222 msgid "Cloning Apply Rules" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:247 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 #, php-format msgid "Custom fields: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:255 msgid "Managing Fields" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:301 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:305 #, php-format msgid "Activity Log: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:326 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:330 #, php-format msgid "Group membership: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:345 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:349 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:116 #, php-format msgid "Template: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:364 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:368 msgid "Usage" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:432 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:436 #, php-format msgid "Add new Icinga %s template" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:443 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:447 #, php-format msgid "Add %s: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:449 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:453 #, php-format msgid "Add new Icinga %s" msgstr "" @@ -7035,36 +7039,51 @@ msgstr "" msgid "Process List" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:27 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:24 +#, fuzzy +msgid "the main configuration branch" +msgstr "Asetukset" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:25 +msgid "This will be part of the next deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:32 +msgid "This will not be part of any deployment, unless being merged" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:36 #, fuzzy msgid "this configuration branch" msgstr "Asetukset" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:34 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:45 +#, fuzzy, php-format +msgid "This object will be created in %s." +msgstr "Kojelauta on poistettu" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:52 #, php-format -msgid "" -"This object will be created in %s. It will not be part of any deployment " -"unless being merged" +msgid "Your changes are going to be stored in %s." msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:42 -#, php-format -msgid "" -"Your changes will be stored in %s. The'll not be part of any deployment " -"unless being merged" -msgstr "" - -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:57 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:69 #, fuzzy, php-format msgid "This object has been created in %s" msgstr "Kojelauta on poistettu" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:62 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:74 #, php-format msgid "This object has modifications visible only in %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:23 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:21 +msgid "" +"You're currently in the master branch, your changes will make part of the " +"next Deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:28 #, php-format msgid "" "Showing a branched view, with potential changes being visible only in this %s" diff --git a/src/icingaweb2-module-director/fr_FR/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/fr_FR/LC_MESSAGES/icinga.po index 0a06f1cd..4160fd81 100644 --- a/src/icingaweb2-module-director/fr_FR/LC_MESSAGES/icinga.po +++ b/src/icingaweb2-module-director/fr_FR/LC_MESSAGES/icinga.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-01 11:10+0000\n" +"POT-Creation-Date: 2022-12-16 14:09+0000\n" "PO-Revision-Date: 2021-07-13 14:54-0400\n" "Last-Translator: Mathieu Lutfy \n" "Language-Team: \n" @@ -53,7 +53,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/JobController.php:89 #: sources.d/icingaweb2-module-director/application/controllers/ServicesController.php:36 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:673 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:414 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:418 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:129 msgid "Add to Basket" msgstr "" @@ -73,8 +73,8 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:612 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/DirectorBaseActionBar.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ActionController.php:182 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:275 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:635 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:279 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:647 msgid "back" msgstr "" @@ -329,19 +329,19 @@ msgid "Diff" msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:443 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:715 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 #, php-format msgid "The following modifications are visible in this %s only..." msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:447 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:719 -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:731 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:29 msgid "configuration branch" msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:452 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:739 msgid "...and the modifications below are already in the main branch:" msgstr "" @@ -693,7 +693,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ImportsourceController.php:148 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:548 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/AutomationObjectActionBar.php:44 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:378 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:382 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneImportSourceForm.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneSyncRuleForm.php:35 msgid "Clone" @@ -925,7 +925,7 @@ msgid "Apply \"%s\"" msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:147 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:173 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 #, fuzzy msgid "Modifying Templates" msgstr "Modifier « %s »" @@ -1501,7 +1501,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:159 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:133 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:102 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52 @@ -1583,7 +1583,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:150 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:125 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126 msgid "Caption" msgstr "" @@ -2646,56 +2646,56 @@ msgstr "Champs suggérés" msgid "Argument macros" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:103 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104 msgid "Other available fields" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:117 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118 msgid "" "There are no data fields available. Please ask an administrator to create " "such" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:129 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130 msgid "The caption which should be displayed" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135 msgid "A description about the field" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51 msgid "Mandatory" msgstr "Obligatoire" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144 msgid "Whether this field should be mandatory" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:146 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 msgid "Optional" msgstr "Optionnel" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:169 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170 msgid "" "You might want to show this field only when certain conditions are met. " "Otherwise it will not be available and values eventually set before will be " "cleared once stored" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:183 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184 msgid "Show based on filter" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:193 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:927 msgid "Delete" msgstr "Supprimer" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:196 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197 msgid "Field has been removed" msgstr "" @@ -4015,7 +4015,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:62 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:612 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:624 msgid "Merge" msgstr "" @@ -4263,12 +4263,16 @@ msgstr "" msgid "Automate all tasks" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:19 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:21 #, php-format msgid "You're currently working in a Configuration Branch: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:28 +msgid "You're currently working in the main Configuration Branch" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:34 msgid "Prepare your configuration in a safe Environment" msgstr "" @@ -5891,7 +5895,7 @@ msgid "Create a new object" msgstr "" #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/TemplateActionBar.php:23 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:146 msgid "Create a new Template" msgstr "" @@ -5911,74 +5915,74 @@ msgstr "" msgid "Switch to Table view" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:103 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:104 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectTabs.php:51 #, php-format msgid "Add %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:144 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 msgid "Creating Templates" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:181 #, fuzzy msgid "Modifying Apply Rules" msgstr "Modifier « %s »" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:211 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:215 #, php-format msgid "Clone: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:214 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 msgid "Cloning Templates" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:222 msgid "Cloning Apply Rules" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:247 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 #, php-format msgid "Custom fields: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:255 msgid "Managing Fields" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:301 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:305 #, php-format msgid "Activity Log: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:326 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:330 #, php-format msgid "Group membership: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:345 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:349 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:116 #, php-format msgid "Template: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:364 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:368 msgid "Usage" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:432 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:436 #, php-format msgid "Add new Icinga %s template" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:443 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:447 #, php-format msgid "Add %s: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:449 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:453 #, php-format msgid "Add new Icinga %s" msgstr "" @@ -7029,35 +7033,49 @@ msgstr "" msgid "Process List" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:27 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:24 +msgid "the main configuration branch" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:25 +msgid "This will be part of the next deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:32 +msgid "This will not be part of any deployment, unless being merged" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:36 msgid "this configuration branch" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:34 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:45 #, php-format -msgid "" -"This object will be created in %s. It will not be part of any deployment " -"unless being merged" +msgid "This object will be created in %s." msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:42 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:52 #, php-format -msgid "" -"Your changes will be stored in %s. The'll not be part of any deployment " -"unless being merged" +msgid "Your changes are going to be stored in %s." msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:57 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:69 #, php-format msgid "This object has been created in %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:62 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:74 #, php-format msgid "This object has modifications visible only in %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:23 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:21 +msgid "" +"You're currently in the master branch, your changes will make part of the " +"next Deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:28 #, php-format msgid "" "Showing a branched view, with potential changes being visible only in this %s" diff --git a/src/icingaweb2-module-director/it_IT/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/it_IT/LC_MESSAGES/icinga.po index 41fddb9c..9b1bc34c 100644 --- a/src/icingaweb2-module-director/it_IT/LC_MESSAGES/icinga.po +++ b/src/icingaweb2-module-director/it_IT/LC_MESSAGES/icinga.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-01 11:10+0000\n" +"POT-Creation-Date: 2022-12-16 14:09+0000\n" "PO-Revision-Date: 2020-04-27 14:45+0200\n" "Last-Translator: Francesco Mazzi \n" "Language-Team: \n" @@ -55,7 +55,7 @@ msgstr "Baskets" #: sources.d/icingaweb2-module-director/application/controllers/JobController.php:89 #: sources.d/icingaweb2-module-director/application/controllers/ServicesController.php:36 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:673 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:414 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:418 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:129 msgid "Add to Basket" msgstr "Aggiungere a Basket" @@ -75,8 +75,8 @@ msgstr "Aggiungi oggetti selezionati al basket di configurazione" #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:612 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/DirectorBaseActionBar.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ActionController.php:182 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:275 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:635 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:279 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:647 msgid "back" msgstr "indietro" @@ -344,20 +344,20 @@ msgid "Diff" msgstr "Diff" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:443 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:715 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 #, php-format msgid "The following modifications are visible in this %s only..." msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:447 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:719 -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:731 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:29 #, fuzzy msgid "configuration branch" msgstr "Formato configurazione" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:452 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:739 msgid "...and the modifications below are already in the main branch:" msgstr "" @@ -720,7 +720,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ImportsourceController.php:148 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:548 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/AutomationObjectActionBar.php:44 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:378 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:382 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneImportSourceForm.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneSyncRuleForm.php:35 msgid "Clone" @@ -964,7 +964,7 @@ msgid "Apply \"%s\"" msgstr "Applica \"%s\"" #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:147 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:173 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 #, fuzzy msgid "Modifying Templates" msgstr "Scelta del template Host" @@ -1579,7 +1579,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:159 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:133 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:102 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52 @@ -1688,7 +1688,7 @@ msgstr "" "proprietà personalizzata nella configurazione resa da Icinga." #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:150 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:125 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126 msgid "Caption" msgstr "Didascalia" @@ -2889,41 +2889,41 @@ msgstr "Campi suggeriti" msgid "Argument macros" msgstr "Argomento macro" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:103 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104 msgid "Other available fields" msgstr "Altri campi disponibili" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:117 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118 msgid "" "There are no data fields available. Please ask an administrator to create " "such" msgstr "Non sono disponibili campi dati. Un amministratore può crearne alcuni" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:129 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130 msgid "The caption which should be displayed" msgstr "L'etichetta da visualizzare" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135 msgid "A description about the field" msgstr "Una descrizione del campo" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51 #, fuzzy msgid "Mandatory" msgstr "Obbligatorio" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144 #, fuzzy msgid "Whether this field should be mandatory" msgstr "Questo Campo deve essere obbligatorio?" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:146 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 msgid "Optional" msgstr "Opzionale" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:169 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170 msgid "" "You might want to show this field only when certain conditions are met. " "Otherwise it will not be available and values eventually set before will be " @@ -2934,17 +2934,17 @@ msgstr "" "non verrà visualizzato e le proprietà associate verranno rimosse quando il " "campo verrà salvato" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:183 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184 msgid "Show based on filter" msgstr "Mostra in base al filtro" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:193 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:927 msgid "Delete" msgstr "Elimina" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:196 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197 msgid "Field has been removed" msgstr "Il campo è stato rimosso" @@ -4472,7 +4472,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:62 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:612 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:624 #, fuzzy msgid "Merge" msgstr "Unisci" @@ -4744,12 +4744,17 @@ msgstr "Ricevi avvisi quando qualcosa va storto" msgid "Automate all tasks" msgstr "Automatizza tutte le operazioni" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:19 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:21 #, php-format msgid "You're currently working in a Configuration Branch: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:28 +#, fuzzy +msgid "You're currently working in the main Configuration Branch" +msgstr "Crea un nuovo Basket di configurazione" + +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:34 msgid "Prepare your configuration in a safe Environment" msgstr "" @@ -6580,7 +6585,7 @@ msgid "Create a new object" msgstr "Crea un nuovo oggetto" #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/TemplateActionBar.php:23 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:146 msgid "Create a new Template" msgstr "Crea un nuovo template" @@ -6600,78 +6605,78 @@ msgstr "Passa alla vista ad albero" msgid "Switch to Table view" msgstr "Passa alla vista Tabella" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:103 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:104 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectTabs.php:51 #, php-format msgid "Add %s" msgstr "%s aggiunto" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:144 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 #, fuzzy msgid "Creating Templates" msgstr "Crea un nuovo template" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:181 #, fuzzy msgid "Modifying Apply Rules" msgstr "Modifica questa Apply Rule" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:211 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:215 #, php-format msgid "Clone: %s" msgstr "Clona %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:214 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 #, fuzzy msgid "Cloning Templates" msgstr "Command Templates" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:222 #, fuzzy msgid "Cloning Apply Rules" msgstr "Regole Apply" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:247 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 #, php-format msgid "Custom fields: %s" msgstr "Campi personalizzati: \"%s\"" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:255 #, fuzzy msgid "Managing Fields" msgstr "Campi dati" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:301 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:305 #, php-format msgid "Activity Log: %s" msgstr "Log di attivitá: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:326 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:330 #, php-format msgid "Group membership: %s" msgstr "Membro del gruppo: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:345 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:349 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:116 #, php-format msgid "Template: %s" msgstr "Tempalte: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:364 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:368 msgid "Usage" msgstr "Utilizzo" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:432 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:436 #, php-format msgid "Add new Icinga %s template" msgstr "Aggiungi nuovo Icinga al template %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:443 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:447 #, php-format msgid "Add %s: %s" msgstr "Aggiungere %s: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:449 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:453 #, php-format msgid "Add new Icinga %s" msgstr "Aggiungi un nuovo Icinga %s" @@ -7800,36 +7805,52 @@ msgstr "non supportato" msgid "Process List" msgstr "Elenco dei processi" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:27 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:24 +#, fuzzy +msgid "the main configuration branch" +msgstr "Vuoi utilizzare questa configurazione?" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:25 +#, fuzzy +msgid "This will be part of the next deployment" +msgstr "La Porta di un endpoint." + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:32 +msgid "This will not be part of any deployment, unless being merged" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:36 #, fuzzy msgid "this configuration branch" msgstr "Vuoi utilizzare questa configurazione?" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:34 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:45 +#, fuzzy, php-format +msgid "This object will be created in %s." +msgstr "Questo oggetto è stato abilitato" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:52 #, php-format -msgid "" -"This object will be created in %s. It will not be part of any deployment " -"unless being merged" +msgid "Your changes are going to be stored in %s." msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:42 -#, php-format -msgid "" -"Your changes will be stored in %s. The'll not be part of any deployment " -"unless being merged" -msgstr "" - -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:57 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:69 #, fuzzy, php-format msgid "This object has been created in %s" msgstr "Questo oggetto è stato abilitato" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:62 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:74 #, fuzzy, php-format msgid "This object has modifications visible only in %s" msgstr "Questo set è stato ereditato da %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:23 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:21 +msgid "" +"You're currently in the master branch, your changes will make part of the " +"next Deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:28 #, php-format msgid "" "Showing a branched view, with potential changes being visible only in this %s" diff --git a/src/icingaweb2-module-director/ja_JP/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/ja_JP/LC_MESSAGES/icinga.po index 9d522c3c..aa1398ec 100644 --- a/src/icingaweb2-module-director/ja_JP/LC_MESSAGES/icinga.po +++ b/src/icingaweb2-module-director/ja_JP/LC_MESSAGES/icinga.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-01 11:10+0000\n" +"POT-Creation-Date: 2022-12-16 14:09+0000\n" "PO-Revision-Date: 2020-04-27 14:54+0200\n" "Last-Translator: papillon326 \n" "Language-Team: \n" @@ -54,7 +54,7 @@ msgstr "バスケット" #: sources.d/icingaweb2-module-director/application/controllers/JobController.php:89 #: sources.d/icingaweb2-module-director/application/controllers/ServicesController.php:36 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:673 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:414 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:418 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:129 msgid "Add to Basket" msgstr "バスケットに追加" @@ -74,8 +74,8 @@ msgstr "選択したオブジェクトを構成バスケットに追加する" #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:612 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/DirectorBaseActionBar.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ActionController.php:182 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:275 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:635 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:279 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:647 msgid "back" msgstr "戻る" @@ -341,20 +341,20 @@ msgid "Diff" msgstr "差分" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:443 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:715 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 #, php-format msgid "The following modifications are visible in this %s only..." msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:447 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:719 -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:731 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:29 #, fuzzy msgid "configuration branch" msgstr "設定フォーマット" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:452 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:739 msgid "...and the modifications below are already in the main branch:" msgstr "" @@ -709,7 +709,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ImportsourceController.php:148 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:548 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/AutomationObjectActionBar.php:44 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:378 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:382 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneImportSourceForm.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneSyncRuleForm.php:35 msgid "Clone" @@ -948,7 +948,7 @@ msgid "Apply \"%s\"" msgstr "\"%s\"を適用" #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:147 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:173 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 #, fuzzy msgid "Modifying Templates" msgstr "ホストテンプレートチョイス" @@ -1542,7 +1542,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:159 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:133 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:102 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52 @@ -1644,7 +1644,7 @@ msgstr "" "icingaの設定で定義するカスタム変数の名前になります。" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:150 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:125 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126 msgid "Caption" msgstr "キャプション" @@ -2799,11 +2799,11 @@ msgstr "サジェストされたフィールド" msgid "Argument macros" msgstr "引数マクロ" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:103 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104 msgid "Other available fields" msgstr "ほかの利用可能なフィールド" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:117 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118 msgid "" "There are no data fields available. Please ask an administrator to create " "such" @@ -2811,29 +2811,29 @@ msgstr "" "利用可能なデータフィールドがありません。作成するように管理者に依頼してくださ" "い。" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:129 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130 msgid "The caption which should be displayed" msgstr "表示されるキャプション" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135 msgid "A description about the field" msgstr "フィールドについての説明" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51 msgid "Mandatory" msgstr "必須" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144 msgid "Whether this field should be mandatory" msgstr "このフィールドが必須か選択します。" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:146 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 msgid "Optional" msgstr "オプション" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:169 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170 msgid "" "You might want to show this field only when certain conditions are met. " "Otherwise it will not be available and values eventually set before will be " @@ -2843,17 +2843,17 @@ msgstr "" "そうしなければ利用できないでしょう。また、以前に設定された値はいったん格納さ" "れると消去されます" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:183 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184 msgid "Show based on filter" msgstr "フィルタに基づいて表示" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:193 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:927 msgid "Delete" msgstr "削除" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:196 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197 msgid "Field has been removed" msgstr "フィールドが削除されました" @@ -4315,7 +4315,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:62 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:612 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:624 msgid "Merge" msgstr "マージ" @@ -4577,12 +4577,17 @@ msgstr "障害発生時のアラート通知" msgid "Automate all tasks" msgstr "すべてのタスクの自動化" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:19 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:21 #, php-format msgid "You're currently working in a Configuration Branch: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:28 +#, fuzzy +msgid "You're currently working in the main Configuration Branch" +msgstr "新しい構成バスケットを作成" + +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:34 msgid "Prepare your configuration in a safe Environment" msgstr "" @@ -6341,7 +6346,7 @@ msgid "Create a new object" msgstr "新しいオブジェクトを作成" #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/TemplateActionBar.php:23 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:146 msgid "Create a new Template" msgstr "新しいテンプレートを作成" @@ -6361,78 +6366,78 @@ msgstr "ツリー表示に切り替え" msgid "Switch to Table view" msgstr "テーブル表示に切り替え" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:103 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:104 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectTabs.php:51 #, php-format msgid "Add %s" msgstr "追加: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:144 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 #, fuzzy msgid "Creating Templates" msgstr "新しいテンプレートを作成" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:181 #, fuzzy msgid "Modifying Apply Rules" msgstr "この適用ルールを編集" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:211 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:215 #, php-format msgid "Clone: %s" msgstr "複製: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:214 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 #, fuzzy msgid "Cloning Templates" msgstr "コマンドテンプレート" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:222 #, fuzzy msgid "Cloning Apply Rules" msgstr "ルールを適用" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:247 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 #, php-format msgid "Custom fields: %s" msgstr "カスタムフィールド: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:255 #, fuzzy msgid "Managing Fields" msgstr "データフィールド" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:301 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:305 #, php-format msgid "Activity Log: %s" msgstr "アクティビティログ: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:326 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:330 #, php-format msgid "Group membership: %s" msgstr "グループのメンバーシップ: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:345 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:349 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:116 #, php-format msgid "Template: %s" msgstr "テンプレート: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:364 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:368 msgid "Usage" msgstr "使用状況" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:432 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:436 #, php-format msgid "Add new Icinga %s template" msgstr "新しいIcinga %s テンプレートの追加" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:443 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:447 #, php-format msgid "Add %s: %s" msgstr "%sを追加: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:449 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:453 #, php-format msgid "Add new Icinga %s" msgstr "新しいIcinga %s の追加" @@ -7523,36 +7528,52 @@ msgstr "" msgid "Process List" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:27 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:24 +#, fuzzy +msgid "the main configuration branch" +msgstr "設定を保存" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:25 +#, fuzzy +msgid "This will be part of the next deployment" +msgstr "エンドポイントのポート" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:32 +msgid "This will not be part of any deployment, unless being merged" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:36 #, fuzzy msgid "this configuration branch" msgstr "設定を保存" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:34 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:45 +#, fuzzy, php-format +msgid "This object will be created in %s." +msgstr "このオブジェクトは有効化されています。" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:52 #, php-format -msgid "" -"This object will be created in %s. It will not be part of any deployment " -"unless being merged" +msgid "Your changes are going to be stored in %s." msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:42 -#, php-format -msgid "" -"Your changes will be stored in %s. The'll not be part of any deployment " -"unless being merged" -msgstr "" - -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:57 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:69 #, fuzzy, php-format msgid "This object has been created in %s" msgstr "このオブジェクトは有効化されています。" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:62 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:74 #, fuzzy, php-format msgid "This object has modifications visible only in %s" msgstr "このサービスはこのホストでブラックリストに登録されています" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:23 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:21 +msgid "" +"You're currently in the master branch, your changes will make part of the " +"next Deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:28 #, php-format msgid "" "Showing a branched view, with potential changes being visible only in this %s" diff --git a/src/icingaweb2-module-director/pl/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/pl/LC_MESSAGES/icinga.po index dd4247f2..af65de7b 100644 --- a/src/icingaweb2-module-director/pl/LC_MESSAGES/icinga.po +++ b/src/icingaweb2-module-director/pl/LC_MESSAGES/icinga.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Icinga L10n 1e71984\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-01 11:10+0000\n" +"POT-Creation-Date: 2022-12-16 14:09+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -49,7 +49,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/JobController.php:89 #: sources.d/icingaweb2-module-director/application/controllers/ServicesController.php:36 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:673 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:414 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:418 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:129 msgid "Add to Basket" msgstr "" @@ -69,8 +69,8 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:612 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/DirectorBaseActionBar.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ActionController.php:182 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:275 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:635 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:279 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:647 msgid "back" msgstr "" @@ -323,19 +323,19 @@ msgid "Diff" msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:443 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:715 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 #, php-format msgid "The following modifications are visible in this %s only..." msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:447 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:719 -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:731 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:29 msgid "configuration branch" msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:452 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:739 msgid "...and the modifications below are already in the main branch:" msgstr "" @@ -687,7 +687,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ImportsourceController.php:148 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:548 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/AutomationObjectActionBar.php:44 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:378 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:382 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneImportSourceForm.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneSyncRuleForm.php:35 msgid "Clone" @@ -918,7 +918,7 @@ msgid "Apply \"%s\"" msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:147 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:173 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 msgid "Modifying Templates" msgstr "" @@ -1491,7 +1491,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:159 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:133 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:102 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52 @@ -1573,7 +1573,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:150 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:125 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126 msgid "Caption" msgstr "" @@ -2636,56 +2636,56 @@ msgstr "" msgid "Argument macros" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:103 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104 msgid "Other available fields" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:117 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118 msgid "" "There are no data fields available. Please ask an administrator to create " "such" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:129 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130 msgid "The caption which should be displayed" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135 msgid "A description about the field" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51 msgid "Mandatory" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144 msgid "Whether this field should be mandatory" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:146 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 msgid "Optional" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:169 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170 msgid "" "You might want to show this field only when certain conditions are met. " "Otherwise it will not be available and values eventually set before will be " "cleared once stored" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:183 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184 msgid "Show based on filter" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:193 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:927 msgid "Delete" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:196 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197 msgid "Field has been removed" msgstr "" @@ -4005,7 +4005,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:62 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:612 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:624 msgid "Merge" msgstr "" @@ -4253,12 +4253,16 @@ msgstr "" msgid "Automate all tasks" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:19 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:21 #, php-format msgid "You're currently working in a Configuration Branch: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:28 +msgid "You're currently working in the main Configuration Branch" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:34 msgid "Prepare your configuration in a safe Environment" msgstr "" @@ -5879,7 +5883,7 @@ msgid "Create a new object" msgstr "" #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/TemplateActionBar.php:23 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:146 msgid "Create a new Template" msgstr "" @@ -5899,73 +5903,73 @@ msgstr "" msgid "Switch to Table view" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:103 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:104 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectTabs.php:51 #, php-format msgid "Add %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:144 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 msgid "Creating Templates" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:181 msgid "Modifying Apply Rules" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:211 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:215 #, php-format msgid "Clone: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:214 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 msgid "Cloning Templates" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:222 msgid "Cloning Apply Rules" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:247 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 #, php-format msgid "Custom fields: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:255 msgid "Managing Fields" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:301 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:305 #, php-format msgid "Activity Log: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:326 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:330 #, php-format msgid "Group membership: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:345 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:349 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:116 #, php-format msgid "Template: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:364 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:368 msgid "Usage" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:432 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:436 #, php-format msgid "Add new Icinga %s template" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:443 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:447 #, php-format msgid "Add %s: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:449 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:453 #, php-format msgid "Add new Icinga %s" msgstr "" @@ -7016,35 +7020,49 @@ msgstr "" msgid "Process List" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:27 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:24 +msgid "the main configuration branch" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:25 +msgid "This will be part of the next deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:32 +msgid "This will not be part of any deployment, unless being merged" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:36 msgid "this configuration branch" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:34 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:45 #, php-format -msgid "" -"This object will be created in %s. It will not be part of any deployment " -"unless being merged" +msgid "This object will be created in %s." msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:42 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:52 #, php-format -msgid "" -"Your changes will be stored in %s. The'll not be part of any deployment " -"unless being merged" +msgid "Your changes are going to be stored in %s." msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:57 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:69 #, php-format msgid "This object has been created in %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:62 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:74 #, php-format msgid "This object has modifications visible only in %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:23 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:21 +msgid "" +"You're currently in the master branch, your changes will make part of the " +"next Deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:28 #, php-format msgid "" "Showing a branched view, with potential changes being visible only in this %s" diff --git a/src/icingaweb2-module-director/pt_BR/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/pt_BR/LC_MESSAGES/icinga.po index 9b1108db..6c05808f 100644 --- a/src/icingaweb2-module-director/pt_BR/LC_MESSAGES/icinga.po +++ b/src/icingaweb2-module-director/pt_BR/LC_MESSAGES/icinga.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-01 11:10+0000\n" +"POT-Creation-Date: 2022-12-16 14:09+0000\n" "PO-Revision-Date: 2020-04-27 14:55+0200\n" "Last-Translator: Carlos Cesario \n" "Language-Team: \n" @@ -54,7 +54,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/JobController.php:89 #: sources.d/icingaweb2-module-director/application/controllers/ServicesController.php:36 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:673 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:414 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:418 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:129 msgid "Add to Basket" msgstr "" @@ -74,8 +74,8 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:612 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/DirectorBaseActionBar.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ActionController.php:182 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:275 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:635 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:279 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:647 msgid "back" msgstr "" @@ -330,20 +330,20 @@ msgid "Diff" msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:443 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:715 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 #, php-format msgid "The following modifications are visible in this %s only..." msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:447 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:719 -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:731 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:29 #, fuzzy msgid "configuration branch" msgstr "Configuração" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:452 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:739 msgid "...and the modifications below are already in the main branch:" msgstr "" @@ -696,7 +696,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ImportsourceController.php:148 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:548 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/AutomationObjectActionBar.php:44 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:378 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:382 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneImportSourceForm.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneSyncRuleForm.php:35 msgid "Clone" @@ -929,7 +929,7 @@ msgid "Apply \"%s\"" msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:147 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:173 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 msgid "Modifying Templates" msgstr "" @@ -1505,7 +1505,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:159 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:133 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:102 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52 @@ -1587,7 +1587,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:150 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:125 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126 msgid "Caption" msgstr "" @@ -2653,56 +2653,56 @@ msgstr "" msgid "Argument macros" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:103 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104 msgid "Other available fields" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:117 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118 msgid "" "There are no data fields available. Please ask an administrator to create " "such" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:129 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130 msgid "The caption which should be displayed" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135 msgid "A description about the field" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51 msgid "Mandatory" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144 msgid "Whether this field should be mandatory" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:146 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 msgid "Optional" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:169 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170 msgid "" "You might want to show this field only when certain conditions are met. " "Otherwise it will not be available and values eventually set before will be " "cleared once stored" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:183 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184 msgid "Show based on filter" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:193 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:927 msgid "Delete" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:196 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197 msgid "Field has been removed" msgstr "" @@ -4023,7 +4023,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:62 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:612 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:624 msgid "Merge" msgstr "" @@ -4274,12 +4274,16 @@ msgstr "" msgid "Automate all tasks" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:19 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:21 #, php-format msgid "You're currently working in a Configuration Branch: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:28 +msgid "You're currently working in the main Configuration Branch" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:34 msgid "Prepare your configuration in a safe Environment" msgstr "" @@ -5907,7 +5911,7 @@ msgid "Create a new object" msgstr "" #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/TemplateActionBar.php:23 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:146 msgid "Create a new Template" msgstr "" @@ -5927,75 +5931,75 @@ msgstr "" msgid "Switch to Table view" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:103 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:104 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectTabs.php:51 #, php-format msgid "Add %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:144 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 msgid "Creating Templates" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:181 #, fuzzy msgid "Modifying Apply Rules" msgstr "Notificações" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:211 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:215 #, php-format msgid "Clone: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:214 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 msgid "Cloning Templates" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:222 #, fuzzy msgid "Cloning Apply Rules" msgstr "Notificações" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:247 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 #, php-format msgid "Custom fields: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:255 msgid "Managing Fields" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:301 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:305 #, php-format msgid "Activity Log: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:326 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:330 #, php-format msgid "Group membership: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:345 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:349 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:116 #, php-format msgid "Template: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:364 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:368 msgid "Usage" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:432 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:436 #, php-format msgid "Add new Icinga %s template" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:443 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:447 #, php-format msgid "Add %s: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:449 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:453 #, php-format msgid "Add new Icinga %s" msgstr "" @@ -7047,36 +7051,51 @@ msgstr "" msgid "Process List" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:27 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:24 +#, fuzzy +msgid "the main configuration branch" +msgstr "Nenhuma configuração para o backend %s" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:25 +msgid "This will be part of the next deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:32 +msgid "This will not be part of any deployment, unless being merged" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:36 #, fuzzy msgid "this configuration branch" msgstr "Nenhuma configuração para o backend %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:34 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:45 +#, fuzzy, php-format +msgid "This object will be created in %s." +msgstr "O dashboard foi removido" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:52 #, php-format -msgid "" -"This object will be created in %s. It will not be part of any deployment " -"unless being merged" +msgid "Your changes are going to be stored in %s." msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:42 -#, php-format -msgid "" -"Your changes will be stored in %s. The'll not be part of any deployment " -"unless being merged" -msgstr "" - -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:57 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:69 #, fuzzy, php-format msgid "This object has been created in %s" msgstr "O dashboard foi removido" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:62 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:74 #, php-format msgid "This object has modifications visible only in %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:23 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:21 +msgid "" +"You're currently in the master branch, your changes will make part of the " +"next Deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:28 #, php-format msgid "" "Showing a branched view, with potential changes being visible only in this %s" diff --git a/src/icingaweb2-module-director/ru_RU/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/ru_RU/LC_MESSAGES/icinga.po index 6a4d4a7e..cbd31a27 100644 --- a/src/icingaweb2-module-director/ru_RU/LC_MESSAGES/icinga.po +++ b/src/icingaweb2-module-director/ru_RU/LC_MESSAGES/icinga.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-01 11:10+0000\n" +"POT-Creation-Date: 2022-12-16 14:09+0000\n" "PO-Revision-Date: 2021-11-03 12:23+0500\n" "Last-Translator: Dmitriy Q \n" "Language-Team: TranslAster \n" @@ -55,7 +55,7 @@ msgstr "Корзины" #: sources.d/icingaweb2-module-director/application/controllers/JobController.php:89 #: sources.d/icingaweb2-module-director/application/controllers/ServicesController.php:36 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:673 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:414 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:418 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:129 msgid "Add to Basket" msgstr "Добавить в корзину" @@ -75,8 +75,8 @@ msgstr "Добавить выбранные объекты в корзину к #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:612 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/DirectorBaseActionBar.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ActionController.php:182 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:275 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:635 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:279 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:647 msgid "back" msgstr "назад" @@ -340,19 +340,19 @@ msgid "Diff" msgstr "Разница" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:443 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:715 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 #, php-format msgid "The following modifications are visible in this %s only..." msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:447 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:719 -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:731 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:29 msgid "configuration branch" msgstr "ветвь конфигурации" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:452 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:739 msgid "...and the modifications below are already in the main branch:" msgstr "...и приведенные ниже изменения уже находятся в основной ветке:" @@ -704,7 +704,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/controllers/ImportsourceController.php:148 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:548 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/AutomationObjectActionBar.php:44 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:378 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:382 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneImportSourceForm.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneSyncRuleForm.php:35 msgid "Clone" @@ -944,7 +944,7 @@ msgid "Apply \"%s\"" msgstr "Применить \"%s\"" #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:147 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:173 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 #, fuzzy msgid "Modifying Templates" msgstr "Выбор шаблона узла" @@ -1533,7 +1533,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:159 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:133 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:102 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52 @@ -1621,7 +1621,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:150 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:125 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126 msgid "Caption" msgstr "Подпись" @@ -2709,39 +2709,39 @@ msgstr "" msgid "Argument macros" msgstr "Макрос аргумента" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:103 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104 msgid "Other available fields" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:117 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118 msgid "" "There are no data fields available. Please ask an administrator to create " "such" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:129 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130 msgid "The caption which should be displayed" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135 msgid "A description about the field" msgstr "Описание этого поля" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51 msgid "Mandatory" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144 msgid "Whether this field should be mandatory" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:146 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 msgid "Optional" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:169 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170 msgid "" "You might want to show this field only when certain conditions are met. " "Otherwise it will not be available and values eventually set before will be " @@ -2751,17 +2751,17 @@ msgstr "" "условий. В противном случае оно не будет доступно и значения заданные ранее " "в конечном итоге будут очищены после сохранения" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:183 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184 msgid "Show based on filter" msgstr "" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:193 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:927 msgid "Delete" msgstr "Удалить" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:196 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197 msgid "Field has been removed" msgstr "Поле было удалено" @@ -4143,7 +4143,7 @@ msgid "" msgstr "" #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:62 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:612 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:624 msgid "Merge" msgstr "" @@ -4401,12 +4401,17 @@ msgstr "" msgid "Automate all tasks" msgstr "Автоматизация всех задач" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:19 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:21 #, php-format msgid "You're currently working in a Configuration Branch: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:28 +#, fuzzy +msgid "You're currently working in the main Configuration Branch" +msgstr "Создание новой корзины конфигурации" + +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:34 msgid "Prepare your configuration in a safe Environment" msgstr "" @@ -6050,7 +6055,7 @@ msgid "Create a new object" msgstr "Создание нового объекта" #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/TemplateActionBar.php:23 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:146 msgid "Create a new Template" msgstr "Создание нового шаблона" @@ -6070,78 +6075,78 @@ msgstr "" msgid "Switch to Table view" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:103 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:104 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectTabs.php:51 #, php-format msgid "Add %s" msgstr "Добавить %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:144 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 #, fuzzy msgid "Creating Templates" msgstr "Создание нового шаблона" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:181 #, fuzzy msgid "Modifying Apply Rules" msgstr "Уведомления" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:211 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:215 #, php-format msgid "Clone: %s" msgstr "Клонировние: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:214 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 #, fuzzy msgid "Cloning Templates" msgstr "Шаблоны команды" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:222 #, fuzzy msgid "Cloning Apply Rules" msgstr "Применить правила" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:247 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 #, php-format msgid "Custom fields: %s" msgstr "Пользовательское поле: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:255 #, fuzzy msgid "Managing Fields" msgstr "Поля данных" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:301 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:305 #, php-format msgid "Activity Log: %s" msgstr "Журнал активности: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:326 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:330 #, php-format msgid "Group membership: %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:345 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:349 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:116 #, php-format msgid "Template: %s" msgstr "Шаблон: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:364 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:368 msgid "Usage" msgstr "Использование" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:432 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:436 #, php-format msgid "Add new Icinga %s template" msgstr "Добавить новый шаблон %s Icinga" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:443 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:447 #, php-format msgid "Add %s: %s" msgstr "Добавить %s: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:449 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:453 #, php-format msgid "Add new Icinga %s" msgstr "Добавить новый %s Icinga" @@ -7213,35 +7218,50 @@ msgstr "" msgid "Process List" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:27 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:24 +#, fuzzy +msgid "the main configuration branch" +msgstr "эта ветка конфигурации" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:25 +msgid "This will be part of the next deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:32 +msgid "This will not be part of any deployment, unless being merged" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:36 msgid "this configuration branch" msgstr "эта ветка конфигурации" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:34 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:45 +#, fuzzy, php-format +msgid "This object will be created in %s." +msgstr "Объект был воссоздан заново" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:52 #, php-format -msgid "" -"This object will be created in %s. It will not be part of any deployment " -"unless being merged" +msgid "Your changes are going to be stored in %s." msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:42 -#, php-format -msgid "" -"Your changes will be stored in %s. The'll not be part of any deployment " -"unless being merged" -msgstr "" - -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:57 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:69 #, fuzzy, php-format msgid "This object has been created in %s" msgstr "Объект был воссоздан заново" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:62 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:74 #, php-format msgid "This object has modifications visible only in %s" msgstr "" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:23 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:21 +msgid "" +"You're currently in the master branch, your changes will make part of the " +"next Deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:28 #, php-format msgid "" "Showing a branched view, with potential changes being visible only in this %s" diff --git a/src/icingaweb2-module-director/uk_UA/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/uk_UA/LC_MESSAGES/icinga.po index ea13d023..44415656 100644 --- a/src/icingaweb2-module-director/uk_UA/LC_MESSAGES/icinga.po +++ b/src/icingaweb2-module-director/uk_UA/LC_MESSAGES/icinga.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-01 11:10+0000\n" +"POT-Creation-Date: 2022-12-16 14:09+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -54,7 +54,7 @@ msgstr "Кошики" #: sources.d/icingaweb2-module-director/application/controllers/JobController.php:89 #: sources.d/icingaweb2-module-director/application/controllers/ServicesController.php:36 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:673 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:414 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:418 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:129 msgid "Add to Basket" msgstr "Додати до кошика" @@ -74,8 +74,8 @@ msgstr "Додати обрані об'єкти до кошика налашту #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:612 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/DirectorBaseActionBar.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ActionController.php:182 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:275 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:635 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:279 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:647 msgid "back" msgstr "назад" @@ -338,19 +338,19 @@ msgid "Diff" msgstr "Різниця" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:443 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:715 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 #, php-format msgid "The following modifications are visible in this %s only..." msgstr "Наступні зміни є видимими лише у даному %s..." #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:447 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:719 -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:731 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:29 msgid "configuration branch" msgstr "гілка конфігурації" #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:452 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:727 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:739 msgid "...and the modifications below are already in the main branch:" msgstr "...зміни знизу вже знаходяться у гілці main:" @@ -709,7 +709,7 @@ msgstr "Зміни джерел імпорту" #: sources.d/icingaweb2-module-director/application/controllers/ImportsourceController.php:148 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:548 #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/AutomationObjectActionBar.php:44 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:378 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:382 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneImportSourceForm.php:35 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/CloneSyncRuleForm.php:35 msgid "Clone" @@ -949,7 +949,7 @@ msgid "Apply \"%s\"" msgstr "Застосувати \"%s\"" #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:147 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:173 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 msgid "Modifying Templates" msgstr "Редагування шаблонів" @@ -1549,7 +1549,7 @@ msgstr "" #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:159 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:133 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:102 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52 @@ -1654,7 +1654,7 @@ msgstr "" "після розгортання." #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:150 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:125 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126 msgid "Caption" msgstr "Напис" @@ -2816,39 +2816,39 @@ msgstr "Запропоновані поля" msgid "Argument macros" msgstr "Макроси аргументів" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:103 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104 msgid "Other available fields" msgstr "Інші доступні поля" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:117 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118 msgid "" "There are no data fields available. Please ask an administrator to create " "such" msgstr "Відсутні поля даних. Будь ласка, попросіть адміністратора їх створити" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:129 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130 msgid "The caption which should be displayed" msgstr "Напис який буде показано" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135 msgid "A description about the field" msgstr "Опис поля" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142 -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51 msgid "Mandatory" msgstr "Обов'язково" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144 msgid "Whether this field should be mandatory" msgstr "Чи повинне це поле бути обов'язковим" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:146 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147 msgid "Optional" msgstr "Опціонально" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:169 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170 msgid "" "You might want to show this field only when certain conditions are met. " "Otherwise it will not be available and values eventually set before will be " @@ -2857,17 +2857,17 @@ msgstr "" "Ви можете показувати це поле лише коли виконуються певні умови. Інакше поле " "не буде доступним та значення задані раніше будуть очищені при збереженні" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:183 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184 msgid "Show based on filter" msgstr "Показати в залежності від фільтру" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:193 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:927 msgid "Delete" msgstr "Видалити" -#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:196 +#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197 msgid "Field has been removed" msgstr "Поле було видалено" @@ -4361,7 +4361,7 @@ msgstr "" "буде створювати або видаляти об'єкти." #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:62 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:612 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:624 msgid "Merge" msgstr "Злити" @@ -4629,12 +4629,17 @@ msgstr "Отримувати сповіщення коли щось іде не msgid "Automate all tasks" msgstr "Автоматизувати всі завдання" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:19 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:21 #, php-format msgid "You're currently working in a Configuration Branch: %s" msgstr "Наразі ви працюєте у гілці конфігурації: %s" -#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:24 +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:28 +#, fuzzy +msgid "You're currently working in the main Configuration Branch" +msgstr "Наразі ви працюєте у гілці конфігурації: %s" + +#: sources.d/icingaweb2-module-director/library/Director/Dashboard/BranchesDashboard.php:34 msgid "Prepare your configuration in a safe Environment" msgstr "Підготуйте вашу конфігурацію у безпечному оточенні" @@ -6418,7 +6423,7 @@ msgid "Create a new object" msgstr "Створити новий об'єкт" #: sources.d/icingaweb2-module-director/library/Director/Web/ActionBar/TemplateActionBar.php:23 -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:146 msgid "Create a new Template" msgstr "Створити новий шаблон" @@ -6438,73 +6443,73 @@ msgstr "Переключитись на вид дерева" msgid "Switch to Table view" msgstr "Перемкнути до табличного вигляду" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:103 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:104 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectTabs.php:51 #, php-format msgid "Add %s" msgstr "Додати %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:144 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:145 msgid "Creating Templates" msgstr "Створити шаблони" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:177 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:181 msgid "Modifying Apply Rules" msgstr "Редагувати правила призначення" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:211 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:215 #, php-format msgid "Clone: %s" msgstr "Клонувати: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:214 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 msgid "Cloning Templates" msgstr "Клонувати шаблони" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:218 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:222 msgid "Cloning Apply Rules" msgstr "Клонувати правила призначення" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:247 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 #, php-format msgid "Custom fields: %s" msgstr "Користувацькі поля: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:251 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:255 msgid "Managing Fields" msgstr "Управління полями даних" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:301 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:305 #, php-format msgid "Activity Log: %s" msgstr "Лог дій: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:326 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:330 #, php-format msgid "Group membership: %s" msgstr "Участь в групах: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:345 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:349 #: sources.d/icingaweb2-module-director/library/Director/Web/Controller/TemplateController.php:116 #, php-format msgid "Template: %s" msgstr "Шаблон: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:364 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:368 msgid "Usage" msgstr "Використання" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:432 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:436 #, php-format msgid "Add new Icinga %s template" msgstr "Додати новий шаблон Icinga %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:443 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:447 #, php-format msgid "Add %s: %s" msgstr "Додати %s: %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:449 +#: sources.d/icingaweb2-module-director/library/Director/Web/Controller/ObjectController.php:453 #, php-format msgid "Add new Icinga %s" msgstr "Додати новий %s Icinga" @@ -7600,39 +7605,54 @@ msgstr "не підтримується" msgid "Process List" msgstr "Список процесів" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:27 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:24 +#, fuzzy +msgid "the main configuration branch" +msgstr "ця гілка конфігурації" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:25 +#, fuzzy +msgid "This will be part of the next deployment" +msgstr "Порт кінцевої точки." + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:32 +#, fuzzy +msgid "This will not be part of any deployment, unless being merged" +msgstr "" +"Ваші зміни будуть збережені у %s. Вони не будуть частиною розгортання до " +"злиття" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:36 msgid "this configuration branch" msgstr "ця гілка конфігурації" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:34 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:45 #, fuzzy, php-format -msgid "" -"This object will be created in %s. It will not be part of any deployment " -"unless being merged" -msgstr "" -"Ваші зміни будуть збережені у %s. Вони не будуть частиною розгортання до " -"злиття" +msgid "This object will be created in %s." +msgstr "Цей об'єкт було створено у %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:42 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:52 #, php-format -msgid "" -"Your changes will be stored in %s. The'll not be part of any deployment " -"unless being merged" +msgid "Your changes are going to be stored in %s." msgstr "" -"Ваші зміни будуть збережені у %s. Вони не будуть частиною розгортання до " -"злиття" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:57 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:69 #, php-format msgid "This object has been created in %s" msgstr "Цей об'єкт було створено у %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:62 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectHint.php:74 #, php-format msgid "This object has modifications visible only in %s" msgstr "Цей об'єкт має зміни доступні лише у %s" -#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:23 +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:21 +msgid "" +"You're currently in the master branch, your changes will make part of the " +"next Deployment" +msgstr "" + +#: sources.d/icingaweb2-module-director/library/Director/Web/Widget/BranchedObjectsHint.php:28 #, php-format msgid "" "Showing a branched view, with potential changes being visible only in this %s" @@ -7839,6 +7859,14 @@ msgstr "Було змінено %s об'єктів" msgid "Show all actions" msgstr "Показати доступні опції" +#, php-format +#~ msgid "" +#~ "Your changes will be stored in %s. The'll not be part of any deployment " +#~ "unless being merged" +#~ msgstr "" +#~ "Ваші зміни будуть збережені у %s. Вони не будуть частиною розгортання до " +#~ "злиття" + #~ msgid "Create a new Service Set" #~ msgstr "Створити новий набір сервісів"