From 1431b671d5e39d3ebe634492160b12316bfbac07 Mon Sep 17 00:00:00 2001 From: Chris Davenport Date: Tue, 6 Dec 2016 20:39:28 +0000 Subject: [PATCH] Merge language string changes from CMS (#285) * Fix for failing code style tests * Changed spacing again and ran the script this time * Merge language string changes from CMS --- .../language/en-GB/en-GB.com_weblinks.ini | 20 +++++++++---------- .../language/en-GB/en-GB.com_weblinks.sys.ini | 2 +- .../en-GB/en-GB.plg_search_weblinks.ini | 2 +- .../en-GB/en-GB.plg_search_weblinks.sys.ini | 2 +- src/language/en-GB/en-GB.com_weblinks.ini | 6 +++--- src/language/en-GB/en-GB.mod_weblinks.ini | 8 ++++---- src/language/en-GB/en-GB.mod_weblinks.sys.ini | 4 ++-- .../en-GB/en-GB.plg_finder_weblinks.ini | 2 +- .../en-GB/en-GB.plg_finder_weblinks.sys.ini | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/administrator/language/en-GB/en-GB.com_weblinks.ini b/src/administrator/language/en-GB/en-GB.com_weblinks.ini index d13742e..19ad7c9 100644 --- a/src/administrator/language/en-GB/en-GB.com_weblinks.ini +++ b/src/administrator/language/en-GB/en-GB.com_weblinks.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -17,25 +17,25 @@ COM_WEBLINKS_EDIT_WEBLINK="Edit Web Link" COM_WEBLINKS_ERR_TABLES_NAME="There is already a Web Link with that name in this category. Please try again." COM_WEBLINKS_ERR_TABLES_PROVIDE_URL="Please provide a valid URL" COM_WEBLINKS_ERR_TABLES_TITLE="Your web link must contain a title." -COM_WEBLINKS_ERROR_UNIQUE_ALIAS="Another web link from this category has the same alias" +COM_WEBLINKS_ERROR_UNIQUE_ALIAS="Another web link from this category has the same alias (remember it may be a trashed item)." COM_WEBLINKS_FIELD_ALIAS_DESC="The alias is for internal use only. Leave this blank and Joomla will fill in a default value from the title. It has to be unique for each web link in the same category." COM_WEBLINKS_FIELD_CATEGORY_DESC="Choose a category for this Web link." COM_WEBLINKS_FIELD_CATEGORYCHOOSE_DESC="Please choose a Web Links category to display." COM_WEBLINKS_FIELD_CAPTCHA_DESC="Select the captcha plugin that will be used in the web link submit form. You may need to enter required information for your captcha plugin in the Plugin Manager.
If 'Use Default' is selected, make sure a captcha plugin is selected in Global Configuration." COM_WEBLINKS_FIELD_CAPTCHA_LABEL="Allow Captcha on Web Link" -COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC="Show/Hide the number of Web Links in each Category." +COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC="Show or hide the number of Web Links in each Category." COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL="# Web Links" COM_WEBLINKS_FIELD_CONFIG_COUNTCLICKS_DESC="If set to yes, the number of times the link has been clicked will be recorded." COM_WEBLINKS_FIELD_CONFIG_COUNTCLICKS_LABEL="Count Clicks" -COM_WEBLINKS_FIELD_CONFIG_DESCRIPTION_DESC="Show/Hide the description below." -COM_WEBLINKS_FIELD_CONFIG_HITS_DESC="Show/Hide hits." +COM_WEBLINKS_FIELD_CONFIG_DESCRIPTION_DESC="Show or hide the description below." +COM_WEBLINKS_FIELD_CONFIG_HITS_DESC="Show or hide hits." COM_WEBLINKS_FIELD_CONFIG_ICON_DESC="If Icon is chosen above, select an icon to display with the Web Links. If none is selected, the default icon will be used." COM_WEBLINKS_FIELD_CONFIG_ICON_LABEL="Select Icon" -COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC="Show/Hide the links description." +COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC="Show or hide the links description." COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL="Links Description" -COM_WEBLINKS_FIELD_CONFIG_OTHERCATS_DESC="Show/hide other categories." +COM_WEBLINKS_FIELD_CONFIG_OTHERCATS_DESC="Show or hide other categories." COM_WEBLINKS_FIELD_CONFIG_OTHERCATS_LABEL="Other Categories" -COM_WEBLINKS_FIELD_CONFIG_SHOWREPORT_DESC="Show/Hide the Report Bad Link option." +COM_WEBLINKS_FIELD_CONFIG_SHOWREPORT_DESC="Show or hide the Report Bad Link option." COM_WEBLINKS_FIELD_CONFIG_SHOWREPORT_LABEL="Reports" COM_WEBLINKS_FIELD_COUNTCLICKS_DESC="If set to yes, the number of times the link has been clicked will be recorded." COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL="Count Clicks" @@ -68,7 +68,7 @@ COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_LABEL="Show Tags" COM_WEBLINKS_FIELD_SHOW_TAGS_DESC="Show the tags for a web link." COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL="Show Tags" COM_WEBLINKS_FIELD_STATE_DESC="Set publication status." -COM_WEBLINKS_FIELD_TARGET_DESC="Target browser window when the link is clicked." +COM_WEBLINKS_FIELD_TARGET_DESC="Target browser window when the link is selected." COM_WEBLINKS_FIELD_TARGET_LABEL="Target" COM_WEBLINKS_FIELD_TITLE_DESC="Web Link must have a title." COM_WEBLINKS_FIELD_URL_DESC="You must enter a URL. IDN (International) Links are converted to punycode when they are saved." @@ -124,4 +124,4 @@ JGLOBAL_NO_ITEM_SELECTED="No web links selected" JGLOBAL_NEWITEMSLAST_DESC="New Web links default to the last position. Ordering can be changed after this Web link is saved." JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE="You are not allowed to create new web links in this category." JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these web links." -JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:
Inherited means that the permissions from global configuration and parent group will be used.
Denied means that no matter what the global configuration or parent group settings are, the group being edited can't take this action on this component.
Allowed means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by Not Allowed (Locked) under Calculated Settings).
2. If you select a new setting, click Save to refresh the calculated settings." +JLIB_RULES_SETTING_NOTES="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless it is overruled by a Global Configuration setting." \ No newline at end of file diff --git a/src/administrator/language/en-GB/en-GB.com_weblinks.sys.ini b/src/administrator/language/en-GB/en-GB.com_weblinks.sys.ini index f3224f8..98acc5c 100644 --- a/src/administrator/language/en-GB/en-GB.com_weblinks.sys.ini +++ b/src/administrator/language/en-GB/en-GB.com_weblinks.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/src/administrator/language/en-GB/en-GB.plg_search_weblinks.ini b/src/administrator/language/en-GB/en-GB.plg_search_weblinks.ini index 14c0ed4..14a5623 100644 --- a/src/administrator/language/en-GB/en-GB.plg_search_weblinks.ini +++ b/src/administrator/language/en-GB/en-GB.plg_search_weblinks.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/src/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini b/src/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini index 6a10f68..cab9252 100644 --- a/src/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini +++ b/src/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/src/language/en-GB/en-GB.com_weblinks.ini b/src/language/en-GB/en-GB.com_weblinks.ini index 061fce9..4c91306 100644 --- a/src/language/en-GB/en-GB.com_weblinks.ini +++ b/src/language/en-GB/en-GB.com_weblinks.ini @@ -1,7 +1,7 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php -; Note : All ini files need to be saved as UTF-8 - No BOM +; Note : All ini files need to be saved as UTF-8 COM_WEBLINKS_CAPTCHA_LABEL="Captcha" COM_WEBLINKS_CAPTCHA_DESC="Please complete the security check." @@ -13,7 +13,7 @@ COM_WEBLINKS_ERR_TABLES_NAME="There is already a Web Link with that name in this COM_WEBLINKS_ERR_TABLES_PROVIDE_URL="Please provide a valid URL" COM_WEBLINKS_ERR_TABLES_TITLE="Your Web Link must contain a title." COM_WEBLINKS_ERROR_CATEGORY_NOT_FOUND="Web Link category not found." -COM_WEBLINKS_ERROR_UNIQUE_ALIAS="Another Web Link from this category has the same alias." +COM_WEBLINKS_ERROR_UNIQUE_ALIAS="Another Web Link from this category has the same alias (remember it may be a trashed item)." COM_WEBLINKS_ERROR_WEBLINK_NOT_FOUND="Web Link not found." COM_WEBLINKS_ERROR_WEBLINK_URL_INVALID="Invalid Web link URL." COM_WEBLINKS_FIELD_ALIAS_DESC="The alias is for internal use only. Leave this blank and Joomla will fill in a default value from the title. It has to be unique for each web link in the same category." diff --git a/src/language/en-GB/en-GB.mod_weblinks.ini b/src/language/en-GB/en-GB.mod_weblinks.ini index 604433d..f5b2908 100644 --- a/src/language/en-GB/en-GB.mod_weblinks.ini +++ b/src/language/en-GB/en-GB.mod_weblinks.ini @@ -1,11 +1,11 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php -; Note : All ini files need to be saved as UTF-8 - No BOM +; Note : All ini files need to be saved as UTF-8 MOD_WEBLINKS="Web Links" MOD_WEBLINKS_FIELD_CATEGORY_DESC="Choose the Web Links category to display." -MOD_WEBLINKS_FIELD_GROUPBY_DESC="If set to yes, weblinks will be grouped by subcategories." +MOD_WEBLINKS_FIELD_GROUPBY_DESC="If set to yes, web links will be grouped by subcategories." MOD_WEBLINKS_FIELD_GROUPBY_LABEL="Group By Subcategories" MOD_WEBLINKS_FIELD_GROUPBYSHOWTITLE_DESC="If set to yes, will show groups titles (valid only if grouping)." MOD_WEBLINKS_FIELD_GROUPBYSHOWTITLE_LABEL="Show Group Title" @@ -29,7 +29,7 @@ MOD_WEBLINKS_FIELD_ORDERDIRECTION_DESC="Set the ordering direction." MOD_WEBLINKS_FIELD_ORDERDIRECTION_LABEL="Direction" MOD_WEBLINKS_FIELD_ORDERING_DESC="Ordering for the Web Links." MOD_WEBLINKS_FIELD_ORDERING_LABEL="Ordering" -MOD_WEBLINKS_FIELD_TARGET_DESC="Target browser window when the link is clicked." +MOD_WEBLINKS_FIELD_TARGET_DESC="Target browser window when the link is selected." MOD_WEBLINKS_FIELD_TARGET_LABEL="Target Window" MOD_WEBLINKS_FIELD_VALUE_ASCENDING="Ascending" MOD_WEBLINKS_FIELD_VALUE_DESCENDING="Descending" diff --git a/src/language/en-GB/en-GB.mod_weblinks.sys.ini b/src/language/en-GB/en-GB.mod_weblinks.sys.ini index 92b7ae4..a49b5a9 100644 --- a/src/language/en-GB/en-GB.mod_weblinks.sys.ini +++ b/src/language/en-GB/en-GB.mod_weblinks.sys.ini @@ -1,7 +1,7 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php -; Note : All ini files need to be saved as UTF-8 - No BOM +; Note : All ini files need to be saved as UTF-8 MOD_WEBLINKS="Web Links" MOD_WEBLINKS_XML_DESCRIPTION="This modules displays Web Links from a category defined in the Web Links component." diff --git a/src/plugins/finder/weblinks/language/en-GB/en-GB.plg_finder_weblinks.ini b/src/plugins/finder/weblinks/language/en-GB/en-GB.plg_finder_weblinks.ini index 833defd..f445e0c 100644 --- a/src/plugins/finder/weblinks/language/en-GB/en-GB.plg_finder_weblinks.ini +++ b/src/plugins/finder/weblinks/language/en-GB/en-GB.plg_finder_weblinks.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/src/plugins/finder/weblinks/language/en-GB/en-GB.plg_finder_weblinks.sys.ini b/src/plugins/finder/weblinks/language/en-GB/en-GB.plg_finder_weblinks.sys.ini index 40dedb9..dfbd68a 100644 --- a/src/plugins/finder/weblinks/language/en-GB/en-GB.plg_finder_weblinks.sys.ini +++ b/src/plugins/finder/weblinks/language/en-GB/en-GB.plg_finder_weblinks.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8