diff options
| -rw-r--r-- | include/auth.php | 31 | ||||
| -rw-r--r-- | util/messages.po | 1550 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 822 insertions, 761 deletions
diff --git a/include/auth.php b/include/auth.php index 8e02b7b4f..a8a1a5f5c 100644 --- a/include/auth.php +++ b/include/auth.php @@ -130,11 +130,34 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p if($_SESSION['addr'] != $_SERVER['REMOTE_ADDR']) { logger('SECURITY: Session IP address changed: ' . $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']); - if(get_config('system','paranoia')) { - logger('Session address changed. Paranoid setting in effect, blocking session. ' + + $partial1 = substr($_SESSION['addr'],0,strrpos($_SESSION['addr'],'.')); + $partial2 = substr($_SERVER['REMOTE_ADDR'],0,strrpos($_SERVER['REMOTE_ADDR'],'.')); + + $paranoia = intval(get_config('system','paranoia')); + switch($paranoia) { + case 0: + // no IP checking + break; + case 2: + // check 2 octets + $partial1 = substr($partial1,0,strrpos($partial1,'.')); + $partial2 = substr($partial2,0,strrpos($partial2,'.')); + if($partial1 == $partial2) + break; + case 1: + // check 3 octets + if($partial1 == $partial2) + break; + case 3: + default: + // check any difference at all + logger('Session address changed. Paranoid setting in effect, blocking session. ' . $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']); - nuke_session(); - goaway(z_root()); + nuke_session(); + goaway(z_root()); + break; + } } diff --git a/util/messages.po b/util/messages.po index 013a2e788..877b2ca8d 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2014-07-11.733\n" +"Project-Id-Version: 2014-07-18.740\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-11 00:03-0700\n" +"POT-Creation-Date: 2014-07-18 00:03-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -29,11 +29,11 @@ msgstr "" msgid "Profile Photos" msgstr "" -#: ../../include/oembed.php:171 +#: ../../include/oembed.php:163 msgid "Embedded content" msgstr "" -#: ../../include/oembed.php:180 +#: ../../include/oembed.php:172 msgid "Embedding disabled" msgstr "" @@ -46,506 +46,349 @@ msgstr "" msgid "commented on %s's post" msgstr "" -#: ../../include/conversation.php:120 ../../include/text.php:1730 -#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 -#: ../../mod/tagger.php:45 ../../mod/like.php:254 -msgid "photo" -msgstr "" - -#: ../../include/conversation.php:123 ../../include/text.php:1733 -#: ../../mod/tagger.php:49 -msgid "event" -msgstr "" - -#: ../../include/conversation.php:126 ../../mod/like.php:72 -msgid "channel" -msgstr "" - -#: ../../include/conversation.php:148 ../../include/text.php:1736 -#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 -#: ../../mod/tagger.php:53 ../../mod/like.php:254 -msgid "status" -msgstr "" - -#: ../../include/conversation.php:150 ../../include/text.php:1738 -#: ../../mod/tagger.php:55 -msgid "comment" -msgstr "" - -#: ../../include/conversation.php:164 ../../mod/like.php:291 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "" - -#: ../../include/conversation.php:167 ../../mod/like.php:293 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "" - -#: ../../include/conversation.php:204 -#, php-format -msgid "%1$s is now connected with %2$s" -msgstr "" - -#: ../../include/conversation.php:239 -#, php-format -msgid "%1$s poked %2$s" -msgstr "" - -#: ../../include/conversation.php:243 ../../include/text.php:895 -msgid "poked" -msgstr "" - -#: ../../include/conversation.php:261 ../../mod/mood.php:63 -#, php-format -msgctxt "mood" -msgid "%1$s is %2$s" -msgstr "" - -#: ../../include/conversation.php:634 ../../include/ItemObject.php:114 -msgid "Select" -msgstr "" - -#: ../../include/conversation.php:635 ../../include/reddav.php:1290 -#: ../../include/apps.php:241 ../../include/ItemObject.php:108 -#: ../../mod/settings.php:578 ../../mod/connedit.php:398 -#: ../../mod/photos.php:1046 ../../mod/group.php:176 ../../mod/admin.php:758 -#: ../../mod/admin.php:888 ../../mod/thing.php:236 -msgid "Delete" -msgstr "" - -#: ../../include/conversation.php:642 ../../include/ItemObject.php:89 -#: ../../mod/photos.php:844 -msgid "Private Message" +#: ../../include/text.php:321 +msgid "prev" msgstr "" -#: ../../include/conversation.php:649 ../../include/ItemObject.php:182 -msgid "Message is verified" +#: ../../include/text.php:323 +msgid "first" msgstr "" -#: ../../include/conversation.php:669 -#, php-format -msgid "View %s's profile @ %s" +#: ../../include/text.php:352 +msgid "last" msgstr "" -#: ../../include/conversation.php:683 -msgid "Categories:" +#: ../../include/text.php:355 +msgid "next" msgstr "" -#: ../../include/conversation.php:684 -msgid "Filed under:" +#: ../../include/text.php:367 +msgid "older" msgstr "" -#: ../../include/conversation.php:693 ../../include/ItemObject.php:250 -#, php-format -msgid " from %s" +#: ../../include/text.php:369 +msgid "newer" msgstr "" -#: ../../include/conversation.php:696 ../../include/ItemObject.php:253 -#, php-format -msgid "last edited: %s" +#: ../../include/text.php:730 +msgid "No connections" msgstr "" -#: ../../include/conversation.php:697 ../../include/ItemObject.php:254 +#: ../../include/text.php:743 #, php-format -msgid "Expires: %s" -msgstr "" - -#: ../../include/conversation.php:712 -msgid "View in context" -msgstr "" - -#: ../../include/conversation.php:714 ../../include/conversation.php:1130 -#: ../../include/ItemObject.php:294 ../../mod/editblock.php:120 -#: ../../mod/editlayout.php:115 ../../mod/editpost.php:121 -#: ../../mod/editwebpage.php:152 ../../mod/photos.php:977 -#: ../../mod/mail.php:218 ../../mod/mail.php:333 -msgid "Please wait" -msgstr "" - -#: ../../include/conversation.php:841 -msgid "remove" -msgstr "" - -#: ../../include/conversation.php:845 -msgid "Loading..." -msgstr "" - -#: ../../include/conversation.php:846 -msgid "Delete Selected Items" -msgstr "" - -#: ../../include/conversation.php:937 -msgid "View Source" -msgstr "" - -#: ../../include/conversation.php:938 -msgid "Follow Thread" -msgstr "" +msgid "%d Connection" +msgid_plural "%d Connections" +msgstr[0] "" +msgstr[1] "" -#: ../../include/conversation.php:939 -msgid "View Status" +#: ../../include/text.php:756 +msgid "View Connections" msgstr "" -#: ../../include/conversation.php:940 ../../include/nav.php:81 -#: ../../mod/connedit.php:351 ../../mod/connedit.php:465 -msgid "View Profile" +#: ../../include/text.php:815 ../../include/text.php:829 +#: ../../include/nav.php:149 ../../include/apps.php:142 +#: ../../mod/search.php:29 +msgid "Search" msgstr "" -#: ../../include/conversation.php:941 -msgid "View Photos" +#: ../../include/text.php:817 ../../include/text.php:831 +#: ../../include/widgets.php:186 ../../mod/rbmark.php:28 +#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 +msgid "Save" msgstr "" -#: ../../include/conversation.php:942 -msgid "Matrix Activity" +#: ../../include/text.php:897 +msgid "poke" msgstr "" -#: ../../include/conversation.php:943 -msgid "Edit Contact" +#: ../../include/text.php:897 ../../include/conversation.php:243 +msgid "poked" msgstr "" -#: ../../include/conversation.php:944 -msgid "Send PM" +#: ../../include/text.php:898 +msgid "ping" msgstr "" -#: ../../include/conversation.php:945 ../../include/apps.php:140 -msgid "Poke" +#: ../../include/text.php:898 +msgid "pinged" msgstr "" -#: ../../include/conversation.php:1001 -#, php-format -msgid "%s likes this." +#: ../../include/text.php:899 +msgid "prod" msgstr "" -#: ../../include/conversation.php:1001 -#, php-format -msgid "%s doesn't like this." +#: ../../include/text.php:899 +msgid "prodded" msgstr "" -#: ../../include/conversation.php:1005 -#, php-format -msgid "<span %1$s>%2$d people</span> like this." -msgid_plural "<span %1$s>%2$d people</span> like this." -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1007 -#, php-format -msgid "<span %1$s>%2$d people</span> don't like this." -msgid_plural "<span %1$s>%2$d people</span> don't like this." -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1013 -msgid "and" +#: ../../include/text.php:900 +msgid "slap" msgstr "" -#: ../../include/conversation.php:1016 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1017 -#, php-format -msgid "%s like this." +#: ../../include/text.php:900 +msgid "slapped" msgstr "" -#: ../../include/conversation.php:1017 -#, php-format -msgid "%s don't like this." +#: ../../include/text.php:901 +msgid "finger" msgstr "" -#: ../../include/conversation.php:1074 -msgid "Visible to <strong>everybody</strong>" +#: ../../include/text.php:901 +msgid "fingered" msgstr "" -#: ../../include/conversation.php:1075 ../../mod/mail.php:167 -#: ../../mod/mail.php:266 -msgid "Please enter a link URL:" +#: ../../include/text.php:902 +msgid "rebuff" msgstr "" -#: ../../include/conversation.php:1076 -msgid "Please enter a video link/URL:" +#: ../../include/text.php:902 +msgid "rebuffed" msgstr "" -#: ../../include/conversation.php:1077 -msgid "Please enter an audio link/URL:" +#: ../../include/text.php:911 +msgid "happy" msgstr "" -#: ../../include/conversation.php:1078 -msgid "Tag term:" +#: ../../include/text.php:912 +msgid "sad" msgstr "" -#: ../../include/conversation.php:1079 ../../mod/filer.php:49 -msgid "Save to Folder:" +#: ../../include/text.php:913 +msgid "mellow" msgstr "" -#: ../../include/conversation.php:1080 -msgid "Where are you right now?" +#: ../../include/text.php:914 +msgid "tired" msgstr "" -#: ../../include/conversation.php:1081 ../../mod/editpost.php:52 -#: ../../mod/mail.php:168 ../../mod/mail.php:267 -msgid "Expires YYYY-MM-DD HH:MM" +#: ../../include/text.php:915 +msgid "perky" msgstr "" -#: ../../include/conversation.php:1091 ../../include/page_widgets.php:40 -#: ../../include/ItemObject.php:592 ../../mod/editblock.php:141 -#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 -#: ../../mod/editwebpage.php:174 ../../mod/photos.php:997 -#: ../../mod/webpages.php:124 -msgid "Preview" +#: ../../include/text.php:916 +msgid "angry" msgstr "" -#: ../../include/conversation.php:1105 ../../mod/photos.php:976 -#: ../../mod/layouts.php:113 -msgid "Share" +#: ../../include/text.php:917 +msgid "stupified" msgstr "" -#: ../../include/conversation.php:1107 ../../mod/editwebpage.php:139 -msgid "Page link title" +#: ../../include/text.php:918 +msgid "puzzled" msgstr "" -#: ../../include/conversation.php:1110 -msgid "Post as" +#: ../../include/text.php:919 +msgid "interested" msgstr "" -#: ../../include/conversation.php:1111 ../../mod/editblock.php:112 -#: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 -#: ../../mod/editwebpage.php:144 ../../mod/mail.php:215 ../../mod/mail.php:329 -msgid "Upload photo" +#: ../../include/text.php:920 +msgid "bitter" msgstr "" -#: ../../include/conversation.php:1112 -msgid "upload photo" +#: ../../include/text.php:921 +msgid "cheerful" msgstr "" -#: ../../include/conversation.php:1113 ../../mod/editblock.php:113 -#: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 -#: ../../mod/editwebpage.php:145 ../../mod/mail.php:216 ../../mod/mail.php:330 -msgid "Attach file" +#: ../../include/text.php:922 +msgid "alive" msgstr "" -#: ../../include/conversation.php:1114 -msgid "attach file" +#: ../../include/text.php:923 +msgid "annoyed" msgstr "" -#: ../../include/conversation.php:1115 ../../mod/editblock.php:114 -#: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 -#: ../../mod/editwebpage.php:146 ../../mod/mail.php:217 ../../mod/mail.php:331 -msgid "Insert web link" +#: ../../include/text.php:924 +msgid "anxious" msgstr "" -#: ../../include/conversation.php:1116 -msgid "web link" +#: ../../include/text.php:925 +msgid "cranky" msgstr "" -#: ../../include/conversation.php:1117 -msgid "Insert video link" +#: ../../include/text.php:926 +msgid "disturbed" msgstr "" -#: ../../include/conversation.php:1118 -msgid "video link" +#: ../../include/text.php:927 +msgid "frustrated" msgstr "" -#: ../../include/conversation.php:1119 -msgid "Insert audio link" +#: ../../include/text.php:928 +msgid "depressed" msgstr "" -#: ../../include/conversation.php:1120 -msgid "audio link" +#: ../../include/text.php:929 +msgid "motivated" msgstr "" -#: ../../include/conversation.php:1121 ../../mod/editblock.php:118 -#: ../../mod/editlayout.php:113 ../../mod/editpost.php:119 -#: ../../mod/editwebpage.php:150 -msgid "Set your location" +#: ../../include/text.php:930 +msgid "relaxed" msgstr "" -#: ../../include/conversation.php:1122 -msgid "set location" +#: ../../include/text.php:931 +msgid "surprised" msgstr "" -#: ../../include/conversation.php:1123 ../../mod/editblock.php:119 -#: ../../mod/editlayout.php:114 ../../mod/editpost.php:120 -#: ../../mod/editwebpage.php:151 -msgid "Clear browser location" +#: ../../include/text.php:1092 +msgid "Monday" msgstr "" -#: ../../include/conversation.php:1124 -msgid "clear location" +#: ../../include/text.php:1092 +msgid "Tuesday" msgstr "" -#: ../../include/conversation.php:1126 ../../mod/editblock.php:132 -#: ../../mod/editlayout.php:126 ../../mod/editpost.php:132 -#: ../../mod/editwebpage.php:167 -msgid "Set title" +#: ../../include/text.php:1092 +msgid "Wednesday" msgstr "" -#: ../../include/conversation.php:1129 ../../mod/editblock.php:135 -#: ../../mod/editlayout.php:129 ../../mod/editpost.php:134 -#: ../../mod/editwebpage.php:169 -msgid "Categories (comma-separated list)" +#: ../../include/text.php:1092 +msgid "Thursday" msgstr "" -#: ../../include/conversation.php:1131 ../../mod/editblock.php:121 -#: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 -#: ../../mod/editwebpage.php:153 -msgid "Permission settings" +#: ../../include/text.php:1092 +msgid "Friday" msgstr "" -#: ../../include/conversation.php:1132 -msgid "permissions" +#: ../../include/text.php:1092 +msgid "Saturday" msgstr "" -#: ../../include/conversation.php:1139 ../../mod/editblock.php:129 -#: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 -#: ../../mod/editwebpage.php:162 -msgid "Public post" +#: ../../include/text.php:1092 +msgid "Sunday" msgstr "" -#: ../../include/conversation.php:1141 ../../mod/editblock.php:136 -#: ../../mod/editlayout.php:130 ../../mod/editpost.php:135 -#: ../../mod/editwebpage.php:170 -msgid "Example: bob@example.com, mary@example.com" +#: ../../include/text.php:1096 +msgid "January" msgstr "" -#: ../../include/conversation.php:1154 ../../mod/editblock.php:146 -#: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 -#: ../../mod/editwebpage.php:179 ../../mod/mail.php:222 ../../mod/mail.php:336 -msgid "Set expiration date" +#: ../../include/text.php:1096 +msgid "February" msgstr "" -#: ../../include/conversation.php:1156 ../../include/ItemObject.php:595 -#: ../../mod/editpost.php:148 ../../mod/mail.php:224 ../../mod/mail.php:338 -msgid "Encrypt text" +#: ../../include/text.php:1096 +msgid "March" msgstr "" -#: ../../include/conversation.php:1158 ../../mod/editpost.php:150 -msgid "OK" +#: ../../include/text.php:1096 +msgid "April" msgstr "" -#: ../../include/conversation.php:1159 ../../mod/settings.php:516 -#: ../../mod/settings.php:542 ../../mod/editpost.php:151 -#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 -#: ../../mod/tagrm.php:94 -msgid "Cancel" +#: ../../include/text.php:1096 +msgid "May" msgstr "" -#: ../../include/conversation.php:1401 -msgid "Discover" +#: ../../include/text.php:1096 +msgid "June" msgstr "" -#: ../../include/conversation.php:1404 -msgid "Imported public streams" +#: ../../include/text.php:1096 +msgid "July" msgstr "" -#: ../../include/conversation.php:1409 -msgid "Commented Order" +#: ../../include/text.php:1096 +msgid "August" msgstr "" -#: ../../include/conversation.php:1412 -msgid "Sort by Comment Date" +#: ../../include/text.php:1096 +msgid "September" msgstr "" -#: ../../include/conversation.php:1416 -msgid "Posted Order" +#: ../../include/text.php:1096 +msgid "October" msgstr "" -#: ../../include/conversation.php:1419 -msgid "Sort by Post Date" +#: ../../include/text.php:1096 +msgid "November" msgstr "" -#: ../../include/conversation.php:1424 ../../include/widgets.php:82 -msgid "Personal" +#: ../../include/text.php:1096 +msgid "December" msgstr "" -#: ../../include/conversation.php:1427 -msgid "Posts that mention or involve you" +#: ../../include/text.php:1174 +msgid "unknown.???" msgstr "" -#: ../../include/conversation.php:1433 ../../mod/connections.php:211 -#: ../../mod/connections.php:224 ../../mod/menu.php:61 -msgid "New" +#: ../../include/text.php:1175 +msgid "bytes" msgstr "" -#: ../../include/conversation.php:1436 -msgid "Activity Stream - by date" +#: ../../include/text.php:1210 +msgid "remove category" msgstr "" -#: ../../include/conversation.php:1442 -msgid "Starred" +#: ../../include/text.php:1280 +msgid "remove from file" msgstr "" -#: ../../include/conversation.php:1445 -msgid "Favourite Posts" +#: ../../include/text.php:1345 ../../include/text.php:1357 +msgid "Click to open/close" msgstr "" -#: ../../include/conversation.php:1452 -msgid "Spam" +#: ../../include/text.php:1512 ../../mod/events.php:374 +msgid "Link to Source" msgstr "" -#: ../../include/conversation.php:1455 -msgid "Posts flagged as SPAM" +#: ../../include/text.php:1531 +msgid "Select a page layout: " msgstr "" -#: ../../include/conversation.php:1488 ../../mod/admin.php:892 -msgid "Channel" +#: ../../include/text.php:1534 ../../include/text.php:1599 +msgid "default" msgstr "" -#: ../../include/conversation.php:1491 -msgid "Status Messages and Posts" +#: ../../include/text.php:1570 +msgid "Page content type: " msgstr "" -#: ../../include/conversation.php:1500 -msgid "About" +#: ../../include/text.php:1611 +msgid "Select an alternate language" msgstr "" -#: ../../include/conversation.php:1503 -msgid "Profile Details" +#: ../../include/text.php:1732 ../../include/conversation.php:120 +#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 +#: ../../mod/tagger.php:45 ../../mod/like.php:294 +msgid "photo" msgstr "" -#: ../../include/conversation.php:1509 ../../include/nav.php:84 -#: ../../include/apps.php:134 ../../mod/fbrowser.php:25 -msgid "Photos" +#: ../../include/text.php:1735 ../../include/conversation.php:123 +#: ../../mod/tagger.php:49 +msgid "event" msgstr "" -#: ../../include/conversation.php:1512 ../../include/photos.php:313 -msgid "Photo Albums" +#: ../../include/text.php:1738 ../../include/conversation.php:148 +#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 +#: ../../mod/tagger.php:53 ../../mod/like.php:294 +msgid "status" msgstr "" -#: ../../include/conversation.php:1518 ../../include/nav.php:85 -#: ../../include/reddav.php:1280 ../../include/apps.php:130 -#: ../../mod/fbrowser.php:114 -msgid "Files" +#: ../../include/text.php:1740 ../../include/conversation.php:150 +#: ../../mod/tagger.php:55 +msgid "comment" msgstr "" -#: ../../include/conversation.php:1521 -msgid "Files and Storage" +#: ../../include/text.php:1745 +msgid "activity" msgstr "" -#: ../../include/conversation.php:1530 ../../include/conversation.php:1533 -msgid "Chatrooms" +#: ../../include/text.php:2004 +msgid "Design" msgstr "" -#: ../../include/conversation.php:1540 ../../include/nav.php:93 -#: ../../include/apps.php:124 -msgid "Bookmarks" +#: ../../include/text.php:2006 +msgid "Blocks" msgstr "" -#: ../../include/conversation.php:1543 -msgid "Saved Bookmarks" +#: ../../include/text.php:2007 +msgid "Menus" msgstr "" -#: ../../include/conversation.php:1551 ../../include/nav.php:95 -#: ../../include/apps.php:131 ../../mod/webpages.php:79 -msgid "Webpages" +#: ../../include/text.php:2008 +msgid "Layouts" msgstr "" -#: ../../include/conversation.php:1554 -msgid "Manage Webpages" +#: ../../include/text.php:2009 +msgid "Pages" msgstr "" #: ../../include/page_widgets.php:6 @@ -568,6 +411,14 @@ msgstr "" msgid "View" msgstr "" +#: ../../include/page_widgets.php:40 ../../include/conversation.php:1091 +#: ../../include/ItemObject.php:592 ../../mod/editblock.php:141 +#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 +#: ../../mod/editwebpage.php:174 ../../mod/photos.php:997 +#: ../../mod/webpages.php:124 +msgid "Preview" +msgstr "" + #: ../../include/page_widgets.php:41 ../../mod/webpages.php:125 msgid "Actions" msgstr "" @@ -664,7 +515,7 @@ msgstr "" #: ../../include/attach.php:243 ../../include/attach.php:283 #: ../../include/attach.php:297 ../../include/attach.php:322 #: ../../include/attach.php:513 ../../include/attach.php:585 -#: ../../include/chat.php:116 ../../include/items.php:3676 +#: ../../include/chat.php:116 ../../include/items.php:3662 #: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:27 #: ../../mod/settings.php:492 ../../mod/poke.php:128 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64 @@ -688,10 +539,10 @@ msgstr "" #: ../../mod/thing.php:249 ../../mod/thing.php:266 ../../mod/thing.php:301 #: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:179 #: ../../mod/item.php:187 ../../mod/item.php:908 ../../mod/layouts.php:27 -#: ../../mod/layouts.php:39 ../../mod/viewconnections.php:22 -#: ../../mod/viewconnections.php:27 ../../mod/viewsrc.php:12 -#: ../../mod/mail.php:108 ../../mod/manage.php:6 ../../mod/menu.php:44 -#: ../../mod/webpages.php:40 ../../mod/message.php:16 +#: ../../mod/layouts.php:39 ../../mod/like.php:154 +#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 +#: ../../mod/viewsrc.php:12 ../../mod/mail.php:108 ../../mod/manage.php:6 +#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/message.php:16 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 #: ../../mod/notifications.php:66 ../../mod/appman.php:66 ../../index.php:186 #: ../../index.php:361 @@ -715,6 +566,10 @@ msgstr "" msgid "Photo storage failed." msgstr "" +#: ../../include/photos.php:313 ../../include/conversation.php:1515 +msgid "Photo Albums" +msgstr "" + #: ../../include/photos.php:317 ../../mod/photos.php:691 #: ../../mod/photos.php:1193 msgid "Upload New Photos" @@ -827,37 +682,37 @@ msgstr "" msgid "database storage failed." msgstr "" -#: ../../include/plugin.php:502 ../../include/plugin.php:504 +#: ../../include/plugin.php:504 ../../include/plugin.php:506 msgid "Click here to upgrade." msgstr "" -#: ../../include/plugin.php:510 +#: ../../include/plugin.php:512 msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/plugin.php:515 +#: ../../include/plugin.php:517 msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/bb2diaspora.php:446 ../../include/event.php:11 +#: ../../include/bb2diaspora.php:463 ../../include/event.php:11 msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/bb2diaspora.php:452 ../../include/event.php:20 +#: ../../include/bb2diaspora.php:469 ../../include/event.php:20 msgid "Starts:" msgstr "" -#: ../../include/bb2diaspora.php:460 ../../include/event.php:30 +#: ../../include/bb2diaspora.php:477 ../../include/event.php:30 msgid "Finishes:" msgstr "" -#: ../../include/bb2diaspora.php:468 ../../include/event.php:40 +#: ../../include/bb2diaspora.php:485 ../../include/event.php:40 #: ../../include/identity.php:726 ../../mod/directory.php:156 #: ../../mod/dirprofile.php:105 ../../mod/events.php:504 msgid "Location:" msgstr "" -#: ../../include/nav.php:77 ../../include/nav.php:101 ../../boot.php:1468 +#: ../../include/nav.php:77 ../../include/nav.php:101 ../../boot.php:1487 msgid "Logout" msgstr "" @@ -873,6 +728,11 @@ msgstr "" msgid "Your posts and conversations" msgstr "" +#: ../../include/nav.php:81 ../../include/conversation.php:940 +#: ../../mod/connedit.php:351 ../../mod/connedit.php:465 +msgid "View Profile" +msgstr "" + #: ../../include/nav.php:81 msgid "Your profile page" msgstr "" @@ -885,10 +745,21 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" +#: ../../include/nav.php:84 ../../include/conversation.php:1512 +#: ../../include/apps.php:134 ../../mod/fbrowser.php:25 +msgid "Photos" +msgstr "" + #: ../../include/nav.php:84 msgid "Your photos" msgstr "" +#: ../../include/nav.php:85 ../../include/reddav.php:1280 +#: ../../include/conversation.php:1521 ../../include/apps.php:130 +#: ../../mod/fbrowser.php:114 +msgid "Files" +msgstr "" + #: ../../include/nav.php:85 msgid "Your files" msgstr "" @@ -901,15 +772,25 @@ msgstr "" msgid "Your chatrooms" msgstr "" +#: ../../include/nav.php:93 ../../include/conversation.php:1543 +#: ../../include/apps.php:124 +msgid "Bookmarks" +msgstr "" + #: ../../include/nav.php:93 msgid "Your bookmarks" msgstr "" +#: ../../include/nav.php:95 ../../include/conversation.php:1554 +#: ../../include/apps.php:131 ../../mod/webpages.php:79 +msgid "Webpages" +msgstr "" + #: ../../include/nav.php:95 msgid "Your webpages" msgstr "" -#: ../../include/nav.php:99 ../../include/apps.php:126 ../../boot.php:1469 +#: ../../include/nav.php:99 ../../include/apps.php:126 ../../boot.php:1488 msgid "Login" msgstr "" @@ -930,7 +811,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:139 ../../mod/register.php:221 ../../boot.php:1445 +#: ../../include/nav.php:139 ../../mod/register.php:221 ../../boot.php:1464 msgid "Register" msgstr "" @@ -956,12 +837,6 @@ msgstr "" msgid "Applications, utilities, links, games" msgstr "" -#: ../../include/nav.php:149 ../../include/text.php:813 -#: ../../include/text.php:827 ../../include/apps.php:142 -#: ../../mod/search.php:29 -msgid "Search" -msgstr "" - #: ../../include/nav.php:149 msgid "Search site content" msgstr "" @@ -1098,7 +973,7 @@ msgstr "" msgid "Please wait..." msgstr "" -#: ../../include/bookmarks.php:42 +#: ../../include/bookmarks.php:35 #, php-format msgid "%1$s's bookmarks" msgstr "" @@ -1236,7 +1111,7 @@ msgid "RSS/Atom" msgstr "" #: ../../include/contact_selectors.php:77 ../../mod/admin.php:754 -#: ../../mod/admin.php:763 ../../boot.php:1471 +#: ../../mod/admin.php:763 ../../boot.php:1490 msgid "Email" msgstr "" @@ -1345,15 +1220,15 @@ msgstr "" msgid "This event has been added to your calendar." msgstr "" -#: ../../include/zot.php:610 +#: ../../include/zot.php:624 msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:620 +#: ../../include/zot.php:634 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:817 +#: ../../include/zot.php:831 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -1720,6 +1595,14 @@ msgstr "" msgid "Last Modified" msgstr "" +#: ../../include/reddav.php:1290 ../../include/conversation.php:635 +#: ../../include/apps.php:241 ../../include/ItemObject.php:108 +#: ../../mod/settings.php:578 ../../mod/connedit.php:398 +#: ../../mod/photos.php:1046 ../../mod/group.php:176 ../../mod/admin.php:758 +#: ../../mod/admin.php:888 ../../mod/thing.php:236 +msgid "Delete" +msgstr "" + #: ../../include/reddav.php:1291 msgid "Total" msgstr "" @@ -1741,6 +1624,436 @@ msgstr "" msgid "Upload" msgstr "" +#: ../../include/conversation.php:126 ../../mod/like.php:89 +msgid "channel" +msgstr "" + +#: ../../include/conversation.php:164 ../../mod/like.php:331 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + +#: ../../include/conversation.php:167 ../../mod/like.php:333 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "" + +#: ../../include/conversation.php:204 +#, php-format +msgid "%1$s is now connected with %2$s" +msgstr "" + +#: ../../include/conversation.php:239 +#, php-format +msgid "%1$s poked %2$s" +msgstr "" + +#: ../../include/conversation.php:261 ../../mod/mood.php:63 +#, php-format +msgctxt "mood" +msgid "%1$s is %2$s" +msgstr "" + +#: ../../include/conversation.php:634 ../../include/ItemObject.php:114 +msgid "Select" +msgstr "" + +#: ../../include/conversation.php:642 ../../include/ItemObject.php:89 +#: ../../mod/photos.php:844 +msgid "Private Message" +msgstr "" + +#: ../../include/conversation.php:649 ../../include/ItemObject.php:182 +msgid "Message is verified" +msgstr "" + +#: ../../include/conversation.php:669 +#, php-format +msgid "View %s's profile @ %s" +msgstr "" + +#: ../../include/conversation.php:683 +msgid "Categories:" +msgstr "" + +#: ../../include/conversation.php:684 +msgid "Filed under:" +msgstr "" + +#: ../../include/conversation.php:693 ../../include/ItemObject.php:250 +#, php-format +msgid " from %s" +msgstr "" + +#: ../../include/conversation.php:696 ../../include/ItemObject.php:253 +#, php-format +msgid "last edited: %s" +msgstr "" + +#: ../../include/conversation.php:697 ../../include/ItemObject.php:254 +#, php-format +msgid "Expires: %s" +msgstr "" + +#: ../../include/conversation.php:712 +msgid "View in context" +msgstr "" + +#: ../../include/conversation.php:714 ../../include/conversation.php:1130 +#: ../../include/ItemObject.php:294 ../../mod/editblock.php:120 +#: ../../mod/editlayout.php:115 ../../mod/editpost.php:121 +#: ../../mod/editwebpage.php:152 ../../mod/photos.php:977 +#: ../../mod/mail.php:231 ../../mod/mail.php:346 +msgid "Please wait" +msgstr "" + +#: ../../include/conversation.php:841 +msgid "remove" +msgstr "" + +#: ../../include/conversation.php:845 +msgid "Loading..." +msgstr "" + +#: ../../include/conversation.php:846 +msgid "Delete Selected Items" +msgstr "" + +#: ../../include/conversation.php:937 +msgid "View Source" +msgstr "" + +#: ../../include/conversation.php:938 +msgid "Follow Thread" +msgstr "" + +#: ../../include/conversation.php:939 +msgid "View Status" +msgstr "" + +#: ../../include/conversation.php:941 +msgid "View Photos" +msgstr "" + +#: ../../include/conversation.php:942 +msgid "Matrix Activity" +msgstr "" + +#: ../../include/conversation.php:943 +msgid "Edit Contact" +msgstr "" + +#: ../../include/conversation.php:944 +msgid "Send PM" +msgstr "" + +#: ../../include/conversation.php:945 ../../include/apps.php:140 +msgid "Poke" +msgstr "" + +#: ../../include/conversation.php:1001 +#, php-format +msgid "%s likes this." +msgstr "" + +#: ../../include/conversation.php:1001 +#, php-format +msgid "%s doesn't like this." +msgstr "" + +#: ../../include/conversation.php:1005 +#, php-format +msgid "<span %1$s>%2$d people</span> like this." +msgid_plural "<span %1$s>%2$d people</span> like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1007 +#, php-format +msgid "<span %1$s>%2$d people</span> don't like this." +msgid_plural "<span %1$s>%2$d people</span> don't like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1013 +msgid "and" +msgstr "" + +#: ../../include/conversation.php:1016 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1017 +#, php-format +msgid "%s like this." +msgstr "" + +#: ../../include/conversation.php:1017 +#, php-format +msgid "%s don't like this." +msgstr "" + +#: ../../include/conversation.php:1074 +msgid "Visible to <strong>everybody</strong>" +msgstr "" + +#: ../../include/conversation.php:1075 ../../mod/mail.php:167 +#: ../../mod/mail.php:279 +msgid "Please enter a link URL:" +msgstr "" + +#: ../../include/conversation.php:1076 +msgid "Please enter a video link/URL:" +msgstr "" + +#: ../../include/conversation.php:1077 +msgid "Please enter an audio link/URL:" +msgstr "" + +#: ../../include/conversation.php:1078 +msgid "Tag term:" +msgstr "" + +#: ../../include/conversation.php:1079 ../../mod/filer.php:49 +msgid "Save to Folder:" +msgstr "" + +#: ../../include/conversation.php:1080 +msgid "Where are you right now?" +msgstr "" + +#: ../../include/conversation.php:1081 ../../mod/editpost.php:52 +#: ../../mod/mail.php:168 ../../mod/mail.php:280 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "" + +#: ../../include/conversation.php:1105 ../../mod/photos.php:976 +#: ../../mod/layouts.php:113 +msgid "Share" +msgstr "" + +#: ../../include/conversation.php:1107 ../../mod/editwebpage.php:139 +msgid "Page link title" +msgstr "" + +#: ../../include/conversation.php:1110 +msgid "Post as" +msgstr "" + +#: ../../include/conversation.php:1111 ../../mod/editblock.php:112 +#: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 +#: ../../mod/editwebpage.php:144 ../../mod/mail.php:228 ../../mod/mail.php:342 +msgid "Upload photo" +msgstr "" + +#: ../../include/conversation.php:1112 +msgid "upload photo" +msgstr "" + +#: ../../include/conversation.php:1113 ../../mod/editblock.php:113 +#: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 +#: ../../mod/editwebpage.php:145 ../../mod/mail.php:229 ../../mod/mail.php:343 +msgid "Attach file" +msgstr "" + +#: ../../include/conversation.php:1114 +msgid "attach file" +msgstr "" + +#: ../../include/conversation.php:1115 ../../mod/editblock.php:114 +#: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 +#: ../../mod/editwebpage.php:146 ../../mod/mail.php:230 ../../mod/mail.php:344 +msgid "Insert web link" +msgstr "" + +#: ../../include/conversation.php:1116 +msgid "web link" +msgstr "" + +#: ../../include/conversation.php:1117 +msgid "Insert video link" +msgstr "" + +#: ../../include/conversation.php:1118 +msgid "video link" +msgstr "" + +#: ../../include/conversation.php:1119 +msgid "Insert audio link" +msgstr "" + +#: ../../include/conversation.php:1120 +msgid "audio link" +msgstr "" + +#: ../../include/conversation.php:1121 ../../mod/editblock.php:118 +#: ../../mod/editlayout.php:113 ../../mod/editpost.php:119 +#: ../../mod/editwebpage.php:150 +msgid "Set your location" +msgstr "" + +#: ../../include/conversation.php:1122 +msgid "set location" +msgstr "" + +#: ../../include/conversation.php:1123 ../../mod/editblock.php:119 +#: ../../mod/editlayout.php:114 ../../mod/editpost.php:120 +#: ../../mod/editwebpage.php:151 +msgid "Clear browser location" +msgstr "" + +#: ../../include/conversation.php:1124 +msgid "clear location" +msgstr "" + +#: ../../include/conversation.php:1126 ../../mod/editblock.php:132 +#: ../../mod/editlayout.php:126 ../../mod/editpost.php:132 +#: ../../mod/editwebpage.php:167 +msgid "Set title" +msgstr "" + +#: ../../include/conversation.php:1129 ../../mod/editblock.php:135 +#: ../../mod/editlayout.php:129 ../../mod/editpost.php:134 +#: ../../mod/editwebpage.php:169 +msgid "Categories (comma-separated list)" +msgstr "" + +#: ../../include/conversation.php:1131 ../../mod/editblock.php:121 +#: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 +#: ../../mod/editwebpage.php:153 +msgid "Permission settings" +msgstr "" + +#: ../../include/conversation.php:1132 +msgid "permissions" +msgstr "" + +#: ../../include/conversation.php:1139 ../../mod/editblock.php:129 +#: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 +#: ../../mod/editwebpage.php:162 +msgid "Public post" +msgstr "" + +#: ../../include/conversation.php:1141 ../../mod/editblock.php:136 +#: ../../mod/editlayout.php:130 ../../mod/editpost.php:135 +#: ../../mod/editwebpage.php:170 +msgid "Example: bob@example.com, mary@example.com" +msgstr "" + +#: ../../include/conversation.php:1154 ../../mod/editblock.php:146 +#: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 +#: ../../mod/editwebpage.php:179 ../../mod/mail.php:235 ../../mod/mail.php:349 +msgid "Set expiration date" +msgstr "" + +#: ../../include/conversation.php:1156 ../../include/ItemObject.php:595 +#: ../../mod/editpost.php:148 ../../mod/mail.php:237 ../../mod/mail.php:351 +msgid "Encrypt text" +msgstr "" + +#: ../../include/conversation.php:1158 ../../mod/editpost.php:150 +msgid "OK" +msgstr "" + +#: ../../include/conversation.php:1159 ../../mod/settings.php:516 +#: ../../mod/settings.php:542 ../../mod/editpost.php:151 +#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 +#: ../../mod/tagrm.php:94 +msgid "Cancel" +msgstr "" + +#: ../../include/conversation.php:1401 +msgid "Discover" +msgstr "" + +#: ../../include/conversation.php:1404 +msgid "Imported public streams" +msgstr "" + +#: ../../include/conversation.php:1409 +msgid "Commented Order" +msgstr "" + +#: ../../include/conversation.php:1412 +msgid "Sort by Comment Date" +msgstr "" + +#: ../../include/conversation.php:1416 +msgid "Posted Order" +msgstr "" + +#: ../../include/conversation.php:1419 +msgid "Sort by Post Date" +msgstr "" + +#: ../../include/conversation.php:1424 ../../include/widgets.php:82 +msgid "Personal" +msgstr "" + +#: ../../include/conversation.php:1427 +msgid "Posts that mention or involve you" +msgstr "" + +#: ../../include/conversation.php:1433 ../../mod/connections.php:211 +#: ../../mod/connections.php:224 ../../mod/menu.php:61 +msgid "New" +msgstr "" + +#: ../../include/conversation.php:1436 +msgid "Activity Stream - by date" +msgstr "" + +#: ../../include/conversation.php:1442 +msgid "Starred" +msgstr "" + +#: ../../include/conversation.php:1445 +msgid "Favourite Posts" +msgstr "" + +#: ../../include/conversation.php:1452 +msgid "Spam" +msgstr "" + +#: ../../include/conversation.php:1455 +msgid "Posts flagged as SPAM" +msgstr "" + +#: ../../include/conversation.php:1491 ../../mod/admin.php:892 +msgid "Channel" +msgstr "" + +#: ../../include/conversation.php:1494 +msgid "Status Messages and Posts" +msgstr "" + +#: ../../include/conversation.php:1503 +msgid "About" +msgstr "" + +#: ../../include/conversation.php:1506 +msgid "Profile Details" +msgstr "" + +#: ../../include/conversation.php:1524 +msgid "Files and Storage" +msgstr "" + +#: ../../include/conversation.php:1533 ../../include/conversation.php:1536 +msgid "Chatrooms" +msgstr "" + +#: ../../include/conversation.php:1546 +msgid "Saved Bookmarks" +msgstr "" + +#: ../../include/conversation.php:1557 +msgid "Manage Webpages" +msgstr "" + #: ../../include/features.php:23 msgid "General Features" msgstr "" @@ -1994,35 +2307,35 @@ msgid "" "not what you intended, please create another group with a different name." msgstr "" -#: ../../include/group.php:223 +#: ../../include/group.php:234 msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/group.php:242 ../../mod/admin.php:763 +#: ../../include/group.php:253 ../../mod/admin.php:763 msgid "All Channels" msgstr "" -#: ../../include/group.php:264 +#: ../../include/group.php:275 msgid "edit" msgstr "" -#: ../../include/group.php:285 +#: ../../include/group.php:296 msgid "Collections" msgstr "" -#: ../../include/group.php:286 +#: ../../include/group.php:297 msgid "Edit collection" msgstr "" -#: ../../include/group.php:287 +#: ../../include/group.php:298 msgid "Create a new collection" msgstr "" -#: ../../include/group.php:288 +#: ../../include/group.php:299 msgid "Channels not in any collection" msgstr "" -#: ../../include/group.php:290 ../../include/widgets.php:266 +#: ../../include/group.php:301 ../../include/widgets.php:266 msgid "add" msgstr "" @@ -2285,319 +2598,6 @@ msgstr "" msgid "view full size" msgstr "" -#: ../../include/text.php:320 -msgid "prev" -msgstr "" - -#: ../../include/text.php:322 -msgid "first" -msgstr "" - -#: ../../include/text.php:351 -msgid "last" -msgstr "" - -#: ../../include/text.php:354 -msgid "next" -msgstr "" - -#: ../../include/text.php:366 -msgid "older" -msgstr "" - -#: ../../include/text.php:368 -msgid "newer" -msgstr "" - -#: ../../include/text.php:729 -msgid "No connections" -msgstr "" - -#: ../../include/text.php:742 -#, php-format -msgid "%d Connection" -msgid_plural "%d Connections" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/text.php:754 -msgid "View Connections" -msgstr "" - -#: ../../include/text.php:815 ../../include/text.php:829 -#: ../../include/widgets.php:186 ../../mod/rbmark.php:28 -#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 -msgid "Save" -msgstr "" - -#: ../../include/text.php:895 -msgid "poke" -msgstr "" - -#: ../../include/text.php:896 -msgid "ping" -msgstr "" - -#: ../../include/text.php:896 -msgid "pinged" -msgstr "" - -#: ../../include/text.php:897 -msgid "prod" -msgstr "" - -#: ../../include/text.php:897 -msgid "prodded" -msgstr "" - -#: ../../include/text.php:898 -msgid "slap" -msgstr "" - -#: ../../include/text.php:898 -msgid "slapped" -msgstr "" - -#: ../../include/text.php:899 -msgid "finger" -msgstr "" - -#: ../../include/text.php:899 -msgid "fingered" -msgstr "" - -#: ../../include/text.php:900 -msgid "rebuff" -msgstr "" - -#: ../../include/text.php:900 -msgid "rebuffed" -msgstr "" - -#: ../../include/text.php:909 -msgid "happy" -msgstr "" - -#: ../../include/text.php:910 -msgid "sad" -msgstr "" - -#: ../../include/text.php:911 -msgid "mellow" -msgstr "" - -#: ../../include/text.php:912 -msgid "tired" -msgstr "" - -#: ../../include/text.php:913 -msgid "perky" -msgstr "" - -#: ../../include/text.php:914 -msgid "angry" -msgstr "" - -#: ../../include/text.php:915 -msgid "stupified" -msgstr "" - -#: ../../include/text.php:916 -msgid "puzzled" -msgstr "" - -#: ../../include/text.php:917 -msgid "interested" -msgstr "" - -#: ../../include/text.php:918 -msgid "bitter" -msgstr "" - -#: ../../include/text.php:919 -msgid "cheerful" -msgstr "" - -#: ../../include/text.php:920 -msgid "alive" -msgstr "" - -#: ../../include/text.php:921 -msgid "annoyed" -msgstr "" - -#: ../../include/text.php:922 -msgid "anxious" -msgstr "" - -#: ../../include/text.php:923 -msgid "cranky" -msgstr "" - -#: ../../include/text.php:924 -msgid "disturbed" -msgstr "" - -#: ../../include/text.php:925 -msgid "frustrated" -msgstr "" - -#: ../../include/text.php:926 -msgid "depressed" -msgstr "" - -#: ../../include/text.php:927 -msgid "motivated" -msgstr "" - -#: ../../include/text.php:928 -msgid "relaxed" -msgstr "" - -#: ../../include/text.php:929 -msgid "surprised" -msgstr "" - -#: ../../include/text.php:1090 -msgid "Monday" -msgstr "" - -#: ../../include/text.php:1090 -msgid "Tuesday" -msgstr "" - -#: ../../include/text.php:1090 -msgid "Wednesday" -msgstr "" - -#: ../../include/text.php:1090 -msgid "Thursday" -msgstr "" - -#: ../../include/text.php:1090 -msgid "Friday" -msgstr "" - -#: ../../include/text.php:1090 -msgid "Saturday" -msgstr "" - -#: ../../include/text.php:1090 -msgid "Sunday" -msgstr "" - -#: ../../include/text.php:1094 -msgid "January" -msgstr "" - -#: ../../include/text.php:1094 -msgid "February" -msgstr "" - -#: ../../include/text.php:1094 -msgid "March" -msgstr "" - -#: ../../include/text.php:1094 -msgid "April" -msgstr "" - -#: ../../include/text.php:1094 -msgid "May" -msgstr "" - -#: ../../include/text.php:1094 -msgid "June" -msgstr "" - -#: ../../include/text.php:1094 -msgid "July" -msgstr "" - -#: ../../include/text.php:1094 -msgid "August" -msgstr "" - -#: ../../include/text.php:1094 -msgid "September" -msgstr "" - -#: ../../include/text.php:1094 -msgid "October" -msgstr "" - -#: ../../include/text.php:1094 -msgid "November" -msgstr "" - -#: ../../include/text.php:1094 -msgid "December" -msgstr "" - -#: ../../include/text.php:1172 -msgid "unknown.???" -msgstr "" - -#: ../../include/text.php:1173 -msgid "bytes" -msgstr "" - -#: ../../include/text.php:1208 -msgid "remove category" -msgstr "" - -#: ../../include/text.php:1278 -msgid "remove from file" -msgstr "" - -#: ../../include/text.php:1343 ../../include/text.php:1355 -msgid "Click to open/close" -msgstr "" - -#: ../../include/text.php:1510 ../../mod/events.php:374 -msgid "Link to Source" -msgstr "" - -#: ../../include/text.php:1529 -msgid "Select a page layout: " -msgstr "" - -#: ../../include/text.php:1532 ../../include/text.php:1597 -msgid "default" -msgstr "" - -#: ../../include/text.php:1568 -msgid "Page content type: " -msgstr "" - -#: ../../include/text.php:1609 -msgid "Select an alternate language" -msgstr "" - -#: ../../include/text.php:1743 -msgid "activity" -msgstr "" - -#: ../../include/text.php:2002 -msgid "Design" -msgstr "" - -#: ../../include/text.php:2004 -msgid "Blocks" -msgstr "" - -#: ../../include/text.php:2005 -msgid "Menus" -msgstr "" - -#: ../../include/text.php:2006 -msgid "Layouts" -msgstr "" - -#: ../../include/text.php:2007 -msgid "Pages" -msgstr "" - #: ../../include/apps.php:123 msgid "Site Admin" msgstr "" @@ -2631,34 +2631,34 @@ msgstr "" msgid "Purchase" msgstr "" -#: ../../include/bbcode.php:128 ../../include/bbcode.php:654 -#: ../../include/bbcode.php:657 ../../include/bbcode.php:662 -#: ../../include/bbcode.php:665 ../../include/bbcode.php:668 -#: ../../include/bbcode.php:671 ../../include/bbcode.php:676 -#: ../../include/bbcode.php:679 ../../include/bbcode.php:684 -#: ../../include/bbcode.php:687 ../../include/bbcode.php:690 -#: ../../include/bbcode.php:693 +#: ../../include/bbcode.php:112 ../../include/bbcode.php:638 +#: ../../include/bbcode.php:641 ../../include/bbcode.php:646 +#: ../../include/bbcode.php:649 ../../include/bbcode.php:652 +#: ../../include/bbcode.php:655 ../../include/bbcode.php:660 +#: ../../include/bbcode.php:663 ../../include/bbcode.php:668 +#: ../../include/bbcode.php:671 ../../include/bbcode.php:674 +#: ../../include/bbcode.php:677 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:163 ../../include/bbcode.php:704 +#: ../../include/bbcode.php:147 ../../include/bbcode.php:688 msgid "Encrypted content" msgstr "" -#: ../../include/bbcode.php:179 +#: ../../include/bbcode.php:163 msgid "QR code" msgstr "" -#: ../../include/bbcode.php:228 +#: ../../include/bbcode.php:212 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/bbcode.php:230 +#: ../../include/bbcode.php:214 msgid "post" msgstr "" -#: ../../include/bbcode.php:622 ../../include/bbcode.php:642 +#: ../../include/bbcode.php:606 ../../include/bbcode.php:626 msgid "$1 wrote:" msgstr "" @@ -2937,8 +2937,8 @@ msgstr "" #: ../../mod/admin.php:751 ../../mod/admin.php:886 ../../mod/admin.php:1019 #: ../../mod/admin.php:1218 ../../mod/admin.php:1305 ../../mod/thing.php:286 #: ../../mod/thing.php:329 ../../mod/import.php:393 ../../mod/invite.php:156 -#: ../../mod/mail.php:219 ../../mod/mail.php:332 ../../mod/appman.php:99 -#: ../../view/theme/apw/php/config.php:256 +#: ../../mod/mail.php:232 ../../mod/mail.php:345 ../../mod/appman.php:99 +#: ../../mod/poll.php:68 ../../view/theme/apw/php/config.php:256 #: ../../view/theme/blogga/php/config.php:67 #: ../../view/theme/blogga/view/theme/blog/config.php:67 #: ../../view/theme/redbasic/php/config.php:99 @@ -3342,42 +3342,42 @@ msgstr "" msgid "Login failed." msgstr "" -#: ../../include/items.php:302 ../../mod/profperm.php:23 -#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:202 +#: ../../include/items.php:288 ../../mod/profperm.php:23 +#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:242 #: ../../index.php:360 msgid "Permission denied" msgstr "" -#: ../../include/items.php:826 +#: ../../include/items.php:812 msgid "(Unknown)" msgstr "" -#: ../../include/items.php:3614 ../../mod/home.php:67 ../../mod/display.php:32 +#: ../../include/items.php:3600 ../../mod/home.php:67 ../../mod/display.php:32 #: ../../mod/filestorage.php:18 ../../mod/admin.php:159 #: ../../mod/admin.php:923 ../../mod/admin.php:1126 ../../mod/thing.php:78 #: ../../mod/viewsrc.php:18 msgid "Item not found." msgstr "" -#: ../../include/items.php:4047 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4033 ../../mod/group.php:38 ../../mod/group.php:140 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4062 +#: ../../include/items.php:4048 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4069 +#: ../../include/items.php:4055 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4080 +#: ../../include/items.php:4066 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4083 +#: ../../include/items.php:4069 msgid "Connection not found." msgstr "" @@ -3414,7 +3414,7 @@ msgid "Can post on my channel page (\"wall\")" msgstr "" #: ../../include/permissions.php:23 -msgid "Can comment on my posts" +msgid "Can comment on or like my posts" msgstr "" #: ../../include/permissions.php:24 @@ -3426,38 +3426,42 @@ msgid "Can post photos to my photo albums" msgstr "" #: ../../include/permissions.php:26 +msgid "Can like/dislike stuff" +msgstr "" + +#: ../../include/permissions.php:28 msgid "Can forward to all my channel contacts via post @mentions" msgstr "" -#: ../../include/permissions.php:26 +#: ../../include/permissions.php:28 msgid "Advanced - useful for creating group forum channels" msgstr "" -#: ../../include/permissions.php:27 +#: ../../include/permissions.php:29 msgid "Can chat with me (when available)" msgstr "" -#: ../../include/permissions.php:28 +#: ../../include/permissions.php:30 msgid "Can write to my \"public\" file storage" msgstr "" -#: ../../include/permissions.php:29 +#: ../../include/permissions.php:31 msgid "Can edit my \"public\" pages" msgstr "" -#: ../../include/permissions.php:31 +#: ../../include/permissions.php:33 msgid "Can source my \"public\" posts in derived channels" msgstr "" -#: ../../include/permissions.php:31 +#: ../../include/permissions.php:33 msgid "Somewhat advanced - very useful in open communities" msgstr "" -#: ../../include/permissions.php:33 +#: ../../include/permissions.php:35 msgid "Can administer my channel resources" msgstr "" -#: ../../include/permissions.php:33 +#: ../../include/permissions.php:35 msgid "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "" @@ -4720,15 +4724,15 @@ msgstr "" msgid "Authentication failed." msgstr "" -#: ../../mod/rmagic.php:78 +#: ../../mod/rmagic.php:82 msgid "Remote Authentication" msgstr "" -#: ../../mod/rmagic.php:79 +#: ../../mod/rmagic.php:83 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../mod/rmagic.php:80 +#: ../../mod/rmagic.php:84 msgid "Authenticate" msgstr "" @@ -4835,10 +4839,6 @@ msgstr "" msgid "All" msgstr "" -#: ../../mod/connections.php:240 ../../mod/connections.php:320 -msgid "Unconnected" -msgstr "" - #: ../../mod/connections.php:270 msgid "Suggest new connections" msgstr "" @@ -4879,10 +4879,6 @@ msgstr "" msgid "Only show hidden connections" msgstr "" -#: ../../mod/connections.php:323 -msgid "Only show one-way connections" -msgstr "" - #: ../../mod/connections.php:368 #, php-format msgid "%1$s [%2$s]" @@ -6198,7 +6194,7 @@ msgstr "" msgid "All Connected Channels" msgstr "" -#: ../../mod/group.php:231 +#: ../../mod/group.php:233 msgid "Click on a channel to add or remove." msgstr "" @@ -6990,7 +6986,7 @@ msgstr "" msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/invite.php:143 ../../mod/mail.php:212 ../../mod/mail.php:325 +#: ../../mod/invite.php:143 ../../mod/mail.php:225 ../../mod/mail.php:338 msgid "Your message:" msgstr "" @@ -7065,10 +7061,44 @@ msgstr "" msgid "Layout Name" msgstr "" -#: ../../mod/like.php:97 +#: ../../mod/like.php:15 +msgid "Like/Dislike" +msgstr "" + +#: ../../mod/like.php:20 +msgid "This action is restricted to members." +msgstr "" + +#: ../../mod/like.php:21 +msgid "" +"Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href=" +"\"register\">register as a new RedMatrix member</a> to continue." +msgstr "" + +#: ../../mod/like.php:77 ../../mod/like.php:104 ../../mod/like.php:142 +msgid "Invalid request." +msgstr "" + +#: ../../mod/like.php:119 msgid "thing" msgstr "" +#: ../../mod/like.php:165 +msgid "Channel unavailable." +msgstr "" + +#: ../../mod/like.php:204 +msgid "Previous action reversed." +msgstr "" + +#: ../../mod/like.php:417 +msgid "Action completed." +msgstr "" + +#: ../../mod/like.php:418 +msgid "Thank you." +msgstr "" + #: ../../mod/lockview.php:30 ../../mod/lockview.php:36 msgid "Remote privacy information not available." msgstr "" @@ -7081,12 +7111,12 @@ msgstr "" msgid "No connections." msgstr "" -#: ../../mod/viewconnections.php:70 +#: ../../mod/viewconnections.php:71 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: ../../mod/viewconnections.php:85 +#: ../../mod/viewconnections.php:86 msgid "View Connnections" msgstr "" @@ -7114,7 +7144,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1479 +#: ../../mod/lostpass.php:85 ../../boot.php:1498 msgid "Password Reset" msgstr "" @@ -7203,49 +7233,49 @@ msgstr "" msgid "Message recalled." msgstr "" -#: ../../mod/mail.php:202 +#: ../../mod/mail.php:215 msgid "Send Private Message" msgstr "" -#: ../../mod/mail.php:203 ../../mod/mail.php:320 +#: ../../mod/mail.php:216 ../../mod/mail.php:333 msgid "To:" msgstr "" -#: ../../mod/mail.php:208 ../../mod/mail.php:322 +#: ../../mod/mail.php:221 ../../mod/mail.php:335 msgid "Subject:" msgstr "" -#: ../../mod/mail.php:246 +#: ../../mod/mail.php:259 msgid "Message not found." msgstr "" -#: ../../mod/mail.php:289 ../../mod/message.php:72 +#: ../../mod/mail.php:302 ../../mod/message.php:72 msgid "Delete message" msgstr "" -#: ../../mod/mail.php:290 +#: ../../mod/mail.php:303 msgid "Recall message" msgstr "" -#: ../../mod/mail.php:292 +#: ../../mod/mail.php:305 msgid "Message has been recalled." msgstr "" -#: ../../mod/mail.php:309 +#: ../../mod/mail.php:322 msgid "Private Conversation" msgstr "" -#: ../../mod/mail.php:313 +#: ../../mod/mail.php:326 msgid "Delete conversation" msgstr "" -#: ../../mod/mail.php:315 +#: ../../mod/mail.php:328 msgid "" "No secure communications available. You <strong>may</strong> be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/mail.php:319 +#: ../../mod/mail.php:332 msgid "Send Reply" msgstr "" @@ -7507,6 +7537,14 @@ msgstr "" msgid "Location (URL) to purchase app" msgstr "" +#: ../../mod/poll.php:64 +msgid "Poll" +msgstr "" + +#: ../../mod/poll.php:69 +msgid "View Results" +msgstr "" + #: ../../view/theme/apw/php/config.php:202 #: ../../view/theme/apw/php/config.php:236 msgid "Schema Default" @@ -7792,41 +7830,41 @@ msgstr "" msgid "Are you a clean desk or a messy desk person?" msgstr "" -#: ../../boot.php:1277 +#: ../../boot.php:1286 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1280 +#: ../../boot.php:1289 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1444 +#: ../../boot.php:1463 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../boot.php:1472 +#: ../../boot.php:1491 msgid "Password" msgstr "" -#: ../../boot.php:1473 +#: ../../boot.php:1492 msgid "Remember me" msgstr "" -#: ../../boot.php:1478 +#: ../../boot.php:1497 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1543 +#: ../../boot.php:1562 msgid "permission denied" msgstr "" -#: ../../boot.php:1544 +#: ../../boot.php:1563 msgid "Got Zot?" msgstr "" -#: ../../boot.php:1974 +#: ../../boot.php:1993 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index 7956ea5b8..97bf2e20b 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-07-17.739 +2014-07-20.742 |