diff options
| -rw-r--r-- | include/crypto.php | 15 | ||||
| -rw-r--r-- | util/messages.po | 1246 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 672 insertions, 591 deletions
diff --git a/include/crypto.php b/include/crypto.php index ab083cfaa..a4ce2cf98 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -300,7 +300,6 @@ function salmon_key($pubkey) { // used in Friendica 'RINO'. This function is messy and should be retired. -if(! function_exists('aes_decrypt')) { function aes_decrypt($val,$ky) { $key="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; @@ -310,10 +309,10 @@ function aes_decrypt($val,$ky) $enc = MCRYPT_RIJNDAEL_128; $dec = @mcrypt_decrypt($enc, $key, $val, $mode, @mcrypt_create_iv( @mcrypt_get_iv_size($enc, $mode), MCRYPT_DEV_URANDOM ) ); return rtrim($dec,(( ord(substr($dec,strlen($dec)-1,1))>=0 and ord(substr($dec, strlen($dec)-1,1))<=16)? chr(ord( substr($dec,strlen($dec)-1,1))):null)); -}} +} + -if(! function_exists('aes_encrypt')) { function aes_encrypt($val,$ky) { $key="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; @@ -323,6 +322,14 @@ function aes_encrypt($val,$ky) $enc=MCRYPT_RIJNDAEL_128; $val=str_pad($val, (16*(floor(strlen($val) / 16)+(strlen($val) % 16==0?2:1))), chr(16-(strlen($val) % 16))); return mcrypt_encrypt($enc, $key, $val, $mode, mcrypt_create_iv( mcrypt_get_iv_size($enc, $mode), MCRYPT_DEV_URANDOM)); -}} +} +function z_obscure($s) { + return json_encode(crypto_encapsulate($s,get_config('system','pubkey'))); +} +function z_unobscure($s) { + if(strpos($s,"{\"") !== 0) + return $s; + return crypto_unencapsulate(json_decode($s,true),get_config('system','prvkey')); +} diff --git a/util/messages.po b/util/messages.po index 43c36f167..37e1520df 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-03-20.977\n" +"Project-Id-Version: 2015-03-27.984\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-20 00:03-0700\n" +"POT-Creation-Date: 2015-03-27 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" @@ -54,7 +54,7 @@ msgstr "" msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/group.php:254 ../../mod/admin.php:821 +#: ../../include/group.php:254 ../../mod/admin.php:824 msgid "All Channels" msgstr "" @@ -125,7 +125,7 @@ msgstr "" msgid "$1 wrote:" msgstr "" -#: ../../include/identity.php:31 ../../mod/item.php:1078 +#: ../../include/identity.php:31 msgid "Unable to obtain identity information from database" msgstr "" @@ -154,16 +154,16 @@ msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/identity.php:283 +#: ../../include/identity.php:281 msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/identity.php:343 +#: ../../include/identity.php:341 msgid "Default Profile" msgstr "" -#: ../../include/identity.php:387 ../../include/identity.php:388 -#: ../../include/identity.php:395 ../../include/widgets.php:430 +#: ../../include/identity.php:385 ../../include/identity.php:386 +#: ../../include/identity.php:393 ../../include/widgets.php:430 #: ../../include/profile_selectors.php:80 ../../mod/settings.php:339 #: ../../mod/settings.php:343 ../../mod/settings.php:344 #: ../../mod/settings.php:347 ../../mod/settings.php:358 @@ -171,129 +171,129 @@ msgstr "" msgid "Friends" msgstr "" -#: ../../include/identity.php:643 +#: ../../include/identity.php:641 msgid "Requested channel is not available." msgstr "" -#: ../../include/identity.php:691 ../../mod/profile.php:16 +#: ../../include/identity.php:689 ../../mod/profile.php:16 #: ../../mod/achievements.php:11 ../../mod/blocks.php:29 #: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/editlayout.php:28 -#: ../../mod/editwebpage.php:28 ../../mod/filestorage.php:53 +#: ../../mod/editwebpage.php:28 ../../mod/filestorage.php:54 #: ../../mod/webpages.php:29 ../../mod/editblock.php:29 #: ../../mod/layouts.php:29 msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:842 ../../include/widgets.php:136 -#: ../../include/widgets.php:175 ../../include/conversation.php:940 +#: ../../include/identity.php:840 ../../include/widgets.php:136 +#: ../../include/widgets.php:175 ../../include/conversation.php:945 #: ../../include/Contact.php:107 ../../mod/match.php:62 #: ../../mod/directory.php:291 ../../mod/suggest.php:51 msgid "Connect" msgstr "" -#: ../../include/identity.php:856 ../../mod/profiles.php:774 +#: ../../include/identity.php:854 ../../mod/profiles.php:774 msgid "Change profile photo" msgstr "" -#: ../../include/identity.php:863 +#: ../../include/identity.php:861 msgid "Profiles" msgstr "" -#: ../../include/identity.php:863 +#: ../../include/identity.php:861 msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:864 ../../mod/profiles.php:775 +#: ../../include/identity.php:862 ../../mod/profiles.php:775 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:867 ../../include/nav.php:95 +#: ../../include/identity.php:865 ../../include/nav.php:95 msgid "Edit Profile" msgstr "" -#: ../../include/identity.php:880 ../../mod/profiles.php:786 +#: ../../include/identity.php:878 ../../mod/profiles.php:786 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:883 +#: ../../include/identity.php:881 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:884 ../../mod/profiles.php:669 +#: ../../include/identity.php:882 ../../mod/profiles.php:669 #: ../../mod/profiles.php:790 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:896 ../../include/bb2diaspora.php:450 -#: ../../include/event.php:40 ../../mod/events.php:645 +#: ../../include/identity.php:894 ../../include/bb2diaspora.php:473 +#: ../../include/event.php:40 ../../mod/events.php:647 #: ../../mod/directory.php:223 msgid "Location:" msgstr "" -#: ../../include/identity.php:900 ../../include/identity.php:1142 +#: ../../include/identity.php:898 ../../include/identity.php:1140 msgid "Gender:" msgstr "" -#: ../../include/identity.php:901 ../../include/identity.php:1186 +#: ../../include/identity.php:899 ../../include/identity.php:1184 msgid "Status:" msgstr "" -#: ../../include/identity.php:902 ../../include/identity.php:1197 +#: ../../include/identity.php:900 ../../include/identity.php:1195 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:903 +#: ../../include/identity.php:901 msgid "Online Now" msgstr "" -#: ../../include/identity.php:986 ../../include/identity.php:1066 +#: ../../include/identity.php:984 ../../include/identity.php:1064 #: ../../mod/ping.php:324 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:987 ../../include/identity.php:1067 +#: ../../include/identity.php:985 ../../include/identity.php:1065 msgid "F d" msgstr "" -#: ../../include/identity.php:1032 ../../include/identity.php:1107 +#: ../../include/identity.php:1030 ../../include/identity.php:1105 #: ../../mod/ping.php:346 msgid "[today]" msgstr "" -#: ../../include/identity.php:1044 +#: ../../include/identity.php:1042 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:1045 +#: ../../include/identity.php:1043 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:1100 +#: ../../include/identity.php:1098 msgid "[No description]" msgstr "" -#: ../../include/identity.php:1118 +#: ../../include/identity.php:1116 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:1119 +#: ../../include/identity.php:1117 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:1132 ../../include/identity.php:1249 +#: ../../include/identity.php:1130 ../../include/identity.php:1247 #: ../../include/apps.php:138 ../../mod/profperm.php:112 msgid "Profile" msgstr "" -#: ../../include/identity.php:1140 ../../mod/settings.php:1045 +#: ../../include/identity.php:1138 ../../mod/settings.php:1045 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:1147 +#: ../../include/identity.php:1145 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1158 ../../include/conversation.php:1692 +#: ../../include/identity.php:1156 ../../include/conversation.php:1698 #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:391 #: ../../mod/photos.php:1007 msgctxt "noun" @@ -302,100 +302,100 @@ msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../include/identity.php:1171 +#: ../../include/identity.php:1169 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1172 +#: ../../include/identity.php:1170 msgid "j F" msgstr "" -#: ../../include/identity.php:1179 +#: ../../include/identity.php:1177 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1183 +#: ../../include/identity.php:1181 msgid "Age:" msgstr "" -#: ../../include/identity.php:1192 +#: ../../include/identity.php:1190 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1195 ../../mod/profiles.php:691 +#: ../../include/identity.php:1193 ../../mod/profiles.php:691 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1199 ../../mod/profiles.php:693 +#: ../../include/identity.php:1197 ../../mod/profiles.php:693 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:1201 +#: ../../include/identity.php:1199 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1203 ../../mod/profiles.php:694 +#: ../../include/identity.php:1201 ../../mod/profiles.php:694 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1205 +#: ../../include/identity.php:1203 msgid "Religion:" msgstr "" -#: ../../include/identity.php:1207 +#: ../../include/identity.php:1205 msgid "About:" msgstr "" -#: ../../include/identity.php:1209 +#: ../../include/identity.php:1207 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1211 ../../mod/profiles.php:697 +#: ../../include/identity.php:1209 ../../mod/profiles.php:697 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1213 ../../mod/profiles.php:698 +#: ../../include/identity.php:1211 ../../mod/profiles.php:698 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1215 +#: ../../include/identity.php:1213 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1217 +#: ../../include/identity.php:1215 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1219 +#: ../../include/identity.php:1217 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1221 +#: ../../include/identity.php:1219 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1223 +#: ../../include/identity.php:1221 msgid "Television:" msgstr "" -#: ../../include/identity.php:1225 +#: ../../include/identity.php:1223 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1227 +#: ../../include/identity.php:1225 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1229 +#: ../../include/identity.php:1227 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1231 +#: ../../include/identity.php:1229 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1251 +#: ../../include/identity.php:1249 msgid "Like this thing" msgstr "" @@ -420,8 +420,8 @@ msgstr "" msgid "View" msgstr "" -#: ../../include/page_widgets.php:40 ../../include/conversation.php:1152 -#: ../../include/ItemObject.php:677 ../../mod/events.php:651 +#: ../../include/page_widgets.php:40 ../../include/conversation.php:1155 +#: ../../include/ItemObject.php:677 ../../mod/events.php:653 #: ../../mod/webpages.php:166 ../../mod/photos.php:970 msgid "Preview" msgstr "" @@ -460,7 +460,7 @@ msgstr "" msgid "System" msgstr "" -#: ../../include/widgets.php:94 ../../include/conversation.php:1498 +#: ../../include/widgets.php:94 ../../include/conversation.php:1501 msgid "Personal" msgstr "" @@ -507,7 +507,7 @@ msgstr "" #: ../../include/widgets.php:192 ../../include/text.php:833 #: ../../include/text.php:845 ../../mod/rbmark.php:28 ../../mod/rbmark.php:98 -#: ../../mod/filer.php:50 ../../mod/admin.php:1412 ../../mod/admin.php:1432 +#: ../../mod/filer.php:50 ../../mod/admin.php:1415 ../../mod/admin.php:1435 msgid "Save" msgstr "" @@ -603,8 +603,8 @@ msgid "Channel Sources" msgstr "" #: ../../include/widgets.php:537 ../../include/nav.php:208 -#: ../../include/apps.php:134 ../../mod/admin.php:1035 -#: ../../mod/admin.php:1235 +#: ../../include/apps.php:134 ../../mod/admin.php:1038 +#: ../../mod/admin.php:1238 msgid "Settings" msgstr "" @@ -650,14 +650,14 @@ msgid "Public Hubs" msgstr "" #: ../../include/conversation.php:120 ../../include/text.php:1747 -#: ../../include/diaspora.php:2030 ../../mod/like.php:335 +#: ../../include/diaspora.php:2030 ../../mod/like.php:346 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174 #: ../../mod/tagger.php:43 msgid "photo" msgstr "" #: ../../include/conversation.php:123 ../../include/text.php:1750 -#: ../../mod/like.php:337 ../../mod/tagger.php:47 +#: ../../mod/like.php:348 ../../mod/tagger.php:47 msgid "event" msgstr "" @@ -666,7 +666,7 @@ msgid "channel" msgstr "" #: ../../include/conversation.php:148 ../../include/text.php:1753 -#: ../../include/diaspora.php:2030 ../../mod/like.php:335 +#: ../../include/diaspora.php:2030 ../../mod/like.php:346 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174 #: ../../mod/tagger.php:51 msgid "status" @@ -678,12 +678,12 @@ msgid "comment" msgstr "" #: ../../include/conversation.php:164 ../../include/diaspora.php:2059 -#: ../../mod/like.php:383 +#: ../../mod/like.php:394 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/conversation.php:167 ../../mod/like.php:385 +#: ../../include/conversation.php:167 ../../mod/like.php:396 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -702,109 +702,109 @@ msgstr "" msgid "poked" msgstr "" -#: ../../include/conversation.php:261 ../../mod/mood.php:63 +#: ../../include/conversation.php:260 ../../mod/mood.php:63 #, php-format msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../include/conversation.php:556 ../../mod/photos.php:984 +#: ../../include/conversation.php:572 ../../mod/photos.php:984 msgctxt "title" msgid "Likes" msgstr "" -#: ../../include/conversation.php:556 ../../mod/photos.php:984 +#: ../../include/conversation.php:572 ../../mod/photos.php:984 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../include/conversation.php:557 ../../mod/photos.php:985 +#: ../../include/conversation.php:573 ../../mod/photos.php:985 msgctxt "title" msgid "Agree" msgstr "" -#: ../../include/conversation.php:557 ../../mod/photos.php:985 +#: ../../include/conversation.php:573 ../../mod/photos.php:985 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../include/conversation.php:557 ../../mod/photos.php:985 +#: ../../include/conversation.php:573 ../../mod/photos.php:985 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../include/conversation.php:558 ../../mod/photos.php:986 +#: ../../include/conversation.php:574 ../../mod/photos.php:986 msgctxt "title" msgid "Attending" msgstr "" -#: ../../include/conversation.php:558 ../../mod/photos.php:986 +#: ../../include/conversation.php:574 ../../mod/photos.php:986 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../include/conversation.php:558 ../../mod/photos.php:986 +#: ../../include/conversation.php:574 ../../mod/photos.php:986 msgctxt "title" msgid "Might attend" msgstr "" -#: ../../include/conversation.php:644 ../../include/ItemObject.php:126 +#: ../../include/conversation.php:659 ../../include/ItemObject.php:126 msgid "Select" msgstr "" -#: ../../include/conversation.php:645 ../../include/RedDAV/RedBrowser.php:268 +#: ../../include/conversation.php:660 ../../include/RedDAV/RedBrowser.php:268 #: ../../include/ItemObject.php:120 ../../include/apps.php:255 #: ../../mod/settings.php:645 ../../mod/connedit.php:533 -#: ../../mod/group.php:176 ../../mod/thing.php:234 ../../mod/admin.php:816 -#: ../../mod/admin.php:945 ../../mod/photos.php:1050 +#: ../../mod/group.php:176 ../../mod/thing.php:234 ../../mod/admin.php:819 +#: ../../mod/admin.php:948 ../../mod/photos.php:1050 msgid "Delete" msgstr "" -#: ../../include/conversation.php:652 ../../include/ItemObject.php:89 +#: ../../include/conversation.php:667 ../../include/ItemObject.php:89 msgid "Private Message" msgstr "" -#: ../../include/conversation.php:659 ../../include/ItemObject.php:227 +#: ../../include/conversation.php:674 ../../include/ItemObject.php:227 msgid "Message signature validated" msgstr "" -#: ../../include/conversation.php:660 ../../include/ItemObject.php:228 +#: ../../include/conversation.php:675 ../../include/ItemObject.php:228 msgid "Message signature incorrect" msgstr "" -#: ../../include/conversation.php:680 +#: ../../include/conversation.php:692 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:695 +#: ../../include/conversation.php:707 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:696 +#: ../../include/conversation.php:708 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:704 ../../include/ItemObject.php:312 +#: ../../include/conversation.php:716 ../../include/ItemObject.php:312 #, php-format msgid " from %s" msgstr "" -#: ../../include/conversation.php:707 ../../include/ItemObject.php:315 +#: ../../include/conversation.php:719 ../../include/ItemObject.php:315 #, php-format msgid "last edited: %s" msgstr "" -#: ../../include/conversation.php:708 ../../include/ItemObject.php:316 +#: ../../include/conversation.php:720 ../../include/ItemObject.php:316 #, php-format msgid "Expires: %s" msgstr "" -#: ../../include/conversation.php:723 +#: ../../include/conversation.php:735 msgid "View in context" msgstr "" -#: ../../include/conversation.php:725 ../../include/conversation.php:1203 +#: ../../include/conversation.php:737 ../../include/conversation.php:1208 #: ../../include/ItemObject.php:364 ../../mod/editlayout.php:153 #: ../../mod/editwebpage.php:188 ../../mod/editpost.php:130 #: ../../mod/editblock.php:157 ../../mod/photos.php:950 ../../mod/mail.php:241 @@ -812,52 +812,52 @@ msgstr "" msgid "Please wait" msgstr "" -#: ../../include/conversation.php:838 +#: ../../include/conversation.php:846 msgid "remove" msgstr "" -#: ../../include/conversation.php:842 ../../include/nav.php:247 +#: ../../include/conversation.php:850 ../../include/nav.php:247 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:843 +#: ../../include/conversation.php:851 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:934 +#: ../../include/conversation.php:939 msgid "View Source" msgstr "" -#: ../../include/conversation.php:935 +#: ../../include/conversation.php:940 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:936 +#: ../../include/conversation.php:941 msgid "View Status" msgstr "" -#: ../../include/conversation.php:937 ../../include/nav.php:91 +#: ../../include/conversation.php:942 ../../include/nav.php:91 #: ../../mod/connedit.php:484 ../../mod/connedit.php:634 msgid "View Profile" msgstr "" -#: ../../include/conversation.php:938 +#: ../../include/conversation.php:943 msgid "View Photos" msgstr "" -#: ../../include/conversation.php:939 +#: ../../include/conversation.php:944 msgid "Matrix Activity" msgstr "" -#: ../../include/conversation.php:941 +#: ../../include/conversation.php:946 msgid "Edit Contact" msgstr "" -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:947 msgid "Send PM" msgstr "" -#: ../../include/conversation.php:943 ../../include/apps.php:145 +#: ../../include/conversation.php:948 ../../include/apps.php:145 msgid "Poke" msgstr "" @@ -868,373 +868,373 @@ msgstr "" msgid "Unknown" msgstr "" -#: ../../include/conversation.php:1061 +#: ../../include/conversation.php:1063 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1061 +#: ../../include/conversation.php:1063 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1065 +#: ../../include/conversation.php:1067 #, 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:1067 +#: ../../include/conversation.php:1069 #, 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:1073 +#: ../../include/conversation.php:1075 msgid "and" msgstr "" -#: ../../include/conversation.php:1076 +#: ../../include/conversation.php:1078 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1077 +#: ../../include/conversation.php:1079 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1077 +#: ../../include/conversation.php:1079 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1136 +#: ../../include/conversation.php:1139 msgid "Visible to <strong>everybody</strong>" msgstr "" -#: ../../include/conversation.php:1137 ../../mod/mail.php:174 +#: ../../include/conversation.php:1140 ../../mod/mail.php:174 #: ../../mod/mail.php:289 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:1138 +#: ../../include/conversation.php:1141 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1139 +#: ../../include/conversation.php:1142 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1140 +#: ../../include/conversation.php:1143 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1141 ../../mod/filer.php:49 +#: ../../include/conversation.php:1144 ../../mod/filer.php:49 msgid "Save to Folder:" msgstr "" -#: ../../include/conversation.php:1142 +#: ../../include/conversation.php:1145 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1143 ../../mod/editpost.php:52 +#: ../../include/conversation.php:1146 ../../mod/editpost.php:52 #: ../../mod/mail.php:175 ../../mod/mail.php:290 msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/conversation.php:1169 ../../mod/editlayout.php:198 +#: ../../include/conversation.php:1174 ../../mod/editlayout.php:198 #: ../../mod/editwebpage.php:235 ../../mod/editblock.php:203 #: ../../mod/photos.php:949 ../../mod/layouts.php:168 msgid "Share" msgstr "" -#: ../../include/conversation.php:1171 ../../mod/editwebpage.php:170 +#: ../../include/conversation.php:1176 ../../mod/editwebpage.php:170 msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1174 +#: ../../include/conversation.php:1179 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1176 ../../include/ItemObject.php:669 +#: ../../include/conversation.php:1181 ../../include/ItemObject.php:669 #: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:175 #: ../../mod/editpost.php:114 ../../mod/editblock.php:144 msgid "Bold" msgstr "" -#: ../../include/conversation.php:1177 ../../include/ItemObject.php:670 +#: ../../include/conversation.php:1182 ../../include/ItemObject.php:670 #: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:176 #: ../../mod/editpost.php:115 ../../mod/editblock.php:145 msgid "Italic" msgstr "" -#: ../../include/conversation.php:1178 ../../include/ItemObject.php:671 +#: ../../include/conversation.php:1183 ../../include/ItemObject.php:671 #: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:177 #: ../../mod/editpost.php:116 ../../mod/editblock.php:146 msgid "Underline" msgstr "" -#: ../../include/conversation.php:1179 ../../include/ItemObject.php:672 +#: ../../include/conversation.php:1184 ../../include/ItemObject.php:672 #: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:178 #: ../../mod/editpost.php:117 ../../mod/editblock.php:147 msgid "Quote" msgstr "" -#: ../../include/conversation.php:1180 ../../include/ItemObject.php:673 +#: ../../include/conversation.php:1185 ../../include/ItemObject.php:673 #: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:179 #: ../../mod/editpost.php:118 ../../mod/editblock.php:148 msgid "Code" msgstr "" -#: ../../include/conversation.php:1181 ../../mod/editlayout.php:145 +#: ../../include/conversation.php:1186 ../../mod/editlayout.php:145 #: ../../mod/editwebpage.php:180 ../../mod/editpost.php:119 #: ../../mod/editblock.php:149 ../../mod/mail.php:238 ../../mod/mail.php:352 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1182 +#: ../../include/conversation.php:1187 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1183 ../../mod/editlayout.php:146 +#: ../../include/conversation.php:1188 ../../mod/editlayout.php:146 #: ../../mod/editwebpage.php:181 ../../mod/editpost.php:120 #: ../../mod/editblock.php:150 ../../mod/mail.php:239 ../../mod/mail.php:353 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1184 +#: ../../include/conversation.php:1189 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1185 ../../mod/editlayout.php:147 +#: ../../include/conversation.php:1190 ../../mod/editlayout.php:147 #: ../../mod/editwebpage.php:182 ../../mod/editpost.php:121 #: ../../mod/editblock.php:151 ../../mod/mail.php:240 ../../mod/mail.php:354 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1186 +#: ../../include/conversation.php:1191 msgid "web link" msgstr "" -#: ../../include/conversation.php:1187 +#: ../../include/conversation.php:1192 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1188 +#: ../../include/conversation.php:1193 msgid "video link" msgstr "" -#: ../../include/conversation.php:1189 +#: ../../include/conversation.php:1194 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1190 +#: ../../include/conversation.php:1195 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1191 ../../mod/editlayout.php:151 +#: ../../include/conversation.php:1196 ../../mod/editlayout.php:151 #: ../../mod/editwebpage.php:186 ../../mod/editpost.php:125 #: ../../mod/editblock.php:155 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1192 +#: ../../include/conversation.php:1197 msgid "set location" msgstr "" -#: ../../include/conversation.php:1193 ../../mod/editpost.php:127 +#: ../../include/conversation.php:1198 ../../mod/editpost.php:127 msgid "Toggle voting" msgstr "" -#: ../../include/conversation.php:1196 ../../mod/editlayout.php:152 +#: ../../include/conversation.php:1201 ../../mod/editlayout.php:152 #: ../../mod/editwebpage.php:187 ../../mod/editpost.php:126 #: ../../mod/editblock.php:156 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1197 +#: ../../include/conversation.php:1202 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1199 ../../mod/editlayout.php:164 +#: ../../include/conversation.php:1204 ../../mod/editlayout.php:164 #: ../../mod/editwebpage.php:203 ../../mod/editpost.php:141 #: ../../mod/editblock.php:169 msgid "Title (optional)" msgstr "" -#: ../../include/conversation.php:1202 ../../mod/editlayout.php:167 +#: ../../include/conversation.php:1207 ../../mod/editlayout.php:167 #: ../../mod/editwebpage.php:205 ../../mod/editpost.php:143 #: ../../mod/editblock.php:172 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/conversation.php:1204 ../../mod/editlayout.php:154 +#: ../../include/conversation.php:1209 ../../mod/editlayout.php:154 #: ../../mod/editwebpage.php:189 ../../mod/editpost.php:131 #: ../../mod/editblock.php:158 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1205 +#: ../../include/conversation.php:1210 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1212 ../../mod/editlayout.php:161 +#: ../../include/conversation.php:1217 ../../mod/editlayout.php:161 #: ../../mod/editwebpage.php:198 ../../mod/editpost.php:138 #: ../../mod/editblock.php:166 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1214 ../../mod/editlayout.php:168 +#: ../../include/conversation.php:1219 ../../mod/editlayout.php:168 #: ../../mod/editwebpage.php:206 ../../mod/editpost.php:144 #: ../../mod/editblock.php:173 msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../include/conversation.php:1227 ../../mod/editlayout.php:178 +#: ../../include/conversation.php:1232 ../../mod/editlayout.php:178 #: ../../mod/editwebpage.php:215 ../../mod/editpost.php:155 #: ../../mod/editblock.php:183 ../../mod/mail.php:245 ../../mod/mail.php:359 msgid "Set expiration date" msgstr "" -#: ../../include/conversation.php:1229 ../../include/ItemObject.php:680 +#: ../../include/conversation.php:1234 ../../include/ItemObject.php:680 #: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:361 msgid "Encrypt text" msgstr "" -#: ../../include/conversation.php:1231 ../../mod/events.php:635 +#: ../../include/conversation.php:1236 ../../mod/events.php:637 #: ../../mod/editpost.php:159 msgid "OK" msgstr "" -#: ../../include/conversation.php:1232 ../../mod/settings.php:583 +#: ../../include/conversation.php:1237 ../../mod/settings.php:583 #: ../../mod/settings.php:609 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134 -#: ../../mod/events.php:634 ../../mod/fbrowser.php:82 +#: ../../mod/events.php:636 ../../mod/fbrowser.php:82 #: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160 msgid "Cancel" msgstr "" -#: ../../include/conversation.php:1475 +#: ../../include/conversation.php:1478 msgid "Discover" msgstr "" -#: ../../include/conversation.php:1478 +#: ../../include/conversation.php:1481 msgid "Imported public streams" msgstr "" -#: ../../include/conversation.php:1483 +#: ../../include/conversation.php:1486 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1486 +#: ../../include/conversation.php:1489 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1490 +#: ../../include/conversation.php:1493 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1493 +#: ../../include/conversation.php:1496 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1501 +#: ../../include/conversation.php:1504 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1507 ../../mod/connections.php:212 +#: ../../include/conversation.php:1510 ../../mod/connections.php:212 #: ../../mod/connections.php:225 ../../mod/menu.php:80 msgid "New" msgstr "" -#: ../../include/conversation.php:1510 +#: ../../include/conversation.php:1513 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1516 +#: ../../include/conversation.php:1519 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1519 +#: ../../include/conversation.php:1522 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1526 +#: ../../include/conversation.php:1529 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1529 +#: ../../include/conversation.php:1532 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1568 ../../mod/admin.php:949 +#: ../../include/conversation.php:1576 ../../mod/admin.php:952 msgid "Channel" msgstr "" -#: ../../include/conversation.php:1571 +#: ../../include/conversation.php:1579 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1580 +#: ../../include/conversation.php:1588 msgid "About" msgstr "" -#: ../../include/conversation.php:1583 +#: ../../include/conversation.php:1591 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1589 ../../include/nav.php:97 +#: ../../include/conversation.php:1597 ../../include/nav.php:97 #: ../../include/apps.php:139 ../../mod/fbrowser.php:25 msgid "Photos" msgstr "" -#: ../../include/conversation.php:1592 ../../include/photos.php:356 +#: ../../include/conversation.php:1600 ../../include/photos.php:356 msgid "Photo Albums" msgstr "" -#: ../../include/conversation.php:1598 ../../include/RedDAV/RedBrowser.php:249 +#: ../../include/conversation.php:1606 ../../include/RedDAV/RedBrowser.php:249 #: ../../include/nav.php:98 ../../include/apps.php:135 #: ../../mod/fbrowser.php:114 msgid "Files" msgstr "" -#: ../../include/conversation.php:1601 +#: ../../include/conversation.php:1609 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1611 ../../include/conversation.php:1614 +#: ../../include/conversation.php:1619 ../../include/conversation.php:1622 msgid "Chatrooms" msgstr "" -#: ../../include/conversation.php:1624 ../../include/nav.php:109 +#: ../../include/conversation.php:1632 ../../include/nav.php:109 #: ../../include/apps.php:129 msgid "Bookmarks" msgstr "" -#: ../../include/conversation.php:1627 +#: ../../include/conversation.php:1635 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1635 ../../include/nav.php:113 +#: ../../include/conversation.php:1642 ../../include/nav.php:113 #: ../../include/apps.php:136 ../../mod/webpages.php:160 msgid "Webpages" msgstr "" -#: ../../include/conversation.php:1638 +#: ../../include/conversation.php:1645 msgid "Manage Webpages" msgstr "" -#: ../../include/conversation.php:1667 ../../include/ItemObject.php:175 +#: ../../include/conversation.php:1674 ../../include/ItemObject.php:175 #: ../../include/ItemObject.php:187 ../../mod/photos.php:1003 #: ../../mod/photos.php:1015 msgid "View all" msgstr "" -#: ../../include/conversation.php:1695 ../../include/ItemObject.php:184 +#: ../../include/conversation.php:1701 ../../include/ItemObject.php:184 #: ../../mod/photos.php:1012 msgctxt "noun" msgid "Dislike" @@ -1242,42 +1242,42 @@ msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1698 +#: ../../include/conversation.php:1704 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1701 +#: ../../include/conversation.php:1707 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1704 +#: ../../include/conversation.php:1710 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1707 +#: ../../include/conversation.php:1713 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1710 +#: ../../include/conversation.php:1716 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1713 +#: ../../include/conversation.php:1719 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -1286,9 +1286,9 @@ msgstr[1] "" #: ../../include/attach.php:137 ../../include/attach.php:184 #: ../../include/attach.php:247 ../../include/attach.php:261 -#: ../../include/attach.php:301 ../../include/attach.php:315 -#: ../../include/attach.php:339 ../../include/attach.php:532 -#: ../../include/attach.php:606 ../../include/items.php:4093 +#: ../../include/attach.php:305 ../../include/attach.php:319 +#: ../../include/attach.php:344 ../../include/attach.php:540 +#: ../../include/attach.php:614 ../../include/items.php:4097 #: ../../include/photos.php:15 ../../include/chat.php:131 #: ../../mod/profile.php:64 ../../mod/profile.php:72 #: ../../mod/achievements.php:30 ../../mod/manage.php:6 @@ -1298,8 +1298,8 @@ msgstr[1] "" #: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178 #: ../../mod/events.php:219 ../../mod/connedit.php:321 ../../mod/group.php:9 #: ../../mod/setup.php:207 ../../mod/common.php:35 ../../mod/id.php:61 -#: ../../mod/connections.php:169 ../../mod/item.php:197 ../../mod/item.php:205 -#: ../../mod/item.php:938 ../../mod/thing.php:247 ../../mod/thing.php:264 +#: ../../mod/connections.php:169 ../../mod/item.php:207 ../../mod/item.php:215 +#: ../../mod/item.php:958 ../../mod/thing.php:247 ../../mod/thing.php:264 #: ../../mod/thing.php:299 ../../mod/pdledit.php:21 ../../mod/authtest.php:13 #: ../../mod/editlayout.php:64 ../../mod/editlayout.php:89 #: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64 @@ -1307,8 +1307,8 @@ msgstr[1] "" #: ../../mod/rate.php:110 ../../mod/editpost.php:13 ../../mod/invite.php:13 #: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66 #: ../../mod/menu.php:61 ../../mod/filestorage.php:18 -#: ../../mod/filestorage.php:72 ../../mod/filestorage.php:87 -#: ../../mod/filestorage.php:114 ../../mod/fsuggest.php:78 +#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88 +#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78 #: ../../mod/poke.php:128 ../../mod/profiles.php:188 #: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14 #: ../../mod/webpages.php:67 ../../mod/viewconnections.php:22 @@ -1317,70 +1317,70 @@ msgstr[1] "" #: ../../mod/mitem.php:106 ../../mod/mood.php:111 ../../mod/layouts.php:67 #: ../../mod/layouts.php:74 ../../mod/layouts.php:85 ../../mod/mail.php:114 #: ../../mod/notifications.php:66 ../../mod/regmod.php:17 -#: ../../mod/network.php:12 ../../mod/new_channel.php:68 -#: ../../mod/new_channel.php:99 ../../mod/appman.php:66 ../../mod/page.php:28 -#: ../../mod/page.php:78 ../../mod/bookmarks.php:46 ../../mod/channel.php:95 -#: ../../mod/channel.php:206 ../../mod/channel.php:249 +#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99 +#: ../../mod/appman.php:66 ../../mod/network.php:12 ../../mod/page.php:28 +#: ../../mod/page.php:78 ../../mod/bookmarks.php:46 ../../mod/channel.php:100 +#: ../../mod/channel.php:219 ../../mod/channel.php:262 #: ../../mod/suggest.php:26 ../../mod/service_limits.php:7 #: ../../mod/sharedwithme.php:7 ../../index.php:190 ../../index.php:393 msgid "Permission denied." msgstr "" -#: ../../include/attach.php:242 ../../include/attach.php:296 +#: ../../include/attach.php:242 ../../include/attach.php:300 msgid "Item was not found." msgstr "" -#: ../../include/attach.php:352 +#: ../../include/attach.php:357 msgid "No source file." msgstr "" -#: ../../include/attach.php:369 +#: ../../include/attach.php:375 msgid "Cannot locate file to replace" msgstr "" -#: ../../include/attach.php:387 +#: ../../include/attach.php:393 msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/attach.php:398 +#: ../../include/attach.php:404 #, php-format msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/attach.php:410 +#: ../../include/attach.php:416 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/attach.php:493 +#: ../../include/attach.php:499 msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/attach.php:505 +#: ../../include/attach.php:511 msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/attach.php:547 ../../include/attach.php:564 +#: ../../include/attach.php:555 ../../include/attach.php:572 msgid "Path not available." msgstr "" -#: ../../include/attach.php:611 +#: ../../include/attach.php:619 msgid "Empty pathname" msgstr "" -#: ../../include/attach.php:627 +#: ../../include/attach.php:635 msgid "duplicate filename or path" msgstr "" -#: ../../include/attach.php:651 +#: ../../include/attach.php:659 msgid "Path not found." msgstr "" -#: ../../include/attach.php:702 +#: ../../include/attach.php:710 msgid "mkdir failed." msgstr "" -#: ../../include/attach.php:706 +#: ../../include/attach.php:714 msgid "database storage failed." msgstr "" @@ -1535,21 +1535,21 @@ msgstr "" #: ../../mod/settings.php:710 ../../mod/settings.php:738 #: ../../mod/settings.php:761 ../../mod/settings.php:843 #: ../../mod/settings.php:1039 ../../mod/xchan.php:11 ../../mod/connect.php:93 -#: ../../mod/events.php:654 ../../mod/connedit.php:653 ../../mod/group.php:81 +#: ../../mod/events.php:656 ../../mod/connedit.php:653 ../../mod/group.php:81 #: ../../mod/setup.php:313 ../../mod/setup.php:358 ../../mod/thing.php:284 #: ../../mod/thing.php:327 ../../mod/pdledit.php:58 ../../mod/import.php:504 #: ../../mod/chat.php:177 ../../mod/chat.php:211 ../../mod/rate.php:167 #: ../../mod/invite.php:142 ../../mod/locs.php:105 ../../mod/sources.php:104 -#: ../../mod/sources.php:138 ../../mod/filestorage.php:155 +#: ../../mod/sources.php:138 ../../mod/filestorage.php:156 #: ../../mod/fsuggest.php:108 ../../mod/poke.php:166 -#: ../../mod/profiles.php:667 ../../mod/admin.php:441 ../../mod/admin.php:809 -#: ../../mod/admin.php:943 ../../mod/admin.php:1074 ../../mod/admin.php:1269 -#: ../../mod/admin.php:1352 ../../mod/photos.php:565 ../../mod/photos.php:642 +#: ../../mod/profiles.php:667 ../../mod/admin.php:443 ../../mod/admin.php:812 +#: ../../mod/admin.php:946 ../../mod/admin.php:1077 ../../mod/admin.php:1272 +#: ../../mod/admin.php:1355 ../../mod/photos.php:565 ../../mod/photos.php:642 #: ../../mod/photos.php:929 ../../mod/photos.php:969 ../../mod/photos.php:1087 #: ../../mod/mood.php:134 ../../mod/mail.php:355 ../../mod/appman.php:99 #: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24 #: ../../view/theme/apw/php/config.php:256 -#: ../../view/theme/redbasic/php/config.php:97 +#: ../../view/theme/redbasic/php/config.php:97 ../../wppost/wppost.php:104 msgid "Submit" msgstr "" @@ -1635,7 +1635,7 @@ msgstr "" msgid "parent" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:130 ../../include/text.php:2395 +#: ../../include/RedDAV/RedBrowser.php:130 ../../include/text.php:2407 msgid "Collection" msgstr "" @@ -1690,8 +1690,8 @@ msgid "Upload" msgstr "" #: ../../include/RedDAV/RedBrowser.php:262 ../../mod/settings.php:584 -#: ../../mod/settings.php:610 ../../mod/admin.php:950 -#: ../../mod/sharedwithme.php:100 +#: ../../mod/settings.php:610 ../../mod/admin.php:953 +#: ../../mod/sharedwithme.php:95 msgid "Name" msgstr "" @@ -1699,11 +1699,11 @@ msgstr "" msgid "Type" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:101 +#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:97 msgid "Size" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:265 ../../mod/sharedwithme.php:102 +#: ../../include/RedDAV/RedBrowser.php:265 ../../mod/sharedwithme.php:98 msgid "Last Modified" msgstr "" @@ -1720,7 +1720,7 @@ msgstr "" msgid "%1$s's bookmarks" msgstr "" -#: ../../include/comanche.php:34 ../../mod/admin.php:381 +#: ../../include/comanche.php:34 ../../mod/admin.php:383 #: ../../view/theme/apw/php/config.php:185 msgid "Default" msgstr "" @@ -1976,79 +1976,6 @@ msgstr "" msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../include/items.php:382 ../../mod/like.php:270 -#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23 -#: ../../mod/bulksetclose.php:11 ../../index.php:392 -msgid "Permission denied" -msgstr "" - -#: ../../include/items.php:979 ../../include/items.php:1024 -msgid "(Unknown)" -msgstr "" - -#: ../../include/items.php:1181 -msgid "Visible to anybody on the internet." -msgstr "" - -#: ../../include/items.php:1183 -msgid "Visible to you only." -msgstr "" - -#: ../../include/items.php:1185 -msgid "Visible to anybody in this network." -msgstr "" - -#: ../../include/items.php:1187 -msgid "Visible to anybody authenticated." -msgstr "" - -#: ../../include/items.php:1189 -#, php-format -msgid "Visible to anybody on %s." -msgstr "" - -#: ../../include/items.php:1191 -msgid "Visible to all connections." -msgstr "" - -#: ../../include/items.php:1193 -msgid "Visible to approved connections." -msgstr "" - -#: ../../include/items.php:1195 -msgid "Visible to specific connections." -msgstr "" - -#: ../../include/items.php:4023 ../../mod/thing.php:76 -#: ../../mod/display.php:32 ../../mod/filestorage.php:27 -#: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:981 -#: ../../mod/admin.php:1181 -msgid "Item not found." -msgstr "" - -#: ../../include/items.php:4476 ../../mod/group.php:38 ../../mod/group.php:140 -#: ../../mod/bulksetclose.php:51 -msgid "Collection not found." -msgstr "" - -#: ../../include/items.php:4491 -msgid "Collection is empty." -msgstr "" - -#: ../../include/items.php:4498 -#, php-format -msgid "Collection: %s" -msgstr "" - -#: ../../include/items.php:4509 -#, php-format -msgid "Connection: %s" -msgstr "" - -#: ../../include/items.php:4512 -msgid "Connection not found." -msgstr "" - #: ../../include/contact_selectors.php:56 msgid "Frequently" msgstr "" @@ -2086,7 +2013,7 @@ msgid "RSS/Atom" msgstr "" #: ../../include/contact_selectors.php:79 ../../mod/id.php:12 -#: ../../mod/id.php:13 ../../mod/admin.php:812 ../../mod/admin.php:821 +#: ../../mod/id.php:13 ../../mod/admin.php:815 ../../mod/admin.php:824 #: ../../boot.php:1554 msgid "Email" msgstr "" @@ -2315,86 +2242,86 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:212 ../../mod/events.php:633 +#: ../../include/datetime.php:214 ../../mod/events.php:635 #: ../../mod/appman.php:91 ../../mod/appman.php:92 msgid "Required" msgstr "" -#: ../../include/datetime.php:231 ../../boot.php:2356 +#: ../../include/datetime.php:233 ../../boot.php:2356 msgid "never" msgstr "" -#: ../../include/datetime.php:237 +#: ../../include/datetime.php:239 msgid "less than a second ago" msgstr "" -#: ../../include/datetime.php:240 +#: ../../include/datetime.php:242 msgid "year" msgstr "" -#: ../../include/datetime.php:240 +#: ../../include/datetime.php:242 msgid "years" msgstr "" -#: ../../include/datetime.php:241 +#: ../../include/datetime.php:243 msgid "month" msgstr "" -#: ../../include/datetime.php:241 +#: ../../include/datetime.php:243 msgid "months" msgstr "" -#: ../../include/datetime.php:242 +#: ../../include/datetime.php:244 msgid "week" msgstr "" -#: ../../include/datetime.php:242 +#: ../../include/datetime.php:244 msgid "weeks" msgstr "" -#: ../../include/datetime.php:243 +#: ../../include/datetime.php:245 msgid "day" msgstr "" -#: ../../include/datetime.php:243 +#: ../../include/datetime.php:245 msgid "days" msgstr "" -#: ../../include/datetime.php:244 +#: ../../include/datetime.php:246 msgid "hour" msgstr "" -#: ../../include/datetime.php:244 +#: ../../include/datetime.php:246 msgid "hours" msgstr "" -#: ../../include/datetime.php:245 +#: ../../include/datetime.php:247 msgid "minute" msgstr "" -#: ../../include/datetime.php:245 +#: ../../include/datetime.php:247 msgid "minutes" msgstr "" -#: ../../include/datetime.php:246 +#: ../../include/datetime.php:248 msgid "second" msgstr "" -#: ../../include/datetime.php:246 +#: ../../include/datetime.php:248 msgid "seconds" msgstr "" -#: ../../include/datetime.php:255 +#: ../../include/datetime.php:257 #, php-format msgid "%1$d %2$s ago" msgstr "" -#: ../../include/datetime.php:463 +#: ../../include/datetime.php:465 #, php-format msgid "%1$s's birthday" msgstr "" -#: ../../include/datetime.php:464 +#: ../../include/datetime.php:466 #, php-format msgid "Happy Birthday %1$s" msgstr "" @@ -2407,31 +2334,104 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/Contact.php:215 ../../mod/admin.php:726 +#: ../../include/Contact.php:215 ../../mod/admin.php:729 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../include/bb2diaspora.php:349 +#: ../../include/bb2diaspora.php:373 msgid "Attachments:" msgstr "" -#: ../../include/bb2diaspora.php:428 ../../include/event.php:11 +#: ../../include/bb2diaspora.php:451 ../../include/event.php:11 msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/bb2diaspora.php:430 +#: ../../include/bb2diaspora.php:453 msgid "Redmatrix event notification:" msgstr "" -#: ../../include/bb2diaspora.php:434 ../../include/event.php:20 +#: ../../include/bb2diaspora.php:457 ../../include/event.php:20 msgid "Starts:" msgstr "" -#: ../../include/bb2diaspora.php:442 ../../include/event.php:30 +#: ../../include/bb2diaspora.php:465 ../../include/event.php:30 msgid "Finishes:" msgstr "" +#: ../../include/items.php:382 ../../mod/like.php:270 +#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23 +#: ../../mod/bulksetclose.php:11 ../../index.php:392 +msgid "Permission denied" +msgstr "" + +#: ../../include/items.php:979 ../../include/items.php:1024 +msgid "(Unknown)" +msgstr "" + +#: ../../include/items.php:1181 +msgid "Visible to anybody on the internet." +msgstr "" + +#: ../../include/items.php:1183 +msgid "Visible to you only." +msgstr "" + +#: ../../include/items.php:1185 +msgid "Visible to anybody in this network." +msgstr "" + +#: ../../include/items.php:1187 +msgid "Visible to anybody authenticated." +msgstr "" + +#: ../../include/items.php:1189 +#, php-format +msgid "Visible to anybody on %s." +msgstr "" + +#: ../../include/items.php:1191 +msgid "Visible to all connections." +msgstr "" + +#: ../../include/items.php:1193 +msgid "Visible to approved connections." +msgstr "" + +#: ../../include/items.php:1195 +msgid "Visible to specific connections." +msgstr "" + +#: ../../include/items.php:4027 ../../mod/thing.php:76 +#: ../../mod/display.php:36 ../../mod/filestorage.php:27 +#: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:984 +#: ../../mod/admin.php:1184 +msgid "Item not found." +msgstr "" + +#: ../../include/items.php:4479 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../mod/bulksetclose.php:51 +msgid "Collection not found." +msgstr "" + +#: ../../include/items.php:4494 +msgid "Collection is empty." +msgstr "" + +#: ../../include/items.php:4501 +#, php-format +msgid "Collection: %s" +msgstr "" + +#: ../../include/items.php:4512 +#, php-format +msgid "Connection: %s" +msgstr "" + +#: ../../include/items.php:4515 +msgid "Connection not found." +msgstr "" + #: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1551 msgid "Logout" msgstr "" @@ -2536,7 +2536,7 @@ msgstr "" #: ../../include/nav.php:165 ../../include/apps.php:147 #: ../../include/text.php:832 ../../include/text.php:844 -#: ../../mod/search.php:34 +#: ../../mod/search.php:38 msgid "Search" msgstr "" @@ -2726,14 +2726,10 @@ msgstr "" msgid "This event has been added to your calendar." msgstr "" -#: ../../include/api.php:1081 +#: ../../include/api.php:1095 msgid "Public Timeline" msgstr "" -#: ../../include/network.php:620 -msgid "view full size" -msgstr "" - #: ../../include/dir_fns.php:134 msgid "Directory Options" msgstr "" @@ -2791,15 +2787,15 @@ msgstr "" msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/auth.php:130 +#: ../../include/auth.php:131 msgid "Logged out." msgstr "" -#: ../../include/auth.php:271 +#: ../../include/auth.php:272 msgid "Failed authentication" msgstr "" -#: ../../include/auth.php:285 ../../mod/openid.php:190 +#: ../../include/auth.php:286 ../../mod/openid.php:190 msgid "Login failed." msgstr "" @@ -3005,7 +3001,7 @@ msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:445 +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:447 msgid "Advanced" msgstr "" @@ -3070,8 +3066,8 @@ msgstr "" msgid "Don't show" msgstr "" -#: ../../include/acl_selectors.php:248 ../../mod/events.php:652 -#: ../../mod/chat.php:209 ../../mod/filestorage.php:146 +#: ../../include/acl_selectors.php:248 ../../mod/events.php:654 +#: ../../mod/chat.php:209 ../../mod/filestorage.php:147 #: ../../mod/photos.php:559 ../../mod/photos.php:922 msgid "Permissions" msgstr "" @@ -3686,23 +3682,23 @@ msgstr "" msgid "activity" msgstr "" -#: ../../include/text.php:2047 +#: ../../include/text.php:2051 msgid "Design" msgstr "" -#: ../../include/text.php:2050 +#: ../../include/text.php:2054 msgid "Blocks" msgstr "" -#: ../../include/text.php:2051 +#: ../../include/text.php:2055 msgid "Menus" msgstr "" -#: ../../include/text.php:2052 +#: ../../include/text.php:2056 msgid "Layouts" msgstr "" -#: ../../include/text.php:2053 +#: ../../include/text.php:2057 msgid "Pages" msgstr "" @@ -3856,6 +3852,10 @@ msgstr "" msgid "Custom/Expert Mode" msgstr "" +#: ../../include/network.php:619 +msgid "view full size" +msgstr "" + #: ../../mod/achievements.php:34 msgid "Some blurb about what to do when you're new here" msgstr "" @@ -3943,15 +3943,17 @@ msgstr "" msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:573 ../../mod/api.php:106 ../../mod/admin.php:419 +#: ../../mod/settings.php:573 ../../mod/api.php:106 ../../mod/admin.php:421 #: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102 -#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1556 +#: ../../view/theme/redbasic/php/config.php:127 ../../wppost/wppost.php:80 +#: ../../wppost/wppost.php:96 ../../wppost/wppost.php:100 ../../boot.php:1556 msgid "No" msgstr "" -#: ../../mod/settings.php:573 ../../mod/api.php:105 ../../mod/admin.php:421 +#: ../../mod/settings.php:573 ../../mod/api.php:105 ../../mod/admin.php:423 #: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102 -#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1556 +#: ../../view/theme/redbasic/php/config.php:127 ../../wppost/wppost.php:80 +#: ../../wppost/wppost.php:96 ../../wppost/wppost.php:100 ../../boot.php:1556 msgid "Yes" msgstr "" @@ -4090,7 +4092,7 @@ msgstr "" msgid "%s - (Experimental)" msgstr "" -#: ../../mod/settings.php:805 ../../mod/admin.php:391 +#: ../../mod/settings.php:805 ../../mod/admin.php:393 msgid "mobile" msgstr "" @@ -4610,11 +4612,11 @@ msgstr "" msgid "Fetching URL returns error: %1$s" msgstr "" -#: ../../mod/home.php:48 +#: ../../mod/home.php:53 msgid "Red Matrix - "The Network"" msgstr "" -#: ../../mod/home.php:101 +#: ../../mod/home.php:106 #, php-format msgid "Welcome to %s" msgstr "" @@ -4699,7 +4701,7 @@ msgstr "" msgid "Channel not found." msgstr "" -#: ../../mod/block.php:75 ../../mod/help.php:79 ../../mod/display.php:102 +#: ../../mod/block.php:75 ../../mod/help.php:79 ../../mod/display.php:106 #: ../../mod/page.php:81 ../../index.php:241 msgid "Page not found." msgstr "" @@ -4734,41 +4736,41 @@ msgstr "" msgid "Previous action reversed." msgstr "" -#: ../../mod/like.php:387 +#: ../../mod/like.php:398 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "" -#: ../../mod/like.php:389 +#: ../../mod/like.php:400 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "" -#: ../../mod/like.php:391 +#: ../../mod/like.php:402 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -#: ../../mod/like.php:393 +#: ../../mod/like.php:404 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../mod/like.php:395 +#: ../../mod/like.php:406 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../mod/like.php:397 +#: ../../mod/like.php:408 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "" -#: ../../mod/like.php:481 +#: ../../mod/like.php:492 msgid "Action completed." msgstr "" -#: ../../mod/like.php:482 +#: ../../mod/like.php:493 msgid "Thank you." msgstr "" @@ -4824,49 +4826,49 @@ msgstr "" msgid "Failed to remove event" msgstr "" -#: ../../mod/events.php:625 +#: ../../mod/events.php:627 msgid "Event details" msgstr "" -#: ../../mod/events.php:626 +#: ../../mod/events.php:628 msgid "Starting date and Title are required." msgstr "" -#: ../../mod/events.php:628 +#: ../../mod/events.php:630 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/events.php:630 +#: ../../mod/events.php:632 msgid "Event Starts:" msgstr "" -#: ../../mod/events.php:637 +#: ../../mod/events.php:639 msgid "Finish date/time is not known or not relevant" msgstr "" -#: ../../mod/events.php:639 +#: ../../mod/events.php:641 msgid "Event Finishes:" msgstr "" -#: ../../mod/events.php:641 ../../mod/events.php:642 +#: ../../mod/events.php:643 ../../mod/events.php:644 msgid "Adjust for viewer timezone" msgstr "" -#: ../../mod/events.php:641 +#: ../../mod/events.php:643 msgid "" "Important for events that happen in a particular place. Not practical for " "global holidays." msgstr "" -#: ../../mod/events.php:643 +#: ../../mod/events.php:645 msgid "Description:" msgstr "" -#: ../../mod/events.php:647 +#: ../../mod/events.php:649 msgid "Title:" msgstr "" -#: ../../mod/events.php:649 +#: ../../mod/events.php:651 msgid "Share this event" msgstr "" @@ -5020,12 +5022,12 @@ msgid "View recent posts and comments" msgstr "" #: ../../mod/connedit.php:507 ../../mod/connedit.php:694 -#: ../../mod/admin.php:818 +#: ../../mod/admin.php:821 msgid "Unblock" msgstr "" #: ../../mod/connedit.php:507 ../../mod/connedit.php:694 -#: ../../mod/admin.php:817 +#: ../../mod/admin.php:820 msgid "Block" msgstr "" @@ -5314,57 +5316,57 @@ msgstr "" msgid "Click on a channel to add or remove." msgstr "" -#: ../../mod/siteinfo.php:106 +#: ../../mod/siteinfo.php:112 #, php-format msgid "Version %s" msgstr "" -#: ../../mod/siteinfo.php:127 +#: ../../mod/siteinfo.php:133 msgid "Installed plugins/addons/apps:" msgstr "" -#: ../../mod/siteinfo.php:140 +#: ../../mod/siteinfo.php:146 msgid "No installed plugins/addons/apps" msgstr "" -#: ../../mod/siteinfo.php:149 +#: ../../mod/siteinfo.php:155 msgid "Red" msgstr "" -#: ../../mod/siteinfo.php:150 +#: ../../mod/siteinfo.php:156 msgid "" -"This is a hub of the Red Matrix - a global cooperative network of " -"decentralized privacy enhanced websites." +"This is a hub of redmatrix - a global cooperative network of decentralized " +"privacy enhanced websites." msgstr "" -#: ../../mod/siteinfo.php:152 +#: ../../mod/siteinfo.php:158 msgid "Tag: " msgstr "" -#: ../../mod/siteinfo.php:154 +#: ../../mod/siteinfo.php:160 msgid "Last background fetch: " msgstr "" -#: ../../mod/siteinfo.php:157 +#: ../../mod/siteinfo.php:163 msgid "Running at web location" msgstr "" -#: ../../mod/siteinfo.php:158 +#: ../../mod/siteinfo.php:164 msgid "" -"Please visit <a href=\"https://redmatrix.me\">RedMatrix.me</a> to learn more " +"Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more " "about the Red Matrix." msgstr "" -#: ../../mod/siteinfo.php:159 +#: ../../mod/siteinfo.php:165 msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/siteinfo.php:162 +#: ../../mod/siteinfo.php:168 msgid "" "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" msgstr "" -#: ../../mod/siteinfo.php:164 +#: ../../mod/siteinfo.php:170 msgid "Site Administrators" msgstr "" @@ -5946,33 +5948,37 @@ msgstr "" msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" msgstr "" -#: ../../mod/item.php:165 +#: ../../mod/item.php:175 msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:424 +#: ../../mod/item.php:437 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:466 +#: ../../mod/item.php:479 msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/item.php:865 +#: ../../mod/item.php:885 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:1083 +#: ../../mod/item.php:1097 +msgid "Unable to obtain post information from database." +msgstr "" + +#: ../../mod/item.php:1103 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/item.php:1089 +#: ../../mod/item.php:1109 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../mod/search.php:13 ../../mod/display.php:9 ../../mod/ratings.php:82 +#: ../../mod/search.php:13 ../../mod/display.php:13 ../../mod/ratings.php:82 #: ../../mod/directory.php:47 ../../mod/viewconnections.php:17 #: ../../mod/photos.php:429 msgid "Public access denied." @@ -6637,47 +6643,47 @@ msgstr "" msgid "Modify" msgstr "" -#: ../../mod/filestorage.php:81 +#: ../../mod/filestorage.php:82 msgid "Permission Denied." msgstr "" -#: ../../mod/filestorage.php:97 +#: ../../mod/filestorage.php:98 msgid "File not found." msgstr "" -#: ../../mod/filestorage.php:140 +#: ../../mod/filestorage.php:141 msgid "Edit file permissions" msgstr "" -#: ../../mod/filestorage.php:149 +#: ../../mod/filestorage.php:150 msgid "Set/edit permissions" msgstr "" -#: ../../mod/filestorage.php:150 +#: ../../mod/filestorage.php:151 msgid "Include all files and sub folders" msgstr "" -#: ../../mod/filestorage.php:151 +#: ../../mod/filestorage.php:152 msgid "Return to file list" msgstr "" -#: ../../mod/filestorage.php:153 +#: ../../mod/filestorage.php:154 msgid "Copy/paste this code to attach file to a post" msgstr "" -#: ../../mod/filestorage.php:154 +#: ../../mod/filestorage.php:155 msgid "Copy/paste this URL to link file from a web page" msgstr "" -#: ../../mod/filestorage.php:156 +#: ../../mod/filestorage.php:157 msgid "Attach this file to a new post" msgstr "" -#: ../../mod/filestorage.php:157 +#: ../../mod/filestorage.php:158 msgid "Show URL to this file" msgstr "" -#: ../../mod/filestorage.php:158 +#: ../../mod/filestorage.php:159 msgid "Do not show in shared with me folder of your connections" msgstr "" @@ -6815,7 +6821,7 @@ msgstr "" msgid "Interests" msgstr "" -#: ../../mod/profiles.php:447 ../../mod/admin.php:950 +#: ../../mod/profiles.php:447 ../../mod/admin.php:953 msgid "Address" msgstr "" @@ -7120,7 +7126,7 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:93 ../../mod/admin.php:440 +#: ../../mod/admin.php:93 ../../mod/admin.php:442 msgid "Site" msgstr "" @@ -7128,15 +7134,15 @@ msgstr "" msgid "Accounts" msgstr "" -#: ../../mod/admin.php:95 ../../mod/admin.php:942 +#: ../../mod/admin.php:95 ../../mod/admin.php:945 msgid "Channels" msgstr "" -#: ../../mod/admin.php:96 ../../mod/admin.php:1033 ../../mod/admin.php:1073 +#: ../../mod/admin.php:96 ../../mod/admin.php:1036 ../../mod/admin.php:1076 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:1233 ../../mod/admin.php:1268 +#: ../../mod/admin.php:97 ../../mod/admin.php:1236 ../../mod/admin.php:1271 msgid "Themes" msgstr "" @@ -7152,7 +7158,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1351 +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1354 msgid "Logs" msgstr "" @@ -7196,10 +7202,10 @@ msgstr "" msgid "Message queues" msgstr "" -#: ../../mod/admin.php:240 ../../mod/admin.php:439 ../../mod/admin.php:533 -#: ../../mod/admin.php:807 ../../mod/admin.php:941 ../../mod/admin.php:1032 -#: ../../mod/admin.php:1072 ../../mod/admin.php:1232 ../../mod/admin.php:1267 -#: ../../mod/admin.php:1350 +#: ../../mod/admin.php:240 ../../mod/admin.php:441 ../../mod/admin.php:536 +#: ../../mod/admin.php:810 ../../mod/admin.php:944 ../../mod/admin.php:1035 +#: ../../mod/admin.php:1075 ../../mod/admin.php:1235 ../../mod/admin.php:1270 +#: ../../mod/admin.php:1353 msgid "Administration" msgstr "" @@ -7211,7 +7217,7 @@ msgstr "" msgid "Registered accounts" msgstr "" -#: ../../mod/admin.php:245 ../../mod/admin.php:537 +#: ../../mod/admin.php:245 ../../mod/admin.php:540 msgid "Pending registrations" msgstr "" @@ -7219,7 +7225,7 @@ msgstr "" msgid "Registered channels" msgstr "" -#: ../../mod/admin.php:247 ../../mod/admin.php:538 +#: ../../mod/admin.php:247 ../../mod/admin.php:541 msgid "Active plugins" msgstr "" @@ -7227,611 +7233,619 @@ msgstr "" msgid "Version" msgstr "" -#: ../../mod/admin.php:356 +#: ../../mod/admin.php:358 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:393 +#: ../../mod/admin.php:395 msgid "experimental" msgstr "" -#: ../../mod/admin.php:395 +#: ../../mod/admin.php:397 msgid "unsupported" msgstr "" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:422 msgid "Yes - with approval" msgstr "" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:428 msgid "My site is not a public server" msgstr "" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:429 msgid "My site has paid access only" msgstr "" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:430 msgid "My site has free access only" msgstr "" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:431 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../mod/admin.php:442 ../../mod/register.php:207 +#: ../../mod/admin.php:444 ../../mod/register.php:207 msgid "Registration" msgstr "" -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:445 msgid "File upload" msgstr "" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:446 msgid "Policies" msgstr "" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:451 msgid "Site name" msgstr "" -#: ../../mod/admin.php:450 +#: ../../mod/admin.php:452 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:451 +#: ../../mod/admin.php:453 msgid "Administrator Information" msgstr "" -#: ../../mod/admin.php:451 +#: ../../mod/admin.php:453 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../mod/admin.php:452 +#: ../../mod/admin.php:454 msgid "System language" msgstr "" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:455 msgid "System theme" msgstr "" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:455 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:456 msgid "Mobile system theme" msgstr "" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:456 msgid "Theme for mobile devices" msgstr "" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:458 msgid "Enable Diaspora Protocol" msgstr "" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:458 msgid "Communicate with Diaspora and Friendica - experimental" msgstr "" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:459 msgid "Allow Feeds as Connections" msgstr "" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:459 msgid "(Heavy system resource usage)" msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:460 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:460 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:461 msgid "Does this site allow new member registration?" msgstr "" -#: ../../mod/admin.php:460 +#: ../../mod/admin.php:462 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:463 msgid "Register text" msgstr "" -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:463 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:464 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:464 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:465 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:465 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:466 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:466 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:467 msgid "Not allowed email domains" msgstr "" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:467 msgid "" "Comma separated list of domains which are not allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains, unless allowed domains have been defined." msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:468 msgid "Block public" msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:468 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: ../../mod/admin.php:467 +#: ../../mod/admin.php:469 msgid "Verify Email Addresses" msgstr "" -#: ../../mod/admin.php:467 +#: ../../mod/admin.php:469 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:470 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:470 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:471 msgid "Disable discovery tab" msgstr "" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:471 msgid "" "Remove the tab in the network view with public content pulled from sources " "chosen for this site." msgstr "" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:472 msgid "No login on Homepage" msgstr "" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:472 msgid "" "Check to hide the login form from your sites homepage when visitors arrive " "who are not logged in (e.g. when you put the content of the homepage in via " "the site channel)." msgstr "" -#: ../../mod/admin.php:472 +#: ../../mod/admin.php:474 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:475 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:476 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:476 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:477 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:477 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:478 msgid "Poll interval" msgstr "" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:478 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:479 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:479 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:525 +#: ../../mod/admin.php:480 +msgid "Expiration period in days for imported (matrix/network) content" +msgstr "" + +#: ../../mod/admin.php:480 +msgid "0 for no expiration of imported content" +msgstr "" + +#: ../../mod/admin.php:528 msgid "No server found" msgstr "" -#: ../../mod/admin.php:532 ../../mod/admin.php:821 +#: ../../mod/admin.php:535 ../../mod/admin.php:824 msgid "ID" msgstr "" -#: ../../mod/admin.php:532 +#: ../../mod/admin.php:535 msgid "for channel" msgstr "" -#: ../../mod/admin.php:532 +#: ../../mod/admin.php:535 msgid "on server" msgstr "" -#: ../../mod/admin.php:532 +#: ../../mod/admin.php:535 msgid "Status" msgstr "" -#: ../../mod/admin.php:534 +#: ../../mod/admin.php:537 msgid "Server" msgstr "" -#: ../../mod/admin.php:551 +#: ../../mod/admin.php:554 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:561 +#: ../../mod/admin.php:564 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:564 +#: ../../mod/admin.php:567 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:568 +#: ../../mod/admin.php:571 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:571 +#: ../../mod/admin.php:574 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:587 +#: ../../mod/admin.php:590 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:591 +#: ../../mod/admin.php:594 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:593 +#: ../../mod/admin.php:596 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:594 +#: ../../mod/admin.php:597 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:628 +#: ../../mod/admin.php:631 msgid "Queue Statistics" msgstr "" -#: ../../mod/admin.php:629 +#: ../../mod/admin.php:632 msgid "Total Entries" msgstr "" -#: ../../mod/admin.php:630 +#: ../../mod/admin.php:633 msgid "Priority" msgstr "" -#: ../../mod/admin.php:631 +#: ../../mod/admin.php:634 msgid "Destination URL" msgstr "" -#: ../../mod/admin.php:632 +#: ../../mod/admin.php:635 msgid "Mark hub permanently offline" msgstr "" -#: ../../mod/admin.php:633 +#: ../../mod/admin.php:636 msgid "Empty queue for this hub" msgstr "" -#: ../../mod/admin.php:634 +#: ../../mod/admin.php:637 msgid "Last known contact" msgstr "" -#: ../../mod/admin.php:670 +#: ../../mod/admin.php:673 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:678 +#: ../../mod/admin.php:681 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:714 +#: ../../mod/admin.php:717 msgid "Account not found" msgstr "" -#: ../../mod/admin.php:734 +#: ../../mod/admin.php:737 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:742 +#: ../../mod/admin.php:745 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:808 ../../mod/admin.php:820 +#: ../../mod/admin.php:811 ../../mod/admin.php:823 msgid "Users" msgstr "" -#: ../../mod/admin.php:810 ../../mod/admin.php:944 +#: ../../mod/admin.php:813 ../../mod/admin.php:947 msgid "select all" msgstr "" -#: ../../mod/admin.php:811 +#: ../../mod/admin.php:814 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:812 +#: ../../mod/admin.php:815 msgid "Request date" msgstr "" -#: ../../mod/admin.php:813 +#: ../../mod/admin.php:816 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:814 +#: ../../mod/admin.php:817 msgid "Approve" msgstr "" -#: ../../mod/admin.php:815 +#: ../../mod/admin.php:818 msgid "Deny" msgstr "" -#: ../../mod/admin.php:821 +#: ../../mod/admin.php:824 msgid "Register date" msgstr "" -#: ../../mod/admin.php:821 +#: ../../mod/admin.php:824 msgid "Last login" msgstr "" -#: ../../mod/admin.php:821 +#: ../../mod/admin.php:824 msgid "Expires" msgstr "" -#: ../../mod/admin.php:821 +#: ../../mod/admin.php:824 msgid "Service Class" msgstr "" -#: ../../mod/admin.php:823 +#: ../../mod/admin.php:826 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:824 +#: ../../mod/admin.php:827 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:858 +#: ../../mod/admin.php:861 #, php-format msgid "%s channel censored/uncensored" msgid_plural "%s channels censored/uncensored" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:865 +#: ../../mod/admin.php:868 #, php-format msgid "%s channel deleted" msgid_plural "%s channels deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:883 +#: ../../mod/admin.php:886 msgid "Channel not found" msgstr "" -#: ../../mod/admin.php:894 +#: ../../mod/admin.php:897 #, php-format msgid "Channel '%s' deleted" msgstr "" -#: ../../mod/admin.php:905 +#: ../../mod/admin.php:908 #, php-format msgid "Channel '%s' uncensored" msgstr "" -#: ../../mod/admin.php:905 +#: ../../mod/admin.php:908 #, php-format msgid "Channel '%s' censored" msgstr "" -#: ../../mod/admin.php:946 +#: ../../mod/admin.php:949 msgid "Censor" msgstr "" -#: ../../mod/admin.php:947 +#: ../../mod/admin.php:950 msgid "Uncensor" msgstr "" -#: ../../mod/admin.php:950 +#: ../../mod/admin.php:953 msgid "UID" msgstr "" -#: ../../mod/admin.php:952 +#: ../../mod/admin.php:955 msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:953 +#: ../../mod/admin.php:956 msgid "" "The channel {0} will be deleted!\\n\\nEverything that was posted in this " "channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:993 +#: ../../mod/admin.php:996 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:997 +#: ../../mod/admin.php:1000 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:1007 ../../mod/admin.php:1205 +#: ../../mod/admin.php:1010 ../../mod/admin.php:1208 msgid "Disable" msgstr "" -#: ../../mod/admin.php:1010 ../../mod/admin.php:1207 +#: ../../mod/admin.php:1013 ../../mod/admin.php:1210 msgid "Enable" msgstr "" -#: ../../mod/admin.php:1034 ../../mod/admin.php:1234 +#: ../../mod/admin.php:1037 ../../mod/admin.php:1237 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:1042 ../../mod/admin.php:1244 +#: ../../mod/admin.php:1045 ../../mod/admin.php:1247 msgid "Author: " msgstr "" -#: ../../mod/admin.php:1043 ../../mod/admin.php:1245 +#: ../../mod/admin.php:1046 ../../mod/admin.php:1248 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:1170 +#: ../../mod/admin.php:1173 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:1226 +#: ../../mod/admin.php:1229 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1273 +#: ../../mod/admin.php:1276 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1274 +#: ../../mod/admin.php:1277 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1298 +#: ../../mod/admin.php:1301 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1353 +#: ../../mod/admin.php:1356 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1359 +#: ../../mod/admin.php:1362 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1360 +#: ../../mod/admin.php:1363 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1360 +#: ../../mod/admin.php:1363 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "" -#: ../../mod/admin.php:1361 +#: ../../mod/admin.php:1364 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1407 +#: ../../mod/admin.php:1410 msgid "New Profile Field" msgstr "" -#: ../../mod/admin.php:1408 ../../mod/admin.php:1428 +#: ../../mod/admin.php:1411 ../../mod/admin.php:1431 msgid "Field nickname" msgstr "" -#: ../../mod/admin.php:1408 ../../mod/admin.php:1428 +#: ../../mod/admin.php:1411 ../../mod/admin.php:1431 msgid "System name of field" msgstr "" -#: ../../mod/admin.php:1409 ../../mod/admin.php:1429 +#: ../../mod/admin.php:1412 ../../mod/admin.php:1432 msgid "Input type" msgstr "" -#: ../../mod/admin.php:1410 ../../mod/admin.php:1430 +#: ../../mod/admin.php:1413 ../../mod/admin.php:1433 msgid "Field Name" msgstr "" -#: ../../mod/admin.php:1410 ../../mod/admin.php:1430 +#: ../../mod/admin.php:1413 ../../mod/admin.php:1433 msgid "Label on profile pages" msgstr "" -#: ../../mod/admin.php:1411 ../../mod/admin.php:1431 +#: ../../mod/admin.php:1414 ../../mod/admin.php:1434 msgid "Help text" msgstr "" -#: ../../mod/admin.php:1411 ../../mod/admin.php:1431 +#: ../../mod/admin.php:1414 ../../mod/admin.php:1434 msgid "Additional info (optional)" msgstr "" -#: ../../mod/admin.php:1421 +#: ../../mod/admin.php:1424 msgid "Field definition not found" msgstr "" -#: ../../mod/admin.php:1427 +#: ../../mod/admin.php:1430 msgid "Edit Profile Field" msgstr "" @@ -8388,30 +8402,6 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../mod/network.php:90 -msgid "No such group" -msgstr "" - -#: ../../mod/network.php:128 -msgid "Search Results For:" -msgstr "" - -#: ../../mod/network.php:182 -msgid "Collection is empty" -msgstr "" - -#: ../../mod/network.php:190 -msgid "Collection: " -msgstr "" - -#: ../../mod/network.php:203 -msgid "Connection: " -msgstr "" - -#: ../../mod/network.php:206 -msgid "Invalid connection." -msgstr "" - #: ../../mod/new_channel.php:109 msgid "Add a Channel" msgstr "" @@ -8519,6 +8509,34 @@ msgstr "" msgid "posted an event" msgstr "" +#: ../../mod/network.php:91 +msgid "No such group" +msgstr "" + +#: ../../mod/network.php:129 +msgid "No such channel" +msgstr "" + +#: ../../mod/network.php:143 +msgid "Search Results For:" +msgstr "" + +#: ../../mod/network.php:198 +msgid "Collection is empty" +msgstr "" + +#: ../../mod/network.php:207 +msgid "Collection: " +msgstr "" + +#: ../../mod/network.php:226 +msgid "Connection: " +msgstr "" + +#: ../../mod/network.php:233 +msgid "Invalid connection." +msgstr "" + #: ../../mod/bookmarks.php:38 msgid "Bookmark added" msgstr "" @@ -8531,7 +8549,7 @@ msgstr "" msgid "My Connections Bookmarks" msgstr "" -#: ../../mod/channel.php:92 +#: ../../mod/channel.php:97 msgid "Insufficient permissions. Request redirected to profile page." msgstr "" @@ -8553,15 +8571,19 @@ msgstr "" msgid "No service class restrictions found." msgstr "" -#: ../../mod/sharedwithme.php:99 +#: ../../mod/sharedwithme.php:94 msgid "Files: shared with me" msgstr "" -#: ../../mod/sharedwithme.php:103 +#: ../../mod/sharedwithme.php:96 +msgid "NEW" +msgstr "" + +#: ../../mod/sharedwithme.php:99 msgid "Remove all files" msgstr "" -#: ../../mod/sharedwithme.php:104 +#: ../../mod/sharedwithme.php:100 msgid "Remove this file" msgstr "" @@ -8836,6 +8858,58 @@ msgstr "" msgid "Set size of followup author photos" msgstr "" +#: ../../randpost/randpost.php:96 +msgid "You're welcome." +msgstr "" + +#: ../../randpost/randpost.php:97 +msgid "Ah shucks..." +msgstr "" + +#: ../../randpost/randpost.php:98 +msgid "Don't mention it." +msgstr "" + +#: ../../randpost/randpost.php:99 +msgid "<blush>" +msgstr "" + +#: ../../wppost/wppost.php:43 +msgid "Post to WordPress" +msgstr "" + +#: ../../wppost/wppost.php:80 +msgid "Enable WordPress Post Plugin" +msgstr "" + +#: ../../wppost/wppost.php:84 +msgid "WordPress username" +msgstr "" + +#: ../../wppost/wppost.php:88 +msgid "WordPress password" +msgstr "" + +#: ../../wppost/wppost.php:92 +msgid "WordPress API URL" +msgstr "" + +#: ../../wppost/wppost.php:96 +msgid "Post to WordPress by default" +msgstr "" + +#: ../../wppost/wppost.php:100 +msgid "Forward comments (requires post_to_red plugin)" +msgstr "" + +#: ../../wppost/wppost.php:104 +msgid "WordPress Post Settings" +msgstr "" + +#: ../../wppost/wppost.php:119 +msgid "Wordpress Settings saved." +msgstr "" + #: ../../boot.php:1357 #, php-format msgid "Update %s failed. See error logs." diff --git a/version.inc b/version.inc index fea8356b7..1c94d491b 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-03-26.983 +2015-03-28.985 |