Commit 71e249f1 authored by jonnybradley's avatar jonnybradley

[MRG] Automatic merge, branches/6.x 31378 to 31409

parent df2f4ccc
Tiki! The wiki with a lot of features!
Version 6.1beta2
Version 6.1
DOCUMENTATION
......
......@@ -29,6 +29,68 @@ Version 6.1
<http://tiki.org/ReleaseNotes61>
------------------
----------------------------------------------
r31399 | pkdille | 2010-12-14 16:49:49 +0100 (Tue, 14 Dec 2010) | 1 line
[FIX] 20081120_tiki_poll_structures_update_tiki.sql database update was not included in tiki.sql file
----------------------------------------------
r31393 | xavidp | 2010-12-14 03:22:34 +0100 (Tue, 14 Dec 2010) | 1 line
[FIX]For some reason, smarty strips spaces of the button label if param "text "was used, but text show ok if using "_text". Fixed. Former fix by rodrigo_sampaio seemed not enough.
----------------------------------------------
r31392 | sylvieg | 2010-12-13 21:25:13 +0100 (Mon, 13 Dec 2010) | 1 line
[FIX]tracker: IP does not seem to be a global anymore -> fix uniq for IP
----------------------------------------------
r31383 | Jyhem | 2010-12-13 16:39:13 +0100 (Mon, 13 Dec 2010) | 1 line
[FIX] Allow valid email syntax 'display name <email>'
----------------------------------------------
r31382 | jonnybradley | 2010-12-13 16:27:13 +0100 (Mon, 13 Dec 2010) | 1 line
[FIX] cclite payments: Use registry's defined currency if set, not the global pref and use correct registry for transaction on cclite server.
----------------------------------------------
r31378 | marclaporte | 2010-12-12 22:14:48 +0100 (Sun, 12 Dec 2010) | 1 line
[bp/r30062] Wiki page name bad characters: remove current nominations - comma, colon, parentheses, apostrophe, exclamation mark. Ref: http://dev.tiki.org/Bad+characters
----------------------------------------------
r31377 | jonnybradley | 2010-12-12 21:03:57 +0100 (Sun, 12 Dec 2010) | 1 line
[FIX] user registration: Actually a simple work around as the validation mail cannot send the user tracker info as the item hasn't been made yet, so add a link to the new user's pref page
----------------------------------------------
r31374 | jonnybradley | 2010-12-12 18:55:55 +0100 (Sun, 12 Dec 2010) | 1 line
[FIX] listpages: Add confirmations to the multi select operations (thanks and condolences to Carsten)
----------------------------------------------
r31370 | jonnybradley | 2010-12-12 15:40:33 +0100 (Sun, 12 Dec 2010) | 1 line
[FIX] structures: Ensure pos of new structures is 1 (thanks Geoff)
----------------------------------------------
r31369 | eromneg | 2010-12-12 00:34:24 +0100 (Sun, 12 Dec 2010) | 1 line
[FIX] allow menu url fields to not be escaped by using the menus_item_names_raw pref in the same way as the name field is not escaped - admin screen label/description updated
----------------------------------------------
r31363 | chealer | 2010-12-11 00:17:39 +0100 (Sat, 11 Dec 2010) | 1 line
[FIX] Upcoming events module: don't show cancelled events like all others. strike names as when viewing calendars. (Closes: #3708)
----------------------------------------------
r31356 | marclaporte | 2010-12-10 20:35:40 +0100 (Fri, 10 Dec 2010) | 1 line
Relevant info added to the Security Admin Panel
----------------------------------------------
r31347 | luciash | 2010-12-10 15:33:48 +0100 (Fri, 10 Dec 2010) | 1 line
menus: slightly polished translation string (no need to yell INSECURE there)
----------------------------------------------
r31346 | luciash | 2010-12-10 15:01:04 +0100 (Fri, 10 Dec 2010) | 1 line
[FIX] darkroom theme: OpenID Login image visible now
----------------------------------------------
r31337 | chealer | 2010-12-10 04:17:43 +0100 (Fri, 10 Dec 2010) | 3 lines
[SEC] Escape menu item names by default. Option menus_item_names_raw allows keeping the legacy behavior (replaces less clear preference).
thanks Jonny Bradley, Gary Cunningham-Lee, Rick Sapir, Marc Laporte and Jean-Fran?\195?\167ois Bilger
[SEC] HTML special characters escaping in menu item URLs and icon paths
----------------------------------------------
r31322 | changi67 | 2010-12-09 21:42:45 +0100 (Thu, 09 Dec 2010) | 1 line
......@@ -12,9 +12,9 @@ This is how we implement the Tiki Social Contract.
http://tiki.org/Social+Contract
List of members of the Community
As of 2010-12-09, the community has:
* 493 members on SourceForge.net,
* 241 of those people who made at least one code commit
As of 2010-12-14, the community has:
* 494 members on SourceForge.net,
* 242 of those people who made at least one code commit
This list is automatically generated and alphabetically sorted
from subversion repository by the following script:
......@@ -374,15 +374,15 @@ SF Role: Developer
Nickname: changi67
Name: Jean-François B.
First Commit: 2009-04-23
Last Commit: 2010-12-09
Number of Commits: 435
Last Commit: 2010-12-14
Number of Commits: 453
SF Role: Packager (.rpm, .deb etc)
Nickname: chealer
Name: Philippe Cloutier
First Commit: 2003-09-27
Last Commit: 2010-12-07
Number of Commits: 899
Last Commit: 2010-12-14
Number of Commits: 903
SF Role: Developer
Nickname: chessy
......@@ -623,8 +623,8 @@ SF Role: Developer
Nickname: eromneg
First Commit: 2009-06-07
Last Commit: 2010-12-06
Number of Commits: 57
Last Commit: 2010-12-12
Number of Commits: 58
Nickname: essele
Name: Lee Essen
......@@ -1119,8 +1119,8 @@ SF Role: Developer
Nickname: jonnybradley
Name: jonny Bradley
First Commit: 2007-08-15
Last Commit: 2010-12-09
Number of Commits: 2768
Last Commit: 2010-12-13
Number of Commits: 2794
SF Role: Developer
Nickname: jorgercosta
......@@ -1179,8 +1179,8 @@ Name: Jyes Beat
Nickname: jyhem
Name: Jean-Marc Libs
First Commit: 2006-12-11
Last Commit: 2010-12-06
Number of Commits: 498
Last Commit: 2010-12-13
Number of Commits: 500
SF Role: Developer
Nickname: k2s
......@@ -1212,8 +1212,8 @@ Name: Kimberly Fink
Nickname: killianebel
Name: Killian EBEL
First Commit: 2010-12-07
Last Commit: 2010-12-08
Number of Commits: 15
Last Commit: 2010-12-10
Number of Commits: 22
Nickname: kissaki
Name: Kissaki
......@@ -1308,8 +1308,8 @@ SF Role: Developer
Nickname: lindonb
First Commit: 2009-05-10
Last Commit: 2010-12-06
Number of Commits: 298
Last Commit: 2010-12-11
Number of Commits: 299
Nickname: llunax
Name: Lluna
......@@ -1338,8 +1338,8 @@ Name: Louis-Martin Richard
Nickname: lphuberdeau
Name: Louis-Philippe Huberdeau
First Commit: 2004-04-10
Last Commit: 2010-12-08
Number of Commits: 1834
Last Commit: 2010-12-14
Number of Commits: 1840
SF Role: Developer
Nickname: lrargerich
......@@ -1366,8 +1366,8 @@ Name: Lucas Emanoel
Nickname: luciash
Name: luciash d' being
First Commit: 2003-08-05
Last Commit: 2010-12-09
Number of Commits: 941
Last Commit: 2010-12-10
Number of Commits: 943
SF Role: Developer
Nickname: lueders
......@@ -1419,8 +1419,8 @@ SF Role: Developer
Nickname: marclaporte
Name: Marc Laporte
First Commit: 2003-11-28
Last Commit: 2010-12-05
Number of Commits: 1046
Last Commit: 2010-12-12
Number of Commits: 1048
SF Role: Project Manager
Nickname: marcmont
......@@ -1732,8 +1732,8 @@ SF Role: Developer
Nickname: nyloth
Name: Patrice W.
First Commit: 2006-11-09
Last Commit: 2010-10-13
Number of Commits: 1760
Last Commit: 2010-12-10
Number of Commits: 1761
SF Role: Developer
Nickname: obnoxxx
......@@ -1876,8 +1876,8 @@ Number of Commits: 1
Nickname: pkdille
First Commit: 2007-03-14
Last Commit: 2010-12-03
Number of Commits: 1382
Last Commit: 2010-12-14
Number of Commits: 1383
SF Role: Developer
Nickname: plillevold
......@@ -2124,6 +2124,12 @@ SF Role: Developer
Nickname: sabdelma
SF Role: Developer
Nickname: sacados1
Name: DEUTSCHER Matthieu
First Commit: 2010-12-10
Last Commit: 2010-12-10
Number of Commits: 1
Nickname: sacra
Name: Paulo Sacramento
First Commit: 2009-05-21
......@@ -2133,8 +2139,8 @@ Number of Commits: 3
Nickname: sampaioprimo
Name: Rodrigo Sampaio Primo
First Commit: 2005-10-17
Last Commit: 2010-12-03
Number of Commits: 570
Last Commit: 2010-12-14
Number of Commits: 575
SF Role: Developer
Nickname: scarle
......@@ -2271,8 +2277,8 @@ SF Role: Developer
Nickname: sylvieg
Name: Sylvie Greverend
First Commit: 2003-05-28
Last Commit: 2010-12-07
Number of Commits: 6254
Last Commit: 2010-12-14
Number of Commits: 6256
SF Role: Developer
Nickname: syracine
......@@ -2464,8 +2470,8 @@ SF Role: Developer
Nickname: xavidp
Name: Xavier de Pedro
First Commit: 2005-07-08
Last Commit: 2010-12-07
Number of Commits: 368
Last Commit: 2010-12-14
Number of Commits: 370
SF Role: All-Hands Person
Nickname: xbtheria
......@@ -2509,7 +2515,7 @@ Number of Commits: 11
SF Role: Translator (I18N/L10N)
Nickname: zab-sv
Name: Zab
Name: Zabsv
First Commit: 2009-09-29
Last Commit: 2009-09-29
Number of Commits: 1
......
This diff is collapsed.
......@@ -1675,10 +1675,20 @@ CREATE TABLE `tiki_polls` (
`active` char(1) default NULL,
`publishDate` int(14) default NULL,
`voteConsiderationSpan` int(4) default 0,
`anonym` ENUM( 'a', 'u', 'i', 'c' ) NOT NULL DEFAULT 'u',
PRIMARY KEY (`pollId`)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
ALTER TABLE tiki_polls ADD INDEX tiki_poll_lookup ( active , title );
CREATE TABLE IF NOT EXISTS `tiki_poll_votes` (
`pollId` int(11) NOT NULL,
`optionId` int(11) NOT NULL,
`voteId` int(11) NOT NULL auto_increment,
`identification` varchar(300) NOT NULL,
`time` int(11) NOT NULL,
PRIMARY KEY (`voteId`)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
DROP TABLE IF EXISTS `tiki_preferences`;
CREATE TABLE `tiki_preferences` (
`name` varchar(40) NOT NULL default '',
......
......@@ -1132,8 +1132,6 @@ $lang=Array(
// "new window" => "new window",
// "inline frame" => "inline frame",
// "Fields display order" => "Fields display order",
// "Escape HTML in menu options" => "Escape HTML in menu options",
// "Use to \"escape\" or render HTML in menu options. If disabled, HTML will be allowed in menu options. Your code must be valid. If enabled, HTML code will be \"escaped\" and shown literally (as code) instead" => "Use to \"escape\" or render HTML in menu options. If disabled, HTML will be allowed in menu options. Your code must be valid. If enabled, HTML code will be \"escaped\" and shown literally (as code) instead",
// "Re-validate user by email after" => "Re-validate user by email after",
// "days" => "days",
// "Use \"-1\" for never" => "Use \"-1\" for never",
......@@ -1986,6 +1984,8 @@ $lang=Array(
// "Menu icons" => "Menu icons",
// "Allows to define icons for menu entries" => "Allows to define icons for menu entries",
// "Default path for the icons" => "Default path for the icons",
// "Allow HTML in link text and do not escape the url in menu items (Please note: this might be insecure if you allow more people to edit menus)" => "Allow HTML in link text and do not escape the url in menu items (Please note: this might be insecure if you allow more people to edit menus)",
// "If enabled, menu item names treated as HTML item content and they are not escaped (do not replace HTML special characters), this allows the use of HTML in menu items to insert images for example, and menu item urls are not escaped which allows the use of permissable href tags. Code must be valid. This allows menu item editors to put arbitrary HTML; only enable if you know what you are doing" => "If enabled, menu item names treated as HTML item content and they are not escaped (do not replace HTML special characters), this allows the use of HTML in menu items to insert images for example, and menu item urls are not escaped which allows the use of permissable href tags. Code must be valid. This allows menu item editors to put arbitrary HTML; only enable if you know what you are doing",
// "Maximum mailbox size (messages, 0=unlimited)" => "Maximum mailbox size (messages, 0=unlimited)",
// "Maximum mail archive size (messages, 0=unlimited)" => "Maximum mail archive size (messages, 0=unlimited)",
// "Maximum sent box size (messages, 0=unlimited)" => "Maximum sent box size (messages, 0=unlimited)",
......@@ -2761,6 +2761,7 @@ $lang=Array(
// "No object information provided" => "No object information provided",
// "No rules to display object %1 of type %0" => "No rules to display object %1 of type %0",
// "Relation not found" => "Relation not found",
// "Currency in payment (%0) does not match the currency for that registry (%1)" => "Currency in payment (%0) does not match the currency for that registry (%1)",
// "This invoice does not exist or is in limited access" => "This invoice does not exist or is in limited access",
// "PHPLayersMenus are not enabled on this site" => "PHPLayersMenus are not enabled on this site",
// "Preference name not specified" => "Preference name not specified",
......@@ -5005,6 +5006,7 @@ $lang=Array(
// "Trade" => "Trade",
// "PluginTrade" => "PluginTrade",
// "Send or receive payments from one member to another. (for cclite only so far, experimental)" => "Send or receive payments from one member to another. (for cclite only so far, experimental)",
// "Currency depends on the selected registry" => "Currency depends on the selected registry",
// "Registry to trade in. Default: site preference (or first in list when more than one)" => "Registry to trade in. Default: site preference (or first in list when more than one)",
// "Currency to trade in. Default: Cclite currency preference for registry set above" => "Currency to trade in. Default: Cclite currency preference for registry set above",
// "Other User" => "Other User",
......@@ -6077,6 +6079,8 @@ $lang=Array(
// "case patched" => "case patched",
// "error reporting adminonly" => "error reporting adminonly",
// "error reporting level" => "error reporting level",
// "feature custom doctype content" => "feature custom doctype content",
// "feature fixed width" => "feature fixed width",
// "feature jquery media" => "feature jquery media",
// "feature jquery ui theme" => "feature jquery ui theme",
// "feature sheet" => "feature sheet",
......@@ -6126,6 +6130,7 @@ $lang=Array(
// "fgal show slideshow" => "fgal show slideshow",
// "fgal show thumbactions" => "fgal show thumbactions",
// "fgal sort mode" => "fgal sort mode",
// "fgal use db" => "fgal use db",
// "fgal use dir" => "fgal use dir",
// "gal use lib" => "gal use lib",
// "https login" => "https login",
......@@ -6134,6 +6139,7 @@ $lang=Array(
// "lastUpdatePrefs" => "lastUpdatePrefs",
// "log tpl" => "log tpl",
// "sender email" => "sender email",
// "sitemycode" => "sitemycode",
// "smarty notice reporting" => "smarty notice reporting",
// "tiki needs upgrade" => "tiki needs upgrade",
// "tiki release" => "tiki release",
......@@ -6432,6 +6438,7 @@ $lang=Array(
// "has requested an account on" => "has requested an account on",
// "To validate that account, please follow the link" => "To validate that account, please follow the link",
// "Assign to a group" => "Assign to a group",
// "View user's data" => "View user's data",
// "Best regards" => "Best regards",
// "User Tracker" => "User Tracker",
// "User Registration Request" => "User Registration Request",
......@@ -7645,6 +7652,8 @@ $lang=Array(
// "Please see the <a class='rbox-link' target='tikihelp' href='http://dev.tiki.org/Security'>Security page</a> on Tiki's developer site" => "Please see the <a class='rbox-link' target='tikihelp' href='http://dev.tiki.org/Security'>Security page</a> on Tiki's developer site",
// "See <a href=\"tiki-admin_security.php\" title=\"Security\"><strong>Admin &gt; Security Admin</strong></a> for additional security settings" => "See <a href=\"tiki-admin_security.php\" title=\"Security\"><strong>Admin &gt; Security Admin</strong></a> for additional security settings",
// "General Security" => "General Security",
// "Please also see" => "Please also see",
// "HTTPS (SSL) and other login preferences" => "HTTPS (SSL) and other login preferences",
// "CSRF Security" => "CSRF Security",
// "Use these options to protect against cross-site request forgeries (CSRF)" => "Use these options to protect against cross-site request forgeries (CSRF)",
// "Spam protection" => "Spam protection",
......@@ -10504,7 +10513,7 @@ $lang=Array(
// "a bookmark" => "a bookmark",
// "User Contacts Preferences" => "User Contacts Preferences",
// "Manage Fields" => "Manage Fields",
// "{if \$prefs.display_html_in_menus eq 'y'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}" => "{if \$prefs.display_html_in_menus eq 'y'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}",
// "{if \$prefs.menus_item_names_raw eq 'n'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}" => "{if \$prefs.menus_item_names_raw eq 'n'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}",
// "Send me a message" => "Send me a message",
// "Basic Data" => "Basic Data",
// "Assign Group" => "Assign Group",
......@@ -11294,6 +11303,11 @@ $lang=Array(
// "Pending moderation" => "Pending moderation",
// "Blocked" => "Blocked",
// "Invalid action" => "Invalid action",
// "Are you sure you want to remove the %0 selected pages" => "Are you sure you want to remove the %0 selected pages",
// "Are you sure you want to print the %0 selected pages" => "Are you sure you want to print the %0 selected pages",
// "Are you sure you want to unlock the %0 selected pages" => "Are you sure you want to unlock the %0 selected pages",
// "Are you sure you want to lock the %0 selected pages" => "Are you sure you want to lock the %0 selected pages",
// "Are you sure you want to download a zip of the %0 selected pages" => "Are you sure you want to download a zip of the %0 selected pages",
// "You have to enable cookies to be able to login to this site" => "You have to enable cookies to be able to login to this site",
// "Username field cannot be empty. Please go back and try again" => "Username field cannot be empty. Please go back and try again",
// "Unable to contact remote server" => "Unable to contact remote server",
......
This diff is collapsed.
......@@ -3242,8 +3242,6 @@ $lang=Array(
// "6" => "6",
// "Method to Open Directory Links" => "Method to Open Directory Links",
// "Fields display order" => "Fields display order",
// "Escape HTML in menu options" => "Escape HTML in menu options",
// "Use to \"escape\" or render HTML in menu options. If disabled, HTML will be allowed in menu options. Your code must be valid. If enabled, HTML code will be \"escaped\" and shown literally (as code) instead" => "Use to \"escape\" or render HTML in menu options. If disabled, HTML will be allowed in menu options. Your code must be valid. If enabled, HTML code will be \"escaped\" and shown literally (as code) instead",
// "Re-validate user by email after" => "Re-validate user by email after",
// "Use \"-1\" for never" => "Use \"-1\" for never",
// "PHP errors visible to admin only" => "PHP errors visible to admin only",
......@@ -3946,6 +3944,8 @@ $lang=Array(
// "Menu icons" => "Menu icons",
// "Allows to define icons for menu entries" => "Allows to define icons for menu entries",
// "Default path for the icons" => "Default path for the icons",
// "Allow HTML in link text and do not escape the url in menu items (Please note: this might be insecure if you allow more people to edit menus)" => "Allow HTML in link text and do not escape the url in menu items (Please note: this might be insecure if you allow more people to edit menus)",
// "If enabled, menu item names treated as HTML item content and they are not escaped (do not replace HTML special characters), this allows the use of HTML in menu items to insert images for example, and menu item urls are not escaped which allows the use of permissable href tags. Code must be valid. This allows menu item editors to put arbitrary HTML; only enable if you know what you are doing" => "If enabled, menu item names treated as HTML item content and they are not escaped (do not replace HTML special characters), this allows the use of HTML in menu items to insert images for example, and menu item urls are not escaped which allows the use of permissable href tags. Code must be valid. This allows menu item editors to put arbitrary HTML; only enable if you know what you are doing",
// "Maximum mailbox size (messages, 0=unlimited)" => "Maximum mailbox size (messages, 0=unlimited)",
// "Maximum mail archive size (messages, 0=unlimited)" => "Maximum mail archive size (messages, 0=unlimited)",
// "Maximum sent box size (messages, 0=unlimited)" => "Maximum sent box size (messages, 0=unlimited)",
......@@ -4631,6 +4631,7 @@ $lang=Array(
// "No object information provided" => "No object information provided",
// "No rules to display object %1 of type %0" => "No rules to display object %1 of type %0",
// "Relation not found" => "Relation not found",
// "Currency in payment (%0) does not match the currency for that registry (%1)" => "Currency in payment (%0) does not match the currency for that registry (%1)",
// "This invoice does not exist or is in limited access" => "This invoice does not exist or is in limited access",
// "PHPLayersMenus are not enabled on this site" => "PHPLayersMenus are not enabled on this site",
// "Preference name not specified" => "Preference name not specified",
......@@ -6744,6 +6745,7 @@ $lang=Array(
// "Trade" => "Trade",
// "PluginTrade" => "PluginTrade",
// "Send or receive payments from one member to another. (for cclite only so far, experimental)" => "Send or receive payments from one member to another. (for cclite only so far, experimental)",
// "Currency depends on the selected registry" => "Currency depends on the selected registry",
// "Registry to trade in. Default: site preference (or first in list when more than one)" => "Registry to trade in. Default: site preference (or first in list when more than one)",
// "Currency to trade in. Default: Cclite currency preference for registry set above" => "Currency to trade in. Default: Cclite currency preference for registry set above",
// "Other User" => "Other User",
......@@ -7638,6 +7640,8 @@ $lang=Array(
// "case patched" => "case patched",
// "error reporting adminonly" => "error reporting adminonly",
// "error reporting level" => "error reporting level",
// "feature custom doctype content" => "feature custom doctype content",
// "feature fixed width" => "feature fixed width",
// "feature jquery media" => "feature jquery media",
// "feature jquery ui theme" => "feature jquery ui theme",
// "feature sheet" => "feature sheet",
......@@ -7687,6 +7691,7 @@ $lang=Array(
// "fgal show slideshow" => "fgal show slideshow",
// "fgal show thumbactions" => "fgal show thumbactions",
// "fgal sort mode" => "fgal sort mode",
// "fgal use db" => "fgal use db",
// "fgal use dir" => "fgal use dir",
// "gal use lib" => "gal use lib",
// "https login" => "https login",
......@@ -7695,6 +7700,7 @@ $lang=Array(
// "lastUpdatePrefs" => "lastUpdatePrefs",
// "log tpl" => "log tpl",
// "sender email" => "sender email",
// "sitemycode" => "sitemycode",
// "smarty notice reporting" => "smarty notice reporting",
// "tiki needs upgrade" => "tiki needs upgrade",
// "tiki release" => "tiki release",
......@@ -7910,6 +7916,7 @@ $lang=Array(
// "New message arrived from %s" => "New message arrived from %s",
// "{\$mail_user} <{\$mail_email}> has requested a new password on {\$mail_site}, but you need to validate his account first" => "{\$mail_user} <{\$mail_email}> has requested a new password on {\$mail_site}, but you need to validate his account first",
// "Assign to a group" => "Assign to a group",
// "View user's data" => "View user's data",
// "Best regards" => "Best regards",
// "User Tracker" => "User Tracker",
// "User Registration Request" => "User Registration Request",
......@@ -8837,6 +8844,8 @@ $lang=Array(
// "Please see the <a class='rbox-link' target='tikihelp' href='http://dev.tiki.org/Security'>Security page</a> on Tiki's developer site" => "Please see the <a class='rbox-link' target='tikihelp' href='http://dev.tiki.org/Security'>Security page</a> on Tiki's developer site",
// "See <a href=\"tiki-admin_security.php\" title=\"Security\"><strong>Admin &gt; Security Admin</strong></a> for additional security settings" => "See <a href=\"tiki-admin_security.php\" title=\"Security\"><strong>Admin &gt; Security Admin</strong></a> for additional security settings",
// "General Security" => "General Security",
// "Please also see" => "Please also see",
// "HTTPS (SSL) and other login preferences" => "HTTPS (SSL) and other login preferences",
// "CSRF Security" => "CSRF Security",
// "Use these options to protect against cross-site request forgeries (CSRF)" => "Use these options to protect against cross-site request forgeries (CSRF)",
// "Spam protection" => "Spam protection",
......@@ -10759,7 +10768,7 @@ $lang=Array(
// "a bookmark" => "a bookmark",
// "User Contacts Preferences" => "User Contacts Preferences",
// "Manage Fields" => "Manage Fields",
// "{if \$prefs.display_html_in_menus eq 'y'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}" => "{if \$prefs.display_html_in_menus eq 'y'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}",
// "{if \$prefs.menus_item_names_raw eq 'n'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}" => "{if \$prefs.menus_item_names_raw eq 'n'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}",
// "Basic Data" => "Basic Data",
// "User Icon" => "User Icon",
// "(non public)" => "(non public)",
......@@ -11418,6 +11427,11 @@ $lang=Array(
// "Pending moderation" => "Pending moderation",
// "Blocked" => "Blocked",
// "Invalid action" => "Invalid action",
// "Are you sure you want to remove the %0 selected pages" => "Are you sure you want to remove the %0 selected pages",
// "Are you sure you want to print the %0 selected pages" => "Are you sure you want to print the %0 selected pages",
// "Are you sure you want to unlock the %0 selected pages" => "Are you sure you want to unlock the %0 selected pages",
// "Are you sure you want to lock the %0 selected pages" => "Are you sure you want to lock the %0 selected pages",
// "Are you sure you want to download a zip of the %0 selected pages" => "Are you sure you want to download a zip of the %0 selected pages",
// "Username field cannot be empty. Please go back and try again" => "Username field cannot be empty. Please go back and try again",
// "Unable to contact remote server" => "Unable to contact remote server",
// "XMLRPC Error: " => "XMLRPC Error: ",
......@@ -1470,8 +1470,6 @@ $lang=Array(
// "6" => "6",
// "Method to Open Directory Links" => "Method to Open Directory Links",
// "Fields display order" => "Fields display order",
// "Escape HTML in menu options" => "Escape HTML in menu options",
// "Use to \"escape\" or render HTML in menu options. If disabled, HTML will be allowed in menu options. Your code must be valid. If enabled, HTML code will be \"escaped\" and shown literally (as code) instead" => "Use to \"escape\" or render HTML in menu options. If disabled, HTML will be allowed in menu options. Your code must be valid. If enabled, HTML code will be \"escaped\" and shown literally (as code) instead",
// "Re-validate user by email after" => "Re-validate user by email after",
// "Use \"-1\" for never" => "Use \"-1\" for never",
// "PHP errors visible to admin only" => "PHP errors visible to admin only",
......@@ -2157,6 +2155,8 @@ $lang=Array(
// "Menu icons" => "Menu icons",
// "Allows to define icons for menu entries" => "Allows to define icons for menu entries",
// "Default path for the icons" => "Default path for the icons",
// "Allow HTML in link text and do not escape the url in menu items (Please note: this might be insecure if you allow more people to edit menus)" => "Allow HTML in link text and do not escape the url in menu items (Please note: this might be insecure if you allow more people to edit menus)",
// "If enabled, menu item names treated as HTML item content and they are not escaped (do not replace HTML special characters), this allows the use of HTML in menu items to insert images for example, and menu item urls are not escaped which allows the use of permissable href tags. Code must be valid. This allows menu item editors to put arbitrary HTML; only enable if you know what you are doing" => "If enabled, menu item names treated as HTML item content and they are not escaped (do not replace HTML special characters), this allows the use of HTML in menu items to insert images for example, and menu item urls are not escaped which allows the use of permissable href tags. Code must be valid. This allows menu item editors to put arbitrary HTML; only enable if you know what you are doing",
// "Keywords" => "Keywords",
// "Include freetags" => "Include freetags",
// "Use thread title instead" => "Use thread title instead",
......@@ -2781,6 +2781,7 @@ $lang=Array(
// "No object information provided" => "No object information provided",
// "No rules to display object %1 of type %0" => "No rules to display object %1 of type %0",
// "Relation not found" => "Relation not found",
// "Currency in payment (%0) does not match the currency for that registry (%1)" => "Currency in payment (%0) does not match the currency for that registry (%1)",
// "This invoice does not exist or is in limited access" => "This invoice does not exist or is in limited access",
// "PHPLayersMenus are not enabled on this site" => "PHPLayersMenus are not enabled on this site",
// "Preference name not specified" => "Preference name not specified",
......@@ -4813,6 +4814,7 @@ $lang=Array(
// "Trade" => "Trade",
// "PluginTrade" => "PluginTrade",
// "Send or receive payments from one member to another. (for cclite only so far, experimental)" => "Send or receive payments from one member to another. (for cclite only so far, experimental)",
// "Currency depends on the selected registry" => "Currency depends on the selected registry",
// "Registry to trade in. Default: site preference (or first in list when more than one)" => "Registry to trade in. Default: site preference (or first in list when more than one)",
// "Currency to trade in. Default: Cclite currency preference for registry set above" => "Currency to trade in. Default: Cclite currency preference for registry set above",
// "Other User" => "Other User",
......@@ -5799,6 +5801,8 @@ $lang=Array(
// "case patched" => "case patched",
// "error reporting adminonly" => "error reporting adminonly",
// "error reporting level" => "error reporting level",
// "feature custom doctype content" => "feature custom doctype content",
// "feature fixed width" => "feature fixed width",
// "feature jquery media" => "feature jquery media",
// "feature jquery ui theme" => "feature jquery ui theme",
// "feature sheet" => "feature sheet",
......@@ -5848,6 +5852,7 @@ $lang=Array(
// "fgal show slideshow" => "fgal show slideshow",
// "fgal show thumbactions" => "fgal show thumbactions",
// "fgal sort mode" => "fgal sort mode",
// "fgal use db" => "fgal use db",
// "fgal use dir" => "fgal use dir",
// "gal use lib" => "gal use lib",
// "https login" => "https login",
......@@ -5856,6 +5861,7 @@ $lang=Array(
// "lastUpdatePrefs" => "lastUpdatePrefs",
// "log tpl" => "log tpl",
// "sender email" => "sender email",
// "sitemycode" => "sitemycode",
// "smarty notice reporting" => "smarty notice reporting",
// "tiki needs upgrade" => "tiki needs upgrade",
// "tiki release" => "tiki release",
......@@ -6034,6 +6040,7 @@ $lang=Array(
// "User Account Activated" => "User Account Activated",
// "{\$mail_user} <{\$mail_email}> has requested a new password on {\$mail_site}, but you need to validate his account first" => "{\$mail_user} <{\$mail_email}> has requested a new password on {\$mail_site}, but you need to validate his account first",
// "Assign to a group" => "Assign to a group",
// "View user's data" => "View user's data",
// "Best regards" => "Best regards",
// "User Tracker" => "User Tracker",
// "Go to your friendship network to accept or refuse this request" => "Go to your friendship network to accept or refuse this request",
......@@ -6824,6 +6831,8 @@ $lang=Array(
// "Please see the <a class='rbox-link' target='tikihelp' href='http://dev.tiki.org/Security'>Security page</a> on Tiki's developer site" => "Please see the <a class='rbox-link' target='tikihelp' href='http://dev.tiki.org/Security'>Security page</a> on Tiki's developer site",
// "See <a href=\"tiki-admin_security.php\" title=\"Security\"><strong>Admin &gt; Security Admin</strong></a> for additional security settings" => "See <a href=\"tiki-admin_security.php\" title=\"Security\"><strong>Admin &gt; Security Admin</strong></a> for additional security settings",
// "General Security" => "General Security",
// "Please also see" => "Please also see",
// "HTTPS (SSL) and other login preferences" => "HTTPS (SSL) and other login preferences",
// "CSRF Security" => "CSRF Security",
// "Use these options to protect against cross-site request forgeries (CSRF)" => "Use these options to protect against cross-site request forgeries (CSRF)",
// "Spam protection" => "Spam protection",
......@@ -8450,7 +8459,7 @@ $lang=Array(
// "a bookmark" => "a bookmark",
// "User Contacts Preferences" => "User Contacts Preferences",
// "Manage Fields" => "Manage Fields",
// "{if \$prefs.display_html_in_menus eq 'y'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}" => "{if \$prefs.display_html_in_menus eq 'y'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}",
// "{if \$prefs.menus_item_names_raw eq 'n'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}" => "{if \$prefs.menus_item_names_raw eq 'n'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}",
// "User Icon" => "User Icon",
// "This user is your friend " => "This user is your friend ",
// "The user requested friendship with you" => "The user requested friendship with you",
......@@ -8970,6 +8979,11 @@ $lang=Array(
// "Pending moderation" => "Pending moderation",
// "Blocked" => "Blocked",
// "Invalid action" => "Invalid action",
// "Are you sure you want to remove the %0 selected pages" => "Are you sure you want to remove the %0 selected pages",
// "Are you sure you want to print the %0 selected pages" => "Are you sure you want to print the %0 selected pages",
// "Are you sure you want to unlock the %0 selected pages" => "Are you sure you want to unlock the %0 selected pages",
// "Are you sure you want to lock the %0 selected pages" => "Are you sure you want to lock the %0 selected pages",
// "Are you sure you want to download a zip of the %0 selected pages" => "Are you sure you want to download a zip of the %0 selected pages",
// "Username field cannot be empty. Please go back and try again" => "Username field cannot be empty. Please go back and try again",
// "Unable to contact remote server" => "Unable to contact remote server",
// "XMLRPC Error: " => "XMLRPC Error: ",
......
......@@ -1208,8 +1208,6 @@ $lang=Array(
// "new window" => "new window",
// "inline frame" => "inline frame",
// "Fields display order" => "Fields display order",
// "Escape HTML in menu options" => "Escape HTML in menu options",
// "Use to \"escape\" or render HTML in menu options. If disabled, HTML will be allowed in menu options. Your code must be valid. If enabled, HTML code will be \"escaped\" and shown literally (as code) instead" => "Use to \"escape\" or render HTML in menu options. If disabled, HTML will be allowed in menu options. Your code must be valid. If enabled, HTML code will be \"escaped\" and shown literally (as code) instead",
// "Re-validate user by email after" => "Re-validate user by email after",
// "days" => "days",
// "Use \"-1\" for never" => "Use \"-1\" for never",
......@@ -2017,6 +2015,8 @@ $lang=Array(
// "Menu icons" => "Menu icons",
// "Allows to define icons for menu entries" => "Allows to define icons for menu entries",
// "Default path for the icons" => "Default path for the icons",
// "Allow HTML in link text and do not escape the url in menu items (Please note: this might be insecure if you allow more people to edit menus)" => "Allow HTML in link text and do not escape the url in menu items (Please note: this might be insecure if you allow more people to edit menus)",
// "If enabled, menu item names treated as HTML item content and they are not escaped (do not replace HTML special characters), this allows the use of HTML in menu items to insert images for example, and menu item urls are not escaped which allows the use of permissable href tags. Code must be valid. This allows menu item editors to put arbitrary HTML; only enable if you know what you are doing" => "If enabled, menu item names treated as HTML item content and they are not escaped (do not replace HTML special characters), this allows the use of HTML in menu items to insert images for example, and menu item urls are not escaped which allows the use of permissable href tags. Code must be valid. This allows menu item editors to put arbitrary HTML; only enable if you know what you are doing",
// "Maximum mailbox size (messages, 0=unlimited)" => "Maximum mailbox size (messages, 0=unlimited)",
// "Maximum mail archive size (messages, 0=unlimited)" => "Maximum mail archive size (messages, 0=unlimited)",
// "Maximum sent box size (messages, 0=unlimited)" => "Maximum sent box size (messages, 0=unlimited)",
......@@ -2785,6 +2785,7 @@ $lang=Array(
// "No object information provided" => "No object information provided",
// "No rules to display object %1 of type %0" => "No rules to display object %1 of type %0",
// "Relation not found" => "Relation not found",
// "Currency in payment (%0) does not match the currency for that registry (%1)" => "Currency in payment (%0) does not match the currency for that registry (%1)",
// "This invoice does not exist or is in limited access" => "This invoice does not exist or is in limited access",
// "PHPLayersMenus are not enabled on this site" => "PHPLayersMenus are not enabled on this site",
// "Preference name not specified" => "Preference name not specified",
......@@ -5011,6 +5012,7 @@ $lang=Array(
// "Trade" => "Trade",
// "PluginTrade" => "PluginTrade",
// "Send or receive payments from one member to another. (for cclite only so far, experimental)" => "Send or receive payments from one member to another. (for cclite only so far, experimental)",
// "Currency depends on the selected registry" => "Currency depends on the selected registry",
// "Registry to trade in. Default: site preference (or first in list when more than one)" => "Registry to trade in. Default: site preference (or first in list when more than one)",
// "Currency to trade in. Default: Cclite currency preference for registry set above" => "Currency to trade in. Default: Cclite currency preference for registry set above",
// "Other User" => "Other User",
......@@ -6081,6 +6083,8 @@ $lang=Array(
// "case patched" => "case patched",
// "error reporting adminonly" => "error reporting adminonly",
// "error reporting level" => "error reporting level",
// "feature custom doctype content" => "feature custom doctype content",
// "feature fixed width" => "feature fixed width",
// "feature jquery media" => "feature jquery media",
// "feature jquery ui theme" => "feature jquery ui theme",
// "feature sheet" => "feature sheet",
......@@ -6130,6 +6134,7 @@ $lang=Array(
// "fgal show slideshow" => "fgal show slideshow",
// "fgal show thumbactions" => "fgal show thumbactions",
// "fgal sort mode" => "fgal sort mode",
// "fgal use db" => "fgal use db",
// "fgal use dir" => "fgal use dir",
// "gal use lib" => "gal use lib",
// "https login" => "https login",
......@@ -6137,6 +6142,7 @@ $lang=Array(
// "lastUpdatePrefs" => "lastUpdatePrefs",
// "log tpl" => "log tpl",
// "sender email" => "sender email",
// "sitemycode" => "sitemycode",
// "smarty notice reporting" => "smarty notice reporting",
// "tiki needs upgrade" => "tiki needs upgrade",
// "tiki release" => "tiki release",
......@@ -6425,6 +6431,7 @@ $lang=Array(
// "has requested an account on" => "has requested an account on",
// "To validate that account, please follow the link" => "To validate that account, please follow the link",
// "Assign to a group" => "Assign to a group",
// "View user's data" => "View user's data",
// "Best regards" => "Best regards",
// "User Tracker" => "User Tracker",
// "User Registration Request" => "User Registration Request",
......@@ -7565,6 +7572,8 @@ $lang=Array(
// "Please see the <a class='rbox-link' target='tikihelp' href='http://dev.tiki.org/Security'>Security page</a> on Tiki's developer site" => "Please see the <a class='rbox-link' target='tikihelp' href='http://dev.tiki.org/Security'>Security page</a> on Tiki's developer site",
// "See <a href=\"tiki-admin_security.php\" title=\"Security\"><strong>Admin &gt; Security Admin</strong></a> for additional security settings" => "See <a href=\"tiki-admin_security.php\" title=\"Security\"><strong>Admin &gt; Security Admin</strong></a> for additional security settings",
// "General Security" => "General Security",
// "Please also see" => "Please also see",
// "HTTPS (SSL) and other login preferences" => "HTTPS (SSL) and other login preferences",
// "CSRF Security" => "CSRF Security",
// "Spam protection" => "Spam protection",
// "Captcha" => "Captcha",
......@@ -10261,7 +10270,7 @@ $lang=Array(
// "a bookmark" => "a bookmark",
// "User Contacts Preferences" => "User Contacts Preferences",
// "Manage Fields" => "Manage Fields",
// "{if \$prefs.display_html_in_menus eq 'y'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}" => "{if \$prefs.display_html_in_menus eq 'y'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}",
// "{if \$prefs.menus_item_names_raw eq 'n'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}" => "{if \$prefs.menus_item_names_raw eq 'n'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}",
// "Send me a message" => "Send me a message",
// "Basic Data" => "Basic Data",
// "Assign Group" => "Assign Group",
......@@ -11083,6 +11092,11 @@ $lang=Array(
// "Pending moderation" => "Pending moderation",
// "Blocked" => "Blocked",
// "Invalid action" => "Invalid action",
// "Are you sure you want to remove the %0 selected pages" => "Are you sure you want to remove the %0 selected pages",
// "Are you sure you want to print the %0 selected pages" => "Are you sure you want to print the %0 selected pages",
// "Are you sure you want to unlock the %0 selected pages" => "Are you sure you want to unlock the %0 selected pages",
// "Are you sure you want to lock the %0 selected pages" => "Are you sure you want to lock the %0 selected pages",
// "Are you sure you want to download a zip of the %0 selected pages" => "Are you sure you want to download a zip of the %0 selected pages",
// "You have to enable cookies to be able to login to this site" => "You have to enable cookies to be able to login to this site",
// "Username field cannot be empty. Please go back and try again" => "Username field cannot be empty. Please go back and try again",
// "Unable to contact remote server" => "Unable to contact remote server",
......
......@@ -2234,8 +2234,6 @@ $lang=Array(
// "6" => "6",
// "Method to Open Directory Links" => "Method to Open Directory Links",
// "Fields display order" => "Fields display order",
// "Escape HTML in menu options" => "Escape HTML in menu options",
// "Use to \"escape\" or render HTML in menu options. If disabled, HTML will be allowed in menu options. Your code must be valid. If enabled, HTML code will be \"escaped\" and shown literally (as code) instead" => "Use to \"escape\" or render HTML in menu options. If disabled, HTML will be allowed in menu options. Your code must be valid. If enabled, HTML code will be \"escaped\" and shown literally (as code) instead",
// "Re-validate user by email after" => "Re-validate user by email after",
// "Use \"-1\" for never" => "Use \"-1\" for never",
// "PHP errors visible to admin only" => "PHP errors visible to admin only",
......@@ -2977,6 +2975,8 @@ $lang=Array(
// "Menu icons" => "Menu icons",
// "Allows to define icons for menu entries" => "Allows to define icons for menu entries",
// "Default path for the icons" => "Default path for the icons",
// "Allow HTML in link text and do not escape the url in menu items (Please note: this might be insecure if you allow more people to edit menus)" => "Allow HTML in link text and do not escape the url in menu items (Please note: this might be insecure if you allow more people to edit menus)",
// "If enabled, menu item names treated as HTML item content and they are not escaped (do not replace HTML special characters), this allows the use of HTML in menu items to insert images for example, and menu item urls are not escaped which allows the use of permissable href tags. Code must be valid. This allows menu item editors to put arbitrary HTML; only enable if you know what you are doing" => "If enabled, menu item names treated as HTML item content and they are not escaped (do not replace HTML special characters), this allows the use of HTML in menu items to insert images for example, and menu item urls are not escaped which allows the use of permissable href tags. Code must be valid. This allows menu item editors to put arbitrary HTML; only enable if you know what you are doing",
// "Maximum mailbox size (messages, 0=unlimited)" => "Maximum mailbox size (messages, 0=unlimited)",
// "Maximum mail archive size (messages, 0=unlimited)" => "Maximum mail archive size (messages, 0=unlimited)",
// "Maximum sent box size (messages, 0=unlimited)" => "Maximum sent box size (messages, 0=unlimited)",
......@@ -3688,6 +3688,7 @@ $lang=Array(
// "No object information provided" => "No object information provided",
// "No rules to display object %1 of type %0" => "No rules to display object %1 of type %0",
// "Relation not found" => "Relation not found",
// "Currency in payment (%0) does not match the currency for that registry (%1)" => "Currency in payment (%0) does not match the currency for that registry (%1)",
// "This invoice does not exist or is in limited access" => "This invoice does not exist or is in limited access",
// "PHPLayersMenus are not enabled on this site" => "PHPLayersMenus are not enabled on this site",
// "Preference name not specified" => "Preference name not specified",
......@@ -5829,6 +5830,7 @@ $lang=Array(
// "Trade" => "Trade",
// "PluginTrade" => "PluginTrade",
// "Send or receive payments from one member to another. (for cclite only so far, experimental)" => "Send or receive payments from one member to another. (for cclite only so far, experimental)",
// "Currency depends on the selected registry" => "Currency depends on the selected registry",
// "Registry to trade in. Default: site preference (or first in list when more than one)" => "Registry to trade in. Default: site preference (or first in list when more than one)",
// "Currency to trade in. Default: Cclite currency preference for registry set above" => "Currency to trade in. Default: Cclite currency preference for registry set above",
// "Other User" => "Other User",
......@@ -6855,6 +6857,8 @@ $lang=Array(
// "case patched" => "case patched",
// "error reporting adminonly" => "error reporting adminonly",
// "error reporting level" => "error reporting level",
// "feature custom doctype content" => "feature custom doctype content",
// "feature fixed width" => "feature fixed width",
// "feature jquery media" => "feature jquery media",
// "feature jquery ui theme" => "feature jquery ui theme",
// "feature sheet" => "feature sheet",
......@@ -6904,6 +6908,7 @@ $lang=Array(
// "fgal show slideshow" => "fgal show slideshow",
// "fgal show thumbactions" => "fgal show thumbactions",
// "fgal sort mode" => "fgal sort mode",
// "fgal use db" => "fgal use db",
// "fgal use dir" => "fgal use dir",
// "gal use lib" => "gal use lib",
// "https login" => "https login",
......@@ -6912,6 +6917,7 @@ $lang=Array(
// "lastUpdatePrefs" => "lastUpdatePrefs",
// "log tpl" => "log tpl",
// "sender email" => "sender email",
// "sitemycode" => "sitemycode",
// "smarty notice reporting" => "smarty notice reporting",
// "tiki needs upgrade" => "tiki needs upgrade",
// "tiki release" => "tiki release",
......@@ -7142,6 +7148,7 @@ $lang=Array(
// "has requested an account on" => "has requested an account on",
// "To validate that account, please follow the link" => "To validate that account, please follow the link",
// "Assign to a group" => "Assign to a group",
// "View user's data" => "View user's data",
// "Best regards" => "Best regards",
// "User Tracker" => "User Tracker",
// "User Registration Request" => "User Registration Request",
......@@ -8119,6 +8126,8 @@ $lang=Array(
// "Please see the <a class='rbox-link' target='tikihelp' href='http://dev.tiki.org/Security'>Security page</a> on Tiki's developer site" => "Please see the <a class='rbox-link' target='tikihelp' href='http://dev.tiki.org/Security'>Security page</a> on Tiki's developer site",
// "See <a href=\"tiki-admin_security.php\" title=\"Security\"><strong>Admin &gt; Security Admin</strong></a> for additional security settings" => "See <a href=\"tiki-admin_security.php\" title=\"Security\"><strong>Admin &gt; Security Admin</strong></a> for additional security settings",
// "General Security" => "General Security",
// "Please also see" => "Please also see",
// "HTTPS (SSL) and other login preferences" => "HTTPS (SSL) and other login preferences",
// "CSRF Security" => "CSRF Security",
// "Use these options to protect against cross-site request forgeries (CSRF)" => "Use these options to protect against cross-site request forgeries (CSRF)",
// "Spam protection" => "Spam protection",
......@@ -10237,7 +10246,7 @@ $lang=Array(
// "a bookmark" => "a bookmark",
// "User Contacts Preferences" => "User Contacts Preferences",
// "Manage Fields" => "Manage Fields",
// "{if \$prefs.display_html_in_menus eq 'y'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}" => "{if \$prefs.display_html_in_menus eq 'y'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}",
// "{if \$prefs.menus_item_names_raw eq 'n'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}" => "{if \$prefs.menus_item_names_raw eq 'n'}{\$chdata.name|escape}{else}{\$chdata.name}{/if}",
// "Basic Data" => "Basic Data",
// "Assign Group" => "Assign Group",
// "User Icon" => "User Icon",
......@@ -10919,6 +10928,11 @@ $lang=Array(
// "Pending moderation" => "Pending moderation",
// "Blocked" => "Blocked",
// "Invalid action" => "Invalid action",
// "Are you sure you want to remove the %0 selected pages" => "Are you sure you want to remove the %0 selected pages",
// "Are you sure you want to print the %0 selected pages" => "Are you sure you want to print the %0 selected pages",
// "Are you sure you want to unlock the %0 selected pages" => "Are you sure you want to unlock the %0 selected pages",