From e5725e29dc5e5a34eb05c606ab616f8993e71834 Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Sun, 28 Jul 2013 12:06:48 -0700
Subject: [PATCH] CRM-13117 remove references to Global Settings menu item.

----------------------------------------
* CRM-13117:
  http://issues.civicrm.org/jira/browse/CRM-13117
---
 CRM/Case/xml/Menu/Case.xml                         | 2 +-
 CRM/Contact/Import/Parser/Contact.php              | 2 +-
 CRM/Core/xml/Menu/Admin.xml                        | 2 +-
 templates/CRM/Admin/Form/Preferences/Display.hlp   | 2 +-
 templates/CRM/Event/Form/ManageEvent/EventInfo.hlp | 2 +-
 templates/CRM/UF/Form/Group.hlp                    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CRM/Case/xml/Menu/Case.xml b/CRM/Case/xml/Menu/Case.xml
index af47eb036a..6c59d6edca 100644
--- a/CRM/Case/xml/Menu/Case.xml
+++ b/CRM/Case/xml/Menu/Case.xml
@@ -67,7 +67,7 @@
   <item>
      <path>civicrm/admin/options/case_type</path>
      <title>Case Types</title>
-     <desc>List of types which can be assigned to Cases. (Enable the Cases tab from Global Settings - Site Preferences if you want to track cases.)</desc>
+     <desc>List of types which can be assigned to Cases. (Enable the Cases tab from System Settings - Enable Components if you want to track cases.)</desc>
      <path_arguments>group=case_type</path_arguments>
      <access_arguments>administer CiviCase</access_arguments>
      <page_callback>CRM_Admin_Page_Options</page_callback>
diff --git a/CRM/Contact/Import/Parser/Contact.php b/CRM/Contact/Import/Parser/Contact.php
index 9d9209b324..680d56993c 100644
--- a/CRM/Contact/Import/Parser/Contact.php
+++ b/CRM/Contact/Import/Parser/Contact.php
@@ -1433,7 +1433,7 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Contact_Import_Parser {
                   }
                   else {
                     if (self::in_value($stateValue['country'], $countryIsoCodes) || self::in_value($stateValue['country'], $countryNames)) {
-                      self::addToErrorMsg(ts('Country input value is in table but not "available": "This Country is valid but is NOT in the list of Available Countries currently configured for your site. This can be viewed and modifed from Global Settings >> Localization." '), $errorMessage);
+                      self::addToErrorMsg(ts('Country input value is in table but not "available": "This Country is valid but is NOT in the list of Available Countries currently configured for your site. This can be viewed and modifed from Administer > Localization > Languages, Currency, Locations." '), $errorMessage);
                     }
                     else {
                       self::addToErrorMsg(ts('Country input value not in country table: "The Country value appears to be invalid. It does not match any value in CiviCRM table of countries."'), $errorMessage);
diff --git a/CRM/Core/xml/Menu/Admin.xml b/CRM/Core/xml/Menu/Admin.xml
index d783ffedce..ecbafb53a8 100644
--- a/CRM/Core/xml/Menu/Admin.xml
+++ b/CRM/Core/xml/Menu/Admin.xml
@@ -620,7 +620,7 @@
   <item>
      <path>civicrm/admin/options/grant_type</path>
      <title>Grant Types</title>
-     <desc>List of types which can be assigned to Grants. (Enable CiviGrant from Global Settings - Enable Components if you want to track grants.)</desc>
+     <desc>List of types which can be assigned to Grants. (Enable CiviGrant from Administer > Systme Settings > Enable Components if you want to track grants.)</desc>
      <path_arguments>group=grant_type</path_arguments>
      <page_callback>CRM_Admin_Page_Options</page_callback>
      <adminGroup>Option Lists</adminGroup>
diff --git a/templates/CRM/Admin/Form/Preferences/Display.hlp b/templates/CRM/Admin/Form/Preferences/Display.hlp
index 6aa374c894..d910ad9225 100644
--- a/templates/CRM/Admin/Form/Preferences/Display.hlp
+++ b/templates/CRM/Admin/Form/Preferences/Display.hlp
@@ -33,5 +33,5 @@
 config.scayt_autoStartup = false;
 <p>{ts}To remove the Spell Check button, in packages/ckeditor/config.js - remove this item in the config.toolbar_Full list:{/ts}<br />
 'SpellChecker'
-<p>{ts}<strong>NOTE:</strong> If you are modifying config.js you should first have configured a Custom PHP Path under Global Settings > Directories, and place your modified version in the custom path.{/ts}</p>
+<p>{ts}<strong>NOTE:</strong> If you are modifying config.js you should first have configured a Custom PHP Path under Administer > System Settings > Directories, and place your modified version in the custom path.{/ts}</p>
 {/htxt}
diff --git a/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp b/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp
index 03372481d6..9150971c87 100644
--- a/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp
+++ b/templates/CRM/Event/Form/ManageEvent/EventInfo.hlp
@@ -108,7 +108,7 @@
 {/htxt}
 {htxt id="id-is_map"}
 {capture assign=mapURL}{crmURL p='civicrm/admin/setting/mapping' q="reset=1"}{/capture} 
-{ts 1=$mapURL}Include map presenting event location on event information page? (A map provider must be configured under <a href='%1'>Global Settings &raquo; Mapping</a>){/ts}
+{ts 1=$mapURL}Include map presenting event location on event information page? (A map provider must be configured under <a href='%1'>Administer > System Settings > Mapping and Geocoding</a>){/ts}
 {/htxt}
 
 {htxt id="id-is_public-title"}
diff --git a/templates/CRM/UF/Form/Group.hlp b/templates/CRM/UF/Form/Group.hlp
index 0c415ae9bb..c7d90def99 100644
--- a/templates/CRM/UF/Form/Group.hlp
+++ b/templates/CRM/UF/Form/Group.hlp
@@ -166,6 +166,6 @@
   {ts}Set Proximity Search as required if you want all searches using this profile to require the user to enter a start address and a radius.{/ts}
 </p>
 <p>
-  {ts}IMPORTANT: You must enable a Mapping Provider in order to use the Proximity Search feature (Administer > Configure > Global Settings > Mapping and Geocoding).{/ts}
+  {ts}IMPORTANT: You must enable a Mapping Provider in order to use the Proximity Search feature (Administer > System Settings > Mapping and Geocoding).{/ts}
 </p>
 {/htxt}
-- 
2.25.1