diff options
| author | friendica <info@friendica.com> | 2014-10-10 00:13:46 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-10-10 00:13:46 -0700 |
| commit | cde244ef74eba47749f910b09b23f92862907eda (patch) | |
| tree | f368fc7fd5b0d500ede2cb7478d8d6e225787944 | |
| parent | 8e7e488ffe92030707a792584adecc93cd9a3708 (diff) | |
| download | volse-hubzilla-cde244ef74eba47749f910b09b23f92862907eda.tar.gz volse-hubzilla-cde244ef74eba47749f910b09b23f92862907eda.tar.bz2 volse-hubzilla-cde244ef74eba47749f910b09b23f92862907eda.zip | |
improvement in source route checking when handling complex *upstream* delivery chains, which were not adequately accounted for in the earlier checkin.
| -rw-r--r-- | include/zot.php | 25 | ||||
| -rw-r--r-- | util/messages.po | 2124 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 1095 insertions, 1056 deletions
diff --git a/include/zot.php b/include/zot.php index 63a5645d3..1706153dd 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1420,8 +1420,8 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) { $result[] = array($d['hash'],'permission denied',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); continue; } - - if(($arr['mid'] != $arr['parent_mid']) && (! $relay)) { + + if($arr['mid'] != $arr['parent_mid']) { // check source route. // We are only going to accept comments from this sender if the comment has the same route as the top-level-post, @@ -1437,11 +1437,24 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) { $result[] = array($d['hash'],'comment parent not found',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); continue; } - $current_route = (($arr['route']) ? $arr['route'] . ',' : '') . $sender['hash']; + if($relay) { + // reset the route in case it travelled a great distance upstream + // use our parent's route so when we go back downstream we'll match + // with whatever route our parent has. + $arr['route'] = $r[0]['route']; + } + else { - if($r[0]['route'] != $current_route) { - $result[] = array($d['hash'],'comment route mismatch',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); - continue; + // going downstream check that we have the same upstream provider that + // sent it to us originally. Ignore it if it came from another source + // (with potentially different permissions) + + $current_route = (($arr['route']) ? $arr['route'] . ',' : '') . $sender['hash']; + + if($r[0]['route'] != $current_route) { + $result[] = array($d['hash'],'comment route mismatch',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); + continue; + } } } diff --git a/util/messages.po b/util/messages.po index 2ae3c6008..7fafa754c 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2014-10-03.817\n" +"Project-Id-Version: 2014-10-10.824\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 00:04-0700\n" +"POT-Creation-Date: 2014-10-10 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" @@ -22,8 +22,8 @@ msgstr "" msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/photo/photo_driver.php:653 ../../include/photos.php:51 -#: ../../mod/photos.php:91 ../../mod/photos.php:660 ../../mod/photos.php:682 +#: ../../include/photo/photo_driver.php:680 ../../include/photos.php:51 +#: ../../mod/photos.php:91 ../../mod/photos.php:657 ../../mod/photos.php:679 #: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:301 #: ../../mod/profile_photo.php:423 msgid "Profile Photos" @@ -33,14 +33,126 @@ msgstr "" msgid "view full size" msgstr "" -#: ../../include/oembed.php:163 +#: ../../include/oembed.php:171 msgid "Embedded content" msgstr "" -#: ../../include/oembed.php:172 +#: ../../include/oembed.php:180 msgid "Embedding disabled" msgstr "" +#: ../../include/items.php:375 ../../mod/profperm.php:23 +#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:242 +#: ../../index.php:364 +msgid "Permission denied" +msgstr "" + +#: ../../include/items.php:962 ../../include/items.php:1007 +msgid "(Unknown)" +msgstr "" + +#: ../../include/items.php:1163 +msgid "Visible to anybody on the internet." +msgstr "" + +#: ../../include/items.php:1165 +msgid "Visible to you only." +msgstr "" + +#: ../../include/items.php:1167 +msgid "Visible to anybody in this network." +msgstr "" + +#: ../../include/items.php:1169 +msgid "Visible to anybody authenticated." +msgstr "" + +#: ../../include/items.php:1171 +#, php-format +msgid "Visible to anybody on %s." +msgstr "" + +#: ../../include/items.php:1173 +msgid "Visible to all connections." +msgstr "" + +#: ../../include/items.php:1175 +msgid "Visible to approved connections." +msgstr "" + +#: ../../include/items.php:1177 +msgid "Visible to specific connections." +msgstr "" + +#: ../../include/items.php:3927 ../../mod/display.php:32 +#: ../../mod/filestorage.php:18 ../../mod/admin.php:168 +#: ../../mod/admin.php:898 ../../mod/admin.php:1101 ../../mod/thing.php:76 +#: ../../mod/viewsrc.php:20 +msgid "Item not found." +msgstr "" + +#: ../../include/items.php:3989 ../../include/photos.php:15 +#: ../../include/attach.php:119 ../../include/attach.php:166 +#: ../../include/attach.php:229 ../../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 +#: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:30 +#: ../../mod/settings.php:496 ../../mod/poke.php:128 ../../mod/api.php:26 +#: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64 +#: ../../mod/profile.php:72 ../../mod/block.php:22 ../../mod/block.php:72 +#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/profiles.php:179 +#: ../../mod/profiles.php:560 ../../mod/webpages.php:40 +#: ../../mod/channel.php:89 ../../mod/channel.php:193 +#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 +#: ../../mod/register.php:70 ../../mod/regmod.php:17 ../../mod/common.php:35 +#: ../../mod/network.php:12 ../../mod/connections.php:169 +#: ../../mod/connedit.php:254 ../../mod/delegate.php:6 ../../mod/page.php:30 +#: ../../mod/page.php:80 ../../mod/photos.php:68 ../../mod/photos.php:526 +#: ../../mod/setup.php:203 ../../mod/editblock.php:34 ../../mod/pdledit.php:21 +#: ../../mod/editlayout.php:48 ../../mod/editpost.php:13 +#: ../../mod/editwebpage.php:44 ../../mod/editwebpage.php:83 +#: ../../mod/bookmarks.php:46 ../../mod/profile_photo.php:263 +#: ../../mod/profile_photo.php:276 ../../mod/sources.php:66 +#: ../../mod/events.php:200 ../../mod/filestorage.php:10 +#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75 +#: ../../mod/filestorage.php:98 ../../mod/fsuggest.php:78 +#: ../../mod/suggest.php:26 ../../mod/group.php:9 ../../mod/thing.php:247 +#: ../../mod/thing.php:264 ../../mod/thing.php:299 ../../mod/invite.php:13 +#: ../../mod/invite.php:104 ../../mod/item.php:182 ../../mod/item.php:190 +#: ../../mod/item.php:929 ../../mod/layouts.php:27 ../../mod/layouts.php:39 +#: ../../mod/like.php:154 ../../mod/viewconnections.php:22 +#: ../../mod/viewconnections.php:27 ../../mod/viewsrc.php:14 +#: ../../mod/mail.php:111 ../../mod/manage.php:6 ../../mod/menu.php:44 +#: ../../mod/message.php:16 ../../mod/new_channel.php:68 +#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66 +#: ../../mod/appman.php:66 ../../mod/service_limits.php:7 ../../index.php:190 +#: ../../index.php:365 +msgid "Permission denied." +msgstr "" + +#: ../../include/items.php:4360 ../../mod/group.php:38 ../../mod/group.php:140 +msgid "Collection not found." +msgstr "" + +#: ../../include/items.php:4375 +msgid "Collection is empty." +msgstr "" + +#: ../../include/items.php:4382 +#, php-format +msgid "Collection: %s" +msgstr "" + +#: ../../include/items.php:4393 +#, php-format +msgid "Connection: %s" +msgstr "" + +#: ../../include/items.php:4396 +msgid "Connection not found." +msgstr "" + #: ../../include/notify.php:23 msgid "created a new post" msgstr "" @@ -50,167 +162,166 @@ msgstr "" msgid "commented on %s's post" msgstr "" -#: ../../include/apps.php:123 +#: ../../include/apps.php:126 msgid "Site Admin" msgstr "" -#: ../../include/apps.php:124 ../../include/conversation.php:1566 +#: ../../include/apps.php:127 ../../include/conversation.php:1566 #: ../../include/nav.php:116 msgid "Bookmarks" msgstr "" -#: ../../include/apps.php:125 +#: ../../include/apps.php:128 msgid "Address Book" msgstr "" -#: ../../include/apps.php:126 ../../include/nav.php:124 ../../boot.php:1495 +#: ../../include/apps.php:129 ../../include/nav.php:124 ../../boot.php:1495 msgid "Login" msgstr "" -#: ../../include/apps.php:127 ../../include/nav.php:214 +#: ../../include/apps.php:130 ../../include/nav.php:217 #: ../../mod/manage.php:148 msgid "Channel Manager" msgstr "" -#: ../../include/apps.php:128 ../../include/nav.php:188 +#: ../../include/apps.php:131 ../../include/nav.php:191 msgid "Matrix" msgstr "" -#: ../../include/apps.php:129 ../../include/nav.php:216 -#: ../../include/widgets.php:521 ../../mod/admin.php:953 -#: ../../mod/admin.php:1158 +#: ../../include/apps.php:132 ../../include/widgets.php:521 +#: ../../include/nav.php:219 ../../mod/admin.php:953 ../../mod/admin.php:1158 msgid "Settings" msgstr "" -#: ../../include/apps.php:130 ../../include/conversation.php:1542 -#: ../../include/reddav.php:1280 ../../include/nav.php:105 +#: ../../include/apps.php:133 ../../include/conversation.php:1542 +#: ../../include/nav.php:105 ../../include/RedDAV/RedBrowser.php:238 #: ../../mod/fbrowser.php:114 msgid "Files" msgstr "" -#: ../../include/apps.php:131 ../../include/conversation.php:1577 -#: ../../include/nav.php:120 ../../mod/webpages.php:84 +#: ../../include/apps.php:134 ../../include/conversation.php:1577 +#: ../../include/nav.php:120 ../../mod/webpages.php:86 msgid "Webpages" msgstr "" -#: ../../include/apps.php:132 ../../include/nav.php:191 +#: ../../include/apps.php:135 ../../include/nav.php:194 msgid "Channel Home" msgstr "" -#: ../../include/apps.php:133 ../../include/identity.php:1110 -#: ../../include/identity.php:1228 ../../mod/profperm.php:112 +#: ../../include/apps.php:136 ../../include/identity.php:1111 +#: ../../include/identity.php:1229 ../../mod/profperm.php:112 msgid "Profile" msgstr "" -#: ../../include/apps.php:134 ../../include/conversation.php:1533 +#: ../../include/apps.php:137 ../../include/conversation.php:1533 #: ../../include/nav.php:104 ../../mod/fbrowser.php:25 msgid "Photos" msgstr "" -#: ../../include/apps.php:135 ../../include/nav.php:210 +#: ../../include/apps.php:138 ../../include/nav.php:213 #: ../../mod/events.php:436 msgid "Events" msgstr "" -#: ../../include/apps.php:136 ../../include/nav.php:177 +#: ../../include/apps.php:139 ../../include/nav.php:177 #: ../../mod/directory.php:226 msgid "Directory" msgstr "" -#: ../../include/apps.php:137 ../../include/nav.php:169 ../../mod/help.php:60 +#: ../../include/apps.php:140 ../../include/nav.php:169 ../../mod/help.php:60 #: ../../mod/help.php:65 msgid "Help" msgstr "" -#: ../../include/apps.php:138 ../../include/nav.php:202 +#: ../../include/apps.php:141 ../../include/nav.php:205 msgid "Mail" msgstr "" -#: ../../include/apps.php:139 ../../mod/mood.php:131 +#: ../../include/apps.php:142 ../../mod/mood.php:131 msgid "Mood" msgstr "" -#: ../../include/apps.php:140 ../../include/conversation.php:947 +#: ../../include/apps.php:143 ../../include/conversation.php:947 msgid "Poke" msgstr "" -#: ../../include/apps.php:141 ../../include/nav.php:110 +#: ../../include/apps.php:144 ../../include/nav.php:110 msgid "Chat" msgstr "" -#: ../../include/apps.php:142 ../../include/text.php:821 -#: ../../include/text.php:835 ../../include/nav.php:174 +#: ../../include/apps.php:145 ../../include/text.php:822 +#: ../../include/text.php:834 ../../include/nav.php:174 #: ../../mod/search.php:30 msgid "Search" msgstr "" -#: ../../include/apps.php:143 +#: ../../include/apps.php:146 msgid "Probe" msgstr "" -#: ../../include/apps.php:144 +#: ../../include/apps.php:147 msgid "Suggest" msgstr "" -#: ../../include/apps.php:145 +#: ../../include/apps.php:148 msgid "Random Channel" msgstr "" -#: ../../include/apps.php:146 +#: ../../include/apps.php:149 msgid "Invite" msgstr "" -#: ../../include/apps.php:147 +#: ../../include/apps.php:150 msgid "Features" msgstr "" -#: ../../include/apps.php:148 +#: ../../include/apps.php:151 msgid "Language" msgstr "" -#: ../../include/apps.php:149 +#: ../../include/apps.php:152 msgid "Post" msgstr "" -#: ../../include/apps.php:150 +#: ../../include/apps.php:153 msgid "Profile Photo" msgstr "" -#: ../../include/apps.php:239 ../../mod/settings.php:79 +#: ../../include/apps.php:242 ../../mod/settings.php:79 #: ../../mod/settings.php:545 msgid "Update" msgstr "" -#: ../../include/apps.php:239 +#: ../../include/apps.php:242 msgid "Install" msgstr "" -#: ../../include/apps.php:244 +#: ../../include/apps.php:247 msgid "Purchase" msgstr "" -#: ../../include/apps.php:246 ../../include/page_widgets.php:8 -#: ../../include/page_widgets.php:36 ../../include/reddav.php:1289 +#: ../../include/apps.php:249 ../../include/page_widgets.php:8 +#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:247 #: ../../include/menu.php:42 ../../include/ItemObject.php:100 #: ../../mod/settings.php:581 ../../mod/blocks.php:99 -#: ../../mod/connections.php:381 ../../mod/connections.php:394 -#: ../../mod/connections.php:413 ../../mod/editblock.php:111 -#: ../../mod/editlayout.php:106 ../../mod/editpost.php:112 -#: ../../mod/editwebpage.php:143 ../../mod/thing.php:233 -#: ../../mod/layouts.php:121 ../../mod/menu.php:59 ../../mod/webpages.php:132 +#: ../../mod/webpages.php:133 ../../mod/connections.php:381 +#: ../../mod/connections.php:394 ../../mod/connections.php:413 +#: ../../mod/editblock.php:111 ../../mod/editlayout.php:106 +#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:143 +#: ../../mod/thing.php:233 ../../mod/layouts.php:121 ../../mod/menu.php:59 msgid "Edit" msgstr "" -#: ../../include/apps.php:247 ../../include/conversation.php:638 -#: ../../include/reddav.php:1290 ../../include/ItemObject.php:120 +#: ../../include/apps.php:250 ../../include/conversation.php:638 +#: ../../include/RedDAV/RedBrowser.php:248 ../../include/ItemObject.php:120 #: ../../mod/settings.php:582 ../../mod/connedit.php:462 -#: ../../mod/photos.php:1080 ../../mod/group.php:176 ../../mod/admin.php:732 +#: ../../mod/photos.php:1064 ../../mod/group.php:176 ../../mod/admin.php:732 #: ../../mod/admin.php:863 ../../mod/thing.php:234 msgid "Delete" msgstr "" -#: ../../include/apps.php:328 ../../include/apps.php:379 -#: ../../include/conversation.php:999 ../../include/reddav.php:1202 +#: ../../include/apps.php:331 ../../include/apps.php:382 +#: ../../include/conversation.php:999 ../../include/RedDAV/RedBrowser.php:160 #: ../../mod/connedit.php:498 msgid "Unknown" msgstr "" @@ -220,35 +331,35 @@ msgid "New Page" msgstr "" #: ../../include/page_widgets.php:39 ../../mod/blocks.php:102 -#: ../../mod/layouts.php:125 ../../mod/webpages.php:135 +#: ../../mod/webpages.php:136 ../../mod/layouts.php:125 msgid "View" msgstr "" #: ../../include/page_widgets.php:40 ../../include/conversation.php:1110 -#: ../../include/ItemObject.php:606 ../../mod/editblock.php:141 +#: ../../include/ItemObject.php:606 ../../mod/webpages.php:137 +#: ../../mod/photos.php:1015 ../../mod/editblock.php:141 #: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 -#: ../../mod/editwebpage.php:174 ../../mod/photos.php:1031 -#: ../../mod/webpages.php:136 +#: ../../mod/editwebpage.php:174 msgid "Preview" msgstr "" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:137 +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:138 msgid "Actions" msgstr "" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:138 +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:139 msgid "Page Link" msgstr "" -#: ../../include/page_widgets.php:43 ../../mod/webpages.php:139 +#: ../../include/page_widgets.php:43 ../../mod/webpages.php:140 msgid "Title" msgstr "" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:140 +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:141 msgid "Created" msgstr "" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:141 +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:142 msgid "Edited" msgstr "" @@ -258,6 +369,208 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "" +#: ../../include/widgets.php:29 ../../include/contact_widgets.php:93 +msgid "Categories" +msgstr "" + +#: ../../include/widgets.php:86 ../../include/nav.php:172 +#: ../../mod/apps.php:33 +msgid "Apps" +msgstr "" + +#: ../../include/widgets.php:87 +msgid "System" +msgstr "" + +#: ../../include/widgets.php:89 ../../include/conversation.php:1445 +msgid "Personal" +msgstr "" + +#: ../../include/widgets.php:90 +msgid "Create Personal App" +msgstr "" + +#: ../../include/widgets.php:91 +msgid "Edit Personal App" +msgstr "" + +#: ../../include/widgets.php:135 ../../include/widgets.php:175 +#: ../../include/conversation.php:944 ../../include/identity.php:831 +#: ../../include/Contact.php:107 ../../mod/directory.php:183 +#: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51 +#: ../../mod/match.php:62 +msgid "Connect" +msgstr "" + +#: ../../include/widgets.php:137 ../../mod/suggest.php:53 +msgid "Ignore/Hide" +msgstr "" + +#: ../../include/widgets.php:143 ../../mod/connections.php:267 +msgid "Suggestions" +msgstr "" + +#: ../../include/widgets.php:144 +msgid "See more..." +msgstr "" + +#: ../../include/widgets.php:166 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "" + +#: ../../include/widgets.php:172 +msgid "Add New Connection" +msgstr "" + +#: ../../include/widgets.php:173 +msgid "Enter the channel address" +msgstr "" + +#: ../../include/widgets.php:174 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "" + +#: ../../include/widgets.php:191 +msgid "Notes" +msgstr "" + +#: ../../include/widgets.php:193 ../../include/text.php:823 +#: ../../include/text.php:835 ../../mod/rbmark.php:28 ../../mod/rbmark.php:98 +#: ../../mod/filer.php:50 ../../mod/admin.php:1341 ../../mod/admin.php:1362 +msgid "Save" +msgstr "" + +#: ../../include/widgets.php:263 +msgid "Remove term" +msgstr "" + +#: ../../include/widgets.php:272 ../../include/features.php:58 +msgid "Saved Searches" +msgstr "" + +#: ../../include/widgets.php:273 ../../include/group.php:302 +msgid "add" +msgstr "" + +#: ../../include/widgets.php:303 ../../include/contact_widgets.php:58 +#: ../../include/features.php:72 +msgid "Saved Folders" +msgstr "" + +#: ../../include/widgets.php:306 ../../include/contact_widgets.php:61 +#: ../../include/contact_widgets.php:96 +msgid "Everything" +msgstr "" + +#: ../../include/widgets.php:342 +msgid "Archives" +msgstr "" + +#: ../../include/widgets.php:404 +msgid "Refresh" +msgstr "" + +#: ../../include/widgets.php:405 ../../mod/connedit.php:492 +msgid "Me" +msgstr "" + +#: ../../include/widgets.php:406 ../../mod/connedit.php:494 +msgid "Best Friends" +msgstr "" + +#: ../../include/widgets.php:407 ../../include/identity.php:380 +#: ../../include/identity.php:381 ../../include/identity.php:388 +#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:495 +msgid "Friends" +msgstr "" + +#: ../../include/widgets.php:408 +msgid "Co-workers" +msgstr "" + +#: ../../include/widgets.php:409 ../../mod/connedit.php:496 +msgid "Former Friends" +msgstr "" + +#: ../../include/widgets.php:410 ../../mod/connedit.php:497 +msgid "Acquaintances" +msgstr "" + +#: ../../include/widgets.php:411 +msgid "Everybody" +msgstr "" + +#: ../../include/widgets.php:443 +msgid "Account settings" +msgstr "" + +#: ../../include/widgets.php:449 +msgid "Channel settings" +msgstr "" + +#: ../../include/widgets.php:455 +msgid "Additional features" +msgstr "" + +#: ../../include/widgets.php:461 +msgid "Feature settings" +msgstr "" + +#: ../../include/widgets.php:467 +msgid "Display settings" +msgstr "" + +#: ../../include/widgets.php:473 +msgid "Connected apps" +msgstr "" + +#: ../../include/widgets.php:479 +msgid "Export channel" +msgstr "" + +#: ../../include/widgets.php:485 +msgid "Export content" +msgstr "" + +#: ../../include/widgets.php:491 +msgid "Automatic Permissions (Advanced)" +msgstr "" + +#: ../../include/widgets.php:501 +msgid "Premium Channel Settings" +msgstr "" + +#: ../../include/widgets.php:510 ../../include/features.php:49 +#: ../../mod/sources.php:88 +msgid "Channel Sources" +msgstr "" + +#: ../../include/widgets.php:535 ../../mod/mail.php:124 +#: ../../mod/message.php:31 +msgid "Messages" +msgstr "" + +#: ../../include/widgets.php:540 +msgid "Check Mail" +msgstr "" + +#: ../../include/widgets.php:545 ../../include/nav.php:210 +msgid "New Message" +msgstr "" + +#: ../../include/widgets.php:621 +msgid "Chat Rooms" +msgstr "" + +#: ../../include/widgets.php:639 +msgid "Bookmarked Chatrooms" +msgstr "" + +#: ../../include/widgets.php:657 +msgid "Suggested Chatrooms" +msgstr "" + #: ../../include/zot.php:654 msgid "Invalid data packet" msgstr "" @@ -266,51 +579,11 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:1701 +#: ../../include/zot.php:1741 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/photos.php:15 ../../include/attach.php:119 -#: ../../include/attach.php:166 ../../include/attach.php:229 -#: ../../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:4000 -#: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:30 -#: ../../mod/settings.php:496 ../../mod/poke.php:128 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64 -#: ../../mod/profile.php:72 ../../mod/block.php:22 ../../mod/block.php:72 -#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/profiles.php:179 -#: ../../mod/profiles.php:560 ../../mod/bookmarks.php:46 -#: ../../mod/channel.php:89 ../../mod/channel.php:193 -#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 -#: ../../mod/register.php:70 ../../mod/regmod.php:17 ../../mod/common.php:35 -#: ../../mod/network.php:12 ../../mod/connections.php:169 -#: ../../mod/connedit.php:254 ../../mod/delegate.php:6 ../../mod/page.php:30 -#: ../../mod/page.php:80 ../../mod/setup.php:203 ../../mod/editblock.php:34 -#: ../../mod/pdledit.php:21 ../../mod/editlayout.php:48 -#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:44 -#: ../../mod/editwebpage.php:83 ../../mod/photos.php:68 -#: ../../mod/photos.php:526 ../../mod/profile_photo.php:263 -#: ../../mod/profile_photo.php:276 ../../mod/sources.php:66 -#: ../../mod/events.php:200 ../../mod/filestorage.php:10 -#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75 -#: ../../mod/filestorage.php:98 ../../mod/fsuggest.php:78 -#: ../../mod/suggest.php:26 ../../mod/group.php:9 ../../mod/thing.php:247 -#: ../../mod/thing.php:264 ../../mod/thing.php:299 ../../mod/invite.php:13 -#: ../../mod/invite.php:104 ../../mod/item.php:178 ../../mod/item.php:186 -#: ../../mod/item.php:922 ../../mod/layouts.php:27 ../../mod/layouts.php:39 -#: ../../mod/like.php:154 ../../mod/viewconnections.php:22 -#: ../../mod/viewconnections.php:27 ../../mod/viewsrc.php:14 -#: ../../mod/mail.php:108 ../../mod/manage.php:6 ../../mod/menu.php:44 -#: ../../mod/webpages.php:40 ../../mod/message.php:16 -#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99 -#: ../../mod/notifications.php:66 ../../mod/appman.php:66 -#: ../../mod/service_limits.php:7 ../../index.php:190 ../../index.php:365 -msgid "Permission denied." -msgstr "" - #: ../../include/photos.php:104 #, php-format msgid "Image exceeds website size limit of %lu bytes" @@ -349,7 +622,7 @@ msgid "Don't show" msgstr "" #: ../../include/acl_selectors.php:248 ../../mod/chat.php:209 -#: ../../mod/photos.php:604 ../../mod/photos.php:986 +#: ../../mod/photos.php:604 ../../mod/photos.php:970 #: ../../mod/filestorage.php:128 msgid "Permissions" msgstr "" @@ -443,13 +716,13 @@ msgstr "" msgid "database storage failed." msgstr "" -#: ../../include/conversation.php:120 ../../include/text.php:1745 -#: ../../include/diaspora.php:1898 ../../mod/subthread.php:72 +#: ../../include/conversation.php:120 ../../include/text.php:1743 +#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 msgid "photo" msgstr "" -#: ../../include/conversation.php:123 ../../include/text.php:1748 +#: ../../include/conversation.php:123 ../../include/text.php:1746 #: ../../mod/tagger.php:49 msgid "event" msgstr "" @@ -458,18 +731,18 @@ msgstr "" msgid "channel" msgstr "" -#: ../../include/conversation.php:148 ../../include/text.php:1751 -#: ../../include/diaspora.php:1898 ../../mod/subthread.php:72 +#: ../../include/conversation.php:148 ../../include/text.php:1749 +#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 msgid "status" msgstr "" -#: ../../include/conversation.php:150 ../../include/text.php:1753 +#: ../../include/conversation.php:150 ../../include/text.php:1751 #: ../../mod/tagger.php:55 msgid "comment" msgstr "" -#: ../../include/conversation.php:164 ../../include/diaspora.php:1927 +#: ../../include/conversation.php:164 ../../include/diaspora.php:1953 #: ../../mod/like.php:331 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -490,7 +763,7 @@ msgstr "" msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:243 ../../include/text.php:903 +#: ../../include/conversation.php:243 ../../include/text.php:901 msgid "poked" msgstr "" @@ -505,7 +778,7 @@ msgid "Select" msgstr "" #: ../../include/conversation.php:645 ../../include/ItemObject.php:89 -#: ../../mod/photos.php:878 +#: ../../mod/photos.php:862 msgid "Private Message" msgstr "" @@ -546,10 +819,10 @@ msgid "View in context" msgstr "" #: ../../include/conversation.php:715 ../../include/conversation.php:1149 -#: ../../include/ItemObject.php:308 ../../mod/editblock.php:120 -#: ../../mod/editlayout.php:115 ../../mod/editpost.php:121 -#: ../../mod/editwebpage.php:152 ../../mod/photos.php:1011 -#: ../../mod/mail.php:231 ../../mod/mail.php:346 +#: ../../include/ItemObject.php:308 ../../mod/photos.php:995 +#: ../../mod/editblock.php:120 ../../mod/editlayout.php:115 +#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:152 +#: ../../mod/mail.php:234 ../../mod/mail.php:349 msgid "Please wait" msgstr "" @@ -557,7 +830,7 @@ msgstr "" msgid "remove" msgstr "" -#: ../../include/conversation.php:843 ../../include/nav.php:255 +#: ../../include/conversation.php:843 ../../include/nav.php:258 msgid "Loading..." msgstr "" @@ -590,14 +863,6 @@ msgstr "" msgid "Matrix Activity" msgstr "" -#: ../../include/conversation.php:944 ../../include/identity.php:830 -#: ../../include/widgets.php:135 ../../include/widgets.php:175 -#: ../../include/Contact.php:107 ../../mod/directory.php:183 -#: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51 -#: ../../mod/match.php:62 -msgid "Connect" -msgstr "" - #: ../../include/conversation.php:945 msgid "Edit Contact" msgstr "" @@ -655,8 +920,8 @@ msgstr "" msgid "Visible to <strong>everybody</strong>" msgstr "" -#: ../../include/conversation.php:1094 ../../mod/mail.php:167 -#: ../../mod/mail.php:279 +#: ../../include/conversation.php:1094 ../../mod/mail.php:170 +#: ../../mod/mail.php:282 msgid "Please enter a link URL:" msgstr "" @@ -681,12 +946,13 @@ msgid "Where are you right now?" msgstr "" #: ../../include/conversation.php:1100 ../../mod/editpost.php:52 -#: ../../mod/mail.php:168 ../../mod/mail.php:280 +#: ../../mod/mail.php:171 ../../mod/mail.php:283 msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/conversation.php:1124 ../../mod/photos.php:1010 -#: ../../mod/layouts.php:122 +#: ../../include/conversation.php:1124 ../../mod/photos.php:994 +#: ../../mod/editblock.php:168 ../../mod/editlayout.php:161 +#: ../../mod/editwebpage.php:201 ../../mod/layouts.php:122 msgid "Share" msgstr "" @@ -700,7 +966,7 @@ msgstr "" #: ../../include/conversation.php:1130 ../../mod/editblock.php:112 #: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 -#: ../../mod/editwebpage.php:144 ../../mod/mail.php:228 ../../mod/mail.php:342 +#: ../../mod/editwebpage.php:144 ../../mod/mail.php:231 ../../mod/mail.php:345 msgid "Upload photo" msgstr "" @@ -710,7 +976,7 @@ msgstr "" #: ../../include/conversation.php:1132 ../../mod/editblock.php:113 #: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 -#: ../../mod/editwebpage.php:145 ../../mod/mail.php:229 ../../mod/mail.php:343 +#: ../../mod/editwebpage.php:145 ../../mod/mail.php:232 ../../mod/mail.php:346 msgid "Attach file" msgstr "" @@ -720,7 +986,7 @@ msgstr "" #: ../../include/conversation.php:1134 ../../mod/editblock.php:114 #: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 -#: ../../mod/editwebpage.php:146 ../../mod/mail.php:230 ../../mod/mail.php:344 +#: ../../mod/editwebpage.php:146 ../../mod/mail.php:233 ../../mod/mail.php:347 msgid "Insert web link" msgstr "" @@ -800,12 +1066,12 @@ msgstr "" #: ../../include/conversation.php:1173 ../../mod/editblock.php:146 #: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 -#: ../../mod/editwebpage.php:179 ../../mod/mail.php:235 ../../mod/mail.php:349 +#: ../../mod/editwebpage.php:179 ../../mod/mail.php:238 ../../mod/mail.php:352 msgid "Set expiration date" msgstr "" #: ../../include/conversation.php:1175 ../../include/ItemObject.php:609 -#: ../../mod/editpost.php:148 ../../mod/mail.php:237 ../../mod/mail.php:351 +#: ../../mod/editpost.php:148 ../../mod/mail.php:240 ../../mod/mail.php:354 msgid "Encrypt text" msgstr "" @@ -845,10 +1111,6 @@ msgstr "" msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1445 ../../include/widgets.php:89 -msgid "Personal" -msgstr "" - #: ../../include/conversation.php:1448 msgid "Posts that mention or involve you" msgstr "" @@ -910,9 +1172,16 @@ msgstr "" msgid "Manage Webpages" msgstr "" -#: ../../include/bookmarks.php:35 -#, php-format -msgid "%1$s's bookmarks" +#: ../../include/auth.php:116 +msgid "Logged out." +msgstr "" + +#: ../../include/auth.php:257 +msgid "Failed authentication" +msgstr "" + +#: ../../include/auth.php:271 ../../mod/openid.php:190 +msgid "Login failed." msgstr "" #: ../../include/text.php:321 @@ -954,281 +1223,279 @@ msgstr[1] "" msgid "View Connections" msgstr "" -#: ../../include/text.php:823 ../../include/text.php:837 -#: ../../include/widgets.php:193 ../../mod/rbmark.php:28 -#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1341 -#: ../../mod/admin.php:1362 -msgid "Save" -msgstr "" - -#: ../../include/text.php:903 +#: ../../include/text.php:901 msgid "poke" msgstr "" -#: ../../include/text.php:904 +#: ../../include/text.php:902 msgid "ping" msgstr "" -#: ../../include/text.php:904 +#: ../../include/text.php:902 msgid "pinged" msgstr "" -#: ../../include/text.php:905 +#: ../../include/text.php:903 msgid "prod" msgstr "" -#: ../../include/text.php:905 +#: ../../include/text.php:903 msgid "prodded" msgstr "" -#: ../../include/text.php:906 +#: ../../include/text.php:904 msgid "slap" msgstr "" -#: ../../include/text.php:906 +#: ../../include/text.php:904 msgid "slapped" msgstr "" -#: ../../include/text.php:907 +#: ../../include/text.php:905 msgid "finger" msgstr "" -#: ../../include/text.php:907 +#: ../../include/text.php:905 msgid "fingered" msgstr "" -#: ../../include/text.php:908 +#: ../../include/text.php:906 msgid "rebuff" msgstr "" -#: ../../include/text.php:908 +#: ../../include/text.php:906 msgid "rebuffed" msgstr "" -#: ../../include/text.php:917 +#: ../../include/text.php:915 msgid "happy" msgstr "" -#: ../../include/text.php:918 +#: ../../include/text.php:916 msgid "sad" msgstr "" -#: ../../include/text.php:919 +#: ../../include/text.php:917 msgid "mellow" msgstr "" -#: ../../include/text.php:920 +#: ../../include/text.php:918 msgid "tired" msgstr "" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "perky" msgstr "" -#: ../../include/text.php:922 +#: ../../include/text.php:920 msgid "angry" msgstr "" -#: ../../include/text.php:923 +#: ../../include/text.php:921 msgid "stupified" msgstr "" -#: ../../include/text.php:924 +#: ../../include/text.php:922 msgid "puzzled" msgstr "" -#: ../../include/text.php:925 +#: ../../include/text.php:923 msgid "interested" msgstr "" -#: ../../include/text.php:926 +#: ../../include/text.php:924 msgid "bitter" msgstr "" -#: ../../include/text.php:927 +#: ../../include/text.php:925 msgid "cheerful" msgstr "" -#: ../../include/text.php:928 +#: ../../include/text.php:926 msgid "alive" msgstr "" -#: ../../include/text.php:929 +#: ../../include/text.php:927 msgid "annoyed" msgstr "" -#: ../../include/text.php:930 +#: ../../include/text.php:928 msgid "anxious" msgstr "" -#: ../../include/text.php:931 +#: ../../include/text.php:929 msgid "cranky" msgstr "" -#: ../../include/text.php:932 +#: ../../include/text.php:930 msgid "disturbed" msgstr "" -#: ../../include/text.php:933 +#: ../../include/text.php:931 msgid "frustrated" msgstr "" -#: ../../include/text.php:934 +#: ../../include/text.php:932 msgid "depressed" msgstr "" -#: ../../include/text.php:935 +#: ../../include/text.php:933 msgid "motivated" msgstr "" -#: ../../include/text.php:936 +#: ../../include/text.php:934 msgid "relaxed" msgstr "" -#: ../../include/text.php:937 +#: ../../include/text.php:935 msgid "surprised" msgstr "" -#: ../../include/text.php:1101 +#: ../../include/text.php:1099 msgid "Monday" msgstr "" -#: ../../include/text.php:1101 +#: ../../include/text.php:1099 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1101 +#: ../../include/text.php:1099 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1101 +#: ../../include/text.php:1099 msgid "Thursday" msgstr "" -#: ../../include/text.php:1101 +#: ../../include/text.php:1099 msgid "Friday" msgstr "" -#: ../../include/text.php:1101 +#: ../../include/text.php:1099 msgid "Saturday" msgstr "" -#: ../../include/text.php:1101 +#: ../../include/text.php:1099 msgid "Sunday" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1103 msgid "January" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1103 msgid "February" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1103 msgid "March" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1103 msgid "April" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1103 msgid "May" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1103 msgid "June" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1103 msgid "July" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1103 msgid "August" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1103 msgid "September" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1103 msgid "October" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1103 msgid "November" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1103 msgid "December" msgstr "" -#: ../../include/text.php:1183 +#: ../../include/text.php:1181 msgid "unknown.???" msgstr "" -#: ../../include/text.php:1184 +#: ../../include/text.php:1182 msgid "bytes" msgstr "" -#: ../../include/text.php:1223 +#: ../../include/text.php:1221 msgid "remove category" msgstr "" -#: ../../include/text.php:1293 +#: ../../include/text.php:1291 msgid "remove from file" msgstr "" -#: ../../include/text.php:1358 ../../include/text.php:1370 +#: ../../include/text.php:1356 ../../include/text.php:1368 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1525 ../../mod/events.php:414 +#: ../../include/text.php:1523 ../../mod/events.php:414 msgid "Link to Source" msgstr "" -#: ../../include/text.php:1544 +#: ../../include/text.php:1542 msgid "Select a page layout: " msgstr "" -#: ../../include/text.php:1547 ../../include/text.php:1612 +#: ../../include/text.php:1545 ../../include/text.php:1610 msgid "default" msgstr "" -#: ../../include/text.php:1583 +#: ../../include/text.php:1581 msgid "Page content type: " msgstr "" -#: ../../include/text.php:1624 +#: ../../include/text.php:1622 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1758 +#: ../../include/text.php:1756 msgid "activity" msgstr "" -#: ../../include/text.php:2030 +#: ../../include/text.php:2028 msgid "Design" msgstr "" -#: ../../include/text.php:2032 +#: ../../include/text.php:2030 msgid "Blocks" msgstr "" -#: ../../include/text.php:2033 +#: ../../include/text.php:2031 msgid "Menus" msgstr "" -#: ../../include/text.php:2034 +#: ../../include/text.php:2032 msgid "Layouts" msgstr "" -#: ../../include/text.php:2035 +#: ../../include/text.php:2033 msgid "Pages" msgstr "" +#: ../../include/bookmarks.php:35 +#, php-format +msgid "%1$s's bookmarks" +msgstr "" + #: ../../include/taxonomy.php:210 msgid "Tags" msgstr "" @@ -1269,7 +1536,7 @@ msgstr "" msgid "dislikes" msgstr "" -#: ../../include/taxonomy.php:338 ../../include/identity.php:1136 +#: ../../include/taxonomy.php:338 ../../include/identity.php:1137 #: ../../include/ItemObject.php:146 msgctxt "noun" msgid "Like" @@ -1281,6 +1548,191 @@ msgstr[1] "" msgid "Default" msgstr "" +#: ../../include/nav.php:94 ../../include/nav.php:126 ../../boot.php:1494 +msgid "Logout" +msgstr "" + +#: ../../include/nav.php:94 ../../include/nav.php:126 +msgid "End this session" +msgstr "" + +#: ../../include/nav.php:97 ../../include/nav.php:160 +msgid "Home" +msgstr "" + +#: ../../include/nav.php:97 +msgid "Your posts and conversations" +msgstr "" + +#: ../../include/nav.php:98 +msgid "Your profile page" +msgstr "" + +#: ../../include/nav.php:100 +msgid "Edit Profiles" +msgstr "" + +#: ../../include/nav.php:100 +msgid "Manage/Edit profiles" +msgstr "" + +#: ../../include/nav.php:102 ../../include/identity.php:855 +msgid "Edit Profile" +msgstr "" + +#: ../../include/nav.php:102 +msgid "Edit your profile" +msgstr "" + +#: ../../include/nav.php:104 +msgid "Your photos" +msgstr "" + +#: ../../include/nav.php:105 +msgid "Your files" +msgstr "" + +#: ../../include/nav.php:110 +msgid "Your chatrooms" +msgstr "" + +#: ../../include/nav.php:116 +msgid "Your bookmarks" +msgstr "" + +#: ../../include/nav.php:120 +msgid "Your webpages" +msgstr "" + +#: ../../include/nav.php:124 +msgid "Sign in" +msgstr "" + +#: ../../include/nav.php:141 +#, php-format +msgid "%s - click to logout" +msgstr "" + +#: ../../include/nav.php:146 +msgid "Click to authenticate to your home hub" +msgstr "" + +#: ../../include/nav.php:160 +msgid "Home Page" +msgstr "" + +#: ../../include/nav.php:164 ../../mod/register.php:220 ../../boot.php:1471 +msgid "Register" +msgstr "" + +#: ../../include/nav.php:164 +msgid "Create an account" +msgstr "" + +#: ../../include/nav.php:169 +msgid "Help and documentation" +msgstr "" + +#: ../../include/nav.php:172 +msgid "Applications, utilities, links, games" +msgstr "" + +#: ../../include/nav.php:174 +msgid "Search site content" +msgstr "" + +#: ../../include/nav.php:177 +msgid "Channel Locator" +msgstr "" + +#: ../../include/nav.php:191 +msgid "Your matrix" +msgstr "" + +#: ../../include/nav.php:192 +msgid "Mark all matrix notifications seen" +msgstr "" + +#: ../../include/nav.php:194 +msgid "Channel home" +msgstr "" + +#: ../../include/nav.php:195 +msgid "Mark all channel notifications seen" +msgstr "" + +#: ../../include/nav.php:198 ../../mod/connections.php:406 +msgid "Connections" +msgstr "" + +#: ../../include/nav.php:201 +msgid "Notices" +msgstr "" + +#: ../../include/nav.php:201 +msgid "Notifications" +msgstr "" + +#: ../../include/nav.php:202 +msgid "See all notifications" +msgstr "" + +#: ../../include/nav.php:203 ../../mod/notifications.php:99 +msgid "Mark all system notifications seen" +msgstr "" + +#: ../../include/nav.php:205 +msgid "Private mail" +msgstr "" + +#: ../../include/nav.php:206 +msgid "See all private messages" +msgstr "" + +#: ../../include/nav.php:207 +msgid "Mark all private messages seen" +msgstr "" + +#: ../../include/nav.php:208 +msgid "Inbox" +msgstr "" + +#: ../../include/nav.php:209 +msgid "Outbox" +msgstr "" + +#: ../../include/nav.php:213 +msgid "Event Calendar" +msgstr "" + +#: ../../include/nav.php:214 +msgid "See all events" +msgstr "" + +#: ../../include/nav.php:215 +msgid "Mark all events seen" +msgstr "" + +#: ../../include/nav.php:217 +msgid "Manage Your Channels" +msgstr "" + +#: ../../include/nav.php:219 +msgid "Account/Channel Settings" +msgstr "" + +#: ../../include/nav.php:227 ../../mod/admin.php:123 +msgid "Admin" +msgstr "" + +#: ../../include/nav.php:227 +msgid "Site Setup and Configuration" +msgstr "" + +#: ../../include/nav.php:263 +msgid "Please wait..." +msgstr "" + #: ../../include/contact_selectors.php:56 msgid "Frequently" msgstr "" @@ -1398,20 +1850,6 @@ msgstr "" msgid "Advanced Find" msgstr "" -#: ../../include/contact_widgets.php:58 ../../include/features.php:72 -#: ../../include/widgets.php:303 -msgid "Saved Folders" -msgstr "" - -#: ../../include/contact_widgets.php:61 ../../include/contact_widgets.php:96 -#: ../../include/widgets.php:306 -msgid "Everything" -msgstr "" - -#: ../../include/contact_widgets.php:93 ../../include/widgets.php:29 -msgid "Categories" -msgstr "" - #: ../../include/contact_widgets.php:126 #, php-format msgid "%d connection in common" @@ -1423,20 +1861,20 @@ msgstr[1] "" msgid "show more" msgstr "" -#: ../../include/event.php:11 ../../include/bb2diaspora.php:423 +#: ../../include/event.php:11 ../../include/bb2diaspora.php:439 msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/event.php:20 ../../include/bb2diaspora.php:429 +#: ../../include/event.php:20 ../../include/bb2diaspora.php:445 msgid "Starts:" msgstr "" -#: ../../include/event.php:30 ../../include/bb2diaspora.php:437 +#: ../../include/event.php:30 ../../include/bb2diaspora.php:453 msgid "Finishes:" msgstr "" -#: ../../include/event.php:40 ../../include/bb2diaspora.php:445 -#: ../../include/identity.php:881 ../../mod/directory.php:156 +#: ../../include/event.php:40 ../../include/bb2diaspora.php:461 +#: ../../include/identity.php:882 ../../mod/directory.php:156 #: ../../mod/dirprofile.php:105 ../../mod/events.php:579 msgid "Location:" msgstr "" @@ -1633,7 +2071,7 @@ msgstr "" msgid "Safe Mode" msgstr "" -#: ../../include/bb2diaspora.php:344 +#: ../../include/bb2diaspora.php:360 msgid "Attachments:" msgstr "" @@ -1832,83 +2270,6 @@ msgstr "" msgid "[Red:Notify]" msgstr "" -#: ../../include/reddav.php:1145 ../../include/reddav.php:1288 -msgid "parent" -msgstr "" - -#: ../../include/reddav.php:1169 -msgid "Collection" -msgstr "" - -#: ../../include/reddav.php:1172 -msgid "Principal" -msgstr "" - -#: ../../include/reddav.php:1175 -msgid "Addressbook" -msgstr "" - -#: ../../include/reddav.php:1178 -msgid "Calendar" -msgstr "" - -#: ../../include/reddav.php:1181 -msgid "Schedule Inbox" -msgstr "" - -#: ../../include/reddav.php:1184 -msgid "Schedule Outbox" -msgstr "" - -#: ../../include/reddav.php:1262 -#, php-format -msgid "%1$s used" -msgstr "" - -#: ../../include/reddav.php:1267 -#, php-format -msgid "%1$s used of %2$s (%3$s%)" -msgstr "" - -#: ../../include/reddav.php:1284 ../../mod/settings.php:521 -#: ../../mod/settings.php:547 ../../mod/admin.php:868 -msgid "Name" -msgstr "" - -#: ../../include/reddav.php:1285 -msgid "Type" -msgstr "" - -#: ../../include/reddav.php:1286 -msgid "Size" -msgstr "" - -#: ../../include/reddav.php:1287 -msgid "Last Modified" -msgstr "" - -#: ../../include/reddav.php:1291 -msgid "Total" -msgstr "" - -#: ../../include/reddav.php:1344 -msgid "Create new folder" -msgstr "" - -#: ../../include/reddav.php:1345 ../../mod/mitem.php:142 ../../mod/menu.php:84 -#: ../../mod/new_channel.php:122 -msgid "Create" -msgstr "" - -#: ../../include/reddav.php:1346 -msgid "Upload file" -msgstr "" - -#: ../../include/reddav.php:1347 ../../mod/photos.php:1241 -#: ../../mod/profile_photo.php:361 -msgid "Upload" -msgstr "" - #: ../../include/chat.php:10 msgid "Missing room name" msgstr "" @@ -2037,11 +2398,6 @@ msgstr "" msgid "Allow previewing posts and comments before publishing them" msgstr "" -#: ../../include/features.php:49 ../../include/widgets.php:510 -#: ../../mod/sources.php:88 -msgid "Channel Sources" -msgstr "" - #: ../../include/features.php:49 msgid "Automatically import channel content from other channels or feeds" msgstr "" @@ -2075,10 +2431,6 @@ msgstr "" msgid "Enable widget to display Network posts only from selected collections" msgstr "" -#: ../../include/features.php:58 ../../include/widgets.php:272 -msgid "Saved Searches" -msgstr "" - #: ../../include/features.php:58 msgid "Save search terms for re-use" msgstr "" @@ -2203,153 +2555,159 @@ msgstr "" msgid "Cannot connect to yourself." msgstr "" -#: ../../include/items.php:375 ../../mod/profperm.php:23 -#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:242 -#: ../../index.php:364 -msgid "Permission denied" +#: ../../include/group.php:25 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"<strong>may</strong> apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." msgstr "" -#: ../../include/items.php:962 ../../include/items.php:1007 -msgid "(Unknown)" +#: ../../include/group.php:234 +msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/items.php:1163 -msgid "Visible to anybody on the internet." +#: ../../include/group.php:253 ../../mod/admin.php:737 +msgid "All Channels" msgstr "" -#: ../../include/items.php:1165 -msgid "Visible to you only." +#: ../../include/group.php:275 +msgid "edit" msgstr "" -#: ../../include/items.php:1167 -msgid "Visible to anybody in this network." +#: ../../include/group.php:297 +msgid "Collections" msgstr "" -#: ../../include/items.php:1169 -msgid "Visible to anybody authenticated." +#: ../../include/group.php:298 +msgid "Edit collection" msgstr "" -#: ../../include/items.php:1171 -#, php-format -msgid "Visible to anybody on %s." +#: ../../include/group.php:299 +msgid "Create a new collection" msgstr "" -#: ../../include/items.php:1173 -msgid "Visible to all connections." +#: ../../include/group.php:300 +msgid "Channels not in any collection" msgstr "" -#: ../../include/items.php:1175 -msgid "Visible to approved connections." +#: ../../include/bbcode.php:112 ../../include/bbcode.php:653 +#: ../../include/bbcode.php:656 ../../include/bbcode.php:661 +#: ../../include/bbcode.php:664 ../../include/bbcode.php:667 +#: ../../include/bbcode.php:670 ../../include/bbcode.php:675 +#: ../../include/bbcode.php:678 ../../include/bbcode.php:683 +#: ../../include/bbcode.php:686 ../../include/bbcode.php:689 +#: ../../include/bbcode.php:692 +msgid "Image/photo" msgstr "" -#: ../../include/items.php:1177 -msgid "Visible to specific connections." +#: ../../include/bbcode.php:147 ../../include/bbcode.php:703 +msgid "Encrypted content" msgstr "" -#: ../../include/items.php:3938 ../../mod/display.php:32 -#: ../../mod/filestorage.php:18 ../../mod/admin.php:168 -#: ../../mod/admin.php:898 ../../mod/admin.php:1101 ../../mod/thing.php:76 -#: ../../mod/viewsrc.php:20 -msgid "Item not found." +#: ../../include/bbcode.php:165 +msgid "Install design element: " msgstr "" -#: ../../include/items.php:4371 ../../mod/group.php:38 ../../mod/group.php:140 -msgid "Collection not found." +#: ../../include/bbcode.php:171 +msgid "QR code" msgstr "" -#: ../../include/items.php:4386 -msgid "Collection is empty." +#: ../../include/bbcode.php:220 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/items.php:4393 -#, php-format -msgid "Collection: %s" +#: ../../include/bbcode.php:222 +msgid "post" msgstr "" -#: ../../include/items.php:4404 -#, php-format -msgid "Connection: %s" +#: ../../include/bbcode.php:621 +msgid "$1 spoiler" msgstr "" -#: ../../include/items.php:4407 -msgid "Connection not found." +#: ../../include/bbcode.php:641 +msgid "$1 wrote:" msgstr "" -#: ../../include/group.php:25 -msgid "" -"A deleted group with this name was revived. Existing item permissions " -"<strong>may</strong> apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." +#: ../../include/RedDAV/RedBrowser.php:103 +#: ../../include/RedDAV/RedBrowser.php:246 +msgid "parent" msgstr "" -#: ../../include/group.php:234 -msgid "Default privacy group for new contacts" +#: ../../include/RedDAV/RedBrowser.php:127 +msgid "Collection" msgstr "" -#: ../../include/group.php:253 ../../mod/admin.php:737 -msgid "All Channels" +#: ../../include/RedDAV/RedBrowser.php:130 +msgid "Principal" msgstr "" -#: ../../include/group.php:275 -msgid "edit" +#: ../../include/RedDAV/RedBrowser.php:133 +msgid "Addressbook" msgstr "" -#: ../../include/group.php:297 -msgid "Collections" +#: ../../include/RedDAV/RedBrowser.php:136 +msgid "Calendar" msgstr "" -#: ../../include/group.php:298 -msgid "Edit collection" +#: ../../include/RedDAV/RedBrowser.php:139 +msgid "Schedule Inbox" msgstr "" -#: ../../include/group.php:299 -msgid "Create a new collection" +#: ../../include/RedDAV/RedBrowser.php:142 +msgid "Schedule Outbox" msgstr "" -#: ../../include/group.php:300 -msgid "Channels not in any collection" +#: ../../include/RedDAV/RedBrowser.php:220 +#, php-format +msgid "%1$s used" msgstr "" -#: ../../include/group.php:302 ../../include/widgets.php:273 -msgid "add" +#: ../../include/RedDAV/RedBrowser.php:225 +#, php-format +msgid "%1$s used of %2$s (%3$s%)" msgstr "" -#: ../../include/bbcode.php:112 ../../include/bbcode.php:645 -#: ../../include/bbcode.php:648 ../../include/bbcode.php:653 -#: ../../include/bbcode.php:656 ../../include/bbcode.php:659 -#: ../../include/bbcode.php:662 ../../include/bbcode.php:667 -#: ../../include/bbcode.php:670 ../../include/bbcode.php:675 -#: ../../include/bbcode.php:678 ../../include/bbcode.php:681 -#: ../../include/bbcode.php:684 -msgid "Image/photo" +#: ../../include/RedDAV/RedBrowser.php:242 ../../mod/settings.php:521 +#: ../../mod/settings.php:547 ../../mod/admin.php:868 +msgid "Name" msgstr "" -#: ../../include/bbcode.php:147 ../../include/bbcode.php:695 -msgid "Encrypted content" +#: ../../include/RedDAV/RedBrowser.php:243 +msgid "Type" msgstr "" -#: ../../include/bbcode.php:163 -msgid "QR code" +#: ../../include/RedDAV/RedBrowser.php:244 +msgid "Size" msgstr "" -#: ../../include/bbcode.php:212 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" +#: ../../include/RedDAV/RedBrowser.php:245 +msgid "Last Modified" msgstr "" -#: ../../include/bbcode.php:214 -msgid "post" +#: ../../include/RedDAV/RedBrowser.php:249 +msgid "Total" msgstr "" -#: ../../include/bbcode.php:613 -msgid "$1 spoiler" +#: ../../include/RedDAV/RedBrowser.php:293 +msgid "Create new folder" msgstr "" -#: ../../include/bbcode.php:633 -msgid "$1 wrote:" +#: ../../include/RedDAV/RedBrowser.php:294 ../../mod/mitem.php:142 +#: ../../mod/menu.php:84 ../../mod/new_channel.php:122 +msgid "Create" +msgstr "" + +#: ../../include/RedDAV/RedBrowser.php:295 +msgid "Upload file" msgstr "" -#: ../../include/identity.php:31 ../../mod/item.php:1312 +#: ../../include/RedDAV/RedBrowser.php:296 ../../mod/photos.php:745 +#: ../../mod/photos.php:1225 ../../mod/profile_photo.php:361 +msgid "Upload" +msgstr "" + +#: ../../include/identity.php:31 ../../mod/item.php:1319 msgid "Unable to obtain identity information from database" msgstr "" @@ -2378,412 +2736,212 @@ msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/identity.php:281 +#: ../../include/identity.php:282 msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/identity.php:340 +#: ../../include/identity.php:341 msgid "Default Profile" msgstr "" -#: ../../include/identity.php:379 ../../include/identity.php:380 -#: ../../include/identity.php:387 ../../include/widgets.php:407 -#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:495 -msgid "Friends" -msgstr "" - -#: ../../include/identity.php:633 +#: ../../include/identity.php:634 msgid "Requested channel is not available." msgstr "" -#: ../../include/identity.php:681 ../../mod/achievements.php:11 -#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13 -#: ../../mod/filestorage.php:40 ../../mod/layouts.php:8 -#: ../../mod/webpages.php:8 ../../mod/hcard.php:8 +#: ../../include/identity.php:682 ../../mod/achievements.php:11 +#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/webpages.php:8 +#: ../../mod/connect.php:13 ../../mod/filestorage.php:40 +#: ../../mod/layouts.php:8 ../../mod/hcard.php:8 msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:844 ../../mod/profiles.php:750 +#: ../../include/identity.php:845 ../../mod/profiles.php:750 msgid "Change profile photo" msgstr "" -#: ../../include/identity.php:850 +#: ../../include/identity.php:851 msgid "Profiles" msgstr "" -#: ../../include/identity.php:850 +#: ../../include/identity.php:851 msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:851 ../../mod/profiles.php:751 +#: ../../include/identity.php:852 ../../mod/profiles.php:751 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:854 ../../include/nav.php:102 -msgid "Edit Profile" -msgstr "" - -#: ../../include/identity.php:865 ../../mod/profiles.php:762 +#: ../../include/identity.php:866 ../../mod/profiles.php:762 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:868 +#: ../../include/identity.php:869 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:869 ../../mod/profiles.php:645 +#: ../../include/identity.php:870 ../../mod/profiles.php:645 #: ../../mod/profiles.php:766 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:883 ../../include/identity.php:1120 +#: ../../include/identity.php:884 ../../include/identity.php:1121 #: ../../mod/directory.php:158 msgid "Gender:" msgstr "" -#: ../../include/identity.php:884 ../../include/identity.php:1164 +#: ../../include/identity.php:885 ../../include/identity.php:1165 #: ../../mod/directory.php:160 msgid "Status:" msgstr "" -#: ../../include/identity.php:885 ../../include/identity.php:1175 +#: ../../include/identity.php:886 ../../include/identity.php:1176 #: ../../mod/directory.php:162 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:886 ../../mod/dirprofile.php:151 +#: ../../include/identity.php:887 ../../mod/dirprofile.php:151 msgid "Online Now" msgstr "" -#: ../../include/identity.php:964 ../../include/identity.php:1044 +#: ../../include/identity.php:965 ../../include/identity.php:1045 #: ../../mod/ping.php:298 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:965 ../../include/identity.php:1045 +#: ../../include/identity.php:966 ../../include/identity.php:1046 msgid "F d" msgstr "" -#: ../../include/identity.php:1010 ../../include/identity.php:1085 +#: ../../include/identity.php:1011 ../../include/identity.php:1086 #: ../../mod/ping.php:320 msgid "[today]" msgstr "" -#: ../../include/identity.php:1022 +#: ../../include/identity.php:1023 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:1023 +#: ../../include/identity.php:1024 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:1078 +#: ../../include/identity.php:1079 msgid "[No description]" msgstr "" -#: ../../include/identity.php:1096 +#: ../../include/identity.php:1097 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:1097 +#: ../../include/identity.php:1098 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:1118 ../../mod/settings.php:953 +#: ../../include/identity.php:1119 ../../mod/settings.php:953 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:1125 +#: ../../include/identity.php:1126 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1149 +#: ../../include/identity.php:1150 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1150 +#: ../../include/identity.php:1151 msgid "j F" msgstr "" -#: ../../include/identity.php:1157 +#: ../../include/identity.php:1158 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1161 +#: ../../include/identity.php:1162 msgid "Age:" msgstr "" -#: ../../include/identity.php:1170 +#: ../../include/identity.php:1171 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1173 ../../mod/profiles.php:667 +#: ../../include/identity.php:1174 ../../mod/profiles.php:667 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1177 ../../mod/profiles.php:669 +#: ../../include/identity.php:1178 ../../mod/profiles.php:669 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:1179 +#: ../../include/identity.php:1180 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1181 ../../mod/profiles.php:670 +#: ../../include/identity.php:1182 ../../mod/profiles.php:670 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1183 +#: ../../include/identity.php:1184 msgid "Religion:" msgstr "" -#: ../../include/identity.php:1185 ../../mod/directory.php:164 +#: ../../include/identity.php:1186 ../../mod/directory.php:164 msgid "About:" msgstr "" -#: ../../include/identity.php:1187 +#: ../../include/identity.php:1188 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1189 ../../mod/profiles.php:673 +#: ../../include/identity.php:1190 ../../mod/profiles.php:673 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1191 ../../mod/profiles.php:674 +#: ../../include/identity.php:1192 ../../mod/profiles.php:674 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1194 +#: ../../include/identity.php:1195 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1196 +#: ../../include/identity.php:1197 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1198 +#: ../../include/identity.php:1199 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1200 +#: ../../include/identity.php:1201 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1202 +#: ../../include/identity.php:1203 msgid "Television:" msgstr "" -#: ../../include/identity.php:1204 +#: ../../include/identity.php:1205 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1206 +#: ../../include/identity.php:1207 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1208 +#: ../../include/identity.php:1209 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1210 +#: ../../include/identity.php:1211 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1230 +#: ../../include/identity.php:1231 msgid "Like this thing" msgstr "" -#: ../../include/nav.php:94 ../../include/nav.php:126 ../../boot.php:1494 -msgid "Logout" -msgstr "" - -#: ../../include/nav.php:94 ../../include/nav.php:126 -msgid "End this session" -msgstr "" - -#: ../../include/nav.php:97 ../../include/nav.php:160 -msgid "Home" -msgstr "" - -#: ../../include/nav.php:97 -msgid "Your posts and conversations" -msgstr "" - -#: ../../include/nav.php:98 -msgid "Your profile page" -msgstr "" - -#: ../../include/nav.php:100 -msgid "Edit Profiles" -msgstr "" - -#: ../../include/nav.php:100 -msgid "Manage/Edit profiles" -msgstr "" - -#: ../../include/nav.php:102 -msgid "Edit your profile" -msgstr "" - -#: ../../include/nav.php:104 -msgid "Your photos" -msgstr "" - -#: ../../include/nav.php:105 -msgid "Your files" -msgstr "" - -#: ../../include/nav.php:110 -msgid "Your chatrooms" -msgstr "" - -#: ../../include/nav.php:116 -msgid "Your bookmarks" -msgstr "" - -#: ../../include/nav.php:120 -msgid "Your webpages" -msgstr "" - -#: ../../include/nav.php:124 -msgid "Sign in" -msgstr "" - -#: ../../include/nav.php:141 -#, php-format -msgid "%s - click to logout" -msgstr "" - -#: ../../include/nav.php:146 -msgid "Click to authenticate to your home hub" -msgstr "" - -#: ../../include/nav.php:160 -msgid "Home Page" -msgstr "" - -#: ../../include/nav.php:164 ../../mod/register.php:220 ../../boot.php:1471 -msgid "Register" -msgstr "" - -#: ../../include/nav.php:164 -msgid "Create an account" -msgstr "" - -#: ../../include/nav.php:169 -msgid "Help and documentation" -msgstr "" - -#: ../../include/nav.php:172 ../../include/widgets.php:86 -#: ../../mod/apps.php:33 -msgid "Apps" -msgstr "" - -#: ../../include/nav.php:172 -msgid "Applications, utilities, links, games" -msgstr "" - -#: ../../include/nav.php:174 -msgid "Search site content" -msgstr "" - -#: ../../include/nav.php:177 -msgid "Channel Locator" -msgstr "" - -#: ../../include/nav.php:188 -msgid "Your matrix" -msgstr "" - -#: ../../include/nav.php:189 -msgid "Mark all matrix notifications seen" -msgstr "" - -#: ../../include/nav.php:191 -msgid "Channel home" -msgstr "" - -#: ../../include/nav.php:192 -msgid "Mark all channel notifications seen" -msgstr "" - -#: ../../include/nav.php:195 ../../mod/connections.php:406 -msgid "Connections" -msgstr "" - -#: ../../include/nav.php:198 -msgid "Notices" -msgstr "" - -#: ../../include/nav.php:198 -msgid "Notifications" -msgstr "" - -#: ../../include/nav.php:199 -msgid "See all notifications" -msgstr "" - -#: ../../include/nav.php:200 ../../mod/notifications.php:99 -msgid "Mark all system notifications seen" -msgstr "" - -#: ../../include/nav.php:202 -msgid "Private mail" -msgstr "" - -#: ../../include/nav.php:203 -msgid "See all private messages" -msgstr "" - -#: ../../include/nav.php:204 -msgid "Mark all private messages seen" -msgstr "" - -#: ../../include/nav.php:205 -msgid "Inbox" -msgstr "" - -#: ../../include/nav.php:206 -msgid "Outbox" -msgstr "" - -#: ../../include/nav.php:207 ../../include/widgets.php:543 -msgid "New Message" -msgstr "" - -#: ../../include/nav.php:210 -msgid "Event Calendar" -msgstr "" - -#: ../../include/nav.php:211 -msgid "See all events" -msgstr "" - -#: ../../include/nav.php:212 -msgid "Mark all events seen" -msgstr "" - -#: ../../include/nav.php:214 -msgid "Manage Your Channels" -msgstr "" - -#: ../../include/nav.php:216 -msgid "Account/Channel Settings" -msgstr "" - -#: ../../include/nav.php:224 ../../mod/admin.php:123 -msgid "Admin" -msgstr "" - -#: ../../include/nav.php:224 -msgid "Site Setup and Configuration" -msgstr "" - -#: ../../include/nav.php:260 -msgid "Please wait..." -msgstr "" - #: ../../include/message.php:18 msgid "No recipient provided." msgstr "" @@ -2800,143 +2958,6 @@ msgstr "" msgid "Stored post could not be verified." msgstr "" -#: ../../include/widgets.php:87 -msgid "System" -msgstr "" - -#: ../../include/widgets.php:90 -msgid "Create Personal App" -msgstr "" - -#: ../../include/widgets.php:91 -msgid "Edit Personal App" -msgstr "" - -#: ../../include/widgets.php:137 ../../mod/suggest.php:53 -msgid "Ignore/Hide" -msgstr "" - -#: ../../include/widgets.php:143 ../../mod/connections.php:267 -msgid "Suggestions" -msgstr "" - -#: ../../include/widgets.php:144 -msgid "See more..." -msgstr "" - -#: ../../include/widgets.php:166 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "" - -#: ../../include/widgets.php:172 -msgid "Add New Connection" -msgstr "" - -#: ../../include/widgets.php:173 -msgid "Enter the channel address" -msgstr "" - -#: ../../include/widgets.php:174 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "" - -#: ../../include/widgets.php:191 -msgid "Notes" -msgstr "" - -#: ../../include/widgets.php:263 -msgid "Remove term" -msgstr "" - -#: ../../include/widgets.php:342 -msgid "Archives" -msgstr "" - -#: ../../include/widgets.php:404 -msgid "Refresh" -msgstr "" - -#: ../../include/widgets.php:405 ../../mod/connedit.php:492 -msgid "Me" -msgstr "" - -#: ../../include/widgets.php:406 ../../mod/connedit.php:494 -msgid "Best Friends" -msgstr "" - -#: ../../include/widgets.php:408 -msgid "Co-workers" -msgstr "" - -#: ../../include/widgets.php:409 ../../mod/connedit.php:496 -msgid "Former Friends" -msgstr "" - -#: ../../include/widgets.php:410 ../../mod/connedit.php:497 -msgid "Acquaintances" -msgstr "" - -#: ../../include/widgets.php:411 -msgid "Everybody" -msgstr "" - -#: ../../include/widgets.php:443 -msgid "Account settings" -msgstr "" - -#: ../../include/widgets.php:449 -msgid "Channel settings" -msgstr "" - -#: ../../include/widgets.php:455 -msgid "Additional features" -msgstr "" - -#: ../../include/widgets.php:461 -msgid "Feature settings" -msgstr "" - -#: ../../include/widgets.php:467 -msgid "Display settings" -msgstr "" - -#: ../../include/widgets.php:473 -msgid "Connected apps" -msgstr "" - -#: ../../include/widgets.php:479 -msgid "Export channel" -msgstr "" - -#: ../../include/widgets.php:485 -msgid "Export content" -msgstr "" - -#: ../../include/widgets.php:491 -msgid "Automatic Permissions (Advanced)" -msgstr "" - -#: ../../include/widgets.php:501 -msgid "Premium Channel Settings" -msgstr "" - -#: ../../include/widgets.php:538 -msgid "Check Mail" -msgstr "" - -#: ../../include/widgets.php:619 -msgid "Chat Rooms" -msgstr "" - -#: ../../include/widgets.php:637 -msgid "Bookmarked Chatrooms" -msgstr "" - -#: ../../include/widgets.php:655 -msgid "Suggested Chatrooms" -msgstr "" - #: ../../include/ItemObject.php:130 msgid "Save to Folder" msgstr "" @@ -2972,11 +2993,11 @@ msgstr "" msgid "Add Tag" msgstr "" -#: ../../include/ItemObject.php:220 ../../mod/photos.php:1008 +#: ../../include/ItemObject.php:220 ../../mod/photos.php:992 msgid "I like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:221 ../../mod/photos.php:1009 +#: ../../include/ItemObject.php:221 ../../mod/photos.php:993 msgid "I don't like this (toggle)" msgstr "" @@ -3038,13 +3059,13 @@ msgstr[1] "" msgid "[+] show all" msgstr "" -#: ../../include/ItemObject.php:594 ../../mod/photos.php:1027 -#: ../../mod/photos.php:1114 +#: ../../include/ItemObject.php:594 ../../mod/photos.php:1011 +#: ../../mod/photos.php:1098 msgid "This is you" msgstr "" #: ../../include/ItemObject.php:596 ../../include/js_strings.php:6 -#: ../../mod/photos.php:1029 ../../mod/photos.php:1116 +#: ../../mod/photos.php:1013 ../../mod/photos.php:1100 msgid "Comment" msgstr "" @@ -3054,20 +3075,20 @@ msgstr "" #: ../../mod/settings.php:760 ../../mod/settings.php:945 #: ../../mod/poke.php:166 ../../mod/profiles.php:643 ../../mod/chat.php:177 #: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:540 -#: ../../mod/setup.php:307 ../../mod/setup.php:350 ../../mod/pdledit.php:58 -#: ../../mod/photos.php:563 ../../mod/photos.php:675 ../../mod/photos.php:990 -#: ../../mod/photos.php:1030 ../../mod/photos.php:1117 -#: ../../mod/sources.php:104 ../../mod/sources.php:138 -#: ../../mod/events.php:586 ../../mod/filestorage.php:137 -#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:414 -#: ../../mod/admin.php:725 ../../mod/admin.php:861 ../../mod/admin.php:994 -#: ../../mod/admin.php:1193 ../../mod/admin.php:1280 ../../mod/thing.php:284 -#: ../../mod/thing.php:327 ../../mod/import.php:475 ../../mod/invite.php:142 -#: ../../mod/mail.php:345 ../../mod/appman.php:99 ../../mod/poll.php:68 +#: ../../mod/photos.php:563 ../../mod/photos.php:672 ../../mod/photos.php:974 +#: ../../mod/photos.php:1014 ../../mod/photos.php:1101 ../../mod/setup.php:307 +#: ../../mod/setup.php:350 ../../mod/pdledit.php:58 ../../mod/sources.php:104 +#: ../../mod/sources.php:138 ../../mod/events.php:586 +#: ../../mod/filestorage.php:137 ../../mod/fsuggest.php:108 +#: ../../mod/group.php:81 ../../mod/admin.php:414 ../../mod/admin.php:725 +#: ../../mod/admin.php:861 ../../mod/admin.php:994 ../../mod/admin.php:1193 +#: ../../mod/admin.php:1280 ../../mod/thing.php:284 ../../mod/thing.php:327 +#: ../../mod/import.php:480 ../../mod/invite.php:142 ../../mod/mail.php:348 +#: ../../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 +#: ../../view/theme/redbasic/php/config.php:101 msgid "Submit" msgstr "" @@ -3480,18 +3501,6 @@ msgstr "" msgid "Ask me" msgstr "" -#: ../../include/auth.php:103 -msgid "Logged out." -msgstr "" - -#: ../../include/auth.php:249 -msgid "Failed authentication" -msgstr "" - -#: ../../include/auth.php:264 ../../mod/openid.php:188 -msgid "Login failed." -msgstr "" - #: ../../include/permissions.php:13 msgid "Can view my normal stream and posts" msgstr "" @@ -4266,7 +4275,7 @@ msgid "" "logout and retry." msgstr "" -#: ../../mod/post.php:261 ../../mod/openid.php:72 ../../mod/openid.php:178 +#: ../../mod/post.php:261 ../../mod/openid.php:72 ../../mod/openid.php:180 #, php-format msgid "Welcome %s. Remote authentication successful." msgstr "" @@ -4293,49 +4302,49 @@ msgstr "" msgid "Page not found." msgstr "" -#: ../../mod/siteinfo.php:126 +#: ../../mod/siteinfo.php:90 #, php-format msgid "Version %s" msgstr "" -#: ../../mod/siteinfo.php:145 +#: ../../mod/siteinfo.php:109 msgid "Installed plugins/addons/apps:" msgstr "" -#: ../../mod/siteinfo.php:158 +#: ../../mod/siteinfo.php:122 msgid "No installed plugins/addons/apps" msgstr "" -#: ../../mod/siteinfo.php:166 +#: ../../mod/siteinfo.php:130 msgid "Red" msgstr "" -#: ../../mod/siteinfo.php:167 +#: ../../mod/siteinfo.php:131 msgid "" "This is a hub of the Red Matrix - a global cooperative network of " "decentralized privacy enhanced websites." msgstr "" -#: ../../mod/siteinfo.php:170 +#: ../../mod/siteinfo.php:134 msgid "Running at web location" msgstr "" -#: ../../mod/siteinfo.php:171 +#: ../../mod/siteinfo.php:135 msgid "" "Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more " "about the Red Matrix." msgstr "" -#: ../../mod/siteinfo.php:172 +#: ../../mod/siteinfo.php:136 msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/siteinfo.php:175 +#: ../../mod/siteinfo.php:139 msgid "" "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" msgstr "" -#: ../../mod/siteinfo.php:177 +#: ../../mod/siteinfo.php:141 msgid "Site Administrators" msgstr "" @@ -4606,18 +4615,6 @@ msgstr "" msgid "Include desirable objects in your profile" msgstr "" -#: ../../mod/bookmarks.php:38 -msgid "Bookmark added" -msgstr "" - -#: ../../mod/bookmarks.php:58 -msgid "My Bookmarks" -msgstr "" - -#: ../../mod/bookmarks.php:69 -msgid "My Connections Bookmarks" -msgstr "" - #: ../../mod/profperm.php:29 ../../mod/profperm.php:58 msgid "Invalid profile identifier." msgstr "" @@ -4818,8 +4815,8 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../mod/cloud.php:126 -msgid "Red Matrix - Guests: Username: {your email address}, Password: +++" +#: ../../mod/cloud.php:130 +msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" msgstr "" #: ../../mod/removeme.php:29 @@ -5397,7 +5394,7 @@ msgstr "" msgid "Potential Delegates" msgstr "" -#: ../../mod/delegate.php:130 ../../mod/photos.php:940 ../../mod/tagrm.php:93 +#: ../../mod/delegate.php:130 ../../mod/photos.php:924 ../../mod/tagrm.php:93 msgid "Remove" msgstr "" @@ -5410,7 +5407,7 @@ msgid "No entries." msgstr "" #: ../../mod/search.php:13 ../../mod/directory.php:15 -#: ../../mod/dirprofile.php:9 ../../mod/display.php:9 ../../mod/photos.php:443 +#: ../../mod/dirprofile.php:9 ../../mod/photos.php:443 ../../mod/display.php:9 #: ../../mod/viewconnections.php:17 msgid "Public access denied." msgstr "" @@ -5463,6 +5460,137 @@ msgstr "" msgid "This site is not a directory server" msgstr "" +#: ../../mod/photos.php:77 +msgid "Page owner information could not be retrieved." +msgstr "" + +#: ../../mod/photos.php:97 +msgid "Album not found." +msgstr "" + +#: ../../mod/photos.php:119 ../../mod/photos.php:673 +msgid "Delete Album" +msgstr "" + +#: ../../mod/photos.php:159 ../../mod/photos.php:975 +msgid "Delete Photo" +msgstr "" + +#: ../../mod/photos.php:453 +msgid "No photos selected" +msgstr "" + +#: ../../mod/photos.php:500 +msgid "Access to this item is restricted." +msgstr "" + +#: ../../mod/photos.php:574 +#, php-format +msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." +msgstr "" + +#: ../../mod/photos.php:577 +#, php-format +msgid "You have used %1$.2f Mbytes of photo storage." +msgstr "" + +#: ../../mod/photos.php:596 +msgid "Upload Photos" +msgstr "" + +#: ../../mod/photos.php:600 ../../mod/photos.php:668 +msgid "New album name: " +msgstr "" + +#: ../../mod/photos.php:601 +msgid "or existing album name: " +msgstr "" + +#: ../../mod/photos.php:602 +msgid "Do not show a status post for this upload" +msgstr "" + +#: ../../mod/photos.php:622 +msgid "Album name could not be decoded" +msgstr "" + +#: ../../mod/photos.php:657 ../../mod/photos.php:679 ../../mod/photos.php:1147 +#: ../../mod/photos.php:1162 +msgid "Contact Photos" +msgstr "" + +#: ../../mod/photos.php:681 +msgid "Edit Album" +msgstr "" + +#: ../../mod/photos.php:687 +msgid "Show Newest First" +msgstr "" + +#: ../../mod/photos.php:689 +msgid "Show Oldest First" +msgstr "" + +#: ../../mod/photos.php:716 ../../mod/photos.php:1194 +msgid "View Photo" +msgstr "" + +#: ../../mod/photos.php:794 +msgid "Permission denied. Access to this item may be restricted." +msgstr "" + +#: ../../mod/photos.php:796 +msgid "Photo not available" +msgstr "" + +#: ../../mod/photos.php:856 +msgid "Use as profile photo" +msgstr "" + +#: ../../mod/photos.php:880 +msgid "View Full Size" +msgstr "" + +#: ../../mod/photos.php:958 +msgid "Edit photo" +msgstr "" + +#: ../../mod/photos.php:960 +msgid "Rotate CW (right)" +msgstr "" + +#: ../../mod/photos.php:961 +msgid "Rotate CCW (left)" +msgstr "" + +#: ../../mod/photos.php:964 +msgid "New album name" +msgstr "" + +#: ../../mod/photos.php:967 +msgid "Caption" +msgstr "" + +#: ../../mod/photos.php:969 +msgid "Add a Tag" +msgstr "" + +#: ../../mod/photos.php:972 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "" + +#: ../../mod/photos.php:1125 +msgid "In This Photo:" +msgstr "" + +#: ../../mod/photos.php:1200 +msgid "View Album" +msgstr "" + +#: ../../mod/photos.php:1223 +msgid "Recent Photos" +msgstr "" + #: ../../mod/setup.php:162 msgid "Red Matrix Server - Setup" msgstr "" @@ -5929,135 +6057,16 @@ msgstr "" msgid "Delete Webpage" msgstr "" -#: ../../mod/photos.php:77 -msgid "Page owner information could not be retrieved." -msgstr "" - -#: ../../mod/photos.php:97 -msgid "Album not found." -msgstr "" - -#: ../../mod/photos.php:119 ../../mod/photos.php:676 -msgid "Delete Album" -msgstr "" - -#: ../../mod/photos.php:159 ../../mod/photos.php:991 -msgid "Delete Photo" -msgstr "" - -#: ../../mod/photos.php:453 -msgid "No photos selected" -msgstr "" - -#: ../../mod/photos.php:500 -msgid "Access to this item is restricted." -msgstr "" - -#: ../../mod/photos.php:574 -#, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." -msgstr "" - -#: ../../mod/photos.php:577 -#, php-format -msgid "You have used %1$.2f Mbytes of photo storage." -msgstr "" - -#: ../../mod/photos.php:596 -msgid "Upload Photos" -msgstr "" - -#: ../../mod/photos.php:600 ../../mod/photos.php:671 -msgid "New album name: " -msgstr "" - -#: ../../mod/photos.php:601 -msgid "or existing album name: " -msgstr "" - -#: ../../mod/photos.php:602 -msgid "Do not show a status post for this upload" -msgstr "" - -#: ../../mod/photos.php:622 -msgid "Album name could not be decoded" -msgstr "" - -#: ../../mod/photos.php:660 ../../mod/photos.php:682 ../../mod/photos.php:1163 -#: ../../mod/photos.php:1178 -msgid "Contact Photos" -msgstr "" - -#: ../../mod/photos.php:684 -msgid "Edit Album" -msgstr "" - -#: ../../mod/photos.php:690 -msgid "Show Newest First" -msgstr "" - -#: ../../mod/photos.php:692 -msgid "Show Oldest First" -msgstr "" - -#: ../../mod/photos.php:745 ../../mod/photos.php:1210 -msgid "View Photo" -msgstr "" - -#: ../../mod/photos.php:810 -msgid "Permission denied. Access to this item may be restricted." -msgstr "" - -#: ../../mod/photos.php:812 -msgid "Photo not available" -msgstr "" - -#: ../../mod/photos.php:872 -msgid "Use as profile photo" -msgstr "" - -#: ../../mod/photos.php:896 -msgid "View Full Size" -msgstr "" - -#: ../../mod/photos.php:974 -msgid "Edit photo" -msgstr "" - -#: ../../mod/photos.php:976 -msgid "Rotate CW (right)" -msgstr "" - -#: ../../mod/photos.php:977 -msgid "Rotate CCW (left)" -msgstr "" - -#: ../../mod/photos.php:980 -msgid "New album name" -msgstr "" - -#: ../../mod/photos.php:983 -msgid "Caption" -msgstr "" - -#: ../../mod/photos.php:985 -msgid "Add a Tag" -msgstr "" - -#: ../../mod/photos.php:988 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "" - -#: ../../mod/photos.php:1141 -msgid "In This Photo:" +#: ../../mod/bookmarks.php:38 +msgid "Bookmark added" msgstr "" -#: ../../mod/photos.php:1216 -msgid "View Album" +#: ../../mod/bookmarks.php:60 +msgid "My Bookmarks" msgstr "" -#: ../../mod/photos.php:1239 -msgid "Recent Photos" +#: ../../mod/bookmarks.php:71 +msgid "My Connections Bookmarks" msgstr "" #: ../../mod/profile_photo.php:108 @@ -7141,19 +7150,19 @@ msgstr "" msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:446 +#: ../../mod/import.php:451 msgid "Import completed." msgstr "" -#: ../../mod/import.php:458 +#: ../../mod/import.php:463 msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/import.php:463 +#: ../../mod/import.php:468 msgid "Import Channel" msgstr "" -#: ../../mod/import.php:464 +#: ../../mod/import.php:469 msgid "" "Use this form to import an existing channel from a different server/hub. You " "may retrieve the channel identity from the old server/hub via the network or " @@ -7161,27 +7170,27 @@ msgid "" "imported. Importation of content is not yet available." msgstr "" -#: ../../mod/import.php:465 +#: ../../mod/import.php:470 msgid "File to Upload" msgstr "" -#: ../../mod/import.php:466 +#: ../../mod/import.php:471 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:467 +#: ../../mod/import.php:472 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:468 +#: ../../mod/import.php:473 msgid "Your old login email address" msgstr "" -#: ../../mod/import.php:469 +#: ../../mod/import.php:474 msgid "Your old login password" msgstr "" -#: ../../mod/import.php:470 +#: ../../mod/import.php:475 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be " @@ -7189,11 +7198,11 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../mod/import.php:471 +#: ../../mod/import.php:476 msgid "Make this hub my primary location" msgstr "" -#: ../../mod/import.php:472 +#: ../../mod/import.php:477 msgid "Import existing posts if possible" msgstr "" @@ -7238,7 +7247,7 @@ msgstr "" msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/invite.php:131 ../../mod/mail.php:225 ../../mod/mail.php:338 +#: ../../mod/invite.php:131 ../../mod/mail.php:228 ../../mod/mail.php:341 msgid "Your message:" msgstr "" @@ -7266,28 +7275,28 @@ msgstr "" msgid "3. Click [Connect]" msgstr "" -#: ../../mod/item.php:146 +#: ../../mod/item.php:150 msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:379 +#: ../../mod/item.php:383 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:421 +#: ../../mod/item.php:425 msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/item.php:849 +#: ../../mod/item.php:855 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:1317 +#: ../../mod/item.php:1324 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/item.php:1323 +#: ../../mod/item.php:1330 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -7465,65 +7474,61 @@ msgstr "" msgid "Selected channel has private message restrictions. Send failed." msgstr "" -#: ../../mod/mail.php:121 ../../mod/message.php:31 -msgid "Messages" -msgstr "" - -#: ../../mod/mail.php:132 +#: ../../mod/mail.php:135 msgid "Message deleted." msgstr "" -#: ../../mod/mail.php:149 +#: ../../mod/mail.php:152 msgid "Message recalled." msgstr "" -#: ../../mod/mail.php:215 +#: ../../mod/mail.php:218 msgid "Send Private Message" msgstr "" -#: ../../mod/mail.php:216 ../../mod/mail.php:333 +#: ../../mod/mail.php:219 ../../mod/mail.php:336 msgid "To:" msgstr "" -#: ../../mod/mail.php:221 ../../mod/mail.php:335 +#: ../../mod/mail.php:224 ../../mod/mail.php:338 msgid "Subject:" msgstr "" -#: ../../mod/mail.php:232 +#: ../../mod/mail.php:235 msgid "Send" msgstr "" -#: ../../mod/mail.php:259 +#: ../../mod/mail.php:262 msgid "Message not found." msgstr "" -#: ../../mod/mail.php:302 ../../mod/message.php:72 +#: ../../mod/mail.php:305 msgid "Delete message" msgstr "" -#: ../../mod/mail.php:303 +#: ../../mod/mail.php:306 msgid "Recall message" msgstr "" -#: ../../mod/mail.php:305 +#: ../../mod/mail.php:308 msgid "Message has been recalled." msgstr "" -#: ../../mod/mail.php:322 +#: ../../mod/mail.php:325 msgid "Private Conversation" msgstr "" -#: ../../mod/mail.php:326 +#: ../../mod/mail.php:329 ../../mod/message.php:72 msgid "Delete conversation" msgstr "" -#: ../../mod/mail.php:328 +#: ../../mod/mail.php:331 msgid "" "No secure communications available. You <strong>may</strong> be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/mail.php:332 +#: ../../mod/mail.php:335 msgid "Send Reply" msgstr "" @@ -7840,6 +7845,23 @@ msgstr "" msgid "No service class restrictions found." msgstr "" +#: ../../mod/impel.php:33 +msgid "webpage" +msgstr "" + +#: ../../mod/impel.php:38 +msgid "block" +msgstr "" + +#: ../../mod/impel.php:43 +msgid "layout" +msgstr "" + +#: ../../mod/impel.php:117 +#, php-format +msgid "%s element installed" +msgstr "" + #: ../../view/theme/apw/php/config.php:202 #: ../../view/theme/apw/php/config.php:236 msgid "Schema Default" @@ -7856,17 +7878,17 @@ msgstr "" #: ../../view/theme/apw/php/config.php:259 #: ../../view/theme/blogga/php/config.php:69 #: ../../view/theme/blogga/view/theme/blog/config.php:69 -#: ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Theme settings" msgstr "" #: ../../view/theme/apw/php/config.php:260 -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:105 msgid "Set scheme" msgstr "" #: ../../view/theme/apw/php/config.php:261 -#: ../../view/theme/redbasic/php/config.php:124 +#: ../../view/theme/redbasic/php/config.php:127 msgid "Set font-size for posts and comments" msgstr "" @@ -8001,127 +8023,131 @@ msgstr "" msgid "Header image only on profile pages" msgstr "" -#: ../../view/theme/redbasic/php/config.php:84 +#: ../../view/theme/redbasic/php/config.php:86 msgid "Light (Red Matrix default)" msgstr "" -#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Narrow navbar" msgstr "" -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Navigation bar background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:108 msgid "Navigation bar gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:109 msgid "Navigation bar gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Navigation active button gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:111 msgid "Navigation active button gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Navigation bar border color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:113 msgid "Navigation bar icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Navigation bar active icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:113 +#: ../../view/theme/redbasic/php/config.php:115 msgid "link color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:116 msgid "Set font-color for banner" msgstr "" -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:117 msgid "Set the background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:118 msgid "Set the background image" msgstr "" -#: ../../view/theme/redbasic/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:119 msgid "Set the background color of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:118 +#: ../../view/theme/redbasic/php/config.php:120 msgid "Set the background color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:119 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Set the border color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:120 +#: ../../view/theme/redbasic/php/config.php:122 msgid "Set the indent for comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:121 +#: ../../view/theme/redbasic/php/config.php:123 msgid "Set the basic color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:122 +#: ../../view/theme/redbasic/php/config.php:124 msgid "Set the hover color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:123 +#: ../../view/theme/redbasic/php/config.php:125 +msgid "Set the background color of other content" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:126 msgid "Set font-size for the entire application" msgstr "" -#: ../../view/theme/redbasic/php/config.php:125 +#: ../../view/theme/redbasic/php/config.php:128 msgid "Set font-color for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:126 +#: ../../view/theme/redbasic/php/config.php:129 msgid "Set radius of corners" msgstr "" -#: ../../view/theme/redbasic/php/config.php:127 +#: ../../view/theme/redbasic/php/config.php:130 msgid "Set shadow depth of photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:128 +#: ../../view/theme/redbasic/php/config.php:131 msgid "Set maximum width of conversation regions" msgstr "" -#: ../../view/theme/redbasic/php/config.php:129 +#: ../../view/theme/redbasic/php/config.php:132 msgid "Center conversation regions" msgstr "" -#: ../../view/theme/redbasic/php/config.php:130 +#: ../../view/theme/redbasic/php/config.php:133 msgid "Set minimum opacity of nav bar - to hide it" msgstr "" -#: ../../view/theme/redbasic/php/config.php:131 +#: ../../view/theme/redbasic/php/config.php:134 msgid "Set size of conversation author photo" msgstr "" -#: ../../view/theme/redbasic/php/config.php:132 +#: ../../view/theme/redbasic/php/config.php:135 msgid "Set size of followup author photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:133 +#: ../../view/theme/redbasic/php/config.php:136 msgid "Sloppy photo albums" msgstr "" -#: ../../view/theme/redbasic/php/config.php:133 +#: ../../view/theme/redbasic/php/config.php:136 msgid "Are you a clean desk or a messy desk person?" msgstr "" diff --git a/version.inc b/version.inc index b6fff42c1..e509fa400 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-10-09.823 +2014-10-10.824 |