'. t('This page shows you all available administration tasks for each module.') .'
'; case 'admin/build/themes': - return ''. t('Select which themes are available to your users and specify the default theme. To configure site-wide display settings, click the "configure" task above. Alternately, to override these settings in a specific theme, click the "configure" link for the corresponding theme. Note that different themes may have different regions available for rendering content like blocks. If you want consistency in what your users see, you may wish to enable only one theme.') .'
'; + $output = ''. t('Select which themes are available to your users and specify the default theme. To configure site-wide display settings, click the "configure" task above. Alternately, to override these settings in a specific theme, click the "configure" link for the corresponding theme. Note that different themes may have different regions available for rendering content like blocks. If you want consistency in what your users see, you may wish to enable only one theme.') .'
'; + $output .= ''. t('To change the appearance of your site, a number of contributed themes are available.', array('@themes' => 'http://drupal.org/project/themes')) .'
'; + return $output; case 'admin/build/themes/settings/'. $arg[4]: $reference = explode('.', $arg[4], 2); $theme = array_pop($reference); @@ -48,7 +50,9 @@ $output .= ' '. t('The auto-throttle functionality must be enabled on the throttle configuration page after having enabled the throttle module.', array('@throttle' => url('admin/settings/throttle'))); } $output .= ''; - $output .= t('It is important that update.php is run every time a module is updated to a newer version.
You can find all administration tasks belonging to a particular module on the administration by module page.
', array('@update-php' => $base_url .'/update.php', '@by-module' => url('admin/by-module'))); + $output .= ''. t('It is important that update.php is run every time a module is updated to a newer version.', array('@update-php' => $base_url .'/update.php')) .'
'; + $output .= ''. t('You can find all administration tasks belonging to a particular module on the administration by module page.', array('@by-module' => url('admin/by-module'))) .'
'; + $output .= ''. t('To extend the functionality of your site, a number of contributed modules are available.', array('@modules' => 'http://drupal.org/project/modules')) .'
'; return $output; case 'admin/build/modules/uninstall': return ''. t('The uninstall process removes all data related to a module. To uninstall a module, you must first disable it. Not all modules support this feature.') .'
'; Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.904 diff -u -r1.904 node.module --- modules/node/node.module 20 Nov 2007 18:20:37 -0000 1.904 +++ modules/node/node.module 22 Nov 2007 18:20:46 -0000 @@ -1550,8 +1550,8 @@ $default_message .= ''. t('For more information, please refer to the help section, or the online Drupal handbooks. You may also post at the Drupal forum, or view the wide range of other support options available.', array('@help' => url('admin/help'), '@handbook' => 'http://drupal.org/handbooks', '@forum' => 'http://drupal.org/forum', '@support' => 'http://drupal.org/support')) .'
'; Index: UPGRADE.txt =================================================================== RCS file: /cvs/drupal/drupal/UPGRADE.txt,v retrieving revision 1.10 diff -u -r1.10 UPGRADE.txt --- UPGRADE.txt 14 Sep 2007 20:00:42 -0000 1.10 +++ UPGRADE.txt 22 Nov 2007 18:20:43 -0000 @@ -79,7 +79,7 @@ from 5.x to 6.x, modules from previous versions will not be compatible and updated versions will be required. - - For contributed modules, check http://drupal.org/project/Modules + - For contributed modules, check http://drupal.org/project/modules for the version of a module matching your version of Drupal. - For custom modules, review http://drupal.org/update/modules to @@ -93,7 +93,7 @@ custom or contributed theme, make sure it is compatible with your version of Drupal. - - For contributed themes, check http://drupal.org/project/Themes + - For contributed themes, check http://drupal.org/project/themes for the version of a theme matching your version of Drupal. - For custom themes, review http://drupal.org/update/theme to ensure Index: INSTALL.txt =================================================================== RCS file: /cvs/drupal/drupal/INSTALL.txt,v retrieving revision 1.48 diff -u -r1.48 INSTALL.txt --- INSTALL.txt 21 Nov 2007 09:49:36 -0000 1.48 +++ INSTALL.txt 22 Nov 2007 18:20:43 -0000 @@ -59,7 +59,7 @@ different language, we have good news. You can install and use Drupal in other languages from the start. Check whether a released package of the language desired is available for this Drupal version at - http://drupal.org/project/Translations and download the package. Extract + http://drupal.org/project/translations and download the package. Extract the contents to the same directory where you extracted Drupal into. 2. GRANT WRITE PERMISSIONS ON CONFIGURATION FILE Index: install.php =================================================================== RCS file: /cvs/drupal/drupal/install.php,v retrieving revision 1.95 diff -u -r1.95 install.php --- install.php 20 Nov 2007 13:24:53 -0000 1.95 +++ install.php 22 Nov 2007 18:20:44 -0000 @@ -513,7 +513,7 @@ drupal_set_title(st('Choose language')); if (!empty($_GET['localize'])) { $output = ''. st('With the addition of an appropriate language pack, this installer is capable of proceeding in another language of your choice. To install and use Drupal in a language other than English:') .'
'; - $output .= ''. st('Alternatively, to install and use Drupal in English, or to defer the selection of an alternative language until after installation, select the first link below.') .'
'; Index: modules/update/update.module =================================================================== RCS file: /cvs/drupal/drupal/modules/update/update.module,v retrieving revision 1.3 diff -u -r1.3 update.module --- modules/update/update.module 6 Nov 2007 09:00:31 -0000 1.3 +++ modules/update/update.module 22 Nov 2007 18:20:47 -0000 @@ -47,8 +47,9 @@ function update_help($path, $arg) { switch ($path) { case 'admin/reports/updates': - return ''. t('Here you can find information about available updates for your installed modules and themes. Note that each module or theme is part of a "project", which may or may not have the same name, and might include multiple modules or themes within it.') .'
'; - + $output = ''. t('Here you can find information about available updates for your installed modules and themes. Note that each module or theme is part of a "project", which may or may not have the same name, and might include multiple modules or themes within it.') .'
'; + $output .= ''. t('To extend the functionality or to change the look of your site, a number of contributed modules and themes are available.', array('@modules' => 'http://drupal.org/project/modules', '@themes' => 'http://drupal.org/project/themes')) .'
'; + return $output; case 'admin/build/themes': case 'admin/build/modules': include_once './includes/install.inc'; Index: modules/locale/locale.module =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v retrieving revision 1.198 diff -u -r1.198 locale.module --- modules/locale/locale.module 4 Nov 2007 11:10:09 -0000 1.198 +++ modules/locale/locale.module 22 Nov 2007 18:20:44 -0000 @@ -37,26 +37,28 @@ $output .= ''. t("If an existing translation does not meet your needs, the .po files are easily edited with special editing tools. The locale module's import feature allows you to add strings from such files into your site's database. The export functionality enables you to share your translations with others, generating Portable Object files from your site strings.") .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Locale page.', array('@locale' => 'http://drupal.org/handbook/modules/locale/')) .'
'; return $output; - case 'admin/settings/language': - return t("Drupal provides support for the translation of its interface text into different languages. This page provides an overview of the installed languages. You can add a language on the add language page, or directly by importing a translation. If multiple languages are enabled, registered users will be able to set their preferred language. The site default will be used for anonymous visitors and for users without their own settings.
Drupal interface translations may be added or extended by several courses: by importing an existing translation, by translating everything from scratch, or by a combination of these approaches.
", array("@search" => url("admin/build/translate/search"), "@import" => url("admin/build/translate/import"), "@add-language" => url("admin/settings/language/add"))); + $output = ''. t('Drupal provides support for the translation of its interface text into different languages. This page provides an overview of the installed languages. You can add a language on the add language page, or directly by importing a translation. If multiple languages are enabled, registered users will be able to set their preferred language. The site default will be used for anonymous visitors and for users without their own settings.', array('@add-language' => url('admin/settings/language/add'), '@import' => url('admin/build/translate/import'))) .'
'; + $output .= ''. t('Drupal interface translations may be added or extended by importing an existing translation, by translating everything from scratch, or by a combination of these approaches.', array('@import' => url('admin/build/translate/import'), '@search' => url('admin/build/translate/search'))) .'
'; + $output .= ''. t('To quickly add additional languages to your site, a number of contributed translations are available.', array('@translations' => 'http://drupal.org/project/translations')) .'
'; + return $output; case 'admin/settings/language/add': return ''. t("You need to add all languages in which you would like to display the site interface. If you can't find the desired language in the quick-add dropdown, then you will need to provide the proper language code yourself. The language code may be used to negotiate with browsers and to present flags, etc., so it is important to pick a code that is standardized for the desired language. You can also add a language by importing a translation.", array("@import" => url("admin/build/translate/import"))) .'
'; case 'admin/settings/language/configure': return ''. t('The language used to display a web page is determined with a negotiation algorithm. You can choose how this algorithm should work. By default, there is no negotiation and the default language is used. You can use path prefixes (like "de" and "it" for German and Italian content) with different fallback options, so you can have web addresses like /de/contact and /it/contact. Alternatively you can use custom domains like de.example.com and it.example.com. Customize path prefixes and set domain names on the language editing pages.', array('@languages' => url('admin/settings/language'))) .'
'; - case 'admin/build/translate': - return ''. t("This page provides an overview of interface translation on the site. Drupal groups all translatable strings in so called 'text groups'. Modules may provide more text groups additionaly to the 'built-in interface' default, to separate strings used for other purposes, allowing you to focus your translation efforts on the groups of text you care most about. For example, a translation team could choose not to fully translate a text group that includes less important data, being still able to ensure that built-in interface is always fully translated.") .'
'; + $output = ''. t("This page provides an overview of interface translation on the site. Drupal groups all translatable strings in so called 'text groups'. Modules may provide additional to the 'built-in interface' default, to separate strings used for other purposes, allowing you to focus your translation efforts on the groups of text you care most about. For example, a translation team could choose not to fully translate a text group that includes less important data, being still able to ensure that built-in interface is always fully translated.") .'
'; + $output .= ''. t('To quickly add additional languages to your site, a number of contributed translations are available.', array('@translations' => 'http://drupal.org/project/translations')) .'
'; + return $output; case 'admin/build/translate/import': - return ''. t("This page allows you to import a translation provided in the gettext Portable Object (.po) format. The easiest way to get your site translated is to obtain an existing Drupal translation and to import it. You can find existing translations on the Drupal translation page. Note that importing a translation file might take a while.", array('@url' => 'http://drupal.org/project/translations')) .'
'; + return ''. t('This page allows you to import a translation provided in the gettext Portable Object (.po) format. The easiest way to get your site translated is to obtain an existing Drupal translation and to import it. You can find existing translations on the Drupal translation page. Note that importing a translation file might take a while.', array('@translations' => 'http://drupal.org/project/translations')) .'
'; case 'admin/build/translate/export': - return ''. t("This page allows you to export Drupal strings. The first option is to export a translation so it can be shared. The second option generates a translation template, which contains all Drupal strings, but without their translations. You can use this template to start a new translation using various software packages designed for this task.") .'
'; + return ''. t('This page allows you to export Drupal strings. The first option is to export a translation so it can be shared. The second option generates a translation template, which contains all Drupal strings, but without their translations. You can use this template to start a new translation using various software packages designed for this task.') .'
'; case 'admin/build/translate/search': - return ''. t("It is often convenient to get the strings from your setup on the export page, and use a desktop Gettext translation editor to edit the translations. On this page you can search in the translated and untranslated strings, and the default English texts provided by Drupal.", array("@export" => url("admin/build/translate/export"))) .'
'; - + return ''. t('It is often convenient to get the strings from your setup on the export page, and use a desktop Gettext translation editor to edit the translations. On this page you can search in the translated and untranslated strings, and the default English texts provided by Drupal.', array('@export' => url('admin/build/translate/export'))) .'
'; case 'admin/build/block/configure': if ($arg[4] == 'locale' && $arg[5] == 0) { - return ''. t("This block is only shown if you have at least two languages enabled and you have a language negotiation setting different from 'none', so you have different web addresses for different language versions.", array('@languages' => url('admin/settings/language'), '@configuration' => url('admin/settings/language/configure'))) .'
'; + return ''. t("This block is only shown if you have at least two languages enabled and you have a language negotiation setting other than 'none', so you have different web addresses for different language versions.", array('@languages' => url('admin/settings/language'), '@configuration' => url('admin/settings/language/configure'))) .'
'; } break; }