diff --git a/CHANGELOG.md b/CHANGELOG.md index 32f50e132..81882bbf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,32 @@ + +## [HEAD](https://github.com/pluginsGLPI/formcreator/compare/2.13.8..2.13.9) (2024-03-13) + + +### Bug Fixes + +* prevent issue when response body has blank characters ([1b141a3fa](https://github.com/pluginsGLPI/formcreator/commit/1b141a3fa)) +* **command:** typos ([2681eca61](https://github.com/pluginsGLPI/formcreator/commit/2681eca61)) +* **dropdownfield:** ambiguous column in SQL query ([3c0630554](https://github.com/pluginsGLPI/formcreator/commit/3c0630554)) +* **dropdownfield:** incomplete group restriction ([eebcc21f1](https://github.com/pluginsGLPI/formcreator/commit/eebcc21f1)) +* **formansswer:** keep tickets on delete ([b3cc8d2b9](https://github.com/pluginsGLPI/formcreator/commit/b3cc8d2b9)) +* **formanswer:** translate section name for targets ([cb9ce0fb6](https://github.com/pluginsGLPI/formcreator/commit/cb9ce0fb6)) +* **hiddenfield:** escaping problem when displaying default value in question designer ([3818383e1](https://github.com/pluginsGLPI/formcreator/commit/3818383e1)) +* **install:** dashboard setup with pre 2.13.7 appearance ([08d3871e1](https://github.com/pluginsGLPI/formcreator/commit/08d3871e1)) +* **issue:** deduplicate rows whern showing technicians in issues ([8bc96d3dc](https://github.com/pluginsGLPI/formcreator/commit/8bc96d3dc)) +* **issue:** prevent list of all issues in search engine ([55530d976](https://github.com/pluginsGLPI/formcreator/commit/55530d976)) +* **reminder:** visibility ([826881427](https://github.com/pluginsGLPI/formcreator/commit/826881427)) +* **target_actor:** duplicate failure with gours, supliers or users ([d77cde058](https://github.com/pluginsGLPI/formcreator/commit/d77cde058)) +* **target_actor:** groups duplication ([dbfcc796b](https://github.com/pluginsGLPI/formcreator/commit/dbfcc796b)) +* **targetticket:** set location may fail ([75144be06](https://github.com/pluginsGLPI/formcreator/commit/75144be06)) +* **textarea:** support for min/max size and regex ([09682e9b8](https://github.com/pluginsGLPI/formcreator/commit/09682e9b8)) + + +### Features + +* **glpiselectfield:** support Cluster itemtype ([e72e2603c](https://github.com/pluginsGLPI/formcreator/commit/e72e2603c)) + + + ## [2.13.8](https://github.com/pluginsGLPI/formcreator/compare/2.13.7..2.13.8) (2023-111-08) diff --git a/inc/field/actorfield.class.php b/inc/field/actorfield.class.php index a2d4e46ab..5da452a60 100644 --- a/inc/field/actorfield.class.php +++ b/inc/field/actorfield.class.php @@ -129,7 +129,7 @@ public function getRenderedHtml($domain, $canEdit = true): string { 'display_emptychoice' => false, 'values' => array_keys($value), 'valuesnames' => array_values($value), - '_idor_token' => Session::getNewIDORToken(User::getType()), + '_idor_token' => Session::getNewIDORToken(User::getType(), ['entity_restrict' => -1]), ]; $html .= \PluginFormcreatorCommon::jsAjaxDropdown( $fieldName . '[]', diff --git a/inc/field/dropdownfield.class.php b/inc/field/dropdownfield.class.php index 05b088c8c..f0cd3227a 100644 --- a/inc/field/dropdownfield.class.php +++ b/inc/field/dropdownfield.class.php @@ -531,10 +531,22 @@ public function getRenderedHtml($domain, $canEdit = true): string { $dparams = []; $dparams = $this->buildParams($rand); $dparams['display'] = false; +<<<<<<< HEAD $dparams['_idor_token'] = Session::getNewIDORToken($itemtype); if (version_compare(GLPI_VERSION, '10.1') >= 0 && $item->isField('states_id')) { $dparams['condition'] = State::getDisplayConditionForAssistance(); } +======= + + $idor_params = []; + foreach (['condition', 'displaywith', 'entity_restrict', 'right'] as $sensitive_param) { + if (array_key_exists($sensitive_param, $dparams)) { + $idor_params[$sensitive_param] = $dparams[$sensitive_param]; + } + } + $dparams['_idor_token'] = Session::getNewIDORToken($itemtype, $idor_params); + +>>>>>>> support/2.13.0 $html .= $itemtype::dropdown($dparams); $html .= PHP_EOL; $html .= Html::scriptBlock("$(function() { diff --git a/inc/form_validator.class.php b/inc/form_validator.class.php index 303451e32..6e0fd71bc 100644 --- a/inc/form_validator.class.php +++ b/inc/form_validator.class.php @@ -441,8 +441,13 @@ public static function dropdownValidatorUser(): string { 'entity_restrict' => -1, 'itemtype' => User::getType(), 'condition' => Dropdown::addNewCondition($usersCondition), - '_idor_token' => Session::getNewIDORToken(User::getType()), ]; + $params['_idor_token'] = Session::getNewIDORToken( + User::getType(), + [ + 'condition' => $params['condition'], + ] + ); return Html::jsAjaxDropdown( '_validator_users[]', @@ -520,8 +525,13 @@ public static function dropdownValidatorGroup(): string { 'itemtype' => Group::getType(), 'condition' => Dropdown::addNewCondition($groupsCondition), 'display_emptychoice' => false, - '_idor_token' => Session::getNewIDORToken(Group::getType()), ]; + $params['_idor_token'] = Session::getNewIDORToken( + Group::getType(), + [ + 'condition' => $params['condition'], + ] + ); return Html::jsAjaxDropdown( '_validator_groups[]', diff --git a/inc/section.class.php b/inc/section.class.php index 944404c9f..69ef724ca 100644 --- a/inc/section.class.php +++ b/inc/section.class.php @@ -173,8 +173,10 @@ public function prepareInputForUpdate($input) { $input['uuid'] = plugin_formcreator_getUuid(); } - if (!$this->checkConditionSettings($input)) { - $input['show_rule'] = PluginFormcreatorCondition::SHOW_RULE_ALWAYS; + if (!$this->skipChecks) { + if (!$this->checkConditionSettings($input)) { + $input['show_rule'] = PluginFormcreatorCondition::SHOW_RULE_ALWAYS; + } } return $input; diff --git a/install/mysql/plugin_formcreator_2.13.9_empty.sql b/install/mysql/plugin_formcreator_2.13.9_empty.sql new file mode 100644 index 000000000..6838b92fb --- /dev/null +++ b/install/mysql/plugin_formcreator_2.13.9_empty.sql @@ -0,0 +1,352 @@ +-- Database schema +-- Do NOT drop anything here + +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_answers` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `plugin_formcreator_formanswers_id` int unsigned NOT NULL DEFAULT '0', + `plugin_formcreator_questions_id` int unsigned NOT NULL DEFAULT '0', + `answer` longtext, + PRIMARY KEY (`id`), + INDEX `plugin_formcreator_formanswers_id` (`plugin_formcreator_formanswers_id`), + INDEX `plugin_formcreator_questions_id` (`plugin_formcreator_questions_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_categories` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL DEFAULT '', + `comment` mediumtext, + `completename` varchar(255) DEFAULT NULL, + `plugin_formcreator_categories_id` int unsigned NOT NULL DEFAULT '0', + `level` int(11) NOT NULL DEFAULT '1', + `sons_cache` longtext, + `ancestors_cache` longtext, + `knowbaseitemcategories_id` int unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + INDEX `name` (`name`), + INDEX `knowbaseitemcategories_id` (`knowbaseitemcategories_id`), + INDEX `plugin_formcreator_categories_id` (`plugin_formcreator_categories_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_entityconfigs` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `entities_id` int unsigned NOT NULL DEFAULT '0', + `replace_helpdesk` int(11) NOT NULL DEFAULT '-2', + `default_form_list_mode` int(11) NOT NULL DEFAULT '-2', + `sort_order` int(11) NOT NULL DEFAULT '-2', + `is_kb_separated` int(11) NOT NULL DEFAULT '-2', + `is_search_visible` int(11) NOT NULL DEFAULT '-2', + `is_dashboard_visible` int(11) NOT NULL DEFAULT '-2', + `is_header_visible` int(11) NOT NULL DEFAULT '-2', + `is_search_issue_visible` int(11) NOT NULL DEFAULT '-2', + `tile_design` int(11) NOT NULL DEFAULT '-2', + `header` text, + `service_catalog_home` int(11) NOT NULL DEFAULT '-2', + PRIMARY KEY (`id`), + UNIQUE KEY `unicity` (`entities_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_forms` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL DEFAULT '', + `entities_id` int unsigned NOT NULL DEFAULT '0', + `is_recursive` tinyint(1) NOT NULL DEFAULT '0', + `icon` varchar(255) NOT NULL DEFAULT '', + `icon_color` varchar(255) NOT NULL DEFAULT '', + `background_color` varchar(255) NOT NULL DEFAULT '', + `access_rights` tinyint(1) NOT NULL DEFAULT '1', + `description` varchar(255) DEFAULT NULL, + `content` longtext, + `plugin_formcreator_categories_id` int unsigned NOT NULL DEFAULT '0', + `is_active` tinyint(1) NOT NULL DEFAULT '0', + `language` varchar(255) NOT NULL DEFAULT '', + `helpdesk_home` tinyint(1) NOT NULL DEFAULT '0', + `is_deleted` tinyint(1) NOT NULL DEFAULT '0', + `validation_required` tinyint(1) NOT NULL DEFAULT '0', + `usage_count` int(11) NOT NULL DEFAULT '0', + `is_default` tinyint(1) NOT NULL DEFAULT '0', + `is_captcha_enabled` tinyint(1) NOT NULL DEFAULT '0', + `show_rule` int(11) NOT NULL DEFAULT '1' COMMENT 'Conditions setting to show the submit button', + `formanswer_name` varchar(255) NOT NULL DEFAULT '', + `is_visible` tinyint NOT NULL DEFAULT 1, + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + INDEX `entities_id` (`entities_id`), + INDEX `plugin_formcreator_categories_id` (`plugin_formcreator_categories_id`), + FULLTEXT KEY `Search` (`name`,`description`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_formanswers` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL DEFAULT '', + `entities_id` int unsigned NOT NULL DEFAULT '0', + `is_recursive` tinyint(1) NOT NULL DEFAULT '0', + `plugin_formcreator_forms_id` int unsigned NOT NULL DEFAULT '0', + `requester_id` int unsigned NOT NULL DEFAULT '0', + `users_id_validator` int unsigned NOT NULL DEFAULT '0' COMMENT 'User in charge of validation', + `groups_id_validator` int unsigned NOT NULL DEFAULT '0' COMMENT 'Group in charge of validation', + `request_date` timestamp NULL, + `status` int(11) NOT NULL DEFAULT '101', + `comment` mediumtext, + PRIMARY KEY (`id`), + INDEX `plugin_formcreator_forms_id` (`plugin_formcreator_forms_id`), + INDEX `entities_id_is_recursive` (`entities_id`, `is_recursive`), + INDEX `requester_id` (`requester_id`), + INDEX `users_id_validator` (`users_id_validator`), + INDEX `groups_id_validator` (`groups_id_validator`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_forms_profiles` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `plugin_formcreator_forms_id` int unsigned NOT NULL DEFAULT '0', + `profiles_id` int unsigned NOT NULL DEFAULT '0', + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unicity` (`plugin_formcreator_forms_id`,`profiles_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_forms_users` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `plugin_formcreator_forms_id` int unsigned NOT NULL, + `users_id` int unsigned NOT NULL, + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unicity` (`plugin_formcreator_forms_id`,`users_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_forms_groups` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `plugin_formcreator_forms_id` int unsigned NOT NULL, + `groups_id` int unsigned NOT NULL, + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unicity` (`plugin_formcreator_forms_id`,`groups_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_forms_validators` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `plugin_formcreator_forms_id` int unsigned NOT NULL DEFAULT '0', + `itemtype` varchar(255) NOT NULL DEFAULT '', + `items_id` int unsigned NOT NULL DEFAULT '0', + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unicity` (`plugin_formcreator_forms_id`,`itemtype`,`items_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_questions` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL DEFAULT '', + `plugin_formcreator_sections_id` int unsigned NOT NULL DEFAULT '0', + `fieldtype` varchar(30) NOT NULL DEFAULT 'text', + `required` tinyint(1) NOT NULL DEFAULT '0', + `show_empty` tinyint(1) NOT NULL DEFAULT '0', + `default_values` mediumtext, + `itemtype` varchar(255) NOT NULL DEFAULT '' COMMENT 'itemtype used for glpi objects and dropdown question types', + `values` mediumtext, + `description` mediumtext, + `row` int(11) NOT NULL DEFAULT '0', + `col` int(11) NOT NULL DEFAULT '0', + `width` int(11) NOT NULL DEFAULT '0', + `show_rule` int(11) NOT NULL DEFAULT '1', + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + INDEX `plugin_formcreator_sections_id` (`plugin_formcreator_sections_id`), + FULLTEXT KEY `Search` (`name`,`description`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_conditions` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `itemtype` varchar(255) NOT NULL DEFAULT '' COMMENT 'itemtype of the item affected by the condition', + `items_id` int unsigned NOT NULL DEFAULT '0' COMMENT 'item ID of the item affected by the condition', + `plugin_formcreator_questions_id` int unsigned NOT NULL DEFAULT '0' COMMENT 'question to test for the condition', + `show_condition` int(11) NOT NULL DEFAULT '0', + `show_value` mediumtext NULL DEFAULT NULL, + `show_logic` int(11) NOT NULL DEFAULT '1', + `order` int(11) NOT NULL DEFAULT '1', + `uuid` varchar(255) NULL DEFAULT NULL, + PRIMARY KEY (`id`), + INDEX `plugin_formcreator_questions_id` (`plugin_formcreator_questions_id`), + INDEX `item` (`itemtype`, `items_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_sections` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL DEFAULT '', + `plugin_formcreator_forms_id` int unsigned NOT NULL DEFAULT '0', + `order` int(11) NOT NULL DEFAULT '0', + `show_rule` int(11) NOT NULL DEFAULT '1', + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + INDEX `plugin_formcreator_forms_id` (`plugin_formcreator_forms_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_targetchanges` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL DEFAULT '', + `plugin_formcreator_forms_id` int unsigned NOT NULL DEFAULT '0', + `target_name` varchar(255) NOT NULL DEFAULT '', + `changetemplates_id` int unsigned NOT NULL DEFAULT '0', + `content` longtext, + `impactcontent` longtext, + `controlistcontent` longtext, + `rolloutplancontent` longtext, + `backoutplancontent` longtext, + `checklistcontent` longtext, + `due_date_rule` int(11) NOT NULL DEFAULT '1', + `due_date_question` int unsigned NOT NULL DEFAULT '0', + `due_date_value` tinyint(4) DEFAULT NULL, + `due_date_period` int(11) NOT NULL DEFAULT '0', + `urgency_rule` int(11) NOT NULL DEFAULT '1', + `urgency_question` int unsigned NOT NULL DEFAULT '0', + `validation_followup` tinyint(1) NOT NULL DEFAULT '1', + `destination_entity` int(11) NOT NULL DEFAULT '1', + `destination_entity_value` int unsigned NOT NULL DEFAULT '0', + `tag_type` int(11) NOT NULL DEFAULT '1', + `tag_questions` varchar(255) NOT NULL DEFAULT '', + `tag_specifics` varchar(255) NOT NULL DEFAULT '', + `category_rule` int(11) NOT NULL DEFAULT '1', + `category_question` int unsigned NOT NULL DEFAULT '0', + `commonitil_validation_rule` int(11) NOT NULL DEFAULT '1', + `commonitil_validation_question` varchar(255) DEFAULT NULL, + `show_rule` int(11) NOT NULL DEFAULT '1', + `sla_rule` int(11) NOT NULL DEFAULT '1', + `sla_question_tto` int unsigned NOT NULL DEFAULT '0', + `sla_question_ttr` int unsigned NOT NULL DEFAULT '0', + `ola_rule` int(11) NOT NULL DEFAULT '1', + `ola_question_tto` int unsigned NOT NULL DEFAULT '0', + `ola_question_ttr` int unsigned NOT NULL DEFAULT '0', + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_targettickets` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL DEFAULT '', + `plugin_formcreator_forms_id` int unsigned NOT NULL DEFAULT '0', + `target_name` varchar(255) NOT NULL DEFAULT '', + `source_rule` int(11) NOT NULL DEFAULT '0', + `source_question` int(11) NOT NULL DEFAULT '0', + `type_rule` int(11) NOT NULL DEFAULT '0', + `type_question` int unsigned NOT NULL DEFAULT '0', + `tickettemplates_id` int unsigned NOT NULL DEFAULT '0', + `content` longtext, + `due_date_rule` int(11) NOT NULL DEFAULT '1', + `due_date_question` int unsigned NOT NULL DEFAULT '0', + `due_date_value` tinyint(4) DEFAULT NULL, + `due_date_period` int(11) NOT NULL DEFAULT '0', + `urgency_rule` int(11) NOT NULL DEFAULT '1', + `urgency_question` int unsigned NOT NULL DEFAULT '0', + `validation_followup` tinyint(1) NOT NULL DEFAULT '1', + `destination_entity` int(11) NOT NULL DEFAULT '1', + `destination_entity_value` int unsigned NOT NULL DEFAULT '0', + `tag_type` int(11) NOT NULL DEFAULT '1', + `tag_questions` varchar(255) NOT NULL DEFAULT '', + `tag_specifics` varchar(255) NOT NULL DEFAULT '', + `category_rule` int(11) NOT NULL DEFAULT '1', + `category_question` int unsigned NOT NULL DEFAULT '0', + `associate_rule` int(11) NOT NULL DEFAULT '1', + `associate_question` int unsigned NOT NULL DEFAULT '0', + `location_rule` int(11) NOT NULL DEFAULT '1', + `location_question` int unsigned NOT NULL DEFAULT '0', + `commonitil_validation_rule` int(11) NOT NULL DEFAULT '1', + `commonitil_validation_question` varchar(255) DEFAULT NULL, + `show_rule` int(11) NOT NULL DEFAULT '1', + `sla_rule` int(11) NOT NULL DEFAULT '1', + `sla_question_tto` int unsigned NOT NULL DEFAULT '0', + `sla_question_ttr` int unsigned NOT NULL DEFAULT '0', + `ola_rule` int(11) NOT NULL DEFAULT '1', + `ola_question_tto` int unsigned NOT NULL DEFAULT '0', + `ola_question_ttr` int unsigned NOT NULL DEFAULT '0', + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + INDEX `tickettemplates_id` (`tickettemplates_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_targetproblems` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL DEFAULT '', + `plugin_formcreator_forms_id` int unsigned NOT NULL DEFAULT '0', + `target_name` varchar(255) NOT NULL DEFAULT '', + `problemtemplates_id` int unsigned NOT NULL DEFAULT '0', + `content` longtext, + `impactcontent` longtext, + `causecontent` longtext, + `symptomcontent` longtext, + `urgency_rule` int(11) NOT NULL DEFAULT '1', + `urgency_question` int unsigned NOT NULL DEFAULT '0', + `destination_entity` int(11) NOT NULL DEFAULT '1', + `destination_entity_value` int unsigned NOT NULL DEFAULT '0', + `tag_type` int(11) NOT NULL DEFAULT '1', + `tag_questions` varchar(255) NOT NULL DEFAULT '', + `tag_specifics` varchar(255) NOT NULL DEFAULT '', + `category_rule` int(11) NOT NULL DEFAULT '1', + `category_question` int unsigned NOT NULL DEFAULT '0', + `show_rule` int(11) NOT NULL DEFAULT '1', + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + INDEX `problemtemplates_id` (`problemtemplates_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_targets_actors` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `itemtype` varchar(255) DEFAULT NULL, + `items_id` int unsigned NOT NULL DEFAULT '0', + `actor_role` int(11) NOT NULL DEFAULT '1', + `actor_type` int(11) NOT NULL DEFAULT '1', + `actor_value` int unsigned NOT NULL DEFAULT '0', + `use_notification` tinyint(1) NOT NULL DEFAULT '1', + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + INDEX `item` (`itemtype`, `items_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_issues` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) NULL DEFAULT NULL, + `display_id` varchar(255) NOT NULL, + `items_id` int unsigned NOT NULL DEFAULT '0', + `itemtype` varchar(255) NOT NULL DEFAULT '', + `status` varchar(255) NOT NULL DEFAULT '', + `date_creation` timestamp NULL, + `date_mod` timestamp NULL, + `entities_id` int unsigned NOT NULL DEFAULT '0', + `is_recursive` tinyint(1) NOT NULL DEFAULT '0', + `requester_id` int unsigned NOT NULL DEFAULT '0', + `comment` longtext, + `users_id_recipient` int unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + INDEX `item` (`itemtype`, `items_id`), + INDEX `entities_id` (`entities_id`), + INDEX `requester_id` (`requester_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_items_targettickets` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `plugin_formcreator_targettickets_id` int unsigned NOT NULL DEFAULT '0', + `link` int(11) NOT NULL DEFAULT '0', + `itemtype` varchar(255) NOT NULL DEFAULT '', + `items_id` int unsigned NOT NULL DEFAULT '0', + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + INDEX `plugin_formcreator_targettickets_id` (`plugin_formcreator_targettickets_id`), + INDEX `item` (`itemtype`,`items_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_questiondependencies` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `plugin_formcreator_questions_id` int unsigned NOT NULL DEFAULT '0', + `plugin_formcreator_questions_id_2` int unsigned NOT NULL DEFAULT '0', + `fieldname` varchar(255) DEFAULT NULL, + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + INDEX `plugin_formcreator_questions_id` (`plugin_formcreator_questions_id`), + INDEX `plugin_formcreator_questions_id_2` (`plugin_formcreator_questions_id_2`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_questionregexes` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `plugin_formcreator_questions_id` int unsigned NOT NULL DEFAULT '0', + `regex` mediumtext DEFAULT NULL, + `fieldname` varchar(255) DEFAULT NULL, + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + INDEX `plugin_formcreator_questions_id` (`plugin_formcreator_questions_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_questionranges` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `plugin_formcreator_questions_id` int unsigned NOT NULL DEFAULT '0', + `range_min` varchar(255) DEFAULT NULL, + `range_max` varchar(255) DEFAULT NULL, + `fieldname` varchar(255) DEFAULT NULL, + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + INDEX `plugin_formcreator_questions_id` (`plugin_formcreator_questions_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_forms_languages` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `plugin_formcreator_forms_id` int unsigned NOT NULL DEFAULT '0', + `name` varchar(255) DEFAULT NULL, + `comment` text, + `uuid` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; \ No newline at end of file diff --git a/locales/de_DE.po b/locales/de_DE.po index e03c834b1..bbfcba7e7 100644 --- a/locales/de_DE.po +++ b/locales/de_DE.po @@ -13,16 +13,28 @@ # Robert Langenkamp , 2022 # Florian Ried , 2022 # Michael Schieferer, 2023 +<<<<<<< HEAD # iDazai, 2023 +======= +# Thierry Bugier , 2023 +# iDazai, 2023 +# Simon Heim, 2023 +>>>>>>> support/2.13.0 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2023-05-31 16:21+0200\n" "PO-Revision-Date: 2022-06-15 12:10+0000\n" "Last-Translator: iDazai, 2023\n" +======= +"POT-Creation-Date: 2023-11-13 14:56+0100\n" +"PO-Revision-Date: 2021-08-30 07:22+0000\n" +"Last-Translator: Simon Heim, 2023\n" +>>>>>>> support/2.13.0 "Language-Team: German (Germany) (https://app.transifex.com/teclib/teams/28042/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -61,7 +73,7 @@ msgstr "Konnte den Abschnitt nicht hinzufügen" #: ajax/commontree.php:55 entrée standard:128 standard:100 msgid "Subtree root" -msgstr "Wurzel der Unterabschnitts" +msgstr "Wurzel des Unterabschnitts" #: ajax/commontree.php:59 msgid "Selectable" @@ -215,7 +227,7 @@ msgstr[1] "Dropdowns" #: inc/field/dropdownfield.class.php:616 msgid "Invalid value for " -msgstr "Ungültiger Wert: " +msgstr "Ungültiger Wert für" #: inc/field/dropdownfield.class.php:628 #, php-format @@ -234,7 +246,7 @@ msgstr "Filter" #: inc/field/dropdownfield.class.php:987 entrée standard:162 standard:134 msgid "Entity restriction" -msgstr "EInschränkung" +msgstr "Einschränkung" #: inc/field/dropdownfield.class.php:996 msgid "" @@ -256,10 +268,50 @@ msgstr "LDAP-Verzeichnis nicht angegeben!" msgid "LDAP directory not found!" msgstr "LDAP-Verzeichnis nicht gefunden!" +<<<<<<< HEAD +======= +#: inc/field/ldapselectfield.class.php:154 +msgid "LDAP attribute is required!" +msgstr "LDAP Attribut ist erforderlich!" + +#: inc/field/textfield.class.php:146 inc/field/floatfield.class.php:156 +#, php-format +msgid "Specific format does not match: %s" +msgstr "Spezifisches Format stimmt nicht überein: %s" + +#: inc/field/textfield.class.php:155 +#, php-format +msgid "The text is too short (minimum %d characters): %s" +msgstr "Der Text ist zu kurz (mindestens %d Zeichen): %s" + +#: inc/field/textfield.class.php:160 +#, php-format +msgid "The text is too long (maximum %d characters): %s" +msgstr "Der Text ist zu lang (maximal %d Zeichen): %s" + +#: inc/field/textfield.class.php:168 +msgid "Text" +msgstr "Text" + +#: inc/field/textfield.class.php:217 inc/field/floatfield.class.php:238 +#: inc/questionregex.class.php:62 entrée standard:42 +msgid "Regular expression" +msgstr "regulärer Ausdruck" + +#: inc/field/textfield.class.php:222 inc/field/floatfield.class.php:243 +msgid "Range" +msgstr "Bereich" + +#: inc/field/textfield.class.php:228 inc/field/floatfield.class.php:249 +msgid "Additional validation" +msgstr "nachträgliche Genehmigung" + +>>>>>>> support/2.13.0 #: inc/field/radiosfield.class.php:108 msgid "Radios" msgstr "Radios" +<<<<<<< HEAD #: inc/field/radiosfield.class.php:114 inc/field/fieldsfield.class.php:513 #: inc/field/checkboxesfield.class.php:245 msgid "The field value is required:" @@ -269,11 +321,37 @@ msgstr "Dieses Feld muss ausgefüllt werden:" #: inc/field/datetimefield.class.php:119 inc/field/actorfield.class.php:258 #: inc/field/checkboxesfield.class.php:191 inc/field/floatfield.class.php:125 #: inc/field/datefield.class.php:116 +======= +#: inc/field/radiosfield.class.php:116 inc/field/checkboxesfield.class.php:256 +msgid "The field value is required." +msgstr "Der Feldwert ist erforderlich." + +#: inc/field/radiosfield.class.php:127 +msgid "Only one default value is allowed." +msgstr "Nur ein Standardwert ist erlaubt." + +#: inc/field/radiosfield.class.php:138 +msgid "The default value is not in the list of available values." +msgstr "Der Standardwert ist nicht in der Liste der erlaubten Werte." + +#: inc/field/radiosfield.class.php:215 inc/field/selectfield.class.php:105 +#: inc/field/datetimefield.class.php:119 inc/field/actorfield.class.php:257 +#: inc/field/checkboxesfield.class.php:190 inc/field/floatfield.class.php:124 +>>>>>>> support/2.13.0 #, php-format msgid "A required field is empty: %s" msgstr "Ein notwendiges Feld ist nicht ausgefüllt: %s" +<<<<<<< HEAD #: inc/field/integerfield.class.php:59 +======= +#: inc/field/radiosfield.class.php:234 inc/field/selectfield.class.php:123 +#, php-format +msgid "This value %1$s is not allowed: %2$s" +msgstr "Der Wert %1$s ist nicht erlaubt: %2$s" + +#: inc/field/integerfield.class.php:60 +>>>>>>> support/2.13.0 #, php-format msgid "This is not an integer: %s" msgstr "Dies ist keine Zahl: %s" @@ -411,7 +489,7 @@ msgstr "Datei" #: inc/field/multiselectfield.class.php:86 msgid "Multiselect" -msgstr "Multiselect" +msgstr "Mehrfachauswahl" #: inc/field/fieldsfield.class.php:154 msgid "Warning: Additional Fields plugin is disabled or missing" @@ -440,7 +518,7 @@ msgstr "Manche numerische Felder enthalten keine Zahlen" #: inc/field/fieldsfield.class.php:472 msgid "Some URL fields contains invalid links" -msgstr "Manche Felder für URL enthalten keine Links" +msgstr "Manche URL Felder enthalten keine Links" #: inc/field/fieldsfield.class.php:566 msgid "Additionnal fields" @@ -448,9 +526,23 @@ msgstr "Zusätzliche Felder" #: inc/field/checkboxesfield.class.php:133 msgid "Checkboxes" -msgstr "Checkbox" +msgstr "Checkboxes" +<<<<<<< HEAD #: inc/field/checkboxesfield.class.php:227 +======= +#: inc/field/checkboxesfield.class.php:208 +#, php-format +msgid "Empty values are not allowed: %s" +msgstr "Leere Werte sind nicht erlaubt: %s" + +#: inc/field/checkboxesfield.class.php:216 +#, php-format +msgid "This value %1$s is not alowed: %2$s" +msgstr "Der Wert %1$s ist nicht erlaubt: %2$s" + +#: inc/field/checkboxesfield.class.php:236 +>>>>>>> support/2.13.0 #, php-format msgid "The following question needs at least %d answers: %s" msgstr "Die folgende Frage braucht mindestens %d Antworten: %s" @@ -460,7 +552,15 @@ msgstr "Die folgende Frage braucht mindestens %d Antworten: %s" msgid "The following question does not accept more than %d answers: %s" msgstr "Die folgende Frage akzeptiert nicht mehr als %d Antworten: %s" +<<<<<<< HEAD #: inc/field/checkboxesfield.class.php:305 +======= +#: inc/field/checkboxesfield.class.php:270 +msgid "The default values are not in the list of available values." +msgstr "Die Standardwerte sind nicht in der Liste der erlaubten Werte." + +#: inc/field/checkboxesfield.class.php:325 +>>>>>>> support/2.13.0 msgid "Range min" msgstr "Bereichsminimum" @@ -505,7 +605,7 @@ msgstr "Beschreibung" #: inc/field/descriptionfield.class.php:113 msgid "A description field should have a description:" -msgstr "Ein Beschreibungsfeld sollte eine Beschreibung beinhalten" +msgstr "Ein Beschreibungsfeld sollte eine Beschreibung beinhalten:" #: inc/field/hiddenfield.class.php:96 msgid "Hidden field" @@ -525,11 +625,11 @@ msgstr "ist sichtbar" #: inc/condition.class.php:104 msgid "is not visible" -msgstr "is nicht sichtbar" +msgstr "ist nicht sichtbar" #: inc/condition.class.php:105 msgid "regular expression matches" -msgstr "Regular Expression trifft zu" +msgstr "Regulärer Ausdruck trifft zu" #: inc/condition.class.php:116 msgid "Always displayed" @@ -656,7 +756,7 @@ msgstr "notwendig bei Ablehnung" #: inc/issue.class.php:663 msgid "Ticket approver" -msgstr "Ticket-Genehmiger" +msgstr "Ticketgenehmiger" #: inc/issue.class.php:736 msgid "Technician" @@ -672,7 +772,7 @@ msgstr "Formulargenehmigergruppe" #: inc/issue.class.php:829 msgid "Ticket approver group" -msgstr "Ticket-Genehmigergruppe" +msgstr "Ticketgenehmigergruppe" #: inc/issue.class.php:863 inc/abstractitiltarget.class.php:787 entrée #: standard:108 @@ -733,15 +833,15 @@ msgstr "" #: inc/issue.class.php:1227 msgid "Ticket requester" -msgstr "Ticket Anforderer" +msgstr "Ticketanforderer" #: inc/issue.class.php:1274 msgid "Ticket observer" -msgstr "Ticket Beobachter" +msgstr "Ticketbeobachter" #: inc/issue.class.php:1322 msgid "Ticket technician" -msgstr "Ticket Techniker" +msgstr "Tickettechniker" #: inc/issue.class.php:1469 #, php-format @@ -786,7 +886,7 @@ msgstr[1] "Fomularkategorien" #: inc/category.class.php:80 msgid "Knowbase category" -msgstr "Knowlagebase-Kategorie" +msgstr "Wissensdatenbankkategorie" #: inc/category.class.php:86 msgid "As child of" @@ -904,7 +1004,7 @@ msgstr "Formularersteller" #: inc/target_actor.class.php:71 inc/abstractitiltarget.class.php:2144 msgid "Form validator" -msgstr "Formular Genehmiger" +msgstr "Formulargenehmiger" #: inc/target_actor.class.php:72 msgid "Specific person" @@ -928,7 +1028,7 @@ msgstr "Objektgruppe" #: inc/target_actor.class.php:77 msgid "Tech group from an object" -msgstr "Techniker Gruppe des Objekts" +msgstr "Technikergruppe des Objekts" #: inc/target_actor.class.php:78 msgid "Specific supplier" @@ -958,7 +1058,7 @@ msgstr "Zugewiesen an" msgid "Target actor" msgid_plural "Target actors" msgstr[0] "Ticket-Bearbeiter" -msgstr[1] "Ticket-Bearbeiter" +msgstr[1] "Ticketbearbeiter" #: inc/target_actor.class.php:115 inc/target_actor.class.php:131 #: inc/target_actor.class.php:140 @@ -1065,9 +1165,16 @@ msgstr "" msgid "Cannot generate targets!" msgstr "Zugriff generieren nicht möglich!" +<<<<<<< HEAD #: inc/formanswer.class.php:1511 msgid "No captcha set." msgstr "" +======= +#: inc/formanswer.class.php:1434 +#, php-format +msgid "Answer is invalid in %1$s" +msgstr "Antwort ist ungültig in %1$s" +>>>>>>> support/2.13.0 #: inc/formanswer.class.php:1517 msgid "You failed the captcha test." @@ -1103,7 +1210,7 @@ msgstr "Erinnerungen einsehen" #: inc/common.class.php:811 msgid "Consult feeds" -msgstr "Feeds zu Rate ziehen" +msgstr "Feeds einsehen" #: inc/abstractfield.class.php:89 inc/question.class.php:758 msgid "Apply" @@ -1115,6 +1222,25 @@ msgid_plural "Access types" msgstr[0] "Zugriffstyp" msgstr[1] "Zugriffstypen" +<<<<<<< HEAD +======= +#: inc/formaccesstype.class.php:79 +msgid "Link to the form" +msgstr "Zum Formular verknüpfen" + +#: inc/formaccesstype.class.php:92 +msgid "Please activate the form to view the link" +msgstr "Bitte Formular wählen, um den Link zu aktivieren" + +#: inc/formaccesstype.class.php:100 inc/form.class.php:1505 +msgid "Enable captcha" +msgstr "Captcha aktivieren" + +#: inc/formaccesstype.class.php:112 +msgid "Restricted to" +msgstr "Eingeschränkt für" + +>>>>>>> support/2.13.0 #: inc/form_language.class.php:51 msgid "Form language" msgid_plural "Form languages" @@ -1235,8 +1361,8 @@ msgstr "Speichern" #: inc/targetproblem.class.php:43 entrée standard:43 msgid "Target problem" msgid_plural "Target problems" -msgstr[0] "Zielproblem" -msgstr[1] "Zielprobleme" +msgstr[0] "Problem" +msgstr[1] "Probleme" #: inc/targetproblem.class.php:109 inc/targetproblem.class.php:565 #: inc/targetchange.class.php:105 inc/targetchange.class.php:441 @@ -1251,7 +1377,7 @@ msgid "" "Failed to add or update the %1$s %2$s: a question is missing and is used in " "a parameter of the target" msgstr "" -"Fehler beim Hinzufügen oder Löschen von %1$s %2$s: eine Frage fehlt ist " +"Fehler beim Hinzufügen oder Löschen von %1$s %2$s: eine Frage fehlt, ist " "jedoch ein Parameter des Ziels" #: inc/targetproblem.class.php:566 inc/targetchange.class.php:106 @@ -1323,7 +1449,7 @@ msgstr "Mit Formularen zusammengeführt" #: inc/entityconfig.class.php:128 msgid "Distinct menu entry" -msgstr "Eindeutiger Menueintrag" +msgstr "Eindeutiger Menüeintrag" #: inc/entityconfig.class.php:135 inc/entityconfig.class.php:143 #: inc/entityconfig.class.php:151 inc/entityconfig.class.php:159 @@ -1376,7 +1502,7 @@ msgstr "Helpdesk" #: inc/entityconfig.class.php:306 inc/entityconfig.class.php:534 entrée #: standard:44 msgid "Helpdesk mode" -msgstr "Helpdesk modus" +msgstr "Helpdesk Modus" #: inc/entityconfig.class.php:317 inc/entityconfig.class.php:604 msgid "Default Form list mode" @@ -1388,7 +1514,7 @@ msgstr "Sortierreihenfolge" #: inc/entityconfig.class.php:351 inc/entityconfig.class.php:554 msgid "Knowledge base" -msgstr "Knowledge base" +msgstr "Wissensdatenbank" #: inc/entityconfig.class.php:366 msgid "Search" @@ -1465,7 +1591,7 @@ msgstr "eingeschränkter Zugriff" #: inc/form.class.php:122 msgid "Answers waiting for validation" -msgstr "Antwort wartet auf Prüfung" +msgstr "Antworten warten auf Prüfung" #: inc/form.class.php:124 inc/form.class.php:1663 inc/form.class.php:1689 msgid "Import forms" @@ -1488,7 +1614,23 @@ msgstr "Zugriff" msgid "Active" msgstr "Aktiv" +<<<<<<< HEAD #: inc/form.class.php:286 inc/form.class.php:338 inc/form.class.php:413 +======= +#: inc/form.class.php:261 entrée standard:65 +msgid "Icon" +msgstr "Symbol" + +#: inc/form.class.php:269 entrée standard:67 +msgid "Icon color" +msgstr "Symbolfarbe" + +#: inc/form.class.php:277 entrée standard:80 +msgid "Background color" +msgstr "Hintergrundfarbe" + +#: inc/form.class.php:300 inc/form.class.php:341 inc/form.class.php:416 +>>>>>>> support/2.13.0 msgid "Default form" msgstr "Standardformular" @@ -1529,7 +1671,7 @@ msgstr "Wonach suchst du?" #: inc/form.class.php:993 inc/form.class.php:1156 #: inc/abstracttarget.class.php:162 inc/abstractitiltarget.class.php:1625 msgid "The name cannot be empty!" -msgstr "Das Feld Name kann nicht leer sein" +msgstr "Der Name kann nicht leer sein!" #: inc/form.class.php:1026 inc/form.class.php:1191 msgid "A loop is generated!" @@ -1706,8 +1848,8 @@ msgstr "plugin_formcreator_load_check" #: inc/targetchange.class.php:44 entrée standard:43 msgid "Target change" msgid_plural "Target changes" -msgstr[0] "Betroffene Änderung" -msgstr[1] "Betroffene Änderungen" +msgstr[0] "Änderung" +msgstr[1] "Änderungen" #: inc/targetchange.class.php:344 entrée standard:48 msgid "Change title" @@ -1774,11 +1916,11 @@ msgstr "Die Sektion ist notwendig" #: inc/question.class.php:365 #, php-format msgid "Field type %1$s is not available for question %2$s." -msgstr "Typ %1$s is nicht verfügbar für die Frage %2$s." +msgstr "Typ %1$s ist nicht verfügbar für die Frage %2$s." #: inc/question.class.php:379 msgid "This type of question is not compatible with public forms." -msgstr "Art der Frage ist nicht verfügbar bei öffentlichen Formularen." +msgstr "Art der Frage ist bei öffentlichen Formularen nicht verfügbar." #: inc/question.class.php:469 msgid "The field type cannot be changed. Delete then recreate the question." @@ -1841,35 +1983,35 @@ msgstr "Feldname" #: inc/abstracttarget.class.php:97 msgid "Current active entity" -msgstr "Aktuell aktiver " +msgstr "Aktuell aktive Entität" #: inc/abstracttarget.class.php:98 msgid "Default requester user's entity" -msgstr "Standardanforderer Benutzereintrag" +msgstr "Standardanforderer Benutzerentität" #: inc/abstracttarget.class.php:99 msgid "First dynamic requester user's entity (alphabetical)" -msgstr "Zuerst dynamischer Usereintag (alphabetisch)" +msgstr "Erste dynamische Anfragesteller-Benutzerentität (alphabetisch)" #: inc/abstracttarget.class.php:100 msgid "Last dynamic requester user's entity (alphabetical)" -msgstr "Letzter dynamischer Anforderer (alphabetisch)" +msgstr "Letzte dynamische Anfragesteller-Benutzerentität (alphabetisch)" #: inc/abstracttarget.class.php:101 msgid "The form entity" -msgstr "Formulareinheit" +msgstr "Formularentität" #: inc/abstracttarget.class.php:102 msgid "Default entity of the validator" -msgstr "Standardeinheit des Genehmigers" +msgstr "Standardentität des Genehmigers" #: inc/abstracttarget.class.php:103 msgid "Specific entity" -msgstr "spezielle-Einheit" +msgstr "spezielle Entität" #: inc/abstracttarget.class.php:104 msgid "Default entity of a user type question answer" -msgstr "Standatd Einheit einer Antwort einer Benutzeranfrage" +msgstr "Standardentität einer Antwort einer Benutzeranfrage" #: inc/abstracttarget.class.php:105 msgid "From a GLPI object > Entity type question answer" @@ -1877,15 +2019,15 @@ msgstr "Aus einem GLPI-Objekt > Antwort auf eine Gruppen-Frage" #: inc/abstracttarget.class.php:116 msgid "Always generated" -msgstr "immer erzeugt" +msgstr "Immer erstellen" #: inc/abstracttarget.class.php:117 msgid "Disabled unless" -msgstr "Immer versteckt, außer" +msgstr "Erstellen wenn" #: inc/abstracttarget.class.php:118 msgid "Generated unless" -msgstr "Immer generiert, außer" +msgstr "Nicht erstellen wenn" #: inc/abstracttarget.class.php:129 msgid "A target must be associated to a form." @@ -1905,11 +2047,11 @@ msgstr "Zielgruppe" #: inc/abstracttarget.class.php:518 msgid "User type question" -msgstr "Benutzerfragestellung" +msgstr "Frage zum Benutzertyp" #: inc/abstracttarget.class.php:519 msgid "Entity type question" -msgstr "Gruppen-Antwort" +msgstr "Frage zum Entitätstyp" #: inc/command/cleanticketscommand.class.php:53 msgid "Searching for invalid items..." @@ -1988,8 +2130,8 @@ msgstr[1] "Ticketbeziehungen erstellen" #: inc/targetticket.class.php:57 entrée standard:43 msgid "Target ticket" msgid_plural "Target tickets" -msgstr[0] "Zielticket" -msgstr[1] "Zieltickets" +msgstr[0] "Ticket" +msgstr[1] "Tickets" #: inc/targetticket.class.php:100 msgid "Specific asset" @@ -2025,11 +2167,11 @@ msgstr "Spezifischer Typ" #: inc/targetticket.class.php:189 entrée standard:48 msgid "Ticket title" -msgstr "Ticket-Titel" +msgstr "Tickettitel" #: inc/targetticket.class.php:307 msgid "Add validation message as first ticket followup" -msgstr "Eine Validierungsnachricht als Erstticket-identifizierer hinzufügen" +msgstr "Eine Validierungsnachricht als Erstticket Folgemaßnahme hinzufügen." #: inc/targetticket.class.php:341 msgid "Add a field" @@ -2114,7 +2256,7 @@ msgstr "Sprache nicht gefunden." #: inc/translation.class.php:236 msgid "Failed to add the translation." -msgstr "Fehler beim Hinzufügen der Übersetzung-" +msgstr "Fehler beim Hinzufügen der Übersetzung." #: inc/abstractitiltarget.class.php:187 msgid "Tags from questions" @@ -2138,7 +2280,7 @@ msgstr "TTR aus Vorlage oder keine" #: inc/abstractitiltarget.class.php:197 msgid "equals to the answer to the question" -msgstr "Entspricht der Anwort au die Frage" +msgstr "Entspricht der Anwort auf die Frage" #: inc/abstractitiltarget.class.php:198 msgid "calculated from the ticket creation date" @@ -2146,7 +2288,7 @@ msgstr "aus dem Ticket-Erstelldatum berechnet" #: inc/abstractitiltarget.class.php:199 msgid "calculated from the answer to the question" -msgstr "von der Antwirt wurdeauf die Frage geschlossen" +msgstr "wurde aus der Antwort auf die Frage berechnet" #: inc/abstractitiltarget.class.php:205 msgid "SLA from template or none" @@ -2414,7 +2556,7 @@ msgstr "" #: install/install.php:491 msgid "Your form has been refused by the validator" -msgstr "Ihr Formular wurde abgelehnt" +msgstr "Ihr Formular wurde vom Genehmiger abgelehnt" #: install/install.php:492 msgid "" @@ -2506,7 +2648,7 @@ msgstr "Anzahl von %s" #: hook.php:798 msgid "Issues summary" -msgstr "usammenfassung der Probleme" +msgstr "Zusammenfassung der Probleme" #: hook.php:843 msgid "" @@ -2539,7 +2681,7 @@ msgstr "Sind Sie sich sicher, dass Sie diesen Abschnitt löschen möchten?" #: js/scripts.js:1161 msgid "Add translations" -msgstr "Übersetzung hinzufügen" +msgstr "Übersetzungen hinzufügen" #: js/scripts.js:1300 js/scripts.js:1324 msgid "An error occured while querying forms" @@ -2564,6 +2706,14 @@ msgstr "Sind Sie sicher, dass Sie dieses Ziel duplizieren möchten?" #: js/scripts.js:1537 msgid "Are you sure you want to delete this target?" msgstr "Sind Sie sicher, dass Sie dieses Ziel löschen möchten?" +<<<<<<< HEAD +======= + +#: entrée standard:43 standard:50 standard:44 standard:82 standard:49 +#: standard:78 +msgid "Required" +msgstr "erforderlich" +>>>>>>> support/2.13.0 #: entrée standard:57 standard:61 standard:60 standard:59 standard:43 #: standard:69 standard:52 standard:76 @@ -2620,7 +2770,7 @@ msgstr "Bedingungen zur Anzeige des Abschnitts" #: entrée standard:40 msgid "Condition to generate the target" -msgstr "Bedingungen um das Ziel zu erzeugen" +msgstr "Bedingungen zum erstellen" #: entrée standard:40 msgid "General" @@ -2672,7 +2822,7 @@ msgstr "Bedingungen zur Anzeige des Senden-Buttons" #: entrée standard:33 msgid "No form answer yet" -msgstr "Kein Antworten bisher" +msgstr "Keine Formularantworten bisher" #: entrée standard:38 #, php-format diff --git a/locales/es_EC.po b/locales/es_EC.po index 845172eba..d603d6eaf 100644 --- a/locales/es_EC.po +++ b/locales/es_EC.po @@ -4,6 +4,10 @@ # FIRST AUTHOR , YEAR. # # Translators: +<<<<<<< HEAD +======= +# Thierry Bugier , 2023 +>>>>>>> support/2.13.0 # Soporte Infraestructura Standby, 2023 # #, fuzzy @@ -11,8 +15,13 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2023-05-31 16:21+0200\n" "PO-Revision-Date: 2022-06-15 12:10+0000\n" +======= +"POT-Creation-Date: 2023-11-13 14:56+0100\n" +"PO-Revision-Date: 2021-08-30 07:22+0000\n" +>>>>>>> support/2.13.0 "Last-Translator: Soporte Infraestructura Standby, 2023\n" "Language-Team: Spanish (Ecuador) (https://app.transifex.com/teclib/teams/28042/es_EC/)\n" "MIME-Version: 1.0\n" @@ -36,7 +45,7 @@ msgstr "Pregunta no encontrada" #: ajax/section_duplicate.php:50 ajax/question_delete.php:49 #: ajax/question_toggle_required.php:55 ajax/section_update.php:44 msgid "You don't have right for this action" -msgstr "No tienes derecho a esta acción" +msgstr "No tiene derecho a esta acción" #: ajax/question_duplicate.php:43 msgid "Source question not found" @@ -66,6 +75,17 @@ msgstr "Limite la profundidad del subárbol" msgid "No limit" msgstr "Sin límite" +<<<<<<< HEAD +======= +#: ajax/homepage_link.php:36 inc/formlist.class.php:46 inc/form.class.php:111 +#: entrée standard:47 +msgid "Form" +msgid_plural "Forms" +msgstr[0] "Formulario" +msgstr[1] "Formularios" +msgstr[2] "Formularios" + +>>>>>>> support/2.13.0 #: ajax/section_delete.php:44 ajax/section_move.php:49 #: ajax/section_duplicate.php:44 msgid "Source section not found" @@ -119,7 +139,7 @@ msgstr "Elemento no encontrado" #: front/targetticket.form.php:81 front/targetchange.form.php:46 #: front/targetproblem.form.php:46 msgid "No right to update this item." -msgstr "No hay derecho a actualizar este artículo." +msgstr "No hay derecho a actualizar este elemento." #: front/targetticket.form.php:75 msgid "Bad request while deleting an actor." @@ -130,13 +150,13 @@ msgstr "Solicitud errónea al eliminar un actor." #: front/formanswer.form.php:77 front/form.php:43 inc/common.class.php:654 #: inc/common.class.php:661 msgid "Form Creator" -msgstr "Creador de formularios" +msgstr "Creador de Formularios" #: front/targetticket.form.php:105 front/targetchange.form.php:90 #: front/targetproblem.form.php:90 #, php-format msgid "%1$s = %2$s" -msgstr "%1$s=%2$s" +msgstr "%1$s = %2$s" #: front/formlist.php:46 front/formlist.php:52 inc/common.class.php:648 msgid "Form list" @@ -151,20 +171,20 @@ msgstr "¡El formulario ha sido guardado exitosamente!" #: front/reservation.form.php:71 #, php-format msgid "%1$s purges the reservation for item %2$s" -msgstr "%1$spurga la reserva del artículo%2$s" +msgstr "%1$s depura la reserva del elemento %2$s" #: front/reservation.form.php:124 #, php-format msgid "%1$s adds the reservation %2$s for item %3$s" -msgstr "%1$sañade la reserva%2$s para el artículo%3$s" +msgstr "%1$s añade la reserve %2$s para el elemento %3$s" #: inc/knowbase.class.php:60 inc/entityconfig.class.php:478 #: inc/form.class.php:611 msgid "Category" msgid_plural "Categories" -msgstr[0] "Categorias" -msgstr[1] "Categorias" -msgstr[2] "Categorias" +msgstr[0] "Categoría" +msgstr[1] "Categorías" +msgstr[2] "Categorías" #: inc/knowbase.class.php:62 inc/form.class.php:614 entrée standard:39 msgid "See all" @@ -172,7 +192,7 @@ msgstr "Ver todos" #: inc/knowbase.class.php:83 msgid "Please, describe your need here" -msgstr "Por favor, describe su necesidad aquí" +msgstr "Por favor, describa su necesidad aquí" #: inc/field/textareafield.class.php:186 msgid "Textarea" @@ -202,7 +222,7 @@ msgstr "Filtro de búsqueda" #: inc/field/dropdownfield.class.php:585 entrée standard:38 msgid "Dropdown" msgid_plural "Dropdowns" -msgstr[0] "Menús desplegables" +msgstr[0] "Menú desplegable" msgstr[1] "Menús desplegables" msgstr[2] "Menús desplegables" @@ -213,7 +233,7 @@ msgstr "Valor invalido para " #: inc/field/dropdownfield.class.php:628 #, php-format msgid "The itemtype field is required: %s" -msgstr "El campo tipo de artículo es obligatorio:%s" +msgstr "El campo tipo de elemento es obligatorio: %s" #: inc/field/dropdownfield.class.php:644 #, php-format @@ -234,8 +254,8 @@ msgid "" "To respect the GLPI entity system, \"Form\" should be selected. Others " "settings will break the entity restrictions" msgstr "" -"Para respetar el sistema de entidades GLPI, debe seleccionarse \"Forma\". " -"Otros ajustes romperán las restricciones de entidad" +"Para respetar el sistema de entidades de GLPI, debe seleccionarse " +"\"Formulario\". Otros ajustes romperán las restricciones de entidad" #: inc/field/ldapselectfield.class.php:96 msgid "LDAP Select" @@ -249,10 +269,50 @@ msgstr "¡El directorio LDAP no está definido!" msgid "LDAP directory not found!" msgstr "¡Directorio LDAP no encontrado!" +<<<<<<< HEAD +======= +#: inc/field/ldapselectfield.class.php:154 +msgid "LDAP attribute is required!" +msgstr "¡Se requiere el atributo LDAP!" + +#: inc/field/textfield.class.php:146 inc/field/floatfield.class.php:156 +#, php-format +msgid "Specific format does not match: %s" +msgstr "Formato especificado no coincide: %s" + +#: inc/field/textfield.class.php:155 +#, php-format +msgid "The text is too short (minimum %d characters): %s" +msgstr "El texto es demasiado corto (mínimo %d caracteres): %s" + +#: inc/field/textfield.class.php:160 +#, php-format +msgid "The text is too long (maximum %d characters): %s" +msgstr "El texto es demasiado largo (máximo %d caracteres): %s" + +#: inc/field/textfield.class.php:168 +msgid "Text" +msgstr "Texto" + +#: inc/field/textfield.class.php:217 inc/field/floatfield.class.php:238 +#: inc/questionregex.class.php:62 entrée standard:42 +msgid "Regular expression" +msgstr "Expresión regular" + +#: inc/field/textfield.class.php:222 inc/field/floatfield.class.php:243 +msgid "Range" +msgstr "Rango" + +#: inc/field/textfield.class.php:228 inc/field/floatfield.class.php:249 +msgid "Additional validation" +msgstr "Validación adicional" + +>>>>>>> support/2.13.0 #: inc/field/radiosfield.class.php:108 msgid "Radios" msgstr "Botón de radio" +<<<<<<< HEAD #: inc/field/radiosfield.class.php:114 inc/field/fieldsfield.class.php:513 #: inc/field/checkboxesfield.class.php:245 msgid "The field value is required:" @@ -262,11 +322,37 @@ msgstr "El valor del campo es requerido:" #: inc/field/datetimefield.class.php:119 inc/field/actorfield.class.php:258 #: inc/field/checkboxesfield.class.php:191 inc/field/floatfield.class.php:125 #: inc/field/datefield.class.php:116 +======= +#: inc/field/radiosfield.class.php:116 inc/field/checkboxesfield.class.php:256 +msgid "The field value is required." +msgstr "El valor del campo es requerido." + +#: inc/field/radiosfield.class.php:127 +msgid "Only one default value is allowed." +msgstr "Sólo se permite un valor predeterminado." + +#: inc/field/radiosfield.class.php:138 +msgid "The default value is not in the list of available values." +msgstr "El valor predeterminado no está en la lista de valores disponibles." + +#: inc/field/radiosfield.class.php:215 inc/field/selectfield.class.php:105 +#: inc/field/datetimefield.class.php:119 inc/field/actorfield.class.php:257 +#: inc/field/checkboxesfield.class.php:190 inc/field/floatfield.class.php:124 +>>>>>>> support/2.13.0 #, php-format msgid "A required field is empty: %s" msgstr "Un campo requerido esta vacío: %s" +<<<<<<< HEAD #: inc/field/integerfield.class.php:59 +======= +#: inc/field/radiosfield.class.php:234 inc/field/selectfield.class.php:123 +#, php-format +msgid "This value %1$s is not allowed: %2$s" +msgstr "Este valor %1$s no está permitido: %2$s" + +#: inc/field/integerfield.class.php:60 +>>>>>>> support/2.13.0 #, php-format msgid "This is not an integer: %s" msgstr "Este no es un entero: %s" @@ -332,21 +418,36 @@ msgstr "Muy bajo" #: inc/field/tagfield.class.php:52 msgid "Warning: Tag plugin is disabled or missing" -msgstr "Advertencia: El plugin de etiquetas está deshabilitado o no existe" +msgstr "Advertencia: El complemento Etiquetas está deshabilitado o no existe" #: inc/field/tagfield.class.php:200 msgid "Tag" msgid_plural "Tags" -msgstr[0] "Etiquetas" +msgstr[0] "Etiqueta" msgstr[1] "Etiquetas" msgstr[2] "Etiquetas" +<<<<<<< HEAD #: inc/field/hostnamefield.class.php:116 +======= +#: inc/field/glpiselectfield.class.php:83 entrée standard:38 +msgid "GLPI object" +msgid_plural "GLPI objects" +msgstr[0] "Objeto GLPI" +msgstr[1] "Objetos GLPI" +msgstr[2] "Objetos GLPI" + +#: inc/field/glpiselectfield.class.php:100 inc/field/fieldsfield.class.php:512 +msgid "The field value is required:" +msgstr "El valor del campo es requerido:" + +#: inc/field/hostnamefield.class.php:115 +>>>>>>> support/2.13.0 msgid "Hostname" msgid_plural "Hostnames" -msgstr[0] "Nombres de dominio" -msgstr[1] "Nombres de dominio" -msgstr[2] "Nombres de dominio" +msgstr[0] "Nombre de host" +msgstr[1] "Nombres de host" +msgstr[2] "Nombres de host" #: inc/field/timefield.class.php:130 msgid "Time" @@ -360,7 +461,7 @@ msgstr "Este no es un correo electrónico valido: %s" #: inc/field/emailfield.class.php:100 msgid "Email" msgid_plural "Emails" -msgstr[0] "Correos electrónicos" +msgstr[0] "Correo electrónico" msgstr[1] "Correos electrónicos" msgstr[2] "Correos electrónicos" @@ -375,7 +476,7 @@ msgstr "Fecha y hora" #: inc/field/actorfield.class.php:84 msgid "Actor" msgid_plural "Actors" -msgstr[0] "Actores" +msgstr[0] "Actor" msgstr[1] "Actores" msgstr[2] "Actores" @@ -414,7 +515,8 @@ msgstr "Selección múltiple" #: inc/field/fieldsfield.class.php:154 msgid "Warning: Additional Fields plugin is disabled or missing" msgstr "" -"Advertencia: El plugin de campos adicionales está deshabilitado o no existe" +"Advertencia: El complemento Campos Adicionales está deshabilitado o no " +"existe" #: inc/field/fieldsfield.class.php:168 msgid "Block" @@ -431,7 +533,7 @@ msgstr "mostrar" #: inc/field/fieldsfield.class.php:390 #, php-format msgid "Field '%1$s' type not implemented yet!" -msgstr "¡El tipo de campo \"%1$s'' aún no se ha implementado!" +msgstr "¡El tipo de campo '%1$s' aún no se ha implementado!" #: inc/field/fieldsfield.class.php:467 msgid "Some numeric fields contains non numeric values" @@ -447,19 +549,42 @@ msgstr "Campos adicionales" #: inc/field/checkboxesfield.class.php:133 msgid "Checkboxes" -msgstr "Checkboxes" +msgstr "Casillas de verificación" +<<<<<<< HEAD #: inc/field/checkboxesfield.class.php:227 +======= +#: inc/field/checkboxesfield.class.php:208 +#, php-format +msgid "Empty values are not allowed: %s" +msgstr "No se permiten valores vacíos: %s" + +#: inc/field/checkboxesfield.class.php:216 +#, php-format +msgid "This value %1$s is not alowed: %2$s" +msgstr "Este valor %1$s no está permitido: %2$s" + +#: inc/field/checkboxesfield.class.php:236 +>>>>>>> support/2.13.0 #, php-format msgid "The following question needs at least %d answers: %s" -msgstr "La siguiente pregunta necesita al menos una %drespuesta:%s" +msgstr "La siguiente pregunta necesita al menos %d respuestas: %s" #: inc/field/checkboxesfield.class.php:233 #, php-format msgid "The following question does not accept more than %d answers: %s" -msgstr "La siguiente pregunta no admite más que %drespuestas:%s" +msgstr "La siguiente pregunta no admite más que %d respuestas: %s" +<<<<<<< HEAD #: inc/field/checkboxesfield.class.php:305 +======= +#: inc/field/checkboxesfield.class.php:270 +msgid "The default values are not in the list of available values." +msgstr "" +"Los valores predeterminados no están en la lista de valores disponibles." + +#: inc/field/checkboxesfield.class.php:325 +>>>>>>> support/2.13.0 msgid "Range min" msgstr "Rango mínimo" @@ -509,14 +634,14 @@ msgstr "Un campo de descripción debe tener una descripción:" #: inc/field/hiddenfield.class.php:96 msgid "Hidden field" msgid_plural "Hidden fields" -msgstr[0] "Campos ocultos" +msgstr[0] "Campo oculto" msgstr[1] "Campos ocultos" msgstr[2] "Campos ocultos" #: inc/condition.class.php:65 msgid "Condition" msgid_plural "Conditions" -msgstr[0] "Condiciones" +msgstr[0] "Condición" msgstr[1] "Condiciones" msgstr[2] "Condiciones" @@ -585,9 +710,9 @@ msgstr "Importación en curso" #: inc/issue.class.php:43 msgid "Issue" msgid_plural "Issues" -msgstr[0] "Cuestiones" -msgstr[1] "Cuestiones" -msgstr[2] "Cuestiones" +msgstr[0] "Problema" +msgstr[1] "Problemas" +msgstr[2] "Problemas" #: inc/issue.class.php:56 msgid "Update issue data from tickets and form answers" @@ -615,7 +740,7 @@ msgstr "ID" #: standard:65 standard:104 standard:4 msgid "Type" msgid_plural "Types" -msgstr[0] "Tipos" +msgstr[0] "Tipo" msgstr[1] "Tipos" msgstr[2] "Tipos" @@ -634,7 +759,7 @@ msgstr "Última actualización" #: inc/issue.class.php:595 inc/abstracttarget.class.php:517 msgid "Entity" msgid_plural "Entities" -msgstr[0] "Entidades" +msgstr[0] "Entidad" msgstr[1] "Entidades" msgstr[2] "Entidades" @@ -645,7 +770,7 @@ msgstr[2] "Entidades" #: standard:48 msgid "Requester" msgid_plural "Requesters" -msgstr[0] "Solicitantes" +msgstr[0] "Solicitante" msgstr[1] "Solicitantes" msgstr[2] "Solicitantes" @@ -677,7 +802,7 @@ msgstr "Grupo de aprobación del formulario" #: inc/issue.class.php:829 msgid "Ticket approver group" -msgstr "Grupo de aprobación de ticket" +msgstr "Grupo de aprobación del caso" #: inc/issue.class.php:863 inc/abstractitiltarget.class.php:787 entrée #: standard:108 @@ -738,15 +863,15 @@ msgstr "Aprobador de formulario actual" #: inc/issue.class.php:1227 msgid "Ticket requester" -msgstr "Solicitante de ticket" +msgstr "Solicitante del caso" #: inc/issue.class.php:1274 msgid "Ticket observer" -msgstr "Observador de tickeet" +msgstr "Observador del caso" #: inc/issue.class.php:1322 msgid "Ticket technician" -msgstr "Técnico de tickets" +msgstr "Técnico del caso" #: inc/issue.class.php:1469 #, php-format @@ -786,9 +911,9 @@ msgstr "Cerrado" #: inc/category.class.php:50 hook.php:72 msgid "Form category" msgid_plural "Form categories" -msgstr[0] "Categorías de formularios" -msgstr[1] "Categorías de formularios" -msgstr[2] "Categorías de formularios" +msgstr[0] "Categoría de formulario" +msgstr[1] "Categorías de formulario" +msgstr[2] "Categorías de formulario" #: inc/category.class.php:80 msgid "Knowbase category" @@ -841,7 +966,7 @@ msgstr "Se elimina el formulario" #: inc/notificationtargetformanswer.class.php:74 msgid "Form ID" -msgstr "Formulario ID" +msgstr "ID del Formulario " #: inc/notificationtargetformanswer.class.php:75 #: inc/notificationtargetformanswer.class.php:95 @@ -878,11 +1003,11 @@ msgstr "Enlace de validación" #: inc/notificationtargetformanswer.class.php:82 msgid "Request ID" -msgstr "Solicitar ID" +msgstr "ID de Solicitud" #: inc/notificationtargetformanswer.class.php:94 msgid "Form #" -msgstr "Formulario #" +msgstr "# de Formulario" #: inc/notificationtargetformanswer.class.php:97 msgctxt "tag" @@ -895,7 +1020,7 @@ msgstr "Comentario rechazado" #: inc/notificationtargetformanswer.class.php:102 msgid "Request #" -msgstr "Solicitud #" +msgstr "# de Solicitud" #: inc/notificationtargetformanswer.class.php:114 msgid "Author" @@ -965,7 +1090,7 @@ msgstr "Asignado a" #: inc/target_actor.class.php:109 msgid "Target actor" msgid_plural "Target actors" -msgstr[0] "Actores objetivo" +msgstr[0] "Actor objetivo" msgstr[1] "Actores objetivo" msgstr[2] "Actores objetivo" @@ -977,17 +1102,17 @@ msgstr "Solicitud incorrecta al añadir un actor." #: inc/target_actor.class.php:197 #, php-format msgid "Failed to find a user: %1$s" -msgstr "Error al encontrar un usuario:%1$s" +msgstr "Error al encontrar un usuario: %1$s" #: inc/target_actor.class.php:206 #, php-format msgid "Failed to find a group: %1$s" -msgstr "No se ha encontrado ningún grupo:%1$s" +msgstr "Error al encontrar un grupo: %1$s" #: inc/target_actor.class.php:215 #, php-format msgid "Failed to find a supplier: %1$s" -msgstr "No se ha encontrado proveedor:%1$s" +msgstr "Error al encontrar un proveedor: %1$s" #: inc/formanswer.class.php:79 inc/form_validator.class.php:72 msgid "Refused" @@ -1000,7 +1125,7 @@ msgstr "Aceptado" #: inc/formanswer.class.php:214 msgid "Form answer" msgid_plural "Form answers" -msgstr[0] "Formulario de respuestas" +msgstr[0] "Formulario de respuesta" msgstr[1] "Formulario de respuestas" msgstr[2] "Formulario de respuestas" @@ -1042,7 +1167,7 @@ msgstr "Aceptar" #: inc/formanswer.class.php:828 msgid "Refused comment is required!" -msgstr "¡Se requiere comentario rechazado!" +msgstr "¡Se requiere comentario si es rechazado!" #: inc/formanswer.class.php:882 inc/formanswer.class.php:899 msgid "" @@ -1054,12 +1179,12 @@ msgstr "" #: inc/formanswer.class.php:933 msgid "You are not the validator of these answers" -msgstr "No eres el validador de estas respuestas" +msgstr "No es el validador de estas respuestas" #: inc/formanswer.class.php:1083 #, php-format msgid "Item sucessfully added: %1$s (%2$s: %3$s)" -msgstr "Artículo añadido con éxito:%1$s (%2$s: %3$s)" +msgstr "Elemento añadido con éxito: %1$s (%2$s: %3$s)" #: inc/formanswer.class.php:1166 inc/formanswer.class.php:1168 msgid "Form data" @@ -1077,6 +1202,7 @@ msgstr "" msgid "Cannot generate targets!" msgstr "¡No puede generar objetivos!" +<<<<<<< HEAD #: inc/formanswer.class.php:1511 msgid "No captcha set." msgstr "No se ha establecido ningún captcha." @@ -1086,6 +1212,22 @@ msgid "You failed the captcha test." msgstr "No pasó la prueba de captcha." #: inc/formanswer.class.php:1540 +======= +#: inc/formanswer.class.php:1434 +#, php-format +msgid "Answer is invalid in %1$s" +msgstr "La respuesta no es válida en %1$s" + +#: inc/formanswer.class.php:1462 +msgid "No turing test set" +msgstr "No hay pruebas de Turing" + +#: inc/formanswer.class.php:1468 +msgid "You failed the Turing test" +msgstr "Ha fallado la prueba de Turing" + +#: inc/formanswer.class.php:1492 +>>>>>>> support/2.13.0 msgid "You must select validator!" msgstr "¡Debe seleccionar el validador!" @@ -1121,21 +1263,21 @@ msgstr "Solicitar" #: inc/formaccesstype.class.php:41 entrée standard:39 msgid "Access type" msgid_plural "Access types" -msgstr[0] "Tipos de acceso" +msgstr[0] "Tipo de acceso" msgstr[1] "Tipos de acceso" msgstr[2] "Tipos de acceso" #: inc/form_language.class.php:51 msgid "Form language" msgid_plural "Form languages" -msgstr[0] "Idiomas de formulario" -msgstr[1] "Idiomas de formulario" -msgstr[2] "Idiomas de formulario" +msgstr[0] "Idioma del formulario" +msgstr[1] "Idiomas del formulario" +msgstr[2] "Idiomas del formulario" #: inc/form_language.class.php:78 inc/form_language.class.php:364 msgid "Translation" msgid_plural "Translations" -msgstr[0] "Traducciones" +msgstr[0] "Traducción" msgstr[1] "Traducciones" msgstr[2] "Traducciones" @@ -1145,7 +1287,7 @@ msgstr "El nombre no puede estar vacío." #: inc/form_language.class.php:127 msgid "The language must be associated to a form." -msgstr "La lengua debe estar asociada a un formulario." +msgstr "El idioma debe estar asociado a un formulario." #: inc/form_language.class.php:135 msgid "The specified language is not available." @@ -1198,7 +1340,22 @@ msgstr "Idioma" msgid "None" msgstr "Ninguno" +<<<<<<< HEAD #: inc/form_validator.class.php:78 inc/abstractitiltarget.class.php:2552 +======= +#: inc/form_validator.class.php:76 +msgid "Validator" +msgid_plural "Validators" +msgstr[0] "Validador" +msgstr[1] "Validadores" +msgstr[2] "Validadores" + +#: inc/form_validator.class.php:114 +msgid "Need validaton?" +msgstr "¿Necesita validación?" + +#: inc/form_validator.class.php:118 inc/abstractitiltarget.class.php:2522 +>>>>>>> support/2.13.0 msgid "No" msgstr "No" @@ -1247,9 +1404,9 @@ msgstr "Guardar" #: inc/targetproblem.class.php:43 entrée standard:43 msgid "Target problem" msgid_plural "Target problems" -msgstr[0] "Problemas de destino" -msgstr[1] "Problemas de destino" -msgstr[2] "Problemas de destino" +msgstr[0] "Problema" +msgstr[1] "Problemas" +msgstr[2] "Problemas" #: inc/targetproblem.class.php:109 inc/targetproblem.class.php:565 #: inc/targetchange.class.php:105 inc/targetchange.class.php:441 @@ -1264,8 +1421,8 @@ msgid "" "Failed to add or update the %1$s %2$s: a question is missing and is used in " "a parameter of the target" msgstr "" -"No se pudo agregar o actualizar %1$s%2$s: falta una pregunta y se usa en un " -"parámetro del objetivo" +"No se pudo agregar o actualizar %1$s %2$s: falta una pregunta y se usa en un" +" parámetro del objetivo" #: inc/targetproblem.class.php:566 inc/targetchange.class.php:106 #: inc/targetticket.class.php:136 inc/abstractitiltarget.class.php:1216 @@ -1274,7 +1431,7 @@ msgstr "Actores" #: inc/targetproblem.class.php:619 entrée standard:48 msgid "Problem title" -msgstr "Título del problema" +msgstr "Título del Problema" #: inc/targetproblem.class.php:629 inc/targetchange.class.php:354 #: inc/targetticket.class.php:199 @@ -1300,7 +1457,7 @@ msgstr "Síntoma" #: inc/entityconfig.class.php:166 inc/entityconfig.class.php:180 #: inc/entityconfig.class.php:188 inc/entityconfig.class.php:196 msgid "Inheritance of the parent entity" -msgstr "Herencia de la entidad matriz" +msgstr "Herencia de la entidad principal" #: inc/entityconfig.class.php:102 msgid "GLPi's helpdesk" @@ -1360,7 +1517,7 @@ msgstr "Altura uniforme" #: inc/entityconfig.class.php:173 msgid "Search for assistance" -msgstr "Búsqueda de ayuda" +msgstr "Buscar asistencia" #: inc/entityconfig.class.php:174 msgid "User's assistance requests" @@ -1393,7 +1550,7 @@ msgstr "Modo de mesa de ayuda" #: inc/entityconfig.class.php:317 inc/entityconfig.class.php:604 msgid "Default Form list mode" -msgstr "Modo de lista de formularios predeterminado" +msgstr "Modo de lista de Formularios predeterminado" #: inc/entityconfig.class.php:335 inc/entityconfig.class.php:544 msgid "Sort order" @@ -1417,15 +1574,15 @@ msgstr "Mensaje del encabezado" #: inc/entityconfig.class.php:414 inc/entityconfig.class.php:624 msgid "Search issue" -msgstr "Problema de búsqueda" +msgstr "Buscar problema" #: inc/entityconfig.class.php:430 inc/entityconfig.class.php:594 msgid "Service catalog home page" -msgstr "Página principal del catálogo de servicios" +msgstr "Página principal del Catálogo de Servicios" #: inc/entityconfig.class.php:446 inc/entityconfig.class.php:634 msgid "Tile design" -msgstr "Diseño de baldosas " +msgstr "Diseño de título" #: inc/entityconfig.class.php:462 msgid "Home page" @@ -1439,7 +1596,7 @@ msgstr "Visibilidad del menú (solo para el menú vertical)" #: inc/form.class.php:225 entrée standard:84 msgid "Header" msgid_plural "Headers" -msgstr[0] "Encabezados" +msgstr[0] "Encabezado" msgstr[1] "Encabezados" msgstr[2] "Encabezados" @@ -1454,7 +1611,7 @@ msgstr "Mostrar encabezado" #: inc/questionrange.class.php:52 inc/questionparameter/range.class.php:56 msgid "Question range" msgid_plural "Question ranges" -msgstr[0] "Rangos de preguntas" +msgstr[0] "Rango de pregunta" msgstr[1] "Rangos de preguntas" msgstr[2] "Rangos de preguntas" @@ -1526,7 +1683,7 @@ msgstr "Todos los idiomas" #: inc/form.class.php:508 entrée standard:3 msgid "Target" msgid_plural "Targets" -msgstr[0] "Objetivos" +msgstr[0] "Objetivo" msgstr[1] "Objetivos" msgstr[2] "Objetivos" @@ -1542,8 +1699,39 @@ msgstr "Propiedades del formulario de respuesta" msgid "What are you looking for?" msgstr "¿Qué esta buscando?" +<<<<<<< HEAD #: inc/form.class.php:993 inc/form.class.php:1156 #: inc/abstracttarget.class.php:162 inc/abstractitiltarget.class.php:1625 +======= +#: inc/form.class.php:909 +#, php-format +msgid "My %1$d last forms (requester)" +msgstr "Mis últimos %1$d formularios (Solicitante)" + +#: inc/form.class.php:936 +msgid "No form posted yet" +msgstr "Aún no se ha publicado el formulario" + +#: inc/form.class.php:964 +msgid "All my forms (requester)" +msgstr "Todos mis formularios (Solicitante)" + +#: inc/form.class.php:977 +#, php-format +msgid "My %1$d last forms (validator)" +msgstr "Mis ultimos %1$d formularios (Validador)" + +#: inc/form.class.php:1007 +msgid "No form waiting for validation" +msgstr "No hay formularios esperando para validación" + +#: inc/form.class.php:1035 +msgid "All my forms (validator)" +msgstr "Todos mis formularios (Validador)" + +#: inc/form.class.php:1095 inc/form.class.php:1229 +#: inc/abstracttarget.class.php:162 inc/abstractitiltarget.class.php:1573 +>>>>>>> support/2.13.0 msgid "The name cannot be empty!" msgstr "¡El nombre no puede estar vacío!" @@ -1555,7 +1743,7 @@ msgstr "Se genera un bucle." msgid "Cannot use empty name for form answers. Keeping the previous value." msgstr "" "No se puede utilizar un nombre vacío para las respuestas del formulario. " -"Mantener el valor anterior." +"Manteniendo el valor anterior." #: inc/form.class.php:1303 #, php-format @@ -1573,12 +1761,12 @@ msgstr "Duplicar" #: inc/form.class.php:1442 inc/form.class.php:1452 msgctxt "button" msgid "Post" -msgstr "Exponer" +msgstr "Publicar" #: inc/form.class.php:1475 #, php-format msgid "Form duplicated: %s" -msgstr "Formulario duplicado:%s" +msgstr "Formulario duplicado: %s" #: inc/form.class.php:1491 #, php-format @@ -1592,7 +1780,7 @@ msgstr "Atrás" #: inc/form.class.php:1526 #, php-format msgid "Form updated: %s" -msgstr "Formulario actualizado:%s" +msgstr "Formulario actualizado: %s" #: inc/form.class.php:1636 msgid "Upload of JSON files not allowed." @@ -1675,7 +1863,7 @@ msgstr "" #: inc/form.class.php:1840 #, php-format msgid "You don't have right to update the entity %1$s." -msgstr "No tiene derecho a actualizar la entidad%1$s" +msgstr "No tiene derecho a actualizar la entidad %1$s." #: inc/form.class.php:1850 #, php-format @@ -1723,25 +1911,25 @@ msgstr "comprobación de carga del complemento formcreator" #: inc/targetchange.class.php:44 entrée standard:43 msgid "Target change" msgid_plural "Target changes" -msgstr[0] "Cambios en los objetivos" -msgstr[1] "Cambios en los objetivos" -msgstr[2] "Cambios en los objetivos" +msgstr[0] "Cambio" +msgstr[1] "Cambios" +msgstr[2] "Cambios" #: inc/targetchange.class.php:344 entrée standard:48 msgid "Change title" -msgstr "Cambiar título" +msgstr "Título del Cambio" #: inc/targetchange.class.php:374 entrée standard:56 msgid "Control list" -msgstr "Lista de control" +msgstr "Lista de Control" #: inc/targetchange.class.php:384 entrée standard:58 msgid "Deployment plan" -msgstr "Plan de despliegue" +msgstr "Plan de Despliegue" #: inc/targetchange.class.php:394 entrée standard:60 msgid "Backup plan" -msgstr "Plan de respaldo" +msgstr "Plan de Respaldo" #: inc/targetchange.class.php:404 msgid "Check list" @@ -1757,7 +1945,7 @@ msgstr[2] "Filtros de preguntas" #: inc/section.class.php:71 entrée standard:53 standard:44 msgid "Section" msgid_plural "Sections" -msgstr[0] "Secciones" +msgstr[0] "Sección" msgstr[1] "Secciones" msgstr[2] "Secciones" @@ -1773,13 +1961,13 @@ msgstr "Recuento de condiciones" #: inc/restrictedformcriteria.class.php:179 #, php-format msgid "Failed to find %1$s %2$s" -msgstr "Error al encontrar%1$s%2$s" +msgstr "Error al encontrar %1$s %2$s" #: inc/question.class.php:73 inc/abstractitiltarget.class.php:1127 entrée #: standard:41 msgid "Question" msgid_plural "Questions" -msgstr[0] "Preguntas" +msgstr[0] "Pregunta" msgstr[1] "Preguntas" msgstr[2] "Preguntas" @@ -1808,7 +1996,7 @@ msgstr "" #: inc/question.class.php:1184 msgid "Service levels" -msgstr "Niveles de servicio" +msgstr "Niveles de Servicio" #: inc/question.class.php:1185 inc/abstractitiltarget.class.php:851 msgid "SLA" @@ -1833,7 +2021,7 @@ msgstr "Gestión" #: inc/question.class.php:1236 msgid "Tools" -msgstr "herramientas" +msgstr "Herramientas" #: inc/question.class.php:1237 msgid "Notes" @@ -1850,13 +2038,13 @@ msgstr "Administración" #: inc/question.class.php:1248 inc/question.class.php:1251 msgid "Plugin" msgid_plural "Plugins" -msgstr[0] "Plugins" -msgstr[1] "Plugins" -msgstr[2] "Plugins" +msgstr[0] "Complemento" +msgstr[1] "Complementos" +msgstr[2] "Complementos" #: inc/abstractquestionparameter.class.php:98 msgid "Parameter" -msgstr "Parametro" +msgstr "Parámetro" #: inc/abstractquestionparameter.class.php:105 msgid "Field name" @@ -1964,7 +2152,7 @@ msgstr "Paso 3: litteral > signo." #: inc/filter/itilcategoryfilter.class.php:52 #: inc/filter/itilcategoryfilter.class.php:54 msgid "Request categories" -msgstr "Categorías de solicitud" +msgstr "Categorías de Solicitudes" #: inc/filter/itilcategoryfilter.class.php:53 #: inc/filter/itilcategoryfilter.class.php:54 @@ -1973,7 +2161,7 @@ msgstr "Categorías de Incidentes" #: inc/filter/itilcategoryfilter.class.php:55 msgid "Change categories" -msgstr "Categorías de cambio" +msgstr "Categorías de Cambios" #: inc/supervisorvalidator.class.php:44 msgid "Requester supervisor" @@ -1989,37 +2177,37 @@ msgstr "Mi supervisor" #: inc/questionregex.class.php:52 msgid "Question regular expression" msgid_plural "Question regular expressions" -msgstr[0] "Expresiones regulares de preguntas" -msgstr[1] "Expresiones regulares de preguntas" -msgstr[2] "Expresiones regulares de preguntas" +msgstr[0] "Expresión regular de la pregunta" +msgstr[1] "Expresiones regulares de pregunta" +msgstr[2] "Expresiones regulares de pregunta" #: inc/questiondependency.class.php:66 msgid "Question dependency" msgid_plural "Question dependencies" -msgstr[0] "Dependencias de preguntas" +msgstr[0] "Dependencia de la pregunta" msgstr[1] "Dependencias de preguntas" msgstr[2] "Dependencias de preguntas" #: inc/answer.class.php:66 entrée standard:43 msgid "Answer" msgid_plural "Answers" -msgstr[0] "Respuestas" +msgstr[0] "Respuesta" msgstr[1] "Respuestas" msgstr[2] "Respuestas" #: inc/item_targetticket.class.php:52 msgid "Composite ticket relation" msgid_plural "Composite ticket relations" -msgstr[0] "Relaciones de tickets compuestos" -msgstr[1] "Relaciones de tickets compuestos" -msgstr[2] "Relaciones de tickets compuestos" +msgstr[0] "Relación compuesta de casos" +msgstr[1] "Relaciones compuestas de casos" +msgstr[2] "Relaciones compuestas de casos" #: inc/targetticket.class.php:57 entrée standard:43 msgid "Target ticket" msgid_plural "Target tickets" -msgstr[0] "Tickets objetivo" -msgstr[1] "Tickets objetivo" -msgstr[2] "Tickets objetivo" +msgstr[0] "Caso" +msgstr[1] "Casos" +msgstr[2] "Casos" #: inc/targetticket.class.php:100 msgid "Specific asset" @@ -2043,7 +2231,7 @@ msgstr "Origen de la plantilla o usuario predeterminado o GLPI predeterminado" #: inc/targetticket.class.php:109 msgid "Formcreator" -msgstr "Creador de formularios" +msgstr "Creador de Formularios" #: inc/targetticket.class.php:115 msgid "Default or from a template" @@ -2055,7 +2243,7 @@ msgstr "Especificar tipo" #: inc/targetticket.class.php:189 entrée standard:48 msgid "Ticket title" -msgstr "Título del caso" +msgstr "Título del Caso" #: inc/targetticket.class.php:307 msgid "Add validation message as first ticket followup" @@ -2075,7 +2263,7 @@ msgstr "Sin campo administrado" #: inc/targetticket.class.php:396 msgid "Link to an other ticket" -msgstr "Enlace para otro caso" +msgstr "Enlace a otro caso" #: inc/targetticket.class.php:405 msgid "An other destination of this form" @@ -2087,7 +2275,7 @@ msgstr "Un Caso existente" #: inc/targetticket.class.php:407 msgid "A ticket from an answer to a question" -msgstr "Un ticket de una respuesta a una pregunta" +msgstr "A un Caso de una respuesta a una pregunta" #: inc/targetticket.class.php:488 msgctxt "button" @@ -2156,11 +2344,11 @@ msgstr "Especificar etiquetas" #: inc/abstractitiltarget.class.php:189 msgid "Tags from questions and specific tags" -msgstr "Etiquetas de preguntas y etiquetas específicas" +msgstr "Etiquetas desde preguntas y etiquetas específicas" #: inc/abstractitiltarget.class.php:190 msgid "Tags from questions or specific tags" -msgstr "Etiquetas de preguntas o etiquetas específicas" +msgstr "Etiquetas desde preguntas o etiquetas específicas" #: inc/abstractitiltarget.class.php:196 msgid "TTR from template or none" @@ -2180,7 +2368,7 @@ msgstr "calculado a partir de la respuesta a la pregunta" #: inc/abstractitiltarget.class.php:205 msgid "SLA from template or none" -msgstr "Plantilla de SLA o nada" +msgstr "SLA desde la plantilla o ninguno" #: inc/abstractitiltarget.class.php:206 msgid "Specific SLA" @@ -2188,7 +2376,7 @@ msgstr "Especificar SLA" #: inc/abstractitiltarget.class.php:213 msgid "OLA from template or none" -msgstr "Plantilla de OLA o nada" +msgstr "OLA desde la plantilla o ninguno" #: inc/abstractitiltarget.class.php:214 msgid "Specific OLA" @@ -2196,7 +2384,7 @@ msgstr "Especificar OLA" #: inc/abstractitiltarget.class.php:221 msgid "Urgency from template or Medium" -msgstr "Urgencia de la plantilla o medio" +msgstr "Urgencia desde la plantilla o Medio" #: inc/abstractitiltarget.class.php:222 msgid "Specific urgency" @@ -2204,7 +2392,7 @@ msgstr "Especificar urgencia" #: inc/abstractitiltarget.class.php:229 msgid "Category from template or none" -msgstr "Categoría de la plantilla o nada" +msgstr "Categoría desde la plantilla o ninguno" #: inc/abstractitiltarget.class.php:230 msgid "Specific category" @@ -2212,7 +2400,7 @@ msgstr "Especificar categoría" #: inc/abstractitiltarget.class.php:238 msgid "Location from template or none" -msgstr "Ubicación de la plantilla o nada" +msgstr "Ubicación desde la plantilla o ninguno" #: inc/abstractitiltarget.class.php:239 msgid "Specific location" @@ -2236,51 +2424,51 @@ msgstr "Usuario o grupo específico" #: inc/abstractitiltarget.class.php:258 msgid "User from question answer" -msgstr "Usuario de la pregunta respuesta" +msgstr "Usuario desde la respuesta a la pregunta" #: inc/abstractitiltarget.class.php:259 msgid "Group from question answer" -msgstr "Grupo de respuesta a la pregunta" +msgstr "Grupo desde la respuesta a la pregunta" #: inc/abstractitiltarget.class.php:839 msgid "Minute" msgid_plural "Minutes" -msgstr[0] "Minutos" +msgstr[0] "Minuto" msgstr[1] "Minutos" msgstr[2] "Minutos" #: inc/abstractitiltarget.class.php:840 msgid "Hour" msgid_plural "Hours" -msgstr[0] "Horas" +msgstr[0] "Hora" msgstr[1] "Horas" msgstr[2] "Horas" #: inc/abstractitiltarget.class.php:841 msgid "Day" msgid_plural "Days" -msgstr[0] "Días " -msgstr[1] "Días " -msgstr[2] "Días " +msgstr[0] "Día" +msgstr[1] "Días" +msgstr[2] "Días" #: inc/abstractitiltarget.class.php:842 msgid "Month" msgid_plural "Months" -msgstr[0] "Meses" +msgstr[0] "Mes" msgstr[1] "Meses" msgstr[2] "Meses" #: inc/abstractitiltarget.class.php:874 msgid "SLA (TTO/TTR)" -msgstr "SLA ( TTO / TTR )" +msgstr "SLA (TTO/TTR)" #: inc/abstractitiltarget.class.php:875 inc/abstractitiltarget.class.php:948 msgid "Question (TTO/TTR)" -msgstr "Pregunta ( TTO / TTR )" +msgstr "Pregunta (TTO/TTR )" #: inc/abstractitiltarget.class.php:947 msgid "OLA (TTO/TTR)" -msgstr "OLA ( TTO / TTR )" +msgstr "OLA (TTO/TTR)" #: inc/abstractitiltarget.class.php:1051 msgid "Urgency " @@ -2288,7 +2476,7 @@ msgstr "Urgencia " #: inc/abstractitiltarget.class.php:1080 msgid "Ticket tags" -msgstr "Etiquetas del caso" +msgstr "Etiquetas del Caso" #: inc/abstractitiltarget.class.php:1128 msgid "Tags" @@ -2317,7 +2505,7 @@ msgstr "¡La descripción no puede estar vacía!" #: inc/abstractitiltarget.class.php:1811 msgid "Watcher" msgid_plural "Watchers" -msgstr[0] "Observadores" +msgstr[0] "Observador" msgstr[1] "Observadores" msgstr[2] "Observadores" @@ -2357,7 +2545,7 @@ msgstr "Si" #: install/install.php:163 #, php-format msgid "Upgrade tables to innoDB; run %s" -msgstr "Actualizar tablas a innoDB; ejecutar%s" +msgstr "Actualizar tablas a innoDB; ejecutar %s" #: install/install.php:199 #, php-format @@ -2366,12 +2554,12 @@ msgid "" "Formcreator %s. To see the logs run the command %s" msgstr "" "El esquema de base de datos no es coherente con la versión anterior de " -"Creador de formularios%s. Para ver los registros, ejecute el comando%s" +"Formcreator %s. Para ver los registros, ejecute el comando %s" #: install/install.php:208 #, php-format msgid "To ignore the inconsistencies and upgrade anyway run %s" -msgstr "Para ignorar las incoherencias y actualizar de todos modos ejecute%s" +msgstr "Para ignorar las incoherencias y actualizar de todos modos ejecute %s" #: install/install.php:225 msgid "" @@ -2401,8 +2589,8 @@ msgid "" "Formcreator %s. To see the logs enable the plugin and run the command %s" msgstr "" "El esquema de la base de datos no es consistente con la versión actual de " -"Formcreator%s . Para ver los registros habilite el plugin y ejecute el " -"comando%s" +"Formcreator %s . Para ver los registros habilite el complemento y ejecute el" +" comando %s" #: install/install.php:305 msgid "The tables of the plugin passed the schema integrity check." @@ -2423,14 +2611,20 @@ msgid "" "##formcreator.request_id## and transmitted to the helpdesk team.\\nYou can " "see your answers onto the following link:\\n##formcreator.validation_link##" msgstr "" -"Hola,\\\\n Su solicitud del GLPI ha sido exitosamente guardada con el numero" -" ##formcreator.request_id## y notificado al equipo de la mesa de ayuda.\\\\n" -" Puede ver las respuestas del equipo en el siguiente link:\\\\n " -"##formcreator.validation_link##" +"Hola,\\nSu solicitud desde GLPI ha sido exitosamente guardada con el número " +"##formcreator.request_id## y notificado al equipo de la mesa de " +"ayuda.\\nPuede ver las respuestas del equipo en el siguiente " +"enlace:\\n##formcreator.validation_link##" +<<<<<<< HEAD #: install/install.php:484 msgid "A form need validation" msgstr "Un formulario necesita validación" +======= +#: install/install.php:420 +msgid "A form from GLPI need to be validate" +msgstr "Un formulario de GLPI necesita ser validado" +>>>>>>> support/2.13.0 #: install/install.php:485 msgid "A form from GLPI need to be validated" @@ -2443,8 +2637,13 @@ msgid "" "link:\\n##formcreator.validation_link##" msgstr "" "Hola,\\nUn formulario de GLPI necesita ser validado y usted ha sido elegido " +<<<<<<< HEAD "como validador.\\nPuede acceder haciendo clic en este " "enlace:\\n##formcreator.validation_link##" +======= +"como validador.\\nPuede acceder a él haciendo clic en este enlace:\\n## " +"formcreator.validation_link ##" +>>>>>>> support/2.13.0 #: install/install.php:491 msgid "Your form has been refused by the validator" @@ -2469,11 +2668,11 @@ msgid "" "validator.\\nYour request will be considered soon." msgstr "" "Hola,\\nNos complace informarle que su formulario ha sido aceptado por el " -"validador.\\n Su solicitud será considerada pronto." +"validador.\\nSu solicitud será considerada pronto." #: install/install.php:503 msgid "Your form has been deleted by an administrator" -msgstr "Tu formulario ha sido eliminado por un administrador" +msgstr "Su formulario ha sido eliminado por un administrador" #: install/install.php:504 msgid "" @@ -2537,11 +2736,11 @@ msgstr "Antiguo" #: hook.php:781 #, php-format msgid "Number of %s" -msgstr "Número de%s" +msgstr "Número de %s" #: hook.php:798 msgid "Issues summary" -msgstr "Resumen de Temas" +msgstr "Resumen de problemas" #: hook.php:843 msgid "" @@ -2567,7 +2766,7 @@ msgstr "No se ha encontrado ningún elemento de FAQ." #: js/scripts.js:707 msgid "Are you sure you want to delete this question?" -msgstr "¿Esta seguro que quieres eliminar esta pregunta?" +msgstr "¿Esta seguro que quiere eliminar esta pregunta?" #: js/scripts.js:917 msgid "Are you sure you want to delete this section?" @@ -2596,7 +2795,7 @@ msgstr "¿Está seguro de que desea eliminar este validador?" #: js/scripts.js:1520 msgid "Are you sure you want to duplicate this target?" -msgstr "¿Estás seguro de que quieres duplicar este objetivo?" +msgstr "¿Está seguro de que desea duplicar este objetivo?" #: js/scripts.js:1537 msgid "Are you sure you want to delete this target?" @@ -2614,7 +2813,7 @@ msgstr "Mostrar vacío" #: entrée standard:39 msgid "LDAP directory" msgid_plural "LDAP directories" -msgstr[0] "Directorios LDAP" +msgstr[0] "Directorio LDAP" msgstr[1] "Directorios LDAP" msgstr[2] "Directorios LDAP" @@ -2630,6 +2829,13 @@ msgstr "Valores" msgid "Show ticket categories" msgstr "Mostrar categorías de los casos" +<<<<<<< HEAD +======= +#: entrée standard:109 +msgid "Time to own" +msgstr "Tiempo para apropiarse (TTO)" + +>>>>>>> support/2.13.0 #: entrée standard:146 standard:118 msgid "Selectable root" msgstr "Raíz seleccionable" @@ -2695,7 +2901,7 @@ msgstr "Impactos" #: entrée standard:62 msgid "Checklist" -msgstr "Lista de verificación" +msgstr "Lista de Verificación" #: entrée standard:36 msgid "Answers title" @@ -2716,7 +2922,7 @@ msgstr "Aún no hay respuesta" #: entrée standard:38 #, php-format msgid "%s latest items" -msgstr "%súltimos artículos " +msgstr "%s últimos elementos" #: entrée standard:54 msgid "Please activate the form to view the link" diff --git a/locales/es_VE.po b/locales/es_VE.po index 13424d67d..aae38885f 100644 --- a/locales/es_VE.po +++ b/locales/es_VE.po @@ -250,6 +250,45 @@ msgstr "Directorio LDAP no definido!" msgid "LDAP directory not found!" msgstr "Directorio LDAP no encontrado!" +<<<<<<< HEAD +======= +#: inc/field/ldapselectfield.class.php:154 +msgid "LDAP attribute is required!" +msgstr "¡Se requiere el atributo LDAP!" + +#: inc/field/textfield.class.php:146 inc/field/floatfield.class.php:156 +#, php-format +msgid "Specific format does not match: %s" +msgstr "El formato especificado no coincide: %s" + +#: inc/field/textfield.class.php:155 +#, php-format +msgid "The text is too short (minimum %d characters): %s" +msgstr "El texto es demasiado corto (mínimo %d caracteres): %s" + +#: inc/field/textfield.class.php:160 +#, php-format +msgid "The text is too long (maximum %d characters): %s" +msgstr "El texto es demasiado largo (máximo %d caracteres): %s" + +#: inc/field/textfield.class.php:168 +msgid "Text" +msgstr "Texto" + +#: inc/field/textfield.class.php:217 inc/field/floatfield.class.php:238 +#: inc/questionregex.class.php:62 entrée standard:42 +msgid "Regular expression" +msgstr "Expresión regular" + +#: inc/field/textfield.class.php:222 inc/field/floatfield.class.php:243 +msgid "Range" +msgstr "Rango" + +#: inc/field/textfield.class.php:228 inc/field/floatfield.class.php:249 +msgid "Additional validation" +msgstr "Validación adicional" + +>>>>>>> support/2.13.0 #: inc/field/radiosfield.class.php:108 msgid "Radios" msgstr "Radios" diff --git a/locales/ja_JP.po b/locales/ja_JP.po index 0f356c751..ddce4bc3f 100644 --- a/locales/ja_JP.po +++ b/locales/ja_JP.po @@ -4,6 +4,10 @@ # FIRST AUTHOR , YEAR. # # Translators: +<<<<<<< HEAD +======= +# Thierry Bugier , 2023 +>>>>>>> support/2.13.0 # INOUE Daisuke, 2023 # #, fuzzy @@ -11,8 +15,13 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2023-05-31 16:21+0200\n" "PO-Revision-Date: 2022-06-15 12:10+0000\n" +======= +"POT-Creation-Date: 2023-11-13 14:56+0100\n" +"PO-Revision-Date: 2021-08-30 07:22+0000\n" +>>>>>>> support/2.13.0 "Last-Translator: INOUE Daisuke, 2023\n" "Language-Team: Japanese (Japan) (https://app.transifex.com/teclib/teams/28042/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -243,6 +252,45 @@ msgstr "LDAP ディレクトリが未定義です！" msgid "LDAP directory not found!" msgstr "LDAP ディレクトリーがありません！" +<<<<<<< HEAD +======= +#: inc/field/ldapselectfield.class.php:154 +msgid "LDAP attribute is required!" +msgstr "LDAP 属性が必要です！" + +#: inc/field/textfield.class.php:146 inc/field/floatfield.class.php:156 +#, php-format +msgid "Specific format does not match: %s" +msgstr "特定の書式がマッチしません : %s" + +#: inc/field/textfield.class.php:155 +#, php-format +msgid "The text is too short (minimum %d characters): %s" +msgstr "テキストが短すぎます（最低 %d 文字）: %s" + +#: inc/field/textfield.class.php:160 +#, php-format +msgid "The text is too long (maximum %d characters): %s" +msgstr "テキストが長すぎます（最大 %d 文字）: %s" + +#: inc/field/textfield.class.php:168 +msgid "Text" +msgstr "テキスト" + +#: inc/field/textfield.class.php:217 inc/field/floatfield.class.php:238 +#: inc/questionregex.class.php:62 entrée standard:42 +msgid "Regular expression" +msgstr "正規表現" + +#: inc/field/textfield.class.php:222 inc/field/floatfield.class.php:243 +msgid "Range" +msgstr "範囲" + +#: inc/field/textfield.class.php:228 inc/field/floatfield.class.php:249 +msgid "Additional validation" +msgstr "追加の検証" + +>>>>>>> support/2.13.0 #: inc/field/radiosfield.class.php:108 msgid "Radios" msgstr "ラジオボタン" diff --git a/locales/pt_BR.po b/locales/pt_BR.po index e56d5377f..2ed89a1e2 100644 --- a/locales/pt_BR.po +++ b/locales/pt_BR.po @@ -19,9 +19,18 @@ # Rafael Santos , 2022 # Jean Vergaças , 2022 # Pedro de Oliveira Lira , 2022 +<<<<<<< HEAD +======= +# Eduardo Spinola , 2022 +# Pablo Pierri , 2023 +>>>>>>> support/2.13.0 # Matheus Rafael, 2023 # Eduardo Spinola , 2023 # Eduardo Scott , 2023 +<<<<<<< HEAD +======= +# Thierry Bugier , 2023 +>>>>>>> support/2.13.0 # Diego Nobre , 2023 # #, fuzzy @@ -29,8 +38,13 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2023-05-31 16:21+0200\n" "PO-Revision-Date: 2022-06-15 12:10+0000\n" +======= +"POT-Creation-Date: 2023-11-13 14:56+0100\n" +"PO-Revision-Date: 2021-08-30 07:22+0000\n" +>>>>>>> support/2.13.0 "Last-Translator: Diego Nobre , 2023\n" "Language-Team: Portuguese (Brazil) (https://app.transifex.com/teclib/teams/28042/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -267,10 +281,50 @@ msgstr "Diretório LDAP não definido!" msgid "LDAP directory not found!" msgstr "Diretório LDAP não encontrado!" +<<<<<<< HEAD +======= +#: inc/field/ldapselectfield.class.php:154 +msgid "LDAP attribute is required!" +msgstr "Atributo LDAP é obrigatório!" + +#: inc/field/textfield.class.php:146 inc/field/floatfield.class.php:156 +#, php-format +msgid "Specific format does not match: %s" +msgstr "Formato específico não corresponde: %s" + +#: inc/field/textfield.class.php:155 +#, php-format +msgid "The text is too short (minimum %d characters): %s" +msgstr "O texto é muito curto (mínimo %d caracteres): %s" + +#: inc/field/textfield.class.php:160 +#, php-format +msgid "The text is too long (maximum %d characters): %s" +msgstr "O texto é muito longo (máximo %d caracteres): %s" + +#: inc/field/textfield.class.php:168 +msgid "Text" +msgstr "Texto" + +#: inc/field/textfield.class.php:217 inc/field/floatfield.class.php:238 +#: inc/questionregex.class.php:62 entrée standard:42 +msgid "Regular expression" +msgstr "Expressão regular" + +#: inc/field/textfield.class.php:222 inc/field/floatfield.class.php:243 +msgid "Range" +msgstr "Range" + +#: inc/field/textfield.class.php:228 inc/field/floatfield.class.php:249 +msgid "Additional validation" +msgstr "Validação adicional" + +>>>>>>> support/2.13.0 #: inc/field/radiosfield.class.php:108 msgid "Radios" msgstr "Seleção única" +<<<<<<< HEAD #: inc/field/radiosfield.class.php:114 inc/field/fieldsfield.class.php:513 #: inc/field/checkboxesfield.class.php:245 msgid "The field value is required:" @@ -280,11 +334,37 @@ msgstr "O valor do campo é obrigatório:" #: inc/field/datetimefield.class.php:119 inc/field/actorfield.class.php:258 #: inc/field/checkboxesfield.class.php:191 inc/field/floatfield.class.php:125 #: inc/field/datefield.class.php:116 +======= +#: inc/field/radiosfield.class.php:116 inc/field/checkboxesfield.class.php:256 +msgid "The field value is required." +msgstr "O valor do campo é obrigatório." + +#: inc/field/radiosfield.class.php:127 +msgid "Only one default value is allowed." +msgstr "Somente um valor padrão é permitido." + +#: inc/field/radiosfield.class.php:138 +msgid "The default value is not in the list of available values." +msgstr "O valor padrão não está na lista de valores disponíveis." + +#: inc/field/radiosfield.class.php:215 inc/field/selectfield.class.php:105 +#: inc/field/datetimefield.class.php:119 inc/field/actorfield.class.php:257 +#: inc/field/checkboxesfield.class.php:190 inc/field/floatfield.class.php:124 +>>>>>>> support/2.13.0 #, php-format msgid "A required field is empty: %s" msgstr "Um campo obrigatório está vazio: %s" +<<<<<<< HEAD #: inc/field/integerfield.class.php:59 +======= +#: inc/field/radiosfield.class.php:234 inc/field/selectfield.class.php:123 +#, php-format +msgid "This value %1$s is not allowed: %2$s" +msgstr "Este valor %1$s não é permitido: %2$s" + +#: inc/field/integerfield.class.php:60 +>>>>>>> support/2.13.0 #, php-format msgid "This is not an integer: %s" msgstr "Isto não é um número inteiro: %s" @@ -466,7 +546,21 @@ msgstr "Campos adicionais" msgid "Checkboxes" msgstr "Caixas de Seleção" +<<<<<<< HEAD #: inc/field/checkboxesfield.class.php:227 +======= +#: inc/field/checkboxesfield.class.php:208 +#, php-format +msgid "Empty values are not allowed: %s" +msgstr "Valores vazios não são permitidos: %s" + +#: inc/field/checkboxesfield.class.php:216 +#, php-format +msgid "This value %1$s is not alowed: %2$s" +msgstr "Este valor %1$s não é permitido: %2$s" + +#: inc/field/checkboxesfield.class.php:236 +>>>>>>> support/2.13.0 #, php-format msgid "The following question needs at least %d answers: %s" msgstr "A seguinte pergunta precisa de pelo menos %dresposta: %s" @@ -476,7 +570,15 @@ msgstr "A seguinte pergunta precisa de pelo menos %dresposta: %s" msgid "The following question does not accept more than %d answers: %s" msgstr "A questão a seguir não aceita mais de %drespostas: %s" +<<<<<<< HEAD #: inc/field/checkboxesfield.class.php:305 +======= +#: inc/field/checkboxesfield.class.php:270 +msgid "The default values are not in the list of available values." +msgstr "Os valores padrão não estão na lista de valores disponíveis." + +#: inc/field/checkboxesfield.class.php:325 +>>>>>>> support/2.13.0 msgid "Range min" msgstr "Intervalo mín" @@ -486,7 +588,7 @@ msgstr "Intervalo máx" #: inc/field/requesttypefield.class.php:87 inc/targetticket.class.php:1150 msgid "Request type" -msgstr "Tipo de Solicitação" +msgstr "Tipo de requisição" #: inc/field/floatfield.class.php:142 #, php-format @@ -662,8 +764,13 @@ msgstr[2] "Entidades" #: standard:48 msgid "Requester" msgid_plural "Requesters" +<<<<<<< HEAD msgstr[0] "Requerente" msgstr[1] "Requerentes" +======= +msgstr[0] "Solicitante" +msgstr[1] "Solicitantes" +>>>>>>> support/2.13.0 msgstr[2] "Requerentes" #: inc/issue.class.php:619 inc/formanswer.class.php:258 @@ -755,7 +862,7 @@ msgstr "Aprovador do formulário atual" #: inc/issue.class.php:1227 msgid "Ticket requester" -msgstr "Solicitante do chamado" +msgstr "Requerente do chamado" #: inc/issue.class.php:1274 msgid "Ticket observer" @@ -1092,9 +1199,16 @@ msgstr "" msgid "Cannot generate targets!" msgstr "Impossível gerar alvos!" +<<<<<<< HEAD #: inc/formanswer.class.php:1511 msgid "No captcha set." msgstr "" +======= +#: inc/formanswer.class.php:1434 +#, php-format +msgid "Answer is invalid in %1$s" +msgstr "A resposta é inválida em %1$s" +>>>>>>> support/2.13.0 #: inc/formanswer.class.php:1517 msgid "You failed the captcha test." @@ -1378,7 +1492,7 @@ msgstr "Procurar assistência" #: inc/entityconfig.class.php:174 msgid "User's assistance requests" -msgstr "Solicitações de assistência dos usuários" +msgstr "Requisições de assistência dos usuários" #: inc/entityconfig.class.php:181 msgid "Only forms" @@ -1544,7 +1658,23 @@ msgstr[0] "Destino" msgstr[1] "Destinos" msgstr[2] "Destinos" +<<<<<<< HEAD #: inc/form.class.php:511 +======= +#: inc/form.class.php:504 +msgid "Actions" +msgstr "Ações" + +#: inc/form.class.php:527 inc/form.class.php:1433 +msgid "Duplicate" +msgstr "Duplicar" + +#: inc/form.class.php:554 inc/form.class.php:2223 +msgid "Add a target" +msgstr "Adicionar um alvo" + +#: inc/form.class.php:575 +>>>>>>> support/2.13.0 msgid "Preview" msgstr "Pré-visualização" @@ -1556,8 +1686,39 @@ msgstr "Propriedades de resposta do formulário" msgid "What are you looking for?" msgstr "O que você está procurando?" +<<<<<<< HEAD #: inc/form.class.php:993 inc/form.class.php:1156 #: inc/abstracttarget.class.php:162 inc/abstractitiltarget.class.php:1625 +======= +#: inc/form.class.php:909 +#, php-format +msgid "My %1$d last forms (requester)" +msgstr "Meus %1$d últimos formulários (requerente)" + +#: inc/form.class.php:936 +msgid "No form posted yet" +msgstr "Nenhum formulário postado ainda" + +#: inc/form.class.php:964 +msgid "All my forms (requester)" +msgstr "Todos os meus formulários (requerente)" + +#: inc/form.class.php:977 +#, php-format +msgid "My %1$d last forms (validator)" +msgstr "Meus %1$d últimos formulários (validador)" + +#: inc/form.class.php:1007 +msgid "No form waiting for validation" +msgstr "Nenhum formulário aguarda validação" + +#: inc/form.class.php:1035 +msgid "All my forms (validator)" +msgstr "Todos os formulários (validador)" + +#: inc/form.class.php:1095 inc/form.class.php:1229 +#: inc/abstracttarget.class.php:162 inc/abstractitiltarget.class.php:1573 +>>>>>>> support/2.13.0 msgid "The name cannot be empty!" msgstr "O nome não pode ser vazio!" @@ -1954,7 +2115,7 @@ msgstr "Feito." #: inc/command/cleanticketscommand.class.php:135 msgid "Step 1: double encoded < and > signs." -msgstr "" +msgstr "Etapa 1: sinais < e > com codificação dupla." #: inc/command/cleanticketscommand.class.php:146 #: inc/command/cleanticketscommand.class.php:196 @@ -1964,11 +2125,11 @@ msgstr "Nenhum item inválido encontrado." #: inc/command/cleanticketscommand.class.php:187 msgid "Step 2: literal BR tag." -msgstr "" +msgstr "Etapa 2: tag BR literal." #: inc/command/cleanticketscommand.class.php:251 msgid "Step 3: litteral > sign." -msgstr "" +msgstr "Etapa 3: sinal > literal" #: inc/filter/itilcategoryfilter.class.php:52 #: inc/filter/itilcategoryfilter.class.php:54 @@ -2126,7 +2287,7 @@ msgstr "Seu formulário foi aceito pelo validador" #: inc/targetticket.class.php:1137 msgid "Request source" -msgstr "Origem da solicitação" +msgstr "Origem da requisição" #: inc/targetticket.class.php:1162 msgid "Type " diff --git a/locales/sk_SK.po b/locales/sk_SK.po index 619b4a3d1..e8c3fe88c 100644 --- a/locales/sk_SK.po +++ b/locales/sk_SK.po @@ -4,8 +4,14 @@ # FIRST AUTHOR , YEAR. # # Translators: +<<<<<<< HEAD # Radoslav Koren, 2023 # Miroslav Hlohovsky, 2023 +======= +# Miroslav Hlohovsky, 2022 +# Radoslav Koren, 2022 +# Thierry Bugier , 2023 +>>>>>>> support/2.13.0 # feonsu , 2023 # #, fuzzy @@ -13,8 +19,13 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2023-05-31 16:21+0200\n" "PO-Revision-Date: 2022-06-15 12:10+0000\n" +======= +"POT-Creation-Date: 2023-11-13 14:56+0100\n" +"PO-Revision-Date: 2021-08-30 07:22+0000\n" +>>>>>>> support/2.13.0 "Last-Translator: feonsu , 2023\n" "Language-Team: Slovak (Slovakia) (https://app.transifex.com/teclib/teams/28042/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -253,14 +264,59 @@ msgstr "LDAP adresár nie je definovaný!" msgid "LDAP directory not found!" msgstr "LDAP adresár nebol nájdený!" +<<<<<<< HEAD +======= +#: inc/field/ldapselectfield.class.php:154 +msgid "LDAP attribute is required!" +msgstr "LDAP atribút je požadovaný!" + +#: inc/field/textfield.class.php:146 inc/field/floatfield.class.php:156 +#, php-format +msgid "Specific format does not match: %s" +msgstr "Špecifický formát sa nezhoduje: %s" + +#: inc/field/textfield.class.php:155 +#, php-format +msgid "The text is too short (minimum %d characters): %s" +msgstr "Text je príliš krátky (minimum %d znakov): %s" + +#: inc/field/textfield.class.php:160 +#, php-format +msgid "The text is too long (maximum %d characters): %s" +msgstr "Text je príliš dlhý (maximum %d znakov): %s" + +#: inc/field/textfield.class.php:168 +msgid "Text" +msgstr "Text" + +#: inc/field/textfield.class.php:217 inc/field/floatfield.class.php:238 +#: inc/questionregex.class.php:62 entrée standard:42 +msgid "Regular expression" +msgstr "Všeobecný výraz" + +#: inc/field/textfield.class.php:222 inc/field/floatfield.class.php:243 +msgid "Range" +msgstr "Rozsah" + +#: inc/field/textfield.class.php:228 inc/field/floatfield.class.php:249 +msgid "Additional validation" +msgstr "Dodatočné overenie" + +>>>>>>> support/2.13.0 #: inc/field/radiosfield.class.php:108 msgid "Radios" msgstr "Tlačidlá predvoľby" +<<<<<<< HEAD #: inc/field/radiosfield.class.php:114 inc/field/fieldsfield.class.php:513 #: inc/field/checkboxesfield.class.php:245 msgid "The field value is required:" msgstr "Hodnota poľa je povinná:" +======= +#: inc/field/radiosfield.class.php:116 inc/field/checkboxesfield.class.php:256 +msgid "The field value is required." +msgstr "Hodnota poľa je povinná." +>>>>>>> support/2.13.0 #: inc/field/radiosfield.class.php:192 inc/field/selectfield.class.php:104 #: inc/field/datetimefield.class.php:119 inc/field/actorfield.class.php:258 @@ -337,7 +393,11 @@ msgstr "Veľmi nízka" #: inc/field/tagfield.class.php:52 msgid "Warning: Tag plugin is disabled or missing" +<<<<<<< HEAD msgstr "Upozornenie: Doplnok značky je zakázaný alebo chýba" +======= +msgstr "Upozornenie: plugin Tag je vypnutý alebo chýba" +>>>>>>> support/2.13.0 #: inc/field/tagfield.class.php:200 msgid "Tag" @@ -422,7 +482,11 @@ msgstr "Viacnásobný výber" #: inc/field/fieldsfield.class.php:154 msgid "Warning: Additional Fields plugin is disabled or missing" +<<<<<<< HEAD msgstr "Upozornenie: Ďalšie polia pluginu sú zakázané alebo chýbajú" +======= +msgstr "Upozornenie: plugin Dodatočné polia (fields) je vypnutý alebo chýba" +>>>>>>> support/2.13.0 #: inc/field/fieldsfield.class.php:168 msgid "Block" @@ -772,15 +836,15 @@ msgstr "%1$s %2$s" #: inc/issue.class.php:1727 inc/filter/itilcategoryfilter.class.php:56 #: hook.php:766 msgid "All" -msgstr "Všetci" +msgstr "Všetko" #: inc/issue.class.php:1733 hook.php:767 msgid "New" -msgstr "Nový" +msgstr "Nové" #: inc/issue.class.php:1739 hook.php:768 msgid "Assigned" -msgstr "Pridelený" +msgstr "Priradené" #: inc/issue.class.php:1745 inc/formanswer.class.php:78 #: inc/form_validator.class.php:70 hook.php:769 @@ -797,7 +861,7 @@ msgstr "Vyriešené" #: inc/issue.class.php:1763 hook.php:772 msgid "Closed" -msgstr "Uzavretý" +msgstr "Uzavreté" #: inc/category.class.php:50 hook.php:72 msgid "Form category" @@ -1120,7 +1184,7 @@ msgstr "Vyhľadajte pomoc" #: inc/common.class.php:751 inc/common.class.php:755 msgid "My requests for assistance" -msgstr "Moja požiadavka o pomoc" +msgstr "Moje požiadavky o pomoc" #: inc/common.class.php:791 msgid "Consult reminders" @@ -1137,10 +1201,33 @@ msgstr "" #: inc/formaccesstype.class.php:41 entrée standard:39 msgid "Access type" msgid_plural "Access types" +<<<<<<< HEAD msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" +======= +msgstr[0] "Typ prístupu" +msgstr[1] "Typy prístupov" +msgstr[2] "Typy prístupov" +msgstr[3] "Typy prístupov" + +#: inc/formaccesstype.class.php:79 +msgid "Link to the form" +msgstr "Odkaz na formulár" + +#: inc/formaccesstype.class.php:92 +msgid "Please activate the form to view the link" +msgstr "Pre zobrazenie odkazu prosím aktivujte formulár" + +#: inc/formaccesstype.class.php:100 inc/form.class.php:1505 +msgid "Enable captcha" +msgstr "Povoliť captcha" + +#: inc/formaccesstype.class.php:112 +msgid "Restricted to" +msgstr "Obmedzený na" +>>>>>>> support/2.13.0 #: inc/form_language.class.php:51 msgid "Form language" @@ -1548,10 +1635,17 @@ msgstr "Všetky jazyky" #: inc/form.class.php:508 entrée standard:3 msgid "Target" msgid_plural "Targets" +<<<<<<< HEAD msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" +======= +msgstr[0] "Cieľ" +msgstr[1] "Ciele" +msgstr[2] "Ciele" +msgstr[3] "Ciele" +>>>>>>> support/2.13.0 #: inc/form.class.php:511 msgid "Preview" @@ -1641,7 +1735,7 @@ msgstr "Späť" #: inc/form.class.php:1647 msgid "Upload of JSON files not enabled." -msgstr "Nahrávanie súborov JSON nie je povolené." +msgstr "Nahrávanie súborov JSON nie je zapnuté." #: inc/form.class.php:1650 inc/form.class.php:1653 msgid "You may enable JSON files right now." @@ -2393,7 +2487,7 @@ msgstr "Áno" #: install/install.php:163 #, php-format msgid "Upgrade tables to innoDB; run %s" -msgstr "Aktualizujte tabuľky na innoDB; beží %s" +msgstr "Aktualizujte tabuľky na innoDB; spustite %s" #: install/install.php:199 #, php-format @@ -2433,7 +2527,7 @@ msgstr "" #: install/install.php:305 msgid "The tables of the plugin passed the schema integrity check." -msgstr "Plugin prešiel kontrolou integrity." +msgstr "Tabuľky pluginu prešli kontrolou integrity schémy." #: install/install.php:478 msgid "A form has been created" @@ -2617,7 +2711,7 @@ msgstr "" #: js/scripts.js:1537 msgid "Are you sure you want to delete this target?" -msgstr "" +msgstr "Naozaj chcete odstrániť tento cieľ?" #: entrée standard:57 standard:61 standard:60 standard:59 standard:43 #: standard:69 standard:52 standard:76 diff --git a/plugin.xml b/plugin.xml index 75cc916be..a4b365002 100644 --- a/plugin.xml +++ b/plugin.xml @@ -60,7 +60,7 @@ Features 2.13.9 - ~10.0.7 + ~10.0.10 https://github.com/pluginsGLPI/formcreator/releases/download/2.13.9/glpi-formcreator-2.13.9.tar.bz2 diff --git a/setup.php b/setup.php index ad389758b..e64770587 100644 --- a/setup.php +++ b/setup.php @@ -40,7 +40,7 @@ define('PLUGIN_FORMCREATOR_IS_OFFICIAL_RELEASE', true); // Minimal GLPI version, inclusive -define ('PLUGIN_FORMCREATOR_GLPI_MIN_VERSION', '10.0.7'); +define ('PLUGIN_FORMCREATOR_GLPI_MIN_VERSION', '10.0.10'); // Maximum GLPI version, exclusive (ignored if PLUGIN_FORMCREATOR_IS_OFFICIAL_RELEASE == false) define ('PLUGIN_FORMCREATOR_GLPI_MAX_VERSION', '10.2');