diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-06 12:57:25 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-06 12:57:25 +0100 |
commit | 2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32 (patch) | |
tree | 6935173702da59826d6c7577a927d96a57bc4478 | |
parent | 2afdba48f06bb99922c19bf964d8f601c1545166 (diff) | |
parent | 021584d782c5bfafaa5ffe26d0c5850c8fffdd8f (diff) | |
download | volse-hubzilla-2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32.tar.gz volse-hubzilla-2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32.tar.bz2 volse-hubzilla-2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32.zip |
Merge remote-tracking branch 'upstream/master'
-rwxr-xr-x | boot.php | 2 | ||||
-rw-r--r-- | include/ItemObject.php | 2 | ||||
-rw-r--r-- | include/cli_startup.php | 3 | ||||
-rw-r--r-- | include/features.php | 3 | ||||
-rw-r--r-- | include/identity.php | 5 | ||||
-rw-r--r-- | include/nav.php | 19 | ||||
-rw-r--r-- | include/widgets.php | 1 | ||||
-rw-r--r-- | include/zot.php | 6 | ||||
-rwxr-xr-x | index.php | 3 | ||||
-rwxr-xr-x | install/htconfig.sample.php | 2 | ||||
-rw-r--r-- | mod/import.php | 9 | ||||
-rw-r--r-- | mod/register.php | 4 | ||||
-rw-r--r-- | mod/settings.php | 2 | ||||
-rwxr-xr-x | mod/setup.php | 27 | ||||
-rw-r--r-- | util/hmessages.po | 2983 | ||||
-rw-r--r-- | version.inc | 2 | ||||
-rw-r--r-- | view/cs/htconfig.tpl | 2 | ||||
-rw-r--r-- | view/de/htconfig.tpl | 2 | ||||
-rw-r--r-- | view/en-au/htconfig.tpl | 2 | ||||
-rw-r--r-- | view/en-gb/htconfig.tpl | 2 | ||||
-rw-r--r-- | view/en/htconfig.tpl | 2 | ||||
-rw-r--r-- | view/eo/htconfig.tpl | 2 | ||||
-rw-r--r-- | view/fr/htconfig.tpl | 2 | ||||
-rw-r--r-- | view/it/htconfig.tpl | 2 | ||||
-rw-r--r-- | view/nb-no/htconfig.tpl | 2 | ||||
-rw-r--r-- | view/pt-br/htconfig.tpl | 2 | ||||
-rw-r--r-- | view/ru/htconfig.tpl | 2 | ||||
-rw-r--r-- | view/sv/htconfig.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/install_settings.tpl | 1 |
29 files changed, 1604 insertions, 1494 deletions
@@ -48,7 +48,7 @@ require_once('include/AccessList.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc'))); -define ( 'STD_VERSION', '1.2' ); +define ( 'STD_VERSION', '1.2.1' ); define ( 'ZOT_REVISION', 1 ); define ( 'DB_UPDATE_VERSION', 1161 ); diff --git a/include/ItemObject.php b/include/ItemObject.php index 4bc280e73..2be7e3ac9 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -681,7 +681,7 @@ class Item extends BaseObject { $qc = ((local_channel()) ? get_pconfig(local_channel(),'system','qcomment') : null); $qcomment = (($qc) ? explode("\n",$qc) : null); - $arr = array('comment_buttons' => ''); + $arr = array('comment_buttons' => '','id' => $this->get_id()); call_hooks('comment_buttons',$arr); $comment_buttons = $arr['comment_buttons']; diff --git a/include/cli_startup.php b/include/cli_startup.php index 027d62953..70ab1a24a 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -15,6 +15,9 @@ function cli_startup() { if(is_null($db)) { @include(".htconfig.php"); + if(! defined('UNO')) + define('UNO', 0); + $a->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC'); date_default_timezone_set($a->timezone); diff --git a/include/features.php b/include/features.php index 4d8d162fa..d6a223089 100644 --- a/include/features.php +++ b/include/features.php @@ -38,6 +38,9 @@ function get_feature_default($feature) { function get_features($filtered = true) { + if(UNO) + return array(); + $arr = array( // General diff --git a/include/identity.php b/include/identity.php index 4f58d7dc5..0b9842caf 100644 --- a/include/identity.php +++ b/include/identity.php @@ -484,7 +484,7 @@ function identity_basic_export($channel_id, $items = false) { // use constants here as otherwise we will have no idea if we can import from a site // with a non-standard platform and version. - $ret['compatibility'] = array('project' => PLATFORM_NAME, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION); + $ret['compatibility'] = array('project' => PLATFORM_NAME, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION, 'server_role' => UNO ); $r = q("select * from channel where channel_id = %d limit 1", intval($channel_id) @@ -928,9 +928,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { $block = true; } - if($block && intval(get_config('system','block_public_blackout'))) - return $o; - if((! is_array($profile)) && (! count($profile))) return $o; diff --git a/include/nav.php b/include/nav.php index 1630c4731..5f630745c 100644 --- a/include/nav.php +++ b/include/nav.php @@ -76,7 +76,7 @@ EOT; if(local_channel()) { - if($chans && count($chans) > 1 && feature_enabled(local_channel(),'nav_channel_select')) + if($chans && count($chans) > 1 && feature_enabled(local_channel(),'nav_channel_select') && (! UNO)) $nav['channels'] = $chans; $nav['logout'] = Array('logout',t('Logout'), "", t('End this session'),'logout_nav_btn'); @@ -84,7 +84,7 @@ EOT; // user menu $nav['usermenu'][] = Array('channel/' . $channel['channel_address'], t('Home'), "", t('Your posts and conversations'),'channel_nav_btn'); $nav['usermenu'][] = Array('profile/' . $channel['channel_address'], t('View Profile'), "", t('Your profile page'),'profile_nav_btn'); - if(feature_enabled(local_channel(),'multi_profiles')) + if(feature_enabled(local_channel(),'multi_profiles') && (! UNO)) $nav['usermenu'][] = Array('profiles', t('Edit Profiles'),"", t('Manage/Edit profiles'),'profiles_nav_btn'); else $nav['usermenu'][] = Array('profiles/' . $prof[0]['id'], t('Edit Profile'),"", t('Edit your profile'),'profiles_nav_btn'); @@ -94,16 +94,17 @@ EOT; require_once('include/chat.php'); $has_chats = chatroom_list_count(local_channel()); - $nav['usermenu'][] = Array('chat/' . $channel['channel_address'] . (($has_chats) ? '' : '/new'), t('Chat'),"",t('Your chatrooms'),'chat_nav_btn'); + if(! UNO) + $nav['usermenu'][] = Array('chat/' . $channel['channel_address'] . (($has_chats) ? '' : '/new'), t('Chat'),"",t('Your chatrooms'),'chat_nav_btn'); require_once('include/menu.php'); $has_bookmarks = menu_list_count(local_channel(),'',MENU_BOOKMARK) + menu_list_count(local_channel(),'',MENU_SYSTEM|MENU_BOOKMARK); - if($has_bookmarks) { + if(($has_bookmarks) && (! UNO)) { $nav['usermenu'][] = Array('bookmarks', t('Bookmarks'), "", t('Your bookmarks'),'bookmarks_nav_btn'); } - if(feature_enabled($channel['channel_id'],'webpages')) + if(feature_enabled($channel['channel_id'],'webpages') && (! UNO)) $nav['usermenu'][] = Array('webpages/' . $channel['channel_address'],t('Webpages'),"",t('Your webpages'),'webpages_nav_btn'); } else { @@ -154,7 +155,8 @@ EOT; $nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'),'help_nav_btn'); - $nav['apps'] = array('apps', t('Apps'), "", t('Applications, utilities, links, games'),'apps_nav_btn'); + if(! UNO) + $nav['apps'] = array('apps', t('Apps'), "", t('Applications, utilities, links, games'),'apps_nav_btn'); $nav['search'] = array('search', t('Search'), "", t('Search site @name, #tag, ?docs, content')); @@ -196,8 +198,9 @@ EOT; $nav['all_events'] = array('events', t('Events'), "", t('Event Calendar'),'events_nav_btn'); $nav['all_events']['all']=array('events', t('See all events'), "", ""); $nav['all_events']['mark'] = array('', t('Mark all events seen'), '',''); - - $nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'),'manage_nav_btn'); + + if(! UNO) + $nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'),'manage_nav_btn'); $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn'); diff --git a/include/widgets.php b/include/widgets.php index 011e3a8d7..8073058c6 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -527,7 +527,6 @@ function widget_settings_menu($arr) { 'selected' => '' ); - if($role === false || $role === 'custom') { $tabs[] = array( 'label' => t('Connection Default Permissions'), diff --git a/include/zot.php b/include/zot.php index 0210f3f4a..e9335769e 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2868,6 +2868,9 @@ function import_site($arr, $pubkey) { */ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { + if(UNO) + return; + $a = get_app(); logger('build_sync_packet'); @@ -2997,6 +3000,9 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { */ function process_channel_sync_delivery($sender, $arr, $deliveries) { + if(UNO) + return; + require_once('include/import.php'); /** @FIXME this will sync red structures (channel, pconfig and abook). Eventually we need to make this application agnostic. */ @@ -28,6 +28,9 @@ $a->install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? fal @include('.htconfig.php'); +if(! defined('UNO')) + define('UNO', 0); + $a->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC'); date_default_timezone_set($a->timezone); diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php index df39bc9ad..50ce9658b 100755 --- a/install/htconfig.sample.php +++ b/install/htconfig.sample.php @@ -19,6 +19,8 @@ $db_pass = 'mysqlpassword'; $db_data = 'mysqldatabasename'; $db_type = 0; // use 1 for postgres, 0 for mysql +define( 'UNO', 0 ); + /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they diff --git a/mod/import.php b/mod/import.php index b6091d944..1a2c87a63 100644 --- a/mod/import.php +++ b/mod/import.php @@ -109,6 +109,9 @@ function import_account(&$a, $account_id) { return; } + if(UNO) + return; + if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) { $v1 = substr($data['compatibility']['database'],-4); $v2 = substr(DB_UPDATE_VERSION,-4); @@ -116,6 +119,12 @@ function import_account(&$a, $account_id) { $t = sprintf( t('Warning: Database versions differ by %1$d updates.'), $v2 - $v1 ); notice($t); } + if(array_key_exists('server_role',$data['compatibility']) + && $data['compatibility']['server_role'] != UNO) { + notice( t('Server platform is not compatible. Operation not permitted.') . EOL); + return; + } + } // import channel diff --git a/mod/register.php b/mod/register.php index 853728e10..63f09a9b8 100644 --- a/mod/register.php +++ b/mod/register.php @@ -227,8 +227,8 @@ function register_content(&$a) { $nickname = ((x($_REQUEST,'nickname')) ? strip_tags(trim($_REQUEST['nickname'])) : "" ); $privacy_role = ((x($_REQUEST,'permissions_role')) ? $_REQUEST['permissions_role'] : "" ); - $auto_create = get_config('system','auto_channel_create'); - $default_role = get_config('system','default_permissions_role'); + $auto_create = ((UNO) || (get_config('system','auto_channel_create')) ? true : false); + $default_role = ((UNO) ? 'social' : get_config('system','default_permissions_role')); require_once('include/bbcode.php'); diff --git a/mod/settings.php b/mod/settings.php index c1a4b019d..eea3d9995 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -600,7 +600,7 @@ function settings_content(&$a) { local_channel()); if (!count($r)){ - notice(t("You can't edit this application.")); + notice(t('Application not found.')); return; } $app = $r[0]; diff --git a/mod/setup.php b/mod/setup.php index 5c9e988d9..9bcbabbc5 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -67,7 +67,8 @@ function setup_post(&$a) { $phpath = trim($_POST['phpath']); $adminmail = trim($_POST['adminmail']); $siteurl = trim($_POST['siteurl']); - + $advanced = ((intval($_POST['advanced'])) ? 1 : 0); + // $siteurl should not have a trailing slash $siteurl = rtrim($siteurl,'/'); @@ -118,6 +119,7 @@ function setup_post(&$a) { $timezone = notags(trim($_POST['timezone'])); $adminmail = notags(trim($_POST['adminmail'])); $siteurl = notags(trim($_POST['siteurl'])); + $advanced = ((intval($_POST['advanced'])) ? 1 : 0); if($siteurl != z_root()) { $test = z_fetch_url($siteurl."/setup/testrewrite"); @@ -138,16 +140,17 @@ function setup_post(&$a) { $tpl = get_intltext_template('htconfig.tpl'); $txt = replace_macros($tpl,array( - '$dbhost' => $dbhost, - '$dbport' => $dbport, - '$dbuser' => $dbuser, - '$dbpass' => $dbpass, - '$dbdata' => $dbdata, - '$dbtype' => $dbtype, - '$timezone' => $timezone, - '$siteurl' => $siteurl, - '$site_id' => random_string(), - '$phpath' => $phpath, + '$dbhost' => $dbhost, + '$dbport' => $dbport, + '$dbuser' => $dbuser, + '$dbpass' => $dbpass, + '$dbdata' => $dbdata, + '$dbtype' => $dbtype, + '$uno' => 1 - $advanced, + '$timezone' => $timezone, + '$siteurl' => $siteurl, + '$site_id' => random_string(), + '$phpath' => $phpath, '$adminmail' => $adminmail )); @@ -321,7 +324,6 @@ function setup_content(&$a) { '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.')), '$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Please use SSL (https) URL if available.')), - '$lbl_10' => t('Please select a default timezone for your website'), '$baseurl' => $a->get_baseurl(), @@ -363,6 +365,7 @@ function setup_content(&$a) { '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.')), '$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Please use SSL (https) URL if available.')), + '$advanced' => array('advanced', t('Enable $Projectname <strong>advanced</strong> features?'), 0, t('Some advanced features, while useful - may be best suited for technically proficient audiences')), '$timezone' => array('timezone', t('Please select a default timezone for your website'), $timezone, '', get_timezones()), diff --git a/util/hmessages.po b/util/hmessages.po index e1a35325e..87a5d0ad1 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2016-01-29.1293H\n" +"Project-Id-Version: 2016-02-05.1300H\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-29 00:03-0800\n" +"POT-Creation-Date: 2016-02-05 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" @@ -30,7 +30,7 @@ msgid "Welcome %s. Remote authentication successful." msgstr "" #: ../../include/Contact.php:101 ../../include/conversation.php:961 -#: ../../include/identity.php:953 ../../include/widgets.php:137 +#: ../../include/identity.php:954 ../../include/widgets.php:137 #: ../../include/widgets.php:175 ../../mod/directory.php:321 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" @@ -79,12 +79,12 @@ 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: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:257 ../../mod/webpages.php:183 +#: ../../mod/blocks.php:155 ../../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:1132 ../../mod/admin.php:993 +#: ../../mod/admin.php:1152 ../../mod/settings.php:649 ../../mod/thing.php:257 +#: ../../mod/webpages.php:183 msgid "Delete" msgstr "" @@ -121,14 +121,14 @@ msgid "I abstain" msgstr "" #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187 -#: ../../include/conversation.php:1707 ../../mod/photos.php:1079 -#: ../../mod/photos.php:1091 +#: ../../include/conversation.php:1707 ../../mod/photos.php:1085 +#: ../../mod/photos.php:1097 msgid "View all" msgstr "" #: ../../include/ItemObject.php:179 ../../include/conversation.php:1731 -#: ../../include/taxonomy.php:414 ../../include/identity.php:1266 -#: ../../mod/photos.php:1083 ../../mod/zcard.php:56 +#: ../../include/taxonomy.php:415 ../../include/identity.php:1264 +#: ../../mod/photos.php:1089 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -136,7 +136,7 @@ msgstr[0] "" msgstr[1] "" #: ../../include/ItemObject.php:184 ../../include/conversation.php:1734 -#: ../../mod/photos.php:1088 +#: ../../mod/photos.php:1094 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -171,7 +171,7 @@ msgstr "" msgid "Add Tag" msgstr "" -#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023 +#: ../../include/ItemObject.php:254 ../../mod/photos.php:1029 msgid "I like this (toggle)" msgstr "" @@ -179,7 +179,7 @@ msgstr "" msgid "like" msgstr "" -#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024 +#: ../../include/ItemObject.php:255 ../../mod/photos.php:1030 msgid "I don't like this (toggle)" msgstr "" @@ -254,25 +254,25 @@ msgstr "" msgid "Mark all seen" msgstr "" -#: ../../include/ItemObject.php:378 ../../mod/photos.php:1209 +#: ../../include/ItemObject.php:378 ../../mod/photos.php:1215 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../include/ItemObject.php:379 ../../mod/photos.php:1210 +#: ../../include/ItemObject.php:379 ../../mod/photos.php:1216 msgctxt "noun" msgid "Dislikes" msgstr "" #: ../../include/ItemObject.php:384 ../../include/acl_selectors.php:252 -#: ../../mod/photos.php:1215 +#: ../../mod/photos.php:1221 msgid "Close" msgstr "" #: ../../include/ItemObject.php:389 ../../include/conversation.php:740 #: ../../include/conversation.php:1237 ../../mod/editblock.php:150 #: ../../mod/editlayout.php:148 ../../mod/editpost.php:129 -#: ../../mod/editwebpage.php:190 ../../mod/photos.php:1026 +#: ../../mod/editwebpage.php:190 ../../mod/photos.php:1032 msgid "Please wait" msgstr "" @@ -280,91 +280,92 @@ msgstr "" msgid "[+] show all" msgstr "" -#: ../../include/ItemObject.php:694 ../../mod/photos.php:1042 -#: ../../mod/photos.php:1160 +#: ../../include/ItemObject.php:700 ../../mod/photos.php:1048 +#: ../../mod/photos.php:1166 msgid "This is you" msgstr "" -#: ../../include/ItemObject.php:696 ../../include/js_strings.php:6 -#: ../../mod/photos.php:1044 ../../mod/photos.php:1162 +#: ../../include/ItemObject.php:702 ../../include/js_strings.php:6 +#: ../../mod/photos.php:1050 ../../mod/photos.php:1168 msgid "Comment" msgstr "" -#: ../../include/ItemObject.php:697 ../../include/js_strings.php:22 +#: ../../include/ItemObject.php:703 ../../include/js_strings.php:22 #: ../../include/widgets.php:679 ../../include/widgets.php:691 -#: ../../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/connedit.php:720 +#: ../../mod/appman.php:99 ../../mod/chat.php:184 ../../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: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:1024 -#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/sources.php:104 -#: ../../mod/sources.php:138 ../../mod/thing.php:312 ../../mod/thing.php:358 -#: ../../mod/xchan.php:11 ../../view/theme/redbasic/php/config.php:99 +#: ../../mod/photos.php:637 ../../mod/photos.php:1011 +#: ../../mod/photos.php:1051 ../../mod/photos.php:1169 ../../mod/admin.php:457 +#: ../../mod/admin.php:646 ../../mod/admin.php:721 ../../mod/admin.php:986 +#: ../../mod/admin.php:1150 ../../mod/admin.php:1326 ../../mod/admin.php:1521 +#: ../../mod/admin.php:1606 ../../mod/poke.php:182 ../../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:1024 ../../mod/setup.php:332 ../../mod/setup.php:372 +#: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/thing.php:312 +#: ../../mod/thing.php:358 ../../mod/xchan.php:11 +#: ../../view/theme/redbasic/php/config.php:99 msgid "Submit" msgstr "" -#: ../../include/ItemObject.php:698 ../../include/conversation.php:1209 +#: ../../include/ItemObject.php:704 ../../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:1210 +#: ../../include/ItemObject.php:705 ../../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:1211 +#: ../../include/ItemObject.php:706 ../../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:1212 +#: ../../include/ItemObject.php:707 ../../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:1213 +#: ../../include/ItemObject.php:708 ../../include/conversation.php:1213 #: ../../mod/editblock.php:140 ../../mod/editlayout.php:139 #: ../../mod/editpost.php:117 ../../mod/editwebpage.php:181 msgid "Code" msgstr "" -#: ../../include/ItemObject.php:703 +#: ../../include/ItemObject.php:709 msgid "Image" msgstr "" -#: ../../include/ItemObject.php:704 +#: ../../include/ItemObject.php:710 msgid "Insert Link" msgstr "" -#: ../../include/ItemObject.php:705 +#: ../../include/ItemObject.php:711 msgid "Video" msgstr "" -#: ../../include/ItemObject.php:706 ../../include/conversation.php:1179 +#: ../../include/ItemObject.php:712 ../../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 +#: ../../mod/events.php:458 ../../mod/photos.php:1052 #: ../../mod/webpages.php:188 msgid "Preview" msgstr "" -#: ../../include/ItemObject.php:709 ../../include/conversation.php:1267 +#: ../../include/ItemObject.php:715 ../../include/conversation.php:1267 #: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385 msgid "Encrypt text" msgstr "" @@ -374,7 +375,7 @@ msgstr "" msgid "parent" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2606 +#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2614 msgid "Collection" msgstr "" @@ -400,8 +401,8 @@ msgstr "" #: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360 #: ../../include/apps.php:415 ../../include/conversation.php:1037 -#: ../../include/widgets.php:1386 ../../mod/photos.php:754 -#: ../../mod/photos.php:1195 +#: ../../include/widgets.php:1387 ../../mod/photos.php:758 +#: ../../mod/photos.php:1201 msgid "Unknown" msgstr "" @@ -428,13 +429,13 @@ msgid "Create" msgstr "" #: ../../include/RedDAV/RedBrowser.php:231 -#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1399 -#: ../../mod/photos.php:781 ../../mod/photos.php:1316 +#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1400 +#: ../../mod/photos.php:785 ../../mod/photos.php:1325 #: ../../mod/profile_photo.php:453 ../../mod/cover_photo.php:353 msgid "Upload" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:1060 +#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:1158 #: ../../mod/settings.php:588 ../../mod/settings.php:614 #: ../../mod/sharedwithme.php:95 msgid "Name" @@ -444,7 +445,7 @@ msgstr "" msgid "Type" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:237 ../../include/text.php:1266 +#: ../../include/RedDAV/RedBrowser.php:237 ../../include/text.php:1274 #: ../../mod/sharedwithme.php:97 msgid "Size" msgstr "" @@ -570,7 +571,7 @@ msgstr "" #: ../../include/acl_selectors.php:251 ../../mod/chat.php:211 #: ../../mod/filestorage.php:147 ../../mod/photos.php:631 -#: ../../mod/photos.php:998 ../../mod/thing.php:309 ../../mod/thing.php:355 +#: ../../mod/photos.php:1004 ../../mod/thing.php:309 ../../mod/thing.php:355 msgid "Permissions" msgstr "" @@ -628,8 +629,8 @@ msgid "Grid" msgstr "" #: ../../include/apps.php:134 ../../include/nav.php:202 -#: ../../include/widgets.php:557 ../../mod/admin.php:1168 -#: ../../mod/admin.php:1390 +#: ../../include/widgets.php:557 ../../mod/admin.php:1266 +#: ../../mod/admin.php:1488 msgid "Settings" msgstr "" @@ -642,8 +643,8 @@ msgstr "" msgid "Channel Home" msgstr "" -#: ../../include/apps.php:138 ../../include/identity.php:1240 -#: ../../include/identity.php:1357 ../../mod/profperm.php:112 +#: ../../include/apps.php:138 ../../include/identity.php:1238 +#: ../../include/identity.php:1355 ../../mod/profperm.php:112 msgid "Profile" msgstr "" @@ -660,8 +661,8 @@ msgstr "" msgid "Directory" msgstr "" -#: ../../include/apps.php:142 ../../include/nav.php:154 ../../mod/help.php:204 -#: ../../mod/help.php:209 ../../mod/layouts.php:176 +#: ../../include/apps.php:142 ../../include/nav.php:154 ../../mod/help.php:208 +#: ../../mod/help.php:213 ../../mod/layouts.php:176 msgid "Help" msgstr "" @@ -674,6 +675,7 @@ msgid "Mood" msgstr "" #: ../../include/apps.php:145 ../../include/conversation.php:965 +#: ../../mod/poke.php:164 msgid "Poke" msgstr "" @@ -703,7 +705,7 @@ msgstr "" msgid "Invite" msgstr "" -#: ../../include/apps.php:152 ../../include/widgets.php:1272 +#: ../../include/apps.php:152 ../../include/widgets.php:1273 msgid "Features" msgstr "" @@ -740,12 +742,12 @@ msgstr "" #: ../../include/attach.php:436 ../../include/attach.php:888 #: ../../include/attach.php:959 ../../include/attach.php:1111 #: ../../include/chat.php:133 ../../include/photos.php:29 -#: ../../include/items.php:4429 ../../index.php:186 ../../index.php:371 +#: ../../include/items.php:4430 ../../index.php:186 ../../index.php:374 #: ../../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:215 ../../mod/channel.php:255 ../../mod/chat.php:94 +#: ../../mod/channel.php:217 ../../mod/channel.php:257 ../../mod/chat.php:94 #: ../../mod/chat.php:99 ../../mod/common.php:35 ../../mod/connections.php:29 #: ../../mod/connedit.php:355 ../../mod/editblock.php:65 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87 @@ -769,7 +771,7 @@ msgstr "" #: ../../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/setup.php:228 ../../mod/sharedwithme.php:7 #: ../../mod/sources.php:66 ../../mod/suggest.php:26 ../../mod/thing.php:270 #: ../../mod/thing.php:290 ../../mod/thing.php:327 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 @@ -857,7 +859,7 @@ msgid "Attachments:" msgstr "" #: ../../include/bb2diaspora.php:465 ../../include/event.php:22 -#: ../../include/text.php:1410 +#: ../../include/text.php:1418 msgid "l F d, Y \\@ g:i A" msgstr "" @@ -866,17 +868,17 @@ msgid "$Projectname event notification:" msgstr "" #: ../../include/bb2diaspora.php:471 ../../include/event.php:30 -#: ../../include/text.php:1414 +#: ../../include/text.php:1422 msgid "Starts:" msgstr "" #: ../../include/bb2diaspora.php:479 ../../include/event.php:40 -#: ../../include/text.php:1418 +#: ../../include/text.php:1426 msgid "Finishes:" msgstr "" #: ../../include/bb2diaspora.php:487 ../../include/event.php:52 -#: ../../include/identity.php:1004 ../../include/text.php:1425 +#: ../../include/text.php:1433 ../../include/identity.php:1005 #: ../../mod/directory.php:307 msgid "Location:" msgstr "" @@ -969,7 +971,7 @@ msgstr "" msgid "Room is full" msgstr "" -#: ../../include/comanche.php:34 ../../mod/admin.php:362 +#: ../../include/comanche.php:34 ../../mod/admin.php:366 msgid "Default" msgstr "" @@ -980,7 +982,7 @@ msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:457 +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:461 msgid "Advanced" msgstr "" @@ -1022,8 +1024,8 @@ msgstr "" msgid "Advanced example: name=fred and country=iceland" msgstr "" -#: ../../include/contact_widgets.php:57 ../../include/widgets.php:304 -#: ../../include/features.php:93 +#: ../../include/contact_widgets.php:57 ../../include/features.php:93 +#: ../../include/widgets.php:304 msgid "Saved Folders" msgstr "" @@ -1048,13 +1050,13 @@ msgstr[1] "" msgid "show more" msgstr "" -#: ../../include/conversation.php:120 ../../include/text.php:1940 +#: ../../include/conversation.php:120 ../../include/text.php:1948 #: ../../mod/like.php:361 ../../mod/subthread.php:83 ../../mod/tagger.php:43 msgid "photo" msgstr "" #: ../../include/conversation.php:123 ../../include/event.php:904 -#: ../../include/text.php:1943 ../../mod/events.php:249 ../../mod/like.php:363 +#: ../../include/text.php:1951 ../../mod/events.php:249 ../../mod/like.php:363 #: ../../mod/tagger.php:47 msgid "event" msgstr "" @@ -1063,12 +1065,12 @@ msgstr "" msgid "channel" msgstr "" -#: ../../include/conversation.php:148 ../../include/text.php:1946 +#: ../../include/conversation.php:148 ../../include/text.php:1954 #: ../../mod/like.php:361 ../../mod/subthread.php:83 msgid "status" msgstr "" -#: ../../include/conversation.php:150 ../../include/text.php:1948 +#: ../../include/conversation.php:150 ../../include/text.php:1956 #: ../../mod/tagger.php:53 msgid "comment" msgstr "" @@ -1093,7 +1095,8 @@ msgstr "" msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:243 ../../include/text.php:972 +#: ../../include/conversation.php:243 ../../include/text.php:973 +#: ../../include/text.php:978 msgid "poked" msgstr "" @@ -1103,42 +1106,42 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:1060 +#: ../../include/conversation.php:574 ../../mod/photos.php:1066 msgctxt "title" msgid "Likes" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:1060 +#: ../../include/conversation.php:574 ../../mod/photos.php:1066 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../include/conversation.php:575 ../../mod/photos.php:1061 +#: ../../include/conversation.php:575 ../../mod/photos.php:1067 msgctxt "title" msgid "Agree" msgstr "" -#: ../../include/conversation.php:575 ../../mod/photos.php:1061 +#: ../../include/conversation.php:575 ../../mod/photos.php:1067 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../include/conversation.php:575 ../../mod/photos.php:1061 +#: ../../include/conversation.php:575 ../../mod/photos.php:1067 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../include/conversation.php:576 ../../mod/photos.php:1062 +#: ../../include/conversation.php:576 ../../mod/photos.php:1068 msgctxt "title" msgid "Attending" msgstr "" -#: ../../include/conversation.php:576 ../../mod/photos.php:1062 +#: ../../include/conversation.php:576 ../../mod/photos.php:1068 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../include/conversation.php:576 ../../mod/photos.php:1062 +#: ../../include/conversation.php:576 ../../mod/photos.php:1068 msgctxt "title" msgid "Might attend" msgstr "" @@ -1285,7 +1288,7 @@ msgid "Expires YYYY-MM-DD HH:MM" msgstr "" #: ../../include/conversation.php:1202 ../../mod/blocks.php:154 -#: ../../mod/layouts.php:184 ../../mod/photos.php:1025 +#: ../../mod/layouts.php:184 ../../mod/photos.php:1031 #: ../../mod/webpages.php:182 msgid "Share" msgstr "" @@ -1479,7 +1482,7 @@ msgstr "" msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1611 ../../mod/admin.php:1059 +#: ../../include/conversation.php:1611 ../../mod/admin.php:1157 msgid "Channel" msgstr "" @@ -1664,25 +1667,25 @@ 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 +#: ../../include/dir_fns.php:143 ../../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/photos.php:626 ../../mod/admin.php:425 ../../mod/removeme.php:60 #: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104 #: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1522 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 +#: ../../include/dir_fns.php:143 ../../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/photos.php:626 ../../mod/admin.php:427 ../../mod/removeme.php:60 #: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104 #: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1522 msgid "Yes" @@ -1763,7 +1766,7 @@ msgstr "" msgid "Add new connections to this privacy group" msgstr "" -#: ../../include/group.php:251 ../../mod/admin.php:900 +#: ../../include/group.php:251 ../../mod/admin.php:998 msgid "All Channels" msgstr "" @@ -1951,19 +1954,19 @@ msgstr "" msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:45 ../../include/text.php:1183 +#: ../../include/js_strings.php:45 ../../include/text.php:1191 msgid "January" msgstr "" -#: ../../include/js_strings.php:46 ../../include/text.php:1183 +#: ../../include/js_strings.php:46 ../../include/text.php:1191 msgid "February" msgstr "" -#: ../../include/js_strings.php:47 ../../include/text.php:1183 +#: ../../include/js_strings.php:47 ../../include/text.php:1191 msgid "March" msgstr "" -#: ../../include/js_strings.php:48 ../../include/text.php:1183 +#: ../../include/js_strings.php:48 ../../include/text.php:1191 msgid "April" msgstr "" @@ -1972,31 +1975,31 @@ msgctxt "long" msgid "May" msgstr "" -#: ../../include/js_strings.php:50 ../../include/text.php:1183 +#: ../../include/js_strings.php:50 ../../include/text.php:1191 msgid "June" msgstr "" -#: ../../include/js_strings.php:51 ../../include/text.php:1183 +#: ../../include/js_strings.php:51 ../../include/text.php:1191 msgid "July" msgstr "" -#: ../../include/js_strings.php:52 ../../include/text.php:1183 +#: ../../include/js_strings.php:52 ../../include/text.php:1191 msgid "August" msgstr "" -#: ../../include/js_strings.php:53 ../../include/text.php:1183 +#: ../../include/js_strings.php:53 ../../include/text.php:1191 msgid "September" msgstr "" -#: ../../include/js_strings.php:54 ../../include/text.php:1183 +#: ../../include/js_strings.php:54 ../../include/text.php:1191 msgid "October" msgstr "" -#: ../../include/js_strings.php:55 ../../include/text.php:1183 +#: ../../include/js_strings.php:55 ../../include/text.php:1191 msgid "November" msgstr "" -#: ../../include/js_strings.php:56 ../../include/text.php:1183 +#: ../../include/js_strings.php:56 ../../include/text.php:1191 msgid "December" msgstr "" @@ -2049,31 +2052,31 @@ msgstr "" msgid "Dec" msgstr "" -#: ../../include/js_strings.php:69 ../../include/text.php:1179 +#: ../../include/js_strings.php:69 ../../include/text.php:1187 msgid "Sunday" msgstr "" -#: ../../include/js_strings.php:70 ../../include/text.php:1179 +#: ../../include/js_strings.php:70 ../../include/text.php:1187 msgid "Monday" msgstr "" -#: ../../include/js_strings.php:71 ../../include/text.php:1179 +#: ../../include/js_strings.php:71 ../../include/text.php:1187 msgid "Tuesday" msgstr "" -#: ../../include/js_strings.php:72 ../../include/text.php:1179 +#: ../../include/js_strings.php:72 ../../include/text.php:1187 msgid "Wednesday" msgstr "" -#: ../../include/js_strings.php:73 ../../include/text.php:1179 +#: ../../include/js_strings.php:73 ../../include/text.php:1187 msgid "Thursday" msgstr "" -#: ../../include/js_strings.php:74 ../../include/text.php:1179 +#: ../../include/js_strings.php:74 ../../include/text.php:1187 msgid "Friday" msgstr "" -#: ../../include/js_strings.php:75 ../../include/text.php:1179 +#: ../../include/js_strings.php:75 ../../include/text.php:1187 msgid "Saturday" msgstr "" @@ -2174,7 +2177,7 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:90 ../../include/identity.php:976 +#: ../../include/nav.php:90 ../../include/identity.php:977 msgid "Edit Profile" msgstr "" @@ -2333,7 +2336,7 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:210 ../../include/widgets.php:1299 +#: ../../include/nav.php:210 ../../include/widgets.php:1300 msgid "Admin" msgstr "" @@ -2383,14 +2386,6 @@ msgstr "" msgid "commented on %s's post" msgstr "" -#: ../../include/oembed.php:213 -msgid "Embedded content" -msgstr "" - -#: ../../include/oembed.php:222 -msgid "Embedding disabled" -msgstr "" - #: ../../include/page_widgets.php:6 msgid "New Page" msgstr "" @@ -2422,137 +2417,8 @@ msgstr "" msgid "Edited" msgstr "" -#: ../../include/permissions.php:26 -msgid "Can view my normal stream and posts" -msgstr "" - -#: ../../include/permissions.php:27 -msgid "Can view my default channel profile" -msgstr "" - -#: ../../include/permissions.php:28 -msgid "Can view my connections" -msgstr "" - -#: ../../include/permissions.php:29 -msgid "Can view my file storage and photos" -msgstr "" - -#: ../../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:867 -msgid "Social Networking" -msgstr "" - -#: ../../include/permissions.php:867 ../../include/permissions.php:868 -#: ../../include/permissions.php:869 -msgid "Mostly Public" -msgstr "" - -#: ../../include/permissions.php:867 ../../include/permissions.php:868 -#: ../../include/permissions.php:869 -msgid "Restricted" -msgstr "" - -#: ../../include/permissions.php:867 ../../include/permissions.php:868 -msgid "Private" -msgstr "" - -#: ../../include/permissions.php:868 -msgid "Community Forum" -msgstr "" - -#: ../../include/permissions.php:869 -msgid "Feed Republish" -msgstr "" - -#: ../../include/permissions.php:870 -msgid "Special Purpose" -msgstr "" - -#: ../../include/permissions.php:870 -msgid "Celebrity/Soapbox" -msgstr "" - -#: ../../include/permissions.php:870 -msgid "Group Repository" -msgstr "" - -#: ../../include/permissions.php:871 ../../include/profile_selectors.php:6 -#: ../../include/profile_selectors.php:23 -#: ../../include/profile_selectors.php:61 -#: ../../include/profile_selectors.php:97 -msgid "Other" -msgstr "" - -#: ../../include/permissions.php:871 -msgid "Custom/Expert Mode" -msgstr "" - #: ../../include/photo/photo_driver.php:722 ../../mod/photos.php:94 -#: ../../mod/photos.php:699 ../../mod/profile_photo.php:147 +#: ../../mod/photos.php:703 ../../mod/profile_photo.php:147 #: ../../mod/profile_photo.php:239 ../../mod/profile_photo.php:379 msgid "Profile Photos" msgstr "" @@ -2640,6 +2506,13 @@ msgid "Non-specific" msgstr "" #: ../../include/profile_selectors.php:6 +#: ../../include/profile_selectors.php:23 +#: ../../include/profile_selectors.php:61 +#: ../../include/profile_selectors.php:97 ../../include/permissions.php:871 +msgid "Other" +msgstr "" + +#: ../../include/profile_selectors.php:6 msgid "Undecided" msgstr "" @@ -2925,8 +2798,8 @@ msgstr "" 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 +#: ../../include/contact_selectors.php:79 ../../mod/id.php:15 +#: ../../mod/id.php:16 ../../mod/admin.php:989 ../../mod/admin.php:998 #: ../../boot.php:1520 msgid "Email" msgstr "" @@ -2955,244 +2828,6 @@ msgstr "" msgid "MySpace" 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:966 ../../mod/profiles.php:782 -msgid "Change profile photo" -msgstr "" - -#: ../../include/identity.php:972 -msgid "Profiles" -msgstr "" - -#: ../../include/identity.php:972 -msgid "Manage/edit profiles" -msgstr "" - -#: ../../include/identity.php:973 ../../mod/profiles.php:783 -msgid "Create New Profile" -msgstr "" - -#: ../../include/identity.php:988 ../../mod/profiles.php:794 -msgid "Profile Image" -msgstr "" - -#: ../../include/identity.php:991 -msgid "visible to everybody" -msgstr "" - -#: ../../include/identity.php:992 ../../mod/profiles.php:677 -#: ../../mod/profiles.php:798 -msgid "Edit visibility" -msgstr "" - -#: ../../include/identity.php:1008 ../../include/identity.php:1250 -msgid "Gender:" -msgstr "" - -#: ../../include/identity.php:1009 ../../include/identity.php:1294 -msgid "Status:" -msgstr "" - -#: ../../include/identity.php:1010 ../../include/identity.php:1305 -msgid "Homepage:" -msgstr "" - -#: ../../include/identity.php:1011 -msgid "Online Now" -msgstr "" - -#: ../../include/identity.php:1097 ../../include/identity.php:1175 -#: ../../mod/ping.php:318 -msgid "g A l F d" -msgstr "" - -#: ../../include/identity.php:1098 ../../include/identity.php:1176 -msgid "F d" -msgstr "" - -#: ../../include/identity.php:1143 ../../include/identity.php:1215 -#: ../../mod/ping.php:341 -msgid "[today]" -msgstr "" - -#: ../../include/identity.php:1154 -msgid "Birthday Reminders" -msgstr "" - -#: ../../include/identity.php:1155 -msgid "Birthdays this week:" -msgstr "" - -#: ../../include/identity.php:1208 -msgid "[No description]" -msgstr "" - -#: ../../include/identity.php:1226 -msgid "Event Reminders" -msgstr "" - -#: ../../include/identity.php:1227 -msgid "Events this week:" -msgstr "" - -#: ../../include/identity.php:1248 ../../mod/settings.php:1030 -msgid "Full Name:" -msgstr "" - -#: ../../include/identity.php:1255 -msgid "Like this channel" -msgstr "" - -#: ../../include/identity.php:1279 -msgid "j F, Y" -msgstr "" - -#: ../../include/identity.php:1280 -msgid "j F" -msgstr "" - -#: ../../include/identity.php:1287 -msgid "Birthday:" -msgstr "" - -#: ../../include/identity.php:1291 ../../mod/directory.php:302 -msgid "Age:" -msgstr "" - -#: ../../include/identity.php:1300 -#, php-format -msgid "for %1$d %2$s" -msgstr "" - -#: ../../include/identity.php:1303 ../../mod/profiles.php:699 -msgid "Sexual Preference:" -msgstr "" - -#: ../../include/identity.php:1307 ../../mod/directory.php:318 -#: ../../mod/profiles.php:701 -msgid "Hometown:" -msgstr "" - -#: ../../include/identity.php:1309 -msgid "Tags:" -msgstr "" - -#: ../../include/identity.php:1311 ../../mod/profiles.php:702 -msgid "Political Views:" -msgstr "" - -#: ../../include/identity.php:1313 -msgid "Religion:" -msgstr "" - -#: ../../include/identity.php:1315 ../../mod/directory.php:320 -msgid "About:" -msgstr "" - -#: ../../include/identity.php:1317 -msgid "Hobbies/Interests:" -msgstr "" - -#: ../../include/identity.php:1319 ../../mod/profiles.php:705 -msgid "Likes:" -msgstr "" - -#: ../../include/identity.php:1321 ../../mod/profiles.php:706 -msgid "Dislikes:" -msgstr "" - -#: ../../include/identity.php:1323 -msgid "Contact information and Social Networks:" -msgstr "" - -#: ../../include/identity.php:1325 -msgid "My other channels:" -msgstr "" - -#: ../../include/identity.php:1327 -msgid "Musical interests:" -msgstr "" - -#: ../../include/identity.php:1329 -msgid "Books, literature:" -msgstr "" - -#: ../../include/identity.php:1331 -msgid "Television:" -msgstr "" - -#: ../../include/identity.php:1333 -msgid "Film/dance/culture/entertainment:" -msgstr "" - -#: ../../include/identity.php:1335 -msgid "Love/Romance:" -msgstr "" - -#: ../../include/identity.php:1337 -msgid "Work/employment:" -msgstr "" - -#: ../../include/identity.php:1339 -msgid "School/education:" -msgstr "" - -#: ../../include/identity.php:1359 -msgid "Like this thing" -msgstr "" - -#: ../../include/identity.php:1767 ../../mod/cover_photo.php:236 -msgid "cover photo" -msgstr "" - #: ../../include/text.php:394 msgid "prev" msgstr "" @@ -3227,213 +2862,213 @@ msgid "View all %s connections" msgstr "" #: ../../include/text.php:886 ../../include/text.php:898 -#: ../../include/widgets.php:192 ../../mod/admin.php:1568 -#: ../../mod/admin.php:1588 ../../mod/filer.php:49 ../../mod/rbmark.php:28 +#: ../../include/widgets.php:192 ../../mod/filer.php:49 +#: ../../mod/admin.php:1666 ../../mod/admin.php:1686 ../../mod/rbmark.php:28 #: ../../mod/rbmark.php:100 msgid "Save" msgstr "" -#: ../../include/text.php:972 +#: ../../include/text.php:973 ../../include/text.php:978 msgid "poke" msgstr "" -#: ../../include/text.php:973 +#: ../../include/text.php:979 msgid "ping" msgstr "" -#: ../../include/text.php:973 +#: ../../include/text.php:979 msgid "pinged" msgstr "" -#: ../../include/text.php:974 +#: ../../include/text.php:980 msgid "prod" msgstr "" -#: ../../include/text.php:974 +#: ../../include/text.php:980 msgid "prodded" msgstr "" -#: ../../include/text.php:975 +#: ../../include/text.php:981 msgid "slap" msgstr "" -#: ../../include/text.php:975 +#: ../../include/text.php:981 msgid "slapped" msgstr "" -#: ../../include/text.php:976 +#: ../../include/text.php:982 msgid "finger" msgstr "" -#: ../../include/text.php:976 +#: ../../include/text.php:982 msgid "fingered" msgstr "" -#: ../../include/text.php:977 +#: ../../include/text.php:983 msgid "rebuff" msgstr "" -#: ../../include/text.php:977 +#: ../../include/text.php:983 msgid "rebuffed" msgstr "" -#: ../../include/text.php:987 +#: ../../include/text.php:995 msgid "happy" msgstr "" -#: ../../include/text.php:988 +#: ../../include/text.php:996 msgid "sad" msgstr "" -#: ../../include/text.php:989 +#: ../../include/text.php:997 msgid "mellow" msgstr "" -#: ../../include/text.php:990 +#: ../../include/text.php:998 msgid "tired" msgstr "" -#: ../../include/text.php:991 +#: ../../include/text.php:999 msgid "perky" msgstr "" -#: ../../include/text.php:992 +#: ../../include/text.php:1000 msgid "angry" msgstr "" -#: ../../include/text.php:993 +#: ../../include/text.php:1001 msgid "stupefied" msgstr "" -#: ../../include/text.php:994 +#: ../../include/text.php:1002 msgid "puzzled" msgstr "" -#: ../../include/text.php:995 +#: ../../include/text.php:1003 msgid "interested" msgstr "" -#: ../../include/text.php:996 +#: ../../include/text.php:1004 msgid "bitter" msgstr "" -#: ../../include/text.php:997 +#: ../../include/text.php:1005 msgid "cheerful" msgstr "" -#: ../../include/text.php:998 +#: ../../include/text.php:1006 msgid "alive" msgstr "" -#: ../../include/text.php:999 +#: ../../include/text.php:1007 msgid "annoyed" msgstr "" -#: ../../include/text.php:1000 +#: ../../include/text.php:1008 msgid "anxious" msgstr "" -#: ../../include/text.php:1001 +#: ../../include/text.php:1009 msgid "cranky" msgstr "" -#: ../../include/text.php:1002 +#: ../../include/text.php:1010 msgid "disturbed" msgstr "" -#: ../../include/text.php:1003 +#: ../../include/text.php:1011 msgid "frustrated" msgstr "" -#: ../../include/text.php:1004 +#: ../../include/text.php:1012 msgid "depressed" msgstr "" -#: ../../include/text.php:1005 +#: ../../include/text.php:1013 msgid "motivated" msgstr "" -#: ../../include/text.php:1006 +#: ../../include/text.php:1014 msgid "relaxed" msgstr "" -#: ../../include/text.php:1007 +#: ../../include/text.php:1015 msgid "surprised" msgstr "" -#: ../../include/text.php:1183 +#: ../../include/text.php:1191 msgid "May" msgstr "" -#: ../../include/text.php:1260 ../../include/text.php:1264 +#: ../../include/text.php:1268 ../../include/text.php:1272 msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1266 +#: ../../include/text.php:1274 msgid "unknown" msgstr "" -#: ../../include/text.php:1302 +#: ../../include/text.php:1310 msgid "remove category" msgstr "" -#: ../../include/text.php:1379 +#: ../../include/text.php:1387 msgid "remove from file" msgstr "" -#: ../../include/text.php:1521 ../../include/text.php:1532 +#: ../../include/text.php:1529 ../../include/text.php:1540 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1716 ../../mod/events.php:623 +#: ../../include/text.php:1724 ../../mod/events.php:623 msgid "Link to Source" msgstr "" -#: ../../include/text.php:1737 ../../include/text.php:1809 +#: ../../include/text.php:1745 ../../include/text.php:1817 msgid "default" msgstr "" -#: ../../include/text.php:1745 +#: ../../include/text.php:1753 msgid "Page layout" msgstr "" -#: ../../include/text.php:1745 +#: ../../include/text.php:1753 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:1787 +#: ../../include/text.php:1795 msgid "Page content type" msgstr "" -#: ../../include/text.php:1821 +#: ../../include/text.php:1829 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1953 +#: ../../include/text.php:1961 msgid "activity" msgstr "" -#: ../../include/text.php:2248 +#: ../../include/text.php:2256 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2251 ../../mod/blocks.php:147 +#: ../../include/text.php:2259 ../../mod/blocks.php:147 msgid "Blocks" msgstr "" -#: ../../include/text.php:2252 ../../mod/menu.php:103 +#: ../../include/text.php:2260 ../../mod/menu.php:103 msgid "Menus" msgstr "" -#: ../../include/text.php:2253 ../../mod/layouts.php:174 +#: ../../include/text.php:2261 ../../mod/layouts.php:174 msgid "Layouts" msgstr "" -#: ../../include/text.php:2254 +#: ../../include/text.php:2262 msgid "Pages" msgstr "" -#: ../../include/items.php:423 ../../index.php:370 ../../mod/dreport.php:6 +#: ../../include/items.php:423 ../../index.php:373 ../../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 @@ -3477,32 +3112,32 @@ msgstr "" msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4350 ../../mod/admin.php:135 -#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36 -#: ../../mod/filestorage.php:27 ../../mod/thing.php:85 +#: ../../include/items.php:4351 ../../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:4862 ../../mod/group.php:38 ../../mod/group.php:137 +#: ../../include/items.php:4863 ../../mod/group.php:38 ../../mod/group.php:137 msgid "Privacy group not found." msgstr "" -#: ../../include/items.php:4878 +#: ../../include/items.php:4879 msgid "Privacy group is empty." msgstr "" -#: ../../include/items.php:4885 +#: ../../include/items.php:4886 #, php-format msgid "Privacy group: %s" msgstr "" -#: ../../include/items.php:4895 ../../mod/connedit.php:692 +#: ../../include/items.php:4896 ../../mod/connedit.php:692 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4897 +#: ../../include/items.php:4898 msgid "Connection not found." msgstr "" @@ -3684,305 +3319,6 @@ msgstr "" msgid "[Hubzilla:Notify]" msgstr "" -#: ../../include/widgets.php:93 -msgid "System" -msgstr "" - -#: ../../include/widgets.php:96 -msgid "Create Personal App" -msgstr "" - -#: ../../include/widgets.php:97 -msgid "Edit Personal App" -msgstr "" - -#: ../../include/widgets.php:139 ../../mod/suggest.php:54 -msgid "Ignore/Hide" -msgstr "" - -#: ../../include/widgets.php:144 -msgid "Suggestions" -msgstr "" - -#: ../../include/widgets.php:145 -msgid "See more..." -msgstr "" - -#: ../../include/widgets.php:166 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "" - -#: ../../include/widgets.php:172 -msgid "Add New Connection" -msgstr "" - -#: ../../include/widgets.php:173 -msgid "Enter channel address" -msgstr "" - -#: ../../include/widgets.php:174 -msgid "Examples: bob@example.com, https://example.com/barbara" -msgstr "" - -#: ../../include/widgets.php:190 -msgid "Notes" -msgstr "" - -#: ../../include/widgets.php:266 -msgid "Remove term" -msgstr "" - -#: ../../include/widgets.php:274 ../../include/features.php:80 -msgid "Saved Searches" -msgstr "" - -#: ../../include/widgets.php:349 -msgid "Archives" -msgstr "" - -#: ../../include/widgets.php:428 ../../mod/connedit.php:580 -msgid "Me" -msgstr "" - -#: ../../include/widgets.php:429 ../../mod/connedit.php:581 -msgid "Family" -msgstr "" - -#: ../../include/widgets.php:431 ../../mod/connedit.php:583 -msgid "Acquaintances" -msgstr "" - -#: ../../include/widgets.php:432 ../../mod/connections.php:88 -#: ../../mod/connections.php:103 ../../mod/connedit.php:584 -msgid "All" -msgstr "" - -#: ../../include/widgets.php:451 -msgid "Refresh" -msgstr "" - -#: ../../include/widgets.php:485 -msgid "Account settings" -msgstr "" - -#: ../../include/widgets.php:491 -msgid "Channel settings" -msgstr "" - -#: ../../include/widgets.php:500 -msgid "Additional features" -msgstr "" - -#: ../../include/widgets.php:507 -msgid "Feature/Addon settings" -msgstr "" - -#: ../../include/widgets.php:513 -msgid "Display settings" -msgstr "" - -#: ../../include/widgets.php:519 -msgid "Connected apps" -msgstr "" - -#: ../../include/widgets.php:525 -msgid "Export channel" -msgstr "" - -#: ../../include/widgets.php:533 ../../mod/connedit.php:692 -msgid "Connection Default Permissions" -msgstr "" - -#: ../../include/widgets.php:541 -msgid "Premium Channel Settings" -msgstr "" - -#: ../../include/widgets.php:549 ../../include/features.php:67 -#: ../../mod/sources.php:88 -msgid "Channel Sources" -msgstr "" - -#: ../../include/widgets.php:571 -msgid "Private Mail Menu" -msgstr "" - -#: ../../include/widgets.php:573 -msgid "Combined View" -msgstr "" - -#: ../../include/widgets.php:607 ../../include/widgets.php:619 -msgid "Conversations" -msgstr "" - -#: ../../include/widgets.php:611 -msgid "Received Messages" -msgstr "" - -#: ../../include/widgets.php:615 -msgid "Sent Messages" -msgstr "" - -#: ../../include/widgets.php:629 -msgid "No messages." -msgstr "" - -#: ../../include/widgets.php:647 -msgid "Delete conversation" -msgstr "" - -#: ../../include/widgets.php:673 -msgid "Events Menu" -msgstr "" - -#: ../../include/widgets.php:674 -msgid "Day View" -msgstr "" - -#: ../../include/widgets.php:675 -msgid "Week View" -msgstr "" - -#: ../../include/widgets.php:676 -msgid "Month View" -msgstr "" - -#: ../../include/widgets.php:677 ../../mod/events.php:654 -msgid "Export" -msgstr "" - -#: ../../include/widgets.php:678 ../../mod/events.php:657 -msgid "Import" -msgstr "" - -#: ../../include/widgets.php:688 -msgid "Events Tools" -msgstr "" - -#: ../../include/widgets.php:689 -msgid "Export Calendar" -msgstr "" - -#: ../../include/widgets.php:690 -msgid "Import Calendar" -msgstr "" - -#: ../../include/widgets.php:764 -msgid "Chat Rooms" -msgstr "" - -#: ../../include/widgets.php:784 -msgid "Bookmarked Chatrooms" -msgstr "" - -#: ../../include/widgets.php:804 -msgid "Suggested Chatrooms" -msgstr "" - -#: ../../include/widgets.php:949 ../../include/widgets.php:1039 -msgid "photo/image" -msgstr "" - -#: ../../include/widgets.php:1133 -msgid "Rating Tools" -msgstr "" - -#: ../../include/widgets.php:1137 ../../include/widgets.php:1139 -msgid "Rate Me" -msgstr "" - -#: ../../include/widgets.php:1142 -msgid "View Ratings" -msgstr "" - -#: ../../include/widgets.php:1153 -msgid "Public Hubs" -msgstr "" - -#: ../../include/widgets.php:1201 -msgid "Forums" -msgstr "" - -#: ../../include/widgets.php:1230 -msgid "Tasks" -msgstr "" - -#: ../../include/widgets.php:1239 -msgid "Documentation" -msgstr "" - -#: ../../include/widgets.php:1241 -msgid "Project/Site Information" -msgstr "" - -#: ../../include/widgets.php:1242 -msgid "For Members" -msgstr "" - -#: ../../include/widgets.php:1243 -msgid "For Administrators" -msgstr "" - -#: ../../include/widgets.php:1244 -msgid "For Developers" -msgstr "" - -#: ../../include/widgets.php:1269 ../../mod/admin.php:452 -msgid "Site" -msgstr "" - -#: ../../include/widgets.php:1270 -msgid "Accounts" -msgstr "" - -#: ../../include/widgets.php:1271 ../../mod/admin.php:1051 -msgid "Channels" -msgstr "" - -#: ../../include/widgets.php:1273 ../../mod/admin.php:1166 -#: ../../mod/admin.php:1227 -msgid "Plugins" -msgstr "" - -#: ../../include/widgets.php:1274 ../../mod/admin.php:1388 -#: ../../mod/admin.php:1422 -msgid "Themes" -msgstr "" - -#: ../../include/widgets.php:1275 -msgid "Inspect queue" -msgstr "" - -#: ../../include/widgets.php:1276 -msgid "Profile Config" -msgstr "" - -#: ../../include/widgets.php:1277 -msgid "DB updates" -msgstr "" - -#: ../../include/widgets.php:1295 ../../include/widgets.php:1301 -#: ../../mod/admin.php:1507 -msgid "Logs" -msgstr "" - -#: ../../include/widgets.php:1300 -msgid "Plugin Features" -msgstr "" - -#: ../../include/widgets.php:1302 -msgid "User registrations waiting for confirmation" -msgstr "" - -#: ../../include/widgets.php:1380 ../../mod/photos.php:748 -#: ../../mod/photos.php:1283 -msgid "View Photo" -msgstr "" - -#: ../../include/widgets.php:1397 ../../mod/photos.php:779 -msgid "Edit Album" -msgstr "" - #: ../../include/features.php:45 msgid "General Features" msgstr "" @@ -4101,6 +3437,11 @@ msgid "" "(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 "" @@ -4156,6 +3497,10 @@ msgstr "" msgid "Enable management and selection of privacy groups" 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 "" @@ -4248,826 +3593,687 @@ msgstr "" msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../index.php:242 ../../mod/help.php:213 -msgid "Not Found" -msgstr "" - -#: ../../index.php:245 ../../mod/block.php:75 ../../mod/display.php:110 -#: ../../mod/help.php:216 ../../mod/page.php:89 -msgid "Page not found." -msgstr "" - -#: ../../mod/achievements.php:34 -msgid "Some blurb about what to do when you're new here" -msgstr "" - -#: ../../mod/acl.php:222 -msgid "network" -msgstr "" - -#: ../../mod/acl.php:232 -msgid "RSS" -msgstr "" - -#: ../../mod/admin.php:54 -msgid "Theme settings updated." -msgstr "" - -#: ../../mod/admin.php:168 -msgid "# Accounts" -msgstr "" - -#: ../../mod/admin.php:169 -msgid "# blocked accounts" -msgstr "" - -#: ../../mod/admin.php:170 -msgid "# expired accounts" -msgstr "" - -#: ../../mod/admin.php:171 -msgid "# expiring accounts" +#: ../../include/identity.php:32 +msgid "Unable to obtain identity information from database" msgstr "" -#: ../../mod/admin.php:182 -msgid "# Channels" +#: ../../include/identity.php:66 +msgid "Empty name" msgstr "" -#: ../../mod/admin.php:183 -msgid "# primary" +#: ../../include/identity.php:69 +msgid "Name too long" msgstr "" -#: ../../mod/admin.php:184 -msgid "# clones" +#: ../../include/identity.php:181 +msgid "No account identifier" msgstr "" -#: ../../mod/admin.php:190 -msgid "Message queues" +#: ../../include/identity.php:193 +msgid "Nickname is required." msgstr "" -#: ../../mod/admin.php:206 ../../mod/admin.php:451 ../../mod/admin.php:619 -#: ../../mod/admin.php:886 ../../mod/admin.php:1050 ../../mod/admin.php:1165 -#: ../../mod/admin.php:1226 ../../mod/admin.php:1387 ../../mod/admin.php:1421 -#: ../../mod/admin.php:1506 -msgid "Administration" +#: ../../include/identity.php:207 +msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../mod/admin.php:207 -msgid "Summary" +#: ../../include/identity.php:212 +msgid "" +"Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../mod/admin.php:210 -msgid "Registered accounts" +#: ../../include/identity.php:288 +msgid "Unable to retrieve created identity" msgstr "" -#: ../../mod/admin.php:211 ../../mod/admin.php:623 -msgid "Pending registrations" +#: ../../include/identity.php:346 +msgid "Default Profile" msgstr "" -#: ../../mod/admin.php:212 -msgid "Registered channels" +#: ../../include/identity.php:772 +msgid "Requested channel is not available." msgstr "" -#: ../../mod/admin.php:213 ../../mod/admin.php:624 -msgid "Active plugins" +#: ../../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 "" -#: ../../mod/admin.php:214 -msgid "Version" +#: ../../include/identity.php:967 ../../mod/profiles.php:782 +msgid "Change profile photo" msgstr "" -#: ../../mod/admin.php:335 -msgid "Site settings updated." +#: ../../include/identity.php:973 +msgid "Profiles" msgstr "" -#: ../../mod/admin.php:372 ../../mod/settings.php:793 -msgid "mobile" +#: ../../include/identity.php:973 +msgid "Manage/edit profiles" msgstr "" -#: ../../mod/admin.php:374 -msgid "experimental" +#: ../../include/identity.php:974 ../../mod/profiles.php:783 +msgid "Create New Profile" msgstr "" -#: ../../mod/admin.php:376 -msgid "unsupported" +#: ../../include/identity.php:989 ../../mod/profiles.php:794 +msgid "Profile Image" msgstr "" -#: ../../mod/admin.php:422 -msgid "Yes - with approval" +#: ../../include/identity.php:992 +msgid "visible to everybody" msgstr "" -#: ../../mod/admin.php:428 -msgid "My site is not a public server" +#: ../../include/identity.php:993 ../../mod/profiles.php:677 +#: ../../mod/profiles.php:798 +msgid "Edit visibility" msgstr "" -#: ../../mod/admin.php:429 -msgid "My site has paid access only" +#: ../../include/identity.php:1009 ../../include/identity.php:1248 +msgid "Gender:" msgstr "" -#: ../../mod/admin.php:430 -msgid "My site has free access only" +#: ../../include/identity.php:1010 ../../include/identity.php:1292 +msgid "Status:" msgstr "" -#: ../../mod/admin.php:431 -msgid "My site offers free accounts with optional paid upgrades" +#: ../../include/identity.php:1011 ../../include/identity.php:1303 +msgid "Homepage:" msgstr "" -#: ../../mod/admin.php:454 ../../mod/register.php:237 -msgid "Registration" +#: ../../include/identity.php:1012 +msgid "Online Now" msgstr "" -#: ../../mod/admin.php:455 -msgid "File upload" +#: ../../include/identity.php:1095 ../../include/identity.php:1173 +#: ../../mod/ping.php:318 +msgid "g A l F d" msgstr "" -#: ../../mod/admin.php:456 -msgid "Policies" +#: ../../include/identity.php:1096 ../../include/identity.php:1174 +msgid "F d" msgstr "" -#: ../../mod/admin.php:461 -msgid "Site name" +#: ../../include/identity.php:1141 ../../include/identity.php:1213 +#: ../../mod/ping.php:341 +msgid "[today]" msgstr "" -#: ../../mod/admin.php:462 -msgid "Banner/Logo" +#: ../../include/identity.php:1152 +msgid "Birthday Reminders" msgstr "" -#: ../../mod/admin.php:463 -msgid "Administrator Information" +#: ../../include/identity.php:1153 +msgid "Birthdays this week:" msgstr "" -#: ../../mod/admin.php:463 -msgid "" -"Contact information for site administrators. Displayed on siteinfo page. " -"BBCode can be used here" +#: ../../include/identity.php:1206 +msgid "[No description]" msgstr "" -#: ../../mod/admin.php:464 -msgid "System language" +#: ../../include/identity.php:1224 +msgid "Event Reminders" msgstr "" -#: ../../mod/admin.php:465 -msgid "System theme" +#: ../../include/identity.php:1225 +msgid "Events this week:" msgstr "" -#: ../../mod/admin.php:465 -msgid "" -"Default system theme - may be over-ridden by user profiles - <a href='#' " -"id='cnftheme'>change theme settings</a>" +#: ../../include/identity.php:1246 ../../mod/settings.php:1030 +msgid "Full Name:" msgstr "" -#: ../../mod/admin.php:466 -msgid "Mobile system theme" +#: ../../include/identity.php:1253 +msgid "Like this channel" msgstr "" -#: ../../mod/admin.php:466 -msgid "Theme for mobile devices" +#: ../../include/identity.php:1277 +msgid "j F, Y" msgstr "" -#: ../../mod/admin.php:468 -msgid "Allow Feeds as Connections" +#: ../../include/identity.php:1278 +msgid "j F" msgstr "" -#: ../../mod/admin.php:468 -msgid "(Heavy system resource usage)" +#: ../../include/identity.php:1285 +msgid "Birthday:" msgstr "" -#: ../../mod/admin.php:469 -msgid "Maximum image size" +#: ../../include/identity.php:1289 ../../mod/directory.php:302 +msgid "Age:" msgstr "" -#: ../../mod/admin.php:469 -msgid "" -"Maximum size in bytes of uploaded images. Default is 0, which means no " -"limits." +#: ../../include/identity.php:1298 +#, php-format +msgid "for %1$d %2$s" msgstr "" -#: ../../mod/admin.php:470 -msgid "Does this site allow new member registration?" +#: ../../include/identity.php:1301 ../../mod/profiles.php:699 +msgid "Sexual Preference:" msgstr "" -#: ../../mod/admin.php:471 -msgid "Invitation only" +#: ../../include/identity.php:1305 ../../mod/directory.php:318 +#: ../../mod/profiles.php:701 +msgid "Hometown:" msgstr "" -#: ../../mod/admin.php:471 -msgid "" -"Only allow new member registrations with an invitation code. Above register " -"policy must be set to Yes." +#: ../../include/identity.php:1307 +msgid "Tags:" msgstr "" -#: ../../mod/admin.php:472 -msgid "Which best describes the types of account offered by this hub?" +#: ../../include/identity.php:1309 ../../mod/profiles.php:702 +msgid "Political Views:" msgstr "" -#: ../../mod/admin.php:473 -msgid "Register text" +#: ../../include/identity.php:1311 +msgid "Religion:" msgstr "" -#: ../../mod/admin.php:473 -msgid "Will be displayed prominently on the registration page." +#: ../../include/identity.php:1313 ../../mod/directory.php:320 +msgid "About:" msgstr "" -#: ../../mod/admin.php:474 -msgid "Site homepage to show visitors (default: login box)" +#: ../../include/identity.php:1315 +msgid "Hobbies/Interests:" msgstr "" -#: ../../mod/admin.php:474 -msgid "" -"example: 'public' to show public stream, 'page/sys/home' to show a system " -"webpage called 'home' or 'include:home.html' to include a file." +#: ../../include/identity.php:1317 ../../mod/profiles.php:705 +msgid "Likes:" msgstr "" -#: ../../mod/admin.php:475 -msgid "Preserve site homepage URL" +#: ../../include/identity.php:1319 ../../mod/profiles.php:706 +msgid "Dislikes:" msgstr "" -#: ../../mod/admin.php:475 -msgid "" -"Present the site homepage in a frame at the original location instead of " -"redirecting" +#: ../../include/identity.php:1321 +msgid "Contact information and Social Networks:" msgstr "" -#: ../../mod/admin.php:476 -msgid "Accounts abandoned after x days" +#: ../../include/identity.php:1323 +msgid "My other channels:" msgstr "" -#: ../../mod/admin.php:476 -msgid "" -"Will not waste system resources polling external sites for abandonded " -"accounts. Enter 0 for no time limit." +#: ../../include/identity.php:1325 +msgid "Musical interests:" msgstr "" -#: ../../mod/admin.php:477 -msgid "Allowed friend domains" +#: ../../include/identity.php:1327 +msgid "Books, literature:" msgstr "" -#: ../../mod/admin.php:477 -msgid "" -"Comma separated list of domains which are allowed to establish friendships " -"with this site. Wildcards are accepted. Empty to allow any domains" +#: ../../include/identity.php:1329 +msgid "Television:" msgstr "" -#: ../../mod/admin.php:478 -msgid "Allowed email domains" +#: ../../include/identity.php:1331 +msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../mod/admin.php:478 -msgid "" -"Comma separated list of domains which are allowed in email addresses for " -"registrations to this site. Wildcards are accepted. Empty to allow any " -"domains" +#: ../../include/identity.php:1333 +msgid "Love/Romance:" msgstr "" -#: ../../mod/admin.php:479 -msgid "Not allowed email domains" +#: ../../include/identity.php:1335 +msgid "Work/employment:" msgstr "" -#: ../../mod/admin.php:479 -msgid "" -"Comma separated list of domains which are not allowed in email addresses for " -"registrations to this site. Wildcards are accepted. Empty to allow any " -"domains, unless allowed domains have been defined." +#: ../../include/identity.php:1337 +msgid "School/education:" msgstr "" -#: ../../mod/admin.php:480 -msgid "Block public" +#: ../../include/identity.php:1357 +msgid "Like this thing" msgstr "" -#: ../../mod/admin.php:480 -msgid "" -"Check to block public access to all otherwise public personal pages on this " -"site unless you are currently logged in." +#: ../../include/identity.php:1765 ../../mod/cover_photo.php:236 +msgid "cover photo" msgstr "" -#: ../../mod/admin.php:481 -msgid "Verify Email Addresses" +#: ../../include/oembed.php:267 +msgid "Embedded content" msgstr "" -#: ../../mod/admin.php:481 -msgid "" -"Check to verify email addresses used in account registration (recommended)." +#: ../../include/oembed.php:276 +msgid "Embedding disabled" msgstr "" -#: ../../mod/admin.php:482 -msgid "Force publish" +#: ../../include/permissions.php:26 +msgid "Can view my normal stream and posts" msgstr "" -#: ../../mod/admin.php:482 -msgid "" -"Check to force all profiles on this site to be listed in the site directory." +#: ../../include/permissions.php:27 +msgid "Can view my default channel profile" msgstr "" -#: ../../mod/admin.php:483 -msgid "Import Public Streams" +#: ../../include/permissions.php:28 +msgid "Can view my connections" msgstr "" -#: ../../mod/admin.php:483 -msgid "" -"Import and allow access to public content pulled from other sites. Warning: " -"this content is unmoderated." +#: ../../include/permissions.php:29 +msgid "Can view my file storage and photos" msgstr "" -#: ../../mod/admin.php:484 -msgid "login on Homepage" +#: ../../include/permissions.php:30 +msgid "Can view my webpages" msgstr "" -#: ../../mod/admin.php:484 -msgid "" -"Present a login box to visitors on the home page if no other content has " -"been configured." +#: ../../include/permissions.php:33 +msgid "Can send me their channel stream and posts" msgstr "" -#: ../../mod/admin.php:486 -msgid "Directory Server URL" +#: ../../include/permissions.php:34 +msgid "Can post on my channel page (\"wall\")" msgstr "" -#: ../../mod/admin.php:486 -msgid "Default directory server" +#: ../../include/permissions.php:35 +msgid "Can comment on or like my posts" msgstr "" -#: ../../mod/admin.php:488 -msgid "Proxy user" +#: ../../include/permissions.php:36 +msgid "Can send me private mail messages" msgstr "" -#: ../../mod/admin.php:489 -msgid "Proxy URL" +#: ../../include/permissions.php:37 +msgid "Can like/dislike stuff" msgstr "" -#: ../../mod/admin.php:490 -msgid "Network timeout" +#: ../../include/permissions.php:37 +msgid "Profiles and things other than posts/comments" msgstr "" -#: ../../mod/admin.php:490 -msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +#: ../../include/permissions.php:39 +msgid "Can forward to all my channel contacts via post @mentions" msgstr "" -#: ../../mod/admin.php:491 -msgid "Delivery interval" +#: ../../include/permissions.php:39 +msgid "Advanced - useful for creating group forum channels" msgstr "" -#: ../../mod/admin.php:491 -msgid "" -"Delay background delivery processes by this many seconds to reduce system " -"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " -"for large dedicated servers." +#: ../../include/permissions.php:40 +msgid "Can chat with me (when available)" msgstr "" -#: ../../mod/admin.php:492 -msgid "Deliveries per process" +#: ../../include/permissions.php:41 +msgid "Can write to my file storage and photos" msgstr "" -#: ../../mod/admin.php:492 -msgid "" -"Number of deliveries to attempt in a single operating system process. Adjust " -"if necessary to tune system performance. Recommend: 1-5." +#: ../../include/permissions.php:42 +msgid "Can edit my webpages" msgstr "" -#: ../../mod/admin.php:493 -msgid "Poll interval" +#: ../../include/permissions.php:44 +msgid "Can source my public posts in derived channels" msgstr "" -#: ../../mod/admin.php:493 -msgid "" -"Delay background polling processes by this many seconds to reduce system " -"load. If 0, use delivery interval." +#: ../../include/permissions.php:44 +msgid "Somewhat advanced - very useful in open communities" msgstr "" -#: ../../mod/admin.php:494 -msgid "Maximum Load Average" +#: ../../include/permissions.php:46 +msgid "Can administer my channel resources" msgstr "" -#: ../../mod/admin.php:494 -msgid "" -"Maximum system load before delivery and poll processes are deferred - " -"default 50." +#: ../../include/permissions.php:46 +msgid "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "" -#: ../../mod/admin.php:495 -msgid "Expiration period in days for imported (grid/network) content" +#: ../../include/permissions.php:867 +msgid "Social Networking" msgstr "" -#: ../../mod/admin.php:495 -msgid "0 for no expiration of imported content" +#: ../../include/permissions.php:867 ../../include/permissions.php:868 +#: ../../include/permissions.php:869 +msgid "Mostly Public" msgstr "" -#: ../../mod/admin.php:585 ../../mod/admin.php:586 ../../mod/settings.php:717 -msgid "Off" +#: ../../include/permissions.php:867 ../../include/permissions.php:868 +#: ../../include/permissions.php:869 +msgid "Restricted" msgstr "" -#: ../../mod/admin.php:585 ../../mod/admin.php:586 ../../mod/settings.php:717 -msgid "On" +#: ../../include/permissions.php:867 ../../include/permissions.php:868 +msgid "Private" msgstr "" -#: ../../mod/admin.php:586 -#, php-format -msgid "Lock feature %s" +#: ../../include/permissions.php:868 +msgid "Community Forum" msgstr "" -#: ../../mod/admin.php:594 -msgid "Manage Additional Features" +#: ../../include/permissions.php:869 +msgid "Feed Republish" msgstr "" -#: ../../mod/admin.php:611 -msgid "No server found" +#: ../../include/permissions.php:870 +msgid "Special Purpose" msgstr "" -#: ../../mod/admin.php:618 ../../mod/admin.php:900 -msgid "ID" +#: ../../include/permissions.php:870 +msgid "Celebrity/Soapbox" msgstr "" -#: ../../mod/admin.php:618 -msgid "for channel" +#: ../../include/permissions.php:870 +msgid "Group Repository" msgstr "" -#: ../../mod/admin.php:618 -msgid "on server" +#: ../../include/permissions.php:871 +msgid "Custom/Expert Mode" msgstr "" -#: ../../mod/admin.php:618 ../../mod/connections.php:266 -msgid "Status" +#: ../../include/widgets.php:93 +msgid "System" msgstr "" -#: ../../mod/admin.php:620 -msgid "Server" +#: ../../include/widgets.php:96 +msgid "Create Personal App" msgstr "" -#: ../../mod/admin.php:637 -msgid "Update has been marked successful" +#: ../../include/widgets.php:97 +msgid "Edit Personal App" msgstr "" -#: ../../mod/admin.php:647 -#, php-format -msgid "Executing %s failed. Check system logs." +#: ../../include/widgets.php:139 ../../mod/suggest.php:54 +msgid "Ignore/Hide" msgstr "" -#: ../../mod/admin.php:650 -#, php-format -msgid "Update %s was successfully applied." +#: ../../include/widgets.php:144 +msgid "Suggestions" msgstr "" -#: ../../mod/admin.php:654 -#, php-format -msgid "Update %s did not return a status. Unknown if it succeeded." +#: ../../include/widgets.php:145 +msgid "See more..." msgstr "" -#: ../../mod/admin.php:657 +#: ../../include/widgets.php:166 #, php-format -msgid "Update function %s could not be found." +msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "" -#: ../../mod/admin.php:673 -msgid "No failed updates." +#: ../../include/widgets.php:172 +msgid "Add New Connection" msgstr "" -#: ../../mod/admin.php:677 -msgid "Failed Updates" +#: ../../include/widgets.php:173 +msgid "Enter channel address" msgstr "" -#: ../../mod/admin.php:679 -msgid "Mark success (if update was manually applied)" +#: ../../include/widgets.php:174 +msgid "Examples: bob@example.com, https://example.com/barbara" msgstr "" -#: ../../mod/admin.php:680 -msgid "Attempt to execute this update step automatically" +#: ../../include/widgets.php:190 +msgid "Notes" msgstr "" -#: ../../mod/admin.php:711 -msgid "Queue Statistics" +#: ../../include/widgets.php:266 +msgid "Remove term" msgstr "" -#: ../../mod/admin.php:712 -msgid "Total Entries" +#: ../../include/widgets.php:349 +msgid "Archives" msgstr "" -#: ../../mod/admin.php:713 -msgid "Priority" +#: ../../include/widgets.php:428 ../../mod/connedit.php:580 +msgid "Me" msgstr "" -#: ../../mod/admin.php:714 -msgid "Destination URL" +#: ../../include/widgets.php:429 ../../mod/connedit.php:581 +msgid "Family" msgstr "" -#: ../../mod/admin.php:715 -msgid "Mark hub permanently offline" +#: ../../include/widgets.php:431 ../../mod/connedit.php:583 +msgid "Acquaintances" msgstr "" -#: ../../mod/admin.php:716 -msgid "Empty queue for this hub" +#: ../../include/widgets.php:432 ../../mod/connections.php:88 +#: ../../mod/connections.php:103 ../../mod/connedit.php:584 +msgid "All" msgstr "" -#: ../../mod/admin.php:717 -msgid "Last known contact" +#: ../../include/widgets.php:451 +msgid "Refresh" msgstr "" -#: ../../mod/admin.php:753 -#, php-format -msgid "%s account blocked/unblocked" -msgid_plural "%s account blocked/unblocked" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/admin.php:761 -#, php-format -msgid "%s account deleted" -msgid_plural "%s accounts deleted" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/admin.php:797 -msgid "Account not found" +#: ../../include/widgets.php:485 +msgid "Account settings" msgstr "" -#: ../../mod/admin.php:809 -#, php-format -msgid "Account '%s' deleted" +#: ../../include/widgets.php:491 +msgid "Channel settings" msgstr "" -#: ../../mod/admin.php:817 -#, php-format -msgid "Account '%s' blocked" +#: ../../include/widgets.php:500 +msgid "Additional features" msgstr "" -#: ../../mod/admin.php:825 -#, php-format -msgid "Account '%s' unblocked" +#: ../../include/widgets.php:507 +msgid "Feature/Addon settings" msgstr "" -#: ../../mod/admin.php:887 ../../mod/admin.php:899 -msgid "Users" +#: ../../include/widgets.php:513 +msgid "Display settings" msgstr "" -#: ../../mod/admin.php:889 ../../mod/admin.php:1053 -msgid "select all" +#: ../../include/widgets.php:519 +msgid "Connected apps" msgstr "" -#: ../../mod/admin.php:890 -msgid "User registrations waiting for confirm" +#: ../../include/widgets.php:525 +msgid "Export channel" msgstr "" -#: ../../mod/admin.php:891 -msgid "Request date" +#: ../../include/widgets.php:533 ../../mod/connedit.php:692 +msgid "Connection Default Permissions" msgstr "" -#: ../../mod/admin.php:892 -msgid "No registrations." +#: ../../include/widgets.php:541 +msgid "Premium Channel Settings" msgstr "" -#: ../../mod/admin.php:893 ../../mod/connections.php:271 -msgid "Approve" +#: ../../include/widgets.php:571 +msgid "Private Mail Menu" msgstr "" -#: ../../mod/admin.php:894 -msgid "Deny" +#: ../../include/widgets.php:573 +msgid "Combined View" msgstr "" -#: ../../mod/admin.php:896 ../../mod/connedit.php:528 -msgid "Block" +#: ../../include/widgets.php:607 ../../include/widgets.php:619 +msgid "Conversations" msgstr "" -#: ../../mod/admin.php:897 ../../mod/connedit.php:528 -msgid "Unblock" +#: ../../include/widgets.php:611 +msgid "Received Messages" msgstr "" -#: ../../mod/admin.php:900 -msgid "Register date" +#: ../../include/widgets.php:615 +msgid "Sent Messages" msgstr "" -#: ../../mod/admin.php:900 -msgid "Last login" +#: ../../include/widgets.php:629 +msgid "No messages." msgstr "" -#: ../../mod/admin.php:900 -msgid "Expires" +#: ../../include/widgets.php:647 +msgid "Delete conversation" msgstr "" -#: ../../mod/admin.php:900 -msgid "Service Class" +#: ../../include/widgets.php:673 +msgid "Events Menu" msgstr "" -#: ../../mod/admin.php:902 -msgid "" -"Selected accounts will be deleted!\\n\\nEverything these accounts had posted " -"on this site will be permanently deleted!\\n\\nAre you sure?" +#: ../../include/widgets.php:674 +msgid "Day View" msgstr "" -#: ../../mod/admin.php:903 -msgid "" -"The account {0} will be deleted!\\n\\nEverything this account has posted on " -"this site will be permanently deleted!\\n\\nAre you sure?" +#: ../../include/widgets.php:675 +msgid "Week View" msgstr "" -#: ../../mod/admin.php:939 -#, php-format -msgid "%s channel censored/uncensored" -msgid_plural "%s channels censored/uncensored" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/admin.php:948 -#, php-format -msgid "%s channel code allowed/disallowed" -msgid_plural "%s channels code allowed/disallowed" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/admin.php:955 -#, php-format -msgid "%s channel deleted" -msgid_plural "%s channels deleted" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/admin.php:975 -msgid "Channel not found" +#: ../../include/widgets.php:676 +msgid "Month View" msgstr "" -#: ../../mod/admin.php:986 -#, php-format -msgid "Channel '%s' deleted" +#: ../../include/widgets.php:677 ../../mod/events.php:654 +msgid "Export" msgstr "" -#: ../../mod/admin.php:998 -#, php-format -msgid "Channel '%s' censored" +#: ../../include/widgets.php:678 ../../mod/events.php:657 +msgid "Import" msgstr "" -#: ../../mod/admin.php:998 -#, php-format -msgid "Channel '%s' uncensored" +#: ../../include/widgets.php:688 +msgid "Events Tools" msgstr "" -#: ../../mod/admin.php:1009 -#, php-format -msgid "Channel '%s' code allowed" +#: ../../include/widgets.php:689 +msgid "Export Calendar" msgstr "" -#: ../../mod/admin.php:1009 -#, php-format -msgid "Channel '%s' code disallowed" +#: ../../include/widgets.php:690 +msgid "Import Calendar" msgstr "" -#: ../../mod/admin.php:1055 -msgid "Censor" +#: ../../include/widgets.php:764 +msgid "Chat Rooms" msgstr "" -#: ../../mod/admin.php:1056 -msgid "Uncensor" +#: ../../include/widgets.php:784 +msgid "Bookmarked Chatrooms" msgstr "" -#: ../../mod/admin.php:1057 -msgid "Allow Code" +#: ../../include/widgets.php:804 +msgid "Suggested Chatrooms" msgstr "" -#: ../../mod/admin.php:1058 -msgid "Disallow Code" +#: ../../include/widgets.php:949 ../../include/widgets.php:1039 +msgid "photo/image" msgstr "" -#: ../../mod/admin.php:1060 -msgid "UID" +#: ../../include/widgets.php:1133 +msgid "Rating Tools" msgstr "" -#: ../../mod/admin.php:1060 ../../mod/profiles.php:457 -msgid "Address" +#: ../../include/widgets.php:1137 ../../include/widgets.php:1139 +msgid "Rate Me" msgstr "" -#: ../../mod/admin.php:1062 -msgid "" -"Selected channels will be deleted!\\n\\nEverything that was posted in these " -"channels on this site will be permanently deleted!\\n\\nAre you sure?" +#: ../../include/widgets.php:1142 +msgid "View Ratings" msgstr "" -#: ../../mod/admin.php:1063 -msgid "" -"The channel {0} will be deleted!\\n\\nEverything that was posted in this " -"channel on this site will be permanently deleted!\\n\\nAre you sure?" +#: ../../include/widgets.php:1153 +msgid "Public Hubs" msgstr "" -#: ../../mod/admin.php:1120 -#, php-format -msgid "Plugin %s disabled." +#: ../../include/widgets.php:1201 +msgid "Forums" msgstr "" -#: ../../mod/admin.php:1124 -#, php-format -msgid "Plugin %s enabled." +#: ../../include/widgets.php:1230 +msgid "Tasks" msgstr "" -#: ../../mod/admin.php:1134 ../../mod/admin.php:1360 -msgid "Disable" +#: ../../include/widgets.php:1239 +msgid "Documentation" msgstr "" -#: ../../mod/admin.php:1137 ../../mod/admin.php:1362 -msgid "Enable" +#: ../../include/widgets.php:1241 +msgid "Project/Site Information" msgstr "" -#: ../../mod/admin.php:1167 ../../mod/admin.php:1389 -msgid "Toggle" +#: ../../include/widgets.php:1242 +msgid "For Members" msgstr "" -#: ../../mod/admin.php:1175 ../../mod/admin.php:1399 -msgid "Author: " +#: ../../include/widgets.php:1243 +msgid "For Administrators" msgstr "" -#: ../../mod/admin.php:1176 ../../mod/admin.php:1400 -msgid "Maintainer: " +#: ../../include/widgets.php:1244 +msgid "For Developers" msgstr "" -#: ../../mod/admin.php:1177 -msgid "Minimum project version: " +#: ../../include/widgets.php:1269 ../../mod/admin.php:456 +msgid "Site" msgstr "" -#: ../../mod/admin.php:1178 -msgid "Maximum project version: " +#: ../../include/widgets.php:1270 +msgid "Accounts" msgstr "" -#: ../../mod/admin.php:1179 -msgid "Minimum PHP version: " +#: ../../include/widgets.php:1271 ../../mod/admin.php:1149 +msgid "Channels" msgstr "" -#: ../../mod/admin.php:1181 ../../mod/admin.php:1232 -msgid "Disabled - version incompatibility" +#: ../../include/widgets.php:1272 ../../mod/admin.php:710 +msgid "Security" msgstr "" +#: ../../include/widgets.php:1274 ../../mod/admin.php:1264 #: ../../mod/admin.php:1325 -msgid "No themes found." -msgstr "" - -#: ../../mod/admin.php:1381 -msgid "Screenshot" -msgstr "" - -#: ../../mod/admin.php:1427 -msgid "[Experimental]" -msgstr "" - -#: ../../mod/admin.php:1428 -msgid "[Unsupported]" -msgstr "" - -#: ../../mod/admin.php:1452 -msgid "Log settings updated." -msgstr "" - -#: ../../mod/admin.php:1509 -msgid "Clear" +msgid "Plugins" msgstr "" -#: ../../mod/admin.php:1515 -msgid "Debugging" +#: ../../include/widgets.php:1275 ../../mod/admin.php:1486 +#: ../../mod/admin.php:1520 +msgid "Themes" msgstr "" -#: ../../mod/admin.php:1516 -msgid "Log file" +#: ../../include/widgets.php:1276 +msgid "Inspect queue" msgstr "" -#: ../../mod/admin.php:1516 -msgid "" -"Must be writable by web server. Relative to your Red top-level directory." +#: ../../include/widgets.php:1277 +msgid "Profile Config" msgstr "" -#: ../../mod/admin.php:1517 -msgid "Log level" +#: ../../include/widgets.php:1278 +msgid "DB updates" msgstr "" -#: ../../mod/admin.php:1563 -msgid "New Profile Field" +#: ../../include/widgets.php:1296 ../../include/widgets.php:1302 +#: ../../mod/admin.php:1605 +msgid "Logs" msgstr "" -#: ../../mod/admin.php:1564 ../../mod/admin.php:1584 -msgid "Field nickname" +#: ../../include/widgets.php:1301 +msgid "Plugin Features" msgstr "" -#: ../../mod/admin.php:1564 ../../mod/admin.php:1584 -msgid "System name of field" +#: ../../include/widgets.php:1303 +msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:1565 ../../mod/admin.php:1585 -msgid "Input type" +#: ../../include/widgets.php:1381 ../../mod/photos.php:752 +#: ../../mod/photos.php:1292 +msgid "View Photo" msgstr "" -#: ../../mod/admin.php:1566 ../../mod/admin.php:1586 -msgid "Field Name" +#: ../../include/widgets.php:1398 ../../mod/photos.php:783 +msgid "Edit Album" msgstr "" -#: ../../mod/admin.php:1566 ../../mod/admin.php:1586 -msgid "Label on profile pages" +#: ../../index.php:242 ../../mod/help.php:217 +msgid "Not Found" msgstr "" -#: ../../mod/admin.php:1567 ../../mod/admin.php:1587 -msgid "Help text" +#: ../../index.php:245 ../../mod/block.php:75 ../../mod/display.php:110 +#: ../../mod/help.php:220 ../../mod/page.php:89 +msgid "Page not found." msgstr "" -#: ../../mod/admin.php:1567 ../../mod/admin.php:1587 -msgid "Additional info (optional)" +#: ../../mod/achievements.php:34 +msgid "Some blurb about what to do when you're new here" msgstr "" -#: ../../mod/admin.php:1577 -msgid "Field definition not found" +#: ../../mod/acl.php:222 +msgid "network" msgstr "" -#: ../../mod/admin.php:1583 -msgid "Edit Profile Field" +#: ../../mod/acl.php:232 +msgid "RSS" msgstr "" #: ../../mod/api.php:74 ../../mod/api.php:98 @@ -5149,7 +4355,6 @@ msgid "Invalid item." msgstr "" #: ../../mod/block.php:39 ../../mod/page.php:52 ../../mod/wall_upload.php:29 -#: ../../mod/zcard.php:19 msgid "Channel not found." msgstr "" @@ -5366,6 +4571,10 @@ msgstr "" msgid "Network" msgstr "" +#: ../../mod/connections.php:266 ../../mod/admin.php:668 +msgid "Status" +msgstr "" + #: ../../mod/connections.php:268 msgid "Connected" msgstr "" @@ -5374,6 +4583,10 @@ msgstr "" msgid "Approve connection" msgstr "" +#: ../../mod/connections.php:271 ../../mod/admin.php:991 +msgid "Approve" +msgstr "" + #: ../../mod/connections.php:272 msgid "Ignore connection" msgstr "" @@ -5454,6 +4667,14 @@ msgstr "" msgid "View recent posts and comments" msgstr "" +#: ../../mod/connedit.php:528 ../../mod/admin.php:995 +msgid "Unblock" +msgstr "" + +#: ../../mod/connedit.php:528 ../../mod/admin.php:994 +msgid "Block" +msgstr "" + #: ../../mod/connedit.php:531 msgid "Block (or Unblock) all communications with this connection" msgstr "" @@ -5975,12 +5196,12 @@ msgstr "" msgid "Create Event" msgstr "" -#: ../../mod/events.php:652 ../../mod/events.php:659 ../../mod/photos.php:902 +#: ../../mod/events.php:652 ../../mod/events.php:659 ../../mod/photos.php:908 msgid "Previous" msgstr "" -#: ../../mod/events.php:653 ../../mod/events.php:660 ../../mod/photos.php:911 -#: ../../mod/setup.php:285 +#: ../../mod/events.php:653 ../../mod/events.php:660 ../../mod/photos.php:917 +#: ../../mod/setup.php:286 msgid "Next" msgstr "" @@ -6121,15 +5342,15 @@ msgstr "" msgid "Click on a channel to add or remove." msgstr "" -#: ../../mod/help.php:148 +#: ../../mod/help.php:149 msgid "Documentation Search" msgstr "" -#: ../../mod/help.php:186 ../../mod/help.php:192 ../../mod/help.php:198 +#: ../../mod/help.php:190 ../../mod/help.php:196 ../../mod/help.php:202 msgid "Help:" msgstr "" -#: ../../mod/help.php:239 +#: ../../mod/help.php:243 msgid "$Projectname Documentation" msgstr "" @@ -7098,7 +6319,7 @@ msgstr "" msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:171 ../../mod/photos.php:1006 +#: ../../mod/photos.php:171 ../../mod/photos.php:1012 msgid "Delete Photo" msgstr "" @@ -7148,113 +6369,949 @@ msgstr "" msgid "Album name could not be decoded" msgstr "" -#: ../../mod/photos.php:699 ../../mod/photos.php:1233 -#: ../../mod/photos.php:1250 +#: ../../mod/photos.php:703 ../../mod/photos.php:1242 +#: ../../mod/photos.php:1259 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:722 +#: ../../mod/photos.php:726 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:724 +#: ../../mod/photos.php:728 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:824 +#: ../../mod/photos.php:830 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:826 +#: ../../mod/photos.php:832 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:884 +#: ../../mod/photos.php:890 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:891 +#: ../../mod/photos.php:897 msgid "Private Photo" msgstr "" -#: ../../mod/photos.php:906 +#: ../../mod/photos.php:912 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:951 ../../mod/tagrm.php:133 +#: ../../mod/photos.php:957 ../../mod/tagrm.php:133 msgid "Remove" msgstr "" -#: ../../mod/photos.php:985 +#: ../../mod/photos.php:991 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:987 +#: ../../mod/photos.php:993 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:988 +#: ../../mod/photos.php:994 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:991 +#: ../../mod/photos.php:997 msgid "Enter a new album name" msgstr "" -#: ../../mod/photos.php:992 +#: ../../mod/photos.php:998 msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../mod/photos.php:995 +#: ../../mod/photos.php:1001 msgid "Caption" msgstr "" -#: ../../mod/photos.php:997 +#: ../../mod/photos.php:1003 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1001 +#: ../../mod/photos.php:1007 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../mod/photos.php:1004 +#: ../../mod/photos.php:1010 msgid "Flag as adult in album view" msgstr "" -#: ../../mod/photos.php:1196 +#: ../../mod/photos.php:1202 msgid "In This Photo:" msgstr "" -#: ../../mod/photos.php:1201 +#: ../../mod/photos.php:1207 msgid "Map" msgstr "" -#: ../../mod/photos.php:1289 +#: ../../mod/photos.php:1298 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1300 ../../mod/photos.php:1313 -#: ../../mod/photos.php:1314 +#: ../../mod/photos.php:1309 ../../mod/photos.php:1322 +#: ../../mod/photos.php:1323 msgid "Recent Photos" msgstr "" -#: ../../mod/poke.php:164 -msgid "Poke/Prod" +#: ../../mod/admin.php:54 +msgid "Theme settings updated." +msgstr "" + +#: ../../mod/admin.php:174 +msgid "# Accounts" +msgstr "" + +#: ../../mod/admin.php:175 +msgid "# blocked accounts" +msgstr "" + +#: ../../mod/admin.php:176 +msgid "# expired accounts" +msgstr "" + +#: ../../mod/admin.php:177 +msgid "# expiring accounts" +msgstr "" + +#: ../../mod/admin.php:188 +msgid "# Channels" +msgstr "" + +#: ../../mod/admin.php:189 +msgid "# primary" +msgstr "" + +#: ../../mod/admin.php:190 +msgid "# clones" +msgstr "" + +#: ../../mod/admin.php:196 +msgid "Message queues" +msgstr "" + +#: ../../mod/admin.php:212 ../../mod/admin.php:455 ../../mod/admin.php:669 +#: ../../mod/admin.php:709 ../../mod/admin.php:984 ../../mod/admin.php:1148 +#: ../../mod/admin.php:1263 ../../mod/admin.php:1324 ../../mod/admin.php:1485 +#: ../../mod/admin.php:1519 ../../mod/admin.php:1604 +msgid "Administration" +msgstr "" + +#: ../../mod/admin.php:213 +msgid "Summary" +msgstr "" + +#: ../../mod/admin.php:216 +msgid "Registered accounts" +msgstr "" + +#: ../../mod/admin.php:217 ../../mod/admin.php:673 +msgid "Pending registrations" +msgstr "" + +#: ../../mod/admin.php:218 +msgid "Registered channels" +msgstr "" + +#: ../../mod/admin.php:219 ../../mod/admin.php:674 +msgid "Active plugins" +msgstr "" + +#: ../../mod/admin.php:220 +msgid "Version" +msgstr "" + +#: ../../mod/admin.php:339 +msgid "Site settings updated." +msgstr "" + +#: ../../mod/admin.php:376 ../../mod/settings.php:793 +msgid "mobile" +msgstr "" + +#: ../../mod/admin.php:378 +msgid "experimental" +msgstr "" + +#: ../../mod/admin.php:380 +msgid "unsupported" +msgstr "" + +#: ../../mod/admin.php:426 +msgid "Yes - with approval" +msgstr "" + +#: ../../mod/admin.php:432 +msgid "My site is not a public server" +msgstr "" + +#: ../../mod/admin.php:433 +msgid "My site has paid access only" +msgstr "" + +#: ../../mod/admin.php:434 +msgid "My site has free access only" +msgstr "" + +#: ../../mod/admin.php:435 +msgid "My site offers free accounts with optional paid upgrades" +msgstr "" + +#: ../../mod/admin.php:458 ../../mod/register.php:237 +msgid "Registration" +msgstr "" + +#: ../../mod/admin.php:459 +msgid "File upload" +msgstr "" + +#: ../../mod/admin.php:460 +msgid "Policies" +msgstr "" + +#: ../../mod/admin.php:465 +msgid "Site name" +msgstr "" + +#: ../../mod/admin.php:466 +msgid "Banner/Logo" +msgstr "" + +#: ../../mod/admin.php:467 +msgid "Administrator Information" +msgstr "" + +#: ../../mod/admin.php:467 +msgid "" +"Contact information for site administrators. Displayed on siteinfo page. " +"BBCode can be used here" +msgstr "" + +#: ../../mod/admin.php:468 +msgid "System language" +msgstr "" + +#: ../../mod/admin.php:469 +msgid "System theme" +msgstr "" + +#: ../../mod/admin.php:469 +msgid "" +"Default system theme - may be over-ridden by user profiles - <a href='#' " +"id='cnftheme'>change theme settings</a>" +msgstr "" + +#: ../../mod/admin.php:470 +msgid "Mobile system theme" +msgstr "" + +#: ../../mod/admin.php:470 +msgid "Theme for mobile devices" +msgstr "" + +#: ../../mod/admin.php:472 +msgid "Allow Feeds as Connections" +msgstr "" + +#: ../../mod/admin.php:472 +msgid "(Heavy system resource usage)" +msgstr "" + +#: ../../mod/admin.php:473 +msgid "Maximum image size" +msgstr "" + +#: ../../mod/admin.php:473 +msgid "" +"Maximum size in bytes of uploaded images. Default is 0, which means no " +"limits." +msgstr "" + +#: ../../mod/admin.php:474 +msgid "Does this site allow new member registration?" +msgstr "" + +#: ../../mod/admin.php:475 +msgid "Invitation only" +msgstr "" + +#: ../../mod/admin.php:475 +msgid "" +"Only allow new member registrations with an invitation code. Above register " +"policy must be set to Yes." +msgstr "" + +#: ../../mod/admin.php:476 +msgid "Which best describes the types of account offered by this hub?" +msgstr "" + +#: ../../mod/admin.php:477 +msgid "Register text" +msgstr "" + +#: ../../mod/admin.php:477 +msgid "Will be displayed prominently on the registration page." +msgstr "" + +#: ../../mod/admin.php:478 +msgid "Site homepage to show visitors (default: login box)" +msgstr "" + +#: ../../mod/admin.php:478 +msgid "" +"example: 'public' to show public stream, 'page/sys/home' to show a system " +"webpage called 'home' or 'include:home.html' to include a file." +msgstr "" + +#: ../../mod/admin.php:479 +msgid "Preserve site homepage URL" +msgstr "" + +#: ../../mod/admin.php:479 +msgid "" +"Present the site homepage in a frame at the original location instead of " +"redirecting" +msgstr "" + +#: ../../mod/admin.php:480 +msgid "Accounts abandoned after x days" +msgstr "" + +#: ../../mod/admin.php:480 +msgid "" +"Will not waste system resources polling external sites for abandonded " +"accounts. Enter 0 for no time limit." +msgstr "" + +#: ../../mod/admin.php:481 +msgid "Allowed friend domains" +msgstr "" + +#: ../../mod/admin.php:481 +msgid "" +"Comma separated list of domains which are allowed to establish friendships " +"with this site. Wildcards are accepted. Empty to allow any domains" +msgstr "" + +#: ../../mod/admin.php:482 +msgid "Allowed email domains" +msgstr "" + +#: ../../mod/admin.php:482 +msgid "" +"Comma separated list of domains which are allowed in email addresses for " +"registrations to this site. Wildcards are accepted. Empty to allow any " +"domains" +msgstr "" + +#: ../../mod/admin.php:483 +msgid "Not allowed email domains" +msgstr "" + +#: ../../mod/admin.php:483 +msgid "" +"Comma separated list of domains which are not allowed in email addresses for " +"registrations to this site. Wildcards are accepted. Empty to allow any " +"domains, unless allowed domains have been defined." +msgstr "" + +#: ../../mod/admin.php:484 +msgid "Verify Email Addresses" +msgstr "" + +#: ../../mod/admin.php:484 +msgid "" +"Check to verify email addresses used in account registration (recommended)." +msgstr "" + +#: ../../mod/admin.php:485 +msgid "Force publish" +msgstr "" + +#: ../../mod/admin.php:485 +msgid "" +"Check to force all profiles on this site to be listed in the site directory." +msgstr "" + +#: ../../mod/admin.php:486 +msgid "Import Public Streams" +msgstr "" + +#: ../../mod/admin.php:486 +msgid "" +"Import and allow access to public content pulled from other sites. Warning: " +"this content is unmoderated." +msgstr "" + +#: ../../mod/admin.php:487 +msgid "login on Homepage" +msgstr "" + +#: ../../mod/admin.php:487 +msgid "" +"Present a login box to visitors on the home page if no other content has " +"been configured." +msgstr "" + +#: ../../mod/admin.php:489 +msgid "Directory Server URL" +msgstr "" + +#: ../../mod/admin.php:489 +msgid "Default directory server" +msgstr "" + +#: ../../mod/admin.php:491 +msgid "Proxy user" +msgstr "" + +#: ../../mod/admin.php:492 +msgid "Proxy URL" +msgstr "" + +#: ../../mod/admin.php:493 +msgid "Network timeout" +msgstr "" + +#: ../../mod/admin.php:493 +msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +msgstr "" + +#: ../../mod/admin.php:494 +msgid "Delivery interval" +msgstr "" + +#: ../../mod/admin.php:494 +msgid "" +"Delay background delivery processes by this many seconds to reduce system " +"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " +"for large dedicated servers." +msgstr "" + +#: ../../mod/admin.php:495 +msgid "Deliveries per process" +msgstr "" + +#: ../../mod/admin.php:495 +msgid "" +"Number of deliveries to attempt in a single operating system process. Adjust " +"if necessary to tune system performance. Recommend: 1-5." +msgstr "" + +#: ../../mod/admin.php:496 +msgid "Poll interval" +msgstr "" + +#: ../../mod/admin.php:496 +msgid "" +"Delay background polling processes by this many seconds to reduce system " +"load. If 0, use delivery interval." +msgstr "" + +#: ../../mod/admin.php:497 +msgid "Maximum Load Average" +msgstr "" + +#: ../../mod/admin.php:497 +msgid "" +"Maximum system load before delivery and poll processes are deferred - " +"default 50." +msgstr "" + +#: ../../mod/admin.php:498 +msgid "Expiration period in days for imported (grid/network) content" +msgstr "" + +#: ../../mod/admin.php:498 +msgid "0 for no expiration of imported content" +msgstr "" + +#: ../../mod/admin.php:635 ../../mod/admin.php:636 ../../mod/settings.php:717 +msgid "Off" +msgstr "" + +#: ../../mod/admin.php:635 ../../mod/admin.php:636 ../../mod/settings.php:717 +msgid "On" +msgstr "" + +#: ../../mod/admin.php:636 +#, php-format +msgid "Lock feature %s" +msgstr "" + +#: ../../mod/admin.php:644 +msgid "Manage Additional Features" +msgstr "" + +#: ../../mod/admin.php:661 +msgid "No server found" +msgstr "" + +#: ../../mod/admin.php:668 ../../mod/admin.php:998 +msgid "ID" +msgstr "" + +#: ../../mod/admin.php:668 +msgid "for channel" +msgstr "" + +#: ../../mod/admin.php:668 +msgid "on server" +msgstr "" + +#: ../../mod/admin.php:670 +msgid "Server" +msgstr "" + +#: ../../mod/admin.php:712 +msgid "Block public" +msgstr "" + +#: ../../mod/admin.php:712 +msgid "" +"Check to block public access to all otherwise public personal pages on this " +"site unless you are currently authenticated." +msgstr "" + +#: ../../mod/admin.php:713 +msgid "Allow communications only from these sites" +msgstr "" + +#: ../../mod/admin.php:713 +msgid "" +"One site per line. Leave empty to allow communication from anywhere by " +"default" +msgstr "" + +#: ../../mod/admin.php:714 +msgid "Block communications from these sites" +msgstr "" + +#: ../../mod/admin.php:715 +msgid "Allow communications only from these channels" +msgstr "" + +#: ../../mod/admin.php:715 +msgid "" +"One channel (hash) per line. Leave empty to allow from any channel by default" +msgstr "" + +#: ../../mod/admin.php:716 +msgid "Block communications from these channels" +msgstr "" + +#: ../../mod/admin.php:717 +msgid "Allow embedded HTML content only from these domains" +msgstr "" + +#: ../../mod/admin.php:717 +msgid "One site per line. Leave empty to allow from any site by default" +msgstr "" + +#: ../../mod/admin.php:718 +msgid "Block embedded HTML from these domains" +msgstr "" + +#: ../../mod/admin.php:720 +msgid "Cooperative embed security" +msgstr "" + +#: ../../mod/admin.php:720 +msgid "Enable to share embed security with other compatible sites/hubs" +msgstr "" + +#: ../../mod/admin.php:735 +msgid "Update has been marked successful" +msgstr "" + +#: ../../mod/admin.php:745 +#, php-format +msgid "Executing %s failed. Check system logs." +msgstr "" + +#: ../../mod/admin.php:748 +#, php-format +msgid "Update %s was successfully applied." +msgstr "" + +#: ../../mod/admin.php:752 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "" + +#: ../../mod/admin.php:755 +#, php-format +msgid "Update function %s could not be found." +msgstr "" + +#: ../../mod/admin.php:771 +msgid "No failed updates." +msgstr "" + +#: ../../mod/admin.php:775 +msgid "Failed Updates" +msgstr "" + +#: ../../mod/admin.php:777 +msgid "Mark success (if update was manually applied)" +msgstr "" + +#: ../../mod/admin.php:778 +msgid "Attempt to execute this update step automatically" +msgstr "" + +#: ../../mod/admin.php:809 +msgid "Queue Statistics" +msgstr "" + +#: ../../mod/admin.php:810 +msgid "Total Entries" +msgstr "" + +#: ../../mod/admin.php:811 +msgid "Priority" +msgstr "" + +#: ../../mod/admin.php:812 +msgid "Destination URL" +msgstr "" + +#: ../../mod/admin.php:813 +msgid "Mark hub permanently offline" +msgstr "" + +#: ../../mod/admin.php:814 +msgid "Empty queue for this hub" +msgstr "" + +#: ../../mod/admin.php:815 +msgid "Last known contact" +msgstr "" + +#: ../../mod/admin.php:851 +#, php-format +msgid "%s account blocked/unblocked" +msgid_plural "%s account blocked/unblocked" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/admin.php:859 +#, php-format +msgid "%s account deleted" +msgid_plural "%s accounts deleted" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/admin.php:895 +msgid "Account not found" +msgstr "" + +#: ../../mod/admin.php:907 +#, php-format +msgid "Account '%s' deleted" +msgstr "" + +#: ../../mod/admin.php:915 +#, php-format +msgid "Account '%s' blocked" +msgstr "" + +#: ../../mod/admin.php:923 +#, php-format +msgid "Account '%s' unblocked" +msgstr "" + +#: ../../mod/admin.php:985 ../../mod/admin.php:997 +msgid "Users" +msgstr "" + +#: ../../mod/admin.php:987 ../../mod/admin.php:1151 +msgid "select all" +msgstr "" + +#: ../../mod/admin.php:988 +msgid "User registrations waiting for confirm" +msgstr "" + +#: ../../mod/admin.php:989 +msgid "Request date" +msgstr "" + +#: ../../mod/admin.php:990 +msgid "No registrations." +msgstr "" + +#: ../../mod/admin.php:992 +msgid "Deny" +msgstr "" + +#: ../../mod/admin.php:998 +msgid "Register date" +msgstr "" + +#: ../../mod/admin.php:998 +msgid "Last login" +msgstr "" + +#: ../../mod/admin.php:998 +msgid "Expires" +msgstr "" + +#: ../../mod/admin.php:998 +msgid "Service Class" +msgstr "" + +#: ../../mod/admin.php:1000 +msgid "" +"Selected accounts will be deleted!\\n\\nEverything these accounts had posted " +"on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: ../../mod/admin.php:1001 +msgid "" +"The account {0} will be deleted!\\n\\nEverything this account has posted on " +"this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: ../../mod/admin.php:1037 +#, php-format +msgid "%s channel censored/uncensored" +msgid_plural "%s channels censored/uncensored" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/admin.php:1046 +#, php-format +msgid "%s channel code allowed/disallowed" +msgid_plural "%s channels code allowed/disallowed" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/admin.php:1053 +#, php-format +msgid "%s channel deleted" +msgid_plural "%s channels deleted" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/admin.php:1073 +msgid "Channel not found" +msgstr "" + +#: ../../mod/admin.php:1084 +#, php-format +msgid "Channel '%s' deleted" +msgstr "" + +#: ../../mod/admin.php:1096 +#, php-format +msgid "Channel '%s' censored" +msgstr "" + +#: ../../mod/admin.php:1096 +#, php-format +msgid "Channel '%s' uncensored" +msgstr "" + +#: ../../mod/admin.php:1107 +#, php-format +msgid "Channel '%s' code allowed" +msgstr "" + +#: ../../mod/admin.php:1107 +#, php-format +msgid "Channel '%s' code disallowed" +msgstr "" + +#: ../../mod/admin.php:1153 +msgid "Censor" +msgstr "" + +#: ../../mod/admin.php:1154 +msgid "Uncensor" +msgstr "" + +#: ../../mod/admin.php:1155 +msgid "Allow Code" +msgstr "" + +#: ../../mod/admin.php:1156 +msgid "Disallow Code" +msgstr "" + +#: ../../mod/admin.php:1158 +msgid "UID" +msgstr "" + +#: ../../mod/admin.php:1158 ../../mod/profiles.php:457 +msgid "Address" +msgstr "" + +#: ../../mod/admin.php:1160 +msgid "" +"Selected channels will be deleted!\\n\\nEverything that was posted in these " +"channels on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: ../../mod/admin.php:1161 +msgid "" +"The channel {0} will be deleted!\\n\\nEverything that was posted in this " +"channel on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: ../../mod/admin.php:1218 +#, php-format +msgid "Plugin %s disabled." +msgstr "" + +#: ../../mod/admin.php:1222 +#, php-format +msgid "Plugin %s enabled." +msgstr "" + +#: ../../mod/admin.php:1232 ../../mod/admin.php:1458 +msgid "Disable" +msgstr "" + +#: ../../mod/admin.php:1235 ../../mod/admin.php:1460 +msgid "Enable" +msgstr "" + +#: ../../mod/admin.php:1265 ../../mod/admin.php:1487 +msgid "Toggle" +msgstr "" + +#: ../../mod/admin.php:1273 ../../mod/admin.php:1497 +msgid "Author: " +msgstr "" + +#: ../../mod/admin.php:1274 ../../mod/admin.php:1498 +msgid "Maintainer: " +msgstr "" + +#: ../../mod/admin.php:1275 +msgid "Minimum project version: " +msgstr "" + +#: ../../mod/admin.php:1276 +msgid "Maximum project version: " +msgstr "" + +#: ../../mod/admin.php:1277 +msgid "Minimum PHP version: " +msgstr "" + +#: ../../mod/admin.php:1279 ../../mod/admin.php:1330 +msgid "Disabled - version incompatibility" +msgstr "" + +#: ../../mod/admin.php:1423 +msgid "No themes found." +msgstr "" + +#: ../../mod/admin.php:1479 +msgid "Screenshot" +msgstr "" + +#: ../../mod/admin.php:1525 +msgid "[Experimental]" +msgstr "" + +#: ../../mod/admin.php:1526 +msgid "[Unsupported]" +msgstr "" + +#: ../../mod/admin.php:1550 +msgid "Log settings updated." +msgstr "" + +#: ../../mod/admin.php:1607 +msgid "Clear" +msgstr "" + +#: ../../mod/admin.php:1613 +msgid "Debugging" +msgstr "" + +#: ../../mod/admin.php:1614 +msgid "Log file" +msgstr "" + +#: ../../mod/admin.php:1614 +msgid "" +"Must be writable by web server. Relative to your Red top-level directory." +msgstr "" + +#: ../../mod/admin.php:1615 +msgid "Log level" +msgstr "" + +#: ../../mod/admin.php:1661 +msgid "New Profile Field" +msgstr "" + +#: ../../mod/admin.php:1662 ../../mod/admin.php:1682 +msgid "Field nickname" +msgstr "" + +#: ../../mod/admin.php:1662 ../../mod/admin.php:1682 +msgid "System name of field" +msgstr "" + +#: ../../mod/admin.php:1663 ../../mod/admin.php:1683 +msgid "Input type" +msgstr "" + +#: ../../mod/admin.php:1664 ../../mod/admin.php:1684 +msgid "Field Name" +msgstr "" + +#: ../../mod/admin.php:1664 ../../mod/admin.php:1684 +msgid "Label on profile pages" +msgstr "" + +#: ../../mod/admin.php:1665 ../../mod/admin.php:1685 +msgid "Help text" +msgstr "" + +#: ../../mod/admin.php:1665 ../../mod/admin.php:1685 +msgid "Additional info (optional)" +msgstr "" + +#: ../../mod/admin.php:1675 +msgid "Field definition not found" +msgstr "" + +#: ../../mod/admin.php:1681 +msgid "Edit Profile Field" msgstr "" #: ../../mod/poke.php:165 -msgid "poke, prod or do other things to somebody" +msgid "Poke somebody" +msgstr "" + +#: ../../mod/poke.php:168 +msgid "Poke/Prod" msgstr "" -#: ../../mod/poke.php:166 +#: ../../mod/poke.php:169 +msgid "Poke, prod or do other things to somebody" +msgstr "" + +#: ../../mod/poke.php:176 msgid "Recipient" msgstr "" -#: ../../mod/poke.php:167 +#: ../../mod/poke.php:177 msgid "Choose what you wish to do to recipient" msgstr "" -#: ../../mod/poke.php:170 +#: ../../mod/poke.php:180 ../../mod/poke.php:181 msgid "Make this post private" msgstr "" @@ -8473,408 +8530,408 @@ msgstr "" msgid "Start calendar week on monday" msgstr "" -#: ../../mod/setup.php:191 +#: ../../mod/setup.php:192 msgid "$Projectname Server - Setup" msgstr "" -#: ../../mod/setup.php:195 +#: ../../mod/setup.php:196 msgid "Could not connect to database." msgstr "" -#: ../../mod/setup.php:199 +#: ../../mod/setup.php:200 msgid "" "Could not connect to specified site URL. Possible SSL certificate or DNS " "issue." msgstr "" -#: ../../mod/setup.php:206 +#: ../../mod/setup.php:207 msgid "Could not create table." msgstr "" -#: ../../mod/setup.php:211 +#: ../../mod/setup.php:212 msgid "Your site database has been installed." msgstr "" -#: ../../mod/setup.php:215 +#: ../../mod/setup.php:216 msgid "" "You may need to import the file \"install/schema_xxx.sql\" manually using a " "database client." msgstr "" -#: ../../mod/setup.php:216 ../../mod/setup.php:284 ../../mod/setup.php:734 +#: ../../mod/setup.php:217 ../../mod/setup.php:285 ../../mod/setup.php:735 msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" -#: ../../mod/setup.php:281 +#: ../../mod/setup.php:282 msgid "System check" msgstr "" -#: ../../mod/setup.php:286 +#: ../../mod/setup.php:287 msgid "Check again" msgstr "" -#: ../../mod/setup.php:308 +#: ../../mod/setup.php:309 msgid "Database connection" msgstr "" -#: ../../mod/setup.php:309 +#: ../../mod/setup.php:310 msgid "" "In order to install $Projectname we need to know how to connect to your " "database." msgstr "" -#: ../../mod/setup.php:310 +#: ../../mod/setup.php:311 msgid "" "Please contact your hosting provider or site administrator if you have " "questions about these settings." msgstr "" -#: ../../mod/setup.php:311 +#: ../../mod/setup.php:312 msgid "" "The database you specify below should already exist. If it does not, please " "create it before continuing." msgstr "" -#: ../../mod/setup.php:315 +#: ../../mod/setup.php:316 msgid "Database Server Name" msgstr "" -#: ../../mod/setup.php:315 +#: ../../mod/setup.php:316 msgid "Default is 127.0.0.1" msgstr "" -#: ../../mod/setup.php:316 +#: ../../mod/setup.php:317 msgid "Database Port" msgstr "" -#: ../../mod/setup.php:316 +#: ../../mod/setup.php:317 msgid "Communication port number - use 0 for default" msgstr "" -#: ../../mod/setup.php:317 +#: ../../mod/setup.php:318 msgid "Database Login Name" msgstr "" -#: ../../mod/setup.php:318 +#: ../../mod/setup.php:319 msgid "Database Login Password" msgstr "" -#: ../../mod/setup.php:319 +#: ../../mod/setup.php:320 msgid "Database Name" msgstr "" -#: ../../mod/setup.php:320 +#: ../../mod/setup.php:321 msgid "Database Type" msgstr "" -#: ../../mod/setup.php:322 ../../mod/setup.php:363 +#: ../../mod/setup.php:323 ../../mod/setup.php:364 msgid "Site administrator email address" msgstr "" -#: ../../mod/setup.php:322 ../../mod/setup.php:363 +#: ../../mod/setup.php:323 ../../mod/setup.php:364 msgid "" "Your account email address must match this in order to use the web admin " "panel." msgstr "" -#: ../../mod/setup.php:323 ../../mod/setup.php:365 +#: ../../mod/setup.php:324 ../../mod/setup.php:366 msgid "Website URL" msgstr "" -#: ../../mod/setup.php:323 ../../mod/setup.php:365 +#: ../../mod/setup.php:324 ../../mod/setup.php:366 msgid "Please use SSL (https) URL if available." msgstr "" -#: ../../mod/setup.php:325 ../../mod/setup.php:367 +#: ../../mod/setup.php:326 ../../mod/setup.php:368 msgid "Please select a default timezone for your website" msgstr "" -#: ../../mod/setup.php:352 +#: ../../mod/setup.php:353 msgid "Site settings" msgstr "" -#: ../../mod/setup.php:417 +#: ../../mod/setup.php:418 msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../mod/setup.php:418 +#: ../../mod/setup.php:419 msgid "" "If you don't have a command line version of PHP installed on server, you " "will not be able to run background polling via cron." msgstr "" -#: ../../mod/setup.php:422 +#: ../../mod/setup.php:423 msgid "PHP executable path" msgstr "" -#: ../../mod/setup.php:422 +#: ../../mod/setup.php:423 msgid "" "Enter full path to php executable. You can leave this blank to continue the " "installation." msgstr "" -#: ../../mod/setup.php:427 +#: ../../mod/setup.php:428 msgid "Command line PHP" msgstr "" -#: ../../mod/setup.php:436 +#: ../../mod/setup.php:437 msgid "" "The command line version of PHP on your system does not have " "\"register_argc_argv\" enabled." msgstr "" -#: ../../mod/setup.php:437 +#: ../../mod/setup.php:438 msgid "This is required for message delivery to work." msgstr "" -#: ../../mod/setup.php:440 +#: ../../mod/setup.php:441 msgid "PHP register_argc_argv" msgstr "" -#: ../../mod/setup.php:458 +#: ../../mod/setup.php:459 #, php-format msgid "" "Your max allowed total upload size is set to %s. Maximum size of one file to " "upload is set to %s. You are allowed to upload up to %d files at once." msgstr "" -#: ../../mod/setup.php:463 +#: ../../mod/setup.php:464 msgid "You can adjust these settings in the servers php.ini." msgstr "" -#: ../../mod/setup.php:465 +#: ../../mod/setup.php:466 msgid "PHP upload limits" msgstr "" -#: ../../mod/setup.php:488 +#: ../../mod/setup.php:489 msgid "" "Error: the \"openssl_pkey_new\" function on this system is not able to " "generate encryption keys" msgstr "" -#: ../../mod/setup.php:489 +#: ../../mod/setup.php:490 msgid "" "If running under Windows, please see \"http://www.php.net/manual/en/openssl." "installation.php\"." msgstr "" -#: ../../mod/setup.php:492 +#: ../../mod/setup.php:493 msgid "Generate encryption keys" msgstr "" -#: ../../mod/setup.php:504 +#: ../../mod/setup.php:505 msgid "libCurl PHP module" msgstr "" -#: ../../mod/setup.php:505 +#: ../../mod/setup.php:506 msgid "GD graphics PHP module" msgstr "" -#: ../../mod/setup.php:506 +#: ../../mod/setup.php:507 msgid "OpenSSL PHP module" msgstr "" -#: ../../mod/setup.php:507 +#: ../../mod/setup.php:508 msgid "mysqli or postgres PHP module" msgstr "" -#: ../../mod/setup.php:508 +#: ../../mod/setup.php:509 msgid "mb_string PHP module" msgstr "" -#: ../../mod/setup.php:509 +#: ../../mod/setup.php:510 msgid "mcrypt PHP module" msgstr "" -#: ../../mod/setup.php:510 +#: ../../mod/setup.php:511 msgid "xml PHP module" msgstr "" -#: ../../mod/setup.php:514 ../../mod/setup.php:516 +#: ../../mod/setup.php:515 ../../mod/setup.php:517 msgid "Apache mod_rewrite module" msgstr "" -#: ../../mod/setup.php:514 +#: ../../mod/setup.php:515 msgid "" "Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../mod/setup.php:520 ../../mod/setup.php:523 +#: ../../mod/setup.php:521 ../../mod/setup.php:524 msgid "proc_open" msgstr "" -#: ../../mod/setup.php:520 +#: ../../mod/setup.php:521 msgid "" "Error: proc_open is required but is either not installed or has been " "disabled in php.ini" msgstr "" -#: ../../mod/setup.php:528 +#: ../../mod/setup.php:529 msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../mod/setup.php:532 +#: ../../mod/setup.php:533 msgid "" "Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../mod/setup.php:536 +#: ../../mod/setup.php:537 msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../mod/setup.php:540 +#: ../../mod/setup.php:541 msgid "" "Error: mysqli or postgres PHP module required but neither are installed." msgstr "" -#: ../../mod/setup.php:544 +#: ../../mod/setup.php:545 msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../mod/setup.php:548 +#: ../../mod/setup.php:549 msgid "Error: mcrypt PHP module required but not installed." msgstr "" -#: ../../mod/setup.php:552 +#: ../../mod/setup.php:553 msgid "Error: xml PHP module required for DAV but not installed." msgstr "" -#: ../../mod/setup.php:570 +#: ../../mod/setup.php:571 msgid "" "The web installer needs to be able to create a file called \".htconfig.php\" " "in the top folder of your web server and it is unable to do so." msgstr "" -#: ../../mod/setup.php:571 +#: ../../mod/setup.php:572 msgid "" "This is most often a permission setting, as the web server may not be able " "to write files in your folder - even if you can." msgstr "" -#: ../../mod/setup.php:572 +#: ../../mod/setup.php:573 msgid "" "At the end of this procedure, we will give you a text to save in a file " "named .htconfig.php in your Red top folder." msgstr "" -#: ../../mod/setup.php:573 +#: ../../mod/setup.php:574 msgid "" "You can alternatively skip this procedure and perform a manual installation. " "Please see the file \"install/INSTALL.txt\" for instructions." msgstr "" -#: ../../mod/setup.php:576 +#: ../../mod/setup.php:577 msgid ".htconfig.php is writable" msgstr "" -#: ../../mod/setup.php:590 +#: ../../mod/setup.php:591 msgid "" "Red uses the Smarty3 template engine to render its web views. Smarty3 " "compiles templates to PHP to speed up rendering." msgstr "" -#: ../../mod/setup.php:591 +#: ../../mod/setup.php:592 #, php-format msgid "" "In order to store these compiled templates, the web server needs to have " "write access to the directory %s under the Red top level folder." msgstr "" -#: ../../mod/setup.php:592 ../../mod/setup.php:613 +#: ../../mod/setup.php:593 ../../mod/setup.php:614 msgid "" "Please ensure that the user that your web server runs as (e.g. www-data) has " "write access to this folder." msgstr "" -#: ../../mod/setup.php:593 +#: ../../mod/setup.php:594 #, php-format msgid "" "Note: as a security measure, you should give the web server write access to " "%s only--not the template files (.tpl) that it contains." msgstr "" -#: ../../mod/setup.php:596 +#: ../../mod/setup.php:597 #, php-format msgid "%s is writable" msgstr "" -#: ../../mod/setup.php:612 +#: ../../mod/setup.php:613 msgid "" "Red uses the store directory to save uploaded files. The web server needs to " "have write access to the store directory under the Red top level folder" msgstr "" -#: ../../mod/setup.php:616 +#: ../../mod/setup.php:617 msgid "store is writable" msgstr "" -#: ../../mod/setup.php:649 +#: ../../mod/setup.php:650 msgid "" "SSL certificate cannot be validated. Fix certificate or disable https access " "to this site." msgstr "" -#: ../../mod/setup.php:650 +#: ../../mod/setup.php:651 msgid "" "If you have https access to your website or allow connections to TCP port " "443 (the https: port), you MUST use a browser-valid certificate. You MUST " "NOT use self-signed certificates!" msgstr "" -#: ../../mod/setup.php:651 +#: ../../mod/setup.php:652 msgid "" "This restriction is incorporated because public posts from you may for " "example contain references to images on your own hub." msgstr "" -#: ../../mod/setup.php:652 +#: ../../mod/setup.php:653 msgid "" "If your certificate is not recognized, members of other sites (who may " "themselves have valid certificates) will get a warning message on their own " "site complaining about security issues." msgstr "" -#: ../../mod/setup.php:653 +#: ../../mod/setup.php:654 msgid "" "This can cause usability issues elsewhere (not just on your own site) so we " "must insist on this requirement." msgstr "" -#: ../../mod/setup.php:654 +#: ../../mod/setup.php:655 msgid "" "Providers are available that issue free certificates which are browser-valid." msgstr "" -#: ../../mod/setup.php:656 +#: ../../mod/setup.php:657 msgid "SSL certificate validation" msgstr "" -#: ../../mod/setup.php:662 +#: ../../mod/setup.php:663 msgid "" "Url rewrite in .htaccess is not working. Check your server configuration." "Test: " msgstr "" -#: ../../mod/setup.php:665 +#: ../../mod/setup.php:666 msgid "Url rewrite is working" msgstr "" -#: ../../mod/setup.php:674 +#: ../../mod/setup.php:675 msgid "" "The database configuration file \".htconfig.php\" could not be written. " "Please use the enclosed text to create a configuration file in your web " "server root." msgstr "" -#: ../../mod/setup.php:698 +#: ../../mod/setup.php:699 msgid "Errors encountered creating database tables." msgstr "" -#: ../../mod/setup.php:732 +#: ../../mod/setup.php:733 msgid "<h1>What next</h1>" msgstr "" -#: ../../mod/setup.php:733 +#: ../../mod/setup.php:734 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" diff --git a/version.inc b/version.inc index 17c7ed1be..d5a47f11b 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-02-04.1299H +2016-02-05.1300H diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl index 773125154..8f26ec7b0 100644 --- a/view/cs/htconfig.tpl +++ b/view/cs/htconfig.tpl @@ -10,6 +10,8 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres +define( 'UNO', {{$uno}} ); + /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl index 205da73a3..a81c34741 100644 --- a/view/de/htconfig.tpl +++ b/view/de/htconfig.tpl @@ -10,6 +10,8 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres +define( 'UNO', {{$uno}} ); + /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they diff --git a/view/en-au/htconfig.tpl b/view/en-au/htconfig.tpl index 9dd0a1ab2..9611decf9 100644 --- a/view/en-au/htconfig.tpl +++ b/view/en-au/htconfig.tpl @@ -10,6 +10,8 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres +define( 'UNO', {{$uno}} ); + /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they diff --git a/view/en-gb/htconfig.tpl b/view/en-gb/htconfig.tpl index 9dd0a1ab2..9611decf9 100644 --- a/view/en-gb/htconfig.tpl +++ b/view/en-gb/htconfig.tpl @@ -10,6 +10,8 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres +define( 'UNO', {{$uno}} ); + /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 17f19702f..50e05fc3e 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -10,6 +10,8 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres +define( 'UNO', {{$uno}} ); + /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they diff --git a/view/eo/htconfig.tpl b/view/eo/htconfig.tpl index 773125154..8f26ec7b0 100644 --- a/view/eo/htconfig.tpl +++ b/view/eo/htconfig.tpl @@ -10,6 +10,8 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres +define( 'UNO', {{$uno}} ); + /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl index 1e7e14fb4..5171fd327 100644 --- a/view/fr/htconfig.tpl +++ b/view/fr/htconfig.tpl @@ -12,6 +12,8 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres +define( 'UNO', {{$uno}} ); + /* * Note: Plusieurs de ces réglages seront disponibles via le panneau d'administration * après l'installation. Lorsque des modifications sont apportés à travers le panneau d'administration diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl index 773125154..8f26ec7b0 100644 --- a/view/it/htconfig.tpl +++ b/view/it/htconfig.tpl @@ -10,6 +10,8 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres +define( 'UNO', {{$uno}} ); + /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they diff --git a/view/nb-no/htconfig.tpl b/view/nb-no/htconfig.tpl index 773125154..8f26ec7b0 100644 --- a/view/nb-no/htconfig.tpl +++ b/view/nb-no/htconfig.tpl @@ -10,6 +10,8 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres +define( 'UNO', {{$uno}} ); + /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they diff --git a/view/pt-br/htconfig.tpl b/view/pt-br/htconfig.tpl index 773125154..8f26ec7b0 100644 --- a/view/pt-br/htconfig.tpl +++ b/view/pt-br/htconfig.tpl @@ -10,6 +10,8 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres +define( 'UNO', {{$uno}} ); + /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they diff --git a/view/ru/htconfig.tpl b/view/ru/htconfig.tpl index 773125154..8f26ec7b0 100644 --- a/view/ru/htconfig.tpl +++ b/view/ru/htconfig.tpl @@ -10,6 +10,8 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres +define( 'UNO', {{$uno}} ); + /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl index 773125154..8f26ec7b0 100644 --- a/view/sv/htconfig.tpl +++ b/view/sv/htconfig.tpl @@ -10,6 +10,8 @@ $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres +define( 'UNO', {{$uno}} ); + /* * Notice: Many of the following settings will be available in the admin panel * after a successful site install. Once they are set in the admin panel, they diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl index 62dcbb8b3..5ecd3243b 100755 --- a/view/tpl/install_settings.tpl +++ b/view/tpl/install_settings.tpl @@ -19,6 +19,7 @@ {{include file="field_input.tpl" field=$adminmail}} {{include file="field_input.tpl" field=$siteurl}} +{{include file="field_checkbox.tpl" field=$advanced}} {{include file="field_select_grouped.tpl" field=$timezone}} |