From 77094f8d2bffa70c9e95518b9883f8752304102c Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 19 Mar 2016 16:17:19 -0700 Subject: make the admin side menu extensible and provide a hook for a channel "move" operation that federation plugins might use to re-establish connections after a channel move. --- boot.php | 2 +- include/widgets.php | 15 +- include/zot.php | 6 + util/hmessages.po | 1196 +++++++++++++++++++++++----------------------- version.inc | 2 +- view/tpl/admin_aside.tpl | 21 +- 6 files changed, 626 insertions(+), 616 deletions(-) diff --git a/boot.php b/boot.php index feed4fc8e..4aba36400 100755 --- a/boot.php +++ b/boot.php @@ -47,7 +47,7 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc'))); -define ( 'STD_VERSION', '1.3.1' ); +define ( 'STD_VERSION', '1.3.2' ); define ( 'ZOT_REVISION', 1 ); define ( 'DB_UPDATE_VERSION', 1165 ); diff --git a/include/widgets.php b/include/widgets.php index 65c745a05..deb514915 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1314,7 +1314,7 @@ function widget_admin($arr) { $aside = array( 'site' => array(z_root() . '/admin/site/', t('Site'), 'site'), - 'users' => array(z_root() . '/admin/users/', t('Accounts'), 'users'), + 'users' => array(z_root() . '/admin/users/', t('Accounts'), 'users', 'pending-update', t('Member registrations waiting for confirmation')), 'channels' => array(z_root() . '/admin/channels/', t('Channels'), 'channels'), 'security' => array(z_root() . '/admin/security/', t('Security'), 'security'), 'features' => array(z_root() . '/admin/features/', t('Features'), 'features'), @@ -1330,24 +1330,29 @@ function widget_admin($arr) { $r = q("SELECT * FROM addon WHERE plugin_admin = 1"); - $aside['plugins_admin'] = array(); + $plugins = array(); if($r) { foreach ($r as $h){ $plugin = $h['name']; - $aside['plugins_admin'][] = array(z_root() . '/admin/plugins/' . $plugin, $plugin, 'plugin'); + $plugins[] = array(z_root() . '/admin/plugins/' . $plugin, $plugin, 'plugin'); // temp plugins with admin $a->plugins_admin[] = $plugin; } } - $aside['logs'] = array(z_root() . '/admin/logs/', t('Logs'), 'logs'); + $logs = array(z_root() . '/admin/logs/', t('Logs'), 'logs'); + + $arr = array('links' => $aside,'plugins' => $plugins,'logs' => $logs); + call_hooks('admin_aside',$arr); $o .= replace_macros(get_markup_template('admin_aside.tpl'), array( '$admin' => $aside, '$admtxt' => t('Admin'), '$plugadmtxt' => t('Plugin Features'), + '$plugins' => $plugins, '$logtxt' => t('Logs'), - '$h_pending' => t('User registrations waiting for confirmation'), + '$logs' => $logs, + '$h_pending' => t('Member registrations waiting for confirmation'), '$admurl'=> z_root() . '/admin/' )); diff --git a/include/zot.php b/include/zot.php index cff9e1810..d8cae3954 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2278,6 +2278,12 @@ function check_location_move($sender_hash,$locations) { dbesc($sender_hash) ); + // federation plugins may wish to notify connections + // of the move on singleton networks + + $arr = array('channel' => $r[0],'locations' => $locations); + call_hooks('location_move',$arr); + } } diff --git a/util/hmessages.po b/util/hmessages.po index 664150e2e..7d5c03c14 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2016-03-11.1332H\n" +"Project-Id-Version: 2016-03-18.1339H\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 00:03-0800\n" +"POT-Creation-Date: 2016-03-18 00:03-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -58,7 +58,7 @@ msgid "Schedule Outbox" msgstr "" #: ../../Zotlabs/Storage/Browser.php:164 ../../include/apps.php:360 -#: ../../include/apps.php:415 ../../include/widgets.php:1434 +#: ../../include/apps.php:415 ../../include/widgets.php:1439 #: ../../include/conversation.php:1037 ../../mod/photos.php:766 #: ../../mod/photos.php:1209 msgid "Unknown" @@ -85,7 +85,7 @@ msgid "Create" msgstr "" #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305 -#: ../../include/widgets.php:1447 ../../mod/photos.php:793 +#: ../../include/widgets.php:1452 ../../mod/photos.php:793 #: ../../mod/photos.php:1333 ../../mod/profile_photo.php:401 #: ../../mod/cover_photo.php:353 msgid "Upload" @@ -112,8 +112,8 @@ msgstr "" #: ../../Zotlabs/Storage/Browser.php:240 ../../include/apps.php:259 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36 -#: ../../include/menu.php:108 ../../include/identity.php:924 -#: ../../include/identity.php:928 ../../include/ItemObject.php:100 +#: ../../include/menu.php:108 ../../include/ItemObject.php:100 +#: ../../include/identity.php:932 ../../include/identity.php:936 #: ../../mod/blocks.php:153 ../../mod/connections.php:286 #: ../../mod/connections.php:306 ../../mod/editblock.php:135 #: ../../mod/editlayout.php:134 ../../mod/editpost.php:112 @@ -164,7 +164,7 @@ msgstr "" #: ../../include/attach.php:352 ../../include/attach.php:359 #: ../../include/attach.php:437 ../../include/attach.php:889 #: ../../include/attach.php:960 ../../include/attach.php:1112 -#: ../../include/photos.php:29 ../../include/items.php:4573 +#: ../../include/photos.php:29 ../../include/items.php:4660 #: ../../index.php:180 ../../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 @@ -213,8 +213,8 @@ msgid "Page not found." msgstr "" #: ../../include/Contact.php:101 ../../include/widgets.php:147 -#: ../../include/widgets.php:185 ../../include/identity.php:1003 -#: ../../include/conversation.php:961 ../../mod/directory.php:321 +#: ../../include/widgets.php:185 ../../include/conversation.php:961 +#: ../../include/identity.php:1011 ../../mod/directory.php:321 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" msgstr "" @@ -283,7 +283,7 @@ msgid "Registration request at %s" msgstr "" #: ../../include/account.php:317 ../../include/account.php:344 -#: ../../include/account.php:404 ../../include/network.php:1660 +#: ../../include/account.php:404 ../../include/network.php:1864 msgid "Administrator" msgstr "" @@ -416,7 +416,7 @@ msgstr "" msgid "Channel Home" msgstr "" -#: ../../include/apps.php:138 ../../include/identity.php:1387 +#: ../../include/apps.php:138 ../../include/identity.php:1395 #: ../../mod/profperm.php:112 msgid "Profile" msgstr "" @@ -509,15 +509,15 @@ msgstr "" msgid "Purchase" msgstr "" -#: ../../include/auth.php:132 +#: ../../include/auth.php:105 msgid "Logged out." msgstr "" -#: ../../include/auth.php:273 +#: ../../include/auth.php:246 msgid "Failed authentication" msgstr "" -#: ../../include/auth.php:287 ../../mod/openid.php:189 +#: ../../include/auth.php:260 ../../mod/openid.php:189 msgid "Login failed." msgstr "" @@ -545,7 +545,7 @@ msgid "Finishes:" msgstr "" #: ../../include/bb2diaspora.php:487 ../../include/event.php:52 -#: ../../include/text.php:1433 ../../include/identity.php:1018 +#: ../../include/text.php:1433 ../../include/identity.php:1026 #: ../../mod/directory.php:307 msgid "Location:" msgstr "" @@ -674,8 +674,9 @@ msgstr "" #: ../../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:634 ../../mod/admin.php:425 ../../mod/removeme.php:60 -#: ../../mod/settings.php:588 ../../view/theme/redbasic/php/config.php:105 +#: ../../mod/photos.php:634 ../../mod/admin.php:425 ../../mod/profiles.php:647 +#: ../../mod/removeme.php:60 ../../mod/settings.php:588 +#: ../../view/theme/redbasic/php/config.php:105 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1555 msgid "No" msgstr "" @@ -687,8 +688,9 @@ msgstr "" #: ../../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:634 ../../mod/admin.php:427 ../../mod/removeme.php:60 -#: ../../mod/settings.php:588 ../../view/theme/redbasic/php/config.php:105 +#: ../../mod/photos.php:634 ../../mod/admin.php:427 ../../mod/profiles.php:647 +#: ../../mod/removeme.php:60 ../../mod/settings.php:588 +#: ../../view/theme/redbasic/php/config.php:105 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1555 msgid "Yes" msgstr "" @@ -747,7 +749,7 @@ msgstr "" msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/follow.php:153 ../../include/follow.php:183 +#: ../../include/follow.php:153 ../../include/follow.php:185 msgid "Protocol disabled." msgstr "" @@ -755,11 +757,11 @@ msgstr "" msgid "Channel discovery failed." msgstr "" -#: ../../include/follow.php:199 +#: ../../include/follow.php:201 msgid "local account not found." msgstr "" -#: ../../include/follow.php:224 +#: ../../include/follow.php:226 msgid "Cannot connect to yourself." msgstr "" @@ -882,7 +884,8 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "" #: ../../include/js_strings.php:25 ../../mod/events.php:459 -#: ../../mod/profiles.php:472 ../../mod/pubsites.php:36 +#: ../../mod/profiles.php:472 ../../mod/profiles.php:697 +#: ../../mod/pubsites.php:36 msgid "Location" msgstr "" @@ -1179,7 +1182,8 @@ msgstr "" msgid "Your profile page" msgstr "" -#: ../../include/nav.php:88 ../../include/identity.php:924 +#: ../../include/nav.php:88 ../../include/identity.php:932 +#: ../../mod/profiles.php:776 msgid "Edit Profiles" msgstr "" @@ -1187,7 +1191,7 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:90 ../../include/identity.php:928 +#: ../../include/nav.php:90 ../../include/identity.php:936 msgid "Edit Profile" msgstr "" @@ -1346,7 +1350,7 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:213 ../../include/widgets.php:1347 +#: ../../include/nav.php:213 ../../include/widgets.php:1350 msgid "Admin" msgstr "" @@ -1746,7 +1750,7 @@ msgstr "" msgid "Tags" msgstr "" -#: ../../include/taxonomy.php:305 ../../mod/profiles.php:717 +#: ../../include/taxonomy.php:305 msgid "Keywords" msgstr "" @@ -1782,8 +1786,8 @@ msgstr "" msgid "dislikes" msgstr "" -#: ../../include/taxonomy.php:415 ../../include/identity.php:1296 -#: ../../include/conversation.php:1756 ../../include/ItemObject.php:179 +#: ../../include/taxonomy.php:415 ../../include/conversation.php:1756 +#: ../../include/ItemObject.php:179 ../../include/identity.php:1304 #: ../../mod/photos.php:1097 msgctxt "noun" msgid "Like" @@ -1791,92 +1795,6 @@ msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:48 -msgid "Miscellaneous" -msgstr "" - -#: ../../include/datetime.php:132 -msgid "YYYY-MM-DD or MM-DD" -msgstr "" - -#: ../../include/datetime.php:236 ../../mod/appman.php:91 -#: ../../mod/appman.php:92 ../../mod/events.php:444 ../../mod/events.php:449 -msgid "Required" -msgstr "" - -#: ../../include/datetime.php:263 ../../boot.php:2382 -msgid "never" -msgstr "" - -#: ../../include/datetime.php:269 -msgid "less than a second ago" -msgstr "" - -#: ../../include/datetime.php:287 -#, php-format -msgctxt "e.g. 22 hours ago, 1 minute ago" -msgid "%1$d %2$s ago" -msgstr "" - -#: ../../include/datetime.php:298 -msgctxt "relative_date" -msgid "year" -msgid_plural "years" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:301 -msgctxt "relative_date" -msgid "month" -msgid_plural "months" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:304 -msgctxt "relative_date" -msgid "week" -msgid_plural "weeks" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:307 -msgctxt "relative_date" -msgid "day" -msgid_plural "days" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:310 -msgctxt "relative_date" -msgid "hour" -msgid_plural "hours" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:313 -msgctxt "relative_date" -msgid "minute" -msgid_plural "minutes" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:316 -msgctxt "relative_date" -msgid "second" -msgid_plural "seconds" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:553 -#, php-format -msgid "%1$s's birthday" -msgstr "" - -#: ../../include/datetime.php:554 -#, php-format -msgid "Happy Birthday %1$s" -msgstr "" - #: ../../include/zot.php:680 msgid "Invalid data packet" msgstr "" @@ -1885,12 +1803,12 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2326 +#: ../../include/zot.php:2332 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/zot.php:3661 +#: ../../include/zot.php:3667 msgid "invalid target signature" msgstr "" @@ -2026,24 +1944,24 @@ msgstr "" msgid "view full size" msgstr "" -#: ../../include/network.php:1612 ../../include/enotify.php:57 +#: ../../include/network.php:1816 ../../include/enotify.php:57 msgid "$Projectname Notification" msgstr "" -#: ../../include/network.php:1613 ../../include/enotify.php:58 +#: ../../include/network.php:1817 ../../include/enotify.php:58 msgid "$projectname" msgstr "" -#: ../../include/network.php:1615 ../../include/enotify.php:60 +#: ../../include/network.php:1819 ../../include/enotify.php:60 msgid "Thank You," msgstr "" -#: ../../include/network.php:1617 ../../include/enotify.php:62 +#: ../../include/network.php:1821 ../../include/enotify.php:62 #, php-format msgid "%s Administrator" msgstr "" -#: ../../include/network.php:1674 +#: ../../include/network.php:1878 msgid "No Subject" msgstr "" @@ -2368,6 +2286,7 @@ msgid "System" msgstr "" #: ../../include/widgets.php:105 ../../include/conversation.php:1541 +#: ../../mod/profiles.php:696 msgid "Personal" msgstr "" @@ -2625,6 +2544,10 @@ msgstr "" msgid "Accounts" msgstr "" +#: ../../include/widgets.php:1317 ../../include/widgets.php:1355 +msgid "Member registrations waiting for confirmation" +msgstr "" + #: ../../include/widgets.php:1318 ../../mod/admin.php:1149 msgid "Channels" msgstr "" @@ -2655,25 +2578,21 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../include/widgets.php:1343 ../../include/widgets.php:1349 +#: ../../include/widgets.php:1343 ../../include/widgets.php:1353 #: ../../mod/admin.php:1605 msgid "Logs" msgstr "" -#: ../../include/widgets.php:1348 +#: ../../include/widgets.php:1351 msgid "Plugin Features" msgstr "" -#: ../../include/widgets.php:1350 -msgid "User registrations waiting for confirmation" -msgstr "" - -#: ../../include/widgets.php:1428 ../../mod/photos.php:760 +#: ../../include/widgets.php:1433 ../../mod/photos.php:760 #: ../../mod/photos.php:1300 msgid "View Photo" msgstr "" -#: ../../include/widgets.php:1445 ../../mod/photos.php:791 +#: ../../include/widgets.php:1450 ../../mod/photos.php:791 msgid "Edit Album" msgstr "" @@ -3139,340 +3058,206 @@ msgstr "" msgid "[Hubzilla:Notify]" msgstr "" -#: ../../include/identity.php:32 -msgid "Unable to obtain identity information from database" +#: ../../include/datetime.php:48 ../../mod/profiles.php:699 +msgid "Miscellaneous" msgstr "" -#: ../../include/identity.php:66 -msgid "Empty name" +#: ../../include/datetime.php:136 +msgid "Birthday" msgstr "" -#: ../../include/identity.php:69 -msgid "Name too long" +#: ../../include/datetime.php:138 +msgid "Age: " msgstr "" -#: ../../include/identity.php:181 -msgid "No account identifier" +#: ../../include/datetime.php:140 +msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/identity.php:193 -msgid "Nickname is required." +#: ../../include/datetime.php:246 ../../mod/appman.php:91 +#: ../../mod/appman.php:92 ../../mod/events.php:444 ../../mod/events.php:449 +#: ../../mod/profiles.php:708 ../../mod/profiles.php:712 +msgid "Required" msgstr "" -#: ../../include/identity.php:207 -msgid "Reserved nickname. Please choose another." +#: ../../include/datetime.php:273 ../../boot.php:2382 +msgid "never" msgstr "" -#: ../../include/identity.php:212 -msgid "" -"Nickname has unsupported characters or is already being used on this site." +#: ../../include/datetime.php:279 +msgid "less than a second ago" msgstr "" -#: ../../include/identity.php:288 -msgid "Unable to retrieve created identity" +#: ../../include/datetime.php:297 +#, php-format +msgctxt "e.g. 22 hours ago, 1 minute ago" +msgid "%1$d %2$s ago" msgstr "" -#: ../../include/identity.php:346 -msgid "Default Profile" -msgstr "" +#: ../../include/datetime.php:308 +msgctxt "relative_date" +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" -#: ../../include/identity.php:776 -msgid "Requested channel is not available." -msgstr "" +#: ../../include/datetime.php:311 +msgctxt "relative_date" +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" -#: ../../include/identity.php:822 ../../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/datetime.php:314 +msgctxt "relative_date" +msgid "week" +msgid_plural "weeks" +msgstr[0] "" +msgstr[1] "" -#: ../../include/identity.php:917 ../../mod/profiles.php:795 -msgid "Change profile photo" -msgstr "" +#: ../../include/datetime.php:317 +msgctxt "relative_date" +msgid "day" +msgid_plural "days" +msgstr[0] "" +msgstr[1] "" -#: ../../include/identity.php:925 ../../mod/profiles.php:796 -msgid "Create New Profile" -msgstr "" +#: ../../include/datetime.php:320 +msgctxt "relative_date" +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" -#: ../../include/identity.php:942 ../../mod/profiles.php:807 -msgid "Profile Image" -msgstr "" +#: ../../include/datetime.php:323 +msgctxt "relative_date" +msgid "minute" +msgid_plural "minutes" +msgstr[0] "" +msgstr[1] "" -#: ../../include/identity.php:945 -msgid "Visible to everybody" -msgstr "" +#: ../../include/datetime.php:326 +msgctxt "relative_date" +msgid "second" +msgid_plural "seconds" +msgstr[0] "" +msgstr[1] "" -#: ../../include/identity.php:946 ../../mod/profiles.php:689 -#: ../../mod/profiles.php:811 -msgid "Edit visibility" +#: ../../include/datetime.php:563 +#, php-format +msgid "%1$s's birthday" msgstr "" -#: ../../include/identity.php:1022 ../../include/identity.php:1280 -msgid "Gender:" +#: ../../include/datetime.php:564 +#, php-format +msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/identity.php:1023 ../../include/identity.php:1324 -msgid "Status:" +#: ../../include/oembed.php:267 +msgid "Embedded content" msgstr "" -#: ../../include/identity.php:1024 ../../include/identity.php:1335 -msgid "Homepage:" +#: ../../include/oembed.php:276 +msgid "Embedding disabled" msgstr "" -#: ../../include/identity.php:1025 -msgid "Online Now" +#: ../../include/conversation.php:126 ../../mod/like.php:113 +msgid "channel" msgstr "" -#: ../../include/identity.php:1113 ../../include/identity.php:1191 -#: ../../mod/ping.php:318 -msgid "g A l F d" +#: ../../include/conversation.php:164 ../../mod/like.php:416 +#, php-format +msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/identity.php:1114 ../../include/identity.php:1192 -msgid "F d" +#: ../../include/conversation.php:167 ../../mod/like.php:418 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../include/identity.php:1159 ../../include/identity.php:1231 -#: ../../mod/ping.php:341 -msgid "[today]" +#: ../../include/conversation.php:204 +#, php-format +msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/identity.php:1170 -msgid "Birthday Reminders" +#: ../../include/conversation.php:239 +#, php-format +msgid "%1$s poked %2$s" msgstr "" -#: ../../include/identity.php:1171 -msgid "Birthdays this week:" +#: ../../include/conversation.php:260 ../../mod/mood.php:63 +#, php-format +msgctxt "mood" +msgid "%1$s is %2$s" msgstr "" -#: ../../include/identity.php:1224 -msgid "[No description]" +#: ../../include/conversation.php:574 ../../mod/photos.php:1074 +msgctxt "title" +msgid "Likes" msgstr "" -#: ../../include/identity.php:1242 -msgid "Event Reminders" +#: ../../include/conversation.php:574 ../../mod/photos.php:1074 +msgctxt "title" +msgid "Dislikes" msgstr "" -#: ../../include/identity.php:1243 -msgid "Events this week:" +#: ../../include/conversation.php:575 ../../mod/photos.php:1075 +msgctxt "title" +msgid "Agree" msgstr "" -#: ../../include/identity.php:1278 ../../mod/settings.php:1047 -msgid "Full Name:" +#: ../../include/conversation.php:575 ../../mod/photos.php:1075 +msgctxt "title" +msgid "Disagree" msgstr "" -#: ../../include/identity.php:1285 -msgid "Like this channel" +#: ../../include/conversation.php:575 ../../mod/photos.php:1075 +msgctxt "title" +msgid "Abstain" msgstr "" -#: ../../include/identity.php:1309 -msgid "j F, Y" +#: ../../include/conversation.php:576 ../../mod/photos.php:1076 +msgctxt "title" +msgid "Attending" msgstr "" -#: ../../include/identity.php:1310 -msgid "j F" +#: ../../include/conversation.php:576 ../../mod/photos.php:1076 +msgctxt "title" +msgid "Not attending" msgstr "" -#: ../../include/identity.php:1317 -msgid "Birthday:" +#: ../../include/conversation.php:576 ../../mod/photos.php:1076 +msgctxt "title" +msgid "Might attend" msgstr "" -#: ../../include/identity.php:1321 ../../mod/directory.php:302 -msgid "Age:" +#: ../../include/conversation.php:656 ../../include/ItemObject.php:126 +msgid "Select" msgstr "" -#: ../../include/identity.php:1330 -#, php-format -msgid "for %1$d %2$s" +#: ../../include/conversation.php:664 ../../include/ItemObject.php:89 +msgid "Private Message" msgstr "" -#: ../../include/identity.php:1333 -msgid "Sexual Preference:" +#: ../../include/conversation.php:671 ../../include/ItemObject.php:227 +msgid "Message signature validated" msgstr "" -#: ../../include/identity.php:1337 ../../mod/directory.php:318 -msgid "Hometown:" +#: ../../include/conversation.php:672 ../../include/ItemObject.php:228 +msgid "Message signature incorrect" msgstr "" -#: ../../include/identity.php:1339 -msgid "Tags:" +#: ../../include/conversation.php:691 +#, php-format +msgid "View %s's profile @ %s" msgstr "" -#: ../../include/identity.php:1341 -msgid "Political Views:" +#: ../../include/conversation.php:710 +msgid "Categories:" msgstr "" -#: ../../include/identity.php:1343 -msgid "Religion:" -msgstr "" - -#: ../../include/identity.php:1345 ../../mod/directory.php:320 -msgid "About:" -msgstr "" - -#: ../../include/identity.php:1347 -msgid "Hobbies/Interests:" -msgstr "" - -#: ../../include/identity.php:1349 -msgid "Likes:" -msgstr "" - -#: ../../include/identity.php:1351 -msgid "Dislikes:" -msgstr "" - -#: ../../include/identity.php:1353 -msgid "Contact information and Social Networks:" -msgstr "" - -#: ../../include/identity.php:1355 -msgid "My other channels:" -msgstr "" - -#: ../../include/identity.php:1357 -msgid "Musical interests:" -msgstr "" - -#: ../../include/identity.php:1359 -msgid "Books, literature:" -msgstr "" - -#: ../../include/identity.php:1361 -msgid "Television:" -msgstr "" - -#: ../../include/identity.php:1363 -msgid "Film/dance/culture/entertainment:" -msgstr "" - -#: ../../include/identity.php:1365 -msgid "Love/Romance:" -msgstr "" - -#: ../../include/identity.php:1367 -msgid "Work/employment:" -msgstr "" - -#: ../../include/identity.php:1369 -msgid "School/education:" -msgstr "" - -#: ../../include/identity.php:1389 -msgid "Like this thing" -msgstr "" - -#: ../../include/identity.php:1799 ../../mod/cover_photo.php:236 -msgid "cover photo" -msgstr "" - -#: ../../include/oembed.php:267 -msgid "Embedded content" -msgstr "" - -#: ../../include/oembed.php:276 -msgid "Embedding disabled" -msgstr "" - -#: ../../include/conversation.php:126 ../../mod/like.php:113 -msgid "channel" -msgstr "" - -#: ../../include/conversation.php:164 ../../mod/like.php:416 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "" - -#: ../../include/conversation.php:167 ../../mod/like.php:418 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "" - -#: ../../include/conversation.php:204 -#, php-format -msgid "%1$s is now connected with %2$s" -msgstr "" - -#: ../../include/conversation.php:239 -#, php-format -msgid "%1$s poked %2$s" -msgstr "" - -#: ../../include/conversation.php:260 ../../mod/mood.php:63 -#, php-format -msgctxt "mood" -msgid "%1$s is %2$s" -msgstr "" - -#: ../../include/conversation.php:574 ../../mod/photos.php:1074 -msgctxt "title" -msgid "Likes" -msgstr "" - -#: ../../include/conversation.php:574 ../../mod/photos.php:1074 -msgctxt "title" -msgid "Dislikes" -msgstr "" - -#: ../../include/conversation.php:575 ../../mod/photos.php:1075 -msgctxt "title" -msgid "Agree" -msgstr "" - -#: ../../include/conversation.php:575 ../../mod/photos.php:1075 -msgctxt "title" -msgid "Disagree" -msgstr "" - -#: ../../include/conversation.php:575 ../../mod/photos.php:1075 -msgctxt "title" -msgid "Abstain" -msgstr "" - -#: ../../include/conversation.php:576 ../../mod/photos.php:1076 -msgctxt "title" -msgid "Attending" -msgstr "" - -#: ../../include/conversation.php:576 ../../mod/photos.php:1076 -msgctxt "title" -msgid "Not attending" -msgstr "" - -#: ../../include/conversation.php:576 ../../mod/photos.php:1076 -msgctxt "title" -msgid "Might attend" -msgstr "" - -#: ../../include/conversation.php:656 ../../include/ItemObject.php:126 -msgid "Select" -msgstr "" - -#: ../../include/conversation.php:664 ../../include/ItemObject.php:89 -msgid "Private Message" -msgstr "" - -#: ../../include/conversation.php:671 ../../include/ItemObject.php:227 -msgid "Message signature validated" -msgstr "" - -#: ../../include/conversation.php:672 ../../include/ItemObject.php:228 -msgid "Message signature incorrect" -msgstr "" - -#: ../../include/conversation.php:691 -#, php-format -msgid "View %s's profile @ %s" -msgstr "" - -#: ../../include/conversation.php:710 -msgid "Categories:" -msgstr "" - -#: ../../include/conversation.php:711 -msgid "Filed under:" +#: ../../include/conversation.php:711 +msgid "Filed under:" msgstr "" #: ../../include/conversation.php:719 ../../include/ItemObject.php:334 @@ -4082,228 +3867,457 @@ msgstr "" msgid "Can view my file storage and photos" msgstr "" -#: ../../include/permissions.php:30 -msgid "Can view my webpages" +#: ../../include/permissions.php:30 +msgid "Can view my webpages" +msgstr "" + +#: ../../include/permissions.php:33 +msgid "Can send me their channel stream and posts" +msgstr "" + +#: ../../include/permissions.php:34 +msgid "Can post on my channel page (\"wall\")" +msgstr "" + +#: ../../include/permissions.php:35 +msgid "Can comment on or like my posts" +msgstr "" + +#: ../../include/permissions.php:36 +msgid "Can send me private mail messages" +msgstr "" + +#: ../../include/permissions.php:37 +msgid "Can like/dislike stuff" +msgstr "" + +#: ../../include/permissions.php:37 +msgid "Profiles and things other than posts/comments" +msgstr "" + +#: ../../include/permissions.php:39 +msgid "Can forward to all my channel contacts via post @mentions" +msgstr "" + +#: ../../include/permissions.php:39 +msgid "Advanced - useful for creating group forum channels" +msgstr "" + +#: ../../include/permissions.php:40 +msgid "Can chat with me (when available)" +msgstr "" + +#: ../../include/permissions.php:41 +msgid "Can write to my file storage and photos" +msgstr "" + +#: ../../include/permissions.php:42 +msgid "Can edit my webpages" +msgstr "" + +#: ../../include/permissions.php:44 +msgid "Can source my public posts in derived channels" +msgstr "" + +#: ../../include/permissions.php:44 +msgid "Somewhat advanced - very useful in open communities" +msgstr "" + +#: ../../include/permissions.php:46 +msgid "Can administer my channel resources" +msgstr "" + +#: ../../include/permissions.php:46 +msgid "Extremely advanced. Leave this alone unless you know what you are doing" +msgstr "" + +#: ../../include/permissions.php:877 +msgid "Social Networking" +msgstr "" + +#: ../../include/permissions.php:877 +msgid "Social - Mostly Public" +msgstr "" + +#: ../../include/permissions.php:877 +msgid "Social - Restricted" +msgstr "" + +#: ../../include/permissions.php:877 +msgid "Social - Private" +msgstr "" + +#: ../../include/permissions.php:878 +msgid "Community Forum" +msgstr "" + +#: ../../include/permissions.php:878 +msgid "Forum - Mostly Public" +msgstr "" + +#: ../../include/permissions.php:878 +msgid "Forum - Restricted" +msgstr "" + +#: ../../include/permissions.php:878 +msgid "Forum - Private" +msgstr "" + +#: ../../include/permissions.php:879 +msgid "Feed Republish" +msgstr "" + +#: ../../include/permissions.php:879 +msgid "Feed - Mostly Public" +msgstr "" + +#: ../../include/permissions.php:879 +msgid "Feed - Restricted" +msgstr "" + +#: ../../include/permissions.php:880 +msgid "Special Purpose" +msgstr "" + +#: ../../include/permissions.php:880 +msgid "Special - Celebrity/Soapbox" +msgstr "" + +#: ../../include/permissions.php:880 +msgid "Special - Group Repository" +msgstr "" + +#: ../../include/permissions.php:881 +msgid "Custom/Expert Mode" +msgstr "" + +#: ../../include/items.php:423 ../../index.php:179 ../../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:1138 ../../include/items.php:1183 +msgid "(Unknown)" +msgstr "" + +#: ../../include/items.php:1382 +msgid "Visible to anybody on the internet." +msgstr "" + +#: ../../include/items.php:1384 +msgid "Visible to you only." +msgstr "" + +#: ../../include/items.php:1386 +msgid "Visible to anybody in this network." +msgstr "" + +#: ../../include/items.php:1388 +msgid "Visible to anybody authenticated." +msgstr "" + +#: ../../include/items.php:1390 +#, php-format +msgid "Visible to anybody on %s." +msgstr "" + +#: ../../include/items.php:1392 +msgid "Visible to all connections." +msgstr "" + +#: ../../include/items.php:1394 +msgid "Visible to approved connections." +msgstr "" + +#: ../../include/items.php:1396 +msgid "Visible to specific connections." +msgstr "" + +#: ../../include/items.php:4581 ../../mod/display.php:36 +#: ../../mod/filestorage.php:27 ../../mod/admin.php:141 +#: ../../mod/admin.php:1189 ../../mod/admin.php:1434 ../../mod/thing.php:85 +#: ../../mod/viewsrc.php:20 +msgid "Item not found." +msgstr "" + +#: ../../include/items.php:5117 ../../mod/group.php:38 ../../mod/group.php:137 +msgid "Privacy group not found." +msgstr "" + +#: ../../include/items.php:5133 +msgid "Privacy group is empty." +msgstr "" + +#: ../../include/items.php:5140 +#, php-format +msgid "Privacy group: %s" +msgstr "" + +#: ../../include/items.php:5150 ../../mod/connedit.php:701 +#, php-format +msgid "Connection: %s" +msgstr "" + +#: ../../include/items.php:5152 +msgid "Connection not found." +msgstr "" + +#: ../../include/items.php:5578 ../../mod/cover_photo.php:229 +msgid "female" +msgstr "" + +#: ../../include/items.php:5579 ../../mod/cover_photo.php:230 +#, php-format +msgid "%1$s updated her %2$s" +msgstr "" + +#: ../../include/items.php:5580 ../../mod/cover_photo.php:231 +msgid "male" +msgstr "" + +#: ../../include/items.php:5581 ../../mod/cover_photo.php:232 +#, php-format +msgid "%1$s updated his %2$s" +msgstr "" + +#: ../../include/items.php:5583 ../../mod/cover_photo.php:234 +#, php-format +msgid "%1$s updated their %2$s" +msgstr "" + +#: ../../include/items.php:5585 +msgid "profile photo" +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/permissions.php:33 -msgid "Can send me their channel stream and posts" +#: ../../include/identity.php:181 +msgid "No account identifier" msgstr "" -#: ../../include/permissions.php:34 -msgid "Can post on my channel page (\"wall\")" +#: ../../include/identity.php:193 +msgid "Nickname is required." msgstr "" -#: ../../include/permissions.php:35 -msgid "Can comment on or like my posts" +#: ../../include/identity.php:207 +msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/permissions.php:36 -msgid "Can send me private mail messages" +#: ../../include/identity.php:212 +msgid "" +"Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/permissions.php:37 -msgid "Can like/dislike stuff" +#: ../../include/identity.php:288 +msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/permissions.php:37 -msgid "Profiles and things other than posts/comments" +#: ../../include/identity.php:346 +msgid "Default Profile" msgstr "" -#: ../../include/permissions.php:39 -msgid "Can forward to all my channel contacts via post @mentions" +#: ../../include/identity.php:784 +msgid "Requested channel is not available." msgstr "" -#: ../../include/permissions.php:39 -msgid "Advanced - useful for creating group forum channels" +#: ../../include/identity.php:830 ../../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/permissions.php:40 -msgid "Can chat with me (when available)" +#: ../../include/identity.php:925 ../../mod/profiles.php:691 +msgid "Change profile photo" msgstr "" -#: ../../include/permissions.php:41 -msgid "Can write to my file storage and photos" +#: ../../include/identity.php:933 +msgid "Create New Profile" msgstr "" -#: ../../include/permissions.php:42 -msgid "Can edit my webpages" +#: ../../include/identity.php:950 ../../mod/profiles.php:766 +msgid "Profile Image" msgstr "" -#: ../../include/permissions.php:44 -msgid "Can source my public posts in derived channels" +#: ../../include/identity.php:953 +msgid "Visible to everybody" msgstr "" -#: ../../include/permissions.php:44 -msgid "Somewhat advanced - very useful in open communities" +#: ../../include/identity.php:954 ../../mod/profiles.php:689 +#: ../../mod/profiles.php:770 +msgid "Edit visibility" msgstr "" -#: ../../include/permissions.php:46 -msgid "Can administer my channel resources" +#: ../../include/identity.php:1030 ../../include/identity.php:1288 +msgid "Gender:" msgstr "" -#: ../../include/permissions.php:46 -msgid "Extremely advanced. Leave this alone unless you know what you are doing" +#: ../../include/identity.php:1031 ../../include/identity.php:1332 +msgid "Status:" msgstr "" -#: ../../include/permissions.php:877 -msgid "Social Networking" +#: ../../include/identity.php:1032 ../../include/identity.php:1343 +msgid "Homepage:" msgstr "" -#: ../../include/permissions.php:877 -msgid "Social - Mostly Public" +#: ../../include/identity.php:1033 +msgid "Online Now" msgstr "" -#: ../../include/permissions.php:877 -msgid "Social - Restricted" +#: ../../include/identity.php:1121 ../../include/identity.php:1199 +#: ../../mod/ping.php:318 +msgid "g A l F d" msgstr "" -#: ../../include/permissions.php:877 -msgid "Social - Private" +#: ../../include/identity.php:1122 ../../include/identity.php:1200 +msgid "F d" msgstr "" -#: ../../include/permissions.php:878 -msgid "Community Forum" +#: ../../include/identity.php:1167 ../../include/identity.php:1239 +#: ../../mod/ping.php:341 +msgid "[today]" msgstr "" -#: ../../include/permissions.php:878 -msgid "Forum - Mostly Public" +#: ../../include/identity.php:1178 +msgid "Birthday Reminders" msgstr "" -#: ../../include/permissions.php:878 -msgid "Forum - Restricted" +#: ../../include/identity.php:1179 +msgid "Birthdays this week:" msgstr "" -#: ../../include/permissions.php:878 -msgid "Forum - Private" +#: ../../include/identity.php:1232 +msgid "[No description]" msgstr "" -#: ../../include/permissions.php:879 -msgid "Feed Republish" +#: ../../include/identity.php:1250 +msgid "Event Reminders" msgstr "" -#: ../../include/permissions.php:879 -msgid "Feed - Mostly Public" +#: ../../include/identity.php:1251 +msgid "Events this week:" msgstr "" -#: ../../include/permissions.php:879 -msgid "Feed - Restricted" +#: ../../include/identity.php:1286 ../../mod/settings.php:1047 +msgid "Full Name:" msgstr "" -#: ../../include/permissions.php:880 -msgid "Special Purpose" +#: ../../include/identity.php:1293 +msgid "Like this channel" msgstr "" -#: ../../include/permissions.php:880 -msgid "Special - Celebrity/Soapbox" +#: ../../include/identity.php:1317 +msgid "j F, Y" msgstr "" -#: ../../include/permissions.php:880 -msgid "Special - Group Repository" +#: ../../include/identity.php:1318 +msgid "j F" msgstr "" -#: ../../include/permissions.php:881 -msgid "Custom/Expert Mode" +#: ../../include/identity.php:1325 +msgid "Birthday:" msgstr "" -#: ../../include/items.php:423 ../../index.php:179 ../../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" +#: ../../include/identity.php:1329 ../../mod/directory.php:302 +msgid "Age:" msgstr "" -#: ../../include/items.php:1138 ../../include/items.php:1183 -msgid "(Unknown)" +#: ../../include/identity.php:1338 +#, php-format +msgid "for %1$d %2$s" msgstr "" -#: ../../include/items.php:1382 -msgid "Visible to anybody on the internet." +#: ../../include/identity.php:1341 +msgid "Sexual Preference:" msgstr "" -#: ../../include/items.php:1384 -msgid "Visible to you only." +#: ../../include/identity.php:1345 ../../mod/directory.php:318 +msgid "Hometown:" msgstr "" -#: ../../include/items.php:1386 -msgid "Visible to anybody in this network." +#: ../../include/identity.php:1347 +msgid "Tags:" msgstr "" -#: ../../include/items.php:1388 -msgid "Visible to anybody authenticated." +#: ../../include/identity.php:1349 +msgid "Political Views:" msgstr "" -#: ../../include/items.php:1390 -#, php-format -msgid "Visible to anybody on %s." +#: ../../include/identity.php:1351 +msgid "Religion:" msgstr "" -#: ../../include/items.php:1392 -msgid "Visible to all connections." +#: ../../include/identity.php:1353 ../../mod/directory.php:320 +msgid "About:" msgstr "" -#: ../../include/items.php:1394 -msgid "Visible to approved connections." +#: ../../include/identity.php:1355 +msgid "Hobbies/Interests:" msgstr "" -#: ../../include/items.php:1396 -msgid "Visible to specific connections." +#: ../../include/identity.php:1357 +msgid "Likes:" msgstr "" -#: ../../include/items.php:4494 ../../mod/display.php:36 -#: ../../mod/filestorage.php:27 ../../mod/admin.php:141 -#: ../../mod/admin.php:1189 ../../mod/admin.php:1434 ../../mod/thing.php:85 -#: ../../mod/viewsrc.php:20 -msgid "Item not found." +#: ../../include/identity.php:1359 +msgid "Dislikes:" msgstr "" -#: ../../include/items.php:5030 ../../mod/group.php:38 ../../mod/group.php:137 -msgid "Privacy group not found." +#: ../../include/identity.php:1361 +msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/items.php:5046 -msgid "Privacy group is empty." +#: ../../include/identity.php:1363 +msgid "My other channels:" msgstr "" -#: ../../include/items.php:5053 -#, php-format -msgid "Privacy group: %s" +#: ../../include/identity.php:1365 +msgid "Musical interests:" msgstr "" -#: ../../include/items.php:5063 ../../mod/connedit.php:701 -#, php-format -msgid "Connection: %s" +#: ../../include/identity.php:1367 +msgid "Books, literature:" msgstr "" -#: ../../include/items.php:5065 -msgid "Connection not found." +#: ../../include/identity.php:1369 +msgid "Television:" msgstr "" -#: ../../include/items.php:5491 ../../mod/cover_photo.php:229 -msgid "female" +#: ../../include/identity.php:1371 +msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/items.php:5492 ../../mod/cover_photo.php:230 -#, php-format -msgid "%1$s updated her %2$s" +#: ../../include/identity.php:1373 +msgid "Love/Romance:" msgstr "" -#: ../../include/items.php:5493 ../../mod/cover_photo.php:231 -msgid "male" +#: ../../include/identity.php:1375 +msgid "Work/employment:" msgstr "" -#: ../../include/items.php:5494 ../../mod/cover_photo.php:232 -#, php-format -msgid "%1$s updated his %2$s" +#: ../../include/identity.php:1377 +msgid "School/education:" msgstr "" -#: ../../include/items.php:5496 ../../mod/cover_photo.php:234 -#, php-format -msgid "%1$s updated their %2$s" +#: ../../include/identity.php:1397 +msgid "Like this thing" msgstr "" -#: ../../include/items.php:5498 -msgid "profile photo" +#: ../../include/identity.php:1807 ../../mod/cover_photo.php:236 +msgid "cover photo" msgstr "" #: ../../mod/achievements.php:34 @@ -5455,7 +5469,7 @@ msgstr "" msgid "Timezone" msgstr "" -#: ../../mod/id.php:27 ../../mod/profiles.php:713 +#: ../../mod/id.php:27 ../../mod/profiles.php:730 msgid "Homepage URL" msgstr "" @@ -7494,15 +7508,15 @@ msgstr "" msgid "Romantic Partner" msgstr "" -#: ../../mod/profiles.php:430 ../../mod/profiles.php:718 +#: ../../mod/profiles.php:430 ../../mod/profiles.php:735 msgid "Likes" msgstr "" -#: ../../mod/profiles.php:434 ../../mod/profiles.php:719 +#: ../../mod/profiles.php:434 ../../mod/profiles.php:736 msgid "Dislikes" msgstr "" -#: ../../mod/profiles.php:438 +#: ../../mod/profiles.php:438 ../../mod/profiles.php:743 msgid "Work/Employment" msgstr "" @@ -7510,11 +7524,11 @@ msgstr "" msgid "Religion" msgstr "" -#: ../../mod/profiles.php:445 ../../mod/profiles.php:715 +#: ../../mod/profiles.php:445 msgid "Political Views" msgstr "" -#: ../../mod/profiles.php:453 ../../mod/profiles.php:712 +#: ../../mod/profiles.php:453 msgid "Sexual Preference" msgstr "" @@ -7530,8 +7544,8 @@ msgstr "" msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:646 -msgid "Hide your contact/friend list from viewers of this profile?" +#: ../../mod/profiles.php:644 +msgid "Hide your connections list from viewers of this profile" msgstr "" #: ../../mod/profiles.php:686 @@ -7543,11 +7557,7 @@ msgid "View this profile" msgstr "" #: ../../mod/profiles.php:690 -msgid "Change Cover Photo" -msgstr "" - -#: ../../mod/profiles.php:691 -msgid "Change Profile Photo" +msgid "Change cover photo" msgstr "" #: ../../mod/profiles.php:692 @@ -7562,148 +7572,144 @@ msgstr "" msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:696 -msgid "Import profile from file" -msgstr "" - -#: ../../mod/profiles.php:697 -msgid "Export profile to file" +#: ../../mod/profiles.php:695 +msgid "Add profile things" msgstr "" #: ../../mod/profiles.php:698 -msgid "Profile Name" -msgstr "" - -#: ../../mod/profiles.php:699 -msgid "Your Full Name" -msgstr "" - -#: ../../mod/profiles.php:700 -msgid "Title/Description" +msgid "Relation" msgstr "" #: ../../mod/profiles.php:701 -msgid "Your Gender" +msgid "Import profile from file" msgstr "" #: ../../mod/profiles.php:702 -msgid "Birthday" +msgid "Export profile to file" msgstr "" #: ../../mod/profiles.php:703 -msgid "Street Address" +msgid "Your gender" msgstr "" #: ../../mod/profiles.php:704 -msgid "Locality/City" +msgid "Marital status" msgstr "" #: ../../mod/profiles.php:705 -msgid "Postal/Zip Code" +msgid "Sexual preference" msgstr "" -#: ../../mod/profiles.php:706 -msgid "Country" +#: ../../mod/profiles.php:708 +msgid "Profile name" msgstr "" -#: ../../mod/profiles.php:707 -msgid "Region/State" +#: ../../mod/profiles.php:710 +msgid "This is your default profile." msgstr "" -#: ../../mod/profiles.php:708 -msgid " Marital Status" +#: ../../mod/profiles.php:712 +msgid "Your full name" msgstr "" -#: ../../mod/profiles.php:709 -msgid "Who (if applicable)" +#: ../../mod/profiles.php:713 +msgid "Title/Description" msgstr "" -#: ../../mod/profiles.php:710 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +#: ../../mod/profiles.php:716 +msgid "Street address" msgstr "" -#: ../../mod/profiles.php:711 -msgid "Since [date]" +#: ../../mod/profiles.php:717 +msgid "Locality/City" msgstr "" -#: ../../mod/profiles.php:714 -msgid "Hometown" +#: ../../mod/profiles.php:718 +msgid "Region/State" msgstr "" -#: ../../mod/profiles.php:716 -msgid "Religious Views" +#: ../../mod/profiles.php:719 +msgid "Postal/Zip code" msgstr "" #: ../../mod/profiles.php:720 -msgid "Example: fishing photography software" +msgid "Country" +msgstr "" + +#: ../../mod/profiles.php:725 +msgid "Who (if applicable)" msgstr "" -#: ../../mod/profiles.php:721 -msgid "Used in directory listings" +#: ../../mod/profiles.php:725 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:722 -msgid "Tell us about yourself..." +#: ../../mod/profiles.php:726 +msgid "Since (date)" msgstr "" -#: ../../mod/profiles.php:723 -msgid "Hobbies/Interests" +#: ../../mod/profiles.php:729 +msgid "Tell us about yourself" msgstr "" -#: ../../mod/profiles.php:724 -msgid "Contact information and Social Networks" +#: ../../mod/profiles.php:731 +msgid "Hometown" msgstr "" -#: ../../mod/profiles.php:725 -msgid "My other channels" +#: ../../mod/profiles.php:732 +msgid "Political views" msgstr "" -#: ../../mod/profiles.php:726 -msgid "Musical interests" +#: ../../mod/profiles.php:733 +msgid "Religious views" msgstr "" -#: ../../mod/profiles.php:727 -msgid "Books, literature" +#: ../../mod/profiles.php:734 +msgid "Keywords used in directory listings" msgstr "" -#: ../../mod/profiles.php:728 -msgid "Television" +#: ../../mod/profiles.php:734 +msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:729 -msgid "Film/dance/culture/entertainment" +#: ../../mod/profiles.php:737 +msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:730 -msgid "Love/romance" +#: ../../mod/profiles.php:738 +msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:731 -msgid "Work/employment" +#: ../../mod/profiles.php:739 +msgid "Television" msgstr "" -#: ../../mod/profiles.php:732 -msgid "School/education" +#: ../../mod/profiles.php:740 +msgid "Film/Dance/Culture/Entertainment" msgstr "" -#: ../../mod/profiles.php:738 -msgid "This is your default profile." +#: ../../mod/profiles.php:741 +msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:749 -msgid "Age: " +#: ../../mod/profiles.php:742 +msgid "Love/Romance" msgstr "" -#: ../../mod/profiles.php:792 -msgid "Edit/Manage Profiles" +#: ../../mod/profiles.php:744 +msgid "School/Education" msgstr "" -#: ../../mod/profiles.php:793 -msgid "Add profile things" +#: ../../mod/profiles.php:745 +msgid "Contact information and social networks" +msgstr "" + +#: ../../mod/profiles.php:746 +msgid "My other channels" msgstr "" -#: ../../mod/profiles.php:794 -msgid "Include desirable objects in your profile" +#: ../../mod/profiles.php:777 +msgid "Create New" msgstr "" #: ../../mod/profperm.php:29 ../../mod/profperm.php:58 diff --git a/version.inc b/version.inc index 921108423..6bb30e303 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-03-17.1338H +2016-03-19.1340H diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index da762a094..70e1677af 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -5,7 +5,7 @@ $("nav").bind('nav-update', function(e,data){ var elm = $('#pending-update'); var register = $(data).find('register').text(); - if (register=="0") { reigster=""; elm.hide();} else { elm.show(); } + if (register=="0") { register=""; elm.hide();} else { elm.show(); } elm.html(register); }); }); @@ -13,16 +13,9 @@ @@ -34,11 +27,11 @@ {{/if}} -{{if $admin.plugins_admin}} +{{if $plugins}}

{{$plugadmtxt}}

@@ -48,6 +41,6 @@

{{$logtxt}}

-- cgit v1.2.3