diff --git a/includes/common.inc b/includes/common.inc index bbe8364..d79e5dd 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -384,7 +384,7 @@ function drupal_site_offline() { drupal_set_header($_SERVER['SERVER_PROTOCOL'] .' 503 Service unavailable'); drupal_set_title(t('Site off-line')); print theme('maintenance_page', filter_xss_admin(variable_get('site_offline_message', - t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal')))))); + t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'SuiteDesk')))))); } /** diff --git a/includes/locale.inc b/includes/locale.inc index eab303f..6415903 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -1814,7 +1814,7 @@ function _locale_export_po_generate($language = NULL, $strings = array(), $heade if (!isset($header)) { if (isset($language)) { - $header = '# '. $language->name .' translation of '. variable_get('site_name', 'Drupal') ."\n"; + $header = '# '. $language->name .' translation of '. variable_get('site_name', 'SuiteDesk') ."\n"; $header .= '# Generated by '. $user->name .' <'. $user->mail .">\n"; $header .= "#\n"; $header .= "msgid \"\"\n"; diff --git a/modules/admin_menu/admin_menu.module b/modules/admin_menu/admin_menu.module index d1ab299..7764047 100644 --- a/modules/admin_menu/admin_menu.module +++ b/modules/admin_menu/admin_menu.module @@ -17,7 +17,7 @@ function admin_menu_help($path, $arg) { case 'admin/help#admin_menu': $output = ''; $output .= '
' . t('The administration menu module provides a dropdown menu arranged for one- or two-click access to most administrative tasks and other common destinations (to users with the proper permissions). Administration menu also displays the number of anonymous and authenticated users, and allows modules to add their own custom menu items. Integration with the menu varies from module to module; the contributed module Devel, for instance, makes strong use of the administration menu module to provide quick access to development tools.', array('@drupal' => 'http://drupal.org/project/devel')) . '
'; - $output .= '' . t('The administration menu settings page allows you to modify some elements of the menu\'s behavior and appearance. Since the appearance of the menu is dependent on your site theme, substantial customizations require modifications to your site\'s theme and CSS files. See the advanced module README.txt file for more information on theme and CSS customizations.', array('@settings' => url('admin/settings/admin_menu'))) . '
'; + $output .= '' . t('The administration menu settings page allows you to modify some elements of the menu\'s behavior and appearance. Since the appearance of the menu is dependent on your site theme, substantial customizations require modifications to your site\'s theme and CSS files.', array('@settings' => url('admin/settings/admin_menu'))) . '
'; $output .= '' . t('The menu items displayed in the administration menu depend upon the actual permissions of the viewer. First, the administration menu is only displayed to users in roles with the Access administration menu (admin_menu module) permission. Second, a user must be a member of a role with the Access administration pages (system module) permission to view administrative links. And, third, only currently permitted links are displayed; for example, if a user is not a member of a role with the permissions Administer permissions (user module) and Administer users (user module), the User management menu item is not displayed.') . '
'; return $output; } @@ -327,4 +327,3 @@ function admin_menu_translated_menu_link_alter(&$item, $map) { function theme_admin_menu_icon() { return '' . t('See the module README.txt file in the better_formats module directory for help.') . '
'; - break; - - default: - $output = ''; - } - return $output; -} - /** * Implementation of hook_perm(). */ diff --git a/modules/calendar/calendar_ical/theme.inc b/modules/calendar/calendar_ical/theme.inc index 64b4952..856e5fc 100644 --- a/modules/calendar/calendar_ical/theme.inc +++ b/modules/calendar/calendar_ical/theme.inc @@ -71,7 +71,7 @@ function template_preprocess_calendar_view_ical(&$vars) { } $headertitle = filter_xss_admin($view->get_title()); - $title = variable_get('site_name', 'Drupal'); + $title = variable_get('site_name', 'SuiteDesk'); $description = $headertitle . ($title ? ' | '. $title : ''); $vars['calname'] = $description; diff --git a/modules/ckeditor/ckeditor.install b/modules/ckeditor/ckeditor.install index 951b469..62f9635 100644 --- a/modules/ckeditor/ckeditor.install +++ b/modules/ckeditor/ckeditor.install @@ -424,7 +424,7 @@ function _ckeditor_requirements_ckfinder_config_check($profile_name) { } if (!$require_once_found) { - return t('You are using a feature that requires manual integration in theconfig.php
file. Please read the "Installing CKFinder" section in the !readme
file carefully and add a require_once ...
statement to the %ckfconfig
file.', array('%ckfconfig' => $config_path, '!readme' => l(t('README.txt'), $base_url . '/' . drupal_get_path('module', 'ckeditor') . '/README.txt', array('absolute' => TRUE))));
+ return t('You are using a feature that requires manual integration in the config.php
file. Be carefull and add a require_once ...
statement to the %ckfconfig
file.', array('%ckfconfig' => $config_path));
}
if ($userfiles_absolute_path_line && $force_single_extension_line && (
@@ -634,4 +634,4 @@ function ckeditor_update_6102() {
*/
function ckeditor_uninstall() {
drupal_uninstall_schema('ckeditor');
-}
\ No newline at end of file
+}
diff --git a/modules/ckeditor/includes/ckeditor.admin.inc b/modules/ckeditor/includes/ckeditor.admin.inc
index ec2e6e3..fc79069 100644
--- a/modules/ckeditor/includes/ckeditor.admin.inc
+++ b/modules/ckeditor/includes/ckeditor.admin.inc
@@ -49,10 +49,9 @@ function ckeditor_admin_main() {
)
));
drupal_set_message(t(
- 'The CKEditor component is not installed correctly. Please go to the !ckeditorlink in order to download the latest version. After that you must extract the files to the !ckeditorpath or !librarypath directory and make sure that the !ckeditorfile or !ckeditorlibrary file exists. Refer to the !readme file for more information.',
+ 'The CKEditor component is not installed correctly. Please go to the !ckeditorlink in order to download the latest version. After that you must extract the files to the !ckeditorpath or !librarypath directory and make sure that the !ckeditorfile or !ckeditorlibrary file exists.',
array(
'!ckeditorlink' => l(t('CKEditor homepage'), 'http://ckeditor.com/download'),
- '!readme' => l(t('README.txt'), drupal_get_path('module', 'ckeditor') . '/README.txt', array('absolute' => TRUE)),
'!ckeditorpath' => '' . $editor_path . '
',
'!ckeditorsubdir' => '' . $editor_path . '/editor
',
'!ckeditorfile' => '' . $editor_path . '/ckeditor.js
',
diff --git a/modules/ckeditor/includes/ckeditor.page.inc b/modules/ckeditor/includes/ckeditor.page.inc
index 75f839d..785661f 100644
--- a/modules/ckeditor/includes/ckeditor.page.inc
+++ b/modules/ckeditor/includes/ckeditor.page.inc
@@ -125,12 +125,7 @@ function ckeditor_help_delegate($path, $arg) {
)
) .
''. htmlspecialchars('