Merge pull request #384 from tvb/work21

Work21
esotalk · Nov 14, 2014 · a35a89d · a35a89d
2 parents ccc62d8 + 50dc4aa
commit a35a89d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/addons/languages/English/definitions.php b/addons/languages/English/definitions.php
@@ -20,6 +20,7 @@
 
 $definitions["%d day ago"] = "yesterday";
 $definitions["%d days ago"] = "%d days ago";
+$definitions["%d hidden"]  = "%d hidden";
 $definitions["%d hour ago"] = "1 hour ago";
 $definitions["%d hours ago"] = "%d hours ago";
 $definitions["%d minute ago"] = "1 minute ago";
@@ -201,6 +202,7 @@
 $definitions["Header"] = "Header";
 $definitions["Header color"] = "Header color";
 $definitions["Heads Up!"] = "Heads Up!";
+$definitions["hidden"] = "hidden";
 $definitions["Hide"] = "Hide";
 $definitions["Home page"] = "Home page";
 $definitions["HTML is allowed."] = "HTML is allowed.";
@@ -287,6 +289,7 @@
 $definitions["Now"] = "Now";
 
 $definitions["OK"] = "OK";
+$definitions["Older"] = "Older";
 $definitions["Online"] = "Online";
 $definitions["online"] = "online";
 $definitions["Only allow members of this group to see who else is in it"] = "Only allow members of this group to see who else is in it";
@@ -400,6 +403,7 @@
 $definitions["View your profile"] = "View your profile";
 $definitions["View"] = "View";
 $definitions["Viewing: %s"] = "Viewing: %s";
+$definitions["Viewing %s"] = "Viewing %s";
 $definitions["viewingPosts"] = "<b>%s-%s</b> of %s posts";
 
 $definitions["Warning"] = "Warning";

diff --git a/addons/skins/Default/views/mobile.master.php b/addons/skins/Default/views/mobile.master.php
@@ -54,7 +54,7 @@
 <?php endif; ?>
 
 <ul id='userMenu' class='menu'>
-<li><a href='<?php echo URL("conversation/start"); ?>' class='link-newConversation'><?php echo T("New conversation"); ?></a></li>
+<li><a href='<?php echo URL("conversation/start"); ?>' class='link-newConversation'><?php echo T("New Conversation"); ?></a></li>
 <li class='sep'></li>
 <?php echo $data["userMenuItems"]; ?>
 </ul>