Changeset 1793:a25f8d0fd400 for locales/en/resources.php

Timestamp:

09/11/13 17:10:01 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

1795:5c5c52124ab4, 1796:ef72fa20ed9d

Parents:

1792:3ad2e47ed52d (diff), 514:5cacbd2e1fa9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge globalhelp into default

Files:

• locales/en/resources.php (modified) (3 diffs)
• locales/en/resources.php (modified) (1 diff)

locales/en/resources.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -15 +15 @@
 
 $__resources['doc'] = array(
-     "Dotclear 2 documentation" => 'http://dotclear.org/documentation/2.0',
-     'Dotclear 2 presentation' => 'http://dotclear.org/documentation/2.0/overview/tour',
+     "Dotclear documentation" => 'http://dotclear.org/documentation/2.0',
+     'Dotclear presentation' => 'http://dotclear.org/documentation/2.0/overview/tour',
      "User manual" => 'http://dotclear.org/documentation/2.0/usage',
      "Installation and administration guides" => 'http://dotclear.org/documentation/2.0/admin',
-     "Dotclear 2 support forum" => 'http://forum.dotclear.net/'
+     "Dotclear support forum" => 'http://forum.dotclear.net/'
 );
 
@@ -30 +30 @@
      'core_post' => dirname(__FILE__).'/help/post.html',
      'core_posts' => dirname(__FILE__).'/help/posts.html',
+     'core_trackbacks' => dirname(__FILE__).'/help/trackbacks.html',
      'core_user_pref' => dirname(__FILE__).'/help/user_pref.html',
      'core_user' => dirname(__FILE__).'/help/user.html',

locales/en/resources.php

@@ -23 +23 @@
 
 $__resources['help'] = array(
+     'core_main' => dirname(__FILE__).'/help/main.html',
      'core_blog_pref' => dirname(__FILE__).'/help/blog_pref.html',
      'core_categories' => dirname(__FILE__).'/help/categories.html',