diff -u administration.cvs/civicspace.inc administration/civicspace.inc --- administration.cvs/civicspace.inc 2006-02-27 19:15:07.000000000 -0500 +++ administration/civicspace.inc 2006-07-11 11:04:33.000000000 -0400 @@ -36,33 +36,33 @@ 'sub_panel_css' => 'dashboard', 'items' => array( 'admin/help' => array( - 'title' => 'help', - 'description' => 'Application (Module) help', + 'title' => t('help'), + 'description' => t('Application (Module) help'), ), 'sadmin/features/support' => array( - 'title' => 'get support', - 'description' => 'Get support', - 'short-desc' => 'A page that explains support options, including paid support', - 'long-desc' => 'This exists as an example of what the long-desc will do', + 'title' => t('get support'), + 'description' => t('Get support'), + 'short-desc' => t('A page that explains support options, including paid support'), + 'long-desc' => t('This exists as an example of what the long-desc will do'), 'callback' => 'administration_offsite', 'callback arguments' => array('http://drupal.org/support'), ), 'admin/modules' => array( - 'title' => 'activate/deactivate', - 'description' => 'Turn on and off applications (modules)', + 'title' => t('activate/deactivate'), + 'description' => t('Turn on and off applications (modules)'), ), 'admin/settings' => array( - 'title' => 'configure modules', - 'description' => "Configure my site's module settings", + 'title' => t('configure modules'), + 'description' => t("Configure my site's module settings"), ), 'admin' => array( - 'title' => 'other', - 'description' => "Configure uncategorized items for modules", + 'title' => t('other'), + 'description' => t("Configure uncategorized items for modules"), ), 'chat' => array( - 'title' => 'chat', - 'description' => 'Chat live to volunteers', - 'short-desc' => 'Well researched questions may be answered', + 'title' => t('chat'), + 'description' => t('Chat live to volunteers'), + 'short-desc' => t('Well researched questions may be answered'), 'callback' => 'administration_offsite', 'callback arguments' => array('http://drupal.org/support'), ), @@ -72,32 +72,32 @@ $config['section']['sadmin/content'] = array( 'title' => t('content'), 'description' => t('Manage web pages (content)'), - 'long-desc' => t('Web pages are treated as content that can be managed with settings'), + 'long-desc' => t('Web pages are treated as content that can be managed with settings.'), 'callback' => '_administration_sub_dashboard_page', 'panel_theme' => 'cs_administration_menu_panel', 'sub_panel_theme' => 'cs_administration_sub_menu_panel', 'sub_panel_css' => 'dashboard', 'items' => array( 'admin/comment' => array( - 'title' => 'manage comments', - 'description' => "Moderate and publish comments", + 'title' => t('manage comments'), + 'description' => t("Moderate and publish comments"), ), 'admin/taxonomy' => array( - 'title' => 'manage categories', - 'description' => "Set up and maintain your site's categories (vocabularies/taxonomy)", + 'title' => t('manage categories'), + 'description' => t("Set up and maintain your site's categories (vocabularies/taxonomy)"), ), 'node/add' => array( - 'title' => 'create content', - 'description' => "Add new web pages (content) to your site", + 'title' => t('create content'), + 'description' => t("Add new web pages (content) to your site"), ), 'sadmin/content/no-link1' => array( - 'title' => 'apply tags', - 'description' => 'Apply tags to web pages (content)', + 'title' => t('apply tags'), + 'description' => t('Apply tags to web pages (content)'), 'callback' => 'drupal_not_found', ), 'admin/node' => array( - 'title' => 'organize', - 'description' => 'Order and organize web pages (content)', + 'title' => t('organize'), + 'description' => t('Order and organize web pages (content)'), ), ), ); @@ -112,26 +112,26 @@ 'sub_panel_css' => 'dashboard', 'items' => array( 'sadmin/build/no-link2' => array( - 'title' => 'install modules', - 'description' => 'Install new modules', - 'short-desc' => 'Download module files, database install', + 'title' => t('install modules'), + 'description' => t('Install new modules'), + 'short-desc' => t('Download module files, database install'), 'callback' => 'drupal_not_found' ), 'admin/menu' => array( - 'title' => 'menus', - 'description' => "Create and configure menus", + 'title' => t('menus'), + 'description' => t("Create and configure menus"), ), 'admin/access' => array( - 'title' => 'access control', - 'description' => "Setup site security (access control to site features)", + 'title' => t('access control'), + 'description' => t("Setup site security (access control to site features)"), ), 'admin/path' => array( - 'title' => 'url aliases', - 'description' => "Create and manage URL aliases", + 'title' => t('url aliases'), + 'description' => t("Create and manage URL aliases"), ), 'admin/filters' => array( - 'title' => 'input formats', - 'description' => "Configure allowable input formats/input filters", + 'title' => t('input formats'), + 'description' => t("Configure allowable input formats/input filters"), ), ), ); @@ -146,22 +146,22 @@ 'sub_panel_css' => 'dashboard', 'items' => array( 'admin/themes' => array( - 'title' => 'themes', - 'description' => "Activate/configure themes", + 'title' => t('themes'), + 'description' => t("Activate/configure themes"), ), 'admin/block' => array( - 'title' => 'blocks', - 'description' => "Activate/configure blocks", + 'title' => t('blocks'), + 'description' => t("Activate/configure blocks"), ), 'sadmin/style/no-link1' => array( - 'title' => 'fix themes', - 'description' => 'Fix theme problems', + 'title' => t('fix themes'), + 'description' => t('Fix theme problems'), 'callback' => 'drupal_not_found', ), 'sadmin/style/no-link2' => array( - 'title' => 'page layout', - 'description' => 'Page layout', - 'short-desc' => 'Page layouts, front pages, number of columns', + 'title' => t('page layout'), + 'description' => t('Page layout'), + 'short-desc' => t('Page layouts, front pages, number of columns'), 'callback' => 'drupal_not_found' ), ), @@ -177,23 +177,23 @@ 'sub_panel_css' => 'dashboard', 'items' => array( 'admin/user' => array( - 'title' => 'manage users', - 'description' => "Change or add users", + 'title' => t('manage users'), + 'description' => t("Change or add users"), ), 'admin/node' => array( - 'title' => 'manage content', - 'description' => "Moderate, promote and manage your web pages", + 'title' => t('manage content'), + 'description' => t("Moderate, promote and manage your web pages"), ), 'admin/logs' => array( - 'title' => 'logs', - 'description' => "Site errors and other logs", + 'title' => t('logs'), + 'description' => t("Site errors and other logs"), ), ), ); $config['section']['sadmin/mail'] = array( 'title' => t('mail'), - 'description' => t('Mail and Subscriptions'), + 'description' => t('Mail and subscriptions'), 'long-desc' => t('Manage mail, compose newsletters, subscription management'), 'callback' => '_administration_sub_dashboard_page', 'panel_theme' => 'cs_administration_menu_panel', @@ -201,13 +201,13 @@ 'sub_panel_css' => 'dashboard', 'items' => array( 'sadmin/mail/no-link1' => array( - 'title' => 'mailing lists', - 'description' => 'Mailing lists', + 'title' => t('mailing lists'), + 'description' => t('Mailing lists'), 'callback' => 'drupal_not_found', ), 'admin/aggregator' => array( - 'title' => 'news feeds', - 'description' => "Manage my news feeds", + 'title' => t('news feeds'), + 'description' => t("Manage my news feeds"), ), ), ); @@ -375,13 +375,13 @@ */ function theme_administration_statistics($path) { $users = db_result(db_query("SELECT COUNT(*) FROM users WHERE status = 1")); - $stats['users'] = array('title' => "Users", 'value' => $users); + $stats['users'] = array('title' => t("Users"), 'value' => $users); $nodes = db_result(db_query("SELECT COUNT(*) FROM node WHERE status = 1")); - $stats['nodes'] = array('title' => "Published Nodes", 'value' => $nodes); + $stats['nodes'] = array('title' => t("Published Nodes"), 'value' => $nodes); $comments = db_result(db_query("SELECT COUNT(*) FROM comments WHERE status = 1")); - $stats['comments'] = array('title' => "Published comments", 'value' => $comments); + $stats['comments'] = array('title' => t("Published comments"), 'value' => $comments); $config = administration_menu_config(); return theme('administration_statistics_panel', $stats, $path); Seulement dans administration.cvs: CVS diff -u administration.cvs/default.inc administration/default.inc --- administration.cvs/default.inc 2006-06-22 22:02:02.000000000 -0400 +++ administration/default.inc 2006-07-13 13:29:11.000000000 -0400 @@ -34,24 +34,24 @@ 'menu_as_icons' => FALSE, 'items' => array( 'admin/node' => array( - 'title' => 'manage content', - 'description' => "Moderate, promote and manage my web pages", + 'title' => t('manage content'), + 'description' => t("Moderate, promote and manage my web pages"), ), 'admin/comment' => array( - 'title' => 'manage comments', - 'description' => "Moderate and publish comments", + 'title' => t('manage comments'), + 'description' => t("Moderate and publish comments"), ), 'admin/taxonomy' => array( - 'title' => 'manage categories', - 'description' => "Set up and maintain my site's categories (vocabularies)", + 'title' => t('manage categories'), + 'description' => t("Set up and maintain my site's categories (vocabularies)"), ), 'no-link1' => array( - 'title' => 'apply tags', - 'description' => 'Apply tags to web pages (content)', + 'title' => t('apply tags'), + 'description' => t('Apply tags to web pages (content)'), ), 'node/add' => array( - 'title' => 'create content', - 'description' => "Add new web pages (content) to my site", + 'title' => t('create content'), + 'description' => t("Add new web pages (content) to my site"), ), ) ); @@ -68,18 +68,18 @@ 'menu_as_icons' => FALSE, 'items' => array( 'admin/modules' => array( - 'title' => 'activate /deactivate', - 'description' => 'Activate/Deactivate modules', + 'title' => t('activate /deactivate'), + 'description' => t('Activate/Deactivate modules'), ), // NOTE: We need to give this menu item a different callback! 'admin/settings' => array( - 'title' => 'configure modules', - 'description' => "Configure my site's module settings", + 'title' => t('configure modules'), + 'description' => t("Configure my site's module settings"), ), // NOTE: We need to give THIS menu item a different callback TOO 'admin/uncategorized' => array( - 'title' => 'other', - 'description' => "Configure uncategorized items for modules", + 'title' => t('other'), + 'description' => t("Configure uncategorized items for modules"), ), ), ); @@ -96,36 +96,36 @@ 'menu_as_icons' => FALSE, 'items' => array( 'admin/user' => array( - 'title' => 'manage users', - 'description' => "Change or add users", + 'title' => t('manage users'), + 'description' => t("Change or add users"), ), 'admin/access' => array( - 'title' => 'access control', - 'description' => "Setup site security (access control to site features)", + 'title' => t('access control'), + 'description' => t("Setup site security (access control to site features)"), ), 'admin/menu' => array( - 'title' => 'menus', - 'description' => "Manage my site's menus", + 'title' => t('menus'), + 'description' => t("Manage my site's menus"), ), 'admin/node/types' => array( - 'title' => 'content types', - 'description' => "Create and manage content types", + 'title' => t('content types'), + 'description' => t("Create and manage content types"), ), 'admin/path' => array( - 'title' => 'url aliases', - 'description' => "Create and manage URL aliases", + 'title' => t('url aliases'), + 'description' => t("Create and manage URL aliases"), ), 'admin/filters' => array( - 'title' => 'input formats', - 'description' => "Configure allowable input formats/input filters", + 'title' => t('input formats'), + 'description' => t("Configure allowable input formats/input filters"), ), 'update.php' => array( //NEED TO CHANGE THIS TO USE base_path() - 'title' => 'upgrade site', - 'description' => "Upgrade my web site", + 'title' => t('upgrade site'), + 'description' => t("Upgrade my web site"), ), 'admin/aggregator' => array( - 'title' => 'news feeds', - 'description' => "Manage my news feeds", + 'title' => t('news feeds'), + 'description' => t("Manage my news feeds"), ), ), ); @@ -142,30 +142,30 @@ 'menu_as_icons' => FALSE, 'items' => array( 'admin/help' => array( - 'title' => 'help', - 'description' => 'Module help', + 'title' => t('help'), + 'description' => t('Module help'), ), 'http://drupal.org/support' => array( - 'title' => 'get support', - 'description' => 'Get support', - 'short-desc' => 'A page that explains support options, including paid support', - 'long-desc' => 'This exists as an example of what the long-desc will do', + 'title' => t('get support'), + 'description' => t('Get support'), + 'short-desc' => t('A page that explains support options, including paid support'), + 'long-desc' => t('This exists as an example of what the long-desc will do'), ), 'http://drupal.org/node/21951' => array( - 'title' => 'terminology', - 'description' => 'Understanding terminology and concepts', - 'short-desc' => 'An introduction to Drupal terminology', - 'long-desc' => 'This exists as an example of what the long-desc will do', + 'title' => t('terminology'), + 'description' => t('Understanding terminology and concepts'), + 'short-desc' => t('An introduction to Drupal terminology'), + 'long-desc' => t('This exists as an example of what the long-desc will do'), ), 'http://drupalirc.com' => array( - 'title' => 'chat', - 'description' => 'Chat live to volunteers', - 'short-desc' => 'Well researched questions may be answered', + 'title' => t('chat'), + 'description' => t('Chat live to volunteers'), + 'short-desc' => t('Well researched questions may be answered'), ), 'http://drupal.org/handbook' => array( - 'title' => 'handbooks', - 'description' => 'Drupal.org handbooks', - 'short-desc' => 'Drupal online documention', + 'title' => t('handbooks'), + 'description' => t('Drupal.org handbooks'), + 'short-desc' => t('Drupal online documention'), ), ), ); @@ -191,16 +191,16 @@ 'menu_as_icons' => FALSE, 'items' => array( 'admin/themes' => array( - 'title' => 'themes', - 'description' => "Activate/configure themes", + 'title' => t('themes'), + 'description' => t("Activate/configure themes"), ), 'admin/block' => array( - 'title' => 'blocks', - 'description' => "Activate/configure blocks", + 'title' => t('blocks'), + 'description' => t("Activate/configure blocks"), ), 'http://drupal.org/node/37156' => array( - 'title' => 'fix themes', - 'description' => 'Fix theme problems', + 'title' => t('fix themes'), + 'description' => t('Fix theme problems'), ), ), ); @@ -457,7 +457,7 @@ $sql = "SELECT count(*) FROM {node} where promote=1 and status=1 and moderate=0 and created>=" . $intervals[$interval]; $count = db_result(db_query($sql)); if ($interval == t('epoch')) { - $report[("Promoted Nodes published since this site was founded: ")] = $count; + $report[t("Promoted Nodes published since this site was founded: ")] = $count; } else { $report[t("Promoted Nodes published in the last ") . $interval . ": " ] = $count; Seulement dans administration: default.inc~ Les sous-répertoires administration.cvs/images et administration/images sont identiques. Seulement dans administration: LICENSE.txt diff -u administration.cvs/merged.inc administration/merged.inc --- administration.cvs/merged.inc 2006-06-22 22:02:02.000000000 -0400 +++ administration/merged.inc 2006-07-13 13:16:54.000000000 -0400 @@ -28,53 +28,53 @@ 'callback' => '_administration_sub_dashboard_page', 'panel_theme' => 'administration_menu_panel', 'sub_panel_theme' => 'administration_sub_menu_panel', - 'long-desc' => t('You can configure new applications, known as modules and learn how to add new features.'), + 'long-desc' => t('You can configure new applications, known as modules, and learn how to add new features.'), 'panel_collapsible' => TRUE, 'menu_expandable' => TRUE, 'menu_as_icons' => FALSE, 'items' => array( 'admin/modules' => array( - 'title' => 'module control', - 'description' => 'Activate/deactivate modules', + 'title' => t('module control'), + 'description' => t('Activate/deactivate modules'), ), 'admininister/config/browse' => array( - 'title' => 'browse modules', - 'description' => 'Browse available modules', - 'short-desc' => 'Browse a complete list of modules available for your site', + 'title' => t('browse modules'), + 'description' => t('Browse available modules'), + 'short-desc' => t('Browse a complete list of modules available for your site'), 'callback' => 'administration_offsite', 'callback arguments' => array('http://drupal.org/project/Modules/4.7'), ), 'administer/config/update' => array( //NEED TO CHANGE THIS TO USE base_path() - 'title' => 'update site', - 'description' => "Run update scripts", + 'title' => t('update site'), + 'description' => t("Run update scripts"), 'short-desc' => t('Run update scripts after site update files have been installed'), 'callback' => 'administration_offsite', 'callback arguments' => array('update.php'), ), 'admin/settings' => array( - 'title' => 'module configuration', - 'description' => "Configure my site's module settings", + 'title' => t('module configuration'), + 'description' => t("Configure my site's module settings"), ), 'admin/filters' => array( - 'title' => 'input formats', - 'description' => "Configure allowable input formats/input filters", + 'title' => t('input formats'), + 'description' => t("Configure allowable input formats/input filters"), ), 'admin/contact' => array( - 'title' => 'contact forms', - 'description' => "Configure contact forms for the site", + 'title' => t('contact forms'), + 'description' => t("Configure contact forms for the site"), ), 'admin/locale' => array( - 'title' => 'localization', - 'description' => "Configure my site's language options", + 'title' => t('localization'), + 'description' => t("Configure my site's language options"), ), 'admin/logs' => array( - 'title' => 'logs', - 'description' => "View my site's logs", + 'title' => t('logs'), + 'description' => t("View my site's logs"), ), 'admin' => array( - 'title' => 'uncategorized', - 'description' => "Configure uncategorized items for modules", - 'short-desc' => "Uncategorized items may be recategorized in menu system" + 'title' => t('uncategorized'), + 'description' => t("Configure uncategorized items for modules"), + 'short-desc' => t("Uncategorized items may be recategorized in menu system)"), ), ), ); @@ -91,40 +91,40 @@ 'menu_as_icons' => FALSE, 'items' => array( 'admin/node' => array( - 'title' => 'manage content', - 'description' => "Moderate, promote and manage my web pages", + 'title' => t('manage content'), + 'description' => t("Moderate, promote and manage my web pages"), ), 'admin/comment' => array( - 'title' => 'manage comments', - 'description' => "Moderate and publish comments", + 'title' => t('manage comments'), + 'description' => t("Moderate and publish comments"), ), 'admin/taxonomy' => array( - 'title' => 'manage categories', - 'description' => "Set up and maintain my site's categories (vocabularies)", + 'title' => t('manage categories'), + 'description' => t("Set up and maintain my site's categories (vocabularies)"), ), 'admin/node/types' => array( - 'title' => 'manage content types', - 'description' => "Create and manage content types", + 'title' => t('manage content types'), + 'description' => t("Create and manage content types"), ), 'admin/settings/content-types' => array( - 'title' => 'configure content types', - 'description' => "Configure content types", + 'title' => t('configure content types'), + 'description' => t("Configure content types"), ), 'node/add' => array( - 'title' => 'create content', - 'description' => "Add new web pages (content) to my site", + 'title' => t('create content'), + 'description' => t("Add new web pages (content) to my site"), ), 'admin/path' => array( - 'title' => 'url aliases', - 'description' => "Create and manage URL aliases", + 'title' => t('url aliases'), + 'description' => t("Create and manage URL aliases"), ), 'admin/forum' => array( - 'title' => 'forums', - 'description' => "Configure my site's forums", + 'title' => t('forums'), + 'description' => t("Configure my site's forums"), ), 'admin/settings/node' => array( - 'title' => 'post options', - 'description' => "Configure my site's posting options", + 'title' => t('post options'), + 'description' => t("Configure my site's posting options"), ), ) ); @@ -141,12 +141,12 @@ 'menu_as_icons' => FALSE, 'items' => array( 'admin/user' => array( - 'title' => 'manage users', - 'description' => "Change or add users", + 'title' => t('manage users'), + 'description' => t("Change or add users"), ), 'admin/settings/profile' => array( - 'title' => 'manage profiles', - 'description' => "Change or add user profile information", + 'title' => t('manage profiles'), + 'description' => t("Change or add user profile information"), ), 'admin/access' => array( 'title' => 'access control', @@ -167,36 +167,36 @@ 'menu_as_icons' => FALSE, 'items' => array( 'admin/help' => array( - 'title' => 'help', - 'description' => 'Module help', + 'title' => t('help'), + 'description' => t('Module help'), ), 'administer/help/support' => array( - 'title' => 'get support', - 'description' => 'Get support', - 'short-desc' => 'A page that explains support options, including paid support', - 'long-desc' => 'This exists as an example of what the long-desc will do', + 'title' => t('get support'), + 'description' => t('Get support'), + 'short-desc' => t('A page that explains support options, including paid support'), + 'long-desc' => t('This exists as an example of what the long-desc will do'), 'callback' => 'administration_offsite', 'callback arguments' => array('http://drupal.org/support'), ), 'administer/help/terminology' => array( - 'title' => 'terminology', - 'description' => 'Understanding terminology and concepts', - 'short-desc' => 'An introduction to Drupal terminology', - 'long-desc' => 'This exists as an example of what the long-desc will do', + 'title' => t('terminology'), + 'description' => t('Understanding terminology and concepts'), + 'short-desc' => t('An introduction to Drupal terminology'), + 'long-desc' => t('This exists as an example of what the long-desc will do'), 'callback' => 'administration_offsite', 'callback arguments' => array('http://drupal.org/node/21951'), ), 'administer/help/chat' => array( - 'title' => 'chat', - 'description' => 'Chat live to volunteers', - 'short-desc' => 'Well researched questions may be answered', + 'title' => t('chat'), + 'description' => t('Chat live to volunteers'), + 'short-desc' => t('Well researched questions may be answered'), 'callback' => 'administration_offsite', 'callback arguments' => array('http://drupalirc.com'), ), 'administer/help/handbook' => array( - 'title' => 'handbooks', - 'description' => 'Drupal.org handbooks', - 'short-desc' => 'Drupal online documention', + 'title' => t('handbooks'), + 'description' => t('Drupal.org handbooks'), + 'short-desc' => t('Drupal online documention'), 'callback' => 'administration_offsite', 'callback arguments' => array('http://drupal.org/handbook'), ), @@ -224,30 +224,30 @@ 'menu_as_icons' => FALSE, 'items' => array( 'admin/themes' => array( - 'title' => 'themes', - 'description' => "Activate/configure themes", + 'title' => t('themes'), + 'description' => t("Activate/configure themes"), ), 'admin/block' => array( - 'title' => 'blocks', - 'description' => "Activate/configure blocks", + 'title' => t('blocks'), + 'description' => t("Activate/configure blocks"), ), 'admin/menu' => array( - 'title' => 'menus', - 'description' => "Manage my site's menus", + 'title' => t('menus'), + 'description' => t("Manage my site's menus"), ), 'admin/settings/menu' => array( - 'title' => 'menus', - 'description' => "Configure menu settings", + 'title' => t('menus'), + 'description' => t("Configure menu settings"), ), 'administer/design/browse' => array( - 'title' => 'browse', - 'description' => 'Browse themes', + 'title' => t('browse'), + 'description' => t('Browse themes'), 'callback' => 'administration_offsite', 'callback arguments' => array('http://drupal.org/project/Themes/4.7'), ), 'administer/design/problems' => array( - 'title' => 'fix themes', - 'description' => 'Advice on theme problems', + 'title' => t('fix themes'), + 'description' => t('Advice on theme problems'), 'callback' => 'administration_offsite', 'callback arguments' => array('http://drupal.org/node/37156'), ), @@ -266,12 +266,12 @@ 'menu_as_icons' => FALSE, 'items' => array( 'admin/aggregator' => array( - 'title' => 'news feeds', - 'description' => "Manage my news feeds", + 'title' => t('news feeds'), + 'description' => t("Manage my news feeds"), ), 'admin/settings/aggregator' => array( - 'title' => 'configure news feeds', - 'description' => "Configure news feed settings", + 'title' => t('configure news feeds'), + 'description' => t("Configure news feed settings"), ), ), ); @@ -815,7 +815,7 @@ global $form_values; $op = isset($_POST['op']) ? $_POST['op'] : ''; $_SESSION['watchdog_overview_filter'] = $form_values['filter']; - if ($op == 'View full page') { + if ($op == t('View full page')) { drupal_goto('admin/logs'); } } Seulement dans administration: po Seulement dans administration: .svn Seulement dans administration.cvs: zadministration.module