Commit 2e9d789c authored by chibaguy's avatar chibaguy

[FIX] Language strings improved as on dev.tw.o/Pending text corrections .

parent d179af54
......@@ -29,7 +29,7 @@ if ($prefs['feature_articles'] != 'y') {
// Now check permissions to access this page
if(($tiki_p_read_article != 'y') && ($tiki_p_articles_read_heading != 'y')) {
$smarty->assign('errortype', 401);
$smarty->assign('msg',tra("Permission denied you cannot view pages"));
$smarty->assign('msg',tra("Permission denied. You cannot view pages"));
$smarty->display("error.tpl");
die;
}
......
......@@ -261,7 +261,7 @@ if (($tiki_p_vote_comments == 'y' && (!isset($forum_mode) || $forum_mode == 'n')
if (isset($_REQUEST["comments_vote"]) && isset($_REQUEST["comments_threadId"])) {
if (!$user && !isset($_COOKIE['PHPSESSID'])) {
$smarty->assign_by_ref('msg',tra('Cookies must be allowed to vote'));
$smarty->assign_by_ref('msg',tra('For you to vote, cookies must be allowed'));
$smarty->display("error.tpl");
die;
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -255,19 +255,19 @@ $lang=Array(
// "Missing url parameter for SNARF plugin." => "Missing url parameter for SNARF plugin.",
// "Displays a list of registered users" => "Displays a list of registered users",
// "Displays browser client info" => "Displays browser client info",
// "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor",
// "Creates a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which specifies the location and name of the anchor" => "Creates a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which specifies the location and name of the anchor",
// "linktext" => "linktext",
// "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor",
// "Creates an anchor in a wiki page. Use in conjunction with the ALINK plugin, which specifies a link to the anchor" => "Creates an anchor in a wiki page. Use in conjunction with the ALINK plugin, which specifies a link to the anchor",
// "~np~{~/np~ARTICLES(max=>3,topic=>topicName,type=>type,categId=>Category parent ID,sort=>columnName_asc|columnName_desc)}{ARTICLES} Insert articles into a wikipage" => "~np~{~/np~ARTICLES(max=>3,topic=>topicName,type=>type,categId=>Category parent ID,sort=>columnName_asc|columnName_desc)}{ARTICLES} Insert articles into a wikipage",
// "no such attachment on this page" => "no such attachment on this page",
// "Displays an attachment or a list of them" => "Displays an attachment or a list of them",
// "\r\n \t\tname => Gives the name of the attached file to link to.\r\n \t\tfile => Same as name.\r\n \t\tpage => Gives the name of another page the attached file is on. The file on that page is linked to instead. Only works with wiki pages.\r\n \t\tshowdesc => shows the description as the link text instead of the file name\r\n\t\tbullets => Makes the list of attachments a bulleted list\r\n \t\timage => Says that this file is an image, and should be displayed inline using the img tag.\r\n \t\tinline => puts the stuff between {ATTACH} tags as the link text instead of the file name or description.\r\n \t\tall => Shows all attachments from the whole wiki.\r\n \t\tnum => Gives the number, in the list of attachments, of the attachment to link to\r\n \t\tid => Gives the actual id of the attachment to link in. You probably should never use this.\r\n \t\tdls => Puts the number of downloads in the alt comment\r\n \t\ticon => shows a file icon\r\n " => "\r\n \t\tname => Gives the name of the attached file to link to.\r\n \t\tfile => Same as name.\r\n \t\tpage => Gives the name of another page the attached file is on. The file on that page is linked to instead. Only works with wiki pages.\r\n \t\tshowdesc => shows the description as the link text instead of the file name\r\n\t\tbullets => Makes the list of attachments a bulleted list\r\n \t\timage => Says that this file is an image, and should be displayed inline using the img tag.\r\n \t\tinline => puts the stuff between {ATTACH} tags as the link text instead of the file name or description.\r\n \t\tall => Shows all attachments from the whole wiki.\r\n \t\tnum => Gives the number, in the list of attachments, of the attachment to link to\r\n \t\tid => Gives the actual id of the attachment to link in. You probably should never use this.\r\n \t\tdls => Puts the number of downloads in the alt comment\r\n \t\ticon => shows a file icon\r\n ",
// "List all pages which link to specific pages" => "List all pages which link to specific pages",
// "List all pages that link to specific pages" => "List all pages that link to specific pages",
// "Chart as PDF" => "Chart as PDF",
// "Chart as PostScript" => "Chart as PostScript",
// "note: colors and ln are exclusive" => "note: colors and ln are exclusive",
// "Insert a division block on wiki page" => "Insert a division block on wiki page",
// "Displays a SWF on the wiki page" => "Displays a SWF on the wiki page",
// "Displays a Flash (.swf) file in the wiki page" => "Displays a Flash (.swf) file in the wiki page",
// "Formula" => "Formula",
// "No formula specified." => "No formula specified.",
// "Impossible to render the graphic." => "Impossible to render the graphic.",
......@@ -278,7 +278,7 @@ $lang=Array(
// "Displays a map" => "Displays a map",
// "Displays an miniquiz" => "Displays an miniquiz",
// "Displays object hit info by object and days" => "Displays object hit info by object and days",
// "Provides a list of plugins on this wiki." => "Provides a list of plugins on this wiki.",
// "Displays a list of plugins available in this wiki." => "Displays a list of plugins available in this wiki.",
// "Displays the output of a poll, fields are indicated with numeric ids." => "Displays the output of a poll, fields are indicated with numeric ids.",
// "missing poll ID for plugin POLL" => "missing poll ID for plugin POLL",
// " wrote:" => " wrote:",
......@@ -289,10 +289,10 @@ $lang=Array(
// "Edit Sheet" => "Edit Sheet",
// "Clickable Skype link" => "Clickable Skype link",
// "Displays text in subscript." => "Displays text in subscript.",
// "Displays text between an html tag" => "Displays text between an html tag",
// "Displays text between HTML tags" => "Displays text between HTML tags",
// "Displays the thumbnail for an image" => "Displays the thumbnail for an image",
// "Search the titles of all pages in this wiki" => "Search the titles of all pages in this wiki",
// "List top scoring users" => "List top scoring users",
// "List top-scoring users" => "List top-scoring users",
// "Following mandatory fields are missing" => "Following mandatory fields are missing",
// "Following fields are incorrect" => "Following fields are incorrect",
// "Displays an input form for tracker submit" => "Displays an input form for tracker submit",
......@@ -568,8 +568,8 @@ $lang=Array(
// "based on work by" => "based on work by",
// "Created by:" => "Created by:",
// "last modification:" => "last modification:",
// "Show/Hide Left Menus" => "Show/Hide Left Menus",
// "Show/Hide Right Menus" => "Show/Hide Right Menus",
// "Show/Hide Left Column" => "Show/Hide Left Column",
// "Show/Hide Right Column" => "Show/Hide Right Column",
// "logout" => "logout",
// "Anti-Bot verification code" => "Anti-Bot verification code",
// "Enter the code you see above" => "Enter the code you see above",
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -118,7 +118,7 @@ class Comments extends TikiLib {
return 0;
}
if ($size > $forum_info['att_max_size'] && ! $inbound_mail ) {
$errors[] = tra('Cannot upload this file maximum upload size exceeded');
$errors[] = tra('Cannot upload this file - maximum upload size exceeded');
return 0;
}
$fhash = '';
......@@ -2467,7 +2467,7 @@ class Comments extends TikiLib {
$errors[] = tra('You have mistyped the anti-bot verification code; please try again.');
}
if ($forum_info['controlFlood'] == 'y' && !$this->user_can_post_to_forum($user, $forumId) ) {
$errors = sprintf(tra('Please wait %d secondes between posts'). $forum_info['floodInterval']);
$errors = sprintf(tra('Please wait %d seconds between posts'). $forum_info['floodInterval']);
}
if ($tiki_p_admin_forum != 'y' && $forum_info['forum_use_password'] != 'n' && $params['password'] != $forum_info['forum_password']) {
$errors[] = tra('Wrong password. Cannot post comment');
......@@ -2529,7 +2529,7 @@ class Comments extends TikiLib {
if (($tiki_p_forum_autoapp != 'y')
&& ($forum_info['approval_type'] == 'queue_all' || (!$user && $forum_info['approval_type'] == 'queue_anon'))) {
$threadId = 0;
$feedbacks[] = tra('Your message has been queued for approval, the message will be posted after a moderator approves it.');
$feedbacks[] = tra('Your message has been queued for approval and will be posted after a moderator approves it.');
$qId = $this->replace_queue(0, $forum_info['forumId'], $comments_objectId, $parent_id,
$user, $params['comments_title'], $params['comments_data'], $params['comment_topictype'],
$params['comment_topicsmiley'], $params['comment_topicsummary'], $params['comments_title'], $in_reply_to, $params['anonymous_name'], $params['freetag_string'], $params['anonymous_email']);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -10,7 +10,6 @@ function wikiplugin_mediaplayer_info() {
'description' => 'Simple mp3 or flv Player',
'extraparams' =>true,
'prefs' => array( 'wikiplugin_mediaplayer' ),
'icon' => 'pics/icons/television.png',
'params' => array(
'mp3' => array(
'required' => false,
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment