diff options
| -rw-r--r-- | install/INSTALL.txt | 8 | ||||
| -rw-r--r-- | mod/_well_known.php | 13 | ||||
| -rw-r--r-- | mod/hostxrd.php | 1 | ||||
| -rw-r--r-- | util/hmessages.po | 2590 | ||||
| -rw-r--r-- | version.inc | 2 |
5 files changed, 1320 insertions, 1294 deletions
diff --git a/install/INSTALL.txt b/install/INSTALL.txt index 78cea638d..22c7ef35f 100644 --- a/install/INSTALL.txt +++ b/install/INSTALL.txt @@ -62,6 +62,14 @@ When communicating with new sites, Hubzilla always attempts connection on the SSL port first, before falling back to a less secure connection. If you do not use SSL, your webserver MUST NOT listen on port 443 at all. +If you use LetsEncrypt to provide certificates and create a file under +.well-known/acme-challenge so that LetsEncrypt can verify your domain ownership, +please remove or rename the .well-known directory as soon as the certificate is +generated. Hubzilla will provide its own handler for ".well-known" services when +it is installed, and an existing directory in this location may prevent some of +these services from working correctly. + + 1. Requirements - Apache with mod-rewrite enabled and "AllowOverride All" so you can use a local .htaccess file. Some folks have successfully used nginx and lighttpd. diff --git a/mod/_well_known.php b/mod/_well_known.php index d88bc2391..58ed13ece 100644 --- a/mod/_well_known.php +++ b/mod/_well_known.php @@ -33,6 +33,19 @@ function _well_known_init(&$a){ break;
default:
+ // look in $WEBROOT/well_known for the requested file in case it is
+ // something a site requires and for which we do not have a module
+
+ // @fixme - we may need to determine the content-type and stick it in the header
+ // for now this can be done with a php script masquerading as the requested file
+
+ $wk_file = str_replace('.well-known','well_known',$a->cmd);
+ if(file_exists($wk_file)) {
+ echo file_get_contents($wk_file);
+ killme();
+ }
+ elseif(file_exists($wk_file . '.php'))
+ require_once($wk_file . '.php');
break;
}
diff --git a/mod/hostxrd.php b/mod/hostxrd.php index 0e18c133b..18066b7bf 100644 --- a/mod/hostxrd.php +++ b/mod/hostxrd.php @@ -12,6 +12,7 @@ function hostxrd_init(&$a) { )); $arr = array('xrd' => $x); call_hooks('hostxrd',$arr); + echo $arr['xrd']; killme(); } diff --git a/util/hmessages.po b/util/hmessages.po index 1c1769fb5..d134bfcfa 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2016-01-15.1279H\n" +"Project-Id-Version: 2016-01-22.1286H\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-15 00:03-0800\n" +"POT-Creation-Date: 2016-01-22 00:03-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -29,110 +29,8 @@ msgstr "" msgid "Welcome %s. Remote authentication successful." msgstr "" -#: ../../boot.php:1319 -#, php-format -msgid "Update %s failed. See error logs." -msgstr "" - -#: ../../boot.php:1322 -#, php-format -msgid "Update Error at %s" -msgstr "" - -#: ../../boot.php:1489 -msgid "" -"Create an account to access services and applications within the Hubzilla" -msgstr "" - -#: ../../boot.php:1490 ../../include/nav.php:149 ../../mod/register.php:264 -msgid "Register" -msgstr "" - -#: ../../boot.php:1507 ../../include/nav.php:82 ../../include/nav.php:114 -msgid "Logout" -msgstr "" - -#: ../../boot.php:1508 ../../include/apps.php:131 ../../include/nav.php:111 -msgid "Login" -msgstr "" - -#: ../../boot.php:1510 ../../include/contact_selectors.php:79 -#: ../../mod/admin.php:891 ../../mod/admin.php:900 ../../mod/id.php:15 -#: ../../mod/id.php:16 -msgid "Email" -msgstr "" - -#: ../../boot.php:1511 -msgid "Password" -msgstr "" - -#: ../../boot.php:1512 -msgid "Remember me" -msgstr "" - -#: ../../boot.php:1512 ../../include/dir_fns.php:141 -#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143 -#: ../../mod/admin.php:421 ../../mod/api.php:102 ../../mod/events.php:447 -#: ../../mod/events.php:448 ../../mod/events.php:457 -#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159 -#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154 -#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229 -#: ../../mod/photos.php:626 ../../mod/removeme.php:60 -#: ../../mod/settings.php:577 ../../mod/connedit.php:644 -#: ../../mod/connedit.php:693 ../../view/theme/redbasic/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:129 -msgid "No" -msgstr "" - -#: ../../boot.php:1512 ../../include/dir_fns.php:141 -#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143 -#: ../../mod/admin.php:423 ../../mod/api.php:101 ../../mod/events.php:447 -#: ../../mod/events.php:448 ../../mod/events.php:457 -#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159 -#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154 -#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229 -#: ../../mod/photos.php:626 ../../mod/removeme.php:60 -#: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:129 -msgid "Yes" -msgstr "" - -#: ../../boot.php:1515 -msgid "Forgot your password?" -msgstr "" - -#: ../../boot.php:1516 ../../mod/lostpass.php:86 -msgid "Password Reset" -msgstr "" - -#: ../../boot.php:2137 -msgid "toggle mobile" -msgstr "" - -#: ../../boot.php:2289 -msgid "Website SSL certificate is not valid. Please correct." -msgstr "" - -#: ../../boot.php:2292 -#, php-format -msgid "[hubzilla] Website SSL error for %s" -msgstr "" - -#: ../../boot.php:2329 -msgid "Cron/Scheduled tasks not running." -msgstr "" - -#: ../../boot.php:2330 ../../include/datetime.php:263 -msgid "never" -msgstr "" - -#: ../../boot.php:2333 -#, php-format -msgid "[hubzilla] Cron tasks not running on %s" -msgstr "" - -#: ../../include/Contact.php:101 ../../include/conversation.php:953 -#: ../../include/identity.php:947 ../../include/widgets.php:137 +#: ../../include/Contact.php:101 ../../include/conversation.php:961 +#: ../../include/identity.php:949 ../../include/widgets.php:137 #: ../../include/widgets.php:175 ../../mod/directory.php:318 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" @@ -170,22 +68,22 @@ msgstr "" #: ../../include/ItemObject.php:100 ../../include/RedDAV/RedBrowser.php:240 #: ../../include/apps.php:259 ../../include/menu.php:108 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36 -#: ../../mod/blocks.php:153 ../../mod/connections.php:262 -#: ../../mod/connections.php:281 ../../mod/connections.php:301 -#: ../../mod/editblock.php:135 ../../mod/editlayout.php:134 -#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:176 -#: ../../mod/layouts.php:183 ../../mod/menu.php:108 ../../mod/settings.php:648 -#: ../../mod/thing.php:257 ../../mod/webpages.php:181 +#: ../../mod/blocks.php:153 ../../mod/connections.php:284 +#: ../../mod/connections.php:304 ../../mod/editblock.php:135 +#: ../../mod/editlayout.php:134 ../../mod/editpost.php:112 +#: ../../mod/editwebpage.php:176 ../../mod/layouts.php:183 +#: ../../mod/menu.php:108 ../../mod/settings.php:648 ../../mod/thing.php:257 +#: ../../mod/webpages.php:181 msgid "Edit" msgstr "" #: ../../include/ItemObject.php:120 ../../include/RedDAV/RedBrowser.php:241 #: ../../include/apps.php:260 ../../include/conversation.php:657 #: ../../mod/admin.php:895 ../../mod/admin.php:1054 ../../mod/blocks.php:155 -#: ../../mod/connections.php:263 ../../mod/editblock.php:181 -#: ../../mod/editlayout.php:179 ../../mod/editwebpage.php:223 -#: ../../mod/group.php:173 ../../mod/photos.php:1126 -#: ../../mod/settings.php:649 ../../mod/connedit.php:560 +#: ../../mod/connections.php:259 ../../mod/connedit.php:560 +#: ../../mod/editblock.php:181 ../../mod/editlayout.php:179 +#: ../../mod/editwebpage.php:223 ../../mod/group.php:173 +#: ../../mod/photos.php:1126 ../../mod/settings.php:649 #: ../../mod/thing.php:258 ../../mod/webpages.php:183 msgid "Delete" msgstr "" @@ -223,13 +121,13 @@ msgid "I abstain" msgstr "" #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187 -#: ../../include/conversation.php:1697 ../../mod/photos.php:1079 +#: ../../include/conversation.php:1707 ../../mod/photos.php:1079 #: ../../mod/photos.php:1091 msgid "View all" msgstr "" -#: ../../include/ItemObject.php:179 ../../include/conversation.php:1721 -#: ../../include/identity.php:1258 ../../include/taxonomy.php:414 +#: ../../include/ItemObject.php:179 ../../include/conversation.php:1731 +#: ../../include/taxonomy.php:414 ../../include/identity.php:1262 #: ../../mod/photos.php:1083 msgctxt "noun" msgid "Like" @@ -237,7 +135,7 @@ msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:184 ../../include/conversation.php:1724 +#: ../../include/ItemObject.php:184 ../../include/conversation.php:1734 #: ../../mod/photos.php:1088 msgctxt "noun" msgid "Dislike" @@ -372,7 +270,7 @@ msgid "Close" msgstr "" #: ../../include/ItemObject.php:389 ../../include/conversation.php:740 -#: ../../include/conversation.php:1227 ../../mod/editblock.php:150 +#: ../../include/conversation.php:1237 ../../mod/editblock.php:150 #: ../../mod/editlayout.php:148 ../../mod/editpost.php:129 #: ../../mod/editwebpage.php:190 ../../mod/photos.php:1026 msgid "Please wait" @@ -397,50 +295,50 @@ msgstr "" #: ../../mod/admin.php:453 ../../mod/admin.php:596 ../../mod/admin.php:888 #: ../../mod/admin.php:1052 ../../mod/admin.php:1228 ../../mod/admin.php:1423 #: ../../mod/admin.php:1508 ../../mod/appman.php:99 ../../mod/chat.php:184 -#: ../../mod/chat.php:213 ../../mod/connect.php:93 ../../mod/events.php:461 -#: ../../mod/events.php:658 ../../mod/filestorage.php:156 -#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/import.php:527 -#: ../../mod/import_items.php:122 ../../mod/invite.php:142 +#: ../../mod/chat.php:213 ../../mod/connect.php:93 ../../mod/connedit.php:720 +#: ../../mod/events.php:461 ../../mod/events.php:658 +#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108 +#: ../../mod/group.php:81 ../../mod/import.php:527 +#: ../../mod/import_items.php:116 ../../mod/invite.php:142 #: ../../mod/locs.php:116 ../../mod/mail.php:380 ../../mod/mitem.php:231 -#: ../../mod/mood.php:135 ../../mod/pconfig.php:108 ../../mod/pdledit.php:58 +#: ../../mod/mood.php:135 ../../mod/pconfig.php:108 ../../mod/pdledit.php:59 #: ../../mod/photos.php:637 ../../mod/photos.php:1005 #: ../../mod/photos.php:1045 ../../mod/photos.php:1163 ../../mod/poke.php:171 #: ../../mod/profiles.php:675 ../../mod/rate.php:168 #: ../../mod/settings.php:586 ../../mod/settings.php:698 #: ../../mod/settings.php:726 ../../mod/settings.php:749 #: ../../mod/settings.php:834 ../../mod/settings.php:1023 -#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/connedit.php:724 -#: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/thing.php:313 -#: ../../mod/thing.php:359 ../../mod/xchan.php:11 -#: ../../view/theme/redbasic/php/config.php:99 +#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/sources.php:104 +#: ../../mod/sources.php:138 ../../mod/thing.php:313 ../../mod/thing.php:359 +#: ../../mod/xchan.php:11 ../../view/theme/redbasic/php/config.php:99 msgid "Submit" msgstr "" -#: ../../include/ItemObject.php:698 ../../include/conversation.php:1199 +#: ../../include/ItemObject.php:698 ../../include/conversation.php:1209 #: ../../mod/editblock.php:136 ../../mod/editlayout.php:135 #: ../../mod/editpost.php:113 ../../mod/editwebpage.php:177 msgid "Bold" msgstr "" -#: ../../include/ItemObject.php:699 ../../include/conversation.php:1200 +#: ../../include/ItemObject.php:699 ../../include/conversation.php:1210 #: ../../mod/editblock.php:137 ../../mod/editlayout.php:136 #: ../../mod/editpost.php:114 ../../mod/editwebpage.php:178 msgid "Italic" msgstr "" -#: ../../include/ItemObject.php:700 ../../include/conversation.php:1201 +#: ../../include/ItemObject.php:700 ../../include/conversation.php:1211 #: ../../mod/editblock.php:138 ../../mod/editlayout.php:137 #: ../../mod/editpost.php:115 ../../mod/editwebpage.php:179 msgid "Underline" msgstr "" -#: ../../include/ItemObject.php:701 ../../include/conversation.php:1202 +#: ../../include/ItemObject.php:701 ../../include/conversation.php:1212 #: ../../mod/editblock.php:139 ../../mod/editlayout.php:138 #: ../../mod/editpost.php:116 ../../mod/editwebpage.php:180 msgid "Quote" msgstr "" -#: ../../include/ItemObject.php:702 ../../include/conversation.php:1203 +#: ../../include/ItemObject.php:702 ../../include/conversation.php:1213 #: ../../mod/editblock.php:140 ../../mod/editlayout.php:139 #: ../../mod/editpost.php:117 ../../mod/editwebpage.php:181 msgid "Code" @@ -458,7 +356,7 @@ msgstr "" msgid "Video" msgstr "" -#: ../../include/ItemObject.php:706 ../../include/conversation.php:1169 +#: ../../include/ItemObject.php:706 ../../include/conversation.php:1179 #: ../../include/page_widgets.php:40 ../../mod/editblock.php:171 #: ../../mod/editpost.php:149 ../../mod/editwebpage.php:212 #: ../../mod/events.php:458 ../../mod/photos.php:1046 @@ -466,7 +364,7 @@ msgstr "" msgid "Preview" msgstr "" -#: ../../include/ItemObject.php:709 ../../include/conversation.php:1257 +#: ../../include/ItemObject.php:709 ../../include/conversation.php:1267 #: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385 msgid "Encrypt text" msgstr "" @@ -501,14 +399,14 @@ msgid "Schedule Outbox" msgstr "" #: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360 -#: ../../include/apps.php:415 ../../include/conversation.php:1027 -#: ../../include/widgets.php:1366 ../../mod/photos.php:754 +#: ../../include/apps.php:415 ../../include/conversation.php:1037 +#: ../../include/widgets.php:1368 ../../mod/photos.php:754 #: ../../mod/photos.php:1195 msgid "Unknown" msgstr "" #: ../../include/RedDAV/RedBrowser.php:226 ../../include/apps.php:135 -#: ../../include/conversation.php:1629 ../../include/nav.php:93 +#: ../../include/conversation.php:1639 ../../include/nav.php:93 #: ../../mod/fbrowser.php:109 msgid "Files" msgstr "" @@ -530,7 +428,7 @@ msgid "Create" msgstr "" #: ../../include/RedDAV/RedBrowser.php:231 -#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1379 +#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1381 #: ../../mod/photos.php:781 ../../mod/photos.php:1316 #: ../../mod/profile_photo.php:453 ../../mod/cover_photo.php:353 msgid "Upload" @@ -616,7 +514,7 @@ msgid "Registration request at %s" msgstr "" #: ../../include/account.php:317 ../../include/account.php:344 -#: ../../include/account.php:404 ../../include/network.php:1659 +#: ../../include/account.php:404 ../../include/network.php:1660 msgid "Administrator" msgstr "" @@ -707,7 +605,7 @@ msgstr "" msgid "Site Admin" msgstr "" -#: ../../include/apps.php:129 ../../include/conversation.php:1655 +#: ../../include/apps.php:129 ../../include/conversation.php:1665 #: ../../include/nav.php:103 msgid "Bookmarks" msgstr "" @@ -716,6 +614,10 @@ msgstr "" msgid "Address Book" msgstr "" +#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1508 +msgid "Login" +msgstr "" + #: ../../include/apps.php:132 ../../include/nav.php:200 #: ../../mod/manage.php:160 msgid "Channel Manager" @@ -731,7 +633,7 @@ msgstr "" msgid "Settings" msgstr "" -#: ../../include/apps.php:136 ../../include/conversation.php:1665 +#: ../../include/apps.php:136 ../../include/conversation.php:1675 #: ../../include/nav.php:107 ../../mod/webpages.php:178 msgid "Webpages" msgstr "" @@ -740,12 +642,12 @@ msgstr "" msgid "Channel Home" msgstr "" -#: ../../include/apps.php:138 ../../include/identity.php:1232 -#: ../../include/identity.php:1349 ../../mod/profperm.php:112 +#: ../../include/apps.php:138 ../../include/identity.php:1236 +#: ../../include/identity.php:1353 ../../mod/profperm.php:112 msgid "Profile" msgstr "" -#: ../../include/apps.php:139 ../../include/conversation.php:1622 +#: ../../include/apps.php:139 ../../include/conversation.php:1632 #: ../../include/nav.php:92 ../../mod/fbrowser.php:25 msgid "Photos" msgstr "" @@ -771,7 +673,7 @@ msgstr "" msgid "Mood" msgstr "" -#: ../../include/apps.php:145 ../../include/conversation.php:956 +#: ../../include/apps.php:145 ../../include/conversation.php:965 msgid "Poke" msgstr "" @@ -781,7 +683,7 @@ msgstr "" #: ../../include/apps.php:147 ../../include/nav.php:159 #: ../../include/text.php:885 ../../include/text.php:897 -#: ../../mod/connections.php:297 ../../mod/search.php:40 +#: ../../mod/connections.php:300 ../../mod/search.php:40 msgid "Search" msgstr "" @@ -801,7 +703,7 @@ msgstr "" msgid "Invite" msgstr "" -#: ../../include/apps.php:152 ../../include/widgets.php:1252 +#: ../../include/apps.php:152 ../../include/widgets.php:1254 msgid "Features" msgstr "" @@ -837,37 +739,37 @@ msgstr "" #: ../../include/attach.php:351 ../../include/attach.php:358 #: ../../include/attach.php:436 ../../include/attach.php:888 #: ../../include/attach.php:959 ../../include/attach.php:1111 -#: ../../include/chat.php:133 ../../include/items.php:4405 -#: ../../include/photos.php:29 ../../index.php:182 ../../index.php:367 +#: ../../include/chat.php:133 ../../include/photos.php:29 +#: ../../include/items.php:4407 ../../index.php:186 ../../index.php:371 #: ../../mod/achievements.php:30 ../../mod/api.php:26 ../../mod/api.php:31 #: ../../mod/appman.php:66 ../../mod/authtest.php:13 ../../mod/block.php:22 #: ../../mod/block.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76 #: ../../mod/bookmarks.php:48 ../../mod/channel.php:100 #: ../../mod/channel.php:214 ../../mod/channel.php:254 ../../mod/chat.php:94 #: ../../mod/chat.php:99 ../../mod/common.php:35 ../../mod/connections.php:29 -#: ../../mod/editblock.php:65 ../../mod/editlayout.php:63 -#: ../../mod/editlayout.php:87 ../../mod/editpost.php:13 -#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86 -#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125 -#: ../../mod/events.php:260 ../../mod/filestorage.php:18 -#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88 -#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78 -#: ../../mod/group.php:9 ../../mod/id.php:71 ../../mod/invite.php:13 -#: ../../mod/invite.php:87 ../../mod/item.php:206 ../../mod/item.php:214 -#: ../../mod/item.php:1049 ../../mod/layouts.php:69 ../../mod/layouts.php:76 -#: ../../mod/layouts.php:87 ../../mod/like.php:177 ../../mod/locs.php:83 -#: ../../mod/mail.php:126 ../../mod/manage.php:6 ../../mod/menu.php:74 -#: ../../mod/message.php:16 ../../mod/mitem.php:111 ../../mod/mood.php:112 -#: ../../mod/network.php:12 ../../mod/new_channel.php:68 -#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66 -#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/pdledit.php:21 -#: ../../mod/photos.php:70 ../../mod/poke.php:133 ../../mod/profile.php:64 -#: ../../mod/profile.php:72 ../../mod/profile_photo.php:341 -#: ../../mod/profile_photo.php:354 ../../mod/profiles.php:198 -#: ../../mod/profiles.php:584 ../../mod/rate.php:111 ../../mod/register.php:73 -#: ../../mod/regmod.php:17 ../../mod/service_limits.php:7 -#: ../../mod/settings.php:568 ../../mod/setup.php:227 -#: ../../mod/connedit.php:355 ../../mod/sharedwithme.php:7 +#: ../../mod/connedit.php:355 ../../mod/editblock.php:65 +#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87 +#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:64 +#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101 +#: ../../mod/editwebpage.php:125 ../../mod/events.php:260 +#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73 +#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115 +#: ../../mod/fsuggest.php:78 ../../mod/group.php:9 ../../mod/id.php:71 +#: ../../mod/invite.php:13 ../../mod/invite.php:87 ../../mod/item.php:206 +#: ../../mod/item.php:214 ../../mod/item.php:1050 ../../mod/layouts.php:69 +#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/like.php:177 +#: ../../mod/locs.php:83 ../../mod/mail.php:126 ../../mod/manage.php:6 +#: ../../mod/menu.php:74 ../../mod/message.php:16 ../../mod/mitem.php:111 +#: ../../mod/mood.php:112 ../../mod/network.php:12 +#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99 +#: ../../mod/notifications.php:66 ../../mod/page.php:31 ../../mod/page.php:86 +#: ../../mod/pdledit.php:22 ../../mod/photos.php:70 ../../mod/poke.php:133 +#: ../../mod/profile.php:64 ../../mod/profile.php:72 +#: ../../mod/profile_photo.php:341 ../../mod/profile_photo.php:354 +#: ../../mod/profiles.php:198 ../../mod/profiles.php:584 +#: ../../mod/rate.php:111 ../../mod/register.php:73 ../../mod/regmod.php:17 +#: ../../mod/service_limits.php:7 ../../mod/settings.php:568 +#: ../../mod/setup.php:227 ../../mod/sharedwithme.php:7 #: ../../mod/sources.php:66 ../../mod/suggest.php:26 ../../mod/thing.php:271 #: ../../mod/thing.php:291 ../../mod/thing.php:328 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 @@ -974,7 +876,7 @@ msgid "Finishes:" msgstr "" #: ../../include/bb2diaspora.php:487 ../../include/event.php:52 -#: ../../include/identity.php:998 ../../include/text.php:1425 +#: ../../include/identity.php:1000 ../../include/text.php:1425 #: ../../mod/directory.php:304 msgid "Location:" msgstr "" @@ -1071,66 +973,6 @@ msgstr "" msgid "Default" msgstr "" -#: ../../include/contact_selectors.php:56 -msgid "Frequently" -msgstr "" - -#: ../../include/contact_selectors.php:57 -msgid "Hourly" -msgstr "" - -#: ../../include/contact_selectors.php:58 -msgid "Twice daily" -msgstr "" - -#: ../../include/contact_selectors.php:59 -msgid "Daily" -msgstr "" - -#: ../../include/contact_selectors.php:60 -msgid "Weekly" -msgstr "" - -#: ../../include/contact_selectors.php:61 -msgid "Monthly" -msgstr "" - -#: ../../include/contact_selectors.php:76 -msgid "Friendica" -msgstr "" - -#: ../../include/contact_selectors.php:77 -msgid "OStatus" -msgstr "" - -#: ../../include/contact_selectors.php:78 -msgid "RSS/Atom" -msgstr "" - -#: ../../include/contact_selectors.php:80 -msgid "Diaspora" -msgstr "" - -#: ../../include/contact_selectors.php:81 -msgid "Facebook" -msgstr "" - -#: ../../include/contact_selectors.php:82 -msgid "Zot!" -msgstr "" - -#: ../../include/contact_selectors.php:83 -msgid "LinkedIn" -msgstr "" - -#: ../../include/contact_selectors.php:84 -msgid "XMPP/IM" -msgstr "" - -#: ../../include/contact_selectors.php:85 -msgid "MySpace" -msgstr "" - #: ../../include/contact_widgets.php:14 #, php-format msgid "%d invitation available" @@ -1158,7 +1000,7 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:26 ../../mod/connections.php:300 +#: ../../include/contact_widgets.php:26 ../../mod/connections.php:303 #: ../../mod/directory.php:381 ../../mod/directory.php:386 msgid "Find" msgstr "" @@ -1180,7 +1022,7 @@ msgstr "" msgid "Advanced example: name=fred and country=iceland" msgstr "" -#: ../../include/contact_widgets.php:57 ../../include/features.php:92 +#: ../../include/contact_widgets.php:57 ../../include/features.php:93 #: ../../include/widgets.php:304 msgid "Saved Folders" msgstr "" @@ -1330,389 +1172,385 @@ msgstr "" msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:946 +#: ../../include/conversation.php:953 msgid "View Source" msgstr "" -#: ../../include/conversation.php:947 +#: ../../include/conversation.php:954 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:948 +#: ../../include/conversation.php:955 msgid "Unfollow Thread" msgstr "" -#: ../../include/conversation.php:949 -msgid "View Status" -msgstr "" - -#: ../../include/conversation.php:950 ../../include/nav.php:86 +#: ../../include/conversation.php:959 ../../include/nav.php:86 #: ../../mod/connedit.php:507 msgid "View Profile" msgstr "" -#: ../../include/conversation.php:951 -msgid "View Photos" -msgstr "" - -#: ../../include/conversation.php:952 +#: ../../include/conversation.php:960 msgid "Activity/Posts" msgstr "" -#: ../../include/conversation.php:954 +#: ../../include/conversation.php:962 msgid "Edit Connection" msgstr "" -#: ../../include/conversation.php:955 -msgid "Send PM" +#: ../../include/conversation.php:963 +msgid "Message" +msgstr "" + +#: ../../include/conversation.php:964 ../../mod/ratings.php:99 +msgid "Ratings" msgstr "" -#: ../../include/conversation.php:1070 +#: ../../include/conversation.php:1080 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1070 +#: ../../include/conversation.php:1080 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1074 +#: ../../include/conversation.php:1084 #, 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:1076 +#: ../../include/conversation.php:1086 #, 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:1082 +#: ../../include/conversation.php:1092 msgid "and" msgstr "" -#: ../../include/conversation.php:1085 +#: ../../include/conversation.php:1095 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1086 +#: ../../include/conversation.php:1096 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1086 +#: ../../include/conversation.php:1096 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1154 +#: ../../include/conversation.php:1164 msgid "Visible to <strong>everybody</strong>" msgstr "" -#: ../../include/conversation.php:1155 ../../mod/mail.php:202 +#: ../../include/conversation.php:1165 ../../mod/mail.php:202 #: ../../mod/mail.php:316 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:1156 +#: ../../include/conversation.php:1166 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1157 +#: ../../include/conversation.php:1167 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1158 +#: ../../include/conversation.php:1168 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1159 ../../mod/filer.php:48 +#: ../../include/conversation.php:1169 ../../mod/filer.php:48 msgid "Save to Folder:" msgstr "" -#: ../../include/conversation.php:1160 +#: ../../include/conversation.php:1170 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1161 ../../mod/editpost.php:56 +#: ../../include/conversation.php:1171 ../../mod/editpost.php:56 #: ../../mod/mail.php:203 ../../mod/mail.php:317 msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/conversation.php:1192 ../../mod/blocks.php:154 +#: ../../include/conversation.php:1202 ../../mod/blocks.php:154 #: ../../mod/layouts.php:184 ../../mod/photos.php:1025 #: ../../mod/webpages.php:182 msgid "Share" msgstr "" -#: ../../include/conversation.php:1194 +#: ../../include/conversation.php:1204 msgid "Page link name" msgstr "" -#: ../../include/conversation.php:1197 +#: ../../include/conversation.php:1207 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1204 ../../mod/editblock.php:142 +#: ../../include/conversation.php:1214 ../../mod/editblock.php:142 #: ../../mod/editlayout.php:140 ../../mod/editpost.php:118 #: ../../mod/editwebpage.php:182 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1205 +#: ../../include/conversation.php:1215 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1206 ../../mod/editblock.php:143 +#: ../../include/conversation.php:1216 ../../mod/editblock.php:143 #: ../../mod/editlayout.php:141 ../../mod/editpost.php:119 #: ../../mod/editwebpage.php:183 ../../mod/mail.php:248 ../../mod/mail.php:378 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1207 +#: ../../include/conversation.php:1217 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1208 ../../mod/editblock.php:144 +#: ../../include/conversation.php:1218 ../../mod/editblock.php:144 #: ../../mod/editlayout.php:142 ../../mod/editpost.php:120 #: ../../mod/editwebpage.php:184 ../../mod/mail.php:249 ../../mod/mail.php:379 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1209 +#: ../../include/conversation.php:1219 msgid "web link" msgstr "" -#: ../../include/conversation.php:1210 +#: ../../include/conversation.php:1220 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1211 +#: ../../include/conversation.php:1221 msgid "video link" msgstr "" -#: ../../include/conversation.php:1212 +#: ../../include/conversation.php:1222 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1213 +#: ../../include/conversation.php:1223 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1214 ../../mod/editblock.php:148 +#: ../../include/conversation.php:1224 ../../mod/editblock.php:148 #: ../../mod/editlayout.php:146 ../../mod/editpost.php:124 #: ../../mod/editwebpage.php:188 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1215 +#: ../../include/conversation.php:1225 msgid "set location" msgstr "" -#: ../../include/conversation.php:1216 ../../mod/editpost.php:126 +#: ../../include/conversation.php:1226 ../../mod/editpost.php:126 msgid "Toggle voting" msgstr "" -#: ../../include/conversation.php:1219 ../../mod/editblock.php:149 +#: ../../include/conversation.php:1229 ../../mod/editblock.php:149 #: ../../mod/editlayout.php:147 ../../mod/editpost.php:125 #: ../../mod/editwebpage.php:189 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1220 +#: ../../include/conversation.php:1230 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1222 ../../mod/editblock.php:162 +#: ../../include/conversation.php:1232 ../../mod/editblock.php:162 #: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205 msgid "Title (optional)" msgstr "" -#: ../../include/conversation.php:1226 ../../mod/editblock.php:165 +#: ../../include/conversation.php:1236 ../../mod/editblock.php:165 #: ../../mod/editlayout.php:163 ../../mod/editpost.php:143 #: ../../mod/editwebpage.php:207 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/conversation.php:1228 ../../mod/editblock.php:151 +#: ../../include/conversation.php:1238 ../../mod/editblock.php:151 #: ../../mod/editlayout.php:149 ../../mod/editpost.php:130 #: ../../mod/editwebpage.php:191 ../../mod/events.php:459 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1229 +#: ../../include/conversation.php:1239 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1237 ../../mod/editblock.php:159 +#: ../../include/conversation.php:1247 ../../mod/editblock.php:159 #: ../../mod/editlayout.php:156 ../../mod/editpost.php:138 #: ../../mod/editwebpage.php:200 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1239 ../../mod/editblock.php:166 +#: ../../include/conversation.php:1249 ../../mod/editblock.php:166 #: ../../mod/editlayout.php:164 ../../mod/editpost.php:144 #: ../../mod/editwebpage.php:208 msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../include/conversation.php:1252 ../../mod/editblock.php:176 +#: ../../include/conversation.php:1262 ../../mod/editblock.php:176 #: ../../mod/editlayout.php:173 ../../mod/editpost.php:155 #: ../../mod/editwebpage.php:217 ../../mod/mail.php:253 ../../mod/mail.php:383 msgid "Set expiration date" msgstr "" -#: ../../include/conversation.php:1255 +#: ../../include/conversation.php:1265 msgid "Set publish date" msgstr "" -#: ../../include/conversation.php:1259 ../../mod/editpost.php:159 +#: ../../include/conversation.php:1269 ../../mod/editpost.php:159 msgid "OK" msgstr "" -#: ../../include/conversation.php:1260 ../../mod/editpost.php:160 +#: ../../include/conversation.php:1270 ../../mod/editpost.php:160 #: ../../mod/fbrowser.php:77 ../../mod/fbrowser.php:112 #: ../../mod/settings.php:587 ../../mod/settings.php:613 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:134 msgid "Cancel" msgstr "" -#: ../../include/conversation.php:1503 +#: ../../include/conversation.php:1513 msgid "Discover" msgstr "" -#: ../../include/conversation.php:1506 +#: ../../include/conversation.php:1516 msgid "Imported public streams" msgstr "" -#: ../../include/conversation.php:1511 +#: ../../include/conversation.php:1521 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1514 +#: ../../include/conversation.php:1524 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1518 +#: ../../include/conversation.php:1528 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1521 +#: ../../include/conversation.php:1531 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1526 ../../include/widgets.php:95 +#: ../../include/conversation.php:1536 ../../include/widgets.php:95 msgid "Personal" msgstr "" -#: ../../include/conversation.php:1529 +#: ../../include/conversation.php:1539 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1535 ../../mod/connections.php:72 +#: ../../include/conversation.php:1545 ../../mod/connections.php:72 #: ../../mod/connections.php:82 ../../mod/menu.php:112 msgid "New" msgstr "" -#: ../../include/conversation.php:1538 +#: ../../include/conversation.php:1548 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1544 +#: ../../include/conversation.php:1554 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1547 +#: ../../include/conversation.php:1557 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1554 +#: ../../include/conversation.php:1564 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1557 +#: ../../include/conversation.php:1567 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1601 ../../mod/admin.php:1059 +#: ../../include/conversation.php:1611 ../../mod/admin.php:1059 msgid "Channel" msgstr "" -#: ../../include/conversation.php:1604 +#: ../../include/conversation.php:1614 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1613 +#: ../../include/conversation.php:1623 msgid "About" msgstr "" -#: ../../include/conversation.php:1616 +#: ../../include/conversation.php:1626 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1625 ../../include/photos.php:506 +#: ../../include/conversation.php:1635 ../../include/photos.php:506 msgid "Photo Albums" msgstr "" -#: ../../include/conversation.php:1632 +#: ../../include/conversation.php:1642 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1642 ../../include/conversation.php:1645 +#: ../../include/conversation.php:1652 ../../include/conversation.php:1655 msgid "Chatrooms" msgstr "" -#: ../../include/conversation.php:1658 +#: ../../include/conversation.php:1668 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1668 +#: ../../include/conversation.php:1678 msgid "Manage Webpages" msgstr "" -#: ../../include/conversation.php:1727 +#: ../../include/conversation.php:1737 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1730 +#: ../../include/conversation.php:1740 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1733 +#: ../../include/conversation.php:1743 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1736 +#: ../../include/conversation.php:1746 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1739 +#: ../../include/conversation.php:1749 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1742 +#: ../../include/conversation.php:1752 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -1732,6 +1570,10 @@ msgstr "" msgid "Required" msgstr "" +#: ../../include/datetime.php:263 ../../boot.php:2330 +msgid "never" +msgstr "" + #: ../../include/datetime.php:269 msgid "less than a second ago" msgstr "" @@ -1821,6 +1663,31 @@ msgstr "" msgid "Safe Mode" msgstr "" +#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142 +#: ../../include/dir_fns.php:143 ../../mod/admin.php:421 ../../mod/api.php:102 +#: ../../mod/connedit.php:644 ../../mod/connedit.php:693 +#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457 +#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159 +#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154 +#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229 +#: ../../mod/photos.php:626 ../../mod/removeme.php:60 +#: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1512 +msgid "No" +msgstr "" + +#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142 +#: ../../include/dir_fns.php:143 ../../mod/admin.php:423 ../../mod/api.php:101 +#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457 +#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159 +#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154 +#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229 +#: ../../mod/photos.php:626 ../../mod/removeme.php:60 +#: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1512 +msgid "Yes" +msgstr "" + #: ../../include/dir_fns.php:142 msgid "Public Forums Only" msgstr "" @@ -2048,274 +1915,6 @@ msgstr "" msgid "Cancelled" msgstr "" -#: ../../include/features.php:45 -msgid "General Features" -msgstr "" - -#: ../../include/features.php:47 -msgid "Content Expiration" -msgstr "" - -#: ../../include/features.php:47 -msgid "Remove posts/comments and/or private messages at a future time" -msgstr "" - -#: ../../include/features.php:48 -msgid "Multiple Profiles" -msgstr "" - -#: ../../include/features.php:48 -msgid "Ability to create multiple profiles" -msgstr "" - -#: ../../include/features.php:49 -msgid "Advanced Profiles" -msgstr "" - -#: ../../include/features.php:49 -msgid "Additional profile sections and selections" -msgstr "" - -#: ../../include/features.php:50 -msgid "Profile Import/Export" -msgstr "" - -#: ../../include/features.php:50 -msgid "Save and load profile details across sites/channels" -msgstr "" - -#: ../../include/features.php:51 -msgid "Web Pages" -msgstr "" - -#: ../../include/features.php:51 -msgid "Provide managed web pages on your channel" -msgstr "" - -#: ../../include/features.php:52 -msgid "Private Notes" -msgstr "" - -#: ../../include/features.php:52 -msgid "Enables a tool to store notes and reminders" -msgstr "" - -#: ../../include/features.php:53 -msgid "Navigation Channel Select" -msgstr "" - -#: ../../include/features.php:53 -msgid "Change channels directly from within the navigation dropdown menu" -msgstr "" - -#: ../../include/features.php:54 -msgid "Photo Location" -msgstr "" - -#: ../../include/features.php:54 -msgid "If location data is available on uploaded photos, link this to a map." -msgstr "" - -#: ../../include/features.php:56 -msgid "Expert Mode" -msgstr "" - -#: ../../include/features.php:56 -msgid "Enable Expert Mode to provide advanced configuration options" -msgstr "" - -#: ../../include/features.php:57 -msgid "Premium Channel" -msgstr "" - -#: ../../include/features.php:57 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" -msgstr "" - -#: ../../include/features.php:62 -msgid "Post Composition Features" -msgstr "" - -#: ../../include/features.php:64 -msgid "Use Markdown" -msgstr "" - -#: ../../include/features.php:64 -msgid "Allow use of \"Markdown\" to format posts" -msgstr "" - -#: ../../include/features.php:65 -msgid "Large Photos" -msgstr "" - -#: ../../include/features.php:65 -msgid "" -"Include large (1024px) photo thumbnails in posts. If not enabled, use small " -"(640px) photo thumbnails" -msgstr "" - -#: ../../include/features.php:66 ../../include/widgets.php:549 -#: ../../mod/sources.php:88 -msgid "Channel Sources" -msgstr "" - -#: ../../include/features.php:66 -msgid "Automatically import channel content from other channels or feeds" -msgstr "" - -#: ../../include/features.php:67 -msgid "Even More Encryption" -msgstr "" - -#: ../../include/features.php:67 -msgid "" -"Allow optional encryption of content end-to-end with a shared secret key" -msgstr "" - -#: ../../include/features.php:68 -msgid "Enable Voting Tools" -msgstr "" - -#: ../../include/features.php:68 -msgid "Provide a class of post which others can vote on" -msgstr "" - -#: ../../include/features.php:69 -msgid "Delayed Posting" -msgstr "" - -#: ../../include/features.php:69 -msgid "Allow posts to be published at a later date" -msgstr "" - -#: ../../include/features.php:70 -msgid "Suppress Duplicate Posts/Comments" -msgstr "" - -#: ../../include/features.php:70 -msgid "" -"Prevent posts with identical content to be published with less than two " -"minutes in between submissions." -msgstr "" - -#: ../../include/features.php:76 -msgid "Network and Stream Filtering" -msgstr "" - -#: ../../include/features.php:77 -msgid "Search by Date" -msgstr "" - -#: ../../include/features.php:77 -msgid "Ability to select posts by date ranges" -msgstr "" - -#: ../../include/features.php:78 -msgid "Collections Filter" -msgstr "" - -#: ../../include/features.php:78 -msgid "Enable widget to display Network posts only from selected collections" -msgstr "" - -#: ../../include/features.php:79 ../../include/widgets.php:274 -msgid "Saved Searches" -msgstr "" - -#: ../../include/features.php:79 -msgid "Save search terms for re-use" -msgstr "" - -#: ../../include/features.php:80 -msgid "Network Personal Tab" -msgstr "" - -#: ../../include/features.php:80 -msgid "Enable tab to display only Network posts that you've interacted on" -msgstr "" - -#: ../../include/features.php:81 -msgid "Network New Tab" -msgstr "" - -#: ../../include/features.php:81 -msgid "Enable tab to display all new Network activity" -msgstr "" - -#: ../../include/features.php:82 -msgid "Affinity Tool" -msgstr "" - -#: ../../include/features.php:82 -msgid "Filter stream activity by depth of relationships" -msgstr "" - -#: ../../include/features.php:83 -msgid "Connection Filtering" -msgstr "" - -#: ../../include/features.php:83 -msgid "Filter incoming posts from connections based on keywords/content" -msgstr "" - -#: ../../include/features.php:84 -msgid "Suggest Channels" -msgstr "" - -#: ../../include/features.php:84 -msgid "Show channel suggestions" -msgstr "" - -#: ../../include/features.php:89 -msgid "Post/Comment Tools" -msgstr "" - -#: ../../include/features.php:90 -msgid "Community Tagging" -msgstr "" - -#: ../../include/features.php:90 -msgid "Ability to tag existing posts" -msgstr "" - -#: ../../include/features.php:91 -msgid "Post Categories" -msgstr "" - -#: ../../include/features.php:91 -msgid "Add categories to your posts" -msgstr "" - -#: ../../include/features.php:92 -msgid "Ability to file posts under folders" -msgstr "" - -#: ../../include/features.php:93 -msgid "Dislike Posts" -msgstr "" - -#: ../../include/features.php:93 -msgid "Ability to dislike posts/comments" -msgstr "" - -#: ../../include/features.php:94 -msgid "Star Posts" -msgstr "" - -#: ../../include/features.php:94 -msgid "Ability to mark special posts with a star indicator" -msgstr "" - -#: ../../include/features.php:95 -msgid "Tag Cloud" -msgstr "" - -#: ../../include/features.php:95 -msgid "Provide a personal tag cloud on your channel page" -msgstr "" - #: ../../include/follow.php:28 msgid "Channel is blocked on this site." msgstr "" @@ -2387,257 +1986,6 @@ msgstr "" msgid "add" msgstr "" -#: ../../include/identity.php:32 -msgid "Unable to obtain identity information from database" -msgstr "" - -#: ../../include/identity.php:66 -msgid "Empty name" -msgstr "" - -#: ../../include/identity.php:69 -msgid "Name too long" -msgstr "" - -#: ../../include/identity.php:181 -msgid "No account identifier" -msgstr "" - -#: ../../include/identity.php:193 -msgid "Nickname is required." -msgstr "" - -#: ../../include/identity.php:207 -msgid "Reserved nickname. Please choose another." -msgstr "" - -#: ../../include/identity.php:212 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "" - -#: ../../include/identity.php:288 -msgid "Unable to retrieve created identity" -msgstr "" - -#: ../../include/identity.php:346 -msgid "Default Profile" -msgstr "" - -#: ../../include/identity.php:390 ../../include/identity.php:391 -#: ../../include/identity.php:398 ../../include/profile_selectors.php:80 -#: ../../include/widgets.php:430 ../../mod/settings.php:338 -#: ../../mod/settings.php:342 ../../mod/settings.php:343 -#: ../../mod/settings.php:346 ../../mod/settings.php:357 -#: ../../mod/connedit.php:582 -msgid "Friends" -msgstr "" - -#: ../../include/identity.php:770 -msgid "Requested channel is not available." -msgstr "" - -#: ../../include/identity.php:816 ../../mod/achievements.php:11 -#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29 -#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28 -#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29 -#: ../../mod/profile.php:16 ../../mod/webpages.php:29 -msgid "Requested profile is not available." -msgstr "" - -#: ../../include/identity.php:960 ../../mod/profiles.php:782 -msgid "Change profile photo" -msgstr "" - -#: ../../include/identity.php:966 -msgid "Profiles" -msgstr "" - -#: ../../include/identity.php:966 -msgid "Manage/edit profiles" -msgstr "" - -#: ../../include/identity.php:967 ../../mod/profiles.php:783 -msgid "Create New Profile" -msgstr "" - -#: ../../include/identity.php:970 ../../include/nav.php:90 -msgid "Edit Profile" -msgstr "" - -#: ../../include/identity.php:982 ../../mod/profiles.php:794 -msgid "Profile Image" -msgstr "" - -#: ../../include/identity.php:985 -msgid "visible to everybody" -msgstr "" - -#: ../../include/identity.php:986 ../../mod/profiles.php:677 -#: ../../mod/profiles.php:798 -msgid "Edit visibility" -msgstr "" - -#: ../../include/identity.php:1002 ../../include/identity.php:1242 -msgid "Gender:" -msgstr "" - -#: ../../include/identity.php:1003 ../../include/identity.php:1286 -msgid "Status:" -msgstr "" - -#: ../../include/identity.php:1004 ../../include/identity.php:1297 -msgid "Homepage:" -msgstr "" - -#: ../../include/identity.php:1005 -msgid "Online Now" -msgstr "" - -#: ../../include/identity.php:1089 ../../include/identity.php:1167 -#: ../../mod/ping.php:318 -msgid "g A l F d" -msgstr "" - -#: ../../include/identity.php:1090 ../../include/identity.php:1168 -msgid "F d" -msgstr "" - -#: ../../include/identity.php:1135 ../../include/identity.php:1207 -#: ../../mod/ping.php:341 -msgid "[today]" -msgstr "" - -#: ../../include/identity.php:1146 -msgid "Birthday Reminders" -msgstr "" - -#: ../../include/identity.php:1147 -msgid "Birthdays this week:" -msgstr "" - -#: ../../include/identity.php:1200 -msgid "[No description]" -msgstr "" - -#: ../../include/identity.php:1218 -msgid "Event Reminders" -msgstr "" - -#: ../../include/identity.php:1219 -msgid "Events this week:" -msgstr "" - -#: ../../include/identity.php:1240 ../../mod/settings.php:1029 -msgid "Full Name:" -msgstr "" - -#: ../../include/identity.php:1247 -msgid "Like this channel" -msgstr "" - -#: ../../include/identity.php:1271 -msgid "j F, Y" -msgstr "" - -#: ../../include/identity.php:1272 -msgid "j F" -msgstr "" - -#: ../../include/identity.php:1279 -msgid "Birthday:" -msgstr "" - -#: ../../include/identity.php:1283 ../../mod/directory.php:299 -msgid "Age:" -msgstr "" - -#: ../../include/identity.php:1292 -#, php-format -msgid "for %1$d %2$s" -msgstr "" - -#: ../../include/identity.php:1295 ../../mod/profiles.php:699 -msgid "Sexual Preference:" -msgstr "" - -#: ../../include/identity.php:1299 ../../mod/directory.php:315 -#: ../../mod/profiles.php:701 -msgid "Hometown:" -msgstr "" - -#: ../../include/identity.php:1301 -msgid "Tags:" -msgstr "" - -#: ../../include/identity.php:1303 ../../mod/profiles.php:702 -msgid "Political Views:" -msgstr "" - -#: ../../include/identity.php:1305 -msgid "Religion:" -msgstr "" - -#: ../../include/identity.php:1307 ../../mod/directory.php:317 -msgid "About:" -msgstr "" - -#: ../../include/identity.php:1309 -msgid "Hobbies/Interests:" -msgstr "" - -#: ../../include/identity.php:1311 ../../mod/profiles.php:705 -msgid "Likes:" -msgstr "" - -#: ../../include/identity.php:1313 ../../mod/profiles.php:706 -msgid "Dislikes:" -msgstr "" - -#: ../../include/identity.php:1315 -msgid "Contact information and Social Networks:" -msgstr "" - -#: ../../include/identity.php:1317 -msgid "My other channels:" -msgstr "" - -#: ../../include/identity.php:1319 -msgid "Musical interests:" -msgstr "" - -#: ../../include/identity.php:1321 -msgid "Books, literature:" -msgstr "" - -#: ../../include/identity.php:1323 -msgid "Television:" -msgstr "" - -#: ../../include/identity.php:1325 -msgid "Film/dance/culture/entertainment:" -msgstr "" - -#: ../../include/identity.php:1327 -msgid "Love/Romance:" -msgstr "" - -#: ../../include/identity.php:1329 -msgid "Work/employment:" -msgstr "" - -#: ../../include/identity.php:1331 -msgid "School/education:" -msgstr "" - -#: ../../include/identity.php:1351 -msgid "Like this thing" -msgstr "" - -#: ../../include/identity.php:1759 ../../mod/cover_photo.php:236 -msgid "cover photo" -msgstr "" - #: ../../include/import.php:23 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." @@ -2651,79 +1999,6 @@ msgstr "" msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../include/items.php:423 ../../index.php:366 ../../mod/dreport.php:6 -#: ../../mod/dreport.php:45 ../../mod/group.php:68 -#: ../../mod/import_items.php:114 ../../mod/like.php:280 -#: ../../mod/profperm.php:23 ../../mod/subthread.php:58 -msgid "Permission denied" -msgstr "" - -#: ../../include/items.php:1130 ../../include/items.php:1176 -msgid "(Unknown)" -msgstr "" - -#: ../../include/items.php:1373 -msgid "Visible to anybody on the internet." -msgstr "" - -#: ../../include/items.php:1375 -msgid "Visible to you only." -msgstr "" - -#: ../../include/items.php:1377 -msgid "Visible to anybody in this network." -msgstr "" - -#: ../../include/items.php:1379 -msgid "Visible to anybody authenticated." -msgstr "" - -#: ../../include/items.php:1381 -#, php-format -msgid "Visible to anybody on %s." -msgstr "" - -#: ../../include/items.php:1383 -msgid "Visible to all connections." -msgstr "" - -#: ../../include/items.php:1385 -msgid "Visible to approved connections." -msgstr "" - -#: ../../include/items.php:1387 -msgid "Visible to specific connections." -msgstr "" - -#: ../../include/items.php:4326 ../../mod/admin.php:135 -#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36 -#: ../../mod/filestorage.php:27 ../../mod/thing.php:86 -#: ../../mod/viewsrc.php:20 -msgid "Item not found." -msgstr "" - -#: ../../include/items.php:4838 ../../mod/group.php:38 ../../mod/group.php:137 -msgid "Collection not found." -msgstr "" - -#: ../../include/items.php:4854 -msgid "Collection is empty." -msgstr "" - -#: ../../include/items.php:4861 -#, php-format -msgid "Collection: %s" -msgstr "" - -#: ../../include/items.php:4871 ../../mod/connedit.php:692 -#, php-format -msgid "Connection: %s" -msgstr "" - -#: ../../include/items.php:4873 -msgid "Connection not found." -msgstr "" - #: ../../include/js_strings.php:5 msgid "Delete this item?" msgstr "" @@ -2776,8 +2051,8 @@ msgstr "" msgid "Rate This Channel (this is public)" msgstr "" -#: ../../include/js_strings.php:20 ../../mod/rate.php:157 -#: ../../mod/connedit.php:703 +#: ../../include/js_strings.php:20 ../../mod/connedit.php:703 +#: ../../mod/rate.php:157 msgid "Rating" msgstr "" @@ -3066,6 +2341,10 @@ msgstr "" msgid "Stored post could not be verified." msgstr "" +#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1507 +msgid "Logout" +msgstr "" + #: ../../include/nav.php:82 ../../include/nav.php:114 msgid "End this session" msgstr "" @@ -3090,6 +2369,10 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" +#: ../../include/nav.php:90 ../../include/identity.php:972 +msgid "Edit Profile" +msgstr "" + #: ../../include/nav.php:90 msgid "Edit your profile" msgstr "" @@ -3135,6 +2418,10 @@ msgstr "" msgid "Home Page" msgstr "" +#: ../../include/nav.php:149 ../../mod/register.php:264 ../../boot.php:1490 +msgid "Register" +msgstr "" + #: ../../include/nav.php:149 msgid "Create an account" msgstr "" @@ -3176,7 +2463,8 @@ msgstr "" msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/nav.php:181 ../../mod/connections.php:293 +#: ../../include/nav.php:181 ../../include/text.php:815 +#: ../../mod/connections.php:296 msgid "Connections" msgstr "" @@ -3240,7 +2528,7 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:210 ../../include/widgets.php:1279 +#: ../../include/nav.php:210 ../../include/widgets.php:1281 msgid "Admin" msgstr "" @@ -3260,7 +2548,7 @@ msgstr "" msgid "view full size" msgstr "" -#: ../../include/network.php:1673 +#: ../../include/network.php:1674 msgid "No Subject" msgstr "" @@ -3625,6 +2913,15 @@ msgstr "" msgid "Sex Addict" msgstr "" +#: ../../include/profile_selectors.php:80 ../../include/identity.php:390 +#: ../../include/identity.php:391 ../../include/identity.php:398 +#: ../../include/widgets.php:430 ../../mod/connedit.php:582 +#: ../../mod/settings.php:338 ../../mod/settings.php:342 +#: ../../mod/settings.php:343 ../../mod/settings.php:346 +#: ../../mod/settings.php:357 +msgid "Friends" +msgstr "" + #: ../../include/profile_selectors.php:80 msgid "Friends/Benefits" msgstr "" @@ -3715,7 +3012,7 @@ msgstr "" msgid "Ask me" msgstr "" -#: ../../include/security.php:381 +#: ../../include/security.php:384 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." @@ -3753,6 +3050,605 @@ msgstr "" msgid "dislikes" msgstr "" +#: ../../include/zot.php:676 +msgid "Invalid data packet" +msgstr "" + +#: ../../include/zot.php:692 +msgid "Unable to verify channel signature" +msgstr "" + +#: ../../include/zot.php:2268 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "" + +#: ../../include/zot.php:3584 +msgid "invalid target signature" +msgstr "" + +#: ../../include/contact_selectors.php:56 +msgid "Frequently" +msgstr "" + +#: ../../include/contact_selectors.php:57 +msgid "Hourly" +msgstr "" + +#: ../../include/contact_selectors.php:58 +msgid "Twice daily" +msgstr "" + +#: ../../include/contact_selectors.php:59 +msgid "Daily" +msgstr "" + +#: ../../include/contact_selectors.php:60 +msgid "Weekly" +msgstr "" + +#: ../../include/contact_selectors.php:61 +msgid "Monthly" +msgstr "" + +#: ../../include/contact_selectors.php:76 +msgid "Friendica" +msgstr "" + +#: ../../include/contact_selectors.php:77 +msgid "OStatus" +msgstr "" + +#: ../../include/contact_selectors.php:78 +msgid "RSS/Atom" +msgstr "" + +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:891 +#: ../../mod/admin.php:900 ../../mod/id.php:15 ../../mod/id.php:16 +#: ../../boot.php:1510 +msgid "Email" +msgstr "" + +#: ../../include/contact_selectors.php:80 +msgid "Diaspora" +msgstr "" + +#: ../../include/contact_selectors.php:81 +msgid "Facebook" +msgstr "" + +#: ../../include/contact_selectors.php:82 +msgid "Zot" +msgstr "" + +#: ../../include/contact_selectors.php:83 +msgid "LinkedIn" +msgstr "" + +#: ../../include/contact_selectors.php:84 +msgid "XMPP/IM" +msgstr "" + +#: ../../include/contact_selectors.php:85 +msgid "MySpace" +msgstr "" + +#: ../../include/features.php:45 +msgid "General Features" +msgstr "" + +#: ../../include/features.php:47 +msgid "Content Expiration" +msgstr "" + +#: ../../include/features.php:47 +msgid "Remove posts/comments and/or private messages at a future time" +msgstr "" + +#: ../../include/features.php:48 +msgid "Multiple Profiles" +msgstr "" + +#: ../../include/features.php:48 +msgid "Ability to create multiple profiles" +msgstr "" + +#: ../../include/features.php:49 +msgid "Advanced Profiles" +msgstr "" + +#: ../../include/features.php:49 +msgid "Additional profile sections and selections" +msgstr "" + +#: ../../include/features.php:50 +msgid "Profile Import/Export" +msgstr "" + +#: ../../include/features.php:50 +msgid "Save and load profile details across sites/channels" +msgstr "" + +#: ../../include/features.php:51 +msgid "Web Pages" +msgstr "" + +#: ../../include/features.php:51 +msgid "Provide managed web pages on your channel" +msgstr "" + +#: ../../include/features.php:52 +msgid "Hide Rating" +msgstr "" + +#: ../../include/features.php:52 +msgid "" +"Hide the rating buttons on your channel and profile pages. Note: People can " +"still rate you somewhere else." +msgstr "" + +#: ../../include/features.php:53 +msgid "Private Notes" +msgstr "" + +#: ../../include/features.php:53 +msgid "Enables a tool to store notes and reminders" +msgstr "" + +#: ../../include/features.php:54 +msgid "Navigation Channel Select" +msgstr "" + +#: ../../include/features.php:54 +msgid "Change channels directly from within the navigation dropdown menu" +msgstr "" + +#: ../../include/features.php:55 +msgid "Photo Location" +msgstr "" + +#: ../../include/features.php:55 +msgid "If location data is available on uploaded photos, link this to a map." +msgstr "" + +#: ../../include/features.php:57 +msgid "Expert Mode" +msgstr "" + +#: ../../include/features.php:57 +msgid "Enable Expert Mode to provide advanced configuration options" +msgstr "" + +#: ../../include/features.php:58 +msgid "Premium Channel" +msgstr "" + +#: ../../include/features.php:58 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" +msgstr "" + +#: ../../include/features.php:63 +msgid "Post Composition Features" +msgstr "" + +#: ../../include/features.php:65 +msgid "Use Markdown" +msgstr "" + +#: ../../include/features.php:65 +msgid "Allow use of \"Markdown\" to format posts" +msgstr "" + +#: ../../include/features.php:66 +msgid "Large Photos" +msgstr "" + +#: ../../include/features.php:66 +msgid "" +"Include large (1024px) photo thumbnails in posts. If not enabled, use small " +"(640px) photo thumbnails" +msgstr "" + +#: ../../include/features.php:67 ../../include/widgets.php:549 +#: ../../mod/sources.php:88 +msgid "Channel Sources" +msgstr "" + +#: ../../include/features.php:67 +msgid "Automatically import channel content from other channels or feeds" +msgstr "" + +#: ../../include/features.php:68 +msgid "Even More Encryption" +msgstr "" + +#: ../../include/features.php:68 +msgid "" +"Allow optional encryption of content end-to-end with a shared secret key" +msgstr "" + +#: ../../include/features.php:69 +msgid "Enable Voting Tools" +msgstr "" + +#: ../../include/features.php:69 +msgid "Provide a class of post which others can vote on" +msgstr "" + +#: ../../include/features.php:70 +msgid "Delayed Posting" +msgstr "" + +#: ../../include/features.php:70 +msgid "Allow posts to be published at a later date" +msgstr "" + +#: ../../include/features.php:71 +msgid "Suppress Duplicate Posts/Comments" +msgstr "" + +#: ../../include/features.php:71 +msgid "" +"Prevent posts with identical content to be published with less than two " +"minutes in between submissions." +msgstr "" + +#: ../../include/features.php:77 +msgid "Network and Stream Filtering" +msgstr "" + +#: ../../include/features.php:78 +msgid "Search by Date" +msgstr "" + +#: ../../include/features.php:78 +msgid "Ability to select posts by date ranges" +msgstr "" + +#: ../../include/features.php:79 +msgid "Collections (Privacy Groups)" +msgstr "" + +#: ../../include/features.php:79 +msgid "Enable widget to display Network posts only from selected collections" +msgstr "" + +#: ../../include/features.php:80 ../../include/widgets.php:274 +msgid "Saved Searches" +msgstr "" + +#: ../../include/features.php:80 +msgid "Save search terms for re-use" +msgstr "" + +#: ../../include/features.php:81 +msgid "Network Personal Tab" +msgstr "" + +#: ../../include/features.php:81 +msgid "Enable tab to display only Network posts that you've interacted on" +msgstr "" + +#: ../../include/features.php:82 +msgid "Network New Tab" +msgstr "" + +#: ../../include/features.php:82 +msgid "Enable tab to display all new Network activity" +msgstr "" + +#: ../../include/features.php:83 +msgid "Affinity Tool" +msgstr "" + +#: ../../include/features.php:83 +msgid "Filter stream activity by depth of relationships" +msgstr "" + +#: ../../include/features.php:84 +msgid "Connection Filtering" +msgstr "" + +#: ../../include/features.php:84 +msgid "Filter incoming posts from connections based on keywords/content" +msgstr "" + +#: ../../include/features.php:85 +msgid "Suggest Channels" +msgstr "" + +#: ../../include/features.php:85 +msgid "Show channel suggestions" +msgstr "" + +#: ../../include/features.php:90 +msgid "Post/Comment Tools" +msgstr "" + +#: ../../include/features.php:91 +msgid "Community Tagging" +msgstr "" + +#: ../../include/features.php:91 +msgid "Ability to tag existing posts" +msgstr "" + +#: ../../include/features.php:92 +msgid "Post Categories" +msgstr "" + +#: ../../include/features.php:92 +msgid "Add categories to your posts" +msgstr "" + +#: ../../include/features.php:93 +msgid "Ability to file posts under folders" +msgstr "" + +#: ../../include/features.php:94 +msgid "Dislike Posts" +msgstr "" + +#: ../../include/features.php:94 +msgid "Ability to dislike posts/comments" +msgstr "" + +#: ../../include/features.php:95 +msgid "Star Posts" +msgstr "" + +#: ../../include/features.php:95 +msgid "Ability to mark special posts with a star indicator" +msgstr "" + +#: ../../include/features.php:96 +msgid "Tag Cloud" +msgstr "" + +#: ../../include/features.php:96 +msgid "Provide a personal tag cloud on your channel page" +msgstr "" + +#: ../../include/identity.php:32 +msgid "Unable to obtain identity information from database" +msgstr "" + +#: ../../include/identity.php:66 +msgid "Empty name" +msgstr "" + +#: ../../include/identity.php:69 +msgid "Name too long" +msgstr "" + +#: ../../include/identity.php:181 +msgid "No account identifier" +msgstr "" + +#: ../../include/identity.php:193 +msgid "Nickname is required." +msgstr "" + +#: ../../include/identity.php:207 +msgid "Reserved nickname. Please choose another." +msgstr "" + +#: ../../include/identity.php:212 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "" + +#: ../../include/identity.php:288 +msgid "Unable to retrieve created identity" +msgstr "" + +#: ../../include/identity.php:346 +msgid "Default Profile" +msgstr "" + +#: ../../include/identity.php:772 +msgid "Requested channel is not available." +msgstr "" + +#: ../../include/identity.php:818 ../../mod/achievements.php:11 +#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29 +#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28 +#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29 +#: ../../mod/profile.php:16 ../../mod/webpages.php:29 +msgid "Requested profile is not available." +msgstr "" + +#: ../../include/identity.php:962 ../../mod/profiles.php:782 +msgid "Change profile photo" +msgstr "" + +#: ../../include/identity.php:968 +msgid "Profiles" +msgstr "" + +#: ../../include/identity.php:968 +msgid "Manage/edit profiles" +msgstr "" + +#: ../../include/identity.php:969 ../../mod/profiles.php:783 +msgid "Create New Profile" +msgstr "" + +#: ../../include/identity.php:984 ../../mod/profiles.php:794 +msgid "Profile Image" +msgstr "" + +#: ../../include/identity.php:987 +msgid "visible to everybody" +msgstr "" + +#: ../../include/identity.php:988 ../../mod/profiles.php:677 +#: ../../mod/profiles.php:798 +msgid "Edit visibility" +msgstr "" + +#: ../../include/identity.php:1004 ../../include/identity.php:1246 +msgid "Gender:" +msgstr "" + +#: ../../include/identity.php:1005 ../../include/identity.php:1290 +msgid "Status:" +msgstr "" + +#: ../../include/identity.php:1006 ../../include/identity.php:1301 +msgid "Homepage:" +msgstr "" + +#: ../../include/identity.php:1007 +msgid "Online Now" +msgstr "" + +#: ../../include/identity.php:1093 ../../include/identity.php:1171 +#: ../../mod/ping.php:318 +msgid "g A l F d" +msgstr "" + +#: ../../include/identity.php:1094 ../../include/identity.php:1172 +msgid "F d" +msgstr "" + +#: ../../include/identity.php:1139 ../../include/identity.php:1211 +#: ../../mod/ping.php:341 +msgid "[today]" +msgstr "" + +#: ../../include/identity.php:1150 +msgid "Birthday Reminders" +msgstr "" + +#: ../../include/identity.php:1151 +msgid "Birthdays this week:" +msgstr "" + +#: ../../include/identity.php:1204 +msgid "[No description]" +msgstr "" + +#: ../../include/identity.php:1222 +msgid "Event Reminders" +msgstr "" + +#: ../../include/identity.php:1223 +msgid "Events this week:" +msgstr "" + +#: ../../include/identity.php:1244 ../../mod/settings.php:1029 +msgid "Full Name:" +msgstr "" + +#: ../../include/identity.php:1251 +msgid "Like this channel" +msgstr "" + +#: ../../include/identity.php:1275 +msgid "j F, Y" +msgstr "" + +#: ../../include/identity.php:1276 +msgid "j F" +msgstr "" + +#: ../../include/identity.php:1283 +msgid "Birthday:" +msgstr "" + +#: ../../include/identity.php:1287 ../../mod/directory.php:299 +msgid "Age:" +msgstr "" + +#: ../../include/identity.php:1296 +#, php-format +msgid "for %1$d %2$s" +msgstr "" + +#: ../../include/identity.php:1299 ../../mod/profiles.php:699 +msgid "Sexual Preference:" +msgstr "" + +#: ../../include/identity.php:1303 ../../mod/directory.php:315 +#: ../../mod/profiles.php:701 +msgid "Hometown:" +msgstr "" + +#: ../../include/identity.php:1305 +msgid "Tags:" +msgstr "" + +#: ../../include/identity.php:1307 ../../mod/profiles.php:702 +msgid "Political Views:" +msgstr "" + +#: ../../include/identity.php:1309 +msgid "Religion:" +msgstr "" + +#: ../../include/identity.php:1311 ../../mod/directory.php:317 +msgid "About:" +msgstr "" + +#: ../../include/identity.php:1313 +msgid "Hobbies/Interests:" +msgstr "" + +#: ../../include/identity.php:1315 ../../mod/profiles.php:705 +msgid "Likes:" +msgstr "" + +#: ../../include/identity.php:1317 ../../mod/profiles.php:706 +msgid "Dislikes:" +msgstr "" + +#: ../../include/identity.php:1319 +msgid "Contact information and Social Networks:" +msgstr "" + +#: ../../include/identity.php:1321 +msgid "My other channels:" +msgstr "" + +#: ../../include/identity.php:1323 +msgid "Musical interests:" +msgstr "" + +#: ../../include/identity.php:1325 +msgid "Books, literature:" +msgstr "" + +#: ../../include/identity.php:1327 +msgid "Television:" +msgstr "" + +#: ../../include/identity.php:1329 +msgid "Film/dance/culture/entertainment:" +msgstr "" + +#: ../../include/identity.php:1331 +msgid "Love/Romance:" +msgstr "" + +#: ../../include/identity.php:1333 +msgid "Work/employment:" +msgstr "" + +#: ../../include/identity.php:1335 +msgid "School/education:" +msgstr "" + +#: ../../include/identity.php:1355 +msgid "Like this thing" +msgstr "" + +#: ../../include/identity.php:1763 ../../mod/cover_photo.php:236 +msgid "cover photo" +msgstr "" + #: ../../include/text.php:394 msgid "prev" msgstr "" @@ -3781,15 +3677,9 @@ msgstr "" msgid "No connections" msgstr "" -#: ../../include/text.php:815 +#: ../../include/text.php:828 #, php-format -msgid "%d Connection" -msgid_plural "%d Connections" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/text.php:828 ../../mod/viewconnections.php:101 -msgid "View Connections" +msgid "View all %s connections" msgstr "" #: ../../include/text.php:886 ../../include/text.php:898 @@ -3999,23 +3889,6 @@ msgstr "" msgid "Pages" msgstr "" -#: ../../include/zot.php:676 -msgid "Invalid data packet" -msgstr "" - -#: ../../include/zot.php:692 -msgid "Unable to verify channel signature" -msgstr "" - -#: ../../include/zot.php:2268 -#, php-format -msgid "Unable to verify site signature for %s" -msgstr "" - -#: ../../include/zot.php:3584 -msgid "invalid target signature" -msgstr "" - #: ../../include/widgets.php:93 msgid "System" msgstr "" @@ -4206,107 +4079,184 @@ msgstr "" msgid "photo/image" msgstr "" -#: ../../include/widgets.php:1116 ../../include/widgets.php:1118 +#: ../../include/widgets.php:1115 +msgid "Rating Tools" +msgstr "" + +#: ../../include/widgets.php:1119 ../../include/widgets.php:1121 msgid "Rate Me" msgstr "" -#: ../../include/widgets.php:1122 +#: ../../include/widgets.php:1124 msgid "View Ratings" msgstr "" -#: ../../include/widgets.php:1133 +#: ../../include/widgets.php:1135 msgid "Public Hubs" msgstr "" -#: ../../include/widgets.php:1181 +#: ../../include/widgets.php:1183 msgid "Forums" msgstr "" -#: ../../include/widgets.php:1210 +#: ../../include/widgets.php:1212 msgid "Tasks" msgstr "" -#: ../../include/widgets.php:1219 +#: ../../include/widgets.php:1221 msgid "Documentation" msgstr "" -#: ../../include/widgets.php:1221 +#: ../../include/widgets.php:1223 msgid "Project/Site Information" msgstr "" -#: ../../include/widgets.php:1222 +#: ../../include/widgets.php:1224 msgid "For Members" msgstr "" -#: ../../include/widgets.php:1223 +#: ../../include/widgets.php:1225 msgid "For Administrators" msgstr "" -#: ../../include/widgets.php:1224 +#: ../../include/widgets.php:1226 msgid "For Developers" msgstr "" -#: ../../include/widgets.php:1249 ../../mod/admin.php:452 +#: ../../include/widgets.php:1251 ../../mod/admin.php:452 msgid "Site" msgstr "" -#: ../../include/widgets.php:1250 +#: ../../include/widgets.php:1252 msgid "Accounts" msgstr "" -#: ../../include/widgets.php:1251 ../../mod/admin.php:1051 +#: ../../include/widgets.php:1253 ../../mod/admin.php:1051 msgid "Channels" msgstr "" -#: ../../include/widgets.php:1253 ../../mod/admin.php:1166 +#: ../../include/widgets.php:1255 ../../mod/admin.php:1166 #: ../../mod/admin.php:1227 msgid "Plugins" msgstr "" -#: ../../include/widgets.php:1254 ../../mod/admin.php:1388 +#: ../../include/widgets.php:1256 ../../mod/admin.php:1388 #: ../../mod/admin.php:1422 msgid "Themes" msgstr "" -#: ../../include/widgets.php:1255 +#: ../../include/widgets.php:1257 msgid "Inspect queue" msgstr "" -#: ../../include/widgets.php:1256 +#: ../../include/widgets.php:1258 msgid "Profile Config" msgstr "" -#: ../../include/widgets.php:1257 +#: ../../include/widgets.php:1259 msgid "DB updates" msgstr "" -#: ../../include/widgets.php:1275 ../../include/widgets.php:1281 +#: ../../include/widgets.php:1277 ../../include/widgets.php:1283 #: ../../mod/admin.php:1507 msgid "Logs" msgstr "" -#: ../../include/widgets.php:1280 +#: ../../include/widgets.php:1282 msgid "Plugin Features" msgstr "" -#: ../../include/widgets.php:1282 +#: ../../include/widgets.php:1284 msgid "User registrations waiting for confirmation" msgstr "" -#: ../../include/widgets.php:1360 ../../mod/photos.php:748 +#: ../../include/widgets.php:1362 ../../mod/photos.php:748 #: ../../mod/photos.php:1283 msgid "View Photo" msgstr "" -#: ../../include/widgets.php:1377 ../../mod/photos.php:779 +#: ../../include/widgets.php:1379 ../../mod/photos.php:779 msgid "Edit Album" msgstr "" -#: ../../index.php:238 ../../mod/help.php:213 +#: ../../include/items.php:423 ../../index.php:370 ../../mod/dreport.php:6 +#: ../../mod/dreport.php:45 ../../mod/group.php:68 +#: ../../mod/import_items.php:108 ../../mod/like.php:280 +#: ../../mod/profperm.php:23 ../../mod/subthread.php:58 +msgid "Permission denied" +msgstr "" + +#: ../../include/items.php:1130 ../../include/items.php:1176 +msgid "(Unknown)" +msgstr "" + +#: ../../include/items.php:1373 +msgid "Visible to anybody on the internet." +msgstr "" + +#: ../../include/items.php:1375 +msgid "Visible to you only." +msgstr "" + +#: ../../include/items.php:1377 +msgid "Visible to anybody in this network." +msgstr "" + +#: ../../include/items.php:1379 +msgid "Visible to anybody authenticated." +msgstr "" + +#: ../../include/items.php:1381 +#, php-format +msgid "Visible to anybody on %s." +msgstr "" + +#: ../../include/items.php:1383 +msgid "Visible to all connections." +msgstr "" + +#: ../../include/items.php:1385 +msgid "Visible to approved connections." +msgstr "" + +#: ../../include/items.php:1387 +msgid "Visible to specific connections." +msgstr "" + +#: ../../include/items.php:4328 ../../mod/admin.php:135 +#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36 +#: ../../mod/filestorage.php:27 ../../mod/thing.php:86 +#: ../../mod/viewsrc.php:20 +msgid "Item not found." +msgstr "" + +#: ../../include/items.php:4840 ../../mod/group.php:38 ../../mod/group.php:137 +msgid "Collection not found." +msgstr "" + +#: ../../include/items.php:4856 +msgid "Collection is empty." +msgstr "" + +#: ../../include/items.php:4863 +#, php-format +msgid "Collection: %s" +msgstr "" + +#: ../../include/items.php:4873 ../../mod/connedit.php:692 +#, php-format +msgid "Connection: %s" +msgstr "" + +#: ../../include/items.php:4875 +msgid "Connection not found." +msgstr "" + +#: ../../index.php:242 ../../mod/help.php:213 msgid "Not Found" msgstr "" -#: ../../index.php:241 ../../mod/block.php:75 ../../mod/display.php:110 +#: ../../index.php:245 ../../mod/block.php:75 ../../mod/display.php:110 #: ../../mod/help.php:216 ../../mod/page.php:89 msgid "Page not found." msgstr "" @@ -4698,7 +4648,7 @@ msgid "" msgstr "" #: ../../mod/admin.php:495 -msgid "Expiration period in days for imported (matrix/network) content" +msgid "Expiration period in days for imported (grid/network) content" msgstr "" #: ../../mod/admin.php:495 @@ -4738,7 +4688,7 @@ msgstr "" msgid "on server" msgstr "" -#: ../../mod/admin.php:618 ../../mod/connections.php:267 +#: ../../mod/admin.php:618 ../../mod/connections.php:266 msgid "Status" msgstr "" @@ -4867,7 +4817,7 @@ msgstr "" msgid "No registrations." msgstr "" -#: ../../mod/admin.php:893 ../../mod/connedit.php:719 +#: ../../mod/admin.php:893 ../../mod/connections.php:271 msgid "Approve" msgstr "" @@ -5395,7 +5345,7 @@ msgid "Only show hidden connections" msgstr "" #: ../../mod/connections.php:234 -msgid "Pending" +msgid "Pending approval" msgstr "" #: ../../mod/connections.php:250 @@ -5411,18 +5361,276 @@ msgstr "" msgid "Delete connection" msgstr "" -#: ../../mod/connections.php:269 +#: ../../mod/connections.php:261 +msgid "Channel address" +msgstr "" + +#: ../../mod/connections.php:263 +msgid "Network" +msgstr "" + +#: ../../mod/connections.php:268 msgid "Connected" msgstr "" -#: ../../mod/connections.php:298 +#: ../../mod/connections.php:270 +msgid "Approve connection" +msgstr "" + +#: ../../mod/connections.php:272 +msgid "Recent activity" +msgstr "" + +#: ../../mod/connections.php:301 msgid "Search your connections" msgstr "" -#: ../../mod/connections.php:299 +#: ../../mod/connections.php:302 msgid "Connections search" msgstr "" +#: ../../mod/connedit.php:75 +msgid "Could not access contact record." +msgstr "" + +#: ../../mod/connedit.php:99 +msgid "Could not locate selected profile." +msgstr "" + +#: ../../mod/connedit.php:223 +msgid "Connection updated." +msgstr "" + +#: ../../mod/connedit.php:225 +msgid "Failed to update connection record." +msgstr "" + +#: ../../mod/connedit.php:272 +msgid "is now connected to" +msgstr "" + +#: ../../mod/connedit.php:398 +msgid "Could not access address book record." +msgstr "" + +#: ../../mod/connedit.php:412 +msgid "Refresh failed - channel is currently unavailable." +msgstr "" + +#: ../../mod/connedit.php:427 ../../mod/connedit.php:436 +#: ../../mod/connedit.php:445 ../../mod/connedit.php:454 +#: ../../mod/connedit.php:467 +msgid "Unable to set address book parameters." +msgstr "" + +#: ../../mod/connedit.php:491 +msgid "Connection has been removed." +msgstr "" + +#: ../../mod/connedit.php:510 +#, php-format +msgid "View %s's profile" +msgstr "" + +#: ../../mod/connedit.php:514 +msgid "Refresh Permissions" +msgstr "" + +#: ../../mod/connedit.php:517 +msgid "Fetch updated permissions" +msgstr "" + +#: ../../mod/connedit.php:521 +msgid "Recent Activity" +msgstr "" + +#: ../../mod/connedit.php:524 +msgid "View recent posts and comments" +msgstr "" + +#: ../../mod/connedit.php:531 +msgid "Block (or Unblock) all communications with this connection" +msgstr "" + +#: ../../mod/connedit.php:532 +msgid "This connection is blocked!" +msgstr "" + +#: ../../mod/connedit.php:536 +msgid "Unignore" +msgstr "" + +#: ../../mod/connedit.php:536 ../../mod/notifications.php:51 +msgid "Ignore" +msgstr "" + +#: ../../mod/connedit.php:539 +msgid "Ignore (or Unignore) all inbound communications from this connection" +msgstr "" + +#: ../../mod/connedit.php:540 +msgid "This connection is ignored!" +msgstr "" + +#: ../../mod/connedit.php:544 +msgid "Unarchive" +msgstr "" + +#: ../../mod/connedit.php:544 +msgid "Archive" +msgstr "" + +#: ../../mod/connedit.php:547 +msgid "" +"Archive (or Unarchive) this connection - mark channel dead but keep content" +msgstr "" + +#: ../../mod/connedit.php:548 +msgid "This connection is archived!" +msgstr "" + +#: ../../mod/connedit.php:552 +msgid "Unhide" +msgstr "" + +#: ../../mod/connedit.php:552 +msgid "Hide" +msgstr "" + +#: ../../mod/connedit.php:555 +msgid "Hide or Unhide this connection from your other connections" +msgstr "" + +#: ../../mod/connedit.php:556 +msgid "This connection is hidden!" +msgstr "" + +#: ../../mod/connedit.php:563 +msgid "Delete this connection" +msgstr "" + +#: ../../mod/connedit.php:644 +msgid "Approve this connection" +msgstr "" + +#: ../../mod/connedit.php:644 +msgid "Accept connection to allow communication" +msgstr "" + +#: ../../mod/connedit.php:649 +msgid "Set Affinity" +msgstr "" + +#: ../../mod/connedit.php:652 +msgid "Set Profile" +msgstr "" + +#: ../../mod/connedit.php:655 +msgid "Set Affinity & Profile" +msgstr "" + +#: ../../mod/connedit.php:688 +msgid "none" +msgstr "" + +#: ../../mod/connedit.php:693 +msgid "Apply these permissions automatically" +msgstr "" + +#: ../../mod/connedit.php:695 +msgid "This connection's primary address is" +msgstr "" + +#: ../../mod/connedit.php:696 +msgid "Available locations:" +msgstr "" + +#: ../../mod/connedit.php:700 +msgid "" +"The permissions indicated on this page will be applied to all new " +"connections." +msgstr "" + +#: ../../mod/connedit.php:702 +msgid "Slide to adjust your degree of friendship" +msgstr "" + +#: ../../mod/connedit.php:704 +msgid "Slide to adjust your rating" +msgstr "" + +#: ../../mod/connedit.php:705 ../../mod/connedit.php:710 +msgid "Optionally explain your rating" +msgstr "" + +#: ../../mod/connedit.php:707 +msgid "Custom Filter" +msgstr "" + +#: ../../mod/connedit.php:708 +msgid "Only import posts with this text" +msgstr "" + +#: ../../mod/connedit.php:708 ../../mod/connedit.php:709 +msgid "" +"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " +"all posts" +msgstr "" + +#: ../../mod/connedit.php:709 +msgid "Do not import posts with this text" +msgstr "" + +#: ../../mod/connedit.php:711 +msgid "This information is public!" +msgstr "" + +#: ../../mod/connedit.php:716 +msgid "Connection Pending Approval" +msgstr "" + +#: ../../mod/connedit.php:719 +msgid "inherited" +msgstr "" + +#: ../../mod/connedit.php:721 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "" + +#: ../../mod/connedit.php:723 +msgid "Their Settings" +msgstr "" + +#: ../../mod/connedit.php:724 +msgid "My Settings" +msgstr "" + +#: ../../mod/connedit.php:726 +msgid "Individual Permissions" +msgstr "" + +#: ../../mod/connedit.php:727 +msgid "" +"Some permissions may be inherited from your channel's <a href=\"settings" +"\"><strong>privacy settings</strong></a>, which have higher priority than " +"individual settings. You can <strong>not</strong> change those settings here." +msgstr "" + +#: ../../mod/connedit.php:728 +msgid "" +"Some permissions may be inherited from your channel's <a href=\"settings" +"\"><strong>privacy settings</strong></a>, which have higher priority than " +"individual settings. You can change those settings here but they wont have " +"any impact unless the inherited setting changes." +msgstr "" + +#: ../../mod/connedit.php:729 +msgid "Last update:" +msgstr "" + #: ../../mod/dav.php:121 msgid "$Projectname channel" msgstr "" @@ -5919,7 +6127,7 @@ msgstr "" msgid "Help:" msgstr "" -#: ../../mod/help.php:237 +#: ../../mod/help.php:239 msgid "$Projectname Documentation" msgstr "" @@ -6051,7 +6259,7 @@ msgid "" "provide an export file." msgstr "" -#: ../../mod/import.php:516 ../../mod/import_items.php:121 +#: ../../mod/import.php:516 ../../mod/import_items.php:115 msgid "File to Upload" msgstr "" @@ -6094,15 +6302,15 @@ msgid "" "only once and leave this page open until finished." msgstr "" -#: ../../mod/import_items.php:101 +#: ../../mod/import_items.php:98 msgid "Import completed" msgstr "" -#: ../../mod/import_items.php:119 +#: ../../mod/import_items.php:113 msgid "Import Items" msgstr "" -#: ../../mod/import_items.php:120 +#: ../../mod/import_items.php:114 msgid "Use this form to import existing posts and content from an export file." msgstr "" @@ -6187,24 +6395,24 @@ msgstr "" msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/item.php:822 +#: ../../mod/item.php:824 msgid "Duplicate post suppressed." msgstr "" -#: ../../mod/item.php:953 +#: ../../mod/item.php:954 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:1220 +#: ../../mod/item.php:1221 msgid "Unable to obtain post information from database." msgstr "" -#: ../../mod/item.php:1227 +#: ../../mod/item.php:1228 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/item.php:1234 +#: ../../mod/item.php:1235 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -6353,75 +6561,6 @@ msgstr "" msgid "Use this form to drop the location if the hub is no longer operating." msgstr "" -#: ../../mod/lostpass.php:15 -msgid "No valid account found." -msgstr "" - -#: ../../mod/lostpass.php:29 -msgid "Password reset request issued. Check your email." -msgstr "" - -#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103 -#, php-format -msgid "Site Member (%s)" -msgstr "" - -#: ../../mod/lostpass.php:40 -#, php-format -msgid "Password reset requested at %s" -msgstr "" - -#: ../../mod/lostpass.php:63 -msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." -msgstr "" - -#: ../../mod/lostpass.php:87 -msgid "Your password has been reset as requested." -msgstr "" - -#: ../../mod/lostpass.php:88 -msgid "Your new password is" -msgstr "" - -#: ../../mod/lostpass.php:89 -msgid "Save or copy your new password - and then" -msgstr "" - -#: ../../mod/lostpass.php:90 -msgid "click here to login" -msgstr "" - -#: ../../mod/lostpass.php:91 -msgid "" -"Your password may be changed from the <em>Settings</em> page after " -"successful login." -msgstr "" - -#: ../../mod/lostpass.php:108 -#, php-format -msgid "Your password has changed at %s" -msgstr "" - -#: ../../mod/lostpass.php:123 -msgid "Forgot your Password?" -msgstr "" - -#: ../../mod/lostpass.php:124 -msgid "" -"Enter your email address and submit to have your password reset. Then check " -"your email for further instructions." -msgstr "" - -#: ../../mod/lostpass.php:125 -msgid "Email Address" -msgstr "" - -#: ../../mod/lostpass.php:126 -msgid "Reset" -msgstr "" - #: ../../mod/magic.php:69 msgid "Hub not found." msgstr "" @@ -6868,10 +7007,6 @@ msgstr "" msgid "Discard" msgstr "" -#: ../../mod/notifications.php:51 ../../mod/connedit.php:536 -msgid "Ignore" -msgstr "" - #: ../../mod/notifications.php:94 ../../mod/notify.php:53 msgid "No more system notifications." msgstr "" @@ -6917,23 +7052,23 @@ msgid "" "to correctly use this feature." msgstr "" -#: ../../mod/pdledit.php:13 +#: ../../mod/pdledit.php:14 msgid "Layout updated." msgstr "" -#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53 +#: ../../mod/pdledit.php:29 ../../mod/pdledit.php:54 msgid "Edit System Page Description" msgstr "" -#: ../../mod/pdledit.php:48 +#: ../../mod/pdledit.php:49 msgid "Layout not found." msgstr "" -#: ../../mod/pdledit.php:54 +#: ../../mod/pdledit.php:55 msgid "Module Name:" msgstr "" -#: ../../mod/pdledit.php:55 +#: ../../mod/pdledit.php:56 msgid "Layout Help" msgstr "" @@ -7548,10 +7683,6 @@ msgstr "" msgid "No ratings" msgstr "" -#: ../../mod/ratings.php:99 -msgid "Ratings" -msgstr "" - #: ../../mod/ratings.php:100 msgid "Rating: " msgstr "" @@ -7990,7 +8121,7 @@ msgid "(comments displayed separately)" msgstr "" #: ../../mod/settings.php:849 -msgid "Use blog/list mode on matrix page" +msgid "Use blog/list mode on grid page" msgstr "" #: ../../mod/settings.php:850 @@ -8002,7 +8133,7 @@ msgid "click to expand content exceeding this height" msgstr "" #: ../../mod/settings.php:851 -msgid "Matrix page max height of content (in pixels)" +msgid "Grid page max height of content (in pixels)" msgstr "" #: ../../mod/settings.php:885 @@ -8228,7 +8359,7 @@ msgid "Show visual notifications including:" msgstr "" #: ../../mod/settings.php:1087 -msgid "Unseen matrix activity" +msgid "Unseen grid activity" msgstr "" #: ../../mod/settings.php:1088 @@ -8745,257 +8876,77 @@ msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../mod/connedit.php:75 -msgid "Could not access contact record." -msgstr "" - -#: ../../mod/connedit.php:99 -msgid "Could not locate selected profile." -msgstr "" - -#: ../../mod/connedit.php:223 -msgid "Connection updated." -msgstr "" - -#: ../../mod/connedit.php:225 -msgid "Failed to update connection record." -msgstr "" - -#: ../../mod/connedit.php:272 -msgid "is now connected to" -msgstr "" - -#: ../../mod/connedit.php:398 -msgid "Could not access address book record." -msgstr "" - -#: ../../mod/connedit.php:412 -msgid "Refresh failed - channel is currently unavailable." -msgstr "" - -#: ../../mod/connedit.php:427 ../../mod/connedit.php:436 -#: ../../mod/connedit.php:445 ../../mod/connedit.php:454 -#: ../../mod/connedit.php:467 -msgid "Unable to set address book parameters." +#: ../../mod/lostpass.php:15 +msgid "No valid account found." msgstr "" -#: ../../mod/connedit.php:491 -msgid "Connection has been removed." +#: ../../mod/lostpass.php:29 +msgid "Password reset request issued. Check your email." msgstr "" -#: ../../mod/connedit.php:510 +#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103 #, php-format -msgid "View %s's profile" -msgstr "" - -#: ../../mod/connedit.php:514 -msgid "Refresh Permissions" -msgstr "" - -#: ../../mod/connedit.php:517 -msgid "Fetch updated permissions" -msgstr "" - -#: ../../mod/connedit.php:521 -msgid "Recent Activity" -msgstr "" - -#: ../../mod/connedit.php:524 -msgid "View recent posts and comments" -msgstr "" - -#: ../../mod/connedit.php:531 -msgid "Block (or Unblock) all communications with this connection" -msgstr "" - -#: ../../mod/connedit.php:532 -msgid "This connection is blocked!" -msgstr "" - -#: ../../mod/connedit.php:536 -msgid "Unignore" -msgstr "" - -#: ../../mod/connedit.php:539 -msgid "Ignore (or Unignore) all inbound communications from this connection" -msgstr "" - -#: ../../mod/connedit.php:540 -msgid "This connection is ignored!" -msgstr "" - -#: ../../mod/connedit.php:544 -msgid "Unarchive" -msgstr "" - -#: ../../mod/connedit.php:544 -msgid "Archive" -msgstr "" - -#: ../../mod/connedit.php:547 -msgid "" -"Archive (or Unarchive) this connection - mark channel dead but keep content" -msgstr "" - -#: ../../mod/connedit.php:548 -msgid "This connection is archived!" -msgstr "" - -#: ../../mod/connedit.php:552 -msgid "Unhide" -msgstr "" - -#: ../../mod/connedit.php:552 -msgid "Hide" -msgstr "" - -#: ../../mod/connedit.php:555 -msgid "Hide or Unhide this connection from your other connections" -msgstr "" - -#: ../../mod/connedit.php:556 -msgid "This connection is hidden!" -msgstr "" - -#: ../../mod/connedit.php:563 -msgid "Delete this connection" -msgstr "" - -#: ../../mod/connedit.php:644 -msgid "Approve this connection" -msgstr "" - -#: ../../mod/connedit.php:644 -msgid "Accept connection to allow communication" -msgstr "" - -#: ../../mod/connedit.php:649 -msgid "Set Affinity" -msgstr "" - -#: ../../mod/connedit.php:652 -msgid "Set Profile" -msgstr "" - -#: ../../mod/connedit.php:655 -msgid "Set Affinity & Profile" -msgstr "" - -#: ../../mod/connedit.php:688 -msgid "none" -msgstr "" - -#: ../../mod/connedit.php:693 -msgid "Apply these permissions automatically" -msgstr "" - -#: ../../mod/connedit.php:695 -msgid "This connection's primary address is" +msgid "Site Member (%s)" msgstr "" -#: ../../mod/connedit.php:696 -msgid "Available locations:" +#: ../../mod/lostpass.php:40 +#, php-format +msgid "Password reset requested at %s" msgstr "" -#: ../../mod/connedit.php:700 +#: ../../mod/lostpass.php:63 msgid "" -"The permissions indicated on this page will be applied to all new " -"connections." -msgstr "" - -#: ../../mod/connedit.php:702 -msgid "Slide to adjust your degree of friendship" -msgstr "" - -#: ../../mod/connedit.php:704 -msgid "Slide to adjust your rating" -msgstr "" - -#: ../../mod/connedit.php:705 ../../mod/connedit.php:710 -msgid "Optionally explain your rating" -msgstr "" - -#: ../../mod/connedit.php:707 -msgid "Custom Filter" -msgstr "" - -#: ../../mod/connedit.php:708 -msgid "Only import posts with this text" +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." msgstr "" -#: ../../mod/connedit.php:708 ../../mod/connedit.php:709 -msgid "" -"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " -"all posts" +#: ../../mod/lostpass.php:86 ../../boot.php:1516 +msgid "Password Reset" msgstr "" -#: ../../mod/connedit.php:709 -msgid "Do not import posts with this text" +#: ../../mod/lostpass.php:87 +msgid "Your password has been reset as requested." msgstr "" -#: ../../mod/connedit.php:711 -msgid "This information is public!" +#: ../../mod/lostpass.php:88 +msgid "Your new password is" msgstr "" -#: ../../mod/connedit.php:716 -msgid "Connection Pending Approval" +#: ../../mod/lostpass.php:89 +msgid "Save or copy your new password - and then" msgstr "" -#: ../../mod/connedit.php:717 -msgid "Connection Request" +#: ../../mod/lostpass.php:90 +msgid "click here to login" msgstr "" -#: ../../mod/connedit.php:718 -#, php-format +#: ../../mod/lostpass.php:91 msgid "" -"(%s) would like to connect with you. Please approve this connection to allow " -"communication." -msgstr "" - -#: ../../mod/connedit.php:720 -msgid "Approve Later" -msgstr "" - -#: ../../mod/connedit.php:723 -msgid "inherited" +"Your password may be changed from the <em>Settings</em> page after " +"successful login." msgstr "" -#: ../../mod/connedit.php:725 +#: ../../mod/lostpass.php:108 #, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "" - -#: ../../mod/connedit.php:727 -msgid "Their Settings" -msgstr "" - -#: ../../mod/connedit.php:728 -msgid "My Settings" +msgid "Your password has changed at %s" msgstr "" -#: ../../mod/connedit.php:730 -msgid "Individual Permissions" +#: ../../mod/lostpass.php:123 +msgid "Forgot your Password?" msgstr "" -#: ../../mod/connedit.php:731 +#: ../../mod/lostpass.php:124 msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can <strong>not</strong> change those settings here." +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." msgstr "" -#: ../../mod/connedit.php:732 -msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can change those settings here but they wont have " -"any impact unless the inherited setting changes." +#: ../../mod/lostpass.php:125 +msgid "Email Address" msgstr "" -#: ../../mod/connedit.php:733 -msgid "Last update:" +#: ../../mod/lostpass.php:126 +msgid "Reset" msgstr "" #: ../../mod/sharedwithme.php:94 @@ -9287,6 +9238,10 @@ msgstr "" msgid "Visit %s's profile [%s]" msgstr "" +#: ../../mod/viewconnections.php:101 +msgid "View Connections" +msgstr "" + #: ../../mod/viewsrc.php:40 msgid "Source of Item" msgstr "" @@ -9446,3 +9401,52 @@ msgstr "" #: ../../view/theme/redbasic/php/config.php:132 msgid "Set size of followup author photos" msgstr "" + +#: ../../boot.php:1319 +#, php-format +msgid "Update %s failed. See error logs." +msgstr "" + +#: ../../boot.php:1322 +#, php-format +msgid "Update Error at %s" +msgstr "" + +#: ../../boot.php:1489 +msgid "" +"Create an account to access services and applications within the Hubzilla" +msgstr "" + +#: ../../boot.php:1511 +msgid "Password" +msgstr "" + +#: ../../boot.php:1512 +msgid "Remember me" +msgstr "" + +#: ../../boot.php:1515 +msgid "Forgot your password?" +msgstr "" + +#: ../../boot.php:2137 +msgid "toggle mobile" +msgstr "" + +#: ../../boot.php:2289 +msgid "Website SSL certificate is not valid. Please correct." +msgstr "" + +#: ../../boot.php:2292 +#, php-format +msgid "[hubzilla] Website SSL error for %s" +msgstr "" + +#: ../../boot.php:2329 +msgid "Cron/Scheduled tasks not running." +msgstr "" + +#: ../../boot.php:2333 +#, php-format +msgid "[hubzilla] Cron tasks not running on %s" +msgstr "" diff --git a/version.inc b/version.inc index 2e8e8f4ff..e558e2de2 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-01-21.1285H +2016-01-22.1286H |