aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xboot.php4
-rw-r--r--doc/roadmap.bb20
-rw-r--r--doc/to_do_code.bb16
-rw-r--r--images/default_profile_photos/alpha/300.png (renamed from images/default_profile_photos/alpha/175.png)bin3817 -> 3817 bytes
-rw-r--r--images/default_profile_photos/black_avatar_1/300.png (renamed from images/default_profile_photos/black_avatar_1/175.png)bin6420 -> 6420 bytes
-rw-r--r--images/default_profile_photos/black_avatar_2/300.png (renamed from images/default_profile_photos/black_avatar_2/175.png)bin5802 -> 5802 bytes
-rw-r--r--images/default_profile_photos/blank/300.jpg (renamed from images/default_profile_photos/blank/175.jpg)bin910 -> 910 bytes
-rw-r--r--images/default_profile_photos/blank/300.png (renamed from images/default_profile_photos/blank/175.png)bin3817 -> 3817 bytes
-rw-r--r--images/default_profile_photos/rainbow_man/300.jpg (renamed from images/default_profile_photos/rainbow_man/175.jpg)bin8510 -> 8510 bytes
-rw-r--r--images/default_profile_photos/rainbow_man/300.png (renamed from images/default_profile_photos/rainbow_man/175.png)bin57998 -> 57998 bytes
-rw-r--r--images/default_profile_photos/rainbow_man_trans/300.png (renamed from images/default_profile_photos/rainbow_man_trans/175.png)bin71198 -> 71198 bytes
-rw-r--r--images/default_profile_photos/red_avatar/300.png (renamed from images/default_profile_photos/red_avatar/175.png)bin4621 -> 4621 bytes
-rw-r--r--images/default_profile_photos/red_koala/300.jpg (renamed from images/default_profile_photos/red_koala/175.jpg)bin22969 -> 22969 bytes
-rw-r--r--images/default_profile_photos/red_koala/300.png (renamed from images/default_profile_photos/red_koala/175.png)bin20722 -> 20722 bytes
-rw-r--r--images/default_profile_photos/red_koala_trans/300.png (renamed from images/default_profile_photos/red_koala_trans/175.png)bin25546 -> 25546 bytes
-rw-r--r--images/default_profile_photos/redmatrix_logo_smiley/300.png (renamed from images/default_profile_photos/redmatrix_logo_smiley/175.png)bin3834 -> 3834 bytes
-rw-r--r--include/Contact.php18
-rw-r--r--include/bbcode.php15
-rw-r--r--include/comanche.php5
-rw-r--r--include/contact_selectors.php2
-rw-r--r--include/conversation.php2
-rwxr-xr-xinclude/diaspora.php4
-rw-r--r--include/dir_fns.php61
-rw-r--r--include/event.php150
-rw-r--r--include/identity.php35
-rwxr-xr-xinclude/items.php32
-rw-r--r--include/network.php4
-rw-r--r--include/photo/photo_driver.php8
-rw-r--r--include/security.php6
-rw-r--r--include/taxonomy.php4
-rw-r--r--include/text.php2
-rw-r--r--include/widgets.php4
-rw-r--r--include/zot.php29
-rwxr-xr-xindex.php11
-rw-r--r--install/update.php7
-rw-r--r--mod/connedit.php165
-rw-r--r--mod/directory.php35
-rw-r--r--mod/display.php6
-rw-r--r--mod/editblock.php15
-rw-r--r--mod/editlayout.php16
-rw-r--r--mod/editpost.php14
-rwxr-xr-xmod/events.php22
-rw-r--r--mod/import.php2
-rw-r--r--mod/menu.php2
-rw-r--r--mod/mitem.php9
-rw-r--r--mod/profile_photo.php4
-rwxr-xr-xmod/setup.php2
-rw-r--r--mod/uexport.php10
-rwxr-xr-xutil/add_addon_repo2
-rwxr-xr-xutil/add_theme_repo2
-rwxr-xr-xutil/add_widget_repo2
-rw-r--r--util/messages.po2348
-rwxr-xr-xutil/update_addon_repo2
-rwxr-xr-xutil/update_theme_repo2
-rwxr-xr-xutil/update_widget_repo2
-rw-r--r--version.inc2
-rw-r--r--view/css/conversation.css4
-rw-r--r--view/css/default.css17
-rw-r--r--view/css/mod_connedit.css186
-rw-r--r--view/css/mod_display.css3
-rw-r--r--view/css/widgets.css6
-rw-r--r--view/js/mod_connedit.js102
-rw-r--r--view/nl/messages.po553
-rw-r--r--view/nl/strings.php57
-rw-r--r--view/pt-br/messages.po5431
-rw-r--r--view/pt-br/strings.php1022
-rw-r--r--view/theme/redbasic/css/style.css72
-rw-r--r--view/theme/redbasic/js/redbasic.js2
-rw-r--r--view/theme/redbasic/php/style.php2
-rw-r--r--view/theme/redbasic/schema/focus.css9
-rw-r--r--view/theme/redbasic/schema/focus.php4
-rwxr-xr-xview/tpl/abook_edit.tpl361
-rwxr-xr-xview/tpl/contact_slider.tpl20
-rwxr-xr-xview/tpl/conv_item.tpl3
-rwxr-xr-xview/tpl/conv_list.tpl3
-rwxr-xr-xview/tpl/cropbody.tpl4
-rw-r--r--view/tpl/dir_sort_links.tpl7
-rwxr-xr-xview/tpl/directory_header.tpl12
-rwxr-xr-xview/tpl/edpost_head.tpl22
-rwxr-xr-xview/tpl/events-js.tpl18
-rwxr-xr-xview/tpl/field_acheckbox.tpl21
-rw-r--r--view/tpl/menuedit.tpl8
-rw-r--r--view/tpl/mitemedit.tpl71
-rw-r--r--view/tpl/mitemlist.tpl61
-rwxr-xr-xview/tpl/page_display.tpl19
-rwxr-xr-xview/tpl/photo_item.tpl2
-rwxr-xr-xview/tpl/photo_view.tpl77
-rwxr-xr-xview/tpl/profile_vcard.tpl3
-rw-r--r--view/tpl/rating_slider.tpl19
-rwxr-xr-xview/tpl/search_item.tpl2
-rwxr-xr-xview/tpl/xchan_vcard.tpl2
91 files changed, 5812 insertions, 5496 deletions
diff --git a/boot.php b/boot.php
index bd99eb774..2eeec1847 100755
--- a/boot.php
+++ b/boot.php
@@ -49,7 +49,7 @@ define ( 'PLATFORM_NAME', 'redmatrix' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
-define ( 'DB_UPDATE_VERSION', 1144 );
+define ( 'DB_UPDATE_VERSION', 1145 );
/**
* @brief Constant with a HTML line break.
@@ -562,6 +562,7 @@ define ( 'ITEM_BUILDBLOCK', 0x0100); // Named thusly to make sure nobody co
define ( 'ITEM_PDL', 0x0200); // Page Description Language - e.g. Comanche
define ( 'ITEM_BUG', 0x0400); // Is a bug, can be used by the internal bug tracker
define ( 'ITEM_PENDING_REMOVE', 0x0800); // deleted, notification period has lapsed
+define ( 'ITEM_DOC', 0x1000); // hubzilla only, define here so that item import does the right thing
/**
* Item Flags
@@ -2050,7 +2051,6 @@ function load_pdl(&$a) {
if((! $s) && (($p = theme_include($n)) != ''))
$s = @file_get_contents($p);
-
if($s) {
comanche_parser($a, $s);
$a->pdl = $s;
diff --git a/doc/roadmap.bb b/doc/roadmap.bb
index be8fc47f5..b41938cfc 100644
--- a/doc/roadmap.bb
+++ b/doc/roadmap.bb
@@ -2,26 +2,30 @@
Roadmap for $Projectname V3
+*HZ = Hubzilla repository
+
+
Crypto
Convert E2EE to dynamic loading (on demand) using jQuery.getScript() [or other methods] to only load encryption libs when you require them. This should also support multiple encryption libraries (e.g. SJCL, others) triggered from the choice of algorithm and remain pluggable.
Diaspora
- Convert core Diaspora federation code into a plugin. This presents a number of challenges since it touches and special cases a lot of core functionality.
+ Convert core Diaspora federation code into a plugin. This presents a number of challenges since it touches and special cases a lot of core functionality. (HZ - in progress)
Subscriptions and business models
- Build enough into core(/addons) to generate income (or at least try and cover costs) out of the box
+ Build enough into core(/addons) to generate income (or at least try and cover costs) out of the box (in progress Habeas Codice)
Merge all uploads into common DAV interface
- Separate photo albums from photos and turn them into file directories.
- Upload everything direct to /store
- If photo, generate thumbnails and image resources
- Provide default upload folders with %y (and other?) macros for both photos and other file resources
- Allow "media" (anything that we can generate a thumbnail for) in the Photos section (and show thumbnails in the Files section where possible)
+ Separate photo albums from photos and turn them into file directories. (HZ - done)
+ Upload everything direct to /store (HZ - done)
+ If photo, generate thumbnails and image resources (HZ - done)
+ Provide default upload folders with %y (and other?) macros for both photos and other file resources (HZ - done)
+ Allow "media" (anything that we can generate a thumbnail for) in the Photos section (and show thumbnails in the Files section where possible) (HZ - done)
+
Resolve the "every photo has an item" confusion, perhaps every file should also - but only if we can explain it and separate them conceptually.
Migration tools
Friendica importer
- Diaspora importer
+ Diaspora importer (channel and connection import done, conversations and photos still in progress and waiting for support from Diaspora)
Webpage design UI improvements
If practical, separate "conversation" sub-themes from overall themes so one can choose different conversation and content layouts within a base theme.
diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb
index 3a54a5357..21b567c3f 100644
--- a/doc/to_do_code.bb
+++ b/doc/to_do_code.bb
@@ -11,7 +11,7 @@ We need much more than this, but here are areas where developers can help. Pleas
[li]Finish the anti-spam bayesian engine[/li]
[li]implement an email permission denied bounce message from the sys channel[/li]
[li]provide a way for xchans with a certain network type to upgrade (unknown to rss, rss to statusnet, friendica-over-diaspora to friendica, for instance) based on new knowledge and/or redmatrix ability[/li]
-[li]If DAV folders exist, add an option to the Settings page to set a default folder for attachment uploads.[/li]
+[li](done - HZ) If DAV folders exist, add an option to the Settings page to set a default folder for attachment uploads.[/li]
[li]Integrate the "open site" list with the register page[/li]
[li]implement oembed provider interface[/li]
[li]refactor the oembed client interface so that we can safely sandbox remote content[/li]
@@ -21,27 +21,27 @@ We need much more than this, but here are areas where developers can help. Pleas
[li]restricted access OAuth clients[/li]
[li](Advanced) create a UI for building Comanche pages[/li]
[li](less advanced) create a way to preview Comanche results on a preview page while editing on another page[/li]
-[li]Extend WebDAV to provide desktop access to photo albums[/li]
+[li](done - HZ) Extend WebDAV to provide desktop access to photo albums[/li]
[li]External post connectors - create standard interface[/li]
[li]External post connectors, add popular services[/li]
-[li]service classes - provide a pluggable subscription payment gateway for premium accounts[/li]
-[li]service classes - account overview page showing resources consumed by channel. With special consideration this page can also be accessed at a meta level by the site admin to drill down on problematic accounts/channels.[/li]
-[li]Events module - fix permissions on events, and provide JS translation support for the calendar overview; integrate with calDAV[/li]
+[li](in progress Habeas Codice) service classes - provide a pluggable subscription payment gateway for premium accounts[/li]
+[li](in progress Habeas Codice) service classes - account overview page showing resources consumed by channel. With special consideration this page can also be accessed at a meta level by the site admin to drill down on problematic accounts/channels.[/li]
+[li]Events module - fix permissions on events, and provide JS translation support for the calendar overview (done); integrate with calDAV[/li]
[li]Uploads - integrate #^[url=https://github.com/blueimp/jQuery-File-Upload]https://github.com/blueimp/jQuery-File-Upload[/url][/li]
[li]Import/export - include events, things, etc.[/li]
[li]API extensions, for Twitter API - search, friending, threading. For Red API, lots of stuff[/li]
[li]OAuth permission extensions[/li]
-[li]Import channel from Diaspora/Friendica[/li]
+[li]Import channel from Diaspora/Friendica (Diaspora partially done)[/li]
[li]MediaGoblin photo "crosspost" connector[/li]
[li]Create management page/UI for extensible profile fields[/li]
[li]Create interface to include/exclude and re-order standard profile fields[/li]
-[li]Provide a mechanism to share page design elements in posts (just like apps)[/li]
+[li]Provide a mechanism to share page design elements in posts (just like apps) (done)[/li]
[li]App taxonomy[/li]
[li]Customisable App collection pages[/li]
[li]replace the tinymce visual editor and/or make the visual editor pluggable and responsive to different output formats. We probably want library/bbedit for bbcode. This needs a fair bit of work to catch up with our "enhanced bbcode", but start with images, links, bold and highlight and work from there.[/li]
[li]Photos module - turn photos into normal conversations and fix tagging[/li]
[li]Create mobile clients for the top platforms - which involves extending the API so that we can do stuff far beyond the current crop of Twitter/Statusnet clients. Ditto for mobile themes. We can probably use something like the Friendica Android app as a base to start from.[/li]
-[li]Implement owned and exchangeable "things".[/li]
+[li](in progress Habeas Codice) Implement owned and exchangeable "things".[/li]
[li]Family Account creation - using service classes (an account holder can create a certain number of sub-accounts which are all tied to their subscription - if the subscription lapses they all go away).[/li]
[li]Put mod_admin under Comanche[/li]
diff --git a/images/default_profile_photos/alpha/175.png b/images/default_profile_photos/alpha/300.png
index 17211ee27..17211ee27 100644
--- a/images/default_profile_photos/alpha/175.png
+++ b/images/default_profile_photos/alpha/300.png
Binary files differ
diff --git a/images/default_profile_photos/black_avatar_1/175.png b/images/default_profile_photos/black_avatar_1/300.png
index bc5b19793..bc5b19793 100644
--- a/images/default_profile_photos/black_avatar_1/175.png
+++ b/images/default_profile_photos/black_avatar_1/300.png
Binary files differ
diff --git a/images/default_profile_photos/black_avatar_2/175.png b/images/default_profile_photos/black_avatar_2/300.png
index 8ff3cbd4c..8ff3cbd4c 100644
--- a/images/default_profile_photos/black_avatar_2/175.png
+++ b/images/default_profile_photos/black_avatar_2/300.png
Binary files differ
diff --git a/images/default_profile_photos/blank/175.jpg b/images/default_profile_photos/blank/300.jpg
index 4024d6e88..4024d6e88 100644
--- a/images/default_profile_photos/blank/175.jpg
+++ b/images/default_profile_photos/blank/300.jpg
Binary files differ
diff --git a/images/default_profile_photos/blank/175.png b/images/default_profile_photos/blank/300.png
index 1edb25b76..1edb25b76 100644
--- a/images/default_profile_photos/blank/175.png
+++ b/images/default_profile_photos/blank/300.png
Binary files differ
diff --git a/images/default_profile_photos/rainbow_man/175.jpg b/images/default_profile_photos/rainbow_man/300.jpg
index fc0ec3d77..fc0ec3d77 100644
--- a/images/default_profile_photos/rainbow_man/175.jpg
+++ b/images/default_profile_photos/rainbow_man/300.jpg
Binary files differ
diff --git a/images/default_profile_photos/rainbow_man/175.png b/images/default_profile_photos/rainbow_man/300.png
index 30a7e0ffb..30a7e0ffb 100644
--- a/images/default_profile_photos/rainbow_man/175.png
+++ b/images/default_profile_photos/rainbow_man/300.png
Binary files differ
diff --git a/images/default_profile_photos/rainbow_man_trans/175.png b/images/default_profile_photos/rainbow_man_trans/300.png
index a0a236841..a0a236841 100644
--- a/images/default_profile_photos/rainbow_man_trans/175.png
+++ b/images/default_profile_photos/rainbow_man_trans/300.png
Binary files differ
diff --git a/images/default_profile_photos/red_avatar/175.png b/images/default_profile_photos/red_avatar/300.png
index 31d39a41a..31d39a41a 100644
--- a/images/default_profile_photos/red_avatar/175.png
+++ b/images/default_profile_photos/red_avatar/300.png
Binary files differ
diff --git a/images/default_profile_photos/red_koala/175.jpg b/images/default_profile_photos/red_koala/300.jpg
index e49343b1d..e49343b1d 100644
--- a/images/default_profile_photos/red_koala/175.jpg
+++ b/images/default_profile_photos/red_koala/300.jpg
Binary files differ
diff --git a/images/default_profile_photos/red_koala/175.png b/images/default_profile_photos/red_koala/300.png
index ee4a701d9..ee4a701d9 100644
--- a/images/default_profile_photos/red_koala/175.png
+++ b/images/default_profile_photos/red_koala/300.png
Binary files differ
diff --git a/images/default_profile_photos/red_koala_trans/175.png b/images/default_profile_photos/red_koala_trans/300.png
index 4e51c80e2..4e51c80e2 100644
--- a/images/default_profile_photos/red_koala_trans/175.png
+++ b/images/default_profile_photos/red_koala_trans/300.png
Binary files differ
diff --git a/images/default_profile_photos/redmatrix_logo_smiley/175.png b/images/default_profile_photos/redmatrix_logo_smiley/300.png
index 7299c4494..7299c4494 100644
--- a/images/default_profile_photos/redmatrix_logo_smiley/175.png
+++ b/images/default_profile_photos/redmatrix_logo_smiley/300.png
Binary files differ
diff --git a/include/Contact.php b/include/Contact.php
index 9490fd2da..035e83a82 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -311,6 +311,24 @@ function channel_remove($channel_id, $local = true, $unset_session=true) {
intval(PAGE_REMOVED),
intval($channel_id)
);
+ // if this was the default channel, set another one as default
+ if($a->account['account_default_channel'] == $channel_id) {
+ $r = q("select channel_id from channel where channel_account_id = %d and not ( channel_pageflags & %d)>0 limit 1",
+ intval($a->account['account_id']),
+ intval(PAGE_REMOVED));
+ if ($r) {
+ $rr = q("update account set account_default_channel = %d where account_id = %d",
+ intval($r[0]['channel_id']),
+ intval($a->account['account_id']));
+ logger("Default channel deleted, changing default to channel_id " . $r[0]['channel_id']);
+ }
+ else {
+ $rr = q("update account set account_default_channel = 0 where account_id = %d",
+ intval($r[0]['channel_id']),
+ intval($a->account['account_id']));
+ }
+ }
+
$r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_hash = '%s' and hubloc_url = '%s' ",
intval(HUBLOC_FLAGS_DELETED),
diff --git a/include/bbcode.php b/include/bbcode.php
index e248c3771..6fc481fff 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -174,10 +174,14 @@ function bb_parse_app($match) {
function bb_parse_element($match) {
$j = json_decode(base64url_decode($match[1]),true);
- if ($j) {
+ if ($j && local_channel()) {
$text = sprintf( t('Install %s element: '), translate_design_element($j['type'])) . $j['pagetitle'];
$o = EOL . '<a href="#" onclick="importElement(\'' . $match[1] . '\'); return false;" >' . $text . '</a>' . EOL;
}
+ else {
+ $text = sprintf( t('This post contains an installable %s element, however you lack permissions to install it on this site.' ), translate_design_element($j['type'])) . $j['pagetitle'];
+ $o = EOL . $text . EOL;
+ }
return $o;
}
@@ -922,14 +926,21 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true) {
// start which is always required). Allow desc with a missing summary for compatibility.
if ((x($ev,'desc') || x($ev,'summary')) && x($ev,'start')) {
+
$sub = format_event_html($ev);
+ $sub = str_replace('$',"\0",$sub);
+
+ $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/ism",$sub,$Text);
+
$Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism",'',$Text);
$Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism",'',$Text);
- $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/ism",$sub,$Text);
$Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism",'',$Text);
$Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/ism",'',$Text);
$Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism",'',$Text);
+
+ $Text = str_replace("\0",'$',$Text);
+
}
// Unhide all [noparse] contained bbtags unspacefying them
diff --git a/include/comanche.php b/include/comanche.php
index cb46985eb..49b910bdb 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -284,6 +284,11 @@ function comanche_widget($name, $text) {
if(file_exists('widget/' . trim($name) . '.php'))
require_once('widget/' . trim($name) . '.php');
+ else {
+ $theme_widget = 'widget_' . trim($name) . '.php';
+ if(theme_include($theme_widget))
+ require_once(theme_include($theme_widget));
+ }
$func = 'widget_' . trim($name);
if (function_exists($func))
diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 726efce9d..8671f1bd1 100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -5,7 +5,7 @@ function contact_profile_assign($current) {
$o = '';
- $o .= "<select id=\"contact-profile-selector\" name=\"profile_assign\" />\r\n";
+ $o .= "<select id=\"contact-profile-selector\" name=\"profile_assign\" class=\"form-control\"/>\r\n";
$r = q("SELECT profile_guid, profile_name FROM `profile` WHERE `uid` = %d",
intval($_SESSION['uid']));
diff --git a/include/conversation.php b/include/conversation.php
index fb012667e..76a2f47d1 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -597,7 +597,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
if($arr_blocked) {
$blocked = false;
foreach($arr_blocked as $b) {
- if(($b) && ($item['author_xchan'] == $b)) {
+ if(($b) && (($item['author_xchan'] == $b) || ($item['owner_xchan'] == $b))) {
$blocked = true;
break;
}
diff --git a/include/diaspora.php b/include/diaspora.php
index cf8d89023..74a56dd79 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1009,6 +1009,10 @@ function diaspora_post($importer,$xml,$msg) {
return 202;
}
+ if(! post_is_importable($datarray,$contact)) {
+ logger('diaspora_post: filtering this author.');
+ return 202;
+ }
$result = item_store($datarray);
return;
diff --git a/include/dir_fns.php b/include/dir_fns.php
index 77c78558c..83073154a 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -72,33 +72,20 @@ function check_upstream_directory() {
set_config('system', 'directory_server', '');
}
-function get_globaldir_setting($observer) {
-
- if($observer)
- $globaldir = get_xconfig($observer,'directory','globaldir');
- else
- $globaldir = ((array_key_exists('globaldir',$_SESSION)) ? intval($_SESSION['globaldir']) : false);
-
- if($globaldir === false)
- $globaldir = get_config('directory','globaldir');
-
- return $globaldir;
-}
-
-function get_safemode_setting($observer) {
+function get_directory_setting($observer, $setting) {
if ($observer)
- $safe_mode = get_xconfig($observer,'directory','safe_mode');
+ $ret = get_xconfig($observer, 'directory', $setting);
else
- $safe_mode = ((array_key_exists('safemode',$_SESSION)) ? intval($_SESSION['safemode']) : false);
+ $ret = ((array_key_exists($setting,$_SESSION)) ? intval($_SESSION[$setting]) : false);
- if($safe_mode === false)
- $safe_mode = get_config('directory','safe_mode');
+ if($ret === false)
+ $ret = get_config('directory', $setting);
- if($safe_mode === false)
- $safe_mode = 1;
+ if($setting == 'safemode' && $ret === false)
+ $ret = 1;
- return $safe_mode;
+ return $ret;
}
/**
@@ -110,49 +97,37 @@ function dir_sort_links() {
$observer = get_observer_hash();
- $safe_mode = get_safemode_setting($observer);
- $globaldir = get_globaldir_setting($observer);
+ $safe_mode = get_directory_setting($observer, 'safemode');
+ $globaldir = get_directory_setting($observer, 'globaldir');
+ $pubforums = get_directory_setting($observer, 'pubforums');
// Build urls without order and pubforums so it's easy to tack on the changed value
// Probably there's an easier way to do this
-
$directory_sort_order = get_config('system','directory_sort_order');
if(! $directory_sort_order)
$directory_sort_order = 'date';
-
$current_order = (($_REQUEST['order']) ? $_REQUEST['order'] : $directory_sort_order);
- $url = 'directory?f=';
+ $suggest = (($_REQUEST['suggest']) ? '&suggest=' . $_REQUEST['suggest'] : '');
- $tmp = array_merge($_GET,$_POST);
- unset($tmp['order']);
- unset($tmp['q']);
- unset($tmp['f']);
- $sorturl = $url . http_build_query($tmp);
+ $url = 'directory?f=';
$tmp = array_merge($_GET,$_POST);
+ unset($tmp['suggest']);
unset($tmp['pubforums']);
unset($tmp['global']);
unset($tmp['safe']);
unset($tmp['q']);
unset($tmp['f']);
- $forumsurl = $url . http_build_query($tmp);
+ $forumsurl = $url . http_build_query($tmp) . $suggest;
$o = replace_macros(get_markup_template('dir_sort_links.tpl'), array(
'$header' => t('Directory Options'),
- '$normal' => t('Alphabetic'),
- '$reverse' => t('Reverse Alphabetic'),
- '$date' => t('Newest to Oldest'),
- '$reversedate' => t('Oldest to Newest'),
- '$sort' => t('Sort'),
- '$selected_sort' => $current_order,
- '$sorturl' => $sorturl,
'$forumsurl' => $forumsurl,
- '$safemode' => array('safemode', t('Safe Mode'),$safe_mode,'','',' onchange=\'window.location.href="' . $forumsurl . '&safe="+(this.checked ? 1 : 0)\''),
-
- '$pubforums' => array('pubforums', t('Public Forums Only'),(x($_REQUEST,'pubforums') ? $_REQUEST['pubforums'] : ''),'','',' onchange=\'window.location.href="' . $forumsurl . '&pubforums="+(this.checked ? 1 : 0)\''),
- '$globaldir' => array('globaldir', t('This Website Only'), 1-intval($globaldir),'','',' onchange=\'window.location.href="' . $forumsurl . '&global="+(this.checked ? 0 : 1)\''),
+ '$safemode' => array('safemode', t('Safe Mode'),$safe_mode,'',array(t('No'), t('Yes')),' onchange=\'window.location.href="' . $forumsurl . '&safe="+(this.checked ? 1 : 0)\''),
+ '$pubforums' => array('pubforums', t('Public Forums Only'),$pubforums,'',array(t('No'), t('Yes')),' onchange=\'window.location.href="' . $forumsurl . '&pubforums="+(this.checked ? 1 : 0)\''),
+ '$globaldir' => array('globaldir', t('This Website Only'), 1-intval($globaldir),'',array(t('No'), t('Yes')),' onchange=\'window.location.href="' . $forumsurl . '&global="+(this.checked ? 0 : 1)\''),
));
return $o;
diff --git a/include/event.php b/include/event.php
index 0b1e56ae2..134c23aa2 100644
--- a/include/event.php
+++ b/include/event.php
@@ -1,4 +1,6 @@
<?php
+use Sabre\VObject;
+
/**
* @file include/event.php
*/
@@ -16,6 +18,7 @@ function format_event_html($ev) {
if(! ((is_array($ev)) && count($ev)))
return '';
+
$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8:01 AM
$o = '<div class="vevent">' . "\r\n";
@@ -90,6 +93,7 @@ function format_event_ical($ev) {
$o .= "\nLOCATION:" . format_ical_text($ev['location']);
if($ev['description'])
$o .= "\nDESCRIPTION:" . format_ical_text($ev['description']);
+ $o .= "\nUID:" . $ev['event_hash'] ;
$o .= "\nEND:VEVENT\n";
return $o;
@@ -100,7 +104,7 @@ function format_ical_text($s) {
require_once('include/bbcode.php');
require_once('include/html2plain.php');
- return(wordwrap(html2plain(bbcode($s)),72,"\n ",true));
+ return(wordwrap(str_replace(',','\\,',html2plain(bbcode($s))),72,"\n ",true));
}
@@ -162,7 +166,18 @@ function bbtoevent($s) {
$match = '';
if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
$ev['adjust'] = $match[1];
- $ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
+ if(array_key_exists('start',$ev)) {
+ if(array_key_exists('finish',$ev)) {
+ if($ev['finish'] === $ev['start'])
+ $ev['nofinish'] = 1;
+ elseif($ev['finish'])
+ $ev['nofinish'] = 0;
+ else
+ $ev['nofinish'] = 1;
+ }
+ else
+ $ev['nofinish'] = 1;
+ }
return $ev;
}
@@ -208,6 +223,7 @@ function event_store_event($arr) {
$arr['type'] = (($arr['type']) ? $arr['type'] : 'event' );
$arr['event_xchan'] = (($arr['event_xchan']) ? $arr['event_xchan'] : '');
+
// Existing event being modified
if($arr['id'] || $arr['event_hash']) {
@@ -275,7 +291,11 @@ function event_store_event($arr) {
// New event. Store it.
- $hash = random_string();
+
+ if(array_key_exists('external_id',$arr))
+ $hash = $arr['external_id'];
+ else
+ $hash = random_string() . '@' . get_app()->get_hostname();
$r = q("INSERT INTO event ( uid,aid,event_xchan,event_hash,created,edited,start,finish,summary,description,location,type,
adjust,nofinish,allow_cid,allow_gid,deny_cid,deny_gid)
@@ -364,6 +384,130 @@ function event_addtocal($item_id, $uid) {
}
+function parse_ical_file($f,$uid) {
+require_once('vendor/autoload.php');
+
+ $s = @file_get_contents($f);
+
+ // Change the current timezone to something besides UTC.
+ // Doesn't matter what it is, as long as it isn't UTC.
+ // Save the current timezone so we can reset it when we're done processing.
+
+ $saved_timezone = date_default_timezone_get();
+ date_default_timezone_set('Australia/Sydney');
+
+ $ical = VObject\Reader::read($s);
+
+ if($ical) {
+ foreach($ical->VEVENT as $event) {
+ event_import_ical($event,$uid);
+
+ }
+ }
+
+ date_default_timezone_set($saved_timezone);
+
+ if($ical)
+ return true;
+ return false;
+}
+
+
+
+function event_import_ical($ical, $uid) {
+
+ $c = q("select * from channel where channel_id = %d limit 1",
+ intval($uid)
+ );
+
+ if(! $c)
+ return false;
+
+ $channel = $c[0];
+ $ev = array();
+
+
+ if(! isset($ical->DTSTART)) {
+ logger('no event start');
+ return false;
+ }
+
+ $dtstart = $ical->DTSTART->getDateTime();
+
+// logger('dtstart: ' . var_export($dtstart,true));
+
+ if(($dtstart->timezone_type == 2) || (($dtstart->timezone_type == 3) && ($dtstart->timezone === 'UTC'))) {
+ $ev['adjust'] = 1;
+ }
+ else {
+ $ev['adjust'] = 0;
+ }
+
+ $ev['start'] = datetime_convert((($ev['adjust']) ? 'UTC' : date_default_timezone_get()),'UTC',
+ $dtstart->format(\DateTime::W3C));
+
+
+ if(isset($ical->DTEND)) {
+ $dtend = $ical->DTEND->getDateTime();
+ $ev['finish'] = datetime_convert((($ev['adjust']) ? 'UTC' : date_default_timezone_get()),'UTC',
+ $dtend->format(\DateTime::W3C));
+ }
+ else
+ $ev['nofinish'] = 1;
+
+
+ if($ev['start'] === $ev['finish'])
+ $ev['nofinish'] = 1;
+
+ if(isset($ical->CREATED)) {
+ $created = $ical->CREATED->getDateTime();
+ $ev['created'] = datetime_convert('UTC','UTC',$created->format(\DateTime::W3C));
+ }
+
+ if(isset($ical->{'LAST-MODIFIED'})) {
+ $edited = $ical->{'LAST-MODIFIED'}->getDateTime();
+ $ev['edited'] = datetime_convert('UTC','UTC',$edited->format(\DateTime::W3C));
+ }
+
+ if(isset($ical->LOCATION))
+ $ev['location'] = (string) $ical->LOCATION;
+ if(isset($ical->DESCRIPTION))
+ $ev['description'] = (string) $ical->DESCRIPTION;
+ if(isset($ical->SUMMARY))
+ $ev['summary'] = (string) $ical->SUMMARY;
+
+ if(isset($ical->UID)) {
+ $evuid = (string) $ical->UID;
+ $r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
+ dbesc($evuid),
+ intval($uid)
+ );
+ if($r)
+ $ev['event_hash'] = $evuid;
+ else
+ $ev['external_id'] = $evuid;
+ }
+
+ if($ev['summary'] && $ev['start']) {
+ $ev['event_xchan'] = $channel['channel_hash'];
+ $ev['uid'] = $channel['channel_id'];
+ $ev['account'] = $channel['channel_account_id'];
+ $ev['private'] = 1;
+ $ev['allow_cid'] = '<' . $channel['channel_hash'] . '>';
+
+ logger('storing event: ' . print_r($ev,true), LOGGER_ALL);
+ $event = event_store_event($ev);
+ if($event) {
+ $item_id = event_store_item($ev,$event);
+ return true;
+ }
+ }
+
+ return false;
+
+}
+
+
function event_store_item($arr, $event) {
require_once('include/datetime.php');
diff --git a/include/identity.php b/include/identity.php
index 29d9ef022..5a3861b31 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -583,7 +583,7 @@ function identity_basic_export($channel_id, $items = false) {
/** @warning this may run into memory limits on smaller systems */
- $r = q("select * from item where (item_flags & %d)>0 and not (item_restrict & %d)>0 and uid = %d",
+ $r = q("select * from item where (item_flags & %d)>0 and not (item_restrict & %d)>0 and uid = %d order by created",
intval(ITEM_WALL),
intval(ITEM_DELETED),
intval($channel_id)
@@ -600,6 +600,35 @@ function identity_basic_export($channel_id, $items = false) {
}
+
+function identity_export_year($channel_id,$year) {
+
+ if(! $year)
+ return array();
+
+ $ret = array();
+ $mindate = datetime_convert('UTC','UTC',$year . '-01-01 00:00:00');
+ $maxdate = datetime_convert('UTC','UTC',$year+1 . '-01-01 00:00:00');
+ $r = q("select * from item where (item_flags & %d) > 0 and (item_restrict & %d) = 0 and uid = %d and created >= '%s' and created < '%s' order by created ",
+ intval(ITEM_WALL),
+ intval(ITEM_DELETED),
+ intval($channel_id),
+ dbesc($mindate),
+ dbesc($maxdate)
+ );
+
+ if($r) {
+ $ret['item'] = array();
+ xchan_query($r);
+ $r = fetch_post_tags($r,true);
+ foreach($r as $rr)
+ $ret['item'][] = encode_item($rr,true);
+ }
+
+ return $ret;
+}
+
+
/**
* @brief Loads a profile into the App structure.
*
@@ -1364,10 +1393,10 @@ function get_theme_uid() {
* with the specified size.
*
* @param int $size
-* one of (175, 80, 48)
+* one of (300, 80, 48)
* @returns string
*/
-function get_default_profile_photo($size = 175) {
+function get_default_profile_photo($size = 300) {
$scheme = get_config('system','default_profile_photo');
if(! $scheme)
$scheme = 'rainbow_man';
diff --git a/include/items.php b/include/items.php
index 1009530a4..c807c1d5d 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1198,12 +1198,15 @@ function encode_item($item,$mirror = false) {
case 2:
$x['item_restrict'] |= ITEM_PDL;
break;
- case 2:
+ case 3:
$x['item_restrict'] |= ITEM_WEBPAGE;
break;
- case 2:
+ case 4:
$x['item_restrict'] |= ITEM_BUG;
break;
+ case 5:
+ $x['item_restrict'] |= ITEM_DOC;
+ break;
default:
break;
}
@@ -2654,11 +2657,12 @@ function item_store_update($arr,$allow_exec = false) {
return $ret;
}
+ $r = q("delete from term where oid = %d and otype = %d",
+ intval($orig_post_id),
+ intval(TERM_OBJ_POST)
+ );
+
if(is_array($terms)) {
- $r = q("delete from term where oid = %d and otype = %d",
- intval($orig_post_id),
- intval(TERM_OBJ_POST)
- );
foreach($terms as $t) {
q("insert into term (uid,oid,otype,type,term,url)
values(%d,%d,%d,%d,'%s','%s') ",
@@ -2670,7 +2674,6 @@ function item_store_update($arr,$allow_exec = false) {
dbesc($t['url'])
);
}
-
$arr['term'] = $terms;
}
@@ -3370,14 +3373,18 @@ function post_is_importable($item,$abook) {
if(! $item)
return false;
- if((! $abook['abook_incl']) && (! $abook['abook_excl']))
+ if(! ($abook['abook_incl'] || $abook['abook_excl']))
return true;
-
require_once('include/html2plain.php');
$text = prepare_text($item['body'],$item['mimetype']);
$text = html2plain($text);
+ $lang = null;
+
+ if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_excl'],'lang=') !== false)) {
+ $lang = detect_language($text);
+ }
$tags = ((count($item['term'])) ? $item['term'] : false);
// exclude always has priority
@@ -3394,6 +3401,8 @@ function post_is_importable($item,$abook) {
}
elseif((strpos($word,'/') === 0) && preg_match($word,$body))
return false;
+ elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0))
+ return false;
elseif(stristr($text,$word) !== false)
return false;
}
@@ -3411,6 +3420,8 @@ function post_is_importable($item,$abook) {
}
elseif((strpos($word,'/') === 0) && preg_match($word,$body))
return true;
+ elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0))
+ return true;
elseif(stristr($text,$word) !== false)
return true;
}
@@ -3751,6 +3762,9 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
$author['owner_avatar'] = $contact['thumb'];
}
+ if(! post_is_importable($datarray,$contact))
+ continue;
+
logger('consume_feed: author ' . print_r($author,true),LOGGER_DEBUG);
logger('consume_feed: ' . print_r($datarray,true),LOGGER_DATA);
diff --git a/include/network.php b/include/network.php
index 3abb1b40e..d9546a074 100644
--- a/include/network.php
+++ b/include/network.php
@@ -531,7 +531,7 @@ function avatar_img($email) {
$avatar = array();
$a = get_app();
- $avatar['size'] = 175;
+ $avatar['size'] = 300;
$avatar['email'] = $email;
$avatar['url'] = '';
$avatar['success'] = false;
@@ -1658,4 +1658,4 @@ function format_and_send_email($sender,$xchan,$item) {
-} \ No newline at end of file
+}
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 6f508bf72..5d61556ab 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -606,16 +606,16 @@ function import_profile_photo($photo,$xchan,$thing = false) {
if(($width / $height) > 1.2) {
// crop out the sides
$margin = $width - $height;
- $img->cropImage(175,($margin / 2),0,$height,$height);
+ $img->cropImage(300,($margin / 2),0,$height,$height);
}
elseif(($height / $width) > 1.2) {
// crop out the bottom
$margin = $height - $width;
- $img->cropImage(175,0,0,$width,$width);
+ $img->cropImage(300,0,0,$width,$width);
}
else {
- $img->scaleImageSquare(175);
+ $img->scaleImageSquare(300);
}
}
@@ -682,7 +682,7 @@ function import_channel_photo($photo,$type,$aid,$uid) {
$img = photo_factory($photo, $type);
if($img->is_valid()) {
- $img->scaleImageSquare(175);
+ $img->scaleImageSquare(300);
$p = array('aid' => $aid, 'uid' => $uid, 'resource_id' => $hash, 'filename' => $filename, 'album' => t('Profile Photos'), 'photo_flags' => PHOTO_PROFILE, 'scale' => 4);
diff --git a/include/security.php b/include/security.php
index 91683cc98..bad39d805 100644
--- a/include/security.php
+++ b/include/security.php
@@ -422,6 +422,9 @@ function stream_perms_api_uids($perms = NULL, $limit = 0, $rand = 0 ) {
$str .= intval($rr);
}
}
+ else
+ $str = "''";
+
logger('stream_perms_api_uids: ' . $str, LOGGER_DEBUG);
return $str;
@@ -452,6 +455,9 @@ function stream_perms_xchans($perms = NULL ) {
$str .= "'" . dbesc($rr) . "'";
}
}
+ else
+ $str = "''";
+
logger('stream_perms_xchans: ' . $str, LOGGER_DEBUG);
return $str;
diff --git a/include/taxonomy.php b/include/taxonomy.php
index fa540ac56..a5da190d4 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -276,7 +276,7 @@ function dir_tagblock($link,$r) {
$o = '';
$observer = get_observer_hash();
- if(! get_globaldir_setting($observer))
+ if(! get_directory_setting($observer, 'globaldir'))
return $o;
@@ -407,4 +407,4 @@ function get_things($profile_hash,$uid) {
//logger('things: ' . print_r($sorted_things,true));
return $sorted_things;
-} \ No newline at end of file
+}
diff --git a/include/text.php b/include/text.php
index 7101d76da..02a038ef4 100644
--- a/include/text.php
+++ b/include/text.php
@@ -807,7 +807,7 @@ function contact_block() {
$shown = get_pconfig($a->profile['uid'],'system','display_friend_count');
if($shown === false)
- $shown = 24;
+ $shown = 25;
if($shown == 0)
return;
diff --git a/include/widgets.php b/include/widgets.php
index 4a9032a21..032b1c67e 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -132,7 +132,7 @@ function widget_suggestions($arr) {
'profile' => $rr['xchan_url'],
'name' => $rr['xchan_name'],
'photo' => $rr['xchan_photo_m'],
- 'ignlnk' => z_root() . '/suggest?ignore=' . $rr['xchan_hash'],
+ 'ignlnk' => z_root() . '/directory?ignore=' . $rr['xchan_hash'],
'conntxt' => t('Connect'),
'connlnk' => $connlnk,
'ignore' => t('Ignore/Hide')
@@ -381,6 +381,7 @@ function widget_categories($arr) {
$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
return categories_widget($srchurl, $cat);
+
}
function widget_tagcloud_wall($arr) {
@@ -409,6 +410,7 @@ function widget_catcloud_wall($arr) {
$limit = ((array_key_exists('limit',$arr)) ? intval($arr['limit']) : 50);
return catblock($a->profile['profile_uid'], $limit, $a->profile['channel_hash'], ITEM_WALL);
+
}
diff --git a/include/zot.php b/include/zot.php
index 34e7f3e42..a677da808 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1110,13 +1110,18 @@ function zot_import($arr, $sender_url) {
logger('specific recipients');
$recip_arr = array();
foreach($i['notify']['recipients'] as $recip) {
- $recip_arr[] = make_xchan_hash($recip['guid'],$recip['guid_sig']);
+ if(is_array($recip)) {
+ $recip_arr[] = make_xchan_hash($recip['guid'],$recip['guid_sig']);
+ }
+ }
+ $r = false;
+ if($recip_arr) {
+ stringify_array_elms($recip_arr);
+ $recips = implode(',',$recip_arr);
+ $r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and not ( channel_pageflags & %d ) > 0 ",
+ intval(PAGE_REMOVED)
+ );
}
- stringify_array_elms($recip_arr);
- $recips = implode(',',$recip_arr);
- $r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and not ( channel_pageflags & %d ) > 0 ",
- intval(PAGE_REMOVED)
- );
if(! $r) {
logger('recips: no recipients on this site');
continue;
@@ -1272,7 +1277,8 @@ function public_recips($msg) {
$include_sys = false;
if($msg['message']['type'] === 'activity') {
- $include_sys = true;
+ if(! get_config('system','disable_discover_tab'))
+ $include_sys = true;
$col = 'channel_w_stream';
$field = PERMS_W_STREAM;
if(array_key_exists('flags',$msg['message']) && in_array('thread_parent', $msg['message']['flags'])) {
@@ -2887,7 +2893,12 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
}
if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) {
- $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notifyflags');
+ if(array_key_exists('channel_removed',$arr['channel']))
+ $arr['channel_pageflags'] |= PAGE_REMOVED;
+ if(array_key_exists('channel_system',$arr['channel']))
+ $arr['channel_pageflags'] |= PAGE_SYSTEM;
+
+ $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notifyflags', 'channel_removed', 'channel_system');
$clean = array();
foreach($arr['channel'] as $k => $v) {
@@ -3200,7 +3211,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
}
if(count($clean)) {
foreach($clean as $k => $v) {
- $r = dbq("UPDATE profile set " . dbesc($k) . " = '" . dbesc($v)
+ $r = dbq("UPDATE profile set `" . dbesc($k) . "` = '" . dbesc($v)
. "' where profile_guid = '" . dbesc($profile['profile_guid']) . "' and uid = " . intval($channel['channel_id']));
}
}
diff --git a/index.php b/index.php
index 3c2f172f5..9452bd05b 100755
--- a/index.php
+++ b/index.php
@@ -199,6 +199,17 @@ if(strlen($a->module)) {
}
}
+ /**
+ * This provides a place for plugins to register module handlers which don't otherwise exist on the system.
+ * If the plugin sets 'installed' to true we won't throw a 404 error for the specified module even if
+ * there is no specific module file or matching plugin name.
+ * The plugin should catch at least one of the module hooks for this URL.
+ */
+
+ $x = array('module' => $a->module, 'installed' => false);
+ call_hooks('module_loaded', $x);
+ if($x['installed'])
+ $a->module_loaded = true;
/**
* The URL provided does not resolve to a valid module.
diff --git a/install/update.php b/install/update.php
index fb49e9a16..0f9ec4c79 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1144 );
+define( 'UPDATE_VERSION' , 1145 );
/**
*
@@ -1666,4 +1666,9 @@ function update_r1143() {
return UPDATE_SUCCESS;
return UPDATE_FAILED;
+}
+
+function update_r1144() {
+ // hubzilla update does not apply here, but we're keeping the numbers in sync
+ return UPDATE_SUCCESS;
} \ No newline at end of file
diff --git a/mod/connedit.php b/mod/connedit.php
index 71166b2cc..bc8ae5e2e 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -144,7 +144,6 @@ function connedit_post(&$a) {
dbesc($orig_record[0]['abook_xchan'])
);
-
if($z) {
$record = $z[0]['xlink_id'];
$w = q("update xlink set xlink_rating = '%d', xlink_rating_text = '%s', xlink_sig = '%s', xlink_updated = '%s'
@@ -398,9 +397,9 @@ function connedit_content(&$a) {
if($cmd === 'block') {
if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_BLOCKED)) {
- info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_BLOCKED)
- ? t('Channel has been unblocked')
- : t('Channel has been blocked')) . EOL );
+ // info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_BLOCKED)
+ // ? t('Channel has been unblocked')
+ // : t('Channel has been blocked')) . EOL );
connedit_clone($a);
}
else
@@ -410,9 +409,9 @@ function connedit_content(&$a) {
if($cmd === 'ignore') {
if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_IGNORED)) {
- info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_IGNORED)
- ? t('Channel has been unignored')
- : t('Channel has been ignored')) . EOL );
+ // info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_IGNORED)
+ // ? t('Channel has been unignored')
+ // : t('Channel has been ignored')) . EOL );
connedit_clone($a);
}
else
@@ -422,9 +421,9 @@ function connedit_content(&$a) {
if($cmd === 'archive') {
if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_ARCHIVED)) {
- info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_ARCHIVED)
- ? t('Channel has been unarchived')
- : t('Channel has been archived')) . EOL );
+ // info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_ARCHIVED)
+ // ? t('Channel has been unarchived')
+ // : t('Channel has been archived')) . EOL );
connedit_clone($a);
}
else
@@ -434,9 +433,9 @@ function connedit_content(&$a) {
if($cmd === 'hide') {
if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_HIDDEN)) {
- info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_HIDDEN)
- ? t('Channel has been unhidden')
- : t('Channel has been hidden')) . EOL );
+ // info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_HIDDEN)
+ // ? t('Channel has been unhidden')
+ // : t('Channel has been hidden')) . EOL );
connedit_clone($a);
}
else
@@ -450,9 +449,9 @@ function connedit_content(&$a) {
if($cmd === 'approve') {
if($orig_record[0]['abook_flags'] & ABOOK_FLAG_PENDING) {
if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_PENDING)) {
- info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_PENDING)
- ? t('Channel has been approved')
- : t('Channel has been unapproved')) . EOL );
+ // info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_PENDING)
+ // ? t('Channel has been approved')
+ // : t('Channel has been unapproved')) . EOL );
connedit_clone($a);
}
else
@@ -493,59 +492,62 @@ function connedit_content(&$a) {
$contact_id = $a->poi['abook_id'];
$contact = $a->poi;
+ $buttons = array(
- $tabs = array(
-
- array(
+ 'view' => array(
'label' => t('View Profile'),
'url' => chanlink_cid($contact['abook_id']),
'sel' => '',
'title' => sprintf( t('View %s\'s profile'), $contact['xchan_name']),
),
- array(
+ 'refresh' => array(
'label' => t('Refresh Permissions'),
'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/refresh',
'sel' => '',
'title' => t('Fetch updated permissions'),
),
- array(
+ 'recent' => array(
'label' => t('Recent Activity'),
'url' => $a->get_baseurl(true) . '/network/?f=&cid=' . $contact['abook_id'],
'sel' => '',
'title' => t('View recent posts and comments'),
- )
- );
+ ),
- $buttons = array(
- array(
+ 'block' => array(
'label' => (($contact['abook_flags'] & ABOOK_FLAG_BLOCKED) ? t('Unblock') : t('Block')),
'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/block',
'sel' => (($contact['abook_flags'] & ABOOK_FLAG_BLOCKED) ? 'active' : ''),
'title' => t('Block (or Unblock) all communications with this connection'),
+ 'info' => (($contact['abook_flags'] & ABOOK_FLAG_BLOCKED) ? t('This connection is blocked!') : ''),
),
- array(
+ 'ignore' => array(
'label' => (($contact['abook_flags'] & ABOOK_FLAG_IGNORED) ? t('Unignore') : t('Ignore')),
'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/ignore',
'sel' => (($contact['abook_flags'] & ABOOK_FLAG_IGNORED) ? 'active' : ''),
'title' => t('Ignore (or Unignore) all inbound communications from this connection'),
+ 'info' => (($contact['abook_flags'] & ABOOK_FLAG_IGNORED) ? t('This connection is ignored!') : ''),
),
- array(
+
+ 'archive' => array(
'label' => (($contact['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? t('Unarchive') : t('Archive')),
'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/archive',
'sel' => (($contact['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? 'active' : ''),
'title' => t('Archive (or Unarchive) this connection - mark channel dead but keep content'),
+ 'info' => (($contact['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? t('This connection is archived!') : ''),
),
- array(
+
+ 'hide' => array(
'label' => (($contact['abook_flags'] & ABOOK_FLAG_HIDDEN) ? t('Unhide') : t('Hide')),
'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/hide',
'sel' => (($contact['abook_flags'] & ABOOK_FLAG_HIDDEN) ? 'active' : ''),
'title' => t('Hide or Unhide this connection from your other connections'),
+ 'info' => (($contact['abook_flags'] & ABOOK_FLAG_HIDDEN) ? t('This connection is hidden!') : ''),
),
- array(
+ 'delete' => array(
'label' => t('Delete'),
'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/drop',
'sel' => '',
@@ -556,18 +558,9 @@ function connedit_content(&$a) {
$self = false;
- if(! ($contact['abook_flags'] & ABOOK_FLAG_SELF)) {
- $tab_tpl = get_markup_template('common_tabs.tpl');
- $t = replace_macros($tab_tpl, array('$tabs'=>$tabs));
- }
- else
+ if(($contact['abook_flags'] & ABOOK_FLAG_SELF))
$self = true;
- $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array(
- '$baseurl' => $a->get_baseurl(true),
- '$editselect' => $editselect
- ));
-
require_once('include/contact_selectors.php');
$tpl = get_markup_template("abook_edit.tpl");
@@ -616,7 +609,6 @@ function connedit_content(&$a) {
$rating_text = $xl[0]['xlink_rating_text'];
}
-
$poco_rating = get_config('system','poco_rating_enable');
// if unset default to enabled
@@ -640,101 +632,78 @@ function connedit_content(&$a) {
$global_perms = get_perms();
$existing = get_all_perms(local_channel(),$contact['abook_xchan']);
- $unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication'));
-
+ $unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication'), array(t('No'),('Yes')));
+
+ $multiprofs = ((feature_enabled(local_channel(),'multi_profiles')) ? true : false);
+
+ if($slide && !$multiprofs)
+ $affinity = t('Set Affinity');
+
+ if(!$slide && $multiprofs)
+ $affinity = t('Set Profile');
+
+ if($slide && $multiprofs)
+ $affinity = t('Set Affinity & Profile');
+
foreach($global_perms as $k => $v) {
$thisperm = (($contact['abook_my_perms'] & $v[1]) ? "1" : '');
+ $checkinherited = ((($channel[$v[0]]) && ($channel[$v[0]] != PERMS_SPECIFIC)) ? "1" : '');
// For auto permissions (when $self is true) we don't want to look at existing
// permissions because they are enabled for the channel owner
-
if((! $self) && ($existing[$k]))
$thisperm = "1";
- $perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC || $self) ? '' : '1'), $v[4]);
+ $perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC) ? '' : '1'), $v[4], $checkinherited);
}
$o .= replace_macros($tpl,array(
- '$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connections: settings for %s'),$contact['xchan_name'])),
- '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), ''),
+ '$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])),
+ '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), 'Connection requests will be approved without your interaction', array(t('No'),('Yes'))),
'$addr' => $contact['xchan_addr'],
+ '$addr_text' => t('This connection\'s address is'),
'$notself' => (($self) ? '' : '1'),
'$self' => (($self) ? '1' : ''),
- '$autolbl' => t('Apply the permissions indicated on this page to all new connections.'),
+ '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'),
'$buttons' => (($self) ? '' : $buttons),
- '$viewprof' => t('View Profile'),
- '$clickme' => t('Click to open/close'),
'$lbl_slider' => t('Slide to adjust your degree of friendship'),
- '$lbl_rating' => t('Rating (this information is public)'),
- '$lbl_rating_txt' => t('Optionally explain your rating (this information is public)'),
+ '$lbl_rating' => t('Rating'),
+ '$lbl_rating_label' => t('Slide to adjust your rating'),
+ '$lbl_rating_txt' => t('Optionally explain your rating'),
'$connfilter' => feature_enabled(local_channel(),'connfilter'),
+ '$connfilter_label' => t('Custom Filter'),
'$incl' => array('abook_incl',t('Only import posts with this text'), $contact['abook_incl'],t('words one per line or #tags or /patterns/, leave blank to import all posts')),
'$excl' => array('abook_excl',t('Do not import posts with this text'), $contact['abook_excl'],t('words one per line or #tags or /patterns/, leave blank to import all posts')),
- '$rating_text' => array('rating_text', t('Optionally explain your rating (this information is public)'),$rating_text,''),
+ '$rating_text' => array('rating_text', t('Optionally explain your rating'),$rating_text,''),
+ '$rating_info' => t('This information is public!'),
'$rating' => $rating,
'$rating_val' => $rating_val,
'$slide' => $slide,
- '$tabs' => $t,
- '$tab_str' => $tab_str,
- '$perms_step1' => t('Default permissions for your channel type have (just) been applied. They have not yet been submitted. Please review the permissions on this page and make any desired changes at this time. This new connection may <em>not</em> be able to communicate with you until you submit this page, which will install and apply the selected permissions.'),
+ '$affinity' => $affinity,
+ '$pending_label' => t('Connection Pending Approval'),
+ '$pending_modal_title' => t('Connection Request'),
+ '$pending_modal_body' => sprintf(t('(%s) would like to connect with you. Please approve this connection to allow communication.'), $contact['xchan_addr']),
+ '$pending_modal_approve' => t('Approve'),
+ '$pending_modal_dismiss' => t('Approve Later'),
'$is_pending' => (($contact['abook_flags'] & ABOOK_FLAG_PENDING) ? 1 : ''),
'$unapproved' => $unapproved,
'$inherited' => t('inherited'),
- '$approve' => t('Approve this connection'),
- '$noperms' => (($contact['abook_my_perms']) ? false : true),
- '$no_perms' => (((! $self) && (! $contact['abook_my_perms'])) ? t('Connection has no individual permissions!') : ''),
- '$noperm_desc' => (((! $self) && (! $contact['abook_my_perms'])) ? t('This may be appropriate based on your <a href="settings">privacy settings</a>, though you may wish to review the "Advanced Permissions".') : ''),
'$submit' => t('Submit'),
- '$lbl_vis1' => t('Profile Visibility'),
'$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['xchan_name']),
- '$lbl_info1' => t('Contact Information / Notes'),
- '$infedit' => t('Edit contact notes'),
'$close' => $contact['abook_closeness'],
'$them' => t('Their Settings'),
'$me' => t('My Settings'),
'$perms' => $perms,
- '$perms_new' => t('Default permissions for this channel type have (just) been applied. They have <em>not</em> been saved and there are currently no stored default permissions. Please review/edit the applied settings and click [Submit] to finalize.'),
- '$clear' => t('Clear/Disable Automatic Permissions'),
- '$forum' => t('Forum Members'),
- '$soapbox' => t('Soapbox'),
- '$full' => t('Full Sharing (typical social network permissions)'),
- '$cautious' => t('Cautious Sharing '),
- '$follow' => t('Follow Only'),
'$permlbl' => t('Individual Permissions'),
- '$permnote' => t('Some permissions may be inherited from your channel <a href="settings">privacy settings</a>, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect.'),
- '$advanced' => t('Advanced Permissions'),
- '$quick' => t('Simple Permissions (select one and submit)'),
- '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_channel() . '/' . $contact['id'],
- '$all_friends' => $all_friends,
- '$relation_text' => $relation_text,
- '$visit' => sprintf( t('Visit %s\'s profile - %s'),$contact['xchan_name'],$contact['xchan_url']),
- '$blockunblock' => t('Block/Unblock contact'),
- '$ignorecont' => t('Ignore contact'),
- '$lblcrepair' => t("Repair URL settings"),
- '$lblrecent' => t('View conversations'),
- '$lblsuggest' => $lblsuggest,
- '$delete' => t('Delete contact'),
-
- '$poll_interval' => contact_poll_interval($contact['priority'],(! $poll_enabled)),
- '$poll_enabled' => $poll_enabled,
+ '$permnote' => t('Some permissions may be inherited from your channel\'s <a href="settings"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here.'),
+ '$permnote_self' => t('Some permissions may be inherited from your channel\'s <a href="settings"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes.'),
'$lastupdtext' => t('Last update:'),
- '$lost_contact' => $lost_contact,
- '$updpub' => t('Update public posts'),
'$last_update' => relative_date($contact['abook_connected']),
- '$udnow' => t('Update now'),
'$profile_select' => contact_profile_assign($contact['abook_profile']),
- '$multiprofs' => feature_enabled(local_channel(),'multi_profiles'),
+ '$multiprofs' => $multiprofs,
'$contact_id' => $contact['abook_id'],
- '$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
- '$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
- '$blocked' => (($contact['blocked']) ? t('Currently blocked') : ''),
- '$ignored' => (($contact['readonly']) ? t('Currently ignored') : ''),
- '$archived' => (($contact['archive']) ? t('Currently archived') : ''),
- '$pending' => (($contact['archive']) ? t('Currently pending') : ''),
- '$name' => $contact['name'],
- '$alt_text' => $alt_text,
- '$url' => $url
+ '$name' => $contact['xchan_name'],
));
diff --git a/mod/directory.php b/mod/directory.php
index 6d066a21b..44d80cff1 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -19,6 +19,7 @@ function directory_init(&$a) {
$observer = get_observer_hash();
$global_changed = false;
$safe_changed = false;
+ $pubforums_changed = false;
if(array_key_exists('global',$_REQUEST)) {
$globaldir = intval($_REQUEST['global']);
@@ -28,7 +29,7 @@ function directory_init(&$a) {
$_SESSION['globaldir'] = $globaldir;
if($observer)
set_xconfig($observer,'directory','globaldir',$globaldir);
- }
+ }
if(array_key_exists('safe',$_REQUEST)) {
$safemode = intval($_REQUEST['safe']);
@@ -37,9 +38,19 @@ function directory_init(&$a) {
if($safe_changed) {
$_SESSION['safemode'] = $safemode;
if($observer)
- set_xconfig($observer,'directory','safe_mode',$safemode);
- }
+ set_xconfig($observer,'directory','safemode',$safemode);
+ }
+
+ if(array_key_exists('pubforums',$_REQUEST)) {
+ $pubforums = intval($_REQUEST['pubforums']);
+ $pubforums_changed = true;
+ }
+ if($pubforums_changed) {
+ $_SESSION['pubforums'] = $pubforums;
+ if($observer)
+ set_xconfig($observer,'directory','pubforums',$pubforums);
+ }
}
function directory_content(&$a) {
@@ -51,18 +62,14 @@ function directory_content(&$a) {
$observer = get_observer_hash();
- $globaldir = get_globaldir_setting($observer);
+ $globaldir = get_directory_setting($observer, 'globaldir');
// override your personal global search pref if we're doing a navbar search of the directory
if(intval($_REQUEST['navsearch']))
$globaldir = 1;
- $safe_mode = get_safemode_setting($observer);
+ $safe_mode = get_directory_setting($observer, 'safemode');
- $pubforums = null;
- if(array_key_exists('pubforums',$_REQUEST))
- $pubforums = intval($_REQUEST['pubforums']);
- if(! $pubforums)
- $pubforums = null;
+ $pubforums = get_directory_setting($observer, 'pubforums');
$o = '';
nav_set_selected('directory');
@@ -375,7 +382,13 @@ function directory_content(&$a) {
'$entries' => $entries,
'$dirlbl' => $suggest ? t('Channel Suggestions') : $dirtitle,
'$submit' => t('Find'),
- '$next' => alt_pager($a,$j['records'], t('next page'), t('previous page'))
+ '$next' => alt_pager($a,$j['records'], t('next page'), t('previous page')),
+ '$sort' => t('Sort options'),
+ '$normal' => t('Alphabetic'),
+ '$reverse' => t('Reverse Alphabetic'),
+ '$date' => t('Newest to Oldest'),
+ '$reversedate' => t('Oldest to Newest'),
+ '$suggest' => $suggest ? '&suggest=1' : ''
));
diff --git a/mod/display.php b/mod/display.php
index b5daea2de..8c4707bb2 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -52,6 +52,7 @@ function display_content(&$a, $update = 0, $load = false) {
'deny_gid' => $channel['channel_deny_gid']
);
+
$x = array(
'is_owner' => true,
'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''),
@@ -63,10 +64,13 @@ function display_content(&$a, $update = 0, $load = false) {
'bang' => '',
'visitor' => true,
'profile_uid' => local_channel(),
- 'return_path' => 'channel/' . $channel['channel_address']
+ 'return_path' => 'channel/' . $channel['channel_address'],
+ 'expanded' => true
);
+ $o = '<div id="jot-popup">';
$o .= status_editor($a,$x);
+ $o .= '</div>';
}
diff --git a/mod/editblock.php b/mod/editblock.php
index a0ece8133..faa283b63 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -108,12 +108,6 @@ function editblock_content(&$a) {
else
$mimeselect = mimetype_select($itm[0]['uid'],$mimetype);
- $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
- '$title' => t('Edit Block'),
- '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
- '$id' => $itm[0]['id']
- ));
-
$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
'$baseurl' => $a->get_baseurl(),
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
@@ -133,7 +127,7 @@ function editblock_content(&$a) {
$rp = 'blocks/' . $channel['channel_address'];
- $o .= replace_macros($tpl,array(
+ $editor = replace_macros($tpl,array(
'$return_path' => $rp,
'$action' => 'item',
'$webpage' => ITEM_BUILDBLOCK,
@@ -181,6 +175,13 @@ function editblock_content(&$a) {
'$expires' => t('Set expiration date'),
));
+ $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+ '$title' => t('Edit Block'),
+ '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+ '$id' => $itm[0]['id'],
+ '$editor' => $editor
+ ));
+
return $o;
}
diff --git a/mod/editlayout.php b/mod/editlayout.php
index 8ab5aab22..a39611a58 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -101,12 +101,6 @@ function editlayout_content(&$a) {
$layout_title = $item_id[0]['sid'];
$plaintext = true;
-
- $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
- '$title' => t('Edit Layout'),
- '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
- '$id' => $itm[0]['id']
- ));
$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
'$baseurl' => $a->get_baseurl(),
@@ -132,7 +126,7 @@ function editlayout_content(&$a) {
$rp = 'layouts/' . $which;
- $o .= replace_macros($tpl,array(
+ $editor = replace_macros($tpl,array(
'$return_path' => $rp,
'$action' => 'item',
'$webpage' => ITEM_PDL,
@@ -178,6 +172,14 @@ function editlayout_content(&$a) {
'$expires' => t('Set expiration date'),
));
+
+ $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+ '$title' => t('Edit Layout'),
+ '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+ '$id' => $itm[0]['id'],
+ '$editor' => $editor
+ ));
+
return $o;
}
diff --git a/mod/editpost.php b/mod/editpost.php
index 81bb91b2a..e907a07d0 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -38,11 +38,6 @@ function editpost_content(&$a) {
$channel = $a->get_channel();
- $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
- '$title' => t('Edit post')
- ));
-
-
$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
'$baseurl' => $a->get_baseurl(),
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
@@ -53,8 +48,6 @@ function editpost_content(&$a) {
'$confirmdelete' => t('Delete item?'),
));
-
-
if($itm[0]['item_flags'] & ITEM_OBSCURED) {
$key = get_config('system','prvkey');
if($itm[0]['title'])
@@ -107,7 +100,7 @@ function editpost_content(&$a) {
$cipher = 'aes256';
- $o .= replace_macros($tpl,array(
+ $editor = replace_macros($tpl,array(
'$return_path' => $_SESSION['return_url'],
'$action' => 'item',
'$share' => t('Edit'),
@@ -161,6 +154,11 @@ function editpost_content(&$a) {
'$expiryModalCANCEL' => t('Cancel'),
));
+ $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+ '$title' => t('Edit post'),
+ '$editor' => $editor
+ ));
+
return $o;
}
diff --git a/mod/events.php b/mod/events.php
index 289ddfb15..9c94d433d 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -13,6 +13,20 @@ function events_post(&$a) {
if(! local_channel())
return;
+ if(($_FILES) && array_key_exists('userfile',$_FILES) && intval($_FILES['userfile']['size'])) {
+ $src = $_FILES['userfile']['tmp_name'];
+ if($src) {
+ $result = parse_ical_file($src,local_channel());
+ if($result)
+ info( t('Calendar entries imported.') . EOL);
+ else
+ notice( t('No calendar entries found.') . EOL);
+ @unlink($src);
+ }
+ goaway(z_root() . '/events');
+ }
+
+
$event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0);
$event_hash = ((x($_POST,'event_hash')) ? $_POST['event_hash'] : '');
@@ -148,10 +162,9 @@ function events_post(&$a) {
}
}
else {
- // Note: do not set `private` field for self-only events. It will
- // keep even you from seeing them!
$str_contact_allow = '<' . $channel['channel_hash'] . '>';
$str_group_allow = $str_contact_deny = $str_group_deny = '';
+ $private_event = true;
}
}
@@ -450,6 +463,7 @@ function events_content(&$a) {
if($export) {
header('Content-type: text/calendar');
+ header('content-disposition: attachment; filename="' . t('calendar') . '-' . $channel['channel_address'] . '.ics"' );
echo ical_wrapper($r);
killme();
}
@@ -476,8 +490,8 @@ function events_content(&$a) {
'$export' => array($a->get_baseurl()."/events/$y/$m/export",t('Export'),'',''),
'$calendar' => cal($y,$m,$links, ' eventcal'),
'$events' => $events,
-
-
+ '$upload' => t('Import'),
+ '$submit' => t('Submit')
));
if (x($_GET,'id')){ echo $o; killme(); }
diff --git a/mod/import.php b/mod/import.php
index 9877ce9f3..ccedb2c0b 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -414,7 +414,7 @@ function import_post(&$a) {
}
$group_members = $data['group_member'];
- if($groups_members) {
+ if($group_members) {
foreach($group_members as $group_member) {
unset($group_member['id']);
$group_member['uid'] = $channel['channel_id'];
diff --git a/mod/menu.php b/mod/menu.php
index f46dc9471..7763c4ed1 100644
--- a/mod/menu.php
+++ b/mod/menu.php
@@ -137,7 +137,9 @@ function menu_content(&$a) {
$o = replace_macros(get_markup_template('menuedit.tpl'), array(
'$header' => t('Edit Menu'),
+ '$sys' => $a->is_sys,
'$menu_id' => intval(argv(1)),
+ '$menu_edit_link' => 'mitem/' . intval(argv(1)) . (($a->is_sys) ? '?f=&sys=1' : ''),
'$hintedit' => t('Add or remove entries to this menu'),
'$editcontents' => t('Edit menu contents'),
'$menu_name' => array('menu_name', t('Menu name'), $m['menu_name'], t('Must be unique, only seen by you'), '*'),
diff --git a/mod/mitem.php b/mod/mitem.php
index c4c293d1e..bc93165ac 100644
--- a/mod/mitem.php
+++ b/mod/mitem.php
@@ -44,9 +44,6 @@ function mitem_post(&$a) {
if(! $a->data['menu'])
return;
-
- $channel = $a->get_channel();
-
if(!$_REQUEST['mitem_desc'] || !$_REQUEST['mitem_link']) {
notice( t('Unable to create element.') . EOL);
return;
@@ -90,9 +87,6 @@ function mitem_post(&$a) {
}
-
-
-
}
@@ -167,7 +161,8 @@ function mitem_content(&$a) {
'$submit_more' => t('Submit and continue'),
'$display' => $display,
'$lockstate' => $lockstate,
- '$menu_names' => $menu_names
+ '$menu_names' => $menu_names,
+ '$sys' => $a->is_sys
));
$o .= replace_macros(get_markup_template('mitemlist.tpl'),array(
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 597b5f66d..c70e8fc94 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -135,7 +135,7 @@ function profile_photo_post(&$a) {
$im = photo_factory($base_image['data'], $base_image['type']);
if($im->is_valid()) {
- $im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
+ $im->cropImage(300,$srcX,$srcY,$srcW,$srcH);
$aid = get_account_id();
@@ -411,7 +411,7 @@ function profile_photo_crop_ui_head(&$a, $ph){
$width = $ph->getWidth();
$height = $ph->getHeight();
- if($width < 175 || $height < 175) {
+ if($width < 300 || $height < 300) {
$ph->scaleImageUp(200);
$width = $ph->getWidth();
$height = $ph->getHeight();
diff --git a/mod/setup.php b/mod/setup.php
index d88cf73f1..bba29921e 100755
--- a/mod/setup.php
+++ b/mod/setup.php
@@ -729,6 +729,6 @@ function what_next() {
."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')
.t('Please see the file "install/INSTALL.txt".')
."</p><p>"
- .t("Go to your new Red node <a href='$baseurl/register'>registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.")
+ .t("Go to your new hub <a href='$baseurl/register'>registration page</a> and register as new member. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.")
."</p>";
}
diff --git a/mod/uexport.php b/mod/uexport.php
index edcb2fa84..b0bb11afa 100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -9,9 +9,17 @@ function uexport_init(&$a) {
require_once('include/identity.php');
+ if(argc() > 1 && intval(argv(1)) > 1900) {
+ $year = intval(argv(1));
+ }
+
header('content-type: application/octet_stream');
- header('content-disposition: attachment; filename="' . $channel['channel_address'] . '.json"' );
+ header('content-disposition: attachment; filename="' . $channel['channel_address'] . (($year) ? '-' . $year : '') . '.json"' );
+ if($year) {
+ echo json_encode(identity_export_year(local_channel(),$year));
+ killme();
+ }
if(argc() > 1 && argv(1) === 'basic') {
echo json_encode(identity_basic_export(local_channel()));
diff --git a/util/add_addon_repo b/util/add_addon_repo
index 4979c06bc..decd9e091 100755
--- a/util/add_addon_repo
+++ b/util/add_addon_repo
@@ -1,4 +1,4 @@
-#!/bin/sh -f
+#!/bin/bash -f
if [ $# -ne 2 ]; then
echo usage: $0 repo_url nickname
diff --git a/util/add_theme_repo b/util/add_theme_repo
index 70a8c6432..d41eba6d9 100755
--- a/util/add_theme_repo
+++ b/util/add_theme_repo
@@ -1,4 +1,4 @@
-#!/bin/sh -f
+#!/bin/bash -f
if [ $# -ne 2 ]; then
diff --git a/util/add_widget_repo b/util/add_widget_repo
index 449afe5db..347e8e4e1 100755
--- a/util/add_widget_repo
+++ b/util/add_widget_repo
@@ -1,4 +1,4 @@
-#!/bin/sh -f
+#!/bin/bash -f
if [ $# -ne 2 ]; then
echo usage: $0 repo_url nickname
diff --git a/util/messages.po b/util/messages.po
index c6c95dd42..d645321f7 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2015-06-26.1075\n"
+"Project-Id-Version: 2015-07-31.1110\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-26 00:05-0700\n"
+"POT-Creation-Date: 2015-07-31 00:03-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,401 +28,82 @@ msgstr ""
msgid "Profile Photos"
msgstr ""
-#: ../../include/text.php:395
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:397
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:426
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:429
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:439
-msgid "older"
-msgstr ""
-
-#: ../../include/text.php:441
-msgid "newer"
-msgstr ""
-
-#: ../../include/text.php:834
-msgid "No connections"
-msgstr ""
-
-#: ../../include/text.php:848
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/text.php:861 ../../mod/viewconnections.php:104
-msgid "View Connections"
-msgstr ""
-
-#: ../../include/text.php:918 ../../include/text.php:930
-#: ../../include/nav.php:165 ../../include/apps.php:147
-#: ../../mod/search.php:38
-msgid "Search"
-msgstr ""
-
-#: ../../include/text.php:919 ../../include/text.php:931
-#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
-#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1457
-#: ../../mod/admin.php:1477
-msgid "Save"
-msgstr ""
-
-#: ../../include/text.php:994
-msgid "poke"
-msgstr ""
-
-#: ../../include/text.php:994 ../../include/conversation.php:243
-msgid "poked"
-msgstr ""
-
-#: ../../include/text.php:995
-msgid "ping"
-msgstr ""
-
-#: ../../include/text.php:995
-msgid "pinged"
-msgstr ""
-
-#: ../../include/text.php:996
-msgid "prod"
-msgstr ""
-
-#: ../../include/text.php:996
-msgid "prodded"
-msgstr ""
-
-#: ../../include/text.php:997
-msgid "slap"
-msgstr ""
-
-#: ../../include/text.php:997
-msgid "slapped"
-msgstr ""
-
-#: ../../include/text.php:998
-msgid "finger"
-msgstr ""
-
-#: ../../include/text.php:998
-msgid "fingered"
-msgstr ""
-
-#: ../../include/text.php:999
-msgid "rebuff"
-msgstr ""
-
-#: ../../include/text.php:999
-msgid "rebuffed"
-msgstr ""
-
-#: ../../include/text.php:1009
-msgid "happy"
-msgstr ""
-
-#: ../../include/text.php:1010
-msgid "sad"
-msgstr ""
-
-#: ../../include/text.php:1011
-msgid "mellow"
-msgstr ""
-
-#: ../../include/text.php:1012
-msgid "tired"
-msgstr ""
-
-#: ../../include/text.php:1013
-msgid "perky"
-msgstr ""
-
-#: ../../include/text.php:1014
-msgid "angry"
-msgstr ""
-
-#: ../../include/text.php:1015
-msgid "stupified"
-msgstr ""
-
-#: ../../include/text.php:1016
-msgid "puzzled"
-msgstr ""
-
-#: ../../include/text.php:1017
-msgid "interested"
-msgstr ""
-
-#: ../../include/text.php:1018
-msgid "bitter"
-msgstr ""
-
-#: ../../include/text.php:1019
-msgid "cheerful"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "alive"
-msgstr ""
-
-#: ../../include/text.php:1021
-msgid "annoyed"
-msgstr ""
-
-#: ../../include/text.php:1022
-msgid "anxious"
-msgstr ""
-
-#: ../../include/text.php:1023
-msgid "cranky"
-msgstr ""
-
-#: ../../include/text.php:1024
-msgid "disturbed"
-msgstr ""
-
-#: ../../include/text.php:1025
-msgid "frustrated"
-msgstr ""
-
-#: ../../include/text.php:1026
-msgid "depressed"
-msgstr ""
-
-#: ../../include/text.php:1027
-msgid "motivated"
-msgstr ""
-
-#: ../../include/text.php:1028
-msgid "relaxed"
-msgstr ""
-
-#: ../../include/text.php:1029
-msgid "surprised"
-msgstr ""
-
-#: ../../include/text.php:1201
-msgid "Monday"
-msgstr ""
-
-#: ../../include/text.php:1201
-msgid "Tuesday"
-msgstr ""
-
-#: ../../include/text.php:1201
-msgid "Wednesday"
-msgstr ""
-
-#: ../../include/text.php:1201
-msgid "Thursday"
-msgstr ""
-
-#: ../../include/text.php:1201
-msgid "Friday"
-msgstr ""
-
-#: ../../include/text.php:1201
-msgid "Saturday"
-msgstr ""
-
-#: ../../include/text.php:1201
-msgid "Sunday"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "January"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "February"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "March"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "April"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "May"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "June"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "July"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "August"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "September"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "October"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "November"
-msgstr ""
-
-#: ../../include/text.php:1205
-msgid "December"
-msgstr ""
-
-#: ../../include/text.php:1310
-msgid "unknown.???"
-msgstr ""
-
-#: ../../include/text.php:1311
-msgid "bytes"
-msgstr ""
-
-#: ../../include/text.php:1347
-msgid "remove category"
-msgstr ""
-
-#: ../../include/text.php:1422
-msgid "remove from file"
-msgstr ""
-
-#: ../../include/text.php:1498 ../../include/text.php:1509
-#: ../../mod/connedit.php:661
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/text.php:1665 ../../mod/events.php:444
-msgid "Link to Source"
-msgstr ""
-
-#: ../../include/text.php:1686 ../../include/text.php:1757
-msgid "default"
-msgstr ""
-
-#: ../../include/text.php:1694
-msgid "Page layout"
-msgstr ""
-
-#: ../../include/text.php:1694
-msgid "You can create your own with the layouts tool"
-msgstr ""
-
-#: ../../include/text.php:1735
-msgid "Page content type"
-msgstr ""
-
-#: ../../include/text.php:1769
-msgid "Select an alternate language"
-msgstr ""
-
-#: ../../include/text.php:1888 ../../include/diaspora.php:2101
-#: ../../include/conversation.php:120 ../../mod/like.php:346
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:43
-msgid "photo"
-msgstr ""
-
-#: ../../include/text.php:1891 ../../include/conversation.php:123
-#: ../../mod/like.php:348 ../../mod/tagger.php:47
-msgid "event"
+#: ../../include/menu.php:107 ../../include/page_widgets.php:8
+#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:266
+#: ../../include/ItemObject.php:100 ../../include/apps.php:254
+#: ../../mod/webpages.php:181 ../../mod/thing.php:227
+#: ../../mod/connections.php:382 ../../mod/connections.php:395
+#: ../../mod/connections.php:414 ../../mod/blocks.php:153
+#: ../../mod/editpost.php:106 ../../mod/editlayout.php:133
+#: ../../mod/editwebpage.php:178 ../../mod/editblock.php:134
+#: ../../mod/menu.php:103 ../../mod/settings.php:650 ../../mod/layouts.php:183
+msgid "Edit"
msgstr ""
-#: ../../include/text.php:1894 ../../include/diaspora.php:2101
-#: ../../include/conversation.php:148 ../../mod/like.php:346
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:51
-msgid "status"
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
msgstr ""
-#: ../../include/text.php:1896 ../../include/conversation.php:150
-#: ../../mod/tagger.php:53
-msgid "comment"
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
msgstr ""
-#: ../../include/text.php:1901
-msgid "activity"
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
msgstr ""
-#: ../../include/text.php:2196
-msgid "Design Tools"
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
msgstr ""
-#: ../../include/text.php:2199 ../../mod/blocks.php:147
-msgid "Blocks"
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
msgstr ""
-#: ../../include/text.php:2200 ../../mod/menu.php:98
-msgid "Menus"
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
msgstr ""
-#: ../../include/text.php:2201 ../../mod/layouts.php:174
-msgid "Layouts"
+#: ../../include/contact_selectors.php:76
+msgid "Friendica"
msgstr ""
-#: ../../include/text.php:2202
-msgid "Pages"
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
msgstr ""
-#: ../../include/text.php:2553 ../../include/RedDAV/RedBrowser.php:131
-msgid "Collection"
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
msgstr ""
-#: ../../include/menu.php:107 ../../include/page_widgets.php:8
-#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:266
-#: ../../include/ItemObject.php:100 ../../include/apps.php:254
-#: ../../mod/webpages.php:181 ../../mod/thing.php:227
-#: ../../mod/connections.php:382 ../../mod/connections.php:395
-#: ../../mod/connections.php:414 ../../mod/blocks.php:153
-#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:178
-#: ../../mod/editpost.php:113 ../../mod/menu.php:103
-#: ../../mod/editblock.php:140 ../../mod/settings.php:650
-#: ../../mod/layouts.php:183
-msgid "Edit"
+#: ../../include/contact_selectors.php:79 ../../mod/admin.php:822
+#: ../../mod/admin.php:831 ../../mod/id.php:15 ../../mod/id.php:16
+#: ../../boot.php:1553
+msgid "Email"
msgstr ""
-#: ../../include/diaspora.php:2130 ../../include/conversation.php:164
-#: ../../mod/like.php:394
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
msgstr ""
-#: ../../include/diaspora.php:2476
-msgid "Please choose"
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
msgstr ""
-#: ../../include/diaspora.php:2478
-msgid "Agree"
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
msgstr ""
-#: ../../include/diaspora.php:2480
-msgid "Disagree"
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
msgstr ""
-#: ../../include/diaspora.php:2482
-msgid "Abstain"
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
msgstr ""
-#: ../../include/diaspora.php:2504 ../../include/diaspora.php:2515
-#: ../../include/enotify.php:59 ../../mod/p.php:46
-msgid "$projectname"
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
msgstr ""
#: ../../include/notify.php:23
@@ -438,11 +119,11 @@ msgstr ""
msgid "No username found in import file."
msgstr ""
-#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:142
+#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:156
msgid "Unable to create a unique channel address. Import failed."
msgstr ""
-#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:490
+#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504
msgid "Import completed."
msgstr ""
@@ -524,7 +205,7 @@ msgid "Registration request at %s"
msgstr ""
#: ../../include/account.php:314 ../../include/account.php:341
-#: ../../include/account.php:401
+#: ../../include/account.php:401 ../../include/network.php:1632
msgid "Administrator"
msgstr ""
@@ -570,7 +251,7 @@ msgstr ""
msgid "YYYY-MM-DD or MM-DD"
msgstr ""
-#: ../../include/datetime.php:235 ../../mod/events.php:635
+#: ../../include/datetime.php:235 ../../mod/events.php:649
#: ../../mod/appman.php:91 ../../mod/appman.php:92
msgid "Required"
msgstr ""
@@ -655,6 +336,47 @@ msgstr ""
msgid "Happy Birthday %1$s"
msgstr ""
+#: ../../include/dir_fns.php:126
+msgid "Directory Options"
+msgstr ""
+
+#: ../../include/dir_fns.php:128
+msgid "Safe Mode"
+msgstr ""
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/api.php:106
+#: ../../mod/photos.php:568 ../../mod/mitem.php:157 ../../mod/mitem.php:158
+#: ../../mod/mitem.php:229 ../../mod/mitem.php:230 ../../mod/menu.php:91
+#: ../../mod/menu.php:147 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:428
+#: ../../mod/settings.php:579 ../../mod/removeme.php:60
+#: ../../mod/connedit.php:635 ../../mod/connedit.php:663
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1555
+msgid "No"
+msgstr ""
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/api.php:105
+#: ../../mod/photos.php:568 ../../mod/mitem.php:157 ../../mod/mitem.php:158
+#: ../../mod/mitem.php:229 ../../mod/mitem.php:230 ../../mod/menu.php:91
+#: ../../mod/menu.php:147 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:430
+#: ../../mod/settings.php:579 ../../mod/removeme.php:60
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1555
+msgid "Yes"
+msgstr ""
+
+#: ../../include/dir_fns.php:129
+msgid "Public Forums Only"
+msgstr ""
+
+#: ../../include/dir_fns.php:130
+msgid "This Website Only"
+msgstr ""
+
#: ../../include/page_widgets.php:6
msgid "New Page"
msgstr ""
@@ -666,9 +388,9 @@ msgstr ""
#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
#: ../../include/conversation.php:1155 ../../mod/webpages.php:188
-#: ../../mod/events.php:653 ../../mod/photos.php:982
-#: ../../mod/editwebpage.php:214 ../../mod/editpost.php:150
-#: ../../mod/editblock.php:176
+#: ../../mod/events.php:667 ../../mod/editpost.php:143
+#: ../../mod/photos.php:982 ../../mod/editwebpage.php:214
+#: ../../mod/editblock.php:170
msgid "Preview"
msgstr ""
@@ -703,64 +425,6 @@ msgstr ""
msgid "Default"
msgstr ""
-#: ../../include/dir_fns.php:143
-msgid "Directory Options"
-msgstr ""
-
-#: ../../include/dir_fns.php:144
-msgid "Alphabetic"
-msgstr ""
-
-#: ../../include/dir_fns.php:145
-msgid "Reverse Alphabetic"
-msgstr ""
-
-#: ../../include/dir_fns.php:146
-msgid "Newest to Oldest"
-msgstr ""
-
-#: ../../include/dir_fns.php:147
-msgid "Oldest to Newest"
-msgstr ""
-
-#: ../../include/dir_fns.php:148
-msgid "Sort"
-msgstr ""
-
-#: ../../include/dir_fns.php:152
-msgid "Safe Mode"
-msgstr ""
-
-#: ../../include/dir_fns.php:154
-msgid "Public Forums Only"
-msgstr ""
-
-#: ../../include/dir_fns.php:155
-msgid "This Website Only"
-msgstr ""
-
-#: ../../include/event.php:19 ../../include/bb2diaspora.php:459
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
-
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:465
-msgid "Starts:"
-msgstr ""
-
-#: ../../include/event.php:37 ../../include/bb2diaspora.php:473
-msgid "Finishes:"
-msgstr ""
-
-#: ../../include/event.php:47 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:879 ../../mod/directory.php:296
-#: ../../mod/events.php:647
-msgid "Location:"
-msgstr ""
-
-#: ../../include/event.php:391
-msgid "This event has been added to your calendar."
-msgstr ""
-
#: ../../include/js_strings.php:5
msgid "Delete this item?"
msgstr ""
@@ -823,6 +487,7 @@ msgid "Rate This Channel (this is public)"
msgstr ""
#: ../../include/js_strings.php:20 ../../mod/rate.php:156
+#: ../../mod/connedit.php:671
msgid "Rating"
msgstr ""
@@ -832,22 +497,23 @@ msgstr ""
#: ../../include/js_strings.php:22 ../../include/ItemObject.php:668
#: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:275
-#: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81
-#: ../../mod/photos.php:577 ../../mod/photos.php:654 ../../mod/photos.php:941
-#: ../../mod/photos.php:981 ../../mod/photos.php:1099 ../../mod/pdledit.php:58
-#: ../../mod/import.php:520 ../../mod/chat.php:177 ../../mod/chat.php:211
-#: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105
-#: ../../mod/sources.php:104 ../../mod/sources.php:138
-#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
-#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/setup.php:327
-#: ../../mod/setup.php:367 ../../mod/admin.php:453 ../../mod/admin.php:819
-#: ../../mod/admin.php:986 ../../mod/admin.php:1118 ../../mod/admin.php:1312
-#: ../../mod/admin.php:1397 ../../mod/settings.php:588
-#: ../../mod/settings.php:692 ../../mod/settings.php:718
-#: ../../mod/settings.php:746 ../../mod/settings.php:769
-#: ../../mod/settings.php:854 ../../mod/settings.php:1050
-#: ../../mod/mitem.php:237 ../../mod/mood.php:134 ../../mod/connedit.php:679
-#: ../../mod/mail.php:355 ../../mod/appman.php:99 ../../mod/poll.php:68
+#: ../../mod/thing.php:318 ../../mod/events.php:494 ../../mod/events.php:670
+#: ../../mod/group.php:81 ../../mod/photos.php:577 ../../mod/photos.php:654
+#: ../../mod/photos.php:941 ../../mod/photos.php:981 ../../mod/photos.php:1099
+#: ../../mod/pdledit.php:58 ../../mod/import.php:534 ../../mod/chat.php:177
+#: ../../mod/chat.php:211 ../../mod/mitem.php:232 ../../mod/rate.php:167
+#: ../../mod/invite.php:142 ../../mod/locs.php:105 ../../mod/sources.php:104
+#: ../../mod/sources.php:138 ../../mod/filestorage.php:156
+#: ../../mod/fsuggest.php:108 ../../mod/poke.php:166
+#: ../../mod/profiles.php:667 ../../mod/setup.php:327 ../../mod/setup.php:367
+#: ../../mod/admin.php:453 ../../mod/admin.php:819 ../../mod/admin.php:986
+#: ../../mod/admin.php:1118 ../../mod/admin.php:1312 ../../mod/admin.php:1397
+#: ../../mod/settings.php:588 ../../mod/settings.php:692
+#: ../../mod/settings.php:718 ../../mod/settings.php:746
+#: ../../mod/settings.php:769 ../../mod/settings.php:854
+#: ../../mod/settings.php:1050 ../../mod/mood.php:134
+#: ../../mod/connedit.php:692 ../../mod/mail.php:355 ../../mod/appman.php:99
+#: ../../mod/pconfig.php:108 ../../mod/poll.php:68
#: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256
#: ../../view/theme/redbasic/php/config.php:99
msgid "Submit"
@@ -934,6 +600,361 @@ msgstr ""
msgid "timeago.numbers"
msgstr ""
+#: ../../include/text.php:395
+msgid "prev"
+msgstr ""
+
+#: ../../include/text.php:397
+msgid "first"
+msgstr ""
+
+#: ../../include/text.php:426
+msgid "last"
+msgstr ""
+
+#: ../../include/text.php:429
+msgid "next"
+msgstr ""
+
+#: ../../include/text.php:439
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:441
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:834
+msgid "No connections"
+msgstr ""
+
+#: ../../include/text.php:848
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:861 ../../mod/viewconnections.php:104
+msgid "View Connections"
+msgstr ""
+
+#: ../../include/text.php:918 ../../include/text.php:930
+#: ../../include/nav.php:165 ../../include/apps.php:147
+#: ../../mod/search.php:38
+msgid "Search"
+msgstr ""
+
+#: ../../include/text.php:919 ../../include/text.php:931
+#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
+#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1457
+#: ../../mod/admin.php:1477
+msgid "Save"
+msgstr ""
+
+#: ../../include/text.php:994
+msgid "poke"
+msgstr ""
+
+#: ../../include/text.php:994 ../../include/conversation.php:243
+msgid "poked"
+msgstr ""
+
+#: ../../include/text.php:995
+msgid "ping"
+msgstr ""
+
+#: ../../include/text.php:995
+msgid "pinged"
+msgstr ""
+
+#: ../../include/text.php:996
+msgid "prod"
+msgstr ""
+
+#: ../../include/text.php:996
+msgid "prodded"
+msgstr ""
+
+#: ../../include/text.php:997
+msgid "slap"
+msgstr ""
+
+#: ../../include/text.php:997
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:998
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:998
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:999
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:999
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:1009
+msgid "happy"
+msgstr ""
+
+#: ../../include/text.php:1010
+msgid "sad"
+msgstr ""
+
+#: ../../include/text.php:1011
+msgid "mellow"
+msgstr ""
+
+#: ../../include/text.php:1012
+msgid "tired"
+msgstr ""
+
+#: ../../include/text.php:1013
+msgid "perky"
+msgstr ""
+
+#: ../../include/text.php:1014
+msgid "angry"
+msgstr ""
+
+#: ../../include/text.php:1015
+msgid "stupified"
+msgstr ""
+
+#: ../../include/text.php:1016
+msgid "puzzled"
+msgstr ""
+
+#: ../../include/text.php:1017
+msgid "interested"
+msgstr ""
+
+#: ../../include/text.php:1018
+msgid "bitter"
+msgstr ""
+
+#: ../../include/text.php:1019
+msgid "cheerful"
+msgstr ""
+
+#: ../../include/text.php:1020
+msgid "alive"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "annoyed"
+msgstr ""
+
+#: ../../include/text.php:1022
+msgid "anxious"
+msgstr ""
+
+#: ../../include/text.php:1023
+msgid "cranky"
+msgstr ""
+
+#: ../../include/text.php:1024
+msgid "disturbed"
+msgstr ""
+
+#: ../../include/text.php:1025
+msgid "frustrated"
+msgstr ""
+
+#: ../../include/text.php:1026
+msgid "depressed"
+msgstr ""
+
+#: ../../include/text.php:1027
+msgid "motivated"
+msgstr ""
+
+#: ../../include/text.php:1028
+msgid "relaxed"
+msgstr ""
+
+#: ../../include/text.php:1029
+msgid "surprised"
+msgstr ""
+
+#: ../../include/text.php:1201
+msgid "Monday"
+msgstr ""
+
+#: ../../include/text.php:1201
+msgid "Tuesday"
+msgstr ""
+
+#: ../../include/text.php:1201
+msgid "Wednesday"
+msgstr ""
+
+#: ../../include/text.php:1201
+msgid "Thursday"
+msgstr ""
+
+#: ../../include/text.php:1201
+msgid "Friday"
+msgstr ""
+
+#: ../../include/text.php:1201
+msgid "Saturday"
+msgstr ""
+
+#: ../../include/text.php:1201
+msgid "Sunday"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "January"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "February"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "March"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "April"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "June"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "July"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "August"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "September"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "October"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "November"
+msgstr ""
+
+#: ../../include/text.php:1205
+msgid "December"
+msgstr ""
+
+#: ../../include/text.php:1310
+msgid "unknown.???"
+msgstr ""
+
+#: ../../include/text.php:1311
+msgid "bytes"
+msgstr ""
+
+#: ../../include/text.php:1347
+msgid "remove category"
+msgstr ""
+
+#: ../../include/text.php:1422
+msgid "remove from file"
+msgstr ""
+
+#: ../../include/text.php:1498 ../../include/text.php:1509
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/text.php:1665 ../../mod/events.php:457
+msgid "Link to Source"
+msgstr ""
+
+#: ../../include/text.php:1686 ../../include/text.php:1757
+msgid "default"
+msgstr ""
+
+#: ../../include/text.php:1694
+msgid "Page layout"
+msgstr ""
+
+#: ../../include/text.php:1694
+msgid "You can create your own with the layouts tool"
+msgstr ""
+
+#: ../../include/text.php:1735
+msgid "Page content type"
+msgstr ""
+
+#: ../../include/text.php:1769
+msgid "Select an alternate language"
+msgstr ""
+
+#: ../../include/text.php:1888 ../../include/diaspora.php:2119
+#: ../../include/conversation.php:120 ../../mod/like.php:346
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+#: ../../mod/tagger.php:43
+msgid "photo"
+msgstr ""
+
+#: ../../include/text.php:1891 ../../include/conversation.php:123
+#: ../../mod/like.php:348 ../../mod/tagger.php:47
+msgid "event"
+msgstr ""
+
+#: ../../include/text.php:1894 ../../include/diaspora.php:2119
+#: ../../include/conversation.php:148 ../../mod/like.php:346
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+msgid "status"
+msgstr ""
+
+#: ../../include/text.php:1896 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr ""
+
+#: ../../include/text.php:1901
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:2196
+msgid "Design Tools"
+msgstr ""
+
+#: ../../include/text.php:2199 ../../mod/blocks.php:147
+msgid "Blocks"
+msgstr ""
+
+#: ../../include/text.php:2200 ../../mod/menu.php:98
+msgid "Menus"
+msgstr ""
+
+#: ../../include/text.php:2201 ../../mod/layouts.php:174
+msgid "Layouts"
+msgstr ""
+
+#: ../../include/text.php:2202
+msgid "Pages"
+msgstr ""
+
+#: ../../include/text.php:2553 ../../include/RedDAV/RedBrowser.php:131
+msgid "Collection"
+msgstr ""
+
#: ../../include/RedDAV/RedBrowser.php:107
#: ../../include/RedDAV/RedBrowser.php:265
msgid "parent"
@@ -998,7 +1019,7 @@ msgstr ""
#: ../../include/RedDAV/RedBrowser.php:257
#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362
-#: ../../mod/photos.php:718 ../../mod/photos.php:1248
+#: ../../mod/events.php:493 ../../mod/photos.php:718 ../../mod/photos.php:1248
msgid "Upload"
msgstr ""
@@ -1024,9 +1045,9 @@ msgstr ""
#: ../../include/conversation.php:660 ../../include/apps.php:255
#: ../../mod/webpages.php:183 ../../mod/thing.php:228 ../../mod/group.php:176
#: ../../mod/blocks.php:155 ../../mod/photos.php:1062
-#: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:225
-#: ../../mod/admin.php:826 ../../mod/admin.php:988 ../../mod/editblock.php:113
-#: ../../mod/settings.php:651 ../../mod/connedit.php:543
+#: ../../mod/editlayout.php:178 ../../mod/editwebpage.php:225
+#: ../../mod/editblock.php:180 ../../mod/admin.php:826 ../../mod/admin.php:988
+#: ../../mod/settings.php:651 ../../mod/connedit.php:551
msgid "Delete"
msgstr ""
@@ -1047,6 +1068,29 @@ msgstr ""
msgid "view full size"
msgstr ""
+#: ../../include/network.php:1585 ../../include/enotify.php:58
+msgid "$Projectname Notification"
+msgstr ""
+
+#: ../../include/network.php:1586 ../../include/enotify.php:59
+#: ../../include/diaspora.php:2522 ../../include/diaspora.php:2533
+#: ../../mod/p.php:46
+msgid "$projectname"
+msgstr ""
+
+#: ../../include/network.php:1588 ../../include/enotify.php:61
+msgid "Thank You,"
+msgstr ""
+
+#: ../../include/network.php:1590 ../../include/enotify.php:63
+#, php-format
+msgid "%s Administrator"
+msgstr ""
+
+#: ../../include/network.php:1646
+msgid "No Subject"
+msgstr ""
+
#: ../../include/features.php:38
msgid "General Features"
msgstr ""
@@ -1155,7 +1199,7 @@ msgid ""
"(320px) photo thumbnails"
msgstr ""
-#: ../../include/features.php:59 ../../include/widgets.php:546
+#: ../../include/features.php:59 ../../include/widgets.php:548
#: ../../mod/sources.php:88
msgid "Channel Sources"
msgstr ""
@@ -1234,63 +1278,71 @@ msgid "Filter stream activity by depth of relationships"
msgstr ""
#: ../../include/features.php:74
-msgid "Suggest Channels"
+msgid "Connection Filtering"
msgstr ""
#: ../../include/features.php:74
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr ""
+
+#: ../../include/features.php:75
+msgid "Suggest Channels"
+msgstr ""
+
+#: ../../include/features.php:75
msgid "Show channel suggestions"
msgstr ""
-#: ../../include/features.php:79
+#: ../../include/features.php:80
msgid "Post/Comment Tools"
msgstr ""
-#: ../../include/features.php:80
+#: ../../include/features.php:81
msgid "Tagging"
msgstr ""
-#: ../../include/features.php:80
+#: ../../include/features.php:81
msgid "Ability to tag existing posts"
msgstr ""
-#: ../../include/features.php:81
+#: ../../include/features.php:82
msgid "Post Categories"
msgstr ""
-#: ../../include/features.php:81
+#: ../../include/features.php:82
msgid "Add categories to your posts"
msgstr ""
-#: ../../include/features.php:82 ../../include/widgets.php:304
+#: ../../include/features.php:83 ../../include/widgets.php:304
#: ../../include/contact_widgets.php:57
msgid "Saved Folders"
msgstr ""
-#: ../../include/features.php:82
+#: ../../include/features.php:83
msgid "Ability to file posts under folders"
msgstr ""
-#: ../../include/features.php:83
+#: ../../include/features.php:84
msgid "Dislike Posts"
msgstr ""
-#: ../../include/features.php:83
+#: ../../include/features.php:84
msgid "Ability to dislike posts/comments"
msgstr ""
-#: ../../include/features.php:84
+#: ../../include/features.php:85
msgid "Star Posts"
msgstr ""
-#: ../../include/features.php:84
+#: ../../include/features.php:85
msgid "Ability to mark special posts with a star indicator"
msgstr ""
-#: ../../include/features.php:85
+#: ../../include/features.php:86
msgid "Tag Cloud"
msgstr ""
-#: ../../include/features.php:85
+#: ../../include/features.php:86
msgid "Provide a personal tag cloud on your channel page"
msgstr ""
@@ -1322,7 +1374,7 @@ msgstr ""
#: ../../include/widgets.php:136 ../../include/widgets.php:175
#: ../../include/Contact.php:107 ../../include/conversation.php:945
-#: ../../include/identity.php:828 ../../mod/directory.php:310
+#: ../../include/identity.php:857 ../../mod/directory.php:316
#: ../../mod/match.php:64 ../../mod/suggest.php:52
msgid "Connect"
msgstr ""
@@ -1373,130 +1425,139 @@ msgstr ""
msgid "Archives"
msgstr ""
-#: ../../include/widgets.php:427 ../../mod/connedit.php:572
+#: ../../include/widgets.php:429 ../../mod/connedit.php:571
msgid "Me"
msgstr ""
-#: ../../include/widgets.php:428 ../../mod/connedit.php:573
+#: ../../include/widgets.php:430 ../../mod/connedit.php:572
msgid "Family"
msgstr ""
-#: ../../include/widgets.php:429 ../../include/identity.php:394
+#: ../../include/widgets.php:431 ../../include/identity.php:394
#: ../../include/identity.php:395 ../../include/identity.php:402
#: ../../include/profile_selectors.php:80 ../../mod/settings.php:345
#: ../../mod/settings.php:349 ../../mod/settings.php:350
#: ../../mod/settings.php:353 ../../mod/settings.php:364
-#: ../../mod/connedit.php:574
+#: ../../mod/connedit.php:573
msgid "Friends"
msgstr ""
-#: ../../include/widgets.php:430 ../../mod/connedit.php:575
+#: ../../include/widgets.php:432 ../../mod/connedit.php:574
msgid "Acquaintances"
msgstr ""
-#: ../../include/widgets.php:431 ../../mod/connections.php:231
-#: ../../mod/connections.php:246 ../../mod/connedit.php:576
+#: ../../include/widgets.php:433 ../../mod/connections.php:231
+#: ../../mod/connections.php:246 ../../mod/connedit.php:575
msgid "All"
msgstr ""
-#: ../../include/widgets.php:450
+#: ../../include/widgets.php:452
msgid "Refresh"
msgstr ""
-#: ../../include/widgets.php:485
+#: ../../include/widgets.php:487
msgid "Account settings"
msgstr ""
-#: ../../include/widgets.php:491
+#: ../../include/widgets.php:493
msgid "Channel settings"
msgstr ""
-#: ../../include/widgets.php:497
+#: ../../include/widgets.php:499
msgid "Additional features"
msgstr ""
-#: ../../include/widgets.php:503
+#: ../../include/widgets.php:505
msgid "Feature/Addon settings"
msgstr ""
-#: ../../include/widgets.php:509
+#: ../../include/widgets.php:511
msgid "Display settings"
msgstr ""
-#: ../../include/widgets.php:515
+#: ../../include/widgets.php:517
msgid "Connected apps"
msgstr ""
-#: ../../include/widgets.php:521
+#: ../../include/widgets.php:523
msgid "Export channel"
msgstr ""
-#: ../../include/widgets.php:530 ../../mod/connedit.php:653
+#: ../../include/widgets.php:532 ../../mod/connedit.php:662
msgid "Connection Default Permissions"
msgstr ""
-#: ../../include/widgets.php:538
+#: ../../include/widgets.php:540
msgid "Premium Channel Settings"
msgstr ""
-#: ../../include/widgets.php:554 ../../include/nav.php:208
+#: ../../include/widgets.php:556 ../../include/nav.php:208
#: ../../include/apps.php:134 ../../mod/admin.php:1079
#: ../../mod/admin.php:1279
msgid "Settings"
msgstr ""
-#: ../../include/widgets.php:567 ../../mod/message.php:31
+#: ../../include/widgets.php:569 ../../mod/message.php:31
#: ../../mod/mail.php:128
msgid "Messages"
msgstr ""
-#: ../../include/widgets.php:570
+#: ../../include/widgets.php:572
msgid "Check Mail"
msgstr ""
-#: ../../include/widgets.php:575 ../../include/nav.php:199
+#: ../../include/widgets.php:577 ../../include/nav.php:199
msgid "New Message"
msgstr ""
-#: ../../include/widgets.php:650
+#: ../../include/widgets.php:652
msgid "Chat Rooms"
msgstr ""
-#: ../../include/widgets.php:670
+#: ../../include/widgets.php:672
msgid "Bookmarked Chatrooms"
msgstr ""
-#: ../../include/widgets.php:690
+#: ../../include/widgets.php:692
msgid "Suggested Chatrooms"
msgstr ""
-#: ../../include/widgets.php:817 ../../include/widgets.php:875
+#: ../../include/widgets.php:819 ../../include/widgets.php:877
msgid "photo/image"
msgstr ""
-#: ../../include/widgets.php:970 ../../include/widgets.php:972
+#: ../../include/widgets.php:972 ../../include/widgets.php:974
msgid "Rate Me"
msgstr ""
-#: ../../include/widgets.php:976
+#: ../../include/widgets.php:978
msgid "View Ratings"
msgstr ""
-#: ../../include/widgets.php:987
+#: ../../include/widgets.php:989
msgid "Public Hubs"
msgstr ""
-#: ../../include/enotify.php:58
-msgid "$Projectname Notification"
+#: ../../include/event.php:22 ../../include/bb2diaspora.php:459
+msgid "l F d, Y \\@ g:i A"
msgstr ""
-#: ../../include/enotify.php:61
-msgid "Thank You,"
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:465
+msgid "Starts:"
msgstr ""
-#: ../../include/enotify.php:63
-#, php-format
-msgid "%s Administrator"
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:473
+msgid "Finishes:"
+msgstr ""
+
+#: ../../include/event.php:50 ../../include/bb2diaspora.php:481
+#: ../../include/identity.php:908 ../../mod/directory.php:302
+#: ../../mod/events.php:661
+msgid "Location:"
+msgstr ""
+
+#: ../../include/event.php:535
+msgid "This event has been added to your calendar."
msgstr ""
#: ../../include/enotify.php:96
@@ -1677,86 +1738,42 @@ msgstr ""
msgid "[Red:Notify]"
msgstr ""
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr ""
-
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr ""
-
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr ""
-
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr ""
-
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr ""
-
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr ""
-
-#: ../../include/contact_selectors.php:76
-msgid "Friendica"
-msgstr ""
-
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
-msgstr ""
-
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr ""
-
-#: ../../include/contact_selectors.php:79 ../../mod/admin.php:822
-#: ../../mod/admin.php:831 ../../mod/id.php:15 ../../mod/id.php:16
-#: ../../boot.php:1552
-msgid "Email"
-msgstr ""
-
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
-msgstr ""
-
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
+#: ../../include/message.php:18
+msgid "No recipient provided."
msgstr ""
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
+#: ../../include/message.php:23
+msgid "[no subject]"
msgstr ""
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
msgstr ""
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
+#: ../../include/message.php:200
+msgid "Stored post could not be verified."
msgstr ""
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
+#: ../../include/diaspora.php:2148 ../../include/conversation.php:164
+#: ../../mod/like.php:394
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
msgstr ""
-#: ../../include/message.php:18
-msgid "No recipient provided."
+#: ../../include/diaspora.php:2494
+msgid "Please choose"
msgstr ""
-#: ../../include/message.php:23
-msgid "[no subject]"
+#: ../../include/diaspora.php:2496
+msgid "Agree"
msgstr ""
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
+#: ../../include/diaspora.php:2498
+msgid "Disagree"
msgstr ""
-#: ../../include/message.php:200
-msgid "Stored post could not be verified."
+#: ../../include/diaspora.php:2500
+msgid "Abstain"
msgstr ""
#: ../../include/follow.php:28
@@ -1838,7 +1855,7 @@ msgid "View all"
msgstr ""
#: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1701 ../../include/identity.php:1138
+#: ../../include/conversation.php:1701 ../../include/identity.php:1167
#: ../../mod/photos.php:1019
msgctxt "noun"
msgid "Like"
@@ -1977,9 +1994,9 @@ msgid "Close"
msgstr ""
#: ../../include/ItemObject.php:364 ../../include/conversation.php:737
-#: ../../include/conversation.php:1209 ../../mod/photos.php:962
-#: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192
-#: ../../mod/editpost.php:130 ../../mod/editblock.php:155
+#: ../../include/conversation.php:1209 ../../mod/editpost.php:123
+#: ../../mod/photos.php:962 ../../mod/editlayout.php:147
+#: ../../mod/editwebpage.php:192 ../../mod/editblock.php:149
#: ../../mod/mail.php:241 ../../mod/mail.php:356
msgid "Please wait"
msgstr ""
@@ -1990,32 +2007,32 @@ msgid "This is you"
msgstr ""
#: ../../include/ItemObject.php:669 ../../include/conversation.php:1181
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:179
-#: ../../mod/editpost.php:114 ../../mod/editblock.php:141
+#: ../../mod/editpost.php:107 ../../mod/editlayout.php:134
+#: ../../mod/editwebpage.php:179 ../../mod/editblock.php:135
msgid "Bold"
msgstr ""
#: ../../include/ItemObject.php:670 ../../include/conversation.php:1182
-#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:180
-#: ../../mod/editpost.php:115 ../../mod/editblock.php:142
+#: ../../mod/editpost.php:108 ../../mod/editlayout.php:135
+#: ../../mod/editwebpage.php:180 ../../mod/editblock.php:136
msgid "Italic"
msgstr ""
#: ../../include/ItemObject.php:671 ../../include/conversation.php:1183
-#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:181
-#: ../../mod/editpost.php:116 ../../mod/editblock.php:143
+#: ../../mod/editpost.php:109 ../../mod/editlayout.php:136
+#: ../../mod/editwebpage.php:181 ../../mod/editblock.php:137
msgid "Underline"
msgstr ""
#: ../../include/ItemObject.php:672 ../../include/conversation.php:1184
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:182
-#: ../../mod/editpost.php:117 ../../mod/editblock.php:144
+#: ../../mod/editpost.php:110 ../../mod/editlayout.php:137
+#: ../../mod/editwebpage.php:182 ../../mod/editblock.php:138
msgid "Quote"
msgstr ""
#: ../../include/ItemObject.php:673 ../../include/conversation.php:1185
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:183
-#: ../../mod/editpost.php:118 ../../mod/editblock.php:145
+#: ../../mod/editpost.php:111 ../../mod/editlayout.php:138
+#: ../../mod/editwebpage.php:183 ../../mod/editblock.php:139
msgid "Code"
msgstr ""
@@ -2032,7 +2049,7 @@ msgid "Video"
msgstr ""
#: ../../include/ItemObject.php:680 ../../include/conversation.php:1236
-#: ../../mod/editpost.php:158 ../../mod/mail.php:247 ../../mod/mail.php:361
+#: ../../mod/editpost.php:151 ../../mod/mail.php:247 ../../mod/mail.php:361
msgid "Encrypt text"
msgstr ""
@@ -2057,7 +2074,7 @@ msgstr ""
msgid "$Projectname event notification:"
msgstr ""
-#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1549
+#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1550
msgid "Logout"
msgstr ""
@@ -2074,7 +2091,7 @@ msgid "Your posts and conversations"
msgstr ""
#: ../../include/nav.php:91 ../../include/conversation.php:942
-#: ../../mod/connedit.php:494 ../../mod/connedit.php:660
+#: ../../mod/connedit.php:498
msgid "View Profile"
msgstr ""
@@ -2090,7 +2107,7 @@ msgstr ""
msgid "Manage/Edit profiles"
msgstr ""
-#: ../../include/nav.php:95 ../../include/identity.php:851
+#: ../../include/nav.php:95 ../../include/identity.php:880
msgid "Edit Profile"
msgstr ""
@@ -2137,7 +2154,7 @@ msgstr ""
msgid "Your webpages"
msgstr ""
-#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1550
+#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1551
msgid "Login"
msgstr ""
@@ -2162,7 +2179,7 @@ msgstr ""
msgid "Home Page"
msgstr ""
-#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1526
+#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1527
msgid "Register"
msgstr ""
@@ -2264,7 +2281,7 @@ msgid "Outbox"
msgstr ""
#: ../../include/nav.php:202 ../../include/apps.php:140
-#: ../../mod/events.php:472
+#: ../../mod/events.php:486
msgid "Events"
msgstr ""
@@ -2707,7 +2724,7 @@ msgstr ""
msgid "Where are you right now?"
msgstr ""
-#: ../../include/conversation.php:1147 ../../mod/editpost.php:52
+#: ../../include/conversation.php:1147 ../../mod/editpost.php:47
#: ../../mod/mail.php:175 ../../mod/mail.php:290
msgid "Expires YYYY-MM-DD HH:MM"
msgstr ""
@@ -2725,9 +2742,9 @@ msgstr ""
msgid "Post as"
msgstr ""
-#: ../../include/conversation.php:1186 ../../mod/editlayout.php:145
-#: ../../mod/editwebpage.php:184 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:147 ../../mod/mail.php:238 ../../mod/mail.php:352
+#: ../../include/conversation.php:1186 ../../mod/editpost.php:112
+#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:184
+#: ../../mod/editblock.php:141 ../../mod/mail.php:238 ../../mod/mail.php:352
msgid "Upload photo"
msgstr ""
@@ -2735,9 +2752,9 @@ msgstr ""
msgid "upload photo"
msgstr ""
-#: ../../include/conversation.php:1188 ../../mod/editlayout.php:146
-#: ../../mod/editwebpage.php:185 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:148 ../../mod/mail.php:239 ../../mod/mail.php:353
+#: ../../include/conversation.php:1188 ../../mod/editpost.php:113
+#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:185
+#: ../../mod/editblock.php:142 ../../mod/mail.php:239 ../../mod/mail.php:353
msgid "Attach file"
msgstr ""
@@ -2745,9 +2762,9 @@ msgstr ""
msgid "attach file"
msgstr ""
-#: ../../include/conversation.php:1190 ../../mod/editlayout.php:147
-#: ../../mod/editwebpage.php:186 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:149 ../../mod/mail.php:240 ../../mod/mail.php:354
+#: ../../include/conversation.php:1190 ../../mod/editpost.php:114
+#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:186
+#: ../../mod/editblock.php:143 ../../mod/mail.php:240 ../../mod/mail.php:354
msgid "Insert web link"
msgstr ""
@@ -2771,9 +2788,9 @@ msgstr ""
msgid "audio link"
msgstr ""
-#: ../../include/conversation.php:1196 ../../mod/editlayout.php:151
-#: ../../mod/editwebpage.php:190 ../../mod/editpost.php:125
-#: ../../mod/editblock.php:153
+#: ../../include/conversation.php:1196 ../../mod/editpost.php:118
+#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:190
+#: ../../mod/editblock.php:147
msgid "Set your location"
msgstr ""
@@ -2781,13 +2798,13 @@ msgstr ""
msgid "set location"
msgstr ""
-#: ../../include/conversation.php:1198 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1198 ../../mod/editpost.php:120
msgid "Toggle voting"
msgstr ""
-#: ../../include/conversation.php:1201 ../../mod/editlayout.php:152
-#: ../../mod/editwebpage.php:191 ../../mod/editpost.php:126
-#: ../../mod/editblock.php:154
+#: ../../include/conversation.php:1201 ../../mod/editpost.php:119
+#: ../../mod/editlayout.php:146 ../../mod/editwebpage.php:191
+#: ../../mod/editblock.php:148
msgid "Clear browser location"
msgstr ""
@@ -2795,20 +2812,20 @@ msgstr ""
msgid "clear location"
msgstr ""
-#: ../../include/conversation.php:1204 ../../mod/editwebpage.php:207
-#: ../../mod/editpost.php:142 ../../mod/editblock.php:167
+#: ../../include/conversation.php:1204 ../../mod/editpost.php:135
+#: ../../mod/editwebpage.php:207 ../../mod/editblock.php:161
msgid "Title (optional)"
msgstr ""
-#: ../../include/conversation.php:1208 ../../mod/editlayout.php:168
-#: ../../mod/editwebpage.php:209 ../../mod/editpost.php:144
-#: ../../mod/editblock.php:170
+#: ../../include/conversation.php:1208 ../../mod/editpost.php:137
+#: ../../mod/editlayout.php:162 ../../mod/editwebpage.php:209
+#: ../../mod/editblock.php:164
msgid "Categories (optional, comma-separated list)"
msgstr ""
-#: ../../include/conversation.php:1210 ../../mod/editlayout.php:154
-#: ../../mod/editwebpage.php:193 ../../mod/editpost.php:131
-#: ../../mod/editblock.php:156
+#: ../../include/conversation.php:1210 ../../mod/editpost.php:124
+#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:193
+#: ../../mod/editblock.php:150
msgid "Permission settings"
msgstr ""
@@ -2816,32 +2833,32 @@ msgstr ""
msgid "permissions"
msgstr ""
-#: ../../include/conversation.php:1219 ../../mod/editlayout.php:161
-#: ../../mod/editwebpage.php:202 ../../mod/editpost.php:139
-#: ../../mod/editblock.php:164
+#: ../../include/conversation.php:1219 ../../mod/editpost.php:132
+#: ../../mod/editlayout.php:155 ../../mod/editwebpage.php:202
+#: ../../mod/editblock.php:158
msgid "Public post"
msgstr ""
-#: ../../include/conversation.php:1221 ../../mod/editlayout.php:169
-#: ../../mod/editwebpage.php:210 ../../mod/editpost.php:145
-#: ../../mod/editblock.php:171
+#: ../../include/conversation.php:1221 ../../mod/editpost.php:138
+#: ../../mod/editlayout.php:163 ../../mod/editwebpage.php:210
+#: ../../mod/editblock.php:165
msgid "Example: bob@example.com, mary@example.com"
msgstr ""
-#: ../../include/conversation.php:1234 ../../mod/editlayout.php:178
-#: ../../mod/editwebpage.php:219 ../../mod/editpost.php:156
-#: ../../mod/editblock.php:181 ../../mod/mail.php:245 ../../mod/mail.php:359
+#: ../../include/conversation.php:1234 ../../mod/editpost.php:149
+#: ../../mod/editlayout.php:172 ../../mod/editwebpage.php:219
+#: ../../mod/editblock.php:175 ../../mod/mail.php:245 ../../mod/mail.php:359
msgid "Set expiration date"
msgstr ""
-#: ../../include/conversation.php:1238 ../../mod/events.php:637
-#: ../../mod/editpost.php:160
+#: ../../include/conversation.php:1238 ../../mod/events.php:651
+#: ../../mod/editpost.php:153
msgid "OK"
msgstr ""
#: ../../include/conversation.php:1239 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:134 ../../mod/events.php:636 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
+#: ../../mod/tagrm.php:134 ../../mod/events.php:650 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:154
#: ../../mod/settings.php:589 ../../mod/settings.php:615
msgid "Cancel"
msgstr ""
@@ -2979,7 +2996,7 @@ msgstr[1] ""
#: ../../include/items.php:413 ../../mod/like.php:270
#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
-#: ../../mod/bulksetclose.php:11 ../../index.php:381
+#: ../../mod/bulksetclose.php:11 ../../index.php:392
msgid "Permission denied"
msgstr ""
@@ -2987,47 +3004,47 @@ msgstr ""
msgid "(Unknown)"
msgstr ""
-#: ../../include/items.php:1249
+#: ../../include/items.php:1307
msgid "Visible to anybody on the internet."
msgstr ""
-#: ../../include/items.php:1251
+#: ../../include/items.php:1309
msgid "Visible to you only."
msgstr ""
-#: ../../include/items.php:1253
+#: ../../include/items.php:1311
msgid "Visible to anybody in this network."
msgstr ""
-#: ../../include/items.php:1255
+#: ../../include/items.php:1313
msgid "Visible to anybody authenticated."
msgstr ""
-#: ../../include/items.php:1257
+#: ../../include/items.php:1315
#, php-format
msgid "Visible to anybody on %s."
msgstr ""
-#: ../../include/items.php:1259
+#: ../../include/items.php:1317
msgid "Visible to all connections."
msgstr ""
-#: ../../include/items.php:1261
+#: ../../include/items.php:1319
msgid "Visible to approved connections."
msgstr ""
-#: ../../include/items.php:1263
+#: ../../include/items.php:1321
msgid "Visible to specific connections."
msgstr ""
-#: ../../include/items.php:4076 ../../mod/thing.php:74
-#: ../../mod/display.php:36 ../../mod/filestorage.php:27
-#: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:1025
-#: ../../mod/admin.php:1225
+#: ../../include/items.php:4209 ../../mod/thing.php:74
+#: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20
+#: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225
+#: ../../mod/display.php:36
msgid "Item not found."
msgstr ""
-#: ../../include/items.php:4149 ../../include/attach.php:137
+#: ../../include/items.php:4282 ../../include/attach.php:137
#: ../../include/attach.php:184 ../../include/attach.php:247
#: ../../include/attach.php:261 ../../include/attach.php:305
#: ../../include/attach.php:319 ../../include/attach.php:350
@@ -3039,25 +3056,25 @@ msgstr ""
#: ../../mod/thing.php:256 ../../mod/thing.php:290
#: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277
#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
-#: ../../mod/events.php:219 ../../mod/group.php:9 ../../mod/item.php:206
+#: ../../mod/events.php:232 ../../mod/group.php:9 ../../mod/item.php:206
#: ../../mod/item.php:214 ../../mod/item.php:978 ../../mod/network.php:12
#: ../../mod/common.php:35 ../../mod/connections.php:169
-#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/photos.php:69
-#: ../../mod/pdledit.php:21 ../../mod/authtest.php:13
+#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/editpost.php:13
+#: ../../mod/photos.php:69 ../../mod/pdledit.php:21 ../../mod/authtest.php:13
#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
-#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64
-#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101
-#: ../../mod/editwebpage.php:125 ../../mod/rate.php:110
-#: ../../mod/editpost.php:13 ../../mod/invite.php:13 ../../mod/invite.php:104
-#: ../../mod/locs.php:77 ../../mod/sources.php:66 ../../mod/menu.php:69
-#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
-#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
-#: ../../mod/fsuggest.php:78 ../../mod/poke.php:128 ../../mod/profiles.php:188
+#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/mitem.php:109
+#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
+#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
+#: ../../mod/rate.php:110 ../../mod/editblock.php:65 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66
+#: ../../mod/menu.php:69 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
+#: ../../mod/poke.php:128 ../../mod/profiles.php:188
#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14 ../../mod/setup.php:223
#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../mod/editblock.php:65 ../../mod/register.php:72
-#: ../../mod/settings.php:570 ../../mod/id.php:71 ../../mod/message.php:16
-#: ../../mod/mitem.php:115 ../../mod/mood.php:111 ../../mod/connedit.php:331
+#: ../../mod/register.php:72 ../../mod/settings.php:570 ../../mod/id.php:71
+#: ../../mod/message.php:16 ../../mod/mood.php:111 ../../mod/connedit.php:336
#: ../../mod/mail.php:114 ../../mod/notifications.php:66
#: ../../mod/regmod.php:17 ../../mod/new_channel.php:68
#: ../../mod/new_channel.php:99 ../../mod/appman.php:66
@@ -3066,30 +3083,30 @@ msgstr ""
#: ../../mod/channel.php:100 ../../mod/channel.php:219
#: ../../mod/channel.php:262 ../../mod/suggest.php:26
#: ../../mod/service_limits.php:7 ../../mod/sharedwithme.php:7
-#: ../../index.php:182 ../../index.php:382
+#: ../../index.php:182 ../../index.php:393
msgid "Permission denied."
msgstr ""
-#: ../../include/items.php:4551 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:4684 ../../mod/group.php:38 ../../mod/group.php:140
#: ../../mod/bulksetclose.php:51
msgid "Collection not found."
msgstr ""
-#: ../../include/items.php:4567
+#: ../../include/items.php:4700
msgid "Collection is empty."
msgstr ""
-#: ../../include/items.php:4574
+#: ../../include/items.php:4707
#, php-format
msgid "Collection: %s"
msgstr ""
-#: ../../include/items.php:4584
+#: ../../include/items.php:4717 ../../mod/connedit.php:662
#, php-format
msgid "Connection: %s"
msgstr ""
-#: ../../include/items.php:4586
+#: ../../include/items.php:4719
msgid "Connection not found."
msgstr ""
@@ -3101,7 +3118,7 @@ msgstr ""
msgid "Unable to verify channel signature"
msgstr ""
-#: ../../include/zot.php:2109
+#: ../../include/zot.php:2132
#, php-format
msgid "Unable to verify site signature for %s"
msgstr ""
@@ -3153,12 +3170,12 @@ msgstr ""
msgid "Examples: Robert Morgenstein, Fishing"
msgstr ""
-#: ../../include/contact_widgets.php:26 ../../mod/directory.php:373
-#: ../../mod/directory.php:378 ../../mod/connections.php:413
+#: ../../include/contact_widgets.php:26 ../../mod/directory.php:379
+#: ../../mod/directory.php:384 ../../mod/connections.php:413
msgid "Find"
msgstr ""
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:377
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:383
#: ../../mod/suggest.php:60
msgid "Channel Suggestions"
msgstr ""
@@ -3198,7 +3215,7 @@ msgstr ""
msgid "Don't show"
msgstr ""
-#: ../../include/acl_selectors.php:248 ../../mod/events.php:654
+#: ../../include/acl_selectors.php:248 ../../mod/events.php:668
#: ../../mod/photos.php:571 ../../mod/photos.php:934 ../../mod/chat.php:209
#: ../../mod/filestorage.php:147
msgid "Permissions"
@@ -3299,206 +3316,206 @@ msgstr ""
msgid "Default Profile"
msgstr ""
-#: ../../include/identity.php:631
+#: ../../include/identity.php:660
msgid "Requested channel is not available."
msgstr ""
-#: ../../include/identity.php:678 ../../mod/profile.php:16
+#: ../../include/identity.php:707 ../../mod/profile.php:16
#: ../../mod/achievements.php:11 ../../mod/webpages.php:29
#: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29
#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
-#: ../../mod/filestorage.php:54 ../../mod/editblock.php:29
+#: ../../mod/editblock.php:29 ../../mod/filestorage.php:54
#: ../../mod/layouts.php:29
msgid "Requested profile is not available."
msgstr ""
-#: ../../include/identity.php:841 ../../mod/profiles.php:774
+#: ../../include/identity.php:870 ../../mod/profiles.php:774
msgid "Change profile photo"
msgstr ""
-#: ../../include/identity.php:847
+#: ../../include/identity.php:876
msgid "Profiles"
msgstr ""
-#: ../../include/identity.php:847
+#: ../../include/identity.php:876
msgid "Manage/edit profiles"
msgstr ""
-#: ../../include/identity.php:848 ../../mod/profiles.php:775
+#: ../../include/identity.php:877 ../../mod/profiles.php:775
msgid "Create New Profile"
msgstr ""
-#: ../../include/identity.php:863 ../../mod/profiles.php:786
+#: ../../include/identity.php:892 ../../mod/profiles.php:786
msgid "Profile Image"
msgstr ""
-#: ../../include/identity.php:866
+#: ../../include/identity.php:895
msgid "visible to everybody"
msgstr ""
-#: ../../include/identity.php:867 ../../mod/profiles.php:669
+#: ../../include/identity.php:896 ../../mod/profiles.php:669
#: ../../mod/profiles.php:790
msgid "Edit visibility"
msgstr ""
-#: ../../include/identity.php:883 ../../include/identity.php:1122
+#: ../../include/identity.php:912 ../../include/identity.php:1151
msgid "Gender:"
msgstr ""
-#: ../../include/identity.php:884 ../../include/identity.php:1166
+#: ../../include/identity.php:913 ../../include/identity.php:1195
msgid "Status:"
msgstr ""
-#: ../../include/identity.php:885 ../../include/identity.php:1177
+#: ../../include/identity.php:914 ../../include/identity.php:1206
msgid "Homepage:"
msgstr ""
-#: ../../include/identity.php:886
+#: ../../include/identity.php:915
msgid "Online Now"
msgstr ""
-#: ../../include/identity.php:969 ../../include/identity.php:1047
+#: ../../include/identity.php:998 ../../include/identity.php:1076
#: ../../mod/ping.php:324
msgid "g A l F d"
msgstr ""
-#: ../../include/identity.php:970 ../../include/identity.php:1048
+#: ../../include/identity.php:999 ../../include/identity.php:1077
msgid "F d"
msgstr ""
-#: ../../include/identity.php:1015 ../../include/identity.php:1087
+#: ../../include/identity.php:1044 ../../include/identity.php:1116
#: ../../mod/ping.php:346
msgid "[today]"
msgstr ""
-#: ../../include/identity.php:1026
+#: ../../include/identity.php:1055
msgid "Birthday Reminders"
msgstr ""
-#: ../../include/identity.php:1027
+#: ../../include/identity.php:1056
msgid "Birthdays this week:"
msgstr ""
-#: ../../include/identity.php:1080
+#: ../../include/identity.php:1109
msgid "[No description]"
msgstr ""
-#: ../../include/identity.php:1098
+#: ../../include/identity.php:1127
msgid "Event Reminders"
msgstr ""
-#: ../../include/identity.php:1099
+#: ../../include/identity.php:1128
msgid "Events this week:"
msgstr ""
-#: ../../include/identity.php:1112 ../../include/identity.php:1229
+#: ../../include/identity.php:1141 ../../include/identity.php:1258
#: ../../include/apps.php:138 ../../mod/profperm.php:112
msgid "Profile"
msgstr ""
-#: ../../include/identity.php:1120 ../../mod/settings.php:1056
+#: ../../include/identity.php:1149 ../../mod/settings.php:1056
msgid "Full Name:"
msgstr ""
-#: ../../include/identity.php:1127
+#: ../../include/identity.php:1156
msgid "Like this channel"
msgstr ""
-#: ../../include/identity.php:1151
+#: ../../include/identity.php:1180
msgid "j F, Y"
msgstr ""
-#: ../../include/identity.php:1152
+#: ../../include/identity.php:1181
msgid "j F"
msgstr ""
-#: ../../include/identity.php:1159
+#: ../../include/identity.php:1188
msgid "Birthday:"
msgstr ""
-#: ../../include/identity.php:1163 ../../mod/directory.php:291
+#: ../../include/identity.php:1192 ../../mod/directory.php:297
msgid "Age:"
msgstr ""
-#: ../../include/identity.php:1172
+#: ../../include/identity.php:1201
#, php-format
msgid "for %1$d %2$s"
msgstr ""
-#: ../../include/identity.php:1175 ../../mod/profiles.php:691
+#: ../../include/identity.php:1204 ../../mod/profiles.php:691
msgid "Sexual Preference:"
msgstr ""
-#: ../../include/identity.php:1179 ../../mod/directory.php:307
+#: ../../include/identity.php:1208 ../../mod/directory.php:313
#: ../../mod/profiles.php:693
msgid "Hometown:"
msgstr ""
-#: ../../include/identity.php:1181
+#: ../../include/identity.php:1210
msgid "Tags:"
msgstr ""
-#: ../../include/identity.php:1183 ../../mod/profiles.php:694
+#: ../../include/identity.php:1212 ../../mod/profiles.php:694
msgid "Political Views:"
msgstr ""
-#: ../../include/identity.php:1185
+#: ../../include/identity.php:1214
msgid "Religion:"
msgstr ""
-#: ../../include/identity.php:1187 ../../mod/directory.php:309
+#: ../../include/identity.php:1216 ../../mod/directory.php:315
msgid "About:"
msgstr ""
-#: ../../include/identity.php:1189
+#: ../../include/identity.php:1218
msgid "Hobbies/Interests:"
msgstr ""
-#: ../../include/identity.php:1191 ../../mod/profiles.php:697
+#: ../../include/identity.php:1220 ../../mod/profiles.php:697
msgid "Likes:"
msgstr ""
-#: ../../include/identity.php:1193 ../../mod/profiles.php:698
+#: ../../include/identity.php:1222 ../../mod/profiles.php:698
msgid "Dislikes:"
msgstr ""
-#: ../../include/identity.php:1195
+#: ../../include/identity.php:1224
msgid "Contact information and Social Networks:"
msgstr ""
-#: ../../include/identity.php:1197
+#: ../../include/identity.php:1226
msgid "My other channels:"
msgstr ""
-#: ../../include/identity.php:1199
+#: ../../include/identity.php:1228
msgid "Musical interests:"
msgstr ""
-#: ../../include/identity.php:1201
+#: ../../include/identity.php:1230
msgid "Books, literature:"
msgstr ""
-#: ../../include/identity.php:1203
+#: ../../include/identity.php:1232
msgid "Television:"
msgstr ""
-#: ../../include/identity.php:1205
+#: ../../include/identity.php:1234
msgid "Film/dance/culture/entertainment:"
msgstr ""
-#: ../../include/identity.php:1207
+#: ../../include/identity.php:1236
msgid "Love/Romance:"
msgstr ""
-#: ../../include/identity.php:1209
+#: ../../include/identity.php:1238
msgid "Work/employment:"
msgstr ""
-#: ../../include/identity.php:1211
+#: ../../include/identity.php:1240
msgid "School/education:"
msgstr ""
-#: ../../include/identity.php:1231
+#: ../../include/identity.php:1260
msgid "Like this thing"
msgstr ""
@@ -3796,17 +3813,17 @@ msgstr ""
msgid "Purchase"
msgstr ""
-#: ../../include/bbcode.php:122 ../../include/bbcode.php:764
-#: ../../include/bbcode.php:767 ../../include/bbcode.php:772
-#: ../../include/bbcode.php:775 ../../include/bbcode.php:778
-#: ../../include/bbcode.php:781 ../../include/bbcode.php:786
-#: ../../include/bbcode.php:789 ../../include/bbcode.php:794
-#: ../../include/bbcode.php:797 ../../include/bbcode.php:800
-#: ../../include/bbcode.php:803
+#: ../../include/bbcode.php:122 ../../include/bbcode.php:768
+#: ../../include/bbcode.php:771 ../../include/bbcode.php:776
+#: ../../include/bbcode.php:779 ../../include/bbcode.php:782
+#: ../../include/bbcode.php:785 ../../include/bbcode.php:790
+#: ../../include/bbcode.php:793 ../../include/bbcode.php:798
+#: ../../include/bbcode.php:801 ../../include/bbcode.php:804
+#: ../../include/bbcode.php:807
msgid "Image/photo"
msgstr ""
-#: ../../include/bbcode.php:161 ../../include/bbcode.php:814
+#: ../../include/bbcode.php:161 ../../include/bbcode.php:818
msgid "Encrypted content"
msgstr ""
@@ -3815,44 +3832,51 @@ msgstr ""
msgid "Install %s element: "
msgstr ""
-#: ../../include/bbcode.php:188 ../../mod/impel.php:37
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr ""
+
+#: ../../include/bbcode.php:192 ../../mod/impel.php:37
msgid "webpage"
msgstr ""
-#: ../../include/bbcode.php:191 ../../mod/impel.php:47
+#: ../../include/bbcode.php:195 ../../mod/impel.php:47
msgid "layout"
msgstr ""
-#: ../../include/bbcode.php:194 ../../mod/impel.php:42
+#: ../../include/bbcode.php:198 ../../mod/impel.php:42
msgid "block"
msgstr ""
-#: ../../include/bbcode.php:197 ../../mod/impel.php:54
+#: ../../include/bbcode.php:201 ../../mod/impel.php:54
msgid "menu"
msgstr ""
-#: ../../include/bbcode.php:211
+#: ../../include/bbcode.php:215
msgid "QR code"
msgstr ""
-#: ../../include/bbcode.php:262
+#: ../../include/bbcode.php:266
#, php-format
msgid "%1$s wrote the following %2$s %3$s"
msgstr ""
-#: ../../include/bbcode.php:264
+#: ../../include/bbcode.php:268 ../../mod/tagger.php:51
msgid "post"
msgstr ""
-#: ../../include/bbcode.php:514
+#: ../../include/bbcode.php:518
msgid "Different viewers will see this text differently"
msgstr ""
-#: ../../include/bbcode.php:725
+#: ../../include/bbcode.php:729
msgid "$1 spoiler"
msgstr ""
-#: ../../include/bbcode.php:752
+#: ../../include/bbcode.php:756
msgid "$1 wrote:"
msgstr ""
@@ -3940,72 +3964,92 @@ msgstr ""
msgid "Delegated Channels"
msgstr ""
-#: ../../mod/directory.php:48 ../../mod/photos.php:441 ../../mod/search.php:13
-#: ../../mod/display.php:13 ../../mod/ratings.php:82
-#: ../../mod/viewconnections.php:17
+#: ../../mod/directory.php:59 ../../mod/photos.php:441 ../../mod/search.php:13
+#: ../../mod/ratings.php:82 ../../mod/viewconnections.php:17
+#: ../../mod/display.php:13
msgid "Public access denied."
msgstr ""
-#: ../../mod/directory.php:227
+#: ../../mod/directory.php:234
#, php-format
msgid "%d rating"
msgid_plural "%d ratings"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/directory.php:238
+#: ../../mod/directory.php:245
msgid "Gender: "
msgstr ""
-#: ../../mod/directory.php:240
+#: ../../mod/directory.php:247
msgid "Status: "
msgstr ""
-#: ../../mod/directory.php:242
+#: ../../mod/directory.php:249
msgid "Homepage: "
msgstr ""
-#: ../../mod/directory.php:302 ../../mod/events.php:645
+#: ../../mod/directory.php:308 ../../mod/events.php:659
msgid "Description:"
msgstr ""
-#: ../../mod/directory.php:311
+#: ../../mod/directory.php:317
msgid "Public Forum:"
msgstr ""
-#: ../../mod/directory.php:314
+#: ../../mod/directory.php:320
msgid "Keywords: "
msgstr ""
-#: ../../mod/directory.php:317
+#: ../../mod/directory.php:323
msgid "Don't suggest"
msgstr ""
-#: ../../mod/directory.php:319
+#: ../../mod/directory.php:325
msgid "Common connections:"
msgstr ""
-#: ../../mod/directory.php:368
+#: ../../mod/directory.php:374
msgid "Global Directory"
msgstr ""
-#: ../../mod/directory.php:368
+#: ../../mod/directory.php:374
msgid "Local Directory"
msgstr ""
-#: ../../mod/directory.php:374
+#: ../../mod/directory.php:380
msgid "Finding:"
msgstr ""
-#: ../../mod/directory.php:379
+#: ../../mod/directory.php:385
msgid "next page"
msgstr ""
-#: ../../mod/directory.php:379
+#: ../../mod/directory.php:385
msgid "previous page"
msgstr ""
-#: ../../mod/directory.php:395
+#: ../../mod/directory.php:386
+msgid "Sort options"
+msgstr ""
+
+#: ../../mod/directory.php:387
+msgid "Alphabetic"
+msgstr ""
+
+#: ../../mod/directory.php:388
+msgid "Reverse Alphabetic"
+msgstr ""
+
+#: ../../mod/directory.php:389
+msgid "Newest to Oldest"
+msgstr ""
+
+#: ../../mod/directory.php:390
+msgid "Oldest to Newest"
+msgstr ""
+
+#: ../../mod/directory.php:407
msgid "No entries (some entries may be hidden)."
msgstr ""
@@ -4017,7 +4061,7 @@ msgstr ""
msgid "Lookup xchan beginning with (or webbie): "
msgstr ""
-#: ../../mod/xchan.php:37 ../../mod/menu.php:154 ../../mod/mitem.php:120
+#: ../../mod/xchan.php:37 ../../mod/mitem.php:114 ../../mod/menu.php:156
msgid "Not found."
msgstr ""
@@ -4039,26 +4083,6 @@ msgid ""
"and/or create new posts for you?"
msgstr ""
-#: ../../mod/api.php:105 ../../mod/photos.php:568 ../../mod/menu.php:91
-#: ../../mod/menu.php:145 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:430
-#: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164
-#: ../../mod/mitem.php:234 ../../mod/mitem.php:235 ../../mod/removeme.php:60
-#: ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554
-msgid "Yes"
-msgstr ""
-
-#: ../../mod/api.php:106 ../../mod/photos.php:568 ../../mod/menu.php:91
-#: ../../mod/menu.php:145 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:428
-#: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164
-#: ../../mod/mitem.php:234 ../../mod/mitem.php:235 ../../mod/removeme.php:60
-#: ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554
-msgid "No"
-msgstr ""
-
#: ../../mod/webpages.php:191
msgid "Page Title"
msgstr ""
@@ -4276,8 +4300,8 @@ msgstr ""
msgid "Channel not found."
msgstr ""
-#: ../../mod/block.php:75 ../../mod/display.php:106 ../../mod/help.php:79
-#: ../../mod/page.php:89 ../../index.php:230
+#: ../../mod/block.php:75 ../../mod/display.php:110 ../../mod/help.php:79
+#: ../../mod/page.php:89 ../../index.php:241
msgid "Page not found."
msgstr ""
@@ -4349,97 +4373,109 @@ msgstr ""
msgid "Thank you."
msgstr ""
-#: ../../mod/events.php:87
+#: ../../mod/events.php:21
+msgid "Calendar entries imported."
+msgstr ""
+
+#: ../../mod/events.php:23
+msgid "No calendar entries found."
+msgstr ""
+
+#: ../../mod/events.php:101
msgid "Event can not end before it has started."
msgstr ""
-#: ../../mod/events.php:89 ../../mod/events.php:98 ../../mod/events.php:116
+#: ../../mod/events.php:103 ../../mod/events.php:112 ../../mod/events.php:130
msgid "Unable to generate preview."
msgstr ""
-#: ../../mod/events.php:96
+#: ../../mod/events.php:110
msgid "Event title and start time are required."
msgstr ""
-#: ../../mod/events.php:114
+#: ../../mod/events.php:128
msgid "Event not found."
msgstr ""
-#: ../../mod/events.php:396
+#: ../../mod/events.php:409
msgid "l, F j"
msgstr ""
-#: ../../mod/events.php:418
+#: ../../mod/events.php:431
msgid "Edit event"
msgstr ""
-#: ../../mod/events.php:419
+#: ../../mod/events.php:432
msgid "Delete event"
msgstr ""
-#: ../../mod/events.php:473
+#: ../../mod/events.php:466
+msgid "calendar"
+msgstr ""
+
+#: ../../mod/events.php:487
msgid "Create New Event"
msgstr ""
-#: ../../mod/events.php:474 ../../mod/photos.php:839
+#: ../../mod/events.php:488 ../../mod/photos.php:839
msgid "Previous"
msgstr ""
-#: ../../mod/events.php:475 ../../mod/photos.php:848 ../../mod/setup.php:281
+#: ../../mod/events.php:489 ../../mod/photos.php:848 ../../mod/setup.php:281
msgid "Next"
msgstr ""
-#: ../../mod/events.php:476
+#: ../../mod/events.php:490
msgid "Export"
msgstr ""
-#: ../../mod/events.php:504
+#: ../../mod/events.php:518
msgid "Event removed"
msgstr ""
-#: ../../mod/events.php:507
+#: ../../mod/events.php:521
msgid "Failed to remove event"
msgstr ""
-#: ../../mod/events.php:627
+#: ../../mod/events.php:641
msgid "Event details"
msgstr ""
-#: ../../mod/events.php:628
+#: ../../mod/events.php:642
msgid "Starting date and Title are required."
msgstr ""
-#: ../../mod/events.php:630
+#: ../../mod/events.php:644
msgid "Categories (comma-separated list)"
msgstr ""
-#: ../../mod/events.php:632
+#: ../../mod/events.php:646
msgid "Event Starts:"
msgstr ""
-#: ../../mod/events.php:639
+#: ../../mod/events.php:653
msgid "Finish date/time is not known or not relevant"
msgstr ""
-#: ../../mod/events.php:641
+#: ../../mod/events.php:655
msgid "Event Finishes:"
msgstr ""
-#: ../../mod/events.php:643 ../../mod/events.php:644
+#: ../../mod/events.php:657 ../../mod/events.php:658
msgid "Adjust for viewer timezone"
msgstr ""
-#: ../../mod/events.php:643
+#: ../../mod/events.php:657
msgid ""
"Important for events that happen in a particular place. Not practical for "
"global holidays."
msgstr ""
-#: ../../mod/events.php:649
+#: ../../mod/events.php:663
msgid "Title:"
msgstr ""
-#: ../../mod/events.php:651
+#: ../../mod/events.php:665
msgid "Share this event"
msgstr ""
@@ -4493,7 +4529,7 @@ msgstr ""
msgid "View ratings"
msgstr ""
-#: ../../mod/rpost.php:131 ../../mod/editpost.php:42
+#: ../../mod/rpost.php:131 ../../mod/editpost.php:158
msgid "Edit post"
msgstr ""
@@ -4689,11 +4725,11 @@ msgstr ""
msgid "Could not locate selected profile."
msgstr ""
-#: ../../mod/connections.php:94 ../../mod/connedit.php:214
+#: ../../mod/connections.php:94 ../../mod/connedit.php:219
msgid "Connection updated."
msgstr ""
-#: ../../mod/connections.php:96 ../../mod/connedit.php:216
+#: ../../mod/connections.php:96 ../../mod/connedit.php:221
msgid "Failed to update connection record."
msgstr ""
@@ -4782,9 +4818,33 @@ msgstr ""
msgid "Block Title"
msgstr ""
-#: ../../mod/tagger.php:96
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:76
+#: ../../mod/editwebpage.php:77 ../../mod/editblock.php:78
+#: ../../mod/editblock.php:94
+msgid "Item not found"
+msgstr ""
+
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr ""
+
+#: ../../mod/editpost.php:48
+msgid "Delete item?"
+msgstr ""
+
+#: ../../mod/editpost.php:115 ../../mod/editlayout.php:142
+#: ../../mod/editwebpage.php:187 ../../mod/editblock.php:144
+msgid "Insert YouTube video"
+msgstr ""
+
+#: ../../mod/editpost.php:116 ../../mod/editlayout.php:143
+#: ../../mod/editwebpage.php:188 ../../mod/editblock.php:145
+msgid "Insert Vorbis [.ogg] video"
+msgstr ""
+
+#: ../../mod/editpost.php:117 ../../mod/editlayout.php:144
+#: ../../mod/editwebpage.php:189 ../../mod/editblock.php:146
+msgid "Insert Vorbis [.ogg] audio"
msgstr ""
#: ../../mod/cloud.php:120
@@ -5041,55 +5101,64 @@ msgstr ""
msgid "Imported file is empty."
msgstr ""
-#: ../../mod/import.php:121
+#: ../../mod/import.php:110
+msgid "The data provided is not compatible with this project."
+msgstr ""
+
+#: ../../mod/import.php:115
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr ""
+
+#: ../../mod/import.php:135
msgid ""
"Cannot create a duplicate channel identifier on this system. Import failed."
msgstr ""
-#: ../../mod/import.php:162
+#: ../../mod/import.php:176
msgid "Channel clone failed. Import failed."
msgstr ""
-#: ../../mod/import.php:172
+#: ../../mod/import.php:186
msgid "Cloned channel not found. Import failed."
msgstr ""
-#: ../../mod/import.php:502
+#: ../../mod/import.php:516
msgid "You must be logged in to use this feature."
msgstr ""
-#: ../../mod/import.php:507
+#: ../../mod/import.php:521
msgid "Import Channel"
msgstr ""
-#: ../../mod/import.php:508
+#: ../../mod/import.php:522
msgid ""
"Use this form to import an existing channel from a different server/hub. You "
"may retrieve the channel identity from the old server/hub via the network or "
"provide an export file."
msgstr ""
-#: ../../mod/import.php:509
+#: ../../mod/import.php:523
msgid "File to Upload"
msgstr ""
-#: ../../mod/import.php:510
+#: ../../mod/import.php:524
msgid "Or provide the old server/hub details"
msgstr ""
-#: ../../mod/import.php:511
+#: ../../mod/import.php:525
msgid "Your old identity address (xyz@example.com)"
msgstr ""
-#: ../../mod/import.php:512
+#: ../../mod/import.php:526
msgid "Your old login email address"
msgstr ""
-#: ../../mod/import.php:513
+#: ../../mod/import.php:527
msgid "Your old login password"
msgstr ""
-#: ../../mod/import.php:514
+#: ../../mod/import.php:528
msgid ""
"For either option, please choose whether to make this hub your new primary "
"address, or whether your old location should continue this role. You will be "
@@ -5097,59 +5166,38 @@ msgid ""
"location for files, photos, and media."
msgstr ""
-#: ../../mod/import.php:515
+#: ../../mod/import.php:529
msgid "Make this hub my primary location"
msgstr ""
-#: ../../mod/import.php:516
+#: ../../mod/import.php:530
msgid ""
"Import existing posts if possible (experimental - limited by available memory"
msgstr ""
-#: ../../mod/import.php:517
+#: ../../mod/import.php:531
msgid ""
"This process may take several minutes to complete. Please submit the form "
"only once and leave this page open until finished."
msgstr ""
-#: ../../mod/editlayout.php:76 ../../mod/editwebpage.php:77
-#: ../../mod/editpost.php:20 ../../mod/editblock.php:78
-#: ../../mod/editblock.php:94
-msgid "Item not found"
-msgstr ""
-
-#: ../../mod/editlayout.php:106
-msgid "Edit Layout"
-msgstr ""
-
-#: ../../mod/editlayout.php:117
+#: ../../mod/editlayout.php:111
msgid "Delete layout?"
msgstr ""
-#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:187
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:150
-msgid "Insert YouTube video"
-msgstr ""
-
-#: ../../mod/editlayout.php:149 ../../mod/editwebpage.php:188
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:151
-msgid "Insert Vorbis [.ogg] video"
-msgstr ""
-
-#: ../../mod/editlayout.php:150 ../../mod/editwebpage.php:189
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:152
-msgid "Insert Vorbis [.ogg] audio"
-msgstr ""
-
-#: ../../mod/editlayout.php:164 ../../mod/layouts.php:124
+#: ../../mod/editlayout.php:158 ../../mod/layouts.php:124
msgid "Layout Description (Optional)"
msgstr ""
-#: ../../mod/editlayout.php:166 ../../mod/layouts.php:121
+#: ../../mod/editlayout.php:160 ../../mod/layouts.php:121
#: ../../mod/layouts.php:179
msgid "Layout Name"
msgstr ""
+#: ../../mod/editlayout.php:177
+msgid "Edit Layout"
+msgstr ""
+
#: ../../mod/chat.php:19 ../../mod/channel.php:25
msgid "You must be logged in to see this page."
msgstr ""
@@ -5191,6 +5239,126 @@ msgstr ""
msgid "%1$s's Chatrooms"
msgstr ""
+#: ../../mod/mitem.php:24 ../../mod/menu.php:134
+msgid "Menu not found."
+msgstr ""
+
+#: ../../mod/mitem.php:48
+msgid "Unable to create element."
+msgstr ""
+
+#: ../../mod/mitem.php:71
+msgid "Unable to update menu element."
+msgstr ""
+
+#: ../../mod/mitem.php:86
+msgid "Unable to add menu element."
+msgstr ""
+
+#: ../../mod/mitem.php:152 ../../mod/mitem.php:223
+msgid "Menu Item Permissions"
+msgstr ""
+
+#: ../../mod/mitem.php:153 ../../mod/mitem.php:224 ../../mod/settings.php:1083
+msgid "(click to open/close)"
+msgstr ""
+
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:171
+msgid "Link Name"
+msgstr ""
+
+#: ../../mod/mitem.php:156 ../../mod/mitem.php:228
+msgid "Link or Submenu Target"
+msgstr ""
+
+#: ../../mod/mitem.php:156
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr ""
+
+#: ../../mod/mitem.php:157 ../../mod/mitem.php:229
+msgid "Use magic-auth if available"
+msgstr ""
+
+#: ../../mod/mitem.php:158 ../../mod/mitem.php:230
+msgid "Open link in new window"
+msgstr ""
+
+#: ../../mod/mitem.php:159 ../../mod/mitem.php:231
+msgid "Order in list"
+msgstr ""
+
+#: ../../mod/mitem.php:159 ../../mod/mitem.php:231
+msgid "Higher numbers will sink to bottom of listing"
+msgstr ""
+
+#: ../../mod/mitem.php:160
+msgid "Submit and finish"
+msgstr ""
+
+#: ../../mod/mitem.php:161
+msgid "Submit and continue"
+msgstr ""
+
+#: ../../mod/mitem.php:169
+msgid "Menu:"
+msgstr ""
+
+#: ../../mod/mitem.php:172
+msgid "Link Target"
+msgstr ""
+
+#: ../../mod/mitem.php:175
+msgid "Edit menu"
+msgstr ""
+
+#: ../../mod/mitem.php:178
+msgid "Edit element"
+msgstr ""
+
+#: ../../mod/mitem.php:179
+msgid "Drop element"
+msgstr ""
+
+#: ../../mod/mitem.php:180
+msgid "New element"
+msgstr ""
+
+#: ../../mod/mitem.php:181
+msgid "Edit this menu container"
+msgstr ""
+
+#: ../../mod/mitem.php:182
+msgid "Add menu element"
+msgstr ""
+
+#: ../../mod/mitem.php:183
+msgid "Delete this menu item"
+msgstr ""
+
+#: ../../mod/mitem.php:184
+msgid "Edit this menu item"
+msgstr ""
+
+#: ../../mod/mitem.php:201
+msgid "Menu item not found."
+msgstr ""
+
+#: ../../mod/mitem.php:212
+msgid "Menu item deleted."
+msgstr ""
+
+#: ../../mod/mitem.php:214
+msgid "Menu item could not be deleted."
+msgstr ""
+
+#: ../../mod/mitem.php:221
+msgid "Edit Menu Element"
+msgstr ""
+
+#: ../../mod/mitem.php:227
+msgid "Link text"
+msgstr ""
+
#: ../../mod/editwebpage.php:152
msgid "Delete webpage?"
msgstr ""
@@ -5231,7 +5399,7 @@ msgid ""
"Password reset failed."
msgstr ""
-#: ../../mod/lostpass.php:85 ../../boot.php:1558
+#: ../../mod/lostpass.php:85 ../../boot.php:1559
msgid "Password Reset"
msgstr ""
@@ -5289,20 +5457,20 @@ msgstr ""
msgid "Remote Channel [%s] (not yet known on this site)"
msgstr ""
-#: ../../mod/rate.php:161 ../../mod/connedit.php:663
+#: ../../mod/rate.php:161
msgid "Rating (this information is public)"
msgstr ""
-#: ../../mod/rate.php:162 ../../mod/connedit.php:664
+#: ../../mod/rate.php:162
msgid "Optionally explain your rating (this information is public)"
msgstr ""
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
+#: ../../mod/editblock.php:117
+msgid "Delete block?"
msgstr ""
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
+#: ../../mod/editblock.php:179
+msgid "Edit Block"
msgstr ""
#: ../../mod/invite.php:25
@@ -5493,11 +5661,11 @@ msgstr ""
msgid "Allow Bookmarks"
msgstr ""
-#: ../../mod/menu.php:91 ../../mod/menu.php:145
+#: ../../mod/menu.php:91 ../../mod/menu.php:147
msgid "Menu may be used to store saved bookmarks"
msgstr ""
-#: ../../mod/menu.php:92 ../../mod/menu.php:147
+#: ../../mod/menu.php:92 ../../mod/menu.php:149
msgid "Submit and proceed"
msgstr ""
@@ -5513,7 +5681,7 @@ msgstr ""
msgid "Delete this menu"
msgstr ""
-#: ../../mod/menu.php:111 ../../mod/menu.php:142
+#: ../../mod/menu.php:111 ../../mod/menu.php:144
msgid "Edit menu contents"
msgstr ""
@@ -5525,35 +5693,31 @@ msgstr ""
msgid "Menu could not be deleted."
msgstr ""
-#: ../../mod/menu.php:134 ../../mod/mitem.php:24
-msgid "Menu not found."
-msgstr ""
-
#: ../../mod/menu.php:139
msgid "Edit Menu"
msgstr ""
-#: ../../mod/menu.php:141
+#: ../../mod/menu.php:143
msgid "Add or remove entries to this menu"
msgstr ""
-#: ../../mod/menu.php:143
+#: ../../mod/menu.php:145
msgid "Menu name"
msgstr ""
-#: ../../mod/menu.php:143
+#: ../../mod/menu.php:145
msgid "Must be unique, only seen by you"
msgstr ""
-#: ../../mod/menu.php:144
+#: ../../mod/menu.php:146
msgid "Menu title"
msgstr ""
-#: ../../mod/menu.php:144
+#: ../../mod/menu.php:146
msgid "Menu title as seen by others"
msgstr ""
-#: ../../mod/menu.php:145
+#: ../../mod/menu.php:147
msgid "Allow bookmarks"
msgstr ""
@@ -6364,22 +6528,27 @@ msgstr ""
msgid "Welcome %s. Remote authentication successful."
msgstr ""
-#: ../../mod/uexport.php:33 ../../mod/uexport.php:34
+#: ../../mod/tagger.php:96
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr ""
+
+#: ../../mod/uexport.php:41 ../../mod/uexport.php:42
msgid "Export Channel"
msgstr ""
-#: ../../mod/uexport.php:35
+#: ../../mod/uexport.php:43
msgid ""
"Export your basic channel information to a small file. This acts as a "
"backup of your connections, permissions, profile and basic data, which can "
"be used to import your data to a new hub, but\tdoes not contain your content."
msgstr ""
-#: ../../mod/uexport.php:36
+#: ../../mod/uexport.php:44
msgid "Export Content"
msgstr ""
-#: ../../mod/uexport.php:37
+#: ../../mod/uexport.php:45
msgid ""
"Export your channel information and all the content to a JSON backup. This "
"backs up all of your connections, permissions, profile data and all of your "
@@ -6947,7 +7116,7 @@ msgstr ""
msgid "No registrations."
msgstr ""
-#: ../../mod/admin.php:824
+#: ../../mod/admin.php:824 ../../mod/connedit.php:687
msgid "Approve"
msgstr ""
@@ -6955,13 +7124,11 @@ msgstr ""
msgid "Deny"
msgstr ""
-#: ../../mod/admin.php:827 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
+#: ../../mod/admin.php:827 ../../mod/connedit.php:519
msgid "Block"
msgstr ""
-#: ../../mod/admin.php:828 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
+#: ../../mod/admin.php:828 ../../mod/connedit.php:519
msgid "Unblock"
msgstr ""
@@ -7194,14 +7361,6 @@ msgstr ""
msgid "Post successful."
msgstr ""
-#: ../../mod/editblock.php:112
-msgid "Edit Block"
-msgstr ""
-
-#: ../../mod/editblock.php:123
-msgid "Delete block?"
-msgstr ""
-
#: ../../mod/register.php:44
msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
msgstr ""
@@ -7324,7 +7483,7 @@ msgstr ""
msgid "Help:"
msgstr ""
-#: ../../mod/help.php:76 ../../index.php:227
+#: ../../mod/help.php:76 ../../index.php:238
msgid "Not Found"
msgstr ""
@@ -7755,10 +7914,6 @@ msgstr ""
msgid "Default Post Permissions"
msgstr ""
-#: ../../mod/settings.php:1083 ../../mod/mitem.php:159 ../../mod/mitem.php:229
-msgid "(click to open/close)"
-msgstr ""
-
#: ../../mod/settings.php:1087
msgid "Channel permissions category:"
msgstr ""
@@ -8007,118 +8162,6 @@ msgstr ""
msgid "D, d M Y - g:i A"
msgstr ""
-#: ../../mod/mitem.php:51
-msgid "Unable to create element."
-msgstr ""
-
-#: ../../mod/mitem.php:74
-msgid "Unable to update menu element."
-msgstr ""
-
-#: ../../mod/mitem.php:89
-msgid "Unable to add menu element."
-msgstr ""
-
-#: ../../mod/mitem.php:158 ../../mod/mitem.php:228
-msgid "Menu Item Permissions"
-msgstr ""
-
-#: ../../mod/mitem.php:161 ../../mod/mitem.php:176
-msgid "Link Name"
-msgstr ""
-
-#: ../../mod/mitem.php:162 ../../mod/mitem.php:233
-msgid "Link or Submenu Target"
-msgstr ""
-
-#: ../../mod/mitem.php:162
-msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr ""
-
-#: ../../mod/mitem.php:163 ../../mod/mitem.php:234
-msgid "Use magic-auth if available"
-msgstr ""
-
-#: ../../mod/mitem.php:164 ../../mod/mitem.php:235
-msgid "Open link in new window"
-msgstr ""
-
-#: ../../mod/mitem.php:165 ../../mod/mitem.php:236
-msgid "Order in list"
-msgstr ""
-
-#: ../../mod/mitem.php:165 ../../mod/mitem.php:236
-msgid "Higher numbers will sink to bottom of listing"
-msgstr ""
-
-#: ../../mod/mitem.php:166
-msgid "Submit and finish"
-msgstr ""
-
-#: ../../mod/mitem.php:167
-msgid "Submit and continue"
-msgstr ""
-
-#: ../../mod/mitem.php:174
-msgid "Menu:"
-msgstr ""
-
-#: ../../mod/mitem.php:177
-msgid "Link Target"
-msgstr ""
-
-#: ../../mod/mitem.php:180
-msgid "Edit menu"
-msgstr ""
-
-#: ../../mod/mitem.php:183
-msgid "Edit element"
-msgstr ""
-
-#: ../../mod/mitem.php:184
-msgid "Drop element"
-msgstr ""
-
-#: ../../mod/mitem.php:185
-msgid "New element"
-msgstr ""
-
-#: ../../mod/mitem.php:186
-msgid "Edit this menu container"
-msgstr ""
-
-#: ../../mod/mitem.php:187
-msgid "Add menu element"
-msgstr ""
-
-#: ../../mod/mitem.php:188
-msgid "Delete this menu item"
-msgstr ""
-
-#: ../../mod/mitem.php:189
-msgid "Edit this menu item"
-msgstr ""
-
-#: ../../mod/mitem.php:206
-msgid "Menu item not found."
-msgstr ""
-
-#: ../../mod/mitem.php:217
-msgid "Menu item deleted."
-msgstr ""
-
-#: ../../mod/mitem.php:219
-msgid "Menu item could not be deleted."
-msgstr ""
-
-#: ../../mod/mitem.php:226
-msgid "Edit Menu Element"
-msgstr ""
-
-#: ../../mod/mitem.php:232
-msgid "Link text"
-msgstr ""
-
#: ../../mod/mood.php:131
msgid "Set your current mood and tell your friends"
msgstr ""
@@ -8155,314 +8198,238 @@ msgid ""
"removed from the network"
msgstr ""
-#: ../../mod/connedit.php:262
+#: ../../mod/connedit.php:267
msgid "is now connected to"
msgstr ""
-#: ../../mod/connedit.php:375
+#: ../../mod/connedit.php:380
msgid "Could not access address book record."
msgstr ""
-#: ../../mod/connedit.php:389
+#: ../../mod/connedit.php:394
msgid "Refresh failed - channel is currently unavailable."
msgstr ""
-#: ../../mod/connedit.php:396
-msgid "Channel has been unblocked"
-msgstr ""
-
-#: ../../mod/connedit.php:397
-msgid "Channel has been blocked"
-msgstr ""
-
-#: ../../mod/connedit.php:401 ../../mod/connedit.php:413
-#: ../../mod/connedit.php:425 ../../mod/connedit.php:437
-#: ../../mod/connedit.php:453
+#: ../../mod/connedit.php:406 ../../mod/connedit.php:418
+#: ../../mod/connedit.php:430 ../../mod/connedit.php:442
+#: ../../mod/connedit.php:458
msgid "Unable to set address book parameters."
msgstr ""
-#: ../../mod/connedit.php:408
-msgid "Channel has been unignored"
-msgstr ""
-
-#: ../../mod/connedit.php:409
-msgid "Channel has been ignored"
-msgstr ""
-
-#: ../../mod/connedit.php:420
-msgid "Channel has been unarchived"
-msgstr ""
-
-#: ../../mod/connedit.php:421
-msgid "Channel has been archived"
-msgstr ""
-
-#: ../../mod/connedit.php:432
-msgid "Channel has been unhidden"
-msgstr ""
-
-#: ../../mod/connedit.php:433
-msgid "Channel has been hidden"
-msgstr ""
-
-#: ../../mod/connedit.php:448
-msgid "Channel has been approved"
-msgstr ""
-
-#: ../../mod/connedit.php:449
-msgid "Channel has been unapproved"
-msgstr ""
-
-#: ../../mod/connedit.php:477
+#: ../../mod/connedit.php:482
msgid "Connection has been removed."
msgstr ""
-#: ../../mod/connedit.php:497
+#: ../../mod/connedit.php:501
#, php-format
msgid "View %s's profile"
msgstr ""
-#: ../../mod/connedit.php:501
+#: ../../mod/connedit.php:505
msgid "Refresh Permissions"
msgstr ""
-#: ../../mod/connedit.php:504
+#: ../../mod/connedit.php:508
msgid "Fetch updated permissions"
msgstr ""
-#: ../../mod/connedit.php:508
+#: ../../mod/connedit.php:512
msgid "Recent Activity"
msgstr ""
-#: ../../mod/connedit.php:511
+#: ../../mod/connedit.php:515
msgid "View recent posts and comments"
msgstr ""
-#: ../../mod/connedit.php:520
+#: ../../mod/connedit.php:522
msgid "Block (or Unblock) all communications with this connection"
msgstr ""
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
+#: ../../mod/connedit.php:523
+msgid "This connection is blocked!"
+msgstr ""
+
+#: ../../mod/connedit.php:527
msgid "Unignore"
msgstr ""
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
-#: ../../mod/notifications.php:51
+#: ../../mod/connedit.php:527 ../../mod/notifications.php:51
msgid "Ignore"
msgstr ""
-#: ../../mod/connedit.php:527
+#: ../../mod/connedit.php:530
msgid "Ignore (or Unignore) all inbound communications from this connection"
msgstr ""
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:531
+msgid "This connection is ignored!"
+msgstr ""
+
+#: ../../mod/connedit.php:535
msgid "Unarchive"
msgstr ""
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:535
msgid "Archive"
msgstr ""
-#: ../../mod/connedit.php:533
+#: ../../mod/connedit.php:538
msgid ""
"Archive (or Unarchive) this connection - mark channel dead but keep content"
msgstr ""
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:539
+msgid "This connection is archived!"
+msgstr ""
+
+#: ../../mod/connedit.php:543
msgid "Unhide"
msgstr ""
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:543
msgid "Hide"
msgstr ""
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:546
msgid "Hide or Unhide this connection from your other connections"
msgstr ""
-#: ../../mod/connedit.php:546
+#: ../../mod/connedit.php:547
+msgid "This connection is hidden!"
+msgstr ""
+
+#: ../../mod/connedit.php:554
msgid "Delete this connection"
msgstr ""
-#: ../../mod/connedit.php:637 ../../mod/connedit.php:675
+#: ../../mod/connedit.php:635
msgid "Approve this connection"
msgstr ""
-#: ../../mod/connedit.php:637
+#: ../../mod/connedit.php:635
msgid "Accept connection to allow communication"
msgstr ""
-#: ../../mod/connedit.php:653
-#, php-format
-msgid "Connections: settings for %s"
-msgstr ""
-
-#: ../../mod/connedit.php:654
-msgid "Apply these permissions automatically"
-msgstr ""
-
-#: ../../mod/connedit.php:658
-msgid "Apply the permissions indicated on this page to all new connections."
+#: ../../mod/connedit.php:640
+msgid "Set Affinity"
msgstr ""
-#: ../../mod/connedit.php:662
-msgid "Slide to adjust your degree of friendship"
+#: ../../mod/connedit.php:643
+msgid "Set Profile"
msgstr ""
-#: ../../mod/connedit.php:671
-msgid ""
-"Default permissions for your channel type have (just) been applied. They "
-"have not yet been submitted. Please review the permissions on this page and "
-"make any desired changes at this time. This new connection may <em>not</em> "
-"be able to communicate with you until you submit this page, which will "
-"install and apply the selected permissions."
+#: ../../mod/connedit.php:646
+msgid "Set Affinity & Profile"
msgstr ""
-#: ../../mod/connedit.php:674
-msgid "inherited"
+#: ../../mod/connedit.php:663
+msgid "Apply these permissions automatically"
msgstr ""
-#: ../../mod/connedit.php:677
-msgid "Connection has no individual permissions!"
+#: ../../mod/connedit.php:665
+msgid "This connection's address is"
msgstr ""
-#: ../../mod/connedit.php:678
+#: ../../mod/connedit.php:668
msgid ""
-"This may be appropriate based on your <a href=\"settings\">privacy settings</"
-"a>, though you may wish to review the \"Advanced Permissions\"."
-msgstr ""
-
-#: ../../mod/connedit.php:680
-msgid "Profile Visibility"
+"The permissions indicated on this page will be applied to all new "
+"connections."
msgstr ""
-#: ../../mod/connedit.php:681
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+#: ../../mod/connedit.php:670
+msgid "Slide to adjust your degree of friendship"
msgstr ""
-#: ../../mod/connedit.php:682
-msgid "Contact Information / Notes"
+#: ../../mod/connedit.php:672
+msgid "Slide to adjust your rating"
msgstr ""
-#: ../../mod/connedit.php:683
-msgid "Edit contact notes"
+#: ../../mod/connedit.php:673 ../../mod/connedit.php:678
+msgid "Optionally explain your rating"
msgstr ""
-#: ../../mod/connedit.php:685
-msgid "Their Settings"
+#: ../../mod/connedit.php:675
+msgid "Custom Filter"
msgstr ""
-#: ../../mod/connedit.php:686
-msgid "My Settings"
+#: ../../mod/connedit.php:676
+msgid "Only import posts with this text"
msgstr ""
-#: ../../mod/connedit.php:688
+#: ../../mod/connedit.php:676 ../../mod/connedit.php:677
msgid ""
-"Default permissions for this channel type have (just) been applied. They "
-"have <em>not</em> been saved and there are currently no stored default "
-"permissions. Please review/edit the applied settings and click [Submit] to "
-"finalize."
+"words one per line or #tags or /patterns/, leave blank to import all posts"
msgstr ""
-#: ../../mod/connedit.php:689
-msgid "Clear/Disable Automatic Permissions"
-msgstr ""
-
-#: ../../mod/connedit.php:690
-msgid "Forum Members"
-msgstr ""
-
-#: ../../mod/connedit.php:691
-msgid "Soapbox"
-msgstr ""
-
-#: ../../mod/connedit.php:692
-msgid "Full Sharing (typical social network permissions)"
+#: ../../mod/connedit.php:677
+msgid "Do not import posts with this text"
msgstr ""
-#: ../../mod/connedit.php:693
-msgid "Cautious Sharing "
+#: ../../mod/connedit.php:679
+msgid "This information is public!"
msgstr ""
-#: ../../mod/connedit.php:694
-msgid "Follow Only"
+#: ../../mod/connedit.php:684
+msgid "Connection Pending Approval"
msgstr ""
-#: ../../mod/connedit.php:695
-msgid "Individual Permissions"
+#: ../../mod/connedit.php:685
+msgid "Connection Request"
msgstr ""
-#: ../../mod/connedit.php:696
+#: ../../mod/connedit.php:686
+#, php-format
msgid ""
-"Some permissions may be inherited from your channel <a href=\"settings"
-"\">privacy settings</a>, which have higher priority than individual "
-"settings. Changing those inherited settings on this page will have no effect."
+"(%s) would like to connect with you. Please approve this connection to allow "
+"communication."
msgstr ""
-#: ../../mod/connedit.php:697
-msgid "Advanced Permissions"
+#: ../../mod/connedit.php:688
+msgid "Approve Later"
msgstr ""
-#: ../../mod/connedit.php:698
-msgid "Simple Permissions (select one and submit)"
+#: ../../mod/connedit.php:691
+msgid "inherited"
msgstr ""
-#: ../../mod/connedit.php:702
+#: ../../mod/connedit.php:693
#, php-format
-msgid "Visit %s's profile - %s"
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
msgstr ""
-#: ../../mod/connedit.php:703
-msgid "Block/Unblock contact"
+#: ../../mod/connedit.php:695
+msgid "Their Settings"
msgstr ""
-#: ../../mod/connedit.php:704
-msgid "Ignore contact"
+#: ../../mod/connedit.php:696
+msgid "My Settings"
msgstr ""
-#: ../../mod/connedit.php:705
-msgid "Repair URL settings"
+#: ../../mod/connedit.php:698
+msgid "Individual Permissions"
msgstr ""
-#: ../../mod/connedit.php:706
-msgid "View conversations"
+#: ../../mod/connedit.php:699
+msgid ""
+"Some permissions may be inherited from your channel's <a href=\"settings"
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can <strong>not</strong> change those settings here."
msgstr ""
-#: ../../mod/connedit.php:708
-msgid "Delete contact"
+#: ../../mod/connedit.php:700
+msgid ""
+"Some permissions may be inherited from your channel's <a href=\"settings"
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can change those settings here but they wont have "
+"any impact unless the inherited setting changes."
msgstr ""
-#: ../../mod/connedit.php:712
+#: ../../mod/connedit.php:701
msgid "Last update:"
msgstr ""
-#: ../../mod/connedit.php:714
-msgid "Update public posts"
-msgstr ""
-
-#: ../../mod/connedit.php:716
-msgid "Update now"
-msgstr ""
-
-#: ../../mod/connedit.php:722
-msgid "Currently blocked"
-msgstr ""
-
-#: ../../mod/connedit.php:723
-msgid "Currently ignored"
-msgstr ""
-
-#: ../../mod/connedit.php:724
-msgid "Currently archived"
-msgstr ""
-
-#: ../../mod/connedit.php:725
-msgid "Currently pending"
-msgstr ""
-
#: ../../mod/rmagic.php:40
msgid ""
"We encountered a problem while logging in with the OpenID you provided. "
@@ -8721,6 +8688,21 @@ msgstr ""
msgid "Insufficient permissions. Request redirected to profile page."
msgstr ""
+#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
+msgid "This setting requires special processing and editing has been blocked."
+msgstr ""
+
+#: ../../mod/pconfig.php:49
+msgid "Configuration Editor"
+msgstr ""
+
+#: ../../mod/pconfig.php:50
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please "
+"leave this page unless you are comfortable with and knowledgeable about how "
+"to correctly use this feature."
+msgstr ""
+
#: ../../mod/suggest.php:35
msgid ""
"No suggestions available. If this is a new site, please try again in 24 "
@@ -9026,30 +9008,30 @@ msgstr ""
msgid "Set size of followup author photos"
msgstr ""
-#: ../../boot.php:1355
+#: ../../boot.php:1356
#, php-format
msgid "Update %s failed. See error logs."
msgstr ""
-#: ../../boot.php:1358
+#: ../../boot.php:1359
#, php-format
msgid "Update Error at %s"
msgstr ""
-#: ../../boot.php:1525
+#: ../../boot.php:1526
msgid ""
"Create an account to access services and applications within the Red Matrix"
msgstr ""
-#: ../../boot.php:1553
+#: ../../boot.php:1554
msgid "Password"
msgstr ""
-#: ../../boot.php:1554
+#: ../../boot.php:1555
msgid "Remember me"
msgstr ""
-#: ../../boot.php:1557
+#: ../../boot.php:1558
msgid "Forgot your password?"
msgstr ""
diff --git a/util/update_addon_repo b/util/update_addon_repo
index 42bd3a71f..5b531e6a5 100755
--- a/util/update_addon_repo
+++ b/util/update_addon_repo
@@ -1,4 +1,4 @@
-#!/bin/sh -f
+#!/bin/bash -f
if [ $# -ne 1 ]; then
echo usage: $0 repository
diff --git a/util/update_theme_repo b/util/update_theme_repo
index 443b26591..cd71531d0 100755
--- a/util/update_theme_repo
+++ b/util/update_theme_repo
@@ -1,4 +1,4 @@
-#!/bin/sh -f
+#!/bin/bash -f
if [ $# -ne 1 ]; then
diff --git a/util/update_widget_repo b/util/update_widget_repo
index c00c85708..045122619 100755
--- a/util/update_widget_repo
+++ b/util/update_widget_repo
@@ -1,4 +1,4 @@
-#!/bin/sh -f
+#!/bin/bash -f
if [ $# -ne 1 ]; then
echo usage: $0 repository
diff --git a/version.inc b/version.inc
index 92d861e4c..ad3810d13 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-07-02.1081
+2015-08-02.1112
diff --git a/view/css/conversation.css b/view/css/conversation.css
index bb6887d59..7d4930aac 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -196,10 +196,6 @@ a.wall-item-name-link {
filter:alpha(opacity=100);
}
-.wall-item-wrapper-end {
- clear: both;
-}
-
.shared_header {
margin-bottom: 20px;
}
diff --git a/view/css/default.css b/view/css/default.css
index fb6705894..f0c89a087 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -17,12 +17,25 @@ main {
aside {
display: table-cell;
vertical-align: top;
- padding: 65px 7px 0px 7px;
+ padding: 80px 7px 0px 7px;
+
}
section {
width: 100%;
display: table-cell;
vertical-align: top;
- padding: 65px 7px 200px 7px;
+ padding: 80px 7px 200px 7px;
+}
+
+@media screen and (max-width: 767px) {
+
+ section {
+ padding: 65px 7px 200px 7px;
+ }
+
+ aside#region_1 {
+ padding: 65px 7px 0px 7px;
+ }
+
}
diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css
index 44a0a1abf..87eff66d4 100644
--- a/view/css/mod_connedit.css
+++ b/view/css/mod_connedit.css
@@ -1,188 +1,18 @@
-
-.field_abook_help {
- color: #000;
-}
-.abook-them {
- padding: 5px;
- text-align: center;
-}
+.abook-them,
.abook-me {
- padding: 5px 5px 5px 15px;
- text-align: center;
-}
-.acheckbox {
- margin-bottom: 5px !important;
-}
-
-.abook-pending-contact, .abook-autotext {
- background: orange;
- font-weight: bold;
- margin: 10px;
- padding: 20px 5px 10px;
-}
-
-.abook-perms-msg {
- background: orange;
- font-weight: bold;
- margin: 10px;
- padding: 20px 5px 10px;
-}
-
-.abook-permschange {
- width: 100%;
-}
-
-.abook-perms-steps {
- float: left;
- width: 200px;
- height: 210px;
- background: orange;
- font-weight: bold;
- margin: 10px;
- padding: 20px 5px 10px;
-
-}
-
-.abook-permssave {
- margin-left: 10px;
- clear: both;
-}
-
-#contact-slider {
- width: 600px !important;
-}
-
-#rating-slider {
- width: 600px !important;
-}
-
-#rating-text {
- width: 400px;
- height: 60px;
-}
-
-.abook-edit-them, .abook-edit-me {
- float: left;
- margin-left: 10px;
- margin-right: 10px;
-}
-.field_abook_help {
- float: left;
-}
-
-#contacts-main {
- margin-top: 20px;
- margin-bottom: 20px;
-}
-
-
-
-#contact-edit-wrapper {
- margin-top: 10px;
-}
-
-#contact-edit-banner-name {
- font-size: 1.4em;
font-weight: bold;
}
-#contact-edit-poll-wrapper {
- margin-top: 15px;
+.slider {
+ position: relative;
+ left: 1%;
+ padding-bottom: 15px;
}
-#contact-edit-poll-text {
- margin-top: 15px;
- margin-bottom: 5px;
-}
-
-#contact-edit-update-now {
- margin-top: 15px;
-}
-
-#contact-edit-links{
- clear: both;
-}
-
-#contact-edit-links ul {
- list-style: none;
- list-style-type: none;
- margin-left: 0px;
- padding-left: 0px;
-}
-
-#contact-edit-links li {
- margin-top: 5px;
-}
-
-#contact-edit-drop-link {
- float: right;
- margin-right: 20px;
-}
-
-#contact-edit-nav-end {
- clear: both;
-}
-
-#contact-edit-wrapper {
+#perms-tool-table {
width: 100%;
}
-#contact-edit-end {
- clear: both;
- margin-top: 15px;
-}
-
-#contact-profile-selector {
- width: 175px;
- margin-left: 175px;
-}
-
-.contact-edit-submit {
- margin-top: 20px;
-}
-
-.contact-entry-wrapper {
- float: left;
- width: 120px;
- height: 120px;
- padding: 10px;
-}
-
-#contacts-search {
- font-size: 1em;
- width: 300px;
-}
-
-#contacts-search-end {
- margin-bottom: 10px;
-}
-
-.contact-entry-photo-end {
- clear: both;
-}
-
-.contact-entry-name {
- float: left;
- margin-left: 0px;
- margin-right: 10px;
- width: 120px;
- overflow: hidden;
-}
-
-.contact-entry-end {
- clear: both;
-}
-
-#abook-advanced-panel, #abook-advanced {
- opacity: 0.3;
- filter:alpha(opacity=30);
-}
-
-#abook-advanced-panel:hover, #abook-advanced:hover {
- opacity: 1.0;
- filter:alpha(opacity=100);
-}
-
-#abook-advanced {
- margin-top: 15px;
+#perms-tool-table td {
+ vertical-align: top;
}
diff --git a/view/css/mod_display.css b/view/css/mod_display.css
new file mode 100644
index 000000000..dde242d4e
--- /dev/null
+++ b/view/css/mod_display.css
@@ -0,0 +1,3 @@
+#jot-popup {
+ display: none;
+}
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 0a901b1f9..5b6e8aeb9 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -13,6 +13,10 @@
border-bottom-right-radius: 0px;
}
+.tags {
+ word-wrap: break-word;
+}
+
/* suggest */
.suggest-widget-more {
@@ -35,7 +39,7 @@
padding: 5px;
width: 100%;
resize: vertical;
- height: 150px;
+ height: 250px;
}
/* saved searches */
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index ee34f0508..d6cc42175 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -1,23 +1,12 @@
+$(document).ready(function() {
-function abook_perms_msg() {
-// $('.abook-permsmsg').show();
-// $('.abook-permschange').html(aStr['permschange']);
-// $('.abook-permssave').show();
-}
-
-function abook_perms_new() {
-// $('.abook-permsnew').show();
-// $('.abook-permssave').show();
-}
-
+ $('form').areYouSure({'addRemoveFieldsMarksDirty':true, 'message': aStr['leavethispage'] }); // Warn user about unsaved settings
-$(document).ready(function() {
if(typeof(after_following) !== 'undefined' && after_following) {
if(typeof(connectDefaultShare) !== 'undefined')
connectDefaultShare();
else
connectFullShare();
- abook_perms_new();
}
$('#id_pending').click(function() {
@@ -25,16 +14,10 @@ $(document).ready(function() {
connectDefaultShare();
else
connectFullShare();
- abook_perms_new();
});
-// $('.abook-edit-me').click(function() {
-// abook_perms_msg();
-// });
-
});
-
function connectFullShare() {
$('.abook-edit-me').each(function() {
if(! $(this).is(':disabled'))
@@ -54,85 +37,4 @@ function connectFullShare() {
$('#me_id_perms_view_storage').attr('checked','checked');
$('#me_id_perms_republish').attr('checked','checked');
$('#me_id_perms_post_like').attr('checked','checked');
-// abook_perms_msg();
}
-
-function connectCautiousShare() {
- $('.abook-edit-me').each(function() {
- if(! $(this).is(':disabled'))
- $(this).removeAttr('checked');
- });
-
- $('#me_id_perms_view_stream').attr('checked','checked');
- $('#me_id_perms_view_profile').attr('checked','checked');
- $('#me_id_perms_view_photos').attr('checked','checked');
- $('#me_id_perms_view_storage').attr('checked','checked');
- $('#me_id_perms_view_pages').attr('checked','checked');
- $('#me_id_perms_send_stream').attr('checked','checked');
- $('#me_id_perms_post_comments').attr('checked','checked');
- $('#me_id_perms_post_mail').attr('checked','checked');
- $('#me_id_perms_post_like').attr('checked','checked');
-// abook_perms_msg();
-
-}
-
-function connectForum() {
- $('.abook-edit-me').each(function() {
- if(! $(this).is(':disabled'))
- $(this).removeAttr('checked');
- });
-
- $('#me_id_perms_view_stream').attr('checked','checked');
- $('#me_id_perms_view_profile').attr('checked','checked');
- $('#me_id_perms_view_photos').attr('checked','checked');
- $('#me_id_perms_view_contacts').attr('checked','checked');
- $('#me_id_perms_view_storage').attr('checked','checked');
- $('#me_id_perms_view_pages').attr('checked','checked');
- $('#me_id_perms_send_stream').attr('checked','checked');
- $('#me_id_perms_post_wall').attr('checked','checked');
- $('#me_id_perms_post_comments').attr('checked','checked');
- $('#me_id_perms_post_mail').attr('checked','checked');
- $('#me_id_perms_tag_deliver').attr('checked','checked');
- $('#me_id_perms_republish').attr('checked','checked');
- $('#me_id_perms_post_like').attr('checked','checked');
-// abook_perms_msg();
-
-}
-
-function connectClear() {
- $('.abook-edit-me').each(function() {
- if(! $(this).is(':disabled'))
- $(this).removeAttr('checked');
- });
-// abook_perms_msg();
-
-}
-
-function connectSoapBox() {
- $('.abook-edit-me').each(function() {
- if(! $(this).is(':disabled'))
- $(this).removeAttr('checked');
- });
-
- $('#me_id_perms_view_stream').attr('checked','checked');
- $('#me_id_perms_view_profile').attr('checked','checked');
- $('#me_id_perms_view_photos').attr('checked','checked');
- $('#me_id_perms_view_contacts').attr('checked','checked');
- $('#me_id_perms_view_storage').attr('checked','checked');
- $('#me_id_perms_view_pages').attr('checked','checked');
-// abook_perms_msg();
-
-}
-
-
-function connectFollowOnly() {
- $('.abook-edit-me').each(function() {
- if(! $(this).is(':disabled'))
- $(this).removeAttr('checked');
- });
-
- $('#me_id_perms_send_stream').attr('checked','checked');
-// abook_perms_msg();
-
-}
-
diff --git a/view/nl/messages.po b/view/nl/messages.po
index fc3148bce..45d5eba67 100644
--- a/view/nl/messages.po
+++ b/view/nl/messages.po
@@ -9,10 +9,10 @@ msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-26 00:05-0700\n"
-"PO-Revision-Date: 2015-06-29 22:19+0000\n"
+"POT-Creation-Date: 2015-07-03 00:04-0700\n"
+"PO-Revision-Date: 2015-07-10 19:44+0000\n"
"Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/red-matrix/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/p/red-matrix/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -307,7 +307,7 @@ msgid "remove from file"
msgstr "uit map verwijderen"
#: ../../include/text.php:1498 ../../include/text.php:1509
-#: ../../mod/connedit.php:661
+#: ../../mod/connedit.php:667
msgid "Click to open/close"
msgstr "Klik om te openen of te sluiten"
@@ -335,7 +335,7 @@ msgstr "Opmaaktype pagina"
msgid "Select an alternate language"
msgstr "Kies een andere taal"
-#: ../../include/text.php:1888 ../../include/diaspora.php:2101
+#: ../../include/text.php:1888 ../../include/diaspora.php:2115
#: ../../include/conversation.php:120 ../../mod/like.php:346
#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
#: ../../mod/tagger.php:43
@@ -347,10 +347,9 @@ msgstr "foto"
msgid "event"
msgstr "gebeurtenis"
-#: ../../include/text.php:1894 ../../include/diaspora.php:2101
+#: ../../include/text.php:1894 ../../include/diaspora.php:2115
#: ../../include/conversation.php:148 ../../mod/like.php:346
#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:51
msgid "status"
msgstr "bericht"
@@ -400,30 +399,31 @@ msgstr "map"
msgid "Edit"
msgstr "Bewerken"
-#: ../../include/diaspora.php:2130 ../../include/conversation.php:164
+#: ../../include/diaspora.php:2144 ../../include/conversation.php:164
#: ../../mod/like.php:394
#, php-format
msgid "%1$s likes %2$s's %3$s"
msgstr "%1$s vindt %3$s van %2$s leuk"
-#: ../../include/diaspora.php:2476
+#: ../../include/diaspora.php:2490
msgid "Please choose"
msgstr "Maak een keuze"
-#: ../../include/diaspora.php:2478
+#: ../../include/diaspora.php:2492
msgid "Agree"
msgstr "Eens"
-#: ../../include/diaspora.php:2480
+#: ../../include/diaspora.php:2494
msgid "Disagree"
msgstr "Oneens"
-#: ../../include/diaspora.php:2482
+#: ../../include/diaspora.php:2496
msgid "Abstain"
msgstr "onthouding"
-#: ../../include/diaspora.php:2504 ../../include/diaspora.php:2515
-#: ../../include/enotify.php:59 ../../mod/p.php:46
+#: ../../include/diaspora.php:2518 ../../include/diaspora.php:2529
+#: ../../include/network.php:1586 ../../include/enotify.php:59
+#: ../../mod/p.php:46
msgid "$projectname"
msgstr "$projectname"
@@ -440,11 +440,11 @@ msgstr "gaf een reactie op een bericht van %s"
msgid "No username found in import file."
msgstr "Geen gebruikersnaam in het importbestand gevonden."
-#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:142
+#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:156
msgid "Unable to create a unique channel address. Import failed."
msgstr "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt."
-#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:490
+#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504
msgid "Import completed."
msgstr "Import voltooid."
@@ -526,7 +526,7 @@ msgid "Registration request at %s"
msgstr "Registratiebevestiging voor %s"
#: ../../include/account.php:314 ../../include/account.php:341
-#: ../../include/account.php:401
+#: ../../include/account.php:401 ../../include/network.php:1632
msgid "Administrator"
msgstr "Beheerder"
@@ -754,8 +754,8 @@ msgid "Finishes:"
msgstr "Einde:"
#: ../../include/event.php:47 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:879 ../../mod/directory.php:296
-#: ../../mod/events.php:647
+#: ../../include/identity.php:879 ../../mod/events.php:647
+#: ../../mod/directory.php:295
msgid "Location:"
msgstr "Plaats:"
@@ -837,7 +837,7 @@ msgstr "Omschrijving (optioneel)"
#: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81
#: ../../mod/photos.php:577 ../../mod/photos.php:654 ../../mod/photos.php:941
#: ../../mod/photos.php:981 ../../mod/photos.php:1099 ../../mod/pdledit.php:58
-#: ../../mod/import.php:520 ../../mod/chat.php:177 ../../mod/chat.php:211
+#: ../../mod/import.php:534 ../../mod/chat.php:177 ../../mod/chat.php:211
#: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105
#: ../../mod/sources.php:104 ../../mod/sources.php:138
#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
@@ -848,9 +848,10 @@ msgstr "Omschrijving (optioneel)"
#: ../../mod/settings.php:692 ../../mod/settings.php:718
#: ../../mod/settings.php:746 ../../mod/settings.php:769
#: ../../mod/settings.php:854 ../../mod/settings.php:1050
-#: ../../mod/mitem.php:237 ../../mod/mood.php:134 ../../mod/connedit.php:679
-#: ../../mod/mail.php:355 ../../mod/appman.php:99 ../../mod/poll.php:68
-#: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256
+#: ../../mod/mitem.php:237 ../../mod/mood.php:134 ../../mod/connedit.php:688
+#: ../../mod/mail.php:355 ../../mod/appman.php:99 ../../mod/pconfig.php:108
+#: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24
+#: ../../view/theme/apw/php/config.php:256
#: ../../view/theme/redbasic/php/config.php:99
msgid "Submit"
msgstr "Opslaan"
@@ -1028,7 +1029,7 @@ msgstr "Laatst gewijzigd"
#: ../../mod/blocks.php:155 ../../mod/photos.php:1062
#: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:225
#: ../../mod/admin.php:826 ../../mod/admin.php:988 ../../mod/editblock.php:113
-#: ../../mod/settings.php:651 ../../mod/connedit.php:543
+#: ../../mod/settings.php:651 ../../mod/connedit.php:549
msgid "Delete"
msgstr "Verwijderen"
@@ -1049,6 +1050,23 @@ msgstr "Bladwijzers van %1$s"
msgid "view full size"
msgstr "volledige grootte tonen"
+#: ../../include/network.php:1585 ../../include/enotify.php:58
+msgid "$Projectname Notification"
+msgstr "$Projectname-notificatie"
+
+#: ../../include/network.php:1588 ../../include/enotify.php:61
+msgid "Thank You,"
+msgstr "Bedankt,"
+
+#: ../../include/network.php:1590 ../../include/enotify.php:63
+#, php-format
+msgid "%s Administrator"
+msgstr "Beheerder %s"
+
+#: ../../include/network.php:1646
+msgid "No Subject"
+msgstr "Geen onderwerp"
+
#: ../../include/features.php:38
msgid "General Features"
msgstr "Algemene functies"
@@ -1236,63 +1254,71 @@ msgid "Filter stream activity by depth of relationships"
msgstr "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag"
#: ../../include/features.php:74
+msgid "Connection Filtering"
+msgstr "Connectie-filters"
+
+#: ../../include/features.php:74
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr "Filter binnenkomende berichten van connecties aan de hand van trefwoorden/inhoud"
+
+#: ../../include/features.php:75
msgid "Suggest Channels"
msgstr "Kanalen voorstellen"
-#: ../../include/features.php:74
+#: ../../include/features.php:75
msgid "Show channel suggestions"
msgstr "Voor jou mogelijk interessante kanalen voorstellen"
-#: ../../include/features.php:79
+#: ../../include/features.php:80
msgid "Post/Comment Tools"
msgstr "Bericht- en reactiehulpmiddelen"
-#: ../../include/features.php:80
+#: ../../include/features.php:81
msgid "Tagging"
msgstr "Taggen"
-#: ../../include/features.php:80
+#: ../../include/features.php:81
msgid "Ability to tag existing posts"
msgstr "Mogelijkheid om bestaande berichten te taggen"
-#: ../../include/features.php:81
+#: ../../include/features.php:82
msgid "Post Categories"
msgstr "Categorieën berichten"
-#: ../../include/features.php:81
+#: ../../include/features.php:82
msgid "Add categories to your posts"
msgstr "Voeg categorieën toe aan je berichten"
-#: ../../include/features.php:82 ../../include/widgets.php:304
+#: ../../include/features.php:83 ../../include/widgets.php:304
#: ../../include/contact_widgets.php:57
msgid "Saved Folders"
msgstr "Bewaarde mappen"
-#: ../../include/features.php:82
+#: ../../include/features.php:83
msgid "Ability to file posts under folders"
msgstr "Mogelijkheid om berichten in mappen op te slaan"
-#: ../../include/features.php:83
+#: ../../include/features.php:84
msgid "Dislike Posts"
msgstr "Vind berichten niet leuk"
-#: ../../include/features.php:83
+#: ../../include/features.php:84
msgid "Ability to dislike posts/comments"
msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden"
-#: ../../include/features.php:84
+#: ../../include/features.php:85
msgid "Star Posts"
msgstr "Geef berichten een ster"
-#: ../../include/features.php:84
+#: ../../include/features.php:85
msgid "Ability to mark special posts with a star indicator"
msgstr "Mogelijkheid om speciale berichten met een ster te markeren"
-#: ../../include/features.php:85
+#: ../../include/features.php:86
msgid "Tag Cloud"
msgstr "Tagwolk"
-#: ../../include/features.php:85
+#: ../../include/features.php:86
msgid "Provide a personal tag cloud on your channel page"
msgstr "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina"
@@ -1324,7 +1350,7 @@ msgstr "Persoonlijke app bewerken"
#: ../../include/widgets.php:136 ../../include/widgets.php:175
#: ../../include/Contact.php:107 ../../include/conversation.php:945
-#: ../../include/identity.php:828 ../../mod/directory.php:310
+#: ../../include/identity.php:828 ../../mod/directory.php:309
#: ../../mod/match.php:64 ../../mod/suggest.php:52
msgid "Connect"
msgstr "Verbinden"
@@ -1375,11 +1401,11 @@ msgstr "Alles"
msgid "Archives"
msgstr "Archieven"
-#: ../../include/widgets.php:427 ../../mod/connedit.php:572
+#: ../../include/widgets.php:427 ../../mod/connedit.php:578
msgid "Me"
msgstr "Ik"
-#: ../../include/widgets.php:428 ../../mod/connedit.php:573
+#: ../../include/widgets.php:428 ../../mod/connedit.php:579
msgid "Family"
msgstr "Familie"
@@ -1388,16 +1414,16 @@ msgstr "Familie"
#: ../../include/profile_selectors.php:80 ../../mod/settings.php:345
#: ../../mod/settings.php:349 ../../mod/settings.php:350
#: ../../mod/settings.php:353 ../../mod/settings.php:364
-#: ../../mod/connedit.php:574
+#: ../../mod/connedit.php:580
msgid "Friends"
msgstr "Vrienden"
-#: ../../include/widgets.php:430 ../../mod/connedit.php:575
+#: ../../include/widgets.php:430 ../../mod/connedit.php:581
msgid "Acquaintances"
msgstr "Kennissen"
#: ../../include/widgets.php:431 ../../mod/connections.php:231
-#: ../../mod/connections.php:246 ../../mod/connedit.php:576
+#: ../../mod/connections.php:246 ../../mod/connedit.php:582
msgid "All"
msgstr "Alles"
@@ -1433,7 +1459,7 @@ msgstr "Verbonden applicaties"
msgid "Export channel"
msgstr "Kanaal exporteren"
-#: ../../include/widgets.php:530 ../../mod/connedit.php:653
+#: ../../include/widgets.php:530 ../../mod/connedit.php:659
msgid "Connection Default Permissions"
msgstr "Standaard permissies voor connecties"
@@ -1488,19 +1514,6 @@ msgstr "Bekijk beoordelingen"
msgid "Public Hubs"
msgstr "Openbare hubs"
-#: ../../include/enotify.php:58
-msgid "$Projectname Notification"
-msgstr "$Projectname-notificatie"
-
-#: ../../include/enotify.php:61
-msgid "Thank You,"
-msgstr "Bedankt,"
-
-#: ../../include/enotify.php:63
-#, php-format
-msgid "%s Administrator"
-msgstr "Beheerder %s"
-
#: ../../include/enotify.php:96
#, php-format
msgid "%s <!item_type!>"
@@ -2077,7 +2090,7 @@ msgid "Your posts and conversations"
msgstr "Jouw berichten en conversaties"
#: ../../include/nav.php:91 ../../include/conversation.php:942
-#: ../../mod/connedit.php:494 ../../mod/connedit.php:660
+#: ../../mod/connedit.php:500 ../../mod/connedit.php:666
msgid "View Profile"
msgstr "Profiel weergeven"
@@ -2991,47 +3004,47 @@ msgstr "Toegang geweigerd"
msgid "(Unknown)"
msgstr "(Onbekend)"
-#: ../../include/items.php:1249
+#: ../../include/items.php:1304
msgid "Visible to anybody on the internet."
msgstr "Voor iedereen op het internet zichtbaar."
-#: ../../include/items.php:1251
+#: ../../include/items.php:1306
msgid "Visible to you only."
msgstr "Alleen voor jou zichtbaar."
-#: ../../include/items.php:1253
+#: ../../include/items.php:1308
msgid "Visible to anybody in this network."
msgstr "Voor iedereen in dit netwerk zichtbaar."
-#: ../../include/items.php:1255
+#: ../../include/items.php:1310
msgid "Visible to anybody authenticated."
msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
-#: ../../include/items.php:1257
+#: ../../include/items.php:1312
#, php-format
msgid "Visible to anybody on %s."
msgstr "Voor iedereen op %s zichtbaar."
-#: ../../include/items.php:1259
+#: ../../include/items.php:1314
msgid "Visible to all connections."
msgstr "Voor alle connecties zichtbaar."
-#: ../../include/items.php:1261
+#: ../../include/items.php:1316
msgid "Visible to approved connections."
msgstr "Voor alle goedgekeurde connecties zichtbaar."
-#: ../../include/items.php:1263
+#: ../../include/items.php:1318
msgid "Visible to specific connections."
msgstr "Voor specifieke connecties zichtbaar."
-#: ../../include/items.php:4076 ../../mod/thing.php:74
+#: ../../include/items.php:4195 ../../mod/thing.php:74
#: ../../mod/display.php:36 ../../mod/filestorage.php:27
#: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:1025
#: ../../mod/admin.php:1225
msgid "Item not found."
msgstr "Item niet gevonden."
-#: ../../include/items.php:4149 ../../include/attach.php:137
+#: ../../include/items.php:4268 ../../include/attach.php:137
#: ../../include/attach.php:184 ../../include/attach.php:247
#: ../../include/attach.php:261 ../../include/attach.php:305
#: ../../include/attach.php:319 ../../include/attach.php:350
@@ -3061,7 +3074,7 @@ msgstr "Item niet gevonden."
#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
#: ../../mod/editblock.php:65 ../../mod/register.php:72
#: ../../mod/settings.php:570 ../../mod/id.php:71 ../../mod/message.php:16
-#: ../../mod/mitem.php:115 ../../mod/mood.php:111 ../../mod/connedit.php:331
+#: ../../mod/mitem.php:115 ../../mod/mood.php:111 ../../mod/connedit.php:337
#: ../../mod/mail.php:114 ../../mod/notifications.php:66
#: ../../mod/regmod.php:17 ../../mod/new_channel.php:68
#: ../../mod/new_channel.php:99 ../../mod/appman.php:66
@@ -3074,26 +3087,26 @@ msgstr "Item niet gevonden."
msgid "Permission denied."
msgstr "Toegang geweigerd"
-#: ../../include/items.php:4551 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:4670 ../../mod/group.php:38 ../../mod/group.php:140
#: ../../mod/bulksetclose.php:51
msgid "Collection not found."
msgstr "Collectie niet gevonden."
-#: ../../include/items.php:4567
+#: ../../include/items.php:4686
msgid "Collection is empty."
msgstr "Collectie is leeg"
-#: ../../include/items.php:4574
+#: ../../include/items.php:4693
#, php-format
msgid "Collection: %s"
msgstr "Collectie: %s"
-#: ../../include/items.php:4584
+#: ../../include/items.php:4703
#, php-format
msgid "Connection: %s"
msgstr "Connectie: %s"
-#: ../../include/items.php:4586
+#: ../../include/items.php:4705
msgid "Connection not found."
msgstr "Connectie niet gevonden."
@@ -3105,7 +3118,7 @@ msgstr "Datapakket ongeldig"
msgid "Unable to verify channel signature"
msgstr "Kanaalkenmerk kon niet worden geverifieerd. "
-#: ../../include/zot.php:2109
+#: ../../include/zot.php:2126
#, php-format
msgid "Unable to verify site signature for %s"
msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
@@ -3157,12 +3170,12 @@ msgstr "Verbinden/volgen"
msgid "Examples: Robert Morgenstein, Fishing"
msgstr "Voorbeeld: Robert Morgenstein, vissen"
-#: ../../include/contact_widgets.php:26 ../../mod/directory.php:373
-#: ../../mod/directory.php:378 ../../mod/connections.php:413
+#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413
+#: ../../mod/directory.php:372 ../../mod/directory.php:377
msgid "Find"
msgstr "Vinden"
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:377
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:376
#: ../../mod/suggest.php:60
msgid "Channel Suggestions"
msgstr "Voorgestelde kanalen"
@@ -3420,7 +3433,7 @@ msgstr "F j"
msgid "Birthday:"
msgstr "Geboortedatum:"
-#: ../../include/identity.php:1163 ../../mod/directory.php:291
+#: ../../include/identity.php:1163 ../../mod/directory.php:290
msgid "Age:"
msgstr "Leeftijd:"
@@ -3433,7 +3446,7 @@ msgstr "voor %1$d %2$s"
msgid "Sexual Preference:"
msgstr "Seksuele voorkeur:"
-#: ../../include/identity.php:1179 ../../mod/directory.php:307
+#: ../../include/identity.php:1179 ../../mod/directory.php:306
#: ../../mod/profiles.php:693
msgid "Hometown:"
msgstr "Oorspronkelijk uit:"
@@ -3450,7 +3463,7 @@ msgstr "Politieke overtuigingen:"
msgid "Religion:"
msgstr "Religie:"
-#: ../../include/identity.php:1187 ../../mod/directory.php:309
+#: ../../include/identity.php:1187 ../../mod/directory.php:308
msgid "About:"
msgstr "Over:"
@@ -3844,7 +3857,7 @@ msgstr "QR-code"
msgid "%1$s wrote the following %2$s %3$s"
msgstr "%1$s schreef het volgende %2$s %3$s"
-#: ../../include/bbcode.php:264
+#: ../../include/bbcode.php:264 ../../mod/tagger.php:51
msgid "post"
msgstr "bericht"
@@ -3944,75 +3957,6 @@ msgstr "%d nieuwe connectieverzoeken"
msgid "Delegated Channels"
msgstr "Uitbestede kanalen"
-#: ../../mod/directory.php:48 ../../mod/photos.php:441 ../../mod/search.php:13
-#: ../../mod/display.php:13 ../../mod/ratings.php:82
-#: ../../mod/viewconnections.php:17
-msgid "Public access denied."
-msgstr "Openbare toegang geweigerd."
-
-#: ../../mod/directory.php:227
-#, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] "%d beoordeling"
-msgstr[1] "%d beoordelingen"
-
-#: ../../mod/directory.php:238
-msgid "Gender: "
-msgstr "Geslacht:"
-
-#: ../../mod/directory.php:240
-msgid "Status: "
-msgstr "Status: "
-
-#: ../../mod/directory.php:242
-msgid "Homepage: "
-msgstr "Homepagina: "
-
-#: ../../mod/directory.php:302 ../../mod/events.php:645
-msgid "Description:"
-msgstr "Omschrijving:"
-
-#: ../../mod/directory.php:311
-msgid "Public Forum:"
-msgstr "Openbaar forum:"
-
-#: ../../mod/directory.php:314
-msgid "Keywords: "
-msgstr "Trefwoorden: "
-
-#: ../../mod/directory.php:317
-msgid "Don't suggest"
-msgstr "Niet voorstellen"
-
-#: ../../mod/directory.php:319
-msgid "Common connections:"
-msgstr "Gemeenschappelijke connecties:"
-
-#: ../../mod/directory.php:368
-msgid "Global Directory"
-msgstr "Volledige kanalengids"
-
-#: ../../mod/directory.php:368
-msgid "Local Directory"
-msgstr "Lokale kanalengids"
-
-#: ../../mod/directory.php:374
-msgid "Finding:"
-msgstr "Gezocht naar:"
-
-#: ../../mod/directory.php:379
-msgid "next page"
-msgstr "volgende pagina"
-
-#: ../../mod/directory.php:379
-msgid "previous page"
-msgstr "vorige pagina"
-
-#: ../../mod/directory.php:395
-msgid "No entries (some entries may be hidden)."
-msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)."
-
#: ../../mod/xchan.php:6
msgid "Xchan Lookup"
msgstr "Xchan opzoeken"
@@ -4439,6 +4383,10 @@ msgid ""
"global holidays."
msgstr "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen."
+#: ../../mod/events.php:645 ../../mod/directory.php:301
+msgid "Description:"
+msgstr "Omschrijving:"
+
#: ../../mod/events.php:649
msgid "Title:"
msgstr "Titel:"
@@ -4694,11 +4642,11 @@ msgstr "Kon geen toegang krijgen tot de connectie-gegevens."
msgid "Could not locate selected profile."
msgstr "Kon het gekozen profiel niet vinden."
-#: ../../mod/connections.php:94 ../../mod/connedit.php:214
+#: ../../mod/connections.php:94 ../../mod/connedit.php:220
msgid "Connection updated."
msgstr "Connectie bijgewerkt."
-#: ../../mod/connections.php:96 ../../mod/connedit.php:216
+#: ../../mod/connections.php:96 ../../mod/connedit.php:222
msgid "Failed to update connection record."
msgstr "Bijwerken van connectie-gegevens mislukt."
@@ -4787,10 +4735,70 @@ msgstr "Bloknaam"
msgid "Block Title"
msgstr "Bloktitel"
-#: ../../mod/tagger.php:96
+#: ../../mod/directory.php:48 ../../mod/photos.php:441 ../../mod/search.php:13
+#: ../../mod/display.php:13 ../../mod/ratings.php:82
+#: ../../mod/viewconnections.php:17
+msgid "Public access denied."
+msgstr "Openbare toegang geweigerd."
+
+#: ../../mod/directory.php:227
#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s heeft het %3$s van %2$s getagd met %4$s"
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] "%d beoordeling"
+msgstr[1] "%d beoordelingen"
+
+#: ../../mod/directory.php:238
+msgid "Gender: "
+msgstr "Geslacht:"
+
+#: ../../mod/directory.php:240
+msgid "Status: "
+msgstr "Status: "
+
+#: ../../mod/directory.php:242
+msgid "Homepage: "
+msgstr "Homepagina: "
+
+#: ../../mod/directory.php:310
+msgid "Public Forum:"
+msgstr "Openbaar forum:"
+
+#: ../../mod/directory.php:313
+msgid "Keywords: "
+msgstr "Trefwoorden: "
+
+#: ../../mod/directory.php:316
+msgid "Don't suggest"
+msgstr "Niet voorstellen"
+
+#: ../../mod/directory.php:318
+msgid "Common connections:"
+msgstr "Gemeenschappelijke connecties:"
+
+#: ../../mod/directory.php:367
+msgid "Global Directory"
+msgstr "Volledige kanalengids"
+
+#: ../../mod/directory.php:367
+msgid "Local Directory"
+msgstr "Lokale kanalengids"
+
+#: ../../mod/directory.php:373
+msgid "Finding:"
+msgstr "Gezocht naar:"
+
+#: ../../mod/directory.php:378
+msgid "next page"
+msgstr "volgende pagina"
+
+#: ../../mod/directory.php:378
+msgid "previous page"
+msgstr "vorige pagina"
+
+#: ../../mod/directory.php:394
+msgid "No entries (some entries may be hidden)."
+msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)."
#: ../../mod/cloud.php:120
msgid "$Projectname - Guests: Username: {your email address}, Password: +++"
@@ -5046,55 +5054,64 @@ msgstr "Niet in staat om gegevens van de oude hub te downloaden"
msgid "Imported file is empty."
msgstr "Geïmporteerde bestand is leeg"
-#: ../../mod/import.php:121
+#: ../../mod/import.php:110
+msgid "The data provided is not compatible with this project."
+msgstr "De geïmporteerde gegevens zijn niet compatibel met dit project."
+
+#: ../../mod/import.php:115
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr "Waarschuwing: database-versies lopen %1$d updates achter."
+
+#: ../../mod/import.php:135
msgid ""
"Cannot create a duplicate channel identifier on this system. Import failed."
msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."
-#: ../../mod/import.php:162
+#: ../../mod/import.php:176
msgid "Channel clone failed. Import failed."
msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
-#: ../../mod/import.php:172
+#: ../../mod/import.php:186
msgid "Cloned channel not found. Import failed."
msgstr "Gekloond kanaal niet gevonden. Importeren mislukt."
-#: ../../mod/import.php:502
+#: ../../mod/import.php:516
msgid "You must be logged in to use this feature."
msgstr "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken."
-#: ../../mod/import.php:507
+#: ../../mod/import.php:521
msgid "Import Channel"
msgstr "Kanaal importeren"
-#: ../../mod/import.php:508
+#: ../../mod/import.php:522
msgid ""
"Use this form to import an existing channel from a different server/hub. You"
" may retrieve the channel identity from the old server/hub via the network "
"or provide an export file."
msgstr "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken."
-#: ../../mod/import.php:509
+#: ../../mod/import.php:523
msgid "File to Upload"
msgstr "Bestand om te uploaden"
-#: ../../mod/import.php:510
+#: ../../mod/import.php:524
msgid "Or provide the old server/hub details"
msgstr "Of vul de gegevens van de oude hub in"
-#: ../../mod/import.php:511
+#: ../../mod/import.php:525
msgid "Your old identity address (xyz@example.com)"
msgstr "Jouw oude kanaaladres (xyz@example.com)"
-#: ../../mod/import.php:512
+#: ../../mod/import.php:526
msgid "Your old login email address"
msgstr "Het e-mailadres van je oude account"
-#: ../../mod/import.php:513
+#: ../../mod/import.php:527
msgid "Your old login password"
msgstr "Wachtwoord van jouw oude account"
-#: ../../mod/import.php:514
+#: ../../mod/import.php:528
msgid ""
"For either option, please choose whether to make this hub your new primary "
"address, or whether your old location should continue this role. You will be"
@@ -5102,17 +5119,17 @@ msgid ""
"primary location for files, photos, and media."
msgstr "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen."
-#: ../../mod/import.php:515
+#: ../../mod/import.php:529
msgid "Make this hub my primary location"
msgstr "Stel deze hub als mijn primaire locatie in"
-#: ../../mod/import.php:516
+#: ../../mod/import.php:530
msgid ""
"Import existing posts if possible (experimental - limited by available "
"memory"
msgstr "Importeer bestaande berichten wanneer mogelijk (experimenteel - afhankelijk van hoeveelheid geheugen hub)"
-#: ../../mod/import.php:517
+#: ../../mod/import.php:531
msgid ""
"This process may take several minutes to complete. Please submit the form "
"only once and leave this page open until finished."
@@ -5295,11 +5312,12 @@ msgstr "Website:"
msgid "Remote Channel [%s] (not yet known on this site)"
msgstr "Kanaal op afstand [%s] (nog niet op deze hub bekend)"
-#: ../../mod/rate.php:161 ../../mod/connedit.php:663
+#: ../../mod/rate.php:161 ../../mod/connedit.php:669
msgid "Rating (this information is public)"
msgstr "Beoordeling (deze informatie is openbaar)"
-#: ../../mod/rate.php:162 ../../mod/connedit.php:664
+#: ../../mod/rate.php:162 ../../mod/connedit.php:670
+#: ../../mod/connedit.php:674
msgid "Optionally explain your rating (this information is public)"
msgstr "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)"
@@ -6373,6 +6391,11 @@ msgstr "OpenID-protocolfout. Geen ID terugontvangen."
msgid "Welcome %s. Remote authentication successful."
msgstr "Welkom %s. Authenticatie op afstand geslaagd."
+#: ../../mod/tagger.php:96
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s heeft het %3$s van %2$s getagd met %4$s"
+
#: ../../mod/uexport.php:33 ../../mod/uexport.php:34
msgid "Export Channel"
msgstr "Kanaal exporteren"
@@ -6965,13 +6988,13 @@ msgstr "Goedkeuren"
msgid "Deny"
msgstr "Afkeuren"
-#: ../../mod/admin.php:827 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
+#: ../../mod/admin.php:827 ../../mod/connedit.php:523
+#: ../../mod/connedit.php:729
msgid "Block"
msgstr "Blokkeren"
-#: ../../mod/admin.php:828 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
+#: ../../mod/admin.php:828 ../../mod/connedit.php:523
+#: ../../mod/connedit.php:729
msgid "Unblock"
msgstr "Deblokkeren"
@@ -8167,161 +8190,174 @@ msgid ""
"removed from the network"
msgstr "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het $Projectname-netwerk verwijderd"
-#: ../../mod/connedit.php:262
+#: ../../mod/connedit.php:268
msgid "is now connected to"
msgstr "is nu verbonden met"
-#: ../../mod/connedit.php:375
+#: ../../mod/connedit.php:381
msgid "Could not access address book record."
msgstr "Kon geen toegang krijgen tot de record van de connectie."
-#: ../../mod/connedit.php:389
+#: ../../mod/connedit.php:395
msgid "Refresh failed - channel is currently unavailable."
msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"
-#: ../../mod/connedit.php:396
+#: ../../mod/connedit.php:402
msgid "Channel has been unblocked"
msgstr "Kanaal is gedeblokkeerd"
-#: ../../mod/connedit.php:397
+#: ../../mod/connedit.php:403
msgid "Channel has been blocked"
msgstr "Kanaal is geblokkeerd"
-#: ../../mod/connedit.php:401 ../../mod/connedit.php:413
-#: ../../mod/connedit.php:425 ../../mod/connedit.php:437
-#: ../../mod/connedit.php:453
+#: ../../mod/connedit.php:407 ../../mod/connedit.php:419
+#: ../../mod/connedit.php:431 ../../mod/connedit.php:443
+#: ../../mod/connedit.php:459
msgid "Unable to set address book parameters."
msgstr "Niet in staat om de parameters van connecties in te stellen."
-#: ../../mod/connedit.php:408
+#: ../../mod/connedit.php:414
msgid "Channel has been unignored"
msgstr "Kanaal wordt niet meer genegeerd"
-#: ../../mod/connedit.php:409
+#: ../../mod/connedit.php:415
msgid "Channel has been ignored"
msgstr "Kanaal wordt genegeerd"
-#: ../../mod/connedit.php:420
+#: ../../mod/connedit.php:426
msgid "Channel has been unarchived"
msgstr "Kanaal is niet meer gearchiveerd"
-#: ../../mod/connedit.php:421
+#: ../../mod/connedit.php:427
msgid "Channel has been archived"
msgstr "Kanaal is gearchiveerd"
-#: ../../mod/connedit.php:432
+#: ../../mod/connedit.php:438
msgid "Channel has been unhidden"
msgstr "Kanaal is niet meer verborgen"
-#: ../../mod/connedit.php:433
+#: ../../mod/connedit.php:439
msgid "Channel has been hidden"
msgstr "Kanaal is verborgen"
-#: ../../mod/connedit.php:448
+#: ../../mod/connedit.php:454
msgid "Channel has been approved"
msgstr "Connectie/kanaal is geaccepteerd"
-#: ../../mod/connedit.php:449
+#: ../../mod/connedit.php:455
msgid "Channel has been unapproved"
msgstr "Connectie/kanaal is afgewezen"
-#: ../../mod/connedit.php:477
+#: ../../mod/connedit.php:483
msgid "Connection has been removed."
msgstr "Connectie is verwijderd"
-#: ../../mod/connedit.php:497
+#: ../../mod/connedit.php:503
#, php-format
msgid "View %s's profile"
msgstr "Profiel van %s weergeven"
-#: ../../mod/connedit.php:501
+#: ../../mod/connedit.php:507
msgid "Refresh Permissions"
msgstr "Permissies vernieuwen"
-#: ../../mod/connedit.php:504
+#: ../../mod/connedit.php:510
msgid "Fetch updated permissions"
msgstr "Aangepaste permissies ophalen"
-#: ../../mod/connedit.php:508
+#: ../../mod/connedit.php:514
msgid "Recent Activity"
msgstr "Recente activiteit"
-#: ../../mod/connedit.php:511
+#: ../../mod/connedit.php:517
msgid "View recent posts and comments"
msgstr "Recente berichten en reacties weergeven"
-#: ../../mod/connedit.php:520
+#: ../../mod/connedit.php:526
msgid "Block (or Unblock) all communications with this connection"
msgstr "Blokkeer (of deblokkeer) alle communicatie met deze connectie"
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
+#: ../../mod/connedit.php:530 ../../mod/connedit.php:730
msgid "Unignore"
msgstr "Niet meer negeren"
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
+#: ../../mod/connedit.php:530 ../../mod/connedit.php:730
#: ../../mod/notifications.php:51
msgid "Ignore"
msgstr "Negeren"
-#: ../../mod/connedit.php:527
+#: ../../mod/connedit.php:533
msgid "Ignore (or Unignore) all inbound communications from this connection"
msgstr "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie"
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:536
msgid "Unarchive"
msgstr "Niet meer archiveren"
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:536
msgid "Archive"
msgstr "Archiveren"
-#: ../../mod/connedit.php:533
+#: ../../mod/connedit.php:539
msgid ""
"Archive (or Unarchive) this connection - mark channel dead but keep content"
msgstr "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud"
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:542
msgid "Unhide"
msgstr "Niet meer verbergen"
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:542
msgid "Hide"
msgstr "Verbergen"
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:545
msgid "Hide or Unhide this connection from your other connections"
msgstr "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties"
-#: ../../mod/connedit.php:546
+#: ../../mod/connedit.php:552
msgid "Delete this connection"
msgstr "Deze connectie verwijderen"
-#: ../../mod/connedit.php:637 ../../mod/connedit.php:675
+#: ../../mod/connedit.php:643 ../../mod/connedit.php:684
msgid "Approve this connection"
msgstr "Deze connectie accepteren"
-#: ../../mod/connedit.php:637
+#: ../../mod/connedit.php:643
msgid "Accept connection to allow communication"
msgstr "Keur deze connectie goed om communicatie toe te staan"
-#: ../../mod/connedit.php:653
+#: ../../mod/connedit.php:659
#, php-format
msgid "Connections: settings for %s"
msgstr "Connecties: instellingen voor %s"
-#: ../../mod/connedit.php:654
+#: ../../mod/connedit.php:660
msgid "Apply these permissions automatically"
msgstr "Deze permissies automatisch toepassen"
-#: ../../mod/connedit.php:658
+#: ../../mod/connedit.php:664
msgid "Apply the permissions indicated on this page to all new connections."
msgstr "Permissies die op deze pagina staan vermeldt op alle nieuwe connecties toepassen."
-#: ../../mod/connedit.php:662
+#: ../../mod/connedit.php:668
msgid "Slide to adjust your degree of friendship"
msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag"
-#: ../../mod/connedit.php:671
+#: ../../mod/connedit.php:672
+msgid "Only import posts with this text"
+msgstr "Importeer alleen berichten met deze tekst"
+
+#: ../../mod/connedit.php:672 ../../mod/connedit.php:673
+msgid ""
+"words one per line or #tags or /patterns/, leave blank to import all posts"
+msgstr "woorden (één per regel), #tags of /patterns/, laat leeg om alle berichten te importeren"
+
+#: ../../mod/connedit.php:673
+msgid "Do not import posts with this text"
+msgstr "Importeer geen berichten met deze tekst"
+
+#: ../../mod/connedit.php:680
msgid ""
"Default permissions for your channel type have (just) been applied. They "
"have not yet been submitted. Please review the permissions on this page and "
@@ -8330,48 +8366,48 @@ msgid ""
"install and apply the selected permissions."
msgstr "Voor jouw kanaaltype geldende standaard permissies zijn (zonet) toegepast. Ze zijn echter nog niet opgeslagen. Controleer de permissies op deze pagina en verander ze eventueel. Deze nieuwe connectie kan mogelijk nog <em>niet</em> met jou communiceren totdat je deze pagina opslaat, wat ervoor zorgt dat de gekozen permissies actief worden."
-#: ../../mod/connedit.php:674
+#: ../../mod/connedit.php:683
msgid "inherited"
msgstr "geërfd"
-#: ../../mod/connedit.php:677
+#: ../../mod/connedit.php:686
msgid "Connection has no individual permissions!"
msgstr "Connectie heeft geen individuele permissies!"
-#: ../../mod/connedit.php:678
+#: ../../mod/connedit.php:687
msgid ""
"This may be appropriate based on your <a href=\"settings\">privacy "
"settings</a>, though you may wish to review the \"Advanced Permissions\"."
msgstr "Dit is mogelijk voldoende, wanneer er naar jouw <a href=\"settings\">privacy-instellingen</a> wordt gekeken. Hoewel je wellicht de geavanceerde rechten wil nagaan."
-#: ../../mod/connedit.php:680
+#: ../../mod/connedit.php:689
msgid "Profile Visibility"
msgstr "Zichtbaarheid profiel"
-#: ../../mod/connedit.php:681
+#: ../../mod/connedit.php:690
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."
-#: ../../mod/connedit.php:682
+#: ../../mod/connedit.php:691
msgid "Contact Information / Notes"
msgstr "Informatie/aantekeningen over connectie"
-#: ../../mod/connedit.php:683
+#: ../../mod/connedit.php:692
msgid "Edit contact notes"
msgstr "Bewerk aantekeningen over contact"
-#: ../../mod/connedit.php:685
+#: ../../mod/connedit.php:694
msgid "Their Settings"
msgstr "Hun instellingen"
-#: ../../mod/connedit.php:686
+#: ../../mod/connedit.php:695
msgid "My Settings"
msgstr "Mijn instellingen"
-#: ../../mod/connedit.php:688
+#: ../../mod/connedit.php:697
msgid ""
"Default permissions for this channel type have (just) been applied. They "
"have <em>not</em> been saved and there are currently no stored default "
@@ -8379,35 +8415,35 @@ msgid ""
"finalize."
msgstr "Voor dit kanaaltype geldende standaard permissies zijn (zonet) toegepast. Ze zijn echter nog <em>niet</em> opgeslagen en er zijn momenteel geen standaard permissies aanwezig. Controleer/verander de permissies op deze pagina en klik op [Opslaan] om deze te activeren."
-#: ../../mod/connedit.php:689
+#: ../../mod/connedit.php:698
msgid "Clear/Disable Automatic Permissions"
msgstr "Verwijderen/uitschakelen automatische permissies"
-#: ../../mod/connedit.php:690
+#: ../../mod/connedit.php:699
msgid "Forum Members"
msgstr "Forumleden"
-#: ../../mod/connedit.php:691
+#: ../../mod/connedit.php:700
msgid "Soapbox"
msgstr "Zeepkist"
-#: ../../mod/connedit.php:692
+#: ../../mod/connedit.php:701
msgid "Full Sharing (typical social network permissions)"
msgstr "Voluit delen (vergelijkbaar met die van sociale netwerken)"
-#: ../../mod/connedit.php:693
+#: ../../mod/connedit.php:702
msgid "Cautious Sharing "
msgstr "Voorzichtig delen"
-#: ../../mod/connedit.php:694
+#: ../../mod/connedit.php:703
msgid "Follow Only"
msgstr "Alleen volgen"
-#: ../../mod/connedit.php:695
+#: ../../mod/connedit.php:704
msgid "Individual Permissions"
msgstr "Individuele permissies"
-#: ../../mod/connedit.php:696
+#: ../../mod/connedit.php:705
msgid ""
"Some permissions may be inherited from your channel <a "
"href=\"settings\">privacy settings</a>, which have higher priority than "
@@ -8415,64 +8451,64 @@ msgid ""
"have no effect."
msgstr "Sommige permissies kunnen worden overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal. Wanneer je deze geërfde instellingen op deze pagina veranderd heeft dat geen effect."
-#: ../../mod/connedit.php:697
+#: ../../mod/connedit.php:706
msgid "Advanced Permissions"
msgstr "Geavanceerde permissies"
-#: ../../mod/connedit.php:698
+#: ../../mod/connedit.php:707
msgid "Simple Permissions (select one and submit)"
msgstr "Eenvoudige permissies (selecteer er één en opslaan)"
-#: ../../mod/connedit.php:702
+#: ../../mod/connedit.php:711
#, php-format
msgid "Visit %s's profile - %s"
msgstr "Profiel van %s bezoeken - %s"
-#: ../../mod/connedit.php:703
+#: ../../mod/connedit.php:712
msgid "Block/Unblock contact"
msgstr "Connectie blokkeren/deblokkeren"
-#: ../../mod/connedit.php:704
+#: ../../mod/connedit.php:713
msgid "Ignore contact"
msgstr "Connectie negeren"
-#: ../../mod/connedit.php:705
+#: ../../mod/connedit.php:714
msgid "Repair URL settings"
msgstr "URL-instellingen repareren"
-#: ../../mod/connedit.php:706
+#: ../../mod/connedit.php:715
msgid "View conversations"
msgstr "Conversaties weergeven"
-#: ../../mod/connedit.php:708
+#: ../../mod/connedit.php:717
msgid "Delete contact"
msgstr "Connectie verwijderen"
-#: ../../mod/connedit.php:712
+#: ../../mod/connedit.php:721
msgid "Last update:"
msgstr "Laatste wijziging:"
-#: ../../mod/connedit.php:714
+#: ../../mod/connedit.php:723
msgid "Update public posts"
msgstr "Openbare berichten updaten"
-#: ../../mod/connedit.php:716
+#: ../../mod/connedit.php:725
msgid "Update now"
msgstr "Nu updaten"
-#: ../../mod/connedit.php:722
+#: ../../mod/connedit.php:731
msgid "Currently blocked"
msgstr "Momenteel geblokkeerd"
-#: ../../mod/connedit.php:723
+#: ../../mod/connedit.php:732
msgid "Currently ignored"
msgstr "Momenteel genegeerd"
-#: ../../mod/connedit.php:724
+#: ../../mod/connedit.php:733
msgid "Currently archived"
msgstr "Momenteel gearchiveerd"
-#: ../../mod/connedit.php:725
+#: ../../mod/connedit.php:734
msgid "Currently pending"
msgstr "Moeten nog geaccepteerd of afgewezen worden"
@@ -8731,6 +8767,21 @@ msgstr "Bladwijzers van mijn connecties"
msgid "Insufficient permissions. Request redirected to profile page."
msgstr "Onvoldoende permissies. Doorgestuurd naar profielpagina."
+#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Deze instelling vereist een speciaal proces en bewerken is geblokkeerd."
+
+#: ../../mod/pconfig.php:49
+msgid "Configuration Editor"
+msgstr "Configuratiebewerker"
+
+#: ../../mod/pconfig.php:50
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please"
+" leave this page unless you are comfortable with and knowledgeable about how"
+" to correctly use this feature."
+msgstr "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. "
+
#: ../../mod/suggest.php:35
msgid ""
"No suggestions available. If this is a new site, please try again in 24 "
diff --git a/view/nl/strings.php b/view/nl/strings.php
index a199b81af..a3aff3564 100644
--- a/view/nl/strings.php
+++ b/view/nl/strings.php
@@ -240,6 +240,10 @@ $a->strings["Create new folder"] = "Nieuwe map aanmaken";
$a->strings["Upload file"] = "Bestand uploaden";
$a->strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s";
$a->strings["view full size"] = "volledige grootte tonen";
+$a->strings["\$Projectname Notification"] = "\$Projectname-notificatie";
+$a->strings["Thank You,"] = "Bedankt,";
+$a->strings["%s Administrator"] = "Beheerder %s";
+$a->strings["No Subject"] = "Geen onderwerp";
$a->strings["General Features"] = "Algemene functies";
$a->strings["Content Expiration"] = "Inhoud laten verlopen";
$a->strings["Remove posts/comments and/or private messages at a future time"] = "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen";
@@ -285,6 +289,8 @@ $a->strings["Network New Tab"] = "Nieuwe netwerktab";
$a->strings["Enable tab to display all new Network activity"] = "Laat de tab alle nieuwe netwerkactiviteit tonen";
$a->strings["Affinity Tool"] = "Verwantschapsfilter";
$a->strings["Filter stream activity by depth of relationships"] = "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag";
+$a->strings["Connection Filtering"] = "Connectie-filters";
+$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filter binnenkomende berichten van connecties aan de hand van trefwoorden/inhoud";
$a->strings["Suggest Channels"] = "Kanalen voorstellen";
$a->strings["Show channel suggestions"] = "Voor jou mogelijk interessante kanalen voorstellen";
$a->strings["Post/Comment Tools"] = "Bericht- en reactiehulpmiddelen";
@@ -344,9 +350,6 @@ $a->strings["photo/image"] = "foto/afbeelding";
$a->strings["Rate Me"] = "Beoordeel mij";
$a->strings["View Ratings"] = "Bekijk beoordelingen";
$a->strings["Public Hubs"] = "Openbare hubs";
-$a->strings["\$Projectname Notification"] = "\$Projectname-notificatie";
-$a->strings["Thank You,"] = "Bedankt,";
-$a->strings["%s Administrator"] = "Beheerder %s";
$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
$a->strings["[Red:Notify] New mail received at %s"] = "[Red:Notificatie] Nieuw privébericht ontvangen op %s";
$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s.";
@@ -933,25 +936,6 @@ $a->strings["Make Default"] = "Als standaard instellen";
$a->strings["%d new messages"] = "%d nieuwe berichten";
$a->strings["%d new introductions"] = "%d nieuwe connectieverzoeken";
$a->strings["Delegated Channels"] = "Uitbestede kanalen";
-$a->strings["Public access denied."] = "Openbare toegang geweigerd.";
-$a->strings["%d rating"] = array(
- 0 => "%d beoordeling",
- 1 => "%d beoordelingen",
-);
-$a->strings["Gender: "] = "Geslacht:";
-$a->strings["Status: "] = "Status: ";
-$a->strings["Homepage: "] = "Homepagina: ";
-$a->strings["Description:"] = "Omschrijving:";
-$a->strings["Public Forum:"] = "Openbaar forum:";
-$a->strings["Keywords: "] = "Trefwoorden: ";
-$a->strings["Don't suggest"] = "Niet voorstellen";
-$a->strings["Common connections:"] = "Gemeenschappelijke connecties:";
-$a->strings["Global Directory"] = "Volledige kanalengids";
-$a->strings["Local Directory"] = "Lokale kanalengids";
-$a->strings["Finding:"] = "Gezocht naar:";
-$a->strings["next page"] = "volgende pagina";
-$a->strings["previous page"] = "vorige pagina";
-$a->strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn).";
$a->strings["Xchan Lookup"] = "Xchan opzoeken";
$a->strings["Lookup xchan beginning with (or webbie): "] = "Zoek een xchan (of webbie) die begint met:";
$a->strings["Not found."] = "Niet gevonden.";
@@ -1049,6 +1033,7 @@ $a->strings["Finish date/time is not known or not relevant"] = "Einddatum/-tijd
$a->strings["Event Finishes:"] = "Einde gebeurtenis:";
$a->strings["Adjust for viewer timezone"] = "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt";
$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen.";
+$a->strings["Description:"] = "Omschrijving:";
$a->strings["Title:"] = "Titel:";
$a->strings["Share this event"] = "Deel deze gebeurtenis";
$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s volgt het %3\$s van %2\$s";
@@ -1132,7 +1117,24 @@ $a->strings["Search your connections"] = "Doorzoek jouw connecties";
$a->strings["Finding: "] = "Zoeken naar: ";
$a->strings["Block Name"] = "Bloknaam";
$a->strings["Block Title"] = "Bloktitel";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s heeft het %3\$s van %2\$s getagd met %4\$s";
+$a->strings["Public access denied."] = "Openbare toegang geweigerd.";
+$a->strings["%d rating"] = array(
+ 0 => "%d beoordeling",
+ 1 => "%d beoordelingen",
+);
+$a->strings["Gender: "] = "Geslacht:";
+$a->strings["Status: "] = "Status: ";
+$a->strings["Homepage: "] = "Homepagina: ";
+$a->strings["Public Forum:"] = "Openbaar forum:";
+$a->strings["Keywords: "] = "Trefwoorden: ";
+$a->strings["Don't suggest"] = "Niet voorstellen";
+$a->strings["Common connections:"] = "Gemeenschappelijke connecties:";
+$a->strings["Global Directory"] = "Volledige kanalengids";
+$a->strings["Local Directory"] = "Lokale kanalengids";
+$a->strings["Finding:"] = "Gezocht naar:";
+$a->strings["next page"] = "volgende pagina";
+$a->strings["previous page"] = "vorige pagina";
+$a->strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn).";
$a->strings["\$Projectname - Guests: Username: {your email address}, Password: +++"] = "\$Projectname - gasttoegang: Accountnaam: {jouw e-mailadres}, wachtwoord: +++";
$a->strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen.";
$a->strings["Album not found."] = "Album niet gevonden.";
@@ -1195,6 +1197,8 @@ $a->strings["Your service plan only allows %d channels."] = "Jouw abonnement sta
$a->strings["Nothing to import."] = "Niets gevonden om te importeren";
$a->strings["Unable to download data from old server"] = "Niet in staat om gegevens van de oude hub te downloaden";
$a->strings["Imported file is empty."] = "Geïmporteerde bestand is leeg";
+$a->strings["The data provided is not compatible with this project."] = "De geïmporteerde gegevens zijn niet compatibel met dit project.";
+$a->strings["Warning: Database versions differ by %1\$d updates."] = "Waarschuwing: database-versies lopen %1\$d updates achter.";
$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt.";
$a->strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt.";
$a->strings["Cloned channel not found. Import failed."] = "Gekloond kanaal niet gevonden. Importeren mislukt.";
@@ -1501,6 +1505,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Wat nu</h1>";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: You will need to [manually] setup a scheduled task for the poller.";
$a->strings["OpenID protocol error. No ID returned."] = "OpenID-protocolfout. Geen ID terugontvangen.";
$a->strings["Welcome %s. Remote authentication successful."] = "Welkom %s. Authenticatie op afstand geslaagd.";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s heeft het %3\$s van %2\$s getagd met %4\$s";
$a->strings["Export Channel"] = "Kanaal exporteren";
$a->strings["Export your basic channel information to a small file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new hub, but\tdoes not contain your content."] = "Exporteer de basisinformatie van jouw kanaal naar een klein bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal.";
$a->strings["Export Content"] = "Inhoud exporteren";
@@ -1971,6 +1976,9 @@ $a->strings["Connections: settings for %s"] = "Connecties: instellingen voor %s"
$a->strings["Apply these permissions automatically"] = "Deze permissies automatisch toepassen";
$a->strings["Apply the permissions indicated on this page to all new connections."] = "Permissies die op deze pagina staan vermeldt op alle nieuwe connecties toepassen.";
$a->strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag";
+$a->strings["Only import posts with this text"] = "Importeer alleen berichten met deze tekst";
+$a->strings["words one per line or #tags or /patterns/, leave blank to import all posts"] = "woorden (één per regel), #tags of /patterns/, laat leeg om alle berichten te importeren";
+$a->strings["Do not import posts with this text"] = "Importeer geen berichten met deze tekst";
$a->strings["Default permissions for your channel type have (just) been applied. They have not yet been submitted. Please review the permissions on this page and make any desired changes at this time. This new connection may <em>not</em> be able to communicate with you until you submit this page, which will install and apply the selected permissions."] = "Voor jouw kanaaltype geldende standaard permissies zijn (zonet) toegepast. Ze zijn echter nog niet opgeslagen. Controleer de permissies op deze pagina en verander ze eventueel. Deze nieuwe connectie kan mogelijk nog <em>niet</em> met jou communiceren totdat je deze pagina opslaat, wat ervoor zorgt dat de gekozen permissies actief worden.";
$a->strings["inherited"] = "geërfd";
$a->strings["Connection has no individual permissions!"] = "Connectie heeft geen individuele permissies!";
@@ -2065,6 +2073,9 @@ $a->strings["Bookmark added"] = "Bladwijzer toegevoegd";
$a->strings["My Bookmarks"] = "Mijn bladwijzers";
$a->strings["My Connections Bookmarks"] = "Bladwijzers van mijn connecties";
$a->strings["Insufficient permissions. Request redirected to profile page."] = "Onvoldoende permissies. Doorgestuurd naar profielpagina.";
+$a->strings["This setting requires special processing and editing has been blocked."] = "Deze instelling vereist een speciaal proces en bewerken is geblokkeerd.";
+$a->strings["Configuration Editor"] = "Configuratiebewerker";
+$a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. ";
$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probeer het dan over 24 uur weer.";
$a->strings["Poll"] = "Peiling";
$a->strings["View Results"] = "Bekijk resultaten";
diff --git a/view/pt-br/messages.po b/view/pt-br/messages.po
index 0d0fec778..2a0160e05 100644
--- a/view/pt-br/messages.po
+++ b/view/pt-br/messages.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-22 00:03-0700\n"
-"PO-Revision-Date: 2015-05-28 18:53+0000\n"
+"POT-Creation-Date: 2015-07-17 00:04-0700\n"
+"PO-Revision-Date: 2015-07-25 01:29+0000\n"
"Last-Translator: Iske Solstag <solstag@member.fsf.org>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/red-matrix/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -34,422 +34,128 @@ msgstr "Não foi possível localizar a informação de DNS para o servidor de ba
#: ../../include/photo/photo_driver.php:687 ../../mod/profile_photo.php:143
#: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424
-#: ../../mod/photos.php:91 ../../mod/photos.php:625
+#: ../../mod/photos.php:92 ../../mod/photos.php:637
msgid "Profile Photos"
msgstr "Fotos do perfil"
-#: ../../include/text.php:329
-msgid "prev"
-msgstr "anterior"
-
-#: ../../include/text.php:331
-msgid "first"
-msgstr "primeiro"
-
-#: ../../include/text.php:360
-msgid "last"
-msgstr "último"
-
-#: ../../include/text.php:363
-msgid "next"
-msgstr "próximo"
-
-#: ../../include/text.php:373
-msgid "older"
-msgstr "mais antigo"
-
-#: ../../include/text.php:375
-msgid "newer"
-msgstr "mais recente"
-
-#: ../../include/text.php:768
-msgid "No connections"
-msgstr "Nenhuma conexão"
-
-#: ../../include/text.php:782
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] "%d conexão"
-msgstr[1] "%d conexões"
-
-#: ../../include/text.php:795 ../../mod/viewconnections.php:104
-msgid "View Connections"
-msgstr "Ver conexões"
-
-#: ../../include/text.php:852 ../../include/text.php:864
-#: ../../include/nav.php:165 ../../include/apps.php:147
-#: ../../mod/search.php:38
-msgid "Search"
-msgstr "Pesquisar"
-
-#: ../../include/text.php:853 ../../include/text.php:865
-#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
-#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1416
-#: ../../mod/admin.php:1436
-msgid "Save"
-msgstr "Salvar"
-
-#: ../../include/text.php:928
-msgid "poke"
-msgstr "cutucar"
-
-#: ../../include/text.php:928 ../../include/conversation.php:243
-msgid "poked"
-msgstr "cutucado"
-
-#: ../../include/text.php:929
-msgid "ping"
-msgstr "pingar"
-
-#: ../../include/text.php:929
-msgid "pinged"
-msgstr "pingou"
-
-#: ../../include/text.php:930
-msgid "prod"
-msgstr "espetar"
-
-#: ../../include/text.php:930
-msgid "prodded"
-msgstr "espetou"
-
-#: ../../include/text.php:931
-msgid "slap"
-msgstr "estapear"
-
-#: ../../include/text.php:931
-msgid "slapped"
-msgstr "estapeou"
-
-#: ../../include/text.php:932
-msgid "finger"
-msgstr "dar um toque"
-
-#: ../../include/text.php:932
-msgid "fingered"
-msgstr "deu um toque"
-
-#: ../../include/text.php:933
-msgid "rebuff"
-msgstr "rebater"
-
-#: ../../include/text.php:933
-msgid "rebuffed"
-msgstr "rebateu"
-
-#: ../../include/text.php:943
-msgid "happy"
-msgstr "feliz"
-
-#: ../../include/text.php:944
-msgid "sad"
-msgstr "triste"
-
-#: ../../include/text.php:945
-msgid "mellow"
-msgstr "suave"
-
-#: ../../include/text.php:946
-msgid "tired"
-msgstr "cansad@"
-
-#: ../../include/text.php:947
-msgid "perky"
-msgstr "animad@"
-
-#: ../../include/text.php:948
-msgid "angry"
-msgstr "nervos@"
-
-#: ../../include/text.php:949
-msgid "stupified"
-msgstr "embasbacad@"
-
-#: ../../include/text.php:950
-msgid "puzzled"
-msgstr "confus@"
-
-#: ../../include/text.php:951
-msgid "interested"
-msgstr "interessad@"
-
-#: ../../include/text.php:952
-msgid "bitter"
-msgstr "amarg@"
-
-#: ../../include/text.php:953
-msgid "cheerful"
-msgstr "animad@"
-
-#: ../../include/text.php:954
-msgid "alive"
-msgstr "viv@"
-
-#: ../../include/text.php:955
-msgid "annoyed"
-msgstr "aborrecid@"
-
-#: ../../include/text.php:956
-msgid "anxious"
-msgstr "ansios@"
-
-#: ../../include/text.php:957
-msgid "cranky"
-msgstr "irritad@"
-
-#: ../../include/text.php:958
-msgid "disturbed"
-msgstr "perturbad@"
-
-#: ../../include/text.php:959
-msgid "frustrated"
-msgstr "frustrad@"
-
-#: ../../include/text.php:960
-msgid "depressed"
-msgstr "deprimido"
-
-#: ../../include/text.php:961
-msgid "motivated"
-msgstr "motivad@"
-
-#: ../../include/text.php:962
-msgid "relaxed"
-msgstr "relaxad@"
-
-#: ../../include/text.php:963
-msgid "surprised"
-msgstr "surpres@"
-
-#: ../../include/text.php:1135
-msgid "Monday"
-msgstr "Segunda"
-
-#: ../../include/text.php:1135
-msgid "Tuesday"
-msgstr "Terça"
-
-#: ../../include/text.php:1135
-msgid "Wednesday"
-msgstr "Quarta"
-
-#: ../../include/text.php:1135
-msgid "Thursday"
-msgstr "Quinta"
-
-#: ../../include/text.php:1135
-msgid "Friday"
-msgstr "Sexta"
-
-#: ../../include/text.php:1135
-msgid "Saturday"
-msgstr "SaÌbado"
-
-#: ../../include/text.php:1135
-msgid "Sunday"
-msgstr "Domingo"
-
-#: ../../include/text.php:1139
-msgid "January"
-msgstr "Janeiro"
-
-#: ../../include/text.php:1139
-msgid "February"
-msgstr "Fevereiro"
-
-#: ../../include/text.php:1139
-msgid "March"
-msgstr "Março"
-
-#: ../../include/text.php:1139
-msgid "April"
-msgstr "Abril"
-
-#: ../../include/text.php:1139
-msgid "May"
-msgstr "Maio"
-
-#: ../../include/text.php:1139
-msgid "June"
-msgstr "Junho"
-
-#: ../../include/text.php:1139
-msgid "July"
-msgstr "Julho"
-
-#: ../../include/text.php:1139
-msgid "August"
-msgstr "Agosto"
-
-#: ../../include/text.php:1139
-msgid "September"
-msgstr "Setembro"
-
-#: ../../include/text.php:1139
-msgid "October"
-msgstr "Outubro"
-
-#: ../../include/text.php:1139
-msgid "November"
-msgstr "Novembro"
-
-#: ../../include/text.php:1139
-msgid "December"
-msgstr "Dezembro"
-
-#: ../../include/text.php:1244
-msgid "unknown.???"
-msgstr "desconhecido.???"
-
-#: ../../include/text.php:1245
-msgid "bytes"
-msgstr "bytes"
-
-#: ../../include/text.php:1281
-msgid "remove category"
-msgstr "remover categoria"
-
-#: ../../include/text.php:1356
-msgid "remove from file"
-msgstr "remover do arquivo"
-
-#: ../../include/text.php:1432 ../../include/text.php:1443
-#: ../../mod/connedit.php:661
-msgid "Click to open/close"
-msgstr "Clique para abrir/fechar"
-
-#: ../../include/text.php:1599 ../../mod/events.php:444
-msgid "Link to Source"
-msgstr "Link para a origem"
-
-#: ../../include/text.php:1620 ../../include/text.php:1691
-msgid "default"
-msgstr "default"
-
-#: ../../include/text.php:1628
-msgid "Page layout"
-msgstr "aparência da página"
-
-#: ../../include/text.php:1628
-msgid "You can create your own with the layouts tool"
-msgstr "Você pode criar sua própria com as ferramentas de layouts"
-
-#: ../../include/text.php:1669
-msgid "Page content type"
-msgstr "Tipo de conteúdo da página"
-
-#: ../../include/text.php:1703
-msgid "Select an alternate language"
-msgstr "Selecione um idioma alternativo"
+#: ../../include/menu.php:107 ../../include/page_widgets.php:8
+#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:266
+#: ../../include/ItemObject.php:100 ../../include/apps.php:254
+#: ../../mod/webpages.php:181 ../../mod/thing.php:227
+#: ../../mod/connections.php:382 ../../mod/connections.php:395
+#: ../../mod/connections.php:414 ../../mod/blocks.php:153
+#: ../../mod/editpost.php:106 ../../mod/editlayout.php:133
+#: ../../mod/editwebpage.php:178 ../../mod/editblock.php:134
+#: ../../mod/menu.php:103 ../../mod/settings.php:650 ../../mod/layouts.php:183
+msgid "Edit"
+msgstr "Editar"
-#: ../../include/text.php:1822 ../../include/conversation.php:120
-#: ../../include/diaspora.php:2081 ../../mod/like.php:346
+#: ../../include/diaspora.php:2115 ../../include/text.php:1888
+#: ../../include/conversation.php:120 ../../mod/like.php:346
#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
#: ../../mod/tagger.php:43
msgid "photo"
msgstr "foto"
-#: ../../include/text.php:1825 ../../include/conversation.php:123
-#: ../../mod/like.php:348 ../../mod/tagger.php:47
-msgid "event"
-msgstr "evento"
-
-#: ../../include/text.php:1828 ../../include/conversation.php:148
-#: ../../include/diaspora.php:2081 ../../mod/like.php:346
+#: ../../include/diaspora.php:2115 ../../include/text.php:1894
+#: ../../include/conversation.php:148 ../../mod/like.php:346
#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:51
msgid "status"
msgstr "status"
-#: ../../include/text.php:1830 ../../include/conversation.php:150
-#: ../../mod/tagger.php:53
-msgid "comment"
-msgstr "comentário"
+#: ../../include/diaspora.php:2144 ../../include/conversation.php:164
+#: ../../mod/like.php:394
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s gosta de %3$s de %2$s"
-#: ../../include/text.php:1835
-msgid "activity"
-msgstr "atividade"
+#: ../../include/diaspora.php:2490
+msgid "Please choose"
+msgstr "Por favor, escolha"
-#: ../../include/text.php:2130
-msgid "Design Tools"
-msgstr "Ferramentas de Design"
+#: ../../include/diaspora.php:2492
+msgid "Agree"
+msgstr "Concordo"
-#: ../../include/text.php:2133 ../../mod/blocks.php:147
-msgid "Blocks"
-msgstr "Blocos"
+#: ../../include/diaspora.php:2494
+msgid "Disagree"
+msgstr "Discordo"
-#: ../../include/text.php:2134 ../../mod/menu.php:95
-msgid "Menus"
-msgstr "Menus"
+#: ../../include/diaspora.php:2496
+msgid "Abstain"
+msgstr "Abstenho"
-#: ../../include/text.php:2135 ../../mod/layouts.php:174
-msgid "Layouts"
-msgstr "Layouts"
+#: ../../include/diaspora.php:2518 ../../include/diaspora.php:2529
+#: ../../include/network.php:1586 ../../include/enotify.php:59
+#: ../../mod/p.php:46
+msgid "$projectname"
+msgstr "$projectname"
-#: ../../include/text.php:2136
-msgid "Pages"
-msgstr "Páginas"
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
+msgstr "Frequentemente"
-#: ../../include/text.php:2487 ../../include/RedDAV/RedBrowser.php:131
-msgid "Collection"
-msgstr "Coleção"
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
+msgstr "De hora em hora"
-#: ../../include/bbcode.php:122 ../../include/bbcode.php:761
-#: ../../include/bbcode.php:764 ../../include/bbcode.php:769
-#: ../../include/bbcode.php:772 ../../include/bbcode.php:775
-#: ../../include/bbcode.php:778 ../../include/bbcode.php:783
-#: ../../include/bbcode.php:786 ../../include/bbcode.php:791
-#: ../../include/bbcode.php:794 ../../include/bbcode.php:797
-#: ../../include/bbcode.php:800
-msgid "Image/photo"
-msgstr "Imagem/foto"
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
+msgstr "Duas vezes ao dia"
-#: ../../include/bbcode.php:161 ../../include/bbcode.php:811
-msgid "Encrypted content"
-msgstr "Conteúdo criptografado"
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr "Diariamente"
-#: ../../include/bbcode.php:178
-#, php-format
-msgid "Install %s element: "
-msgstr "Instalar elemento %s:"
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr "Semanalmente"
-#: ../../include/bbcode.php:188 ../../mod/impel.php:33
-msgid "webpage"
-msgstr "página web"
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr "Mensalmente"
-#: ../../include/bbcode.php:191 ../../mod/impel.php:43
-msgid "layout"
-msgstr "layout"
+#: ../../include/contact_selectors.php:76
+msgid "Friendica"
+msgstr "Friendica"
-#: ../../include/bbcode.php:194 ../../mod/impel.php:38
-msgid "block"
-msgstr "bloco"
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr "OStatus"
-#: ../../include/bbcode.php:208
-msgid "QR code"
-msgstr "código QR"
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
-#: ../../include/bbcode.php:259
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s escreveu a seguinte %2$s %3$s"
+#: ../../include/contact_selectors.php:79 ../../mod/admin.php:822
+#: ../../mod/admin.php:831 ../../mod/id.php:15 ../../mod/id.php:16
+#: ../../boot.php:1553
+msgid "Email"
+msgstr "E-mail"
-#: ../../include/bbcode.php:261
-msgid "post"
-msgstr "publicação"
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
+msgstr "Diaspora"
-#: ../../include/bbcode.php:511
-msgid "Different viewers will see this text differently"
-msgstr "Visualizadores diferentes verão esse texto diferentemente"
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
+msgstr "Facebook"
-#: ../../include/bbcode.php:722
-msgid "$1 spoiler"
-msgstr "$1 spoiler"
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
+msgstr "Zot!"
-#: ../../include/bbcode.php:749
-msgid "$1 wrote:"
-msgstr "$1 escreveu:"
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr "XMPP/MI"
+
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr "MySpace"
#: ../../include/notify.php:23
msgid "created a new post"
@@ -460,6 +166,18 @@ msgstr "criou uma nova publicação"
msgid "commented on %s's post"
msgstr "comentou a publicação de %s"
+#: ../../include/Import/import_diaspora.php:17
+msgid "No username found in import file."
+msgstr "Nenhum nome de usuário encontrado no arquivo de importação."
+
+#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:156
+msgid "Unable to create a unique channel address. Import failed."
+msgstr "Não foi possível criar um endereço de canal único. Importação falhou."
+
+#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504
+msgid "Import completed."
+msgstr "A importação foi completada."
+
#: ../../include/group.php:26
msgid ""
"A deleted group with this name was revived. Existing item permissions "
@@ -471,7 +189,7 @@ msgstr "Um grupo com esse nome, anteriormente excluído, foi reativado. PermissÃ
msgid "Default privacy group for new contacts"
msgstr "Grupo de privacidade padrão para novos contatos"
-#: ../../include/group.php:254 ../../mod/admin.php:822
+#: ../../include/group.php:254 ../../mod/admin.php:831
msgid "All Channels"
msgstr "Todos os canais"
@@ -538,7 +256,7 @@ msgid "Registration request at %s"
msgstr "Solicitação de registro em %s"
#: ../../include/account.php:314 ../../include/account.php:341
-#: ../../include/account.php:401
+#: ../../include/account.php:401 ../../include/network.php:1632
msgid "Administrator"
msgstr "Administrador"
@@ -589,7 +307,7 @@ msgstr "YYYY-MM-DD ou MM-DD"
msgid "Required"
msgstr "Obrigatório"
-#: ../../include/datetime.php:262 ../../boot.php:2354
+#: ../../include/datetime.php:262 ../../boot.php:2355
msgid "never"
msgstr "nunca"
@@ -669,41 +387,69 @@ msgstr "Aniversário de %1$s "
msgid "Happy Birthday %1$s"
msgstr "Feliz Aniversário %1$s"
+#: ../../include/dir_fns.php:126
+msgid "Directory Options"
+msgstr "Opções do Diretório"
+
+#: ../../include/dir_fns.php:128
+msgid "Safe Mode"
+msgstr "Modo tranquilo"
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/api.php:106
+#: ../../mod/photos.php:568 ../../mod/mitem.php:157 ../../mod/mitem.php:158
+#: ../../mod/mitem.php:229 ../../mod/mitem.php:230 ../../mod/menu.php:91
+#: ../../mod/menu.php:147 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:428
+#: ../../mod/settings.php:579 ../../mod/removeme.php:60
+#: ../../mod/connedit.php:631 ../../mod/connedit.php:659
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1555
+msgid "No"
+msgstr "Não"
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/api.php:105
+#: ../../mod/photos.php:568 ../../mod/mitem.php:157 ../../mod/mitem.php:158
+#: ../../mod/mitem.php:229 ../../mod/mitem.php:230 ../../mod/menu.php:91
+#: ../../mod/menu.php:147 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:430
+#: ../../mod/settings.php:579 ../../mod/removeme.php:60
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1555
+msgid "Yes"
+msgstr "Sim"
+
+#: ../../include/dir_fns.php:129
+msgid "Public Forums Only"
+msgstr "Somente Fóruns públicos"
+
+#: ../../include/dir_fns.php:130
+msgid "This Website Only"
+msgstr "Somente este Website"
+
#: ../../include/page_widgets.php:6
msgid "New Page"
msgstr "Nova página"
-#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../include/RedDAV/RedBrowser.php:269 ../../include/ItemObject.php:100
-#: ../../include/apps.php:254 ../../include/menu.php:61
-#: ../../mod/settings.php:649 ../../mod/webpages.php:180
-#: ../../mod/thing.php:227 ../../mod/connections.php:382
-#: ../../mod/connections.php:395 ../../mod/connections.php:414
-#: ../../mod/blocks.php:153 ../../mod/editlayout.php:139
-#: ../../mod/editwebpage.php:178 ../../mod/editpost.php:113
-#: ../../mod/menu.php:100 ../../mod/editblock.php:140
-#: ../../mod/layouts.php:183
-msgid "Edit"
-msgstr "Editar"
-
-#: ../../include/page_widgets.php:39 ../../mod/webpages.php:186
+#: ../../include/page_widgets.php:39 ../../mod/webpages.php:187
#: ../../mod/blocks.php:159 ../../mod/layouts.php:188
msgid "View"
msgstr "Ver"
#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
-#: ../../include/conversation.php:1155 ../../mod/webpages.php:187
-#: ../../mod/events.php:653 ../../mod/photos.php:970
-#: ../../mod/editwebpage.php:214 ../../mod/editpost.php:150
-#: ../../mod/editblock.php:176
+#: ../../include/conversation.php:1155 ../../mod/webpages.php:188
+#: ../../mod/events.php:653 ../../mod/editpost.php:143
+#: ../../mod/photos.php:982 ../../mod/editwebpage.php:214
+#: ../../mod/editblock.php:170
msgid "Preview"
msgstr "Pré-visualizar"
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:188
+#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
msgid "Actions"
msgstr "Ações"
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:189
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
msgid "Page Link"
msgstr "Link da página"
@@ -711,76 +457,40 @@ msgstr "Link da página"
msgid "Title"
msgstr "Título"
-#: ../../include/page_widgets.php:44 ../../mod/webpages.php:191
-#: ../../mod/blocks.php:150 ../../mod/layouts.php:181
+#: ../../include/page_widgets.php:44 ../../mod/webpages.php:192
+#: ../../mod/blocks.php:150 ../../mod/menu.php:105 ../../mod/layouts.php:181
msgid "Created"
msgstr "Criado"
-#: ../../include/page_widgets.php:45 ../../mod/webpages.php:192
-#: ../../mod/blocks.php:151 ../../mod/layouts.php:182
+#: ../../include/page_widgets.php:45 ../../mod/webpages.php:193
+#: ../../mod/blocks.php:151 ../../mod/menu.php:106 ../../mod/layouts.php:182
msgid "Edited"
msgstr "Editado"
-#: ../../include/api.php:1161
+#: ../../include/api.php:1193
msgid "Public Timeline"
msgstr "Linha do tempo pública"
-#: ../../include/comanche.php:34 ../../mod/admin.php:386
+#: ../../include/comanche.php:34 ../../mod/admin.php:390
#: ../../view/theme/apw/php/config.php:185
msgid "Default"
msgstr "Default"
-#: ../../include/dir_fns.php:143
-msgid "Directory Options"
-msgstr "Opções do Diretório"
-
-#: ../../include/dir_fns.php:144
-msgid "Alphabetic"
-msgstr "Alfabética"
-
-#: ../../include/dir_fns.php:145
-msgid "Reverse Alphabetic"
-msgstr "Alfabética reversa"
-
-#: ../../include/dir_fns.php:146
-msgid "Newest to Oldest"
-msgstr "Das mais recentes para as mais antigas"
-
-#: ../../include/dir_fns.php:147
-msgid "Oldest to Newest"
-msgstr "Do mais Antigo para o mais Novo"
-
-#: ../../include/dir_fns.php:148
-msgid "Sort"
-msgstr "Ordenar"
-
-#: ../../include/dir_fns.php:152
-msgid "Safe Mode"
-msgstr "Modo tranquilo"
-
-#: ../../include/dir_fns.php:154
-msgid "Public Forums Only"
-msgstr "Somente Fóruns públicos"
-
-#: ../../include/dir_fns.php:155
-msgid "This Website Only"
-msgstr "Somente este Website"
-
-#: ../../include/event.php:19 ../../include/bb2diaspora.php:451
+#: ../../include/event.php:19 ../../include/bb2diaspora.php:459
msgid "l F d, Y \\@ g:i A"
msgstr "l F d, Y \\@ g:i A"
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:457
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:465
msgid "Starts:"
msgstr "Início:"
-#: ../../include/event.php:37 ../../include/bb2diaspora.php:465
+#: ../../include/event.php:37 ../../include/bb2diaspora.php:473
msgid "Finishes:"
msgstr "Fim:"
-#: ../../include/event.php:47 ../../include/bb2diaspora.php:473
-#: ../../include/identity.php:874 ../../mod/events.php:647
-#: ../../mod/directory.php:234
+#: ../../include/event.php:47 ../../include/bb2diaspora.php:481
+#: ../../include/identity.php:908 ../../mod/directory.php:302
+#: ../../mod/events.php:647
msgid "Location:"
msgstr "Localização:"
@@ -793,7 +503,7 @@ msgid "Delete this item?"
msgstr "Excluir este item?"
#: ../../include/js_strings.php:6 ../../include/ItemObject.php:667
-#: ../../mod/photos.php:968 ../../mod/photos.php:1086
+#: ../../mod/photos.php:980 ../../mod/photos.php:1098
msgid "Comment"
msgstr "Comentar"
@@ -821,7 +531,7 @@ msgstr "A senha é muito curta"
msgid "Passwords do not match"
msgstr "As senhas não correspondem"
-#: ../../include/js_strings.php:13 ../../mod/photos.php:39
+#: ../../include/js_strings.php:13 ../../mod/photos.php:40
msgid "everybody"
msgstr "todos"
@@ -850,6 +560,7 @@ msgid "Rate This Channel (this is public)"
msgstr "Avalie esse canal (isso é público)"
#: ../../include/js_strings.php:20 ../../mod/rate.php:156
+#: ../../mod/connedit.php:667
msgid "Rating"
msgstr "Avaliação"
@@ -858,25 +569,25 @@ msgid "Describe (optional)"
msgstr "Descreva (opcional)"
#: ../../include/js_strings.php:22 ../../include/ItemObject.php:668
-#: ../../mod/settings.php:587 ../../mod/settings.php:689
-#: ../../mod/settings.php:715 ../../mod/settings.php:743
-#: ../../mod/settings.php:766 ../../mod/settings.php:848
-#: ../../mod/settings.php:1044 ../../mod/xchan.php:11 ../../mod/connect.php:93
-#: ../../mod/thing.php:275 ../../mod/thing.php:318 ../../mod/events.php:656
-#: ../../mod/group.php:81 ../../mod/setup.php:313 ../../mod/setup.php:358
-#: ../../mod/photos.php:565 ../../mod/photos.php:642 ../../mod/photos.php:929
-#: ../../mod/photos.php:969 ../../mod/photos.php:1087 ../../mod/pdledit.php:58
-#: ../../mod/import.php:504 ../../mod/chat.php:177 ../../mod/chat.php:211
-#: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105
-#: ../../mod/sources.php:104 ../../mod/sources.php:138
+#: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:275
+#: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81
+#: ../../mod/photos.php:577 ../../mod/photos.php:654 ../../mod/photos.php:941
+#: ../../mod/photos.php:981 ../../mod/photos.php:1099 ../../mod/pdledit.php:58
+#: ../../mod/import.php:534 ../../mod/chat.php:177 ../../mod/chat.php:211
+#: ../../mod/mitem.php:232 ../../mod/rate.php:167 ../../mod/invite.php:142
+#: ../../mod/locs.php:105 ../../mod/sources.php:104 ../../mod/sources.php:138
#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
-#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/admin.php:446
-#: ../../mod/admin.php:810 ../../mod/admin.php:946 ../../mod/admin.php:1077
-#: ../../mod/admin.php:1271 ../../mod/admin.php:1356 ../../mod/mitem.php:237
-#: ../../mod/mood.php:134 ../../mod/connedit.php:679 ../../mod/mail.php:355
-#: ../../mod/appman.php:99 ../../mod/poll.php:68 ../../mod/bulksetclose.php:24
-#: ../../view/theme/apw/php/config.php:256
-#: ../../view/theme/redbasic/php/config.php:97
+#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/setup.php:327
+#: ../../mod/setup.php:367 ../../mod/admin.php:453 ../../mod/admin.php:819
+#: ../../mod/admin.php:986 ../../mod/admin.php:1118 ../../mod/admin.php:1312
+#: ../../mod/admin.php:1397 ../../mod/settings.php:588
+#: ../../mod/settings.php:692 ../../mod/settings.php:718
+#: ../../mod/settings.php:746 ../../mod/settings.php:769
+#: ../../mod/settings.php:854 ../../mod/settings.php:1050
+#: ../../mod/mood.php:134 ../../mod/connedit.php:688 ../../mod/mail.php:355
+#: ../../mod/appman.php:99 ../../mod/pconfig.php:108 ../../mod/poll.php:68
+#: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256
+#: ../../view/theme/redbasic/php/config.php:99
msgid "Submit"
msgstr "Enviar"
@@ -961,8 +672,350 @@ msgstr " "
msgid "timeago.numbers"
msgstr "timeago.numbers"
+#: ../../include/text.php:395
+msgid "prev"
+msgstr "anterior"
+
+#: ../../include/text.php:397
+msgid "first"
+msgstr "primeiro"
+
+#: ../../include/text.php:426
+msgid "last"
+msgstr "último"
+
+#: ../../include/text.php:429
+msgid "next"
+msgstr "próximo"
+
+#: ../../include/text.php:439
+msgid "older"
+msgstr "mais antigo"
+
+#: ../../include/text.php:441
+msgid "newer"
+msgstr "mais recente"
+
+#: ../../include/text.php:834
+msgid "No connections"
+msgstr "Nenhuma conexão"
+
+#: ../../include/text.php:848
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] "%d conexão"
+msgstr[1] "%d conexões"
+
+#: ../../include/text.php:861 ../../mod/viewconnections.php:104
+msgid "View Connections"
+msgstr "Ver conexões"
+
+#: ../../include/text.php:918 ../../include/text.php:930
+#: ../../include/nav.php:165 ../../include/apps.php:147
+#: ../../mod/search.php:38
+msgid "Search"
+msgstr "Pesquisar"
+
+#: ../../include/text.php:919 ../../include/text.php:931
+#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
+#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1457
+#: ../../mod/admin.php:1477
+msgid "Save"
+msgstr "Salvar"
+
+#: ../../include/text.php:994
+msgid "poke"
+msgstr "cutucar"
+
+#: ../../include/text.php:994 ../../include/conversation.php:243
+msgid "poked"
+msgstr "cutucado"
+
+#: ../../include/text.php:995
+msgid "ping"
+msgstr "pingar"
+
+#: ../../include/text.php:995
+msgid "pinged"
+msgstr "pingou"
+
+#: ../../include/text.php:996
+msgid "prod"
+msgstr "espetar"
+
+#: ../../include/text.php:996
+msgid "prodded"
+msgstr "espetou"
+
+#: ../../include/text.php:997
+msgid "slap"
+msgstr "estapear"
+
+#: ../../include/text.php:997
+msgid "slapped"
+msgstr "estapeou"
+
+#: ../../include/text.php:998
+msgid "finger"
+msgstr "dar um toque"
+
+#: ../../include/text.php:998
+msgid "fingered"
+msgstr "deu um toque"
+
+#: ../../include/text.php:999
+msgid "rebuff"
+msgstr "rebater"
+
+#: ../../include/text.php:999
+msgid "rebuffed"
+msgstr "rebateu"
+
+#: ../../include/text.php:1009
+msgid "happy"
+msgstr "feliz"
+
+#: ../../include/text.php:1010
+msgid "sad"
+msgstr "triste"
+
+#: ../../include/text.php:1011
+msgid "mellow"
+msgstr "suave"
+
+#: ../../include/text.php:1012
+msgid "tired"
+msgstr "cansad@"
+
+#: ../../include/text.php:1013
+msgid "perky"
+msgstr "animad@"
+
+#: ../../include/text.php:1014
+msgid "angry"
+msgstr "nervos@"
+
+#: ../../include/text.php:1015
+msgid "stupified"
+msgstr "embasbacad@"
+
+#: ../../include/text.php:1016
+msgid "puzzled"
+msgstr "confus@"
+
+#: ../../include/text.php:1017
+msgid "interested"
+msgstr "interessad@"
+
+#: ../../include/text.php:1018
+msgid "bitter"
+msgstr "amarg@"
+
+#: ../../include/text.php:1019
+msgid "cheerful"
+msgstr "animad@"
+
+#: ../../include/text.php:1020
+msgid "alive"
+msgstr "viv@"
+
+#: ../../include/text.php:1021
+msgid "annoyed"
+msgstr "aborrecid@"
+
+#: ../../include/text.php:1022
+msgid "anxious"
+msgstr "ansios@"
+
+#: ../../include/text.php:1023
+msgid "cranky"
+msgstr "irritad@"
+
+#: ../../include/text.php:1024
+msgid "disturbed"
+msgstr "perturbad@"
+
+#: ../../include/text.php:1025
+msgid "frustrated"
+msgstr "frustrad@"
+
+#: ../../include/text.php:1026
+msgid "depressed"
+msgstr "deprimido"
+
+#: ../../include/text.php:1027
+msgid "motivated"
+msgstr "motivad@"
+
+#: ../../include/text.php:1028
+msgid "relaxed"
+msgstr "relaxad@"
+
+#: ../../include/text.php:1029
+msgid "surprised"
+msgstr "surpres@"
+
+#: ../../include/text.php:1201
+msgid "Monday"
+msgstr "Segunda"
+
+#: ../../include/text.php:1201
+msgid "Tuesday"
+msgstr "Terça"
+
+#: ../../include/text.php:1201
+msgid "Wednesday"
+msgstr "Quarta"
+
+#: ../../include/text.php:1201
+msgid "Thursday"
+msgstr "Quinta"
+
+#: ../../include/text.php:1201
+msgid "Friday"
+msgstr "Sexta"
+
+#: ../../include/text.php:1201
+msgid "Saturday"
+msgstr "SaÌbado"
+
+#: ../../include/text.php:1201
+msgid "Sunday"
+msgstr "Domingo"
+
+#: ../../include/text.php:1205
+msgid "January"
+msgstr "Janeiro"
+
+#: ../../include/text.php:1205
+msgid "February"
+msgstr "Fevereiro"
+
+#: ../../include/text.php:1205
+msgid "March"
+msgstr "Março"
+
+#: ../../include/text.php:1205
+msgid "April"
+msgstr "Abril"
+
+#: ../../include/text.php:1205
+msgid "May"
+msgstr "Maio"
+
+#: ../../include/text.php:1205
+msgid "June"
+msgstr "Junho"
+
+#: ../../include/text.php:1205
+msgid "July"
+msgstr "Julho"
+
+#: ../../include/text.php:1205
+msgid "August"
+msgstr "Agosto"
+
+#: ../../include/text.php:1205
+msgid "September"
+msgstr "Setembro"
+
+#: ../../include/text.php:1205
+msgid "October"
+msgstr "Outubro"
+
+#: ../../include/text.php:1205
+msgid "November"
+msgstr "Novembro"
+
+#: ../../include/text.php:1205
+msgid "December"
+msgstr "Dezembro"
+
+#: ../../include/text.php:1310
+msgid "unknown.???"
+msgstr "desconhecido.???"
+
+#: ../../include/text.php:1311
+msgid "bytes"
+msgstr "bytes"
+
+#: ../../include/text.php:1347
+msgid "remove category"
+msgstr "remover categoria"
+
+#: ../../include/text.php:1422
+msgid "remove from file"
+msgstr "remover do arquivo"
+
+#: ../../include/text.php:1498 ../../include/text.php:1509
+msgid "Click to open/close"
+msgstr "Clique para abrir/fechar"
+
+#: ../../include/text.php:1665 ../../mod/events.php:444
+msgid "Link to Source"
+msgstr "Link para a origem"
+
+#: ../../include/text.php:1686 ../../include/text.php:1757
+msgid "default"
+msgstr "default"
+
+#: ../../include/text.php:1694
+msgid "Page layout"
+msgstr "aparência da página"
+
+#: ../../include/text.php:1694
+msgid "You can create your own with the layouts tool"
+msgstr "Você pode criar sua própria com as ferramentas de layouts"
+
+#: ../../include/text.php:1735
+msgid "Page content type"
+msgstr "Tipo de conteúdo da página"
+
+#: ../../include/text.php:1769
+msgid "Select an alternate language"
+msgstr "Selecione um idioma alternativo"
+
+#: ../../include/text.php:1891 ../../include/conversation.php:123
+#: ../../mod/like.php:348 ../../mod/tagger.php:47
+msgid "event"
+msgstr "evento"
+
+#: ../../include/text.php:1896 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr "comentário"
+
+#: ../../include/text.php:1901
+msgid "activity"
+msgstr "atividade"
+
+#: ../../include/text.php:2196
+msgid "Design Tools"
+msgstr "Ferramentas de Design"
+
+#: ../../include/text.php:2199 ../../mod/blocks.php:147
+msgid "Blocks"
+msgstr "Blocos"
+
+#: ../../include/text.php:2200 ../../mod/menu.php:98
+msgid "Menus"
+msgstr "Menus"
+
+#: ../../include/text.php:2201 ../../mod/layouts.php:174
+msgid "Layouts"
+msgstr "Layouts"
+
+#: ../../include/text.php:2202
+msgid "Pages"
+msgstr "Páginas"
+
+#: ../../include/text.php:2553 ../../include/RedDAV/RedBrowser.php:131
+msgid "Collection"
+msgstr "Coleção"
+
#: ../../include/RedDAV/RedBrowser.php:107
-#: ../../include/RedDAV/RedBrowser.php:268
+#: ../../include/RedDAV/RedBrowser.php:265
msgid "parent"
msgstr "nível superior"
@@ -988,7 +1041,7 @@ msgstr "Caixa de saída da agenda"
#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1019
#: ../../include/apps.php:336 ../../include/apps.php:387
-#: ../../mod/photos.php:681 ../../mod/photos.php:1119
+#: ../../mod/photos.php:693 ../../mod/photos.php:1131
msgid "Unknown"
msgstr "Desconhecido"
@@ -1017,52 +1070,51 @@ msgid "Shared"
msgstr "Compartilhado"
#: ../../include/RedDAV/RedBrowser.php:256
-#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/webpages.php:179
-#: ../../mod/blocks.php:152 ../../mod/menu.php:104 ../../mod/layouts.php:175
-#: ../../mod/new_channel.php:121
+#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/webpages.php:180
+#: ../../mod/blocks.php:152 ../../mod/menu.php:109
+#: ../../mod/new_channel.php:121 ../../mod/layouts.php:175
msgid "Create"
msgstr "Criar"
#: ../../include/RedDAV/RedBrowser.php:257
-#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/profile_photo.php:362
-#: ../../mod/photos.php:706 ../../mod/photos.php:1236
+#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362
+#: ../../mod/photos.php:718 ../../mod/photos.php:1248
msgid "Upload"
msgstr "Enviar"
-#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/settings.php:589
-#: ../../mod/settings.php:615 ../../mod/admin.php:953
+#: ../../include/RedDAV/RedBrowser.php:261 ../../mod/admin.php:994
+#: ../../mod/settings.php:590 ../../mod/settings.php:616
#: ../../mod/sharedwithme.php:95
msgid "Name"
msgstr "Nome"
-#: ../../include/RedDAV/RedBrowser.php:265
+#: ../../include/RedDAV/RedBrowser.php:262
msgid "Type"
msgstr "Tipo"
-#: ../../include/RedDAV/RedBrowser.php:266 ../../mod/sharedwithme.php:97
+#: ../../include/RedDAV/RedBrowser.php:263 ../../mod/sharedwithme.php:97
msgid "Size"
msgstr "Tamanho"
-#: ../../include/RedDAV/RedBrowser.php:267 ../../mod/sharedwithme.php:98
+#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:98
msgid "Last Modified"
msgstr "Última modificação"
-#: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120
+#: ../../include/RedDAV/RedBrowser.php:267 ../../include/ItemObject.php:120
#: ../../include/conversation.php:660 ../../include/apps.php:255
-#: ../../mod/settings.php:650 ../../mod/webpages.php:182
-#: ../../mod/thing.php:228 ../../mod/group.php:176 ../../mod/blocks.php:155
-#: ../../mod/photos.php:1050 ../../mod/editlayout.php:107
-#: ../../mod/editwebpage.php:225 ../../mod/admin.php:817
-#: ../../mod/admin.php:948 ../../mod/editblock.php:113
-#: ../../mod/connedit.php:543
+#: ../../mod/webpages.php:183 ../../mod/thing.php:228 ../../mod/group.php:176
+#: ../../mod/blocks.php:155 ../../mod/photos.php:1062
+#: ../../mod/editlayout.php:178 ../../mod/editwebpage.php:225
+#: ../../mod/editblock.php:180 ../../mod/admin.php:826 ../../mod/admin.php:988
+#: ../../mod/settings.php:651 ../../mod/connedit.php:547
msgid "Delete"
msgstr "Excluir"
-#: ../../include/RedDAV/RedBrowser.php:305
+#: ../../include/RedDAV/RedBrowser.php:302
msgid "Create new folder"
msgstr "Criar uma nova pasta"
-#: ../../include/RedDAV/RedBrowser.php:307
+#: ../../include/RedDAV/RedBrowser.php:304
msgid "Upload file"
msgstr "Enviar arquivo"
@@ -1075,6 +1127,23 @@ msgstr "Links guardados de %1$s"
msgid "view full size"
msgstr "ver na tela inteira"
+#: ../../include/network.php:1585 ../../include/enotify.php:58
+msgid "$Projectname Notification"
+msgstr "$Projectname Notificação"
+
+#: ../../include/network.php:1588 ../../include/enotify.php:61
+msgid "Thank You,"
+msgstr "Obrigado(a),"
+
+#: ../../include/network.php:1590 ../../include/enotify.php:63
+#, php-format
+msgid "%s Administrator"
+msgstr "Administrador de %s"
+
+#: ../../include/network.php:1646
+msgid "No Subject"
+msgstr "Sem Assunto"
+
#: ../../include/features.php:38
msgid "General Features"
msgstr "Recursos gerais"
@@ -1183,7 +1252,7 @@ msgid ""
"(320px) photo thumbnails"
msgstr "Inclua miniatura grande (640px) no texto. Se não habilitado, use miniatura pequena (320px)"
-#: ../../include/features.php:59 ../../include/widgets.php:546
+#: ../../include/features.php:59 ../../include/widgets.php:548
#: ../../mod/sources.php:88
msgid "Channel Sources"
msgstr "Fontes do canal"
@@ -1203,11 +1272,11 @@ msgstr "Permitir encriptação opcional de conteúdo, ponta-a-ponta com uma chav
#: ../../include/features.php:61
msgid "Enable voting tools"
-msgstr "Habilitar ferramenta de votos"
+msgstr "Habilitar ferramentas de enquete"
#: ../../include/features.php:61
msgid "Provide a class of post which others can vote on"
-msgstr "Forneça uma classe de publicação que outros possam votar"
+msgstr "Forneça uma classe de publicação que permite enquetes"
#: ../../include/features.php:67
msgid "Network and Stream Filtering"
@@ -1262,63 +1331,71 @@ msgid "Filter stream activity by depth of relationships"
msgstr "Filtra o fluxo de atividades de acordo com o nível do relacionamento"
#: ../../include/features.php:74
+msgid "Connection Filtering"
+msgstr "Filtragem de conexões"
+
+#: ../../include/features.php:74
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr "Filtrar publicações de conexões baseado em palavras-chave/conteúdo"
+
+#: ../../include/features.php:75
msgid "Suggest Channels"
msgstr "Sugerir canais"
-#: ../../include/features.php:74
+#: ../../include/features.php:75
msgid "Show channel suggestions"
msgstr "Exibir sugestões de canais"
-#: ../../include/features.php:79
+#: ../../include/features.php:80
msgid "Post/Comment Tools"
msgstr "Ferramentas de publicação/comentário"
-#: ../../include/features.php:80
+#: ../../include/features.php:81
msgid "Tagging"
msgstr "Etiquetagem"
-#: ../../include/features.php:80
+#: ../../include/features.php:81
msgid "Ability to tag existing posts"
msgstr "Possibilidade de colocar etiquetas em publicações existentes"
-#: ../../include/features.php:81
+#: ../../include/features.php:82
msgid "Post Categories"
msgstr "Categorizar publicações"
-#: ../../include/features.php:81
+#: ../../include/features.php:82
msgid "Add categories to your posts"
msgstr "Adiciona categorias às suas publicações"
-#: ../../include/features.php:82 ../../include/widgets.php:304
+#: ../../include/features.php:83 ../../include/widgets.php:304
#: ../../include/contact_widgets.php:57
msgid "Saved Folders"
msgstr "Pastas salvas"
-#: ../../include/features.php:82
+#: ../../include/features.php:83
msgid "Ability to file posts under folders"
msgstr "Possibilidade de arquivar publicações em pastas"
-#: ../../include/features.php:83
+#: ../../include/features.php:84
msgid "Dislike Posts"
msgstr "Desgostar de publicações"
-#: ../../include/features.php:83
+#: ../../include/features.php:84
msgid "Ability to dislike posts/comments"
msgstr "Possibilidade de desgostar de publicações/comentários"
-#: ../../include/features.php:84
+#: ../../include/features.php:85
msgid "Star Posts"
msgstr "Destacar publicações"
-#: ../../include/features.php:84
+#: ../../include/features.php:85
msgid "Ability to mark special posts with a star indicator"
msgstr "Possibilidade de marcar publicações em destaque com uma estrela indicadora"
-#: ../../include/features.php:85
+#: ../../include/features.php:86
msgid "Tag Cloud"
msgstr "Nuvem de etiquetas"
-#: ../../include/features.php:85
+#: ../../include/features.php:86
msgid "Provide a personal tag cloud on your channel page"
msgstr "Fornece uma nuvem de etiquetas pessoais à página do seu canal"
@@ -1328,7 +1405,7 @@ msgid "Categories"
msgstr "Categorias"
#: ../../include/widgets.php:91 ../../include/nav.php:163
-#: ../../mod/apps.php:34
+#: ../../mod/apps.php:36
msgid "Apps"
msgstr "Aplicações"
@@ -1350,8 +1427,8 @@ msgstr "Editar aplicações pessoais"
#: ../../include/widgets.php:136 ../../include/widgets.php:175
#: ../../include/Contact.php:107 ../../include/conversation.php:945
-#: ../../include/identity.php:823 ../../mod/match.php:64
-#: ../../mod/directory.php:302 ../../mod/suggest.php:52
+#: ../../include/identity.php:857 ../../mod/directory.php:316
+#: ../../mod/match.php:64 ../../mod/suggest.php:52
msgid "Connect"
msgstr "Conectar"
@@ -1401,137 +1478,119 @@ msgstr "Tudo"
msgid "Archives"
msgstr "Arquivos"
-#: ../../include/widgets.php:427 ../../mod/connedit.php:572
+#: ../../include/widgets.php:429 ../../mod/connedit.php:567
msgid "Me"
msgstr "Eu"
-#: ../../include/widgets.php:428 ../../mod/connedit.php:573
+#: ../../include/widgets.php:430 ../../mod/connedit.php:568
msgid "Family"
msgstr "Família"
-#: ../../include/widgets.php:429 ../../include/identity.php:394
+#: ../../include/widgets.php:431 ../../include/identity.php:394
#: ../../include/identity.php:395 ../../include/identity.php:402
-#: ../../include/profile_selectors.php:80 ../../mod/settings.php:344
-#: ../../mod/settings.php:348 ../../mod/settings.php:349
-#: ../../mod/settings.php:352 ../../mod/settings.php:363
-#: ../../mod/connedit.php:574
+#: ../../include/profile_selectors.php:80 ../../mod/settings.php:345
+#: ../../mod/settings.php:349 ../../mod/settings.php:350
+#: ../../mod/settings.php:353 ../../mod/settings.php:364
+#: ../../mod/connedit.php:569
msgid "Friends"
msgstr "Amigos"
-#: ../../include/widgets.php:430 ../../mod/connedit.php:575
+#: ../../include/widgets.php:432 ../../mod/connedit.php:570
msgid "Acquaintances"
msgstr "Conhecidos"
-#: ../../include/widgets.php:431 ../../mod/connections.php:231
-#: ../../mod/connections.php:246 ../../mod/connedit.php:576
+#: ../../include/widgets.php:433 ../../mod/connections.php:231
+#: ../../mod/connections.php:246 ../../mod/connedit.php:571
msgid "All"
msgstr "Todos"
-#: ../../include/widgets.php:450
+#: ../../include/widgets.php:452
msgid "Refresh"
msgstr "Atualizar"
-#: ../../include/widgets.php:485
+#: ../../include/widgets.php:487
msgid "Account settings"
msgstr "Configurações da conta"
-#: ../../include/widgets.php:491
+#: ../../include/widgets.php:493
msgid "Channel settings"
msgstr "Configurações do canal"
-#: ../../include/widgets.php:497
+#: ../../include/widgets.php:499
msgid "Additional features"
msgstr "Recursos adicionais"
-#: ../../include/widgets.php:503
+#: ../../include/widgets.php:505
msgid "Feature/Addon settings"
msgstr "Configurações característica/plugins"
-#: ../../include/widgets.php:509
+#: ../../include/widgets.php:511
msgid "Display settings"
msgstr "Configurações de exibição"
-#: ../../include/widgets.php:515
+#: ../../include/widgets.php:517
msgid "Connected apps"
msgstr "Aplicações conectadas"
-#: ../../include/widgets.php:521
+#: ../../include/widgets.php:523
msgid "Export channel"
msgstr "Exportar o canal"
-#: ../../include/widgets.php:530 ../../mod/connedit.php:653
+#: ../../include/widgets.php:532 ../../mod/connedit.php:658
msgid "Connection Default Permissions"
msgstr "Permissões padrão para conexões"
-#: ../../include/widgets.php:538
+#: ../../include/widgets.php:540
msgid "Premium Channel Settings"
msgstr "Configurações de canal premium"
-#: ../../include/widgets.php:554 ../../include/nav.php:208
-#: ../../include/apps.php:134 ../../mod/admin.php:1038
-#: ../../mod/admin.php:1238
+#: ../../include/widgets.php:556 ../../include/nav.php:208
+#: ../../include/apps.php:134 ../../mod/admin.php:1079
+#: ../../mod/admin.php:1279
msgid "Settings"
msgstr "Configurações"
-#: ../../include/widgets.php:567 ../../mod/message.php:31
+#: ../../include/widgets.php:569 ../../mod/message.php:31
#: ../../mod/mail.php:128
msgid "Messages"
msgstr "Mensagens"
-#: ../../include/widgets.php:570
+#: ../../include/widgets.php:572
msgid "Check Mail"
msgstr "Checar mensagens"
-#: ../../include/widgets.php:575 ../../include/nav.php:199
+#: ../../include/widgets.php:577 ../../include/nav.php:199
msgid "New Message"
msgstr "Nova mensagem"
-#: ../../include/widgets.php:650
+#: ../../include/widgets.php:652
msgid "Chat Rooms"
msgstr "Salas de bate-papo"
-#: ../../include/widgets.php:670
+#: ../../include/widgets.php:672
msgid "Bookmarked Chatrooms"
msgstr "Salas de bate-papo guardadas"
-#: ../../include/widgets.php:690
+#: ../../include/widgets.php:692
msgid "Suggested Chatrooms"
msgstr "Salas de bate-papo sugeridas"
-#: ../../include/widgets.php:817 ../../include/widgets.php:875
+#: ../../include/widgets.php:819 ../../include/widgets.php:877
msgid "photo/image"
msgstr "foto/imagem"
-#: ../../include/widgets.php:970 ../../include/widgets.php:972
+#: ../../include/widgets.php:972 ../../include/widgets.php:974
msgid "Rate Me"
msgstr "Avalie-me"
-#: ../../include/widgets.php:976
+#: ../../include/widgets.php:978
msgid "View Ratings"
msgstr "Ver avaliações"
-#: ../../include/widgets.php:987
+#: ../../include/widgets.php:989
msgid "Public Hubs"
msgstr "Hubs Públicos"
-#: ../../include/enotify.php:58
-msgid "$Projectname Notification"
-msgstr "$Projectname Notificação"
-
-#: ../../include/enotify.php:59 ../../include/diaspora.php:2461
-#: ../../include/diaspora.php:2472 ../../mod/p.php:46
-msgid "$projectname"
-msgstr "$projectname"
-
-#: ../../include/enotify.php:61
-msgid "Thank You,"
-msgstr "Obrigado(a),"
-
-#: ../../include/enotify.php:63
-#, php-format
-msgid "%s Administrator"
-msgstr "Administrador de %s"
-
#: ../../include/enotify.php:96
#, php-format
msgid "%s <!item_type!>"
@@ -1711,72 +1770,6 @@ msgstr "Por favor, visite %s para aprovar ou rejeitar a sugestão."
msgid "[Red:Notify]"
msgstr "[Red:Notify]"
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr "Frequentemente"
-
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr "De hora em hora"
-
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr "Duas vezes ao dia"
-
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr "Diariamente"
-
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr "Semanalmente"
-
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr "Mensalmente"
-
-#: ../../include/contact_selectors.php:76
-msgid "Friendica"
-msgstr "Friendica"
-
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
-msgstr "OStatus"
-
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: ../../include/contact_selectors.php:79 ../../mod/admin.php:813
-#: ../../mod/admin.php:822 ../../mod/id.php:15 ../../mod/id.php:16
-#: ../../boot.php:1552
-msgid "Email"
-msgstr "E-mail"
-
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
-msgstr "Zot!"
-
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
-msgstr "XMPP/MI"
-
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
-msgstr "MySpace"
-
#: ../../include/message.php:18
msgid "No recipient provided."
msgstr "Falta o destinatário."
@@ -1809,19 +1802,23 @@ msgstr "A resposta do canal remoto está incompleta."
msgid "Channel was deleted and no longer exists."
msgstr "O canal foi deletado e não existe mais."
-#: ../../include/follow.php:135 ../../include/follow.php:197
+#: ../../include/follow.php:135 ../../include/follow.php:206
msgid "Protocol disabled."
msgstr "Protocolo desabilitado."
-#: ../../include/follow.php:170
+#: ../../include/follow.php:144
+msgid "Protocol blocked for this channel."
+msgstr "Protocolo bloqueado para este canal."
+
+#: ../../include/follow.php:179
msgid "Channel discovery failed."
msgstr "A descoberta de canais falhou."
-#: ../../include/follow.php:186
+#: ../../include/follow.php:195
msgid "local account not found."
msgstr "a conta local não foi encontrada."
-#: ../../include/follow.php:215
+#: ../../include/follow.php:224
msgid "Cannot connect to yourself."
msgstr "Não é possível conectar-se consigo mesmo."
@@ -1862,14 +1859,14 @@ msgid "I abstain"
msgstr "Me abstenho"
#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1677 ../../mod/photos.php:1003
-#: ../../mod/photos.php:1015
+#: ../../include/conversation.php:1677 ../../mod/photos.php:1015
+#: ../../mod/photos.php:1027
msgid "View all"
msgstr "Ver tudo"
#: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1701 ../../include/identity.php:1133
-#: ../../mod/photos.php:1007
+#: ../../include/conversation.php:1701 ../../include/identity.php:1167
+#: ../../mod/photos.php:1019
msgctxt "noun"
msgid "Like"
msgid_plural "Likes"
@@ -1877,7 +1874,7 @@ msgstr[0] "gostou"
msgstr[1] "gostaram"
#: ../../include/ItemObject.php:184 ../../include/conversation.php:1704
-#: ../../mod/photos.php:1012
+#: ../../mod/photos.php:1024
msgctxt "noun"
msgid "Dislike"
msgid_plural "Dislikes"
@@ -1912,7 +1909,7 @@ msgstr "A assinatura desta mensagem é incorreta"
msgid "Add Tag"
msgstr "Adiciona etiqueta"
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:947
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:959
msgid "I like this (toggle)"
msgstr "Eu gostei disso (alterna)"
@@ -1920,7 +1917,7 @@ msgstr "Eu gostei disso (alterna)"
msgid "like"
msgstr "gostei"
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:948
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:960
msgid "I don't like this (toggle)"
msgstr "Eu não gostei disso (alterna)"
@@ -1991,61 +1988,61 @@ msgstr "Adicione ao calendário"
msgid "Mark all seen"
msgstr "Marcar todos como visto"
-#: ../../include/ItemObject.php:353 ../../mod/photos.php:1133
+#: ../../include/ItemObject.php:353 ../../mod/photos.php:1145
msgctxt "noun"
msgid "Likes"
msgstr "Gostaram"
-#: ../../include/ItemObject.php:354 ../../mod/photos.php:1134
+#: ../../include/ItemObject.php:354 ../../mod/photos.php:1146
msgctxt "noun"
msgid "Dislikes"
msgstr "Desgostaram"
#: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249
-#: ../../mod/photos.php:1139
+#: ../../mod/photos.php:1151
msgid "Close"
msgstr "Fechar"
#: ../../include/ItemObject.php:364 ../../include/conversation.php:737
-#: ../../include/conversation.php:1209 ../../mod/photos.php:950
-#: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192
-#: ../../mod/editpost.php:130 ../../mod/editblock.php:155
+#: ../../include/conversation.php:1209 ../../mod/editpost.php:123
+#: ../../mod/photos.php:962 ../../mod/editlayout.php:147
+#: ../../mod/editwebpage.php:192 ../../mod/editblock.php:149
#: ../../mod/mail.php:241 ../../mod/mail.php:356
msgid "Please wait"
msgstr "Por favor, espere"
-#: ../../include/ItemObject.php:665 ../../mod/photos.php:966
-#: ../../mod/photos.php:1084
+#: ../../include/ItemObject.php:665 ../../mod/photos.php:978
+#: ../../mod/photos.php:1096
msgid "This is you"
msgstr "Este(a) é você"
#: ../../include/ItemObject.php:669 ../../include/conversation.php:1181
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:179
-#: ../../mod/editpost.php:114 ../../mod/editblock.php:141
+#: ../../mod/editpost.php:107 ../../mod/editlayout.php:134
+#: ../../mod/editwebpage.php:179 ../../mod/editblock.php:135
msgid "Bold"
msgstr "Negrito"
#: ../../include/ItemObject.php:670 ../../include/conversation.php:1182
-#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:180
-#: ../../mod/editpost.php:115 ../../mod/editblock.php:142
+#: ../../mod/editpost.php:108 ../../mod/editlayout.php:135
+#: ../../mod/editwebpage.php:180 ../../mod/editblock.php:136
msgid "Italic"
msgstr "Itálico"
#: ../../include/ItemObject.php:671 ../../include/conversation.php:1183
-#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:181
-#: ../../mod/editpost.php:116 ../../mod/editblock.php:143
+#: ../../mod/editpost.php:109 ../../mod/editlayout.php:136
+#: ../../mod/editwebpage.php:181 ../../mod/editblock.php:137
msgid "Underline"
msgstr "Sublinhado"
#: ../../include/ItemObject.php:672 ../../include/conversation.php:1184
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:182
-#: ../../mod/editpost.php:117 ../../mod/editblock.php:144
+#: ../../mod/editpost.php:110 ../../mod/editlayout.php:137
+#: ../../mod/editwebpage.php:182 ../../mod/editblock.php:138
msgid "Quote"
msgstr "Citação"
#: ../../include/ItemObject.php:673 ../../include/conversation.php:1185
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:183
-#: ../../mod/editpost.php:118 ../../mod/editblock.php:145
+#: ../../mod/editpost.php:111 ../../mod/editlayout.php:138
+#: ../../mod/editwebpage.php:183 ../../mod/editblock.php:139
msgid "Code"
msgstr "Código"
@@ -2062,7 +2059,7 @@ msgid "Video"
msgstr "Vídeo"
#: ../../include/ItemObject.php:680 ../../include/conversation.php:1236
-#: ../../mod/editpost.php:158 ../../mod/mail.php:247 ../../mod/mail.php:361
+#: ../../mod/editpost.php:151 ../../mod/mail.php:247 ../../mod/mail.php:361
msgid "Encrypt text"
msgstr "Encriptar texto"
@@ -2074,7 +2071,7 @@ msgstr "Nova janela"
msgid "Open the selected location in a different window or browser tab"
msgstr "Abre a localização selecionada em outra aba ou janela"
-#: ../../include/Contact.php:215 ../../mod/admin.php:730
+#: ../../include/Contact.php:215 ../../mod/admin.php:739
#, php-format
msgid "User '%s' deleted"
msgstr "O usuário/a '%s' foi deletado/a"
@@ -2083,11 +2080,11 @@ msgstr "O usuário/a '%s' foi deletado/a"
msgid "Attachments:"
msgstr "Anexos:"
-#: ../../include/bb2diaspora.php:453
+#: ../../include/bb2diaspora.php:461
msgid "$Projectname event notification:"
msgstr "Notificação de evento em $Projectname:"
-#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1549
+#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1550
msgid "Logout"
msgstr "Sair"
@@ -2104,7 +2101,7 @@ msgid "Your posts and conversations"
msgstr "Suas publicações e conversas"
#: ../../include/nav.php:91 ../../include/conversation.php:942
-#: ../../mod/connedit.php:494 ../../mod/connedit.php:660
+#: ../../mod/connedit.php:498
msgid "View Profile"
msgstr "Ver perfil"
@@ -2120,7 +2117,7 @@ msgstr "Editar perfis"
msgid "Manage/Edit profiles"
msgstr "Administrar/Editar perfis"
-#: ../../include/nav.php:95 ../../include/identity.php:846
+#: ../../include/nav.php:95 ../../include/identity.php:880
msgid "Edit Profile"
msgstr "Editar perfil"
@@ -2159,7 +2156,7 @@ msgid "Your bookmarks"
msgstr "Seus links guardados"
#: ../../include/nav.php:113 ../../include/conversation.php:1645
-#: ../../include/apps.php:136 ../../mod/webpages.php:177
+#: ../../include/apps.php:136 ../../mod/webpages.php:178
msgid "Webpages"
msgstr "Páginas web"
@@ -2167,7 +2164,7 @@ msgstr "Páginas web"
msgid "Your webpages"
msgstr "Suas páginas web"
-#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1550
+#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1551
msgid "Login"
msgstr "Entrar"
@@ -2192,7 +2189,7 @@ msgstr "Clique para se autenticar com seu hub de origem"
msgid "Home Page"
msgstr "Página inicial"
-#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1526
+#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1527
msgid "Register"
msgstr "Registrar"
@@ -2218,7 +2215,6 @@ msgid "Search site content"
msgstr "Pesquisar o conteúdo do site"
#: ../../include/nav.php:168 ../../include/apps.php:141
-#: ../../mod/directory.php:366
msgid "Directory"
msgstr "Diretório"
@@ -2399,122 +2395,6 @@ msgstr "Visite o %2$s de %1$s"
msgid "%1$s has an updated %2$s, changing %3$s."
msgstr "%1$s atualizou %2$s, alterando %3$s."
-#: ../../include/items.php:399 ../../mod/like.php:270
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
-#: ../../mod/bulksetclose.php:11 ../../index.php:392
-msgid "Permission denied"
-msgstr "Permissão negada"
-
-#: ../../include/items.php:1020 ../../include/items.php:1066
-msgid "(Unknown)"
-msgstr "(Desconhecido)"
-
-#: ../../include/items.php:1234
-msgid "Visible to anybody on the internet."
-msgstr "Visível para todos na internet."
-
-#: ../../include/items.php:1236
-msgid "Visible to you only."
-msgstr "Visível somente para você."
-
-#: ../../include/items.php:1238
-msgid "Visible to anybody in this network."
-msgstr "Visível para todos nesta rede."
-
-#: ../../include/items.php:1240
-msgid "Visible to anybody authenticated."
-msgstr "Visível para todos autenticados."
-
-#: ../../include/items.php:1242
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Visível para todos em %s."
-
-#: ../../include/items.php:1244
-msgid "Visible to all connections."
-msgstr "Visível para todas as conexões."
-
-#: ../../include/items.php:1246
-msgid "Visible to approved connections."
-msgstr "Visível para conexões aprovadas."
-
-#: ../../include/items.php:1248
-msgid "Visible to specific connections."
-msgstr "Visível para conexões específicas."
-
-#: ../../include/items.php:4060 ../../mod/thing.php:74
-#: ../../mod/display.php:36 ../../mod/filestorage.php:27
-#: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:984
-#: ../../mod/admin.php:1184
-msgid "Item not found."
-msgstr "O item não foi encontrado."
-
-#: ../../include/items.php:4133 ../../include/photos.php:26
-#: ../../include/attach.php:137 ../../include/attach.php:184
-#: ../../include/attach.php:247 ../../include/attach.php:261
-#: ../../include/attach.php:305 ../../include/attach.php:319
-#: ../../include/attach.php:350 ../../include/attach.php:546
-#: ../../include/attach.php:618 ../../include/chat.php:131
-#: ../../mod/profile.php:64 ../../mod/profile.php:72
-#: ../../mod/achievements.php:30 ../../mod/manage.php:6
-#: ../../mod/settings.php:569 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/webpages.php:69 ../../mod/thing.php:241 ../../mod/thing.php:256
-#: ../../mod/thing.php:290 ../../mod/profile_photo.php:264
-#: ../../mod/profile_photo.php:277 ../../mod/block.php:22
-#: ../../mod/block.php:72 ../../mod/like.php:178 ../../mod/events.php:219
-#: ../../mod/group.php:9 ../../mod/setup.php:207 ../../mod/common.php:35
-#: ../../mod/connections.php:169 ../../mod/blocks.php:69
-#: ../../mod/blocks.php:76 ../../mod/photos.php:68 ../../mod/pdledit.php:21
-#: ../../mod/authtest.php:13 ../../mod/editlayout.php:63
-#: ../../mod/editlayout.php:87 ../../mod/chat.php:90 ../../mod/chat.php:95
-#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
-#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
-#: ../../mod/rate.php:110 ../../mod/editpost.php:13 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66
-#: ../../mod/menu.php:69 ../../mod/filestorage.php:18
-#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
-#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
-#: ../../mod/poke.php:128 ../../mod/profiles.php:188
-#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14
-#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../mod/editblock.php:65 ../../mod/register.php:72 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:974 ../../mod/layouts.php:69
-#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/id.php:71
-#: ../../mod/message.php:16 ../../mod/mitem.php:115 ../../mod/mood.php:111
-#: ../../mod/connedit.php:331 ../../mod/mail.php:114
-#: ../../mod/notifications.php:66 ../../mod/regmod.php:17
-#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99
-#: ../../mod/appman.php:66 ../../mod/network.php:12 ../../mod/page.php:28
-#: ../../mod/page.php:82 ../../mod/bookmarks.php:46 ../../mod/channel.php:100
-#: ../../mod/channel.php:219 ../../mod/channel.php:262
-#: ../../mod/suggest.php:26 ../../mod/service_limits.php:7
-#: ../../mod/sharedwithme.php:7 ../../index.php:190 ../../index.php:393
-msgid "Permission denied."
-msgstr "Permissão negada."
-
-#: ../../include/items.php:4537 ../../mod/group.php:38 ../../mod/group.php:140
-#: ../../mod/bulksetclose.php:51
-msgid "Collection not found."
-msgstr "A coleção não foi encontrada."
-
-#: ../../include/items.php:4553
-msgid "Collection is empty."
-msgstr "A coleção está vazia."
-
-#: ../../include/items.php:4560
-#, php-format
-msgid "Collection: %s"
-msgstr "Coleção: %s"
-
-#: ../../include/items.php:4570
-#, php-format
-msgid "Connection: %s"
-msgstr "Conexão: %s"
-
-#: ../../include/items.php:4572
-msgid "Connection not found."
-msgstr "A conexão não foi encontrada."
-
#: ../../include/security.php:349
msgid ""
"The form security token was not correct. This probably happened because the "
@@ -2663,12 +2543,6 @@ msgstr "Personalizado/Modo expert"
msgid "channel"
msgstr "canal"
-#: ../../include/conversation.php:164 ../../include/diaspora.php:2110
-#: ../../mod/like.php:394
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s gosta de %3$s de %2$s"
-
#: ../../include/conversation.php:167 ../../mod/like.php:396
#, php-format
msgid "%1$s doesn't like %2$s's %3$s"
@@ -2690,42 +2564,42 @@ msgctxt "mood"
msgid "%1$s is %2$s"
msgstr "%1$s está %2$s"
-#: ../../include/conversation.php:572 ../../mod/photos.php:984
+#: ../../include/conversation.php:572 ../../mod/photos.php:996
msgctxt "title"
msgid "Likes"
msgstr "Curtidas"
-#: ../../include/conversation.php:572 ../../mod/photos.php:984
+#: ../../include/conversation.php:572 ../../mod/photos.php:996
msgctxt "title"
msgid "Dislikes"
msgstr "Descurtidas"
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
+#: ../../include/conversation.php:573 ../../mod/photos.php:997
msgctxt "title"
msgid "Agree"
msgstr "Concordo"
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
+#: ../../include/conversation.php:573 ../../mod/photos.php:997
msgctxt "title"
msgid "Disagree"
msgstr "Não concordo"
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
+#: ../../include/conversation.php:573 ../../mod/photos.php:997
msgctxt "title"
msgid "Abstain"
msgstr "Abstenções"
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
+#: ../../include/conversation.php:574 ../../mod/photos.php:998
msgctxt "title"
msgid "Attending"
msgstr "Comparecerão"
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
+#: ../../include/conversation.php:574 ../../mod/photos.php:998
msgctxt "title"
msgid "Not attending"
msgstr "Não comparecerão"
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
+#: ../../include/conversation.php:574 ../../mod/photos.php:998
msgctxt "title"
msgid "Might attend"
msgstr "Talvez compareçam"
@@ -2861,13 +2735,13 @@ msgstr "Salvar para a pasta:"
msgid "Where are you right now?"
msgstr "Onde você está agora?"
-#: ../../include/conversation.php:1147 ../../mod/editpost.php:52
+#: ../../include/conversation.php:1147 ../../mod/editpost.php:47
#: ../../mod/mail.php:175 ../../mod/mail.php:290
msgid "Expires YYYY-MM-DD HH:MM"
msgstr "Expira YYYY-MM-DD HH:MM"
-#: ../../include/conversation.php:1174 ../../mod/webpages.php:181
-#: ../../mod/blocks.php:154 ../../mod/photos.php:949 ../../mod/layouts.php:184
+#: ../../include/conversation.php:1174 ../../mod/webpages.php:182
+#: ../../mod/blocks.php:154 ../../mod/photos.php:961 ../../mod/layouts.php:184
msgid "Share"
msgstr "Compartilhar"
@@ -2879,9 +2753,9 @@ msgstr "Nome do Link da Página"
msgid "Post as"
msgstr "Publicar como"
-#: ../../include/conversation.php:1186 ../../mod/editlayout.php:145
-#: ../../mod/editwebpage.php:184 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:147 ../../mod/mail.php:238 ../../mod/mail.php:352
+#: ../../include/conversation.php:1186 ../../mod/editpost.php:112
+#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:184
+#: ../../mod/editblock.php:141 ../../mod/mail.php:238 ../../mod/mail.php:352
msgid "Upload photo"
msgstr "Enviar foto"
@@ -2889,9 +2763,9 @@ msgstr "Enviar foto"
msgid "upload photo"
msgstr "enviar foto"
-#: ../../include/conversation.php:1188 ../../mod/editlayout.php:146
-#: ../../mod/editwebpage.php:185 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:148 ../../mod/mail.php:239 ../../mod/mail.php:353
+#: ../../include/conversation.php:1188 ../../mod/editpost.php:113
+#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:185
+#: ../../mod/editblock.php:142 ../../mod/mail.php:239 ../../mod/mail.php:353
msgid "Attach file"
msgstr "Anexar arquivo"
@@ -2899,9 +2773,9 @@ msgstr "Anexar arquivo"
msgid "attach file"
msgstr "anexar arquivo"
-#: ../../include/conversation.php:1190 ../../mod/editlayout.php:147
-#: ../../mod/editwebpage.php:186 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:149 ../../mod/mail.php:240 ../../mod/mail.php:354
+#: ../../include/conversation.php:1190 ../../mod/editpost.php:114
+#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:186
+#: ../../mod/editblock.php:143 ../../mod/mail.php:240 ../../mod/mail.php:354
msgid "Insert web link"
msgstr "Inserir link web"
@@ -2925,9 +2799,9 @@ msgstr "Inserir link de áudio"
msgid "audio link"
msgstr "link de áudio"
-#: ../../include/conversation.php:1196 ../../mod/editlayout.php:151
-#: ../../mod/editwebpage.php:190 ../../mod/editpost.php:125
-#: ../../mod/editblock.php:153
+#: ../../include/conversation.php:1196 ../../mod/editpost.php:118
+#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:190
+#: ../../mod/editblock.php:147
msgid "Set your location"
msgstr "Definir sua localização"
@@ -2935,13 +2809,13 @@ msgstr "Definir sua localização"
msgid "set location"
msgstr "definir localização"
-#: ../../include/conversation.php:1198 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1198 ../../mod/editpost.php:120
msgid "Toggle voting"
-msgstr "Alternar votação"
+msgstr "Alternar enquete"
-#: ../../include/conversation.php:1201 ../../mod/editlayout.php:152
-#: ../../mod/editwebpage.php:191 ../../mod/editpost.php:126
-#: ../../mod/editblock.php:154
+#: ../../include/conversation.php:1201 ../../mod/editpost.php:119
+#: ../../mod/editlayout.php:146 ../../mod/editwebpage.php:191
+#: ../../mod/editblock.php:148
msgid "Clear browser location"
msgstr "Limpar a localização do navegador"
@@ -2949,20 +2823,20 @@ msgstr "Limpar a localização do navegador"
msgid "clear location"
msgstr "limpar a localização"
-#: ../../include/conversation.php:1204 ../../mod/editwebpage.php:207
-#: ../../mod/editpost.php:142 ../../mod/editblock.php:167
+#: ../../include/conversation.php:1204 ../../mod/editpost.php:135
+#: ../../mod/editwebpage.php:207 ../../mod/editblock.php:161
msgid "Title (optional)"
msgstr "Título (opcional)"
-#: ../../include/conversation.php:1208 ../../mod/editlayout.php:168
-#: ../../mod/editwebpage.php:209 ../../mod/editpost.php:144
-#: ../../mod/editblock.php:170
+#: ../../include/conversation.php:1208 ../../mod/editpost.php:137
+#: ../../mod/editlayout.php:162 ../../mod/editwebpage.php:209
+#: ../../mod/editblock.php:164
msgid "Categories (optional, comma-separated list)"
msgstr "categorias (opcional, lista separada por vírgulas)"
-#: ../../include/conversation.php:1210 ../../mod/editlayout.php:154
-#: ../../mod/editwebpage.php:193 ../../mod/editpost.php:131
-#: ../../mod/editblock.php:156
+#: ../../include/conversation.php:1210 ../../mod/editpost.php:124
+#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:193
+#: ../../mod/editblock.php:150
msgid "Permission settings"
msgstr "Configurações de permissão"
@@ -2970,33 +2844,33 @@ msgstr "Configurações de permissão"
msgid "permissions"
msgstr "permissões"
-#: ../../include/conversation.php:1219 ../../mod/editlayout.php:161
-#: ../../mod/editwebpage.php:202 ../../mod/editpost.php:139
-#: ../../mod/editblock.php:164
+#: ../../include/conversation.php:1219 ../../mod/editpost.php:132
+#: ../../mod/editlayout.php:155 ../../mod/editwebpage.php:202
+#: ../../mod/editblock.php:158
msgid "Public post"
msgstr "Publicação pública"
-#: ../../include/conversation.php:1221 ../../mod/editlayout.php:169
-#: ../../mod/editwebpage.php:210 ../../mod/editpost.php:145
-#: ../../mod/editblock.php:171
+#: ../../include/conversation.php:1221 ../../mod/editpost.php:138
+#: ../../mod/editlayout.php:163 ../../mod/editwebpage.php:210
+#: ../../mod/editblock.php:165
msgid "Example: bob@example.com, mary@example.com"
msgstr "Por exemplo: joao@exemplo.com, maria@exemplo.com"
-#: ../../include/conversation.php:1234 ../../mod/editlayout.php:178
-#: ../../mod/editwebpage.php:219 ../../mod/editpost.php:156
-#: ../../mod/editblock.php:181 ../../mod/mail.php:245 ../../mod/mail.php:359
+#: ../../include/conversation.php:1234 ../../mod/editpost.php:149
+#: ../../mod/editlayout.php:172 ../../mod/editwebpage.php:219
+#: ../../mod/editblock.php:175 ../../mod/mail.php:245 ../../mod/mail.php:359
msgid "Set expiration date"
msgstr "Definir data de expiração"
#: ../../include/conversation.php:1238 ../../mod/events.php:637
-#: ../../mod/editpost.php:160
+#: ../../mod/editpost.php:153
msgid "OK"
msgstr "Ok"
-#: ../../include/conversation.php:1239 ../../mod/settings.php:588
-#: ../../mod/settings.php:614 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
-#: ../../mod/events.php:636 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
+#: ../../include/conversation.php:1239 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:134 ../../mod/events.php:636 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:154
+#: ../../mod/settings.php:589 ../../mod/settings.php:615
msgid "Cancel"
msgstr "Cancelar"
@@ -3029,7 +2903,7 @@ msgid "Posts that mention or involve you"
msgstr "Publicações que mencionam ou envolvem você"
#: ../../include/conversation.php:1513 ../../mod/connections.php:212
-#: ../../mod/connections.php:225 ../../mod/menu.php:102
+#: ../../mod/connections.php:225 ../../mod/menu.php:107
msgid "New"
msgstr "Novo"
@@ -3053,7 +2927,7 @@ msgstr "Spam"
msgid "Posts flagged as SPAM"
msgstr "Publicações marcadas como SPAM"
-#: ../../include/conversation.php:1579 ../../mod/admin.php:952
+#: ../../include/conversation.php:1579 ../../mod/admin.php:993
msgid "Channel"
msgstr "Canal"
@@ -3131,26 +3005,121 @@ msgid_plural "Abstains"
msgstr[0] "Abstenção"
msgstr[1] "Abstenções"
-#: ../../include/photos.php:94
+#: ../../include/items.php:413 ../../mod/like.php:270
+#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
+#: ../../mod/bulksetclose.php:11 ../../index.php:392
+msgid "Permission denied"
+msgstr "Permissão negada"
+
+#: ../../include/items.php:1035 ../../include/items.php:1081
+msgid "(Unknown)"
+msgstr "(Desconhecido)"
+
+#: ../../include/items.php:1307
+msgid "Visible to anybody on the internet."
+msgstr "Visível para todos na internet."
+
+#: ../../include/items.php:1309
+msgid "Visible to you only."
+msgstr "Visível somente para você."
+
+#: ../../include/items.php:1311
+msgid "Visible to anybody in this network."
+msgstr "Visível para todos nesta rede."
+
+#: ../../include/items.php:1313
+msgid "Visible to anybody authenticated."
+msgstr "Visível para todos autenticados."
+
+#: ../../include/items.php:1315
#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "A imagem excede o limite de tamanho do site, que é de %"
+msgid "Visible to anybody on %s."
+msgstr "Visível para todos em %s."
-#: ../../include/photos.php:101
-msgid "Image file is empty."
-msgstr "O arquivo de imagem está vazio."
+#: ../../include/items.php:1317
+msgid "Visible to all connections."
+msgstr "Visível para todas as conexões."
-#: ../../include/photos.php:128 ../../mod/profile_photo.php:217
-msgid "Unable to process image"
-msgstr "Não foi possível processar a imagem"
+#: ../../include/items.php:1319
+msgid "Visible to approved connections."
+msgstr "Visível para conexões aprovadas."
-#: ../../include/photos.php:199
-msgid "Photo storage failed."
-msgstr "Não foi possível armazenar a foto."
+#: ../../include/items.php:1321
+msgid "Visible to specific connections."
+msgstr "Visível para conexões específicas."
-#: ../../include/photos.php:363
-msgid "Upload New Photos"
-msgstr "Enviar novas fotos"
+#: ../../include/items.php:4198 ../../mod/thing.php:74
+#: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20
+#: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225
+#: ../../mod/display.php:36
+msgid "Item not found."
+msgstr "O item não foi encontrado."
+
+#: ../../include/items.php:4271 ../../include/attach.php:137
+#: ../../include/attach.php:184 ../../include/attach.php:247
+#: ../../include/attach.php:261 ../../include/attach.php:305
+#: ../../include/attach.php:319 ../../include/attach.php:350
+#: ../../include/attach.php:546 ../../include/attach.php:618
+#: ../../include/chat.php:131 ../../include/photos.php:26
+#: ../../mod/profile.php:64 ../../mod/profile.php:72
+#: ../../mod/achievements.php:30 ../../mod/manage.php:6 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/webpages.php:69 ../../mod/thing.php:241
+#: ../../mod/thing.php:256 ../../mod/thing.php:290
+#: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277
+#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
+#: ../../mod/events.php:219 ../../mod/group.php:9 ../../mod/item.php:206
+#: ../../mod/item.php:214 ../../mod/item.php:978 ../../mod/network.php:12
+#: ../../mod/common.php:35 ../../mod/connections.php:169
+#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/editpost.php:13
+#: ../../mod/photos.php:69 ../../mod/pdledit.php:21 ../../mod/authtest.php:13
+#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
+#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/mitem.php:109
+#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
+#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
+#: ../../mod/rate.php:110 ../../mod/editblock.php:65 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66
+#: ../../mod/menu.php:69 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
+#: ../../mod/poke.php:128 ../../mod/profiles.php:188
+#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14 ../../mod/setup.php:223
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/register.php:72 ../../mod/settings.php:570 ../../mod/id.php:71
+#: ../../mod/message.php:16 ../../mod/mood.php:111 ../../mod/connedit.php:336
+#: ../../mod/mail.php:114 ../../mod/notifications.php:66
+#: ../../mod/regmod.php:17 ../../mod/new_channel.php:68
+#: ../../mod/new_channel.php:99 ../../mod/appman.php:66
+#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
+#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/bookmarks.php:46
+#: ../../mod/channel.php:100 ../../mod/channel.php:219
+#: ../../mod/channel.php:262 ../../mod/suggest.php:26
+#: ../../mod/service_limits.php:7 ../../mod/sharedwithme.php:7
+#: ../../index.php:182 ../../index.php:393
+msgid "Permission denied."
+msgstr "Permissão negada."
+
+#: ../../include/items.php:4673 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../mod/bulksetclose.php:51
+msgid "Collection not found."
+msgstr "A coleção não foi encontrada."
+
+#: ../../include/items.php:4689
+msgid "Collection is empty."
+msgstr "A coleção está vazia."
+
+#: ../../include/items.php:4696
+#, php-format
+msgid "Collection: %s"
+msgstr "Coleção: %s"
+
+#: ../../include/items.php:4706 ../../mod/connedit.php:658
+#, php-format
+msgid "Connection: %s"
+msgstr "Conexão: %s"
+
+#: ../../include/items.php:4708
+msgid "Connection not found."
+msgstr "A conexão não foi encontrada."
#: ../../include/zot.php:666
msgid "Invalid data packet"
@@ -3160,7 +3129,7 @@ msgstr "Pacote de dados inválido"
msgid "Unable to verify channel signature"
msgstr "Não foi possível verificar a assinatura do canal"
-#: ../../include/zot.php:2108
+#: ../../include/zot.php:2131
#, php-format
msgid "Unable to verify site signature for %s"
msgstr "Não foi possível verificar a assinatura do site para %s"
@@ -3192,7 +3161,7 @@ msgid_plural "%d invitations available"
msgstr[0] "%d convite disponível"
msgstr[1] "%d convites disponíveis"
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:450
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:457
msgid "Advanced"
msgstr "Avançado"
@@ -3212,12 +3181,12 @@ msgstr "Conectar/Acompanhar"
msgid "Examples: Robert Morgenstein, Fishing"
msgstr "Por exemplo: José da Silva, Pescaria"
-#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413
-#: ../../mod/directory.php:362 ../../mod/directory.php:367
+#: ../../include/contact_widgets.php:26 ../../mod/directory.php:379
+#: ../../mod/directory.php:384 ../../mod/connections.php:413
msgid "Find"
msgstr "Pesquisar"
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:366
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:383
#: ../../mod/suggest.php:60
msgid "Channel Suggestions"
msgstr "Sugestões de canais"
@@ -3258,7 +3227,7 @@ msgid "Don't show"
msgstr "Não exibir"
#: ../../include/acl_selectors.php:248 ../../mod/events.php:654
-#: ../../mod/photos.php:559 ../../mod/photos.php:922 ../../mod/chat.php:209
+#: ../../mod/photos.php:571 ../../mod/photos.php:934 ../../mod/chat.php:209
#: ../../mod/filestorage.php:147
msgid "Permissions"
msgstr "Permissões"
@@ -3358,205 +3327,206 @@ msgstr "Não foi possível recuperar a identidade criada"
msgid "Default Profile"
msgstr "Perfil padrão"
-#: ../../include/identity.php:630
+#: ../../include/identity.php:660
msgid "Requested channel is not available."
msgstr "Canal solicitado não está disponível."
-#: ../../include/identity.php:677 ../../mod/profile.php:16
+#: ../../include/identity.php:707 ../../mod/profile.php:16
#: ../../mod/achievements.php:11 ../../mod/webpages.php:29
#: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29
#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
-#: ../../mod/filestorage.php:54 ../../mod/editblock.php:29
+#: ../../mod/editblock.php:29 ../../mod/filestorage.php:54
#: ../../mod/layouts.php:29
msgid "Requested profile is not available."
msgstr "O perfil solicitado não está disponível."
-#: ../../include/identity.php:836 ../../mod/profiles.php:774
+#: ../../include/identity.php:870 ../../mod/profiles.php:774
msgid "Change profile photo"
msgstr "Mudar a foto do perfil"
-#: ../../include/identity.php:842
+#: ../../include/identity.php:876
msgid "Profiles"
msgstr "Perfis"
-#: ../../include/identity.php:842
+#: ../../include/identity.php:876
msgid "Manage/edit profiles"
msgstr "Administrar/editar perfis"
-#: ../../include/identity.php:843 ../../mod/profiles.php:775
+#: ../../include/identity.php:877 ../../mod/profiles.php:775
msgid "Create New Profile"
msgstr "Criar um novo perfil"
-#: ../../include/identity.php:858 ../../mod/profiles.php:786
+#: ../../include/identity.php:892 ../../mod/profiles.php:786
msgid "Profile Image"
msgstr "Imagem do perfil"
-#: ../../include/identity.php:861
+#: ../../include/identity.php:895
msgid "visible to everybody"
msgstr "visível para todos"
-#: ../../include/identity.php:862 ../../mod/profiles.php:669
+#: ../../include/identity.php:896 ../../mod/profiles.php:669
#: ../../mod/profiles.php:790
msgid "Edit visibility"
msgstr "Editar a visibilidade"
-#: ../../include/identity.php:878 ../../include/identity.php:1117
+#: ../../include/identity.php:912 ../../include/identity.php:1151
msgid "Gender:"
msgstr "Gênero:"
-#: ../../include/identity.php:879 ../../include/identity.php:1161
+#: ../../include/identity.php:913 ../../include/identity.php:1195
msgid "Status:"
msgstr "Situação:"
-#: ../../include/identity.php:880 ../../include/identity.php:1172
+#: ../../include/identity.php:914 ../../include/identity.php:1206
msgid "Homepage:"
msgstr "Página web:"
-#: ../../include/identity.php:881
+#: ../../include/identity.php:915
msgid "Online Now"
msgstr "Online agora"
-#: ../../include/identity.php:964 ../../include/identity.php:1042
+#: ../../include/identity.php:998 ../../include/identity.php:1076
#: ../../mod/ping.php:324
msgid "g A l F d"
msgstr "G l d F"
-#: ../../include/identity.php:965 ../../include/identity.php:1043
+#: ../../include/identity.php:999 ../../include/identity.php:1077
msgid "F d"
msgstr "F d"
-#: ../../include/identity.php:1010 ../../include/identity.php:1082
+#: ../../include/identity.php:1044 ../../include/identity.php:1116
#: ../../mod/ping.php:346
msgid "[today]"
msgstr "[hoje]"
-#: ../../include/identity.php:1021
+#: ../../include/identity.php:1055
msgid "Birthday Reminders"
msgstr "Lembres de aniversário"
-#: ../../include/identity.php:1022
+#: ../../include/identity.php:1056
msgid "Birthdays this week:"
msgstr "Aniversários nesta semana:"
-#: ../../include/identity.php:1075
+#: ../../include/identity.php:1109
msgid "[No description]"
msgstr "[Sem descrição]"
-#: ../../include/identity.php:1093
+#: ../../include/identity.php:1127
msgid "Event Reminders"
msgstr "Lembretes de eventos"
-#: ../../include/identity.php:1094
+#: ../../include/identity.php:1128
msgid "Events this week:"
msgstr "Eventos nesta semana:"
-#: ../../include/identity.php:1107 ../../include/identity.php:1224
+#: ../../include/identity.php:1141 ../../include/identity.php:1258
#: ../../include/apps.php:138 ../../mod/profperm.php:112
msgid "Profile"
msgstr "Perfil"
-#: ../../include/identity.php:1115 ../../mod/settings.php:1050
+#: ../../include/identity.php:1149 ../../mod/settings.php:1056
msgid "Full Name:"
msgstr "Nome completo:"
-#: ../../include/identity.php:1122
+#: ../../include/identity.php:1156
msgid "Like this channel"
msgstr "Gostar deste canal"
-#: ../../include/identity.php:1146
+#: ../../include/identity.php:1180
msgid "j F, Y"
msgstr "j \\d\\e F, Y"
-#: ../../include/identity.php:1147
+#: ../../include/identity.php:1181
msgid "j F"
msgstr "j \\d\\e F"
-#: ../../include/identity.php:1154
+#: ../../include/identity.php:1188
msgid "Birthday:"
msgstr "Aniversário:"
-#: ../../include/identity.php:1158
+#: ../../include/identity.php:1192 ../../mod/directory.php:297
msgid "Age:"
msgstr "Idade:"
-#: ../../include/identity.php:1167
+#: ../../include/identity.php:1201
#, php-format
msgid "for %1$d %2$s"
msgstr "para %1$d %2$s"
-#: ../../include/identity.php:1170 ../../mod/profiles.php:691
+#: ../../include/identity.php:1204 ../../mod/profiles.php:691
msgid "Sexual Preference:"
msgstr "Preferência sexual:"
-#: ../../include/identity.php:1174 ../../mod/profiles.php:693
+#: ../../include/identity.php:1208 ../../mod/directory.php:313
+#: ../../mod/profiles.php:693
msgid "Hometown:"
msgstr "Cidade natal:"
-#: ../../include/identity.php:1176
+#: ../../include/identity.php:1210
msgid "Tags:"
msgstr "Etiquetas:"
-#: ../../include/identity.php:1178 ../../mod/profiles.php:694
+#: ../../include/identity.php:1212 ../../mod/profiles.php:694
msgid "Political Views:"
msgstr "Posição política:"
-#: ../../include/identity.php:1180
+#: ../../include/identity.php:1214
msgid "Religion:"
msgstr "Religião:"
-#: ../../include/identity.php:1182
+#: ../../include/identity.php:1216 ../../mod/directory.php:315
msgid "About:"
msgstr "Sobre:"
-#: ../../include/identity.php:1184
+#: ../../include/identity.php:1218
msgid "Hobbies/Interests:"
msgstr "Hobbies/Interesses:"
-#: ../../include/identity.php:1186 ../../mod/profiles.php:697
+#: ../../include/identity.php:1220 ../../mod/profiles.php:697
msgid "Likes:"
msgstr "Gosta de:"
-#: ../../include/identity.php:1188 ../../mod/profiles.php:698
+#: ../../include/identity.php:1222 ../../mod/profiles.php:698
msgid "Dislikes:"
msgstr "Não gosta de:"
-#: ../../include/identity.php:1190
+#: ../../include/identity.php:1224
msgid "Contact information and Social Networks:"
msgstr "Informações de contato e redes sociais:"
-#: ../../include/identity.php:1192
+#: ../../include/identity.php:1226
msgid "My other channels:"
msgstr "Meus outros canais:"
-#: ../../include/identity.php:1194
+#: ../../include/identity.php:1228
msgid "Musical interests:"
msgstr "Interesses musicais:"
-#: ../../include/identity.php:1196
+#: ../../include/identity.php:1230
msgid "Books, literature:"
msgstr "Livros, literatura:"
-#: ../../include/identity.php:1198
+#: ../../include/identity.php:1232
msgid "Television:"
msgstr "Televisão:"
-#: ../../include/identity.php:1200
+#: ../../include/identity.php:1234
msgid "Film/dance/culture/entertainment:"
msgstr "Filmes/dança/cultura/entretenimento:"
-#: ../../include/identity.php:1202
+#: ../../include/identity.php:1236
msgid "Love/Romance:"
msgstr "Amor/romance:"
-#: ../../include/identity.php:1204
+#: ../../include/identity.php:1238
msgid "Work/employment:"
msgstr "Trabalho/emprego:"
-#: ../../include/identity.php:1206
+#: ../../include/identity.php:1240
msgid "School/education:"
msgstr "Escola/educação:"
-#: ../../include/identity.php:1226
+#: ../../include/identity.php:1260
msgid "Like this thing"
msgstr "Gostar desta coisa"
@@ -3842,7 +3812,7 @@ msgid "Profile Photo"
msgstr "Foto do perfil"
#: ../../include/apps.php:247 ../../mod/settings.php:84
-#: ../../mod/settings.php:613
+#: ../../mod/settings.php:614
msgid "Update"
msgstr "Atualizar"
@@ -3854,6 +3824,73 @@ msgstr "Instalar"
msgid "Purchase"
msgstr "Compras"
+#: ../../include/bbcode.php:122 ../../include/bbcode.php:768
+#: ../../include/bbcode.php:771 ../../include/bbcode.php:776
+#: ../../include/bbcode.php:779 ../../include/bbcode.php:782
+#: ../../include/bbcode.php:785 ../../include/bbcode.php:790
+#: ../../include/bbcode.php:793 ../../include/bbcode.php:798
+#: ../../include/bbcode.php:801 ../../include/bbcode.php:804
+#: ../../include/bbcode.php:807
+msgid "Image/photo"
+msgstr "Imagem/foto"
+
+#: ../../include/bbcode.php:161 ../../include/bbcode.php:818
+msgid "Encrypted content"
+msgstr "Conteúdo criptografado"
+
+#: ../../include/bbcode.php:178
+#, php-format
+msgid "Install %s element: "
+msgstr "Instalar elemento %s:"
+
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Esta publicação contém um elemento %s instalável, porém você não tem permissões para instalá-lo neste site."
+
+#: ../../include/bbcode.php:192 ../../mod/impel.php:37
+msgid "webpage"
+msgstr "página web"
+
+#: ../../include/bbcode.php:195 ../../mod/impel.php:47
+msgid "layout"
+msgstr "layout"
+
+#: ../../include/bbcode.php:198 ../../mod/impel.php:42
+msgid "block"
+msgstr "bloco"
+
+#: ../../include/bbcode.php:201 ../../mod/impel.php:54
+msgid "menu"
+msgstr "menu"
+
+#: ../../include/bbcode.php:215
+msgid "QR code"
+msgstr "código QR"
+
+#: ../../include/bbcode.php:266
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s escreveu a seguinte %2$s %3$s"
+
+#: ../../include/bbcode.php:268 ../../mod/tagger.php:51
+msgid "post"
+msgstr "publicação"
+
+#: ../../include/bbcode.php:518
+msgid "Different viewers will see this text differently"
+msgstr "Visualizadores diferentes verão esse texto diferentemente"
+
+#: ../../include/bbcode.php:729
+msgid "$1 spoiler"
+msgstr "$1 spoiler"
+
+#: ../../include/bbcode.php:756
+msgid "$1 wrote:"
+msgstr "$1 escreveu:"
+
#: ../../include/chat.php:23
msgid "Missing room name"
msgstr "Nome da sala vazio"
@@ -3874,21 +3911,26 @@ msgstr "A sala não foi encontrada."
msgid "Room is full"
msgstr "A sala está cheia"
-#: ../../include/diaspora.php:2433
-msgid "Please choose"
-msgstr "Por favor, escolha"
+#: ../../include/photos.php:94
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "A imagem excede o limite de tamanho do site, que é de %"
-#: ../../include/diaspora.php:2435
-msgid "Agree"
-msgstr "Concordo"
+#: ../../include/photos.php:101
+msgid "Image file is empty."
+msgstr "O arquivo de imagem está vazio."
-#: ../../include/diaspora.php:2437
-msgid "Disagree"
-msgstr "Discordo"
+#: ../../include/photos.php:128 ../../mod/profile_photo.php:217
+msgid "Unable to process image"
+msgstr "Não foi possível processar a imagem"
-#: ../../include/diaspora.php:2439
-msgid "Abstain"
-msgstr "Abstenho"
+#: ../../include/photos.php:199
+msgid "Photo storage failed."
+msgstr "Não foi possível armazenar a foto."
+
+#: ../../include/photos.php:363
+msgid "Upload New Photos"
+msgstr "Enviar novas fotos"
#: ../../mod/achievements.php:34
msgid "Some blurb about what to do when you're new here"
@@ -3933,599 +3975,94 @@ msgstr "%d novas apresentações"
msgid "Delegated Channels"
msgstr "Canais delegados"
-#: ../../mod/settings.php:76
-msgid "Name is required"
-msgstr "É necessário informar o nome"
-
-#: ../../mod/settings.php:80
-msgid "Key and Secret are required"
-msgstr "A chave e o segredo são obrigatórios"
-
-#: ../../mod/settings.php:129
-msgid "Diaspora Policy Settings updated."
-msgstr "Configurações da política do Diáspora atualizadas."
-
-#: ../../mod/settings.php:237
-msgid "Passwords do not match. Password unchanged."
-msgstr "As senhas não correspondem. A senha não foi modificada."
-
-#: ../../mod/settings.php:241
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Não é permitido uma senha em branco. A senha não foi modificada."
-
-#: ../../mod/settings.php:255
-msgid "Password changed."
-msgstr "A senha foi modificada."
-
-#: ../../mod/settings.php:257
-msgid "Password update failed. Please try again."
-msgstr "Não foi possível atualizar a senha. Por favor, tente novamente."
-
-#: ../../mod/settings.php:271
-msgid "Not valid email."
-msgstr "Não é um e-mail válido"
-
-#: ../../mod/settings.php:274
-msgid "Protected email address. Cannot change to that email."
-msgstr "Endereço de e-mail protegido. Não é possível mudar para esse e-mail."
-
-#: ../../mod/settings.php:283
-msgid "System failure storing new email. Please try again."
-msgstr "Falha do sistema ao armazenar novo e-mail. Por favor, tente novamente."
-
-#: ../../mod/settings.php:522
-msgid "Settings updated."
-msgstr "As configurações foram atualizadas."
-
-#: ../../mod/settings.php:578 ../../mod/api.php:106 ../../mod/photos.php:556
-#: ../../mod/menu.php:88 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:424
-#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
-#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1554
-msgid "No"
-msgstr "Não"
-
-#: ../../mod/settings.php:578 ../../mod/api.php:105 ../../mod/photos.php:556
-#: ../../mod/menu.php:88 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:426
-#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
-#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1554
-msgid "Yes"
-msgstr "Sim"
-
-#: ../../mod/settings.php:586 ../../mod/settings.php:612
-#: ../../mod/settings.php:648
-msgid "Add application"
-msgstr "Adicionar aplicação"
-
-#: ../../mod/settings.php:589
-msgid "Name of application"
-msgstr "Nome da aplicação"
-
-#: ../../mod/settings.php:590 ../../mod/settings.php:616
-msgid "Consumer Key"
-msgstr "Chave de consumidor"
-
-#: ../../mod/settings.php:590 ../../mod/settings.php:591
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr "Gerado automaticamente - troque se desejável. Comprimento máximo 20"
-
-#: ../../mod/settings.php:591 ../../mod/settings.php:617
-msgid "Consumer Secret"
-msgstr "Segredo de consumidor"
-
-#: ../../mod/settings.php:592 ../../mod/settings.php:618
-msgid "Redirect"
-msgstr "Redirecionamento"
-
-#: ../../mod/settings.php:592
-msgid ""
-"Redirect URI - leave blank unless your application specifically requires "
-"this"
-msgstr "URI de redirecionamento - deixe em branco, a não ser que sua aplicação especificamente requeira isso"
-
-#: ../../mod/settings.php:593 ../../mod/settings.php:619
-msgid "Icon url"
-msgstr "URL do ícone"
-
-#: ../../mod/settings.php:593
-msgid "Optional"
-msgstr "Opcional"
-
-#: ../../mod/settings.php:604
-msgid "You can't edit this application."
-msgstr "Você não pode editar esta aplicação."
-
-#: ../../mod/settings.php:647
-msgid "Connected Apps"
-msgstr "Aplicações conectadas"
-
-#: ../../mod/settings.php:651
-msgid "Client key starts with"
-msgstr "Chave do cliente começa com"
-
-#: ../../mod/settings.php:652
-msgid "No name"
-msgstr "Sem nome"
-
-#: ../../mod/settings.php:653
-msgid "Remove authorization"
-msgstr "Remover autorização"
-
-#: ../../mod/settings.php:667
-msgid "No feature settings configured"
-msgstr "Não foi definida nenhuma configuração do recurso"
-
-#: ../../mod/settings.php:683
-msgid "Feature/Addon Settings"
-msgstr "Configuração de Característica/Plugins"
-
-#: ../../mod/settings.php:685
-msgid "Settings for the built-in Diaspora emulator"
-msgstr "Configurações para construir um emulador de Diáspora"
-
-#: ../../mod/settings.php:686
-msgid "Allow any Diaspora member to comment on your public posts"
-msgstr "Permitir que qualquer membro do Diaspora comente em suas postagens públicas"
-
-#: ../../mod/settings.php:687
-msgid "Diaspora Policy Settings"
-msgstr "Configurações de Política do Diáspora"
-
-#: ../../mod/settings.php:688
-msgid "Prevent your hashtags from being redirected to other sites"
-msgstr "Previne que suas hashtags sejam redirecionadas para outros sítios"
-
-#: ../../mod/settings.php:712
-msgid "Account Settings"
-msgstr "Configurações da conta"
-
-#: ../../mod/settings.php:713
-msgid "Enter New Password:"
-msgstr "Digite a Nova Senha:"
-
-#: ../../mod/settings.php:714
-msgid "Confirm New Password:"
-msgstr "Confirme a Nova Senha:"
-
-#: ../../mod/settings.php:714
-msgid "Leave password fields blank unless changing"
-msgstr "Deixe os campos de senha em branco, a não ser que você queira alterá-la"
-
-#: ../../mod/settings.php:716 ../../mod/settings.php:1051
-msgid "Email Address:"
-msgstr "Endereço de e-mail:"
-
-#: ../../mod/settings.php:717 ../../mod/removeaccount.php:61
-msgid "Remove Account"
-msgstr "Remover conta"
-
-#: ../../mod/settings.php:718
-msgid "Remove this account including all its channels"
-msgstr "Exclua esta conta, incluindo todos seus canais"
-
-#: ../../mod/settings.php:734
-msgid "Off"
-msgstr "Desligado"
-
-#: ../../mod/settings.php:734
-msgid "On"
-msgstr "Ligado"
-
-#: ../../mod/settings.php:741
-msgid "Additional Features"
-msgstr "Recursos adicionais"
-
-#: ../../mod/settings.php:765
-msgid "Connector Settings"
-msgstr "Configurações do conector"
-
-#: ../../mod/settings.php:804
-msgid "No special theme for mobile devices"
-msgstr "Sem tema especial para aparelhos móveis"
+#: ../../mod/directory.php:59 ../../mod/photos.php:441 ../../mod/search.php:13
+#: ../../mod/ratings.php:82 ../../mod/viewconnections.php:17
+#: ../../mod/display.php:13
+msgid "Public access denied."
+msgstr "Acesso público negado."
-#: ../../mod/settings.php:807
+#: ../../mod/directory.php:234
#, php-format
-msgid "%s - (Experimental)"
-msgstr "%s - (Experimental)"
-
-#: ../../mod/settings.php:810 ../../mod/admin.php:396
-msgid "mobile"
-msgstr "móvel"
-
-#: ../../mod/settings.php:846
-msgid "Display Settings"
-msgstr "Configurações de exibição"
-
-#: ../../mod/settings.php:852
-msgid "Display Theme:"
-msgstr "Tema do perfil:"
-
-#: ../../mod/settings.php:853
-msgid "Mobile Theme:"
-msgstr "Tema móvel:"
-
-#: ../../mod/settings.php:854
-msgid "Enable user zoom on mobile devices"
-msgstr "Permitir zoom pelo usuário em dispositivos móveis"
-
-#: ../../mod/settings.php:855
-msgid "Update browser every xx seconds"
-msgstr "Atualizar navegador a cada xx segundos"
-
-#: ../../mod/settings.php:855
-msgid "Minimum of 10 seconds, no maximum"
-msgstr "Mínimo de 10 segundos, sem máximo"
-
-#: ../../mod/settings.php:856
-msgid "Maximum number of conversations to load at any time:"
-msgstr "Número máximo permitido de conversas carregadas:"
-
-#: ../../mod/settings.php:856
-msgid "Maximum of 100 items"
-msgstr "Máximo de 100 itens"
-
-#: ../../mod/settings.php:857
-msgid "Show emoticons (smilies) as images"
-msgstr "Mostrar emoticons (smilies) como imagens"
-
-#: ../../mod/settings.php:858
-msgid "Link post titles to source"
-msgstr "Ligar o título dos posts à fonte"
-
-#: ../../mod/settings.php:859
-msgid "System Page Layout Editor - (advanced)"
-msgstr "Editor de layout de página do sistema - (avançado)"
-
-#: ../../mod/settings.php:862
-msgid "Use blog/list mode on channel page"
-msgstr "Usar modo blog/lista na página do canal"
-
-#: ../../mod/settings.php:862 ../../mod/settings.php:863
-msgid "(comments displayed separately)"
-msgstr "(comentários mostrados separadamente)"
-
-#: ../../mod/settings.php:863
-msgid "Use blog/list mode on matrix page"
-msgstr "Use modo de blogue/lista na página da matriz"
-
-#: ../../mod/settings.php:864
-msgid "Channel page max height of content (in pixels)"
-msgstr "Altura máxima do conteúdo na página (em pixels)"
-
-#: ../../mod/settings.php:864 ../../mod/settings.php:865
-msgid "click to expand content exceeding this height"
-msgstr "clique para expandir o conteúdo que excede essa altura"
-
-#: ../../mod/settings.php:865
-msgid "Matrix page max height of content (in pixels)"
-msgstr "Máxima altura de conteúdo na página Matriz (in pixesl)"
-
-#: ../../mod/settings.php:899
-msgid "Nobody except yourself"
-msgstr "Ninguém exceto você mesmo"
-
-#: ../../mod/settings.php:900
-msgid "Only those you specifically allow"
-msgstr "Apenas quem você der permissão"
-
-#: ../../mod/settings.php:901
-msgid "Approved connections"
-msgstr "Conexões aprovadas"
-
-#: ../../mod/settings.php:902
-msgid "Any connections"
-msgstr "Quaisquer conexões"
-
-#: ../../mod/settings.php:903
-msgid "Anybody on this website"
-msgstr "Qualquer um neste site"
-
-#: ../../mod/settings.php:904
-msgid "Anybody in this network"
-msgstr "Qualquer um nesta rede"
-
-#: ../../mod/settings.php:905
-msgid "Anybody authenticated"
-msgstr "Qualquer um autenticado"
-
-#: ../../mod/settings.php:906
-msgid "Anybody on the internet"
-msgstr "Qualquer um na internet"
-
-#: ../../mod/settings.php:980
-msgid "Publish your default profile in the network directory"
-msgstr "Publicar seu perfil padrão no diretório da rede?"
-
-#: ../../mod/settings.php:985
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Permitir sugerir você como amigo potencial para outros membros?"
-
-#: ../../mod/settings.php:989 ../../mod/profile_photo.php:366
-msgid "or"
-msgstr "ou"
-
-#: ../../mod/settings.php:994
-msgid "Your channel address is"
-msgstr "O endereço do seu canal é"
-
-#: ../../mod/settings.php:1042
-msgid "Channel Settings"
-msgstr "Configurações do canal"
-
-#: ../../mod/settings.php:1049
-msgid "Basic Settings"
-msgstr "Configurações básicas"
-
-#: ../../mod/settings.php:1052
-msgid "Your Timezone:"
-msgstr "Seu fuso horário:"
-
-#: ../../mod/settings.php:1053
-msgid "Default Post Location:"
-msgstr "Localização padrão de suas publicações:"
-
-#: ../../mod/settings.php:1053
-msgid "Geographical location to display on your posts"
-msgstr "Localização geográfica para exibir em suas publicações"
-
-#: ../../mod/settings.php:1054
-msgid "Use Browser Location:"
-msgstr "Usar localizador do navegador:"
-
-#: ../../mod/settings.php:1056
-msgid "Adult Content"
-msgstr "Conteúdo adulto"
-
-#: ../../mod/settings.php:1056
-msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
-msgstr "Este canal frequentemente ou regularmente publica conteúdo adulto. (Por favor marque qualquer material adulto e/ou nudez com #NSFW)"
-
-#: ../../mod/settings.php:1058
-msgid "Security and Privacy Settings"
-msgstr "Configurações de segurança e privacidade"
-
-#: ../../mod/settings.php:1060
-msgid "Your permissions are already configured. Click to view/adjust"
-msgstr "Suas permissões já foram configuradas. Clique para vê-las/ajustá-las"
-
-#: ../../mod/settings.php:1062
-msgid "Hide my online presence"
-msgstr "Esconda minha presença online"
-
-#: ../../mod/settings.php:1062
-msgid "Prevents displaying in your profile that you are online"
-msgstr "Previne exibir em seu perfil que você está online"
-
-#: ../../mod/settings.php:1064
-msgid "Simple Privacy Settings:"
-msgstr "Configurações de privacidade simples:"
-
-#: ../../mod/settings.php:1065
-msgid ""
-"Very Public - <em>extremely permissive (should be used with caution)</em>"
-msgstr "Muito público - <em>extremamente permissivo (deve ser usado com cuidado)</em>"
-
-#: ../../mod/settings.php:1066
-msgid ""
-"Typical - <em>default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)</em>"
-msgstr "Típico - <em>público por padrão, privado quando desejável (similar às permissões de redes sociais, mas com melhor privacidade)</em>"
-
-#: ../../mod/settings.php:1067
-msgid "Private - <em>default private, never open or public</em>"
-msgstr "Privado - <em>privado por padrão, nunca aberto ou público</em>"
-
-#: ../../mod/settings.php:1068
-msgid "Blocked - <em>default blocked to/from everybody</em>"
-msgstr "Bloqueado - <em>por padrão bloquado de/para todos</em>"
-
-#: ../../mod/settings.php:1070
-msgid "Allow others to tag your posts"
-msgstr "Permitir que outros etiquetem suas publicações"
-
-#: ../../mod/settings.php:1070
-msgid ""
-"Often used by the community to retro-actively flag inappropriate content"
-msgstr "Frequentemente utilizado pela comunidade para retroativamente sinalizar conteúdo inapropriado"
-
-#: ../../mod/settings.php:1072
-msgid "Advanced Privacy Settings"
-msgstr "Configurações de privacidade avançadas"
-
-#: ../../mod/settings.php:1074
-msgid "Expire other channel content after this many days"
-msgstr "Expirar outros conteúdos do canal após este número de dias"
-
-#: ../../mod/settings.php:1074
-msgid "0 or blank prevents expiration"
-msgstr "0 ou em branco previne expiração"
-
-#: ../../mod/settings.php:1075
-msgid "Maximum Friend Requests/Day:"
-msgstr "Número máximo de requisições de amizade por dia:"
-
-#: ../../mod/settings.php:1075
-msgid "May reduce spam activity"
-msgstr "Pode reduzir a frequência de spam"
-
-#: ../../mod/settings.php:1076
-msgid "Default Post Permissions"
-msgstr "Permissões padrão de publicação"
-
-#: ../../mod/settings.php:1077 ../../mod/mitem.php:159 ../../mod/mitem.php:229
-msgid "(click to open/close)"
-msgstr "(clique para abrir/fechar)"
-
-#: ../../mod/settings.php:1081
-msgid "Channel permissions category:"
-msgstr "Categoria de permissões do canal:"
-
-#: ../../mod/settings.php:1087
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Máximo número de mensagens privadas por dia de pessoas desconhecidas:"
-
-#: ../../mod/settings.php:1087
-msgid "Useful to reduce spamming"
-msgstr "Útil para reduzir a frequência de spam"
-
-#: ../../mod/settings.php:1090
-msgid "Notification Settings"
-msgstr "Configurações de notificação"
-
-#: ../../mod/settings.php:1091
-msgid "By default post a status message when:"
-msgstr "Por padrão, publicar uma mensagem de status quando:"
-
-#: ../../mod/settings.php:1092
-msgid "accepting a friend request"
-msgstr "aceitar um pedido de amizade"
-
-#: ../../mod/settings.php:1093
-msgid "joining a forum/community"
-msgstr "associar-se a um fórum/comunidade"
-
-#: ../../mod/settings.php:1094
-msgid "making an <em>interesting</em> profile change"
-msgstr "modificar algo <em>interessante</em> em seu perfil"
-
-#: ../../mod/settings.php:1095
-msgid "Send a notification email when:"
-msgstr "Enviar um e-mail de notificação quando:"
-
-#: ../../mod/settings.php:1096
-msgid "You receive a connection request"
-msgstr "Você recebe uma solicitação de conexão"
-
-#: ../../mod/settings.php:1097
-msgid "Your connections are confirmed"
-msgstr "Suas conexões são confirmadas"
-
-#: ../../mod/settings.php:1098
-msgid "Someone writes on your profile wall"
-msgstr "Alguém escrever no mural do seu perfil"
-
-#: ../../mod/settings.php:1099
-msgid "Someone writes a followup comment"
-msgstr "Alguém comenta uma publicação"
-
-#: ../../mod/settings.php:1100
-msgid "You receive a private message"
-msgstr "Você recebeu uma mensagem privada"
-
-#: ../../mod/settings.php:1101
-msgid "You receive a friend suggestion"
-msgstr "Você recebe uma sugestão de amizade"
-
-#: ../../mod/settings.php:1102
-msgid "You are tagged in a post"
-msgstr "Você é mencionado num post"
-
-#: ../../mod/settings.php:1103
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Você foi cutucado/espetado/etc. numa publicação"
-
-#: ../../mod/settings.php:1106
-msgid "Show visual notifications including:"
-msgstr "Exibir notificações visuais incluindo:"
-
-#: ../../mod/settings.php:1108
-msgid "Unseen matrix activity"
-msgstr "Atividade não vista na matriz"
-
-#: ../../mod/settings.php:1109
-msgid "Unseen channel activity"
-msgstr "Atividade não vista no canal"
-
-#: ../../mod/settings.php:1110
-msgid "Unseen private messages"
-msgstr "Mensagens privadas não vistas"
-
-#: ../../mod/settings.php:1110 ../../mod/settings.php:1115
-#: ../../mod/settings.php:1116 ../../mod/settings.php:1117
-msgid "Recommended"
-msgstr "Recomendado"
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] "%d avaliação"
+msgstr[1] "%d avaliações"
-#: ../../mod/settings.php:1111
-msgid "Upcoming events"
-msgstr "Eventos próximos"
+#: ../../mod/directory.php:245
+msgid "Gender: "
+msgstr "Gênero: "
-#: ../../mod/settings.php:1112
-msgid "Events today"
-msgstr "Eventos hoje"
+#: ../../mod/directory.php:247
+msgid "Status: "
+msgstr "Status:"
-#: ../../mod/settings.php:1113
-msgid "Upcoming birthdays"
-msgstr "Aniversários próximos"
+#: ../../mod/directory.php:249
+msgid "Homepage: "
+msgstr "Website:"
-#: ../../mod/settings.php:1113
-msgid "Not available in all themes"
-msgstr "Não disponível em todos os temas"
+#: ../../mod/directory.php:308 ../../mod/events.php:645
+msgid "Description:"
+msgstr "Descrição:"
-#: ../../mod/settings.php:1114
-msgid "System (personal) notifications"
-msgstr "Notificações de sistema (pessoais)"
+#: ../../mod/directory.php:317
+msgid "Public Forum:"
+msgstr "Fórum público:"
-#: ../../mod/settings.php:1115
-msgid "System info messages"
-msgstr "Mensagens de informação do sistema"
+#: ../../mod/directory.php:320
+msgid "Keywords: "
+msgstr "Palavras-chave:"
-#: ../../mod/settings.php:1116
-msgid "System critical alerts"
-msgstr "Alertas críticos do sistema"
+#: ../../mod/directory.php:323
+msgid "Don't suggest"
+msgstr "Não sugerir"
-#: ../../mod/settings.php:1117
-msgid "New connections"
-msgstr "Novas conexões"
+#: ../../mod/directory.php:325
+msgid "Common connections:"
+msgstr "Conexões em comum:"
-#: ../../mod/settings.php:1118
-msgid "System Registrations"
-msgstr "Registros no sistema"
+#: ../../mod/directory.php:374
+msgid "Global Directory"
+msgstr "Diretório global"
-#: ../../mod/settings.php:1119
-msgid ""
-"Also show new wall posts, private messages and connections under Notices"
-msgstr "Também mostra novos textos, mensagens privadas e conexões nos Avisos"
+#: ../../mod/directory.php:374
+msgid "Local Directory"
+msgstr "Diretório local"
-#: ../../mod/settings.php:1121
-msgid "Notify me of events this many days in advance"
-msgstr "Notifique-me de eventos adiante esse número de dias"
+#: ../../mod/directory.php:380
+msgid "Finding:"
+msgstr "Pesquisando:"
-#: ../../mod/settings.php:1121
-msgid "Must be greater than 0"
-msgstr "Deve ser maior que 0"
+#: ../../mod/directory.php:385
+msgid "next page"
+msgstr "próxima página"
-#: ../../mod/settings.php:1123
-msgid "Advanced Account/Page Type Settings"
-msgstr "Configurações avançadas de conta/tipo de página"
+#: ../../mod/directory.php:385
+msgid "previous page"
+msgstr "página anterior"
-#: ../../mod/settings.php:1124
-msgid "Change the behaviour of this account for special situations"
-msgstr "Mudar o comportamento dessa conta em situações especiais"
+#: ../../mod/directory.php:386
+msgid "Sort options"
+msgstr "Opções de ordenação"
-#: ../../mod/settings.php:1127
-msgid ""
-"Please enable expert mode (in <a href=\"settings/features\">Settings > "
-"Additional features</a>) to adjust!"
-msgstr "Por favor, habilite o modo expert (em <a href=\"settings/features\">Configurações > Recursos adicionais</a>) para ajustar!"
+#: ../../mod/directory.php:387
+msgid "Alphabetic"
+msgstr "Alfabética"
-#: ../../mod/settings.php:1128
-msgid "Miscellaneous Settings"
-msgstr "Configurações miscelâneas"
+#: ../../mod/directory.php:388
+msgid "Reverse Alphabetic"
+msgstr "Alfabética reversa"
-#: ../../mod/settings.php:1130
-msgid "Personal menu to display in your channel pages"
-msgstr "Menu pessoal para exibir nas páginas dos seus canais"
+#: ../../mod/directory.php:389
+msgid "Newest to Oldest"
+msgstr "Das mais recentes para as mais antigas"
-#: ../../mod/settings.php:1131 ../../mod/removeme.php:61
-msgid "Remove Channel"
-msgstr "Remover canal"
+#: ../../mod/directory.php:390
+msgid "Oldest to Newest"
+msgstr "Do mais Antigo para o mais Novo"
-#: ../../mod/settings.php:1132
-msgid "Remove this channel."
-msgstr "Remover este canal"
+#: ../../mod/directory.php:407
+msgid "No entries (some entries may be hidden)."
+msgstr "Nenhuma entrada (algumas entradas podem estar escondidas)."
#: ../../mod/xchan.php:6
msgid "Xchan Lookup"
@@ -4535,7 +4072,7 @@ msgstr "Encontrar Xchan"
msgid "Lookup xchan beginning with (or webbie): "
msgstr "Encontrar xchan iniciado por (ou webbie):"
-#: ../../mod/xchan.php:37 ../../mod/menu.php:149 ../../mod/mitem.php:120
+#: ../../mod/xchan.php:37 ../../mod/mitem.php:114 ../../mod/menu.php:156
msgid "Not found."
msgstr "Não encontrado."
@@ -4557,7 +4094,7 @@ msgid ""
" and/or create new posts for you?"
msgstr "Deseja autorizar esta aplicação a acessar suas publicações e contatos e/ou criar novas publicações para você?"
-#: ../../mod/webpages.php:190
+#: ../../mod/webpages.php:191
msgid "Page Title"
msgstr "Título da Página"
@@ -4577,7 +4114,7 @@ msgstr "Remover a etiqueta de item"
msgid "Select a tag to remove: "
msgstr "Selecione uma etiqueta para remover: "
-#: ../../mod/tagrm.php:133 ../../mod/photos.php:875
+#: ../../mod/tagrm.php:133 ../../mod/photos.php:887
msgid "Remove"
msgstr "Remover"
@@ -4690,15 +4227,6 @@ msgstr "O item não está disponível."
msgid "Fetching URL returns error: %1$s"
msgstr "Carregar o URL retorna o erro: %1$s"
-#: ../../mod/home.php:53 ../../mod/siteinfo.php:155
-msgid "$Projectname"
-msgstr "$Projectname"
-
-#: ../../mod/home.php:124
-#, php-format
-msgid "Welcome to %s"
-msgstr "Bem-vindo(a) a %s"
-
#: ../../mod/profile_photo.php:108
msgid "Image uploaded but image cropping failed."
msgstr "A imagem foi enviada, mas não foi possível cortá-la."
@@ -4738,6 +4266,10 @@ msgstr "Selecione um perfil:"
msgid "Upload Profile Photo"
msgstr "Enviar foto do perfil"
+#: ../../mod/profile_photo.php:366 ../../mod/settings.php:995
+msgid "or"
+msgstr "ou"
+
#: ../../mod/profile_photo.php:366
msgid "skip this step"
msgstr "pule esta etapa"
@@ -4771,16 +4303,16 @@ msgstr "Não foi possível enviar a imagem."
msgid "Image size reduction [%s] failed."
msgstr "Não foi possível reduzir o tamanho da imagem [%s]."
-#: ../../mod/block.php:27 ../../mod/page.php:33
+#: ../../mod/block.php:27 ../../mod/page.php:36
msgid "Invalid item."
msgstr "Item inválido."
-#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:49
+#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:52
msgid "Channel not found."
msgstr "O canal não foi encontrado."
-#: ../../mod/block.php:75 ../../mod/help.php:79 ../../mod/display.php:106
-#: ../../mod/page.php:85 ../../index.php:241
+#: ../../mod/block.php:75 ../../mod/display.php:110 ../../mod/help.php:79
+#: ../../mod/page.php:89 ../../index.php:241
msgid "Page not found."
msgstr "Página não encontrada."
@@ -4884,11 +4416,11 @@ msgstr "Excluir evento"
msgid "Create New Event"
msgstr "Criar um novo evento"
-#: ../../mod/events.php:474 ../../mod/photos.php:827
+#: ../../mod/events.php:474 ../../mod/photos.php:839
msgid "Previous"
msgstr "Anterior"
-#: ../../mod/events.php:475 ../../mod/setup.php:265 ../../mod/photos.php:836
+#: ../../mod/events.php:475 ../../mod/photos.php:848 ../../mod/setup.php:281
msgid "Next"
msgstr "Próximo"
@@ -4938,10 +4470,6 @@ msgid ""
"global holidays."
msgstr "Importante para eventos que ocorrem em um lugar específico. Não prático para feriados globais."
-#: ../../mod/events.php:645
-msgid "Description:"
-msgstr "Descrição:"
-
#: ../../mod/events.php:649
msgid "Title:"
msgstr "Título:"
@@ -5000,7 +4528,7 @@ msgstr "Avalie"
msgid "View ratings"
msgstr "Veja avaliações"
-#: ../../mod/rpost.php:131 ../../mod/editpost.php:42
+#: ../../mod/rpost.php:131 ../../mod/editpost.php:158
msgid "Edit post"
msgstr "Editar a publicação"
@@ -5069,6 +4597,10 @@ msgstr "Plugins/complementos/aplicações instalados:"
msgid "No installed plugins/addons/apps"
msgstr "Nenhum plugin/complemento/aplicação instalado"
+#: ../../mod/siteinfo.php:155 ../../mod/home.php:58 ../../mod/home.php:64
+msgid "$Projectname"
+msgstr "$Projectname"
+
#: ../../mod/siteinfo.php:156
msgid ""
"This is a hub of $Projectname - a global cooperative network of "
@@ -5097,6 +4629,10 @@ msgstr "Por favor visite <a href=\"https://redmatrix.me\">redmatrix.me</a> para
msgid "Bug reports and issues: please visit"
msgstr "Relatos e acompanhamentos de erros podem ser encontrados em"
+#: ../../mod/siteinfo.php:167
+msgid "$projectname issues"
+msgstr "Questões de $projectname"
+
#: ../../mod/siteinfo.php:168
msgid ""
"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
@@ -5107,398 +4643,63 @@ msgstr "Sugestões, elogios, etc - mande um e-mail para \"redmatrix\" arrôba li
msgid "Site Administrators"
msgstr "Administradores do site"
-#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61
-msgid "Help:"
-msgstr "Ajuda:"
-
-#: ../../mod/help.php:76 ../../index.php:238
-msgid "Not Found"
-msgstr "Não encontrada"
-
-#: ../../mod/setup.php:166
-msgid "$Projectname Server - Setup"
-msgstr "Servidor $Projectname - Configuração"
-
-#: ../../mod/setup.php:172
-msgid "Could not connect to database."
-msgstr "Não foi possível conectar ao banco de dados."
-
-#: ../../mod/setup.php:176
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr "Não foi possível conectar à URL especificada para o site. Provavlmente um problema de DNS ou com o certificado SSL."
-
-#: ../../mod/setup.php:183
-msgid "Could not create table."
-msgstr "Não foi possível criar a tabela."
-
-#: ../../mod/setup.php:189
-msgid "Your site database has been installed."
-msgstr "O banco de dados do seu site foi instalado."
-
-#: ../../mod/setup.php:194
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
-msgstr "Você pode precisar importar o arquivo \"install/schema_xxx.sql\" manualmente usando um cliente do banco de dados."
-
-#: ../../mod/setup.php:195 ../../mod/setup.php:264 ../../mod/setup.php:662
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr "Por favor, veja o arquivo \"install/INSTALL.txt\"."
-
-#: ../../mod/setup.php:261
-msgid "System check"
-msgstr "Checagem do sistema"
-
-#: ../../mod/setup.php:266
-msgid "Check again"
-msgstr "Cheque novamente"
-
-#: ../../mod/setup.php:289
-msgid "Database connection"
-msgstr "Conexão ao banco de dados"
-
-#: ../../mod/setup.php:290
-msgid ""
-"In order to install $Projectname we need to know how to connect to your "
-"database."
-msgstr "Para instalar a $Projectname é necessário saber como se conectar ao seu banco de dados."
-
-#: ../../mod/setup.php:291
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Por favor, entre em contato com a sua hospedagem ou com o administrador do site caso você tenha alguma dúvida em relação a isso."
-
-#: ../../mod/setup.php:292
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "O banco de dados que você especificar abaixo já deve existir. Caso contrário, crie-o antes de prosseguir."
-
-#: ../../mod/setup.php:296
-msgid "Database Server Name"
-msgstr "Nome do servidor de banco de dados"
-
-#: ../../mod/setup.php:296
-msgid "Default is localhost"
-msgstr "O default é localhost"
-
-#: ../../mod/setup.php:297
-msgid "Database Port"
-msgstr "Porta do banco de dados"
-
-#: ../../mod/setup.php:297
-msgid "Communication port number - use 0 for default"
-msgstr "Número da porta de comunicação - use 0 para o default"
-
-#: ../../mod/setup.php:298
-msgid "Database Login Name"
-msgstr "Nome do usuário do banco de dados"
-
-#: ../../mod/setup.php:299
-msgid "Database Login Password"
-msgstr "Senha do usuário do banco de dados"
-
-#: ../../mod/setup.php:300
-msgid "Database Name"
-msgstr "Nome do banco de dados"
-
-#: ../../mod/setup.php:301
-msgid "Database Type"
-msgstr "Tipo do banco de dados"
-
-#: ../../mod/setup.php:303 ../../mod/setup.php:347
-msgid "Site administrator email address"
-msgstr "Endereço de email do administrador do site"
-
-#: ../../mod/setup.php:303 ../../mod/setup.php:347
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "O endereço de email da sua conta deve ser igual a este para que você possa utilizar o painel de administração web."
-
-#: ../../mod/setup.php:304 ../../mod/setup.php:349
-msgid "Website URL"
-msgstr "URL do website"
-
-#: ../../mod/setup.php:304 ../../mod/setup.php:349
-msgid "Please use SSL (https) URL if available."
-msgstr "Por favor, use uma URL SSL (https) se disponível."
-
-#: ../../mod/setup.php:307 ../../mod/setup.php:352
-msgid "Please select a default timezone for your website"
-msgstr "Por favor, selecione o fuso horário padrão para o seu site"
-
-#: ../../mod/setup.php:335
-msgid "Site settings"
-msgstr "Configurações do site"
-
-#: ../../mod/setup.php:395
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Não foi possível encontrar uma versão de linha de comando do PHP nos caminhos do seu servidor web."
-
-#: ../../mod/setup.php:396
-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 "Caso você não tenha uma versão de linha de comando do PHP instalada no seu servidor, você não será capaz de executar coletas em segundo plano pelo cron."
-
-#: ../../mod/setup.php:400
-msgid "PHP executable path"
-msgstr "Caminho para o executável do PHP"
-
-#: ../../mod/setup.php:400
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Digite o caminho completo do executável PHP. Você pode deixar isso em branco para continuar com a instalação."
-
-#: ../../mod/setup.php:405
-msgid "Command line PHP"
-msgstr "PHP em linha de comando"
-
-#: ../../mod/setup.php:414
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "\"register_argc_argv\" não está habilitado na versão de linha de comando do PHP no seu sistema."
-
-#: ../../mod/setup.php:415
-msgid "This is required for message delivery to work."
-msgstr "Isto é necessário para o funcionamento do envio de mensagens."
-
-#: ../../mod/setup.php:417
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
-
-#: ../../mod/setup.php:438
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Erro: a função \"openssl_pkey_new\" no seu sistema não é capaz de gerar as chaves de criptografia"
-
-#: ../../mod/setup.php:439
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Se estiver usando o Windows, por favor dê uma olhada em \"http://www.php.net/manual/en/openssl.installation.php\"."
-
-#: ../../mod/setup.php:441
-msgid "Generate encryption keys"
-msgstr "Gerar chaves de criptografia"
-
-#: ../../mod/setup.php:448
-msgid "libCurl PHP module"
-msgstr "Módulo PHP libCurl"
-
-#: ../../mod/setup.php:449
-msgid "GD graphics PHP module"
-msgstr "Módulo PHP GD graphics"
-
-#: ../../mod/setup.php:450
-msgid "OpenSSL PHP module"
-msgstr "Módulo PHP OpenSSL"
-
-#: ../../mod/setup.php:451
-msgid "mysqli or postgres PHP module"
-msgstr "módulo 'mysqli' ou 'postgres' do PHP"
-
-#: ../../mod/setup.php:452
-msgid "mb_string PHP module"
-msgstr "Módulo PHP mb_string "
-
-#: ../../mod/setup.php:453
-msgid "mcrypt PHP module"
-msgstr "Módulo PHP mcrypt"
-
-#: ../../mod/setup.php:458 ../../mod/setup.php:460
-msgid "Apache mod_rewrite module"
-msgstr "Módulo mod_rewrite do Apache"
-
-#: ../../mod/setup.php:458
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Erro: o módulo mod-rewrite do Apache é necessário, mas não está instalado."
-
-#: ../../mod/setup.php:464 ../../mod/setup.php:467
-msgid "proc_open"
-msgstr "proc_open"
-
-#: ../../mod/setup.php:464
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr "Erro: proc_open é necessário, mas não está instalado ou foi desabilitado no php.ini"
-
-#: ../../mod/setup.php:472
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Erro: o módulo libCURL do PHP é necessário, mas não está instalado."
-
-#: ../../mod/setup.php:476
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Erro: o módulo gráfico GD, com suporte a JPEG, do PHP é necessário, mas não está instalado."
-
-#: ../../mod/setup.php:480
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Erro: o módulo openssl do PHP é necessário, mas não está instalado."
-
-#: ../../mod/setup.php:484
-msgid ""
-"Error: mysqli or postgres PHP module required but neither are installed."
-msgstr "Erro: módulo 'mysqli' ou 'postgres' do PHP é necessário mas nenhum deles está instalado."
-
-#: ../../mod/setup.php:488
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Erro: o módulo mb_string do PHP é necessário, mas não está instalado."
-
-#: ../../mod/setup.php:492
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Erro: o módulo mcrypt do PHP é necessário, mas não está instalado."
-
-#: ../../mod/setup.php:508
-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 "O instalador web precisa criar um arquivo chamado \".htconfig.php\" na pasta raiz da instalação e não está conseguindo."
-
-#: ../../mod/setup.php:509
-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 "Geralmente isso está relacionado às definições de permissão, uma vez que o servidor web pode não estar conseguindo escrever os arquivos nesta pasta."
-
-#: ../../mod/setup.php:510
-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 "Ao final desse procedimento, será fornecido um texto que deverá ser salvo em um arquivo de nome .htconfig.php, na pasta raiz do seu Red."
-
-#: ../../mod/setup.php:511
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr "Você também pode pular esse procedimento e executar uma instalação manual. Por favor, dê uma olhada no arquivo \"install/INSTALL.TXT\" para instruções."
+#: ../../mod/item.php:174
+msgid "Unable to locate original post."
+msgstr "Não foi possível localizar a publicação original."
-#: ../../mod/setup.php:514
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php tem permissão de escrita"
+#: ../../mod/item.php:440
+msgid "Empty post discarded."
+msgstr "A publicação em branco foi descartada."
-#: ../../mod/setup.php:524
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Red usa o engine de template Smarty3 para renderizar suas telas. Smarty3 compila templates para PHP para acelerar a renderização."
+#: ../../mod/item.php:480
+msgid "Executable content type not permitted to this channel."
+msgstr "Conteúdo de tipo executável não permitido para este canal."
-#: ../../mod/setup.php:525
-#, 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 "Para guardar os templates compilados, o servidor web necessita de permissão de escrita no diretório %s no diretório raiz da Red."
+#: ../../mod/item.php:901
+msgid "System error. Post not saved."
+msgstr "Erro no sistema. A publicação não foi salva."
-#: ../../mod/setup.php:526 ../../mod/setup.php:544
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Por favor, certifique-se de que o usuário sob o qual o servidor web roda (ex: www-data) tenha permissão de escrita nesse diretório."
+#: ../../mod/item.php:1119
+msgid "Unable to obtain post information from database."
+msgstr "Impossível obter informação do texto no banco de dados"
-#: ../../mod/setup.php:527
+#: ../../mod/item.php:1126
#, 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 "Nota: como uma medida de segurança, você deve fornecer ao servidor web permissão de escrita somente em %s e não aos arquivos de template (.tpl) que ele contém."
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Você atingiu o seu limite de %1$.0f publicações de novos tópicos."
-#: ../../mod/setup.php:530
+#: ../../mod/item.php:1133
#, php-format
-msgid "%s is writable"
-msgstr "%s tem permissão de escrita"
-
-#: ../../mod/setup.php:543
-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 "A Red usa o diretório store para salvar arquivos carregados. O servidor web necessita de permissão de escrita no diretório store dentro do diretório raiz da Red"
-
-#: ../../mod/setup.php:547
-msgid "store is writable"
-msgstr "store tem permissão de escrita"
-
-#: ../../mod/setup.php:577
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access"
-" to this site."
-msgstr "Não foi possível validar o certificado SSL. Corrija o certificado ou desabilite o acesso via https ao site."
-
-#: ../../mod/setup.php:578
-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 "Se você oferece acesso https ao seu website ou permite conexões na porta TCP 443 (a porta https:), você DEVE usar um certificado reconhecido pelos navegadores. Você NÃO DEVE usar certificados assinados por você mesmo!"
-
-#: ../../mod/setup.php:579
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
-msgstr "Essa restrição é incorporada porque publicações públicas suas podem, por exemplo, conter referências a imagens no seu próprio hub."
-
-#: ../../mod/setup.php:580
-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 "Se seu certificado não for reconhecido, membros de outros sites (que podem ter certificados válidos) receberão uma mensagem de aviso nos seus próprios sites reclamando de problemas de segurança."
-
-#: ../../mod/setup.php:581
-msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
-msgstr "Isso pode causar problemas de usabilidade (não só no seu site) então nós precisamos insistir nesse requisito."
-
-#: ../../mod/setup.php:582
-msgid ""
-"Providers are available that issue free certificates which are browser-"
-"valid."
-msgstr "Existem provedores que disponibilizam gratuitamente certificados reconhecidos por navegadores."
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Você atingiu o seu limite de %1$.0f páginas web."
-#: ../../mod/setup.php:584
-msgid "SSL certificate validation"
-msgstr "Validação do certificado SSL"
+#: ../../mod/network.php:91
+msgid "No such group"
+msgstr "Este grupo não existe"
-#: ../../mod/setup.php:590
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server "
-"configuration.Test: "
-msgstr "A reescrita de URLs não está funcionando no .htaccess. Verifique as configurações do servidor. Teste:"
+#: ../../mod/network.php:129
+msgid "No such channel"
+msgstr "Nenhum canal"
-#: ../../mod/setup.php:592
-msgid "Url rewrite is working"
-msgstr "A reescrita de URLs está funcionando"
+#: ../../mod/network.php:143
+msgid "Search Results For:"
+msgstr "Resultados da busca por:"
-#: ../../mod/setup.php:602
-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 "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendika em seu servidor web."
+#: ../../mod/network.php:198
+msgid "Collection is empty"
+msgstr "A coleção está vazia"
-#: ../../mod/setup.php:625
-msgid "Errors encountered creating database tables."
-msgstr "Foram encontrados erros durante a criação das tabelas do banco de dados."
+#: ../../mod/network.php:207
+msgid "Collection: "
+msgstr "Coleção:"
-#: ../../mod/setup.php:660
-msgid "<h1>What next</h1>"
-msgstr "<h1>Próximos passos</h1>"
+#: ../../mod/network.php:226
+msgid "Connection: "
+msgstr "Conexão:"
-#: ../../mod/setup.php:661
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "IMPORTANTE: Você deve configurar [manualmente] uma tarefa agendada para o coletor."
+#: ../../mod/network.php:233
+msgid "Invalid connection."
+msgstr "Conexão inválida."
#: ../../mod/common.php:10
msgid "No channel."
@@ -5524,11 +4725,11 @@ msgstr "Não foi possível acessar o registro do contato."
msgid "Could not locate selected profile."
msgstr "Não foi possível localizar o perfil selecionado."
-#: ../../mod/connections.php:94 ../../mod/connedit.php:214
+#: ../../mod/connections.php:94 ../../mod/connedit.php:219
msgid "Connection updated."
msgstr "A conexão foi atualizada."
-#: ../../mod/connections.php:96 ../../mod/connedit.php:216
+#: ../../mod/connections.php:96 ../../mod/connedit.php:221
msgid "Failed to update connection record."
msgstr "Não foi possível atualizar o registro da conexão."
@@ -5617,160 +4818,188 @@ msgstr "Nome do bloco"
msgid "Block Title"
msgstr "Título do Bloco"
-#: ../../mod/tagger.php:96
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s marcou %3$s de %2$s com %4$s"
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:76
+#: ../../mod/editwebpage.php:77 ../../mod/editblock.php:78
+#: ../../mod/editblock.php:94
+msgid "Item not found"
+msgstr "O item não foi encontrado"
+
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr "O item não está editável"
+
+#: ../../mod/editpost.php:48
+msgid "Delete item?"
+msgstr "Deletar item?"
+
+#: ../../mod/editpost.php:115 ../../mod/editlayout.php:142
+#: ../../mod/editwebpage.php:187 ../../mod/editblock.php:144
+msgid "Insert YouTube video"
+msgstr "Inserir vídeo do YouTube"
+
+#: ../../mod/editpost.php:116 ../../mod/editlayout.php:143
+#: ../../mod/editwebpage.php:188 ../../mod/editblock.php:145
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Inserir vídeo Vorbis (.ogg)"
+
+#: ../../mod/editpost.php:117 ../../mod/editlayout.php:144
+#: ../../mod/editwebpage.php:189 ../../mod/editblock.php:146
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Inserir áudio Vorbis (.ogg)"
#: ../../mod/cloud.php:120
msgid "$Projectname - Guests: Username: {your email address}, Password: +++"
msgstr "$Projectname - Convidados: Nome de usuário: {seu endereço de e-mail}, Senha: +++"
-#: ../../mod/photos.php:77
+#: ../../mod/photos.php:78
msgid "Page owner information could not be retrieved."
msgstr "As informações do dono da pagina não puderam ser obtidas."
-#: ../../mod/photos.php:97
+#: ../../mod/photos.php:98
msgid "Album not found."
msgstr "O álbum não foi encontrado."
-#: ../../mod/photos.php:119 ../../mod/photos.php:643
+#: ../../mod/photos.php:120 ../../mod/photos.php:655
msgid "Delete Album"
msgstr "Excluir o álbum"
-#: ../../mod/photos.php:159 ../../mod/photos.php:930
+#: ../../mod/photos.php:160 ../../mod/photos.php:942
msgid "Delete Photo"
msgstr "Excluir a foto"
-#: ../../mod/photos.php:429 ../../mod/search.php:13 ../../mod/display.php:13
-#: ../../mod/ratings.php:82 ../../mod/directory.php:47
-#: ../../mod/viewconnections.php:17
-msgid "Public access denied."
-msgstr "Acesso público negado."
-
-#: ../../mod/photos.php:440
+#: ../../mod/photos.php:452
msgid "No photos selected"
msgstr "Não foi selecionada nenhuma foto"
-#: ../../mod/photos.php:484
+#: ../../mod/photos.php:496
msgid "Access to this item is restricted."
msgstr "O acesso a este item está restrito."
-#: ../../mod/photos.php:523
+#: ../../mod/photos.php:535
#, php-format
msgid "%1$.2f MB of %2$.2f MB photo storage used."
msgstr "Utilizados %1$.2f MB de %2$.2f MB para armazenamento de fotos."
-#: ../../mod/photos.php:526
+#: ../../mod/photos.php:538
#, php-format
msgid "%1$.2f MB photo storage used."
msgstr "Utilizados %1$.2f MB para armazenamento de fotos."
-#: ../../mod/photos.php:550
+#: ../../mod/photos.php:562
msgid "Upload Photos"
msgstr "Enviar fotos"
-#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:915
+#: ../../mod/photos.php:566 ../../mod/photos.php:648 ../../mod/photos.php:927
msgid "Enter a new album name"
msgstr "Digite um nome para o novo álbum"
-#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:916
+#: ../../mod/photos.php:567 ../../mod/photos.php:649 ../../mod/photos.php:928
msgid "or select an existing one (doubleclick)"
msgstr "ou escolha um já existente (duplo clique)"
-#: ../../mod/photos.php:556
+#: ../../mod/photos.php:568
msgid "Create a status post for this upload"
msgstr "Crie uma publicação de status para este upload."
-#: ../../mod/photos.php:584
+#: ../../mod/photos.php:596
msgid "Album name could not be decoded"
msgstr "Não foi possível decodificar o nome do álbum"
-#: ../../mod/photos.php:625 ../../mod/photos.php:1157
-#: ../../mod/photos.php:1173
+#: ../../mod/photos.php:637 ../../mod/photos.php:1169
+#: ../../mod/photos.php:1185
msgid "Contact Photos"
msgstr "Fotos dos contatos"
-#: ../../mod/photos.php:649
+#: ../../mod/photos.php:661
msgid "Show Newest First"
msgstr "Exibir primeiro os mais recentes"
-#: ../../mod/photos.php:651
+#: ../../mod/photos.php:663
msgid "Show Oldest First"
msgstr "Exibir primeiro os mais antigos"
-#: ../../mod/photos.php:675 ../../mod/photos.php:1205
+#: ../../mod/photos.php:687 ../../mod/photos.php:1217
msgid "View Photo"
msgstr "Ver a foto"
-#: ../../mod/photos.php:704
+#: ../../mod/photos.php:716
msgid "Edit Album"
msgstr "Editar o álbum"
-#: ../../mod/photos.php:749
+#: ../../mod/photos.php:761
msgid "Permission denied. Access to this item may be restricted."
msgstr "Permissão negada. Acesso a este item pode estar restrito."
-#: ../../mod/photos.php:751
+#: ../../mod/photos.php:763
msgid "Photo not available"
msgstr "A foto não está disponível"
-#: ../../mod/photos.php:809
+#: ../../mod/photos.php:821
msgid "Use as profile photo"
msgstr "Usar como uma foto de perfil"
-#: ../../mod/photos.php:816
+#: ../../mod/photos.php:828
msgid "Private Photo"
msgstr "Foto privada"
-#: ../../mod/photos.php:831
+#: ../../mod/photos.php:843
msgid "View Full Size"
msgstr "Ver no tamanho real"
-#: ../../mod/photos.php:909
+#: ../../mod/photos.php:921
msgid "Edit photo"
msgstr "Editar a foto"
-#: ../../mod/photos.php:911
+#: ../../mod/photos.php:923
msgid "Rotate CW (right)"
msgstr "Rotacionar H (horário)"
-#: ../../mod/photos.php:912
+#: ../../mod/photos.php:924
msgid "Rotate CCW (left)"
msgstr "Rotacionar AH (anti-horário)"
-#: ../../mod/photos.php:919
+#: ../../mod/photos.php:931
msgid "Caption"
msgstr "Legenda"
-#: ../../mod/photos.php:921
+#: ../../mod/photos.php:933
msgid "Add a Tag"
msgstr "Adicionar uma etiqueta"
-#: ../../mod/photos.php:925
+#: ../../mod/photos.php:937
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
msgstr "Exemplo: @beto, @Barbara_Almeida, @julia@exemplo.com"
-#: ../../mod/photos.php:928
+#: ../../mod/photos.php:940
msgid "Flag as adult in album view"
msgstr "Sinalizar como adulto na apresentação de álbuns"
-#: ../../mod/photos.php:1120
+#: ../../mod/photos.php:1132
msgid "In This Photo:"
msgstr "Nesta foto:"
-#: ../../mod/photos.php:1125
+#: ../../mod/photos.php:1137
msgid "Map"
msgstr "Mapa"
-#: ../../mod/photos.php:1211
+#: ../../mod/photos.php:1223
msgid "View Album"
msgstr "Ver álbum"
-#: ../../mod/photos.php:1234
+#: ../../mod/photos.php:1246
msgid "Recent Photos"
msgstr "Fotos recentes"
+#: ../../mod/search.php:206
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "Items etiquetados com: %s"
+
+#: ../../mod/search.php:208
+#, php-format
+msgid "Search results for: %s"
+msgstr "Resultados da busca por: %s"
+
#: ../../mod/match.php:22
msgid "Profile Match"
msgstr "Correspondência de perfil"
@@ -5860,76 +5089,76 @@ msgstr "- selecionar -"
msgid "Your service plan only allows %d channels."
msgstr "Seu plano de serviço permite apenas %d canais."
-#: ../../mod/import.php:51
+#: ../../mod/import.php:60
msgid "Nothing to import."
msgstr "Nada a importar."
-#: ../../mod/import.php:75
+#: ../../mod/import.php:84
msgid "Unable to download data from old server"
msgstr "Não foi possível descarregar os dados do servidor antigo"
-#: ../../mod/import.php:81
+#: ../../mod/import.php:90
msgid "Imported file is empty."
msgstr "O arquivo importado está vazio."
-#: ../../mod/import.php:106
+#: ../../mod/import.php:110
+msgid "The data provided is not compatible with this project."
+msgstr "Os dados fornecidos não são compatíveis com este projeto."
+
+#: ../../mod/import.php:115
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr "Atenção: Versões do banco de dados diferem por %1$d atualizações."
+
+#: ../../mod/import.php:135
msgid ""
"Cannot create a duplicate channel identifier on this system. Import failed."
msgstr "Não foi possível criar um identificador de canal duplicado neste sistema. A importação falhou."
-#: ../../mod/import.php:127
-msgid "Unable to create a unique channel address. Import failed."
-msgstr "Não foi possível criar um endereço de canal único. Importação falhou."
-
-#: ../../mod/import.php:147
+#: ../../mod/import.php:176
msgid "Channel clone failed. Import failed."
msgstr "Clonagem do canal falhou. A importação falhou."
-#: ../../mod/import.php:157
+#: ../../mod/import.php:186
msgid "Cloned channel not found. Import failed."
msgstr "Canal a clonar não encontrado. A importação falhou."
-#: ../../mod/import.php:475
-msgid "Import completed."
-msgstr "A importação foi completada."
-
-#: ../../mod/import.php:487
+#: ../../mod/import.php:516
msgid "You must be logged in to use this feature."
msgstr "Você precisa estar autenticado para usar este recurso."
-#: ../../mod/import.php:492
+#: ../../mod/import.php:521
msgid "Import Channel"
msgstr "Importar canal"
-#: ../../mod/import.php:493
+#: ../../mod/import.php:522
msgid ""
"Use this form to import an existing channel from a different server/hub. You"
" may retrieve the channel identity from the old server/hub via the network "
-"or provide an export file. Only identity and connections/relationships will "
-"be imported. Importation of content is not yet available."
-msgstr "Use este formulário para importar um canal existente de um servidor/hub diferente. Você pode obter a identidade do canal do servidor/hub antigo pela rede, ou fornecer um arquivo de exportação. Somente a identidade e as conexões/relacionamentos serão importados. Importação de conteúdos ainda não está disponível."
+"or provide an export file."
+msgstr "Use este formulário para importar um canal existente de um servidor/hub diferente. Você pode obter a identidade do canal do servidor/hub antigo pela rede, ou fornecer um arquivo de exportação."
-#: ../../mod/import.php:494
+#: ../../mod/import.php:523
msgid "File to Upload"
msgstr "Arquivo a carregar"
-#: ../../mod/import.php:495
+#: ../../mod/import.php:524
msgid "Or provide the old server/hub details"
msgstr "Ou forneça os detalhes do antigo servidor/hub"
-#: ../../mod/import.php:496
+#: ../../mod/import.php:525
msgid "Your old identity address (xyz@example.com)"
msgstr "O endereço da sua velha identidade (xyz@exemplo.com)"
-#: ../../mod/import.php:497
+#: ../../mod/import.php:526
msgid "Your old login email address"
msgstr "O endereço de e-mail da sua antiga conta"
-#: ../../mod/import.php:498
+#: ../../mod/import.php:527
msgid "Your old login password"
msgstr "A senha dua sua antiga conta"
-#: ../../mod/import.php:499
+#: ../../mod/import.php:528
msgid ""
"For either option, please choose whether to make this hub your new primary "
"address, or whether your old location should continue this role. You will be"
@@ -5937,52 +5166,39 @@ msgid ""
"primary location for files, photos, and media."
msgstr "Para qualquer das opções, por favor escolha se deseja fazer deste hub seu novo endereço primário, ou se o velho local deve continuar com esse papel. Você será capaz de publicar a partir de ambos os locais, mas somente um pode estar designado como local primário para arquivos, fotos e mídia."
-#: ../../mod/import.php:500
+#: ../../mod/import.php:529
msgid "Make this hub my primary location"
msgstr "Faça deste hub meu local primário"
-#: ../../mod/import.php:501
-msgid "Import existing posts if possible"
-msgstr "Importar publicações existentes se possível"
-
-#: ../../mod/editlayout.php:76 ../../mod/editwebpage.php:77
-#: ../../mod/editpost.php:20 ../../mod/editblock.php:78
-#: ../../mod/editblock.php:94
-msgid "Item not found"
-msgstr "O item não foi encontrado"
+#: ../../mod/import.php:530
+msgid ""
+"Import existing posts if possible (experimental - limited by available "
+"memory"
+msgstr "Importar publicações existentes se possível (experimental - limitado pela memória disponível)"
-#: ../../mod/editlayout.php:106
-msgid "Edit Layout"
-msgstr "Editar layout"
+#: ../../mod/import.php:531
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr "Esse processo pode levar vários minutos para completar. Por favor envie o formulário uma única vez e deixe esta página aberta até que finalize."
-#: ../../mod/editlayout.php:117
+#: ../../mod/editlayout.php:111
msgid "Delete layout?"
msgstr "Deletar layout?"
-#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:187
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:150
-msgid "Insert YouTube video"
-msgstr "Inserir vídeo do YouTube"
-
-#: ../../mod/editlayout.php:149 ../../mod/editwebpage.php:188
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:151
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Inserir vídeo Vorbis (.ogg)"
-
-#: ../../mod/editlayout.php:150 ../../mod/editwebpage.php:189
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:152
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Inserir áudio Vorbis (.ogg)"
-
-#: ../../mod/editlayout.php:164 ../../mod/layouts.php:124
+#: ../../mod/editlayout.php:158 ../../mod/layouts.php:124
msgid "Layout Description (Optional)"
msgstr "Descrição do Layout. (Opcional)"
-#: ../../mod/editlayout.php:166 ../../mod/layouts.php:121
+#: ../../mod/editlayout.php:160 ../../mod/layouts.php:121
#: ../../mod/layouts.php:179
msgid "Layout Name"
msgstr "Nome do layout"
+#: ../../mod/editlayout.php:177
+msgid "Edit Layout"
+msgstr "Editar layout"
+
#: ../../mod/chat.php:19 ../../mod/channel.php:25
msgid "You must be logged in to see this page."
msgstr "Você precisa estar autenticado para ver esta página."
@@ -6024,6 +5240,126 @@ msgstr "Nome da sala de bate-papo"
msgid "%1$s's Chatrooms"
msgstr "Salas de bate-papo de %1$s"
+#: ../../mod/mitem.php:24 ../../mod/menu.php:134
+msgid "Menu not found."
+msgstr "O menu não foi encontrado."
+
+#: ../../mod/mitem.php:48
+msgid "Unable to create element."
+msgstr "Não foi possível criar elemento."
+
+#: ../../mod/mitem.php:71
+msgid "Unable to update menu element."
+msgstr "Não foi possível atualizar o elemento de menu."
+
+#: ../../mod/mitem.php:86
+msgid "Unable to add menu element."
+msgstr "Não foi possível adicionar o elemento de menu."
+
+#: ../../mod/mitem.php:152 ../../mod/mitem.php:223
+msgid "Menu Item Permissions"
+msgstr "Permissões do item do menu"
+
+#: ../../mod/mitem.php:153 ../../mod/mitem.php:224 ../../mod/settings.php:1083
+msgid "(click to open/close)"
+msgstr "(clique para abrir/fechar)"
+
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:171
+msgid "Link Name"
+msgstr "Nome do Link"
+
+#: ../../mod/mitem.php:156 ../../mod/mitem.php:228
+msgid "Link or Submenu Target"
+msgstr "Alvo do Link ou Submenu"
+
+#: ../../mod/mitem.php:156
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr "Insira o URL do link ou selecione um nome de menu para criar um submenu"
+
+#: ../../mod/mitem.php:157 ../../mod/mitem.php:229
+msgid "Use magic-auth if available"
+msgstr "Usar magic-auth se disponível"
+
+#: ../../mod/mitem.php:158 ../../mod/mitem.php:230
+msgid "Open link in new window"
+msgstr "Abrir link em uma nova janela"
+
+#: ../../mod/mitem.php:159 ../../mod/mitem.php:231
+msgid "Order in list"
+msgstr "Ordem na lista"
+
+#: ../../mod/mitem.php:159 ../../mod/mitem.php:231
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Números mais altos descem para o fim da lista"
+
+#: ../../mod/mitem.php:160
+msgid "Submit and finish"
+msgstr "Enviar e terminar"
+
+#: ../../mod/mitem.php:161
+msgid "Submit and continue"
+msgstr "Enviar e continuar"
+
+#: ../../mod/mitem.php:169
+msgid "Menu:"
+msgstr "Menu:"
+
+#: ../../mod/mitem.php:172
+msgid "Link Target"
+msgstr "Alvo do Link"
+
+#: ../../mod/mitem.php:175
+msgid "Edit menu"
+msgstr "Editar menu"
+
+#: ../../mod/mitem.php:178
+msgid "Edit element"
+msgstr "Editar elemento"
+
+#: ../../mod/mitem.php:179
+msgid "Drop element"
+msgstr "Descartar elemento"
+
+#: ../../mod/mitem.php:180
+msgid "New element"
+msgstr "Novo elemento"
+
+#: ../../mod/mitem.php:181
+msgid "Edit this menu container"
+msgstr "Editar esta caixa de menu"
+
+#: ../../mod/mitem.php:182
+msgid "Add menu element"
+msgstr "Adicionar um elemento de menu"
+
+#: ../../mod/mitem.php:183
+msgid "Delete this menu item"
+msgstr "Deleter este item de menu"
+
+#: ../../mod/mitem.php:184
+msgid "Edit this menu item"
+msgstr "Editar este item de menu"
+
+#: ../../mod/mitem.php:201
+msgid "Menu item not found."
+msgstr "O item de menu não foi encontrado."
+
+#: ../../mod/mitem.php:212
+msgid "Menu item deleted."
+msgstr "O item de menu foi deletado."
+
+#: ../../mod/mitem.php:214
+msgid "Menu item could not be deleted."
+msgstr "Não foi possível deletar o item de menu."
+
+#: ../../mod/mitem.php:221
+msgid "Edit Menu Element"
+msgstr "Editar elemento de menu"
+
+#: ../../mod/mitem.php:227
+msgid "Link text"
+msgstr "Texto do link"
+
#: ../../mod/editwebpage.php:152
msgid "Delete webpage?"
msgstr "Deletar página web?"
@@ -6064,7 +5400,7 @@ msgid ""
"Password reset failed."
msgstr "Não foi possível verificar a solicitação (você pode tê-la submetido anteriormente). A senha não foi restaurada."
-#: ../../mod/lostpass.php:85 ../../boot.php:1558
+#: ../../mod/lostpass.php:85 ../../boot.php:1559
msgid "Password Reset"
msgstr "Reiniciar a senha"
@@ -6122,21 +5458,21 @@ msgstr "Sítio web:"
msgid "Remote Channel [%s] (not yet known on this site)"
msgstr "Canal Remoto [%s] (ainda não conhecido neste sítio)"
-#: ../../mod/rate.php:161 ../../mod/connedit.php:663
+#: ../../mod/rate.php:161
msgid "Rating (this information is public)"
msgstr "Avaliações (essa informação é pública)"
-#: ../../mod/rate.php:162 ../../mod/connedit.php:664
+#: ../../mod/rate.php:162
msgid "Optionally explain your rating (this information is public)"
msgstr "Opcionalmente justifique sua avaliação (essa informação é pública)"
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
-msgstr "O item não está editável"
+#: ../../mod/editblock.php:117
+msgid "Delete block?"
+msgstr "Deletar bloco?"
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
-msgstr "Deletar item?"
+#: ../../mod/editblock.php:179
+msgid "Edit Block"
+msgstr "Editar bloco"
#: ../../mod/invite.php:25
msgid "Total invitation limit exceeded."
@@ -6307,94 +5643,86 @@ msgstr "Não foi possível atualizar o menu."
msgid "Unable to create menu."
msgstr "Não foi possível criar o menu."
-#: ../../mod/menu.php:86 ../../mod/menu.php:98
+#: ../../mod/menu.php:89 ../../mod/menu.php:101
msgid "Menu Name"
msgstr "Nome do Menu"
-#: ../../mod/menu.php:86
+#: ../../mod/menu.php:89
msgid "Unique name (not visible on webpage) - required"
msgstr "Nome único (não visível na página web) - necessário"
-#: ../../mod/menu.php:87 ../../mod/menu.php:99
+#: ../../mod/menu.php:90 ../../mod/menu.php:102
msgid "Menu Title"
msgstr "Título do Menu"
-#: ../../mod/menu.php:87
+#: ../../mod/menu.php:90
msgid "Visible on webpage - leave empty for no title"
msgstr "Visível na Página web - Deixe vazio para nenhum título"
-#: ../../mod/menu.php:88
+#: ../../mod/menu.php:91
msgid "Allow Bookmarks"
msgstr "Permite Favoritos"
-#: ../../mod/menu.php:88 ../../mod/menu.php:140
+#: ../../mod/menu.php:91 ../../mod/menu.php:147
msgid "Menu may be used to store saved bookmarks"
msgstr "O menu pode ser utilizado para armazenar links guardados"
-#: ../../mod/menu.php:89
+#: ../../mod/menu.php:92 ../../mod/menu.php:149
msgid "Submit and proceed"
msgstr "Envie e Prossiga"
-#: ../../mod/menu.php:101
+#: ../../mod/menu.php:104
msgid "Drop"
msgstr "Descartar"
-#: ../../mod/menu.php:103
+#: ../../mod/menu.php:108
msgid "Bookmarks allowed"
msgstr "Permitindo guardar links"
-#: ../../mod/menu.php:105
+#: ../../mod/menu.php:110
msgid "Delete this menu"
msgstr "Deletar este menu"
-#: ../../mod/menu.php:106 ../../mod/menu.php:137
+#: ../../mod/menu.php:111 ../../mod/menu.php:144
msgid "Edit menu contents"
msgstr "Editar os conteúdos do menu"
-#: ../../mod/menu.php:107
+#: ../../mod/menu.php:112
msgid "Edit this menu"
msgstr "Editar este menu"
-#: ../../mod/menu.php:121
+#: ../../mod/menu.php:126
msgid "Menu could not be deleted."
msgstr "Não foi possível deletar o menu."
-#: ../../mod/menu.php:129 ../../mod/mitem.php:24
-msgid "Menu not found."
-msgstr "O menu não foi encontrado."
-
-#: ../../mod/menu.php:134
+#: ../../mod/menu.php:139
msgid "Edit Menu"
msgstr "Editar menu"
-#: ../../mod/menu.php:136
+#: ../../mod/menu.php:143
msgid "Add or remove entries to this menu"
msgstr "Adicionar ou remover entradas deste menu"
-#: ../../mod/menu.php:138
+#: ../../mod/menu.php:145
msgid "Menu name"
msgstr "Nome do menu"
-#: ../../mod/menu.php:138
+#: ../../mod/menu.php:145
msgid "Must be unique, only seen by you"
msgstr "Deve ser único, exibido somente para você"
-#: ../../mod/menu.php:139
+#: ../../mod/menu.php:146
msgid "Menu title"
msgstr "Título do menu"
-#: ../../mod/menu.php:139
+#: ../../mod/menu.php:146
msgid "Menu title as seen by others"
msgstr "Título do menu quando visto por outros"
-#: ../../mod/menu.php:140
+#: ../../mod/menu.php:147
msgid "Allow bookmarks"
msgstr "Habilitar links guardados"
-#: ../../mod/menu.php:142
-msgid "Modify"
-msgstr "Modificar"
-
#: ../../mod/filestorage.php:82
msgid "Permission Denied."
msgstr "Permissão negada."
@@ -6496,12 +5824,12 @@ msgstr "Clique em um contato para adicionar ou remover."
msgid "Visible To"
msgstr "Visível para"
-#: ../../mod/impel.php:121
+#: ../../mod/impel.php:191
#, php-format
msgid "%s element installed"
msgstr "Elemento %s instalado"
-#: ../../mod/impel.php:124
+#: ../../mod/impel.php:194
#, php-format
msgid "%s element installation failed"
msgstr "Instalação de elemento %s falhou"
@@ -6579,7 +5907,7 @@ msgstr "Página web"
msgid "Interests"
msgstr "Interesses"
-#: ../../mod/profiles.php:447 ../../mod/admin.php:953
+#: ../../mod/profiles.php:447 ../../mod/admin.php:994
msgid "Address"
msgstr "Endereço"
@@ -6747,7 +6075,7 @@ msgstr "Escola/educação"
msgid "This is your default profile."
msgstr "Este é seu perfil padrão."
-#: ../../mod/profiles.php:728 ../../mod/directory.php:218
+#: ../../mod/profiles.php:728
msgid "Age: "
msgstr "Idade: "
@@ -6787,76 +6115,433 @@ msgstr "Descrição:"
msgid "Source of Item"
msgstr "Fonte do Item"
-#: ../../mod/openid.php:26
-msgid "OpenID protocol error. No ID returned."
-msgstr "Erro do protocolo OpenID. Nenhuma ID retornada."
+#: ../../mod/setup.php:187
+msgid "$Projectname Server - Setup"
+msgstr "Servidor $Projectname - Configuração"
-#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:286
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Bem vindo %s. Autenticação remota realizada com sucesso."
+#: ../../mod/setup.php:191
+msgid "Could not connect to database."
+msgstr "Não foi possível conectar ao banco de dados."
+
+#: ../../mod/setup.php:195
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr "Não foi possível conectar à URL especificada para o site. Provavlmente um problema de DNS ou com o certificado SSL."
+
+#: ../../mod/setup.php:202
+msgid "Could not create table."
+msgstr "Não foi possível criar a tabela."
+
+#: ../../mod/setup.php:207
+msgid "Your site database has been installed."
+msgstr "O banco de dados do seu site foi instalado."
+
+#: ../../mod/setup.php:211
+msgid ""
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
+msgstr "Você pode precisar importar o arquivo \"install/schema_xxx.sql\" manualmente usando um cliente do banco de dados."
+
+#: ../../mod/setup.php:212 ../../mod/setup.php:280 ../../mod/setup.php:730
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr "Por favor, veja o arquivo \"install/INSTALL.txt\"."
+
+#: ../../mod/setup.php:277
+msgid "System check"
+msgstr "Checagem do sistema"
+
+#: ../../mod/setup.php:282
+msgid "Check again"
+msgstr "Cheque novamente"
+
+#: ../../mod/setup.php:304
+msgid "Database connection"
+msgstr "Conexão ao banco de dados"
+
+#: ../../mod/setup.php:305
+msgid ""
+"In order to install $Projectname we need to know how to connect to your "
+"database."
+msgstr "Para instalar a $Projectname é necessário saber como se conectar ao seu banco de dados."
+
+#: ../../mod/setup.php:306
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Por favor, entre em contato com a sua hospedagem ou com o administrador do site caso você tenha alguma dúvida em relação a isso."
+
+#: ../../mod/setup.php:307
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "O banco de dados que você especificar abaixo já deve existir. Caso contrário, crie-o antes de prosseguir."
+
+#: ../../mod/setup.php:311
+msgid "Database Server Name"
+msgstr "Nome do servidor de banco de dados"
+
+#: ../../mod/setup.php:311
+msgid "Default is localhost"
+msgstr "O default é localhost"
+
+#: ../../mod/setup.php:312
+msgid "Database Port"
+msgstr "Porta do banco de dados"
+
+#: ../../mod/setup.php:312
+msgid "Communication port number - use 0 for default"
+msgstr "Número da porta de comunicação - use 0 para o default"
+
+#: ../../mod/setup.php:313
+msgid "Database Login Name"
+msgstr "Nome do usuário do banco de dados"
+
+#: ../../mod/setup.php:314
+msgid "Database Login Password"
+msgstr "Senha do usuário do banco de dados"
+
+#: ../../mod/setup.php:315
+msgid "Database Name"
+msgstr "Nome do banco de dados"
-#: ../../mod/directory.php:224
+#: ../../mod/setup.php:316
+msgid "Database Type"
+msgstr "Tipo do banco de dados"
+
+#: ../../mod/setup.php:318 ../../mod/setup.php:359
+msgid "Site administrator email address"
+msgstr "Endereço de email do administrador do site"
+
+#: ../../mod/setup.php:318 ../../mod/setup.php:359
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "O endereço de email da sua conta deve ser igual a este para que você possa utilizar o painel de administração web."
+
+#: ../../mod/setup.php:319 ../../mod/setup.php:361
+msgid "Website URL"
+msgstr "URL do website"
+
+#: ../../mod/setup.php:319 ../../mod/setup.php:361
+msgid "Please use SSL (https) URL if available."
+msgstr "Por favor, use uma URL SSL (https) se disponível."
+
+#: ../../mod/setup.php:321 ../../mod/setup.php:363
+msgid "Please select a default timezone for your website"
+msgstr "Por favor, selecione o fuso horário padrão para o seu site"
+
+#: ../../mod/setup.php:348
+msgid "Site settings"
+msgstr "Configurações do site"
+
+#: ../../mod/setup.php:413
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Não foi possível encontrar uma versão de linha de comando do PHP nos caminhos do seu servidor web."
+
+#: ../../mod/setup.php:414
+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 "Caso você não tenha uma versão de linha de comando do PHP instalada no seu servidor, você não será capaz de executar coletas em segundo plano pelo cron."
+
+#: ../../mod/setup.php:418
+msgid "PHP executable path"
+msgstr "Caminho para o executável do PHP"
+
+#: ../../mod/setup.php:418
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Digite o caminho completo do executável PHP. Você pode deixar isso em branco para continuar com a instalação."
+
+#: ../../mod/setup.php:423
+msgid "Command line PHP"
+msgstr "PHP em linha de comando"
+
+#: ../../mod/setup.php:432
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "\"register_argc_argv\" não está habilitado na versão de linha de comando do PHP no seu sistema."
+
+#: ../../mod/setup.php:433
+msgid "This is required for message delivery to work."
+msgstr "Isto é necessário para o funcionamento do envio de mensagens."
+
+#: ../../mod/setup.php:436
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
+
+#: ../../mod/setup.php:454
#, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] "%d avaliação"
-msgstr[1] "%d avaliações"
+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 "Seu volume de carregamento total está definido para %s. Tamanho máximo de um arquivo carregado para %s. Você pode carregar até %d arquivos ao mesmo tempo."
-#: ../../mod/directory.php:236
-msgid "Gender: "
-msgstr "Gênero: "
+#: ../../mod/setup.php:459
+msgid "You can adjust these settings in the servers php.ini."
+msgstr "Você pode ajustar essas configurações no php.ini do servidor."
-#: ../../mod/directory.php:238
-msgid "Status: "
-msgstr "Status:"
+#: ../../mod/setup.php:461
+msgid "PHP upload limits"
+msgstr "Limites de carregamento do PHP"
-#: ../../mod/directory.php:240
-msgid "Homepage: "
-msgstr "Website:"
+#: ../../mod/setup.php:484
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Erro: a função \"openssl_pkey_new\" no seu sistema não é capaz de gerar as chaves de criptografia"
-#: ../../mod/directory.php:243
-msgid "Hometown: "
-msgstr "Cidade natal:"
+#: ../../mod/setup.php:485
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Se estiver usando o Windows, por favor dê uma olhada em \"http://www.php.net/manual/en/openssl.installation.php\"."
-#: ../../mod/directory.php:245
-msgid "About: "
-msgstr "Sobre:"
+#: ../../mod/setup.php:488
+msgid "Generate encryption keys"
+msgstr "Gerar chaves de criptografia"
-#: ../../mod/directory.php:303
-msgid "Public Forum:"
-msgstr "Fórum público:"
+#: ../../mod/setup.php:500
+msgid "libCurl PHP module"
+msgstr "Módulo PHP libCurl"
-#: ../../mod/directory.php:306
-msgid "Keywords: "
-msgstr "Palavras-chave:"
+#: ../../mod/setup.php:501
+msgid "GD graphics PHP module"
+msgstr "Módulo PHP GD graphics"
+
+#: ../../mod/setup.php:502
+msgid "OpenSSL PHP module"
+msgstr "Módulo PHP OpenSSL"
+
+#: ../../mod/setup.php:503
+msgid "mysqli or postgres PHP module"
+msgstr "módulo 'mysqli' ou 'postgres' do PHP"
+
+#: ../../mod/setup.php:504
+msgid "mb_string PHP module"
+msgstr "Módulo PHP mb_string "
+
+#: ../../mod/setup.php:505
+msgid "mcrypt PHP module"
+msgstr "Módulo PHP mcrypt"
+
+#: ../../mod/setup.php:506
+msgid "xml PHP module"
+msgstr "Módulo PHP xml"
+
+#: ../../mod/setup.php:510 ../../mod/setup.php:512
+msgid "Apache mod_rewrite module"
+msgstr "Módulo mod_rewrite do Apache"
+
+#: ../../mod/setup.php:510
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Erro: o módulo mod-rewrite do Apache é necessário, mas não está instalado."
+
+#: ../../mod/setup.php:516 ../../mod/setup.php:519
+msgid "proc_open"
+msgstr "proc_open"
+
+#: ../../mod/setup.php:516
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr "Erro: proc_open é necessário, mas não está instalado ou foi desabilitado no php.ini"
+
+#: ../../mod/setup.php:524
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Erro: o módulo libCURL do PHP é necessário, mas não está instalado."
+
+#: ../../mod/setup.php:528
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Erro: o módulo gráfico GD, com suporte a JPEG, do PHP é necessário, mas não está instalado."
+
+#: ../../mod/setup.php:532
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Erro: o módulo openssl do PHP é necessário, mas não está instalado."
+
+#: ../../mod/setup.php:536
+msgid ""
+"Error: mysqli or postgres PHP module required but neither are installed."
+msgstr "Erro: módulo 'mysqli' ou 'postgres' do PHP é necessário mas nenhum deles está instalado."
+
+#: ../../mod/setup.php:540
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Erro: o módulo mb_string do PHP é necessário, mas não está instalado."
+
+#: ../../mod/setup.php:544
+msgid "Error: mcrypt PHP module required but not installed."
+msgstr "Erro: o módulo mcrypt do PHP é necessário, mas não está instalado."
+
+#: ../../mod/setup.php:548
+msgid "Error: xml PHP module required for DAV but not installed."
+msgstr "Erro: o módulo xml do PHP é necessário para DAV, mas não está instalado."
+
+#: ../../mod/setup.php:566
+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 "O instalador web precisa criar um arquivo chamado \".htconfig.php\" na pasta raiz da instalação e não está conseguindo."
+
+#: ../../mod/setup.php:567
+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 "Geralmente isso está relacionado às definições de permissão, uma vez que o servidor web pode não estar conseguindo escrever os arquivos nesta pasta."
+
+#: ../../mod/setup.php:568
+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 "Ao final desse procedimento, será fornecido um texto que deverá ser salvo em um arquivo de nome .htconfig.php, na pasta raiz do seu Red."
+
+#: ../../mod/setup.php:569
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr "Você também pode pular esse procedimento e executar uma instalação manual. Por favor, dê uma olhada no arquivo \"install/INSTALL.TXT\" para instruções."
+
+#: ../../mod/setup.php:572
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php tem permissão de escrita"
-#: ../../mod/directory.php:311
+#: ../../mod/setup.php:586
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Red usa o engine de template Smarty3 para renderizar suas telas. Smarty3 compila templates para PHP para acelerar a renderização."
+
+#: ../../mod/setup.php:587
#, php-format
-msgid "Common connections: %s"
-msgstr "Conexões em Comum: %s"
+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 "Para guardar os templates compilados, o servidor web necessita de permissão de escrita no diretório %s no diretório raiz da Red."
-#: ../../mod/directory.php:363
-msgid "Finding:"
-msgstr "Pesquisando:"
+#: ../../mod/setup.php:588 ../../mod/setup.php:609
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Por favor, certifique-se de que o usuário sob o qual o servidor web roda (ex: www-data) tenha permissão de escrita nesse diretório."
-#: ../../mod/directory.php:368
-msgid "next page"
-msgstr "próxima página"
+#: ../../mod/setup.php:589
+#, 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 "Nota: como uma medida de segurança, você deve fornecer ao servidor web permissão de escrita somente em %s e não aos arquivos de template (.tpl) que ele contém."
-#: ../../mod/directory.php:368
-msgid "previous page"
-msgstr "página anterior"
+#: ../../mod/setup.php:592
+#, php-format
+msgid "%s is writable"
+msgstr "%s tem permissão de escrita"
-#: ../../mod/directory.php:385
-msgid "No entries (some entries may be hidden)."
-msgstr "Nenhuma entrada (algumas entradas podem estar escondidas)."
+#: ../../mod/setup.php:608
+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 "A Red usa o diretório store para salvar arquivos carregados. O servidor web necessita de permissão de escrita no diretório store dentro do diretório raiz da Red"
+
+#: ../../mod/setup.php:612
+msgid "store is writable"
+msgstr "store tem permissão de escrita"
+
+#: ../../mod/setup.php:645
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access"
+" to this site."
+msgstr "Não foi possível validar o certificado SSL. Corrija o certificado ou desabilite o acesso via https ao site."
+
+#: ../../mod/setup.php:646
+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 "Se você oferece acesso https ao seu website ou permite conexões na porta TCP 443 (a porta https:), você DEVE usar um certificado reconhecido pelos navegadores. Você NÃO DEVE usar certificados assinados por você mesmo!"
+
+#: ../../mod/setup.php:647
+msgid ""
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
+msgstr "Essa restrição é incorporada porque publicações públicas suas podem, por exemplo, conter referências a imagens no seu próprio hub."
+
+#: ../../mod/setup.php:648
+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 "Se seu certificado não for reconhecido, membros de outros sites (que podem ter certificados válidos) receberão uma mensagem de aviso nos seus próprios sites reclamando de problemas de segurança."
+
+#: ../../mod/setup.php:649
+msgid ""
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
+msgstr "Isso pode causar problemas de usabilidade (não só no seu site) então nós precisamos insistir nesse requisito."
+
+#: ../../mod/setup.php:650
+msgid ""
+"Providers are available that issue free certificates which are browser-"
+"valid."
+msgstr "Existem provedores que disponibilizam gratuitamente certificados reconhecidos por navegadores."
+
+#: ../../mod/setup.php:652
+msgid "SSL certificate validation"
+msgstr "Validação do certificado SSL"
+
+#: ../../mod/setup.php:658
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server "
+"configuration.Test: "
+msgstr "A reescrita de URLs não está funcionando no .htaccess. Verifique as configurações do servidor. Teste:"
+
+#: ../../mod/setup.php:661
+msgid "Url rewrite is working"
+msgstr "A reescrita de URLs está funcionando"
+
+#: ../../mod/setup.php:670
+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 "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendika em seu servidor web."
+
+#: ../../mod/setup.php:694
+msgid "Errors encountered creating database tables."
+msgstr "Foram encontrados erros durante a criação das tabelas do banco de dados."
-#: ../../mod/uexport.php:33 ../../mod/uexport.php:34
+#: ../../mod/setup.php:728
+msgid "<h1>What next</h1>"
+msgstr "<h1>Próximos passos</h1>"
+
+#: ../../mod/setup.php:729
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "IMPORTANTE: Você deve configurar [manualmente] uma tarefa agendada para o coletor."
+
+#: ../../mod/openid.php:26
+msgid "OpenID protocol error. No ID returned."
+msgstr "Erro do protocolo OpenID. Nenhuma ID retornada."
+
+#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:286
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Bem vindo %s. Autenticação remota realizada com sucesso."
+
+#: ../../mod/tagger.php:96
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s marcou %3$s de %2$s com %4$s"
+
+#: ../../mod/uexport.php:41 ../../mod/uexport.php:42
msgid "Export Channel"
msgstr "Exportar o canal"
-#: ../../mod/uexport.php:35
+#: ../../mod/uexport.php:43
msgid ""
"Export your basic channel information to a small file. This acts as a "
"backup of your connections, permissions, profile and basic data, which can "
@@ -6864,11 +6549,11 @@ msgid ""
"content."
msgstr "Exportar suas informações básicas do canal para um arquivo pequeno. Isso funciona como um backup das suas ligações, permissões, perfis e dados básicos, que podem ser usados para importar os dados para um novo hub, não mas não contém seu conteúdo."
-#: ../../mod/uexport.php:36
+#: ../../mod/uexport.php:44
msgid "Export Content"
msgstr "Exportar conteúdo"
-#: ../../mod/uexport.php:37
+#: ../../mod/uexport.php:45
msgid ""
"Export your channel information and all the content to a JSON backup. This "
"backs up all of your connections, permissions, profile data and all of your "
@@ -6894,7 +6579,7 @@ msgstr "assinatura do destino inválida"
msgid "Theme settings updated."
msgstr "As configurações de tema foram atualizadas."
-#: ../../mod/admin.php:93 ../../mod/admin.php:445
+#: ../../mod/admin.php:93 ../../mod/admin.php:452
msgid "Site"
msgstr "Site"
@@ -6902,15 +6587,15 @@ msgstr "Site"
msgid "Accounts"
msgstr "Contas"
-#: ../../mod/admin.php:95 ../../mod/admin.php:945
+#: ../../mod/admin.php:95 ../../mod/admin.php:985
msgid "Channels"
msgstr "Canais"
-#: ../../mod/admin.php:96 ../../mod/admin.php:1036 ../../mod/admin.php:1076
+#: ../../mod/admin.php:96 ../../mod/admin.php:1077 ../../mod/admin.php:1117
msgid "Plugins"
msgstr "Plugins"
-#: ../../mod/admin.php:97 ../../mod/admin.php:1236 ../../mod/admin.php:1270
+#: ../../mod/admin.php:97 ../../mod/admin.php:1277 ../../mod/admin.php:1311
msgid "Themes"
msgstr "Temas"
@@ -6926,7 +6611,7 @@ msgstr "Configuração de perfis"
msgid "DB updates"
msgstr "Atualizações do Banco de Dados"
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1355
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1396
msgid "Logs"
msgstr "Logs"
@@ -6970,10 +6655,10 @@ msgstr "# clones"
msgid "Message queues"
msgstr "Filas de mensagem"
-#: ../../mod/admin.php:240 ../../mod/admin.php:444 ../../mod/admin.php:539
-#: ../../mod/admin.php:808 ../../mod/admin.php:944 ../../mod/admin.php:1035
-#: ../../mod/admin.php:1075 ../../mod/admin.php:1235 ../../mod/admin.php:1269
-#: ../../mod/admin.php:1354
+#: ../../mod/admin.php:240 ../../mod/admin.php:451 ../../mod/admin.php:548
+#: ../../mod/admin.php:817 ../../mod/admin.php:984 ../../mod/admin.php:1076
+#: ../../mod/admin.php:1116 ../../mod/admin.php:1276 ../../mod/admin.php:1310
+#: ../../mod/admin.php:1395
msgid "Administration"
msgstr "Administração"
@@ -6985,7 +6670,7 @@ msgstr "Resumo"
msgid "Registered accounts"
msgstr "Contas Registradas"
-#: ../../mod/admin.php:245 ../../mod/admin.php:543
+#: ../../mod/admin.php:245 ../../mod/admin.php:552
msgid "Pending registrations"
msgstr "Registros pendentes"
@@ -6993,7 +6678,7 @@ msgstr "Registros pendentes"
msgid "Registered channels"
msgstr "Canais Registrados"
-#: ../../mod/admin.php:247 ../../mod/admin.php:544
+#: ../../mod/admin.php:247 ../../mod/admin.php:553
msgid "Active plugins"
msgstr "Plugins ativos"
@@ -7001,629 +6686,675 @@ msgstr "Plugins ativos"
msgid "Version"
msgstr "Versão"
-#: ../../mod/admin.php:359
+#: ../../mod/admin.php:363
msgid "Site settings updated."
msgstr "As configurações de site foram atualizadas."
-#: ../../mod/admin.php:398
+#: ../../mod/admin.php:400 ../../mod/settings.php:813
+msgid "mobile"
+msgstr "móvel"
+
+#: ../../mod/admin.php:402
msgid "experimental"
msgstr "experimental"
-#: ../../mod/admin.php:400
+#: ../../mod/admin.php:404
msgid "unsupported"
msgstr "não suportado"
-#: ../../mod/admin.php:425
+#: ../../mod/admin.php:429
msgid "Yes - with approval"
msgstr "Sim - pendente aprovação"
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:435
msgid "My site is not a public server"
msgstr "Meu site não é um servidor público"
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:436
msgid "My site has paid access only"
msgstr "Meu site oferece somente acesso pago"
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:437
msgid "My site has free access only"
msgstr "Meu site oferece somente acesso gratuito"
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:438
msgid "My site offers free accounts with optional paid upgrades"
msgstr "Meu site oferece contas gratuitas com recursos adicionais pagos"
-#: ../../mod/admin.php:447 ../../mod/register.php:207
+#: ../../mod/admin.php:454 ../../mod/register.php:207
msgid "Registration"
msgstr "Registro"
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:455
msgid "File upload"
msgstr "Carregamento de arquivos"
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:456
msgid "Policies"
msgstr "Políticas"
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:461
msgid "Site name"
msgstr "Nome do site"
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:462
msgid "Banner/Logo"
msgstr "Cartaz/Logo"
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:463
msgid "Administrator Information"
msgstr "Informações do Administrador"
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:463
msgid ""
"Contact information for site administrators. Displayed on siteinfo page. "
"BBCode can be used here"
msgstr "Informações de contato com administradores do site. Exibida na página siteinfo. BBCode pode ser usado aqui."
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:464
msgid "System language"
msgstr "Idioma do sistema"
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:465
msgid "System theme"
msgstr "Tema do sistema"
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:465
msgid ""
"Default system theme - may be over-ridden by user profiles - <a href='#' "
"id='cnftheme'>change theme settings</a>"
msgstr "Tema padrão do sistema - pode ser sobrescrito por perfis de usuário - <a href='#' id='cnftheme'>mudar configurações do tema</a>"
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:466
msgid "Mobile system theme"
msgstr "Tema do sistema móvel"
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:466
msgid "Theme for mobile devices"
msgstr "Tema para dispositivos móveis"
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:468
msgid "Enable Diaspora Protocol"
msgstr "Habilitar protocolo Diaspora"
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:468
msgid "Communicate with Diaspora and Friendica - experimental"
msgstr "Comunicar com Diaspora e Friendica - experimental"
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:469
msgid "Allow Feeds as Connections"
msgstr "Permitir Feeds como conexões"
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:469
msgid "(Heavy system resource usage)"
msgstr "(Alto uso de recursos do sistema)"
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:470
msgid "Maximum image size"
msgstr "Tamanho máximo de imagens"
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:470
msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits."
msgstr "Tamanho máximo em bytes de imagens carregadas. O padrão é 0, significando sem limites."
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:471
msgid "Does this site allow new member registration?"
msgstr "Este site permite o registro de novos membros?"
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:472
msgid "Which best describes the types of account offered by this hub?"
msgstr "Qual descreve melhor os tipos de conta oferecidas por este hub?"
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:473
msgid "Register text"
msgstr "Texto de registro"
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:473
msgid "Will be displayed prominently on the registration page."
msgstr "Será exibido proeminentemente na página de registro."
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:474
+msgid "Site homepage to show visitors (default: login box)"
+msgstr "Deinir página inicial para exibir a visitantes (padrão: caixa de login)"
+
+#: ../../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."
+msgstr "exemplo: 'public' para mostrar o fluxo público, 'page/sys/home' para mostrar uma página web do sistema chamada 'home', ou 'include:home.html' para incluir um arquivo."
+
+#: ../../mod/admin.php:475
+msgid "Preserve site homepage URL"
+msgstr "Preservar o URL da homepage do site"
+
+#: ../../mod/admin.php:475
+msgid ""
+"Present the site homepage in a frame at the original location instead of "
+"redirecting"
+msgstr "Apresentar a homepage do site em um frame na localização original ao invés de redirecionar"
+
+#: ../../mod/admin.php:476
msgid "Accounts abandoned after x days"
msgstr "Contas abandonadas após x dias"
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:476
msgid ""
"Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit."
msgstr "Não gastará recursos do sistema coletando de sites externos para contas abandonadas. Use 0 para sem limite de tempo."
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:477
msgid "Allowed friend domains"
msgstr "Domínios permitidos para amigos"
-#: ../../mod/admin.php:468
+#: ../../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"
msgstr "Lista, separada por vírgulas, de domínios permitidos para estabelecer amizades com este site. <em>Wildcards</em> são aceitas. Vazio para permitir qualquer domínio"
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:478
msgid "Allowed email domains"
msgstr "Domínios permitidos de e-mail"
-#: ../../mod/admin.php:469
+#: ../../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"
msgstr "Lista, separada por vírgulas, de domínios permitidos em endereços de e-mail para registros nesse site. <em>Wildcards</em> são aceitas. Vazio para permitir qualquer domínio"
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:479
msgid "Not allowed email domains"
msgstr "Não permitido domínios de e-mail"
-#: ../../mod/admin.php:470
+#: ../../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."
msgstr "Lista de domínios separadas por vírgulas, que não são permitidos em endereços de e-mail para inscrições para este sítio. Curingas são aceitos. Deixe vazio para permitir quaisquer domínios, a menos que domínios permitidos tenham sido definidos."
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:480
msgid "Block public"
msgstr "Bloquear público"
-#: ../../mod/admin.php:471
+#: ../../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."
msgstr "Marque para bloquear o acesso público a todas as páginas pessoais que seriam públicas, a não ser que se esteja autenticado."
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:481
msgid "Verify Email Addresses"
msgstr "Verificar endereços de email"
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:481
msgid ""
"Check to verify email addresses used in account registration (recommended)."
msgstr "Clique para verificar endereços de email usados no registro de contas (recomendado)."
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:482
msgid "Force publish"
msgstr "Forçar publicação"
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:482
msgid ""
"Check to force all profiles on this site to be listed in the site directory."
msgstr "Marque para forçar todos os perfis neste site a aparecerem listados no diretório do site."
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:483
msgid "Disable discovery tab"
msgstr "Desabilitar a aba \"Descubra\""
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:483
msgid ""
"Remove the tab in the network view with public content pulled from sources "
"chosen for this site."
msgstr "Remove da visualização de rede a aba com conteúdos públicos obtidos de fontes escolhidas para esse site."
-#: ../../mod/admin.php:475
-msgid "No login on Homepage"
-msgstr "Sem formulário de autenticação na página inicial"
+#: ../../mod/admin.php:484
+msgid "login on Homepage"
+msgstr "login na Página inicial"
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:484
msgid ""
-"Check to hide the login form from your sites homepage when visitors arrive "
-"who are not logged in (e.g. when you put the content of the homepage in via "
-"the site channel)."
-msgstr "Marque para esconder o formulário de autenticação da página inicial do seu site quando visitantes chegarem sem estar autenticados (e.g. quando você inclui os conteúdos da página inicial através do canal do site)."
+"Present a login box to visitors on the home page if no other content has "
+"been configured."
+msgstr "Apresentar uma caixa de login para visitantes na página inicial se nenhum outro conteúdo foi configurado."
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:486
msgid "Proxy user"
msgstr "Usuário do proxy"
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:487
msgid "Proxy URL"
msgstr "URL do proxy"
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:488
msgid "Network timeout"
msgstr "Timeout da rede"
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:488
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr "Valor em segundos. Use 0 para ilimitado (não recomendado)."
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:489
msgid "Delivery interval"
msgstr "Intervalo de entrega"
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:489
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 "Atrase os processos de entrega em segundo plano por este número de segundos para reduzir a carga do sistema. Recomendado: 4-5 para hosts compartilhados, 2-3 para servidores virtuais privados. 0-1 para grandes servidores dedicados."
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:490
msgid "Poll interval"
msgstr "Intervalo de coleta"
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:490
msgid ""
"Delay background polling processes by this many seconds to reduce system "
"load. If 0, use delivery interval."
msgstr "Atrase os processos de coleta em segundo plano por este número de segundos para reduzir a carga do sistema. Se 0, use o intervalo de entrega."
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:491
msgid "Maximum Load Average"
msgstr "Carga média máxima"
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:491
msgid ""
"Maximum system load before delivery and poll processes are deferred - "
"default 50."
msgstr "Carga máxima do sistema antes de adiar processos de entrega e coleta - padrão 50."
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:492
msgid "Expiration period in days for imported (matrix/network) content"
msgstr "Período de expiração em dias para importação de conteúdo (rede/matriz)"
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:492
msgid "0 for no expiration of imported content"
msgstr "0 para nunca expirar o conteúdo importado"
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:540
msgid "No server found"
msgstr "Nenhum servidor foi encontrado"
-#: ../../mod/admin.php:538 ../../mod/admin.php:822
+#: ../../mod/admin.php:547 ../../mod/admin.php:831
msgid "ID"
msgstr "ID"
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:547
msgid "for channel"
msgstr "para o canal"
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:547
msgid "on server"
msgstr "no servidor"
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:547
msgid "Status"
msgstr "Status"
-#: ../../mod/admin.php:540
+#: ../../mod/admin.php:549
msgid "Server"
msgstr "Servidor"
-#: ../../mod/admin.php:557
+#: ../../mod/admin.php:566
msgid "Update has been marked successful"
msgstr "A atualização foi designada bem sucedida"
-#: ../../mod/admin.php:567
+#: ../../mod/admin.php:576
#, php-format
msgid "Executing %s failed. Check system logs."
msgstr "Execução de %s falhou. Verifique os logs do sistema."
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:579
#, php-format
msgid "Update %s was successfully applied."
msgstr "A atualização %s foi aplicada com sucesso."
-#: ../../mod/admin.php:574
+#: ../../mod/admin.php:583
#, php-format
msgid "Update %s did not return a status. Unknown if it succeeded."
msgstr "A atualização %s não retornou um status. Situação incerta quando ao seu sucesso."
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:586
#, php-format
msgid "Update function %s could not be found."
msgstr "A função de atualização %s não foi encontrada."
-#: ../../mod/admin.php:593
+#: ../../mod/admin.php:602
msgid "No failed updates."
msgstr "Nenhuma falha nas atualizações."
-#: ../../mod/admin.php:597
+#: ../../mod/admin.php:606
msgid "Failed Updates"
msgstr "Falha nas atualizações"
-#: ../../mod/admin.php:599
+#: ../../mod/admin.php:608
msgid "Mark success (if update was manually applied)"
msgstr "Marque sucesso (se a atualização foi aplicada manualmente)"
-#: ../../mod/admin.php:600
+#: ../../mod/admin.php:609
msgid "Attempt to execute this update step automatically"
msgstr "Tente executar este passo da atualização automaticamente"
-#: ../../mod/admin.php:632
+#: ../../mod/admin.php:641
msgid "Queue Statistics"
msgstr "Filas de Estatísticas"
-#: ../../mod/admin.php:633
+#: ../../mod/admin.php:642
msgid "Total Entries"
msgstr "Total de Entradas"
-#: ../../mod/admin.php:634
+#: ../../mod/admin.php:643
msgid "Priority"
msgstr "Prioridade"
-#: ../../mod/admin.php:635
+#: ../../mod/admin.php:644
msgid "Destination URL"
msgstr "URL de destino"
-#: ../../mod/admin.php:636
+#: ../../mod/admin.php:645
msgid "Mark hub permanently offline"
msgstr "Marque o Hub como permanentemente fora do ar"
-#: ../../mod/admin.php:637
+#: ../../mod/admin.php:646
msgid "Empty queue for this hub"
msgstr "Fila vazia para esse hub"
-#: ../../mod/admin.php:638
+#: ../../mod/admin.php:647
msgid "Last known contact"
msgstr "Último contato conhecido"
-#: ../../mod/admin.php:674
+#: ../../mod/admin.php:683
#, php-format
msgid "%s user blocked/unblocked"
msgid_plural "%s users blocked/unblocked"
msgstr[0] "%s usuário foi bloqueado/desbloqueado"
msgstr[1] "%s usuários foram bloqueados/desbloqueados"
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:691
#, php-format
msgid "%s user deleted"
msgid_plural "%s users deleted"
msgstr[0] "%s usuário foi deletado"
msgstr[1] "%s usuários foram deletados"
-#: ../../mod/admin.php:718
+#: ../../mod/admin.php:727
msgid "Account not found"
msgstr "A conta não foi encontrada"
-#: ../../mod/admin.php:738
+#: ../../mod/admin.php:747
#, php-format
msgid "User '%s' blocked"
msgstr "O usuário/a '%s' foi bloqueado/a"
-#: ../../mod/admin.php:746
+#: ../../mod/admin.php:755
#, php-format
msgid "User '%s' unblocked"
msgstr "O usuário/a '%s' foi desbloqueado/a"
-#: ../../mod/admin.php:809 ../../mod/admin.php:821
+#: ../../mod/admin.php:818 ../../mod/admin.php:830
msgid "Users"
msgstr "Usuários"
-#: ../../mod/admin.php:811 ../../mod/admin.php:947
+#: ../../mod/admin.php:820 ../../mod/admin.php:987
msgid "select all"
msgstr "selecionar tudo"
-#: ../../mod/admin.php:812
+#: ../../mod/admin.php:821
msgid "User registrations waiting for confirm"
msgstr "Registros de usuário aguardando confirmação"
-#: ../../mod/admin.php:813
+#: ../../mod/admin.php:822
msgid "Request date"
msgstr "Data de requisição"
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:823
msgid "No registrations."
msgstr "Nenhum registro."
-#: ../../mod/admin.php:815
+#: ../../mod/admin.php:824 ../../mod/connedit.php:683
msgid "Approve"
msgstr "Aprovar"
-#: ../../mod/admin.php:816
+#: ../../mod/admin.php:825
msgid "Deny"
msgstr "Negar"
-#: ../../mod/admin.php:818 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
+#: ../../mod/admin.php:827 ../../mod/connedit.php:519
msgid "Block"
msgstr "Bloquear"
-#: ../../mod/admin.php:819 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
+#: ../../mod/admin.php:828 ../../mod/connedit.php:519
msgid "Unblock"
msgstr "Desbloquear"
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:831
msgid "Register date"
msgstr "Data de registro"
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:831
msgid "Last login"
msgstr "Última autenticação"
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:831
msgid "Expires"
msgstr "Expira"
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:831
msgid "Service Class"
msgstr "Classe de serviço"
-#: ../../mod/admin.php:824
+#: ../../mod/admin.php:833
msgid ""
"Selected users will be deleted!\\n\\nEverything these users had posted on "
"this site will be permanently deleted!\\n\\nAre you sure?"
msgstr "Os usuários selecionados serão deletados!\\n\\nTudo o que esses usuários postaram neste site será permanentemente deletado!\\n\\nTem certeza?"
-#: ../../mod/admin.php:825
+#: ../../mod/admin.php:834
msgid ""
"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
"site will be permanently deleted!\\n\\nAre you sure?"
msgstr "O/A usuário/a {0} será deletado/a!\\n\\nTudo o que esse/a usuário/a postou neste site será permanentemente deletado!\\n\\nTem certeza?"
-#: ../../mod/admin.php:859
+#: ../../mod/admin.php:870
#, php-format
msgid "%s channel censored/uncensored"
msgid_plural "%s channels censored/uncensored"
msgstr[0] "%s canal censurado/descensurado"
msgstr[1] "%s canais censurados/descensurados"
-#: ../../mod/admin.php:866
+#: ../../mod/admin.php:879
+#, php-format
+msgid "%s channel code allowed/disallowed"
+msgid_plural "%s channels code allowed/disallowed"
+msgstr[0] "%s canal com código permitido/proibido"
+msgstr[1] "%s canais com código permitido/proibido"
+
+#: ../../mod/admin.php:886
#, php-format
msgid "%s channel deleted"
msgid_plural "%s channels deleted"
msgstr[0] "%s canal deletado"
msgstr[1] "%s canais deletados"
-#: ../../mod/admin.php:886
+#: ../../mod/admin.php:906
msgid "Channel not found"
msgstr "Canal não encontrado"
-#: ../../mod/admin.php:897
+#: ../../mod/admin.php:917
#, php-format
msgid "Channel '%s' deleted"
msgstr "Canal '%s' deletado"
-#: ../../mod/admin.php:908
+#: ../../mod/admin.php:929
+#, php-format
+msgid "Channel '%s' censored"
+msgstr "Canal '%s' censurado"
+
+#: ../../mod/admin.php:929
#, php-format
msgid "Channel '%s' uncensored"
msgstr "Canal '%s' não censurado"
-#: ../../mod/admin.php:908
+#: ../../mod/admin.php:940
#, php-format
-msgid "Channel '%s' censored"
-msgstr "Canal '%s' censurado"
+msgid "Channel '%s' code allowed"
+msgstr "Código permitido para o canal '%s'"
+
+#: ../../mod/admin.php:940
+#, php-format
+msgid "Channel '%s' code disallowed"
+msgstr "Código proibido para o canal '%s'"
-#: ../../mod/admin.php:949
+#: ../../mod/admin.php:989
msgid "Censor"
msgstr "Censurar"
-#: ../../mod/admin.php:950
+#: ../../mod/admin.php:990
msgid "Uncensor"
msgstr "Não censurar"
-#: ../../mod/admin.php:953
+#: ../../mod/admin.php:991
+msgid "Allow Code"
+msgstr "Permitir código"
+
+#: ../../mod/admin.php:992
+msgid "Disallow Code"
+msgstr "Proibir código"
+
+#: ../../mod/admin.php:994
msgid "UID"
msgstr "UID"
-#: ../../mod/admin.php:955
+#: ../../mod/admin.php:996
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 "Os canais selecionados serão deletados!\\n\\nTudo que foi postado nesses canais nesse site será permanentemente deletado!\\n\\nVocê tem certeza?"
-#: ../../mod/admin.php:956
+#: ../../mod/admin.php:997
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 "O canal {0} será deletado!\\n\\nTudo o que foi postado nesse canal nesse site será permanentemente deletado!\\n\\nVocê tem certeza?"
-#: ../../mod/admin.php:996
+#: ../../mod/admin.php:1037
#, php-format
msgid "Plugin %s disabled."
msgstr "Plugin %s desabilitado."
-#: ../../mod/admin.php:1000
+#: ../../mod/admin.php:1041
#, php-format
msgid "Plugin %s enabled."
msgstr "Plugin %s habilitado."
-#: ../../mod/admin.php:1010 ../../mod/admin.php:1208
+#: ../../mod/admin.php:1051 ../../mod/admin.php:1249
msgid "Disable"
msgstr "Desabilitar"
-#: ../../mod/admin.php:1013 ../../mod/admin.php:1210
+#: ../../mod/admin.php:1054 ../../mod/admin.php:1251
msgid "Enable"
msgstr "Habilitar"
-#: ../../mod/admin.php:1037 ../../mod/admin.php:1237
+#: ../../mod/admin.php:1078 ../../mod/admin.php:1278
msgid "Toggle"
msgstr "Alternar"
-#: ../../mod/admin.php:1045 ../../mod/admin.php:1247
+#: ../../mod/admin.php:1086 ../../mod/admin.php:1288
msgid "Author: "
msgstr "Autor:"
-#: ../../mod/admin.php:1046 ../../mod/admin.php:1248
+#: ../../mod/admin.php:1087 ../../mod/admin.php:1289
msgid "Maintainer: "
msgstr "Mantenedor:"
-#: ../../mod/admin.php:1173
+#: ../../mod/admin.php:1214
msgid "No themes found."
msgstr "Nenhum tema foi encontrado."
-#: ../../mod/admin.php:1229
+#: ../../mod/admin.php:1270
msgid "Screenshot"
msgstr "Captura de tela"
-#: ../../mod/admin.php:1275
+#: ../../mod/admin.php:1316
msgid "[Experimental]"
msgstr "[Experimental]"
-#: ../../mod/admin.php:1276
+#: ../../mod/admin.php:1317
msgid "[Unsupported]"
msgstr "[Desassistido]"
-#: ../../mod/admin.php:1300
+#: ../../mod/admin.php:1341
msgid "Log settings updated."
msgstr "As configurações de log foram atualizadas."
-#: ../../mod/admin.php:1357
+#: ../../mod/admin.php:1398
msgid "Clear"
msgstr "Limpar"
-#: ../../mod/admin.php:1363
+#: ../../mod/admin.php:1404
msgid "Debugging"
msgstr "Depuração"
-#: ../../mod/admin.php:1364
+#: ../../mod/admin.php:1405
msgid "Log file"
msgstr "Arquivo de log"
-#: ../../mod/admin.php:1364
+#: ../../mod/admin.php:1405
msgid ""
"Must be writable by web server. Relative to your Red top-level directory."
msgstr "É necessário que o servidor web possa escrever neste arquivo. Relativo ao diretório raiz da Red."
-#: ../../mod/admin.php:1365
+#: ../../mod/admin.php:1406
msgid "Log level"
msgstr "Nível do log"
-#: ../../mod/admin.php:1411
+#: ../../mod/admin.php:1452
msgid "New Profile Field"
msgstr "Novo campo de perfil"
-#: ../../mod/admin.php:1412 ../../mod/admin.php:1432
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
msgid "Field nickname"
msgstr "Nome de apresentação do campo"
-#: ../../mod/admin.php:1412 ../../mod/admin.php:1432
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
msgid "System name of field"
msgstr "Nome de sistema do campo"
-#: ../../mod/admin.php:1413 ../../mod/admin.php:1433
+#: ../../mod/admin.php:1454 ../../mod/admin.php:1474
msgid "Input type"
msgstr "Tipo de entrada"
-#: ../../mod/admin.php:1414 ../../mod/admin.php:1434
+#: ../../mod/admin.php:1455 ../../mod/admin.php:1475
msgid "Field Name"
msgstr "Nome do campo"
-#: ../../mod/admin.php:1414 ../../mod/admin.php:1434
+#: ../../mod/admin.php:1455 ../../mod/admin.php:1475
msgid "Label on profile pages"
msgstr "Rótulo nas páginas de perfil"
-#: ../../mod/admin.php:1415 ../../mod/admin.php:1435
+#: ../../mod/admin.php:1456 ../../mod/admin.php:1476
msgid "Help text"
msgstr "Texto de ajuda"
-#: ../../mod/admin.php:1415 ../../mod/admin.php:1435
+#: ../../mod/admin.php:1456 ../../mod/admin.php:1476
msgid "Additional info (optional)"
msgstr "Informações adicionais (opcional)"
-#: ../../mod/admin.php:1425
+#: ../../mod/admin.php:1466
msgid "Field definition not found"
msgstr "A dfinição de campo não foi encontrada"
-#: ../../mod/admin.php:1431
+#: ../../mod/admin.php:1472
msgid "Edit Profile Field"
msgstr "Editar campo de perfil"
@@ -7635,14 +7366,6 @@ msgstr "Não foi possível localizar seu hub."
msgid "Post successful."
msgstr "Publicado com sucesso."
-#: ../../mod/editblock.php:112
-msgid "Edit Block"
-msgstr "Editar bloco"
-
-#: ../../mod/editblock.php:123
-msgid "Delete block?"
-msgstr "Deletar bloco?"
-
#: ../../mod/register.php:44
msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
msgstr "Número máximo de novos registros neste site excedido por hoje. Por favor, tente novamente amanhã."
@@ -7758,39 +7481,25 @@ msgid ""
"removed from the network"
msgstr "Por padrão, apenas as instâncias dos canais localizadas neste hub serão removidas da rede"
-#: ../../mod/item.php:174
-msgid "Unable to locate original post."
-msgstr "Não foi possível localizar a publicação original."
-
-#: ../../mod/item.php:440
-msgid "Empty post discarded."
-msgstr "A publicação em branco foi descartada."
-
-#: ../../mod/item.php:480
-msgid "Executable content type not permitted to this channel."
-msgstr "Conteúdo de tipo executável não permitido para este canal."
-
-#: ../../mod/item.php:897
-msgid "System error. Post not saved."
-msgstr "Erro no sistema. A publicação não foi salva."
+#: ../../mod/removeaccount.php:61 ../../mod/settings.php:720
+msgid "Remove Account"
+msgstr "Remover conta"
-#: ../../mod/item.php:1115
-msgid "Unable to obtain post information from database."
-msgstr "Impossível obter informação do texto no banco de dados"
+#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61
+msgid "Help:"
+msgstr "Ajuda:"
-#: ../../mod/item.php:1122
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Você atingiu o seu limite de %1$.0f publicações de novos tópicos."
+#: ../../mod/help.php:76 ../../index.php:238
+msgid "Not Found"
+msgstr "Não encontrada"
-#: ../../mod/item.php:1129
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Você atingiu o seu limite de %1$.0f páginas web."
+#: ../../mod/help.php:100
+msgid "$Projectname Documentation"
+msgstr "Documentação de $Projectname"
#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25
#: ../../mod/update_network.php:23 ../../mod/update_search.php:46
-#: ../../mod/update_home.php:21
+#: ../../mod/update_home.php:21 ../../mod/update_public.php:21
msgid "[Embedded content - reload page to view]"
msgstr "[Conteúdo incorporado - recarregue a página para ver]"
@@ -7802,17 +7511,583 @@ msgstr "Não existe informação disponível sobre a privacidade remota."
msgid "Visible to:"
msgstr "Visível para:"
-#: ../../mod/layouts.php:176
-msgid "Comanche page description language help"
-msgstr "Página de Ajuda da descrição da Linguagem Comanche "
+#: ../../mod/settings.php:76
+msgid "Name is required"
+msgstr "É necessário informar o nome"
-#: ../../mod/layouts.php:180
-msgid "Layout Description"
-msgstr "Descrição de Layout"
+#: ../../mod/settings.php:80
+msgid "Key and Secret are required"
+msgstr "A chave e o segredo são obrigatórios"
-#: ../../mod/layouts.php:185
-msgid "Download PDL file"
-msgstr "Baixar arquivo PDL"
+#: ../../mod/settings.php:130
+msgid "Diaspora Policy Settings updated."
+msgstr "Configurações da política do Diáspora atualizadas."
+
+#: ../../mod/settings.php:238
+msgid "Passwords do not match. Password unchanged."
+msgstr "As senhas não correspondem. A senha não foi modificada."
+
+#: ../../mod/settings.php:242
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Não é permitido uma senha em branco. A senha não foi modificada."
+
+#: ../../mod/settings.php:256
+msgid "Password changed."
+msgstr "A senha foi modificada."
+
+#: ../../mod/settings.php:258
+msgid "Password update failed. Please try again."
+msgstr "Não foi possível atualizar a senha. Por favor, tente novamente."
+
+#: ../../mod/settings.php:272
+msgid "Not valid email."
+msgstr "Não é um e-mail válido"
+
+#: ../../mod/settings.php:275
+msgid "Protected email address. Cannot change to that email."
+msgstr "Endereço de e-mail protegido. Não é possível mudar para esse e-mail."
+
+#: ../../mod/settings.php:284
+msgid "System failure storing new email. Please try again."
+msgstr "Falha do sistema ao armazenar novo e-mail. Por favor, tente novamente."
+
+#: ../../mod/settings.php:523
+msgid "Settings updated."
+msgstr "As configurações foram atualizadas."
+
+#: ../../mod/settings.php:587 ../../mod/settings.php:613
+#: ../../mod/settings.php:649
+msgid "Add application"
+msgstr "Adicionar aplicação"
+
+#: ../../mod/settings.php:590
+msgid "Name of application"
+msgstr "Nome da aplicação"
+
+#: ../../mod/settings.php:591 ../../mod/settings.php:617
+msgid "Consumer Key"
+msgstr "Chave de consumidor"
+
+#: ../../mod/settings.php:591 ../../mod/settings.php:592
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr "Gerado automaticamente - troque se desejável. Comprimento máximo 20"
+
+#: ../../mod/settings.php:592 ../../mod/settings.php:618
+msgid "Consumer Secret"
+msgstr "Segredo de consumidor"
+
+#: ../../mod/settings.php:593 ../../mod/settings.php:619
+msgid "Redirect"
+msgstr "Redirecionamento"
+
+#: ../../mod/settings.php:593
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires "
+"this"
+msgstr "URI de redirecionamento - deixe em branco, a não ser que sua aplicação especificamente requeira isso"
+
+#: ../../mod/settings.php:594 ../../mod/settings.php:620
+msgid "Icon url"
+msgstr "URL do ícone"
+
+#: ../../mod/settings.php:594
+msgid "Optional"
+msgstr "Opcional"
+
+#: ../../mod/settings.php:605
+msgid "You can't edit this application."
+msgstr "Você não pode editar esta aplicação."
+
+#: ../../mod/settings.php:648
+msgid "Connected Apps"
+msgstr "Aplicações conectadas"
+
+#: ../../mod/settings.php:652
+msgid "Client key starts with"
+msgstr "Chave do cliente começa com"
+
+#: ../../mod/settings.php:653
+msgid "No name"
+msgstr "Sem nome"
+
+#: ../../mod/settings.php:654
+msgid "Remove authorization"
+msgstr "Remover autorização"
+
+#: ../../mod/settings.php:668
+msgid "No feature settings configured"
+msgstr "Não foi definida nenhuma configuração do recurso"
+
+#: ../../mod/settings.php:685
+msgid "Feature/Addon Settings"
+msgstr "Configuração de Característica/Plugins"
+
+#: ../../mod/settings.php:687
+msgid "Settings for the built-in Diaspora emulator"
+msgstr "Configurações para construir um emulador de Diáspora"
+
+#: ../../mod/settings.php:688
+msgid "Allow any Diaspora member to comment on your public posts"
+msgstr "Permitir que qualquer membro do Diaspora comente em suas postagens públicas"
+
+#: ../../mod/settings.php:689
+msgid "Enable the Diaspora protocol for this channel"
+msgstr "Habilitar o protocolo Diaspora para este canal"
+
+#: ../../mod/settings.php:690
+msgid "Diaspora Policy Settings"
+msgstr "Configurações de Política do Diáspora"
+
+#: ../../mod/settings.php:691
+msgid "Prevent your hashtags from being redirected to other sites"
+msgstr "Previne que suas hashtags sejam redirecionadas para outros sítios"
+
+#: ../../mod/settings.php:715
+msgid "Account Settings"
+msgstr "Configurações da conta"
+
+#: ../../mod/settings.php:716
+msgid "Enter New Password:"
+msgstr "Digite a Nova Senha:"
+
+#: ../../mod/settings.php:717
+msgid "Confirm New Password:"
+msgstr "Confirme a Nova Senha:"
+
+#: ../../mod/settings.php:717
+msgid "Leave password fields blank unless changing"
+msgstr "Deixe os campos de senha em branco, a não ser que você queira alterá-la"
+
+#: ../../mod/settings.php:719 ../../mod/settings.php:1057
+msgid "Email Address:"
+msgstr "Endereço de e-mail:"
+
+#: ../../mod/settings.php:721
+msgid "Remove this account including all its channels"
+msgstr "Exclua esta conta, incluindo todos seus canais"
+
+#: ../../mod/settings.php:737
+msgid "Off"
+msgstr "Desligado"
+
+#: ../../mod/settings.php:737
+msgid "On"
+msgstr "Ligado"
+
+#: ../../mod/settings.php:744
+msgid "Additional Features"
+msgstr "Recursos adicionais"
+
+#: ../../mod/settings.php:768
+msgid "Connector Settings"
+msgstr "Configurações do conector"
+
+#: ../../mod/settings.php:807
+msgid "No special theme for mobile devices"
+msgstr "Sem tema especial para aparelhos móveis"
+
+#: ../../mod/settings.php:810
+#, php-format
+msgid "%s - (Experimental)"
+msgstr "%s - (Experimental)"
+
+#: ../../mod/settings.php:849
+msgid "Display Settings"
+msgstr "Configurações de exibição"
+
+#: ../../mod/settings.php:850
+msgid "Theme Settings"
+msgstr "Configurações de tema"
+
+#: ../../mod/settings.php:851
+msgid "Custom Theme Settings"
+msgstr "Configurações personalizadas de tema"
+
+#: ../../mod/settings.php:852
+msgid "Content Settings"
+msgstr "Configurações de conteúdo"
+
+#: ../../mod/settings.php:858
+msgid "Display Theme:"
+msgstr "Tema do perfil:"
+
+#: ../../mod/settings.php:859
+msgid "Mobile Theme:"
+msgstr "Tema móvel:"
+
+#: ../../mod/settings.php:860
+msgid "Enable user zoom on mobile devices"
+msgstr "Permitir zoom pelo usuário em dispositivos móveis"
+
+#: ../../mod/settings.php:861
+msgid "Update browser every xx seconds"
+msgstr "Atualizar navegador a cada xx segundos"
+
+#: ../../mod/settings.php:861
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Mínimo de 10 segundos, sem máximo"
+
+#: ../../mod/settings.php:862
+msgid "Maximum number of conversations to load at any time:"
+msgstr "Número máximo permitido de conversas carregadas:"
+
+#: ../../mod/settings.php:862
+msgid "Maximum of 100 items"
+msgstr "Máximo de 100 itens"
+
+#: ../../mod/settings.php:863
+msgid "Show emoticons (smilies) as images"
+msgstr "Mostrar emoticons (smilies) como imagens"
+
+#: ../../mod/settings.php:864
+msgid "Link post titles to source"
+msgstr "Ligar o título dos posts à fonte"
+
+#: ../../mod/settings.php:865
+msgid "System Page Layout Editor - (advanced)"
+msgstr "Editor de layout de página do sistema - (avançado)"
+
+#: ../../mod/settings.php:868
+msgid "Use blog/list mode on channel page"
+msgstr "Usar modo blog/lista na página do canal"
+
+#: ../../mod/settings.php:868 ../../mod/settings.php:869
+msgid "(comments displayed separately)"
+msgstr "(comentários mostrados separadamente)"
+
+#: ../../mod/settings.php:869
+msgid "Use blog/list mode on matrix page"
+msgstr "Use modo de blogue/lista na página da matriz"
+
+#: ../../mod/settings.php:870
+msgid "Channel page max height of content (in pixels)"
+msgstr "Altura máxima do conteúdo na página (em pixels)"
+
+#: ../../mod/settings.php:870 ../../mod/settings.php:871
+msgid "click to expand content exceeding this height"
+msgstr "clique para expandir o conteúdo que excede essa altura"
+
+#: ../../mod/settings.php:871
+msgid "Matrix page max height of content (in pixels)"
+msgstr "Máxima altura de conteúdo na página Matriz (in pixesl)"
+
+#: ../../mod/settings.php:905
+msgid "Nobody except yourself"
+msgstr "Ninguém exceto você mesmo"
+
+#: ../../mod/settings.php:906
+msgid "Only those you specifically allow"
+msgstr "Apenas quem você der permissão"
+
+#: ../../mod/settings.php:907
+msgid "Approved connections"
+msgstr "Conexões aprovadas"
+
+#: ../../mod/settings.php:908
+msgid "Any connections"
+msgstr "Quaisquer conexões"
+
+#: ../../mod/settings.php:909
+msgid "Anybody on this website"
+msgstr "Qualquer um neste site"
+
+#: ../../mod/settings.php:910
+msgid "Anybody in this network"
+msgstr "Qualquer um nesta rede"
+
+#: ../../mod/settings.php:911
+msgid "Anybody authenticated"
+msgstr "Qualquer um autenticado"
+
+#: ../../mod/settings.php:912
+msgid "Anybody on the internet"
+msgstr "Qualquer um na internet"
+
+#: ../../mod/settings.php:986
+msgid "Publish your default profile in the network directory"
+msgstr "Publicar seu perfil padrão no diretório da rede?"
+
+#: ../../mod/settings.php:991
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Permitir sugerir você como amigo potencial para outros membros?"
+
+#: ../../mod/settings.php:1000
+msgid "Your channel address is"
+msgstr "O endereço do seu canal é"
+
+#: ../../mod/settings.php:1048
+msgid "Channel Settings"
+msgstr "Configurações do canal"
+
+#: ../../mod/settings.php:1055
+msgid "Basic Settings"
+msgstr "Configurações básicas"
+
+#: ../../mod/settings.php:1058
+msgid "Your Timezone:"
+msgstr "Seu fuso horário:"
+
+#: ../../mod/settings.php:1059
+msgid "Default Post Location:"
+msgstr "Localização padrão de suas publicações:"
+
+#: ../../mod/settings.php:1059
+msgid "Geographical location to display on your posts"
+msgstr "Localização geográfica para exibir em suas publicações"
+
+#: ../../mod/settings.php:1060
+msgid "Use Browser Location:"
+msgstr "Usar localizador do navegador:"
+
+#: ../../mod/settings.php:1062
+msgid "Adult Content"
+msgstr "Conteúdo adulto"
+
+#: ../../mod/settings.php:1062
+msgid ""
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
+msgstr "Este canal frequentemente ou regularmente publica conteúdo adulto. (Por favor marque qualquer material adulto e/ou nudez com #NSFW)"
+
+#: ../../mod/settings.php:1064
+msgid "Security and Privacy Settings"
+msgstr "Configurações de segurança e privacidade"
+
+#: ../../mod/settings.php:1066
+msgid "Your permissions are already configured. Click to view/adjust"
+msgstr "Suas permissões já foram configuradas. Clique para vê-las/ajustá-las"
+
+#: ../../mod/settings.php:1068
+msgid "Hide my online presence"
+msgstr "Esconda minha presença online"
+
+#: ../../mod/settings.php:1068
+msgid "Prevents displaying in your profile that you are online"
+msgstr "Previne exibir em seu perfil que você está online"
+
+#: ../../mod/settings.php:1070
+msgid "Simple Privacy Settings:"
+msgstr "Configurações de privacidade simples:"
+
+#: ../../mod/settings.php:1071
+msgid ""
+"Very Public - <em>extremely permissive (should be used with caution)</em>"
+msgstr "Muito público - <em>extremamente permissivo (deve ser usado com cuidado)</em>"
+
+#: ../../mod/settings.php:1072
+msgid ""
+"Typical - <em>default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)</em>"
+msgstr "Típico - <em>público por padrão, privado quando desejável (similar às permissões de redes sociais, mas com melhor privacidade)</em>"
+
+#: ../../mod/settings.php:1073
+msgid "Private - <em>default private, never open or public</em>"
+msgstr "Privado - <em>privado por padrão, nunca aberto ou público</em>"
+
+#: ../../mod/settings.php:1074
+msgid "Blocked - <em>default blocked to/from everybody</em>"
+msgstr "Bloqueado - <em>por padrão bloquado de/para todos</em>"
+
+#: ../../mod/settings.php:1076
+msgid "Allow others to tag your posts"
+msgstr "Permitir que outros etiquetem suas publicações"
+
+#: ../../mod/settings.php:1076
+msgid ""
+"Often used by the community to retro-actively flag inappropriate content"
+msgstr "Frequentemente utilizado pela comunidade para retroativamente sinalizar conteúdo inapropriado"
+
+#: ../../mod/settings.php:1078
+msgid "Advanced Privacy Settings"
+msgstr "Configurações de privacidade avançadas"
+
+#: ../../mod/settings.php:1080
+msgid "Expire other channel content after this many days"
+msgstr "Expirar outros conteúdos do canal após este número de dias"
+
+#: ../../mod/settings.php:1080
+msgid "0 or blank prevents expiration"
+msgstr "0 ou em branco previne expiração"
+
+#: ../../mod/settings.php:1081
+msgid "Maximum Friend Requests/Day:"
+msgstr "Número máximo de requisições de amizade por dia:"
+
+#: ../../mod/settings.php:1081
+msgid "May reduce spam activity"
+msgstr "Pode reduzir a frequência de spam"
+
+#: ../../mod/settings.php:1082
+msgid "Default Post Permissions"
+msgstr "Permissões padrão de publicação"
+
+#: ../../mod/settings.php:1087
+msgid "Channel permissions category:"
+msgstr "Categoria de permissões do canal:"
+
+#: ../../mod/settings.php:1093
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Máximo número de mensagens privadas por dia de pessoas desconhecidas:"
+
+#: ../../mod/settings.php:1093
+msgid "Useful to reduce spamming"
+msgstr "Útil para reduzir a frequência de spam"
+
+#: ../../mod/settings.php:1096
+msgid "Notification Settings"
+msgstr "Configurações de notificação"
+
+#: ../../mod/settings.php:1097
+msgid "By default post a status message when:"
+msgstr "Por padrão, publicar uma mensagem de status quando:"
+
+#: ../../mod/settings.php:1098
+msgid "accepting a friend request"
+msgstr "aceitar um pedido de amizade"
+
+#: ../../mod/settings.php:1099
+msgid "joining a forum/community"
+msgstr "associar-se a um fórum/comunidade"
+
+#: ../../mod/settings.php:1100
+msgid "making an <em>interesting</em> profile change"
+msgstr "modificar algo <em>interessante</em> em seu perfil"
+
+#: ../../mod/settings.php:1101
+msgid "Send a notification email when:"
+msgstr "Enviar um e-mail de notificação quando:"
+
+#: ../../mod/settings.php:1102
+msgid "You receive a connection request"
+msgstr "Você recebe uma solicitação de conexão"
+
+#: ../../mod/settings.php:1103
+msgid "Your connections are confirmed"
+msgstr "Suas conexões são confirmadas"
+
+#: ../../mod/settings.php:1104
+msgid "Someone writes on your profile wall"
+msgstr "Alguém escrever no mural do seu perfil"
+
+#: ../../mod/settings.php:1105
+msgid "Someone writes a followup comment"
+msgstr "Alguém comenta uma publicação"
+
+#: ../../mod/settings.php:1106
+msgid "You receive a private message"
+msgstr "Você recebeu uma mensagem privada"
+
+#: ../../mod/settings.php:1107
+msgid "You receive a friend suggestion"
+msgstr "Você recebe uma sugestão de amizade"
+
+#: ../../mod/settings.php:1108
+msgid "You are tagged in a post"
+msgstr "Você é mencionado num post"
+
+#: ../../mod/settings.php:1109
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Você foi cutucado/espetado/etc. numa publicação"
+
+#: ../../mod/settings.php:1112
+msgid "Show visual notifications including:"
+msgstr "Exibir notificações visuais incluindo:"
+
+#: ../../mod/settings.php:1114
+msgid "Unseen matrix activity"
+msgstr "Atividade não vista na matriz"
+
+#: ../../mod/settings.php:1115
+msgid "Unseen channel activity"
+msgstr "Atividade não vista no canal"
+
+#: ../../mod/settings.php:1116
+msgid "Unseen private messages"
+msgstr "Mensagens privadas não vistas"
+
+#: ../../mod/settings.php:1116 ../../mod/settings.php:1121
+#: ../../mod/settings.php:1122 ../../mod/settings.php:1123
+msgid "Recommended"
+msgstr "Recomendado"
+
+#: ../../mod/settings.php:1117
+msgid "Upcoming events"
+msgstr "Eventos próximos"
+
+#: ../../mod/settings.php:1118
+msgid "Events today"
+msgstr "Eventos hoje"
+
+#: ../../mod/settings.php:1119
+msgid "Upcoming birthdays"
+msgstr "Aniversários próximos"
+
+#: ../../mod/settings.php:1119
+msgid "Not available in all themes"
+msgstr "Não disponível em todos os temas"
+
+#: ../../mod/settings.php:1120
+msgid "System (personal) notifications"
+msgstr "Notificações de sistema (pessoais)"
+
+#: ../../mod/settings.php:1121
+msgid "System info messages"
+msgstr "Mensagens de informação do sistema"
+
+#: ../../mod/settings.php:1122
+msgid "System critical alerts"
+msgstr "Alertas críticos do sistema"
+
+#: ../../mod/settings.php:1123
+msgid "New connections"
+msgstr "Novas conexões"
+
+#: ../../mod/settings.php:1124
+msgid "System Registrations"
+msgstr "Registros no sistema"
+
+#: ../../mod/settings.php:1125
+msgid ""
+"Also show new wall posts, private messages and connections under Notices"
+msgstr "Também mostra novos textos, mensagens privadas e conexões nos Avisos"
+
+#: ../../mod/settings.php:1127
+msgid "Notify me of events this many days in advance"
+msgstr "Notifique-me de eventos adiante esse número de dias"
+
+#: ../../mod/settings.php:1127
+msgid "Must be greater than 0"
+msgstr "Deve ser maior que 0"
+
+#: ../../mod/settings.php:1129
+msgid "Advanced Account/Page Type Settings"
+msgstr "Configurações avançadas de conta/tipo de página"
+
+#: ../../mod/settings.php:1130
+msgid "Change the behaviour of this account for special situations"
+msgstr "Mudar o comportamento dessa conta em situações especiais"
+
+#: ../../mod/settings.php:1133
+msgid ""
+"Please enable expert mode (in <a href=\"settings/features\">Settings > "
+"Additional features</a>) to adjust!"
+msgstr "Por favor, habilite o modo expert (em <a href=\"settings/features\">Configurações > Recursos adicionais</a>) para ajustar!"
+
+#: ../../mod/settings.php:1134
+msgid "Miscellaneous Settings"
+msgstr "Configurações miscelâneas"
+
+#: ../../mod/settings.php:1136
+msgid "Personal menu to display in your channel pages"
+msgstr "Menu pessoal para exibir nas páginas dos seus canais"
+
+#: ../../mod/settings.php:1137 ../../mod/removeme.php:61
+msgid "Remove Channel"
+msgstr "Remover canal"
+
+#: ../../mod/settings.php:1138
+msgid "Remove this channel."
+msgstr "Remover este canal"
#: ../../mod/id.php:11
msgid "First Name"
@@ -7894,118 +8169,6 @@ msgstr "Excluir conversa"
msgid "D, d M Y - g:i A"
msgstr "D, d M Y - g:i A"
-#: ../../mod/mitem.php:51
-msgid "Unable to create element."
-msgstr "Não foi possível criar elemento."
-
-#: ../../mod/mitem.php:74
-msgid "Unable to update menu element."
-msgstr "Não foi possível atualizar o elemento de menu."
-
-#: ../../mod/mitem.php:89
-msgid "Unable to add menu element."
-msgstr "Não foi possível adicionar o elemento de menu."
-
-#: ../../mod/mitem.php:158 ../../mod/mitem.php:228
-msgid "Menu Item Permissions"
-msgstr "Permissões do item do menu"
-
-#: ../../mod/mitem.php:161 ../../mod/mitem.php:176
-msgid "Link Name"
-msgstr "Nome do Link"
-
-#: ../../mod/mitem.php:162 ../../mod/mitem.php:233
-msgid "Link or Submenu Target"
-msgstr "Alvo do Link ou Submenu"
-
-#: ../../mod/mitem.php:162
-msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr "Insira o URL do link ou selecione um nome de menu para criar um submenu"
-
-#: ../../mod/mitem.php:163 ../../mod/mitem.php:234
-msgid "Use magic-auth if available"
-msgstr "Usar magic-auth se disponível"
-
-#: ../../mod/mitem.php:164 ../../mod/mitem.php:235
-msgid "Open link in new window"
-msgstr "Abrir link em uma nova janela"
-
-#: ../../mod/mitem.php:165 ../../mod/mitem.php:236
-msgid "Order in list"
-msgstr "Ordem na lista"
-
-#: ../../mod/mitem.php:165 ../../mod/mitem.php:236
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Números mais altos descem para o fim da lista"
-
-#: ../../mod/mitem.php:166
-msgid "Submit and finish"
-msgstr "Enviar e terminar"
-
-#: ../../mod/mitem.php:167
-msgid "Submit and continue"
-msgstr "Enviar e continuar"
-
-#: ../../mod/mitem.php:174
-msgid "Menu:"
-msgstr "Menu:"
-
-#: ../../mod/mitem.php:177
-msgid "Link Target"
-msgstr "Alvo do Link"
-
-#: ../../mod/mitem.php:180
-msgid "Edit menu"
-msgstr "Editar menu"
-
-#: ../../mod/mitem.php:183
-msgid "Edit element"
-msgstr "Editar elemento"
-
-#: ../../mod/mitem.php:184
-msgid "Drop element"
-msgstr "Descartar elemento"
-
-#: ../../mod/mitem.php:185
-msgid "New element"
-msgstr "Novo elemento"
-
-#: ../../mod/mitem.php:186
-msgid "Edit this menu container"
-msgstr "Editar esta caixa de menu"
-
-#: ../../mod/mitem.php:187
-msgid "Add menu element"
-msgstr "Adicionar um elemento de menu"
-
-#: ../../mod/mitem.php:188
-msgid "Delete this menu item"
-msgstr "Deleter este item de menu"
-
-#: ../../mod/mitem.php:189
-msgid "Edit this menu item"
-msgstr "Editar este item de menu"
-
-#: ../../mod/mitem.php:206
-msgid "Menu item not found."
-msgstr "O item de menu não foi encontrado."
-
-#: ../../mod/mitem.php:217
-msgid "Menu item deleted."
-msgstr "O item de menu foi deletado."
-
-#: ../../mod/mitem.php:219
-msgid "Menu item could not be deleted."
-msgstr "Não foi possível deletar o item de menu."
-
-#: ../../mod/mitem.php:226
-msgid "Edit Menu Element"
-msgstr "Editar elemento de menu"
-
-#: ../../mod/mitem.php:232
-msgid "Link text"
-msgstr "Texto do link"
-
#: ../../mod/mood.php:131
msgid "Set your current mood and tell your friends"
msgstr "Marque seu humor atual e compartilhe com seus amigos"
@@ -8016,7 +8179,7 @@ msgstr "Votos totais"
#: ../../mod/vote.php:98
msgid "Average Rating"
-msgstr "Avaliação média"
+msgstr "Média das avaliações"
#: ../../mod/removeme.php:29
msgid ""
@@ -8042,315 +8205,263 @@ msgid ""
"removed from the network"
msgstr "Por padrão, apenas a instância do canal localizada neste hub será removida da rede"
-#: ../../mod/connedit.php:262
+#: ../../mod/connedit.php:267
msgid "is now connected to"
msgstr "está agora conectado a"
-#: ../../mod/connedit.php:375
+#: ../../mod/connedit.php:380
msgid "Could not access address book record."
msgstr "Não foi possível acessar o registro do contato."
-#: ../../mod/connedit.php:389
+#: ../../mod/connedit.php:394
msgid "Refresh failed - channel is currently unavailable."
msgstr "A atualização falhou - o canal está indisponível no momento."
-#: ../../mod/connedit.php:396
+#: ../../mod/connedit.php:401
msgid "Channel has been unblocked"
msgstr "O canal foi desbloqueado"
-#: ../../mod/connedit.php:397
+#: ../../mod/connedit.php:402
msgid "Channel has been blocked"
msgstr "O canal foi bloqueado"
-#: ../../mod/connedit.php:401 ../../mod/connedit.php:413
-#: ../../mod/connedit.php:425 ../../mod/connedit.php:437
-#: ../../mod/connedit.php:453
+#: ../../mod/connedit.php:406 ../../mod/connedit.php:418
+#: ../../mod/connedit.php:430 ../../mod/connedit.php:442
+#: ../../mod/connedit.php:458
msgid "Unable to set address book parameters."
msgstr "Não foi possível definir os parâmetros do contato."
-#: ../../mod/connedit.php:408
+#: ../../mod/connedit.php:413
msgid "Channel has been unignored"
msgstr "O canal não está mais ignorado"
-#: ../../mod/connedit.php:409
+#: ../../mod/connedit.php:414
msgid "Channel has been ignored"
msgstr "O canal passou a estar ignorado"
-#: ../../mod/connedit.php:420
+#: ../../mod/connedit.php:425
msgid "Channel has been unarchived"
msgstr "O canal deixou o arquivo"
-#: ../../mod/connedit.php:421
+#: ../../mod/connedit.php:426
msgid "Channel has been archived"
msgstr "O canal foi colocado no arquivo"
-#: ../../mod/connedit.php:432
+#: ../../mod/connedit.php:437
msgid "Channel has been unhidden"
msgstr "O canal não está mais oculto"
-#: ../../mod/connedit.php:433
+#: ../../mod/connedit.php:438
msgid "Channel has been hidden"
msgstr "O canal passou a estar oculto"
-#: ../../mod/connedit.php:448
+#: ../../mod/connedit.php:453
msgid "Channel has been approved"
msgstr "O canal foi aprovado"
-#: ../../mod/connedit.php:449
+#: ../../mod/connedit.php:454
msgid "Channel has been unapproved"
msgstr "O canal deixou de estar aprovado"
-#: ../../mod/connedit.php:477
+#: ../../mod/connedit.php:482
msgid "Connection has been removed."
msgstr "A conexão foi removida."
-#: ../../mod/connedit.php:497
+#: ../../mod/connedit.php:501
#, php-format
msgid "View %s's profile"
msgstr "Ver o perfil de %s"
-#: ../../mod/connedit.php:501
+#: ../../mod/connedit.php:505
msgid "Refresh Permissions"
msgstr "Atualizar permissões"
-#: ../../mod/connedit.php:504
+#: ../../mod/connedit.php:508
msgid "Fetch updated permissions"
msgstr "Buscar as permissões atualizadas"
-#: ../../mod/connedit.php:508
+#: ../../mod/connedit.php:512
msgid "Recent Activity"
msgstr "Atividades recentes"
-#: ../../mod/connedit.php:511
+#: ../../mod/connedit.php:515
msgid "View recent posts and comments"
msgstr "Exibir publicações e comentários recentes"
-#: ../../mod/connedit.php:520
+#: ../../mod/connedit.php:522
msgid "Block (or Unblock) all communications with this connection"
msgstr "Bloquear (desbloquear) todas as comunicações com essa conexão"
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
+#: ../../mod/connedit.php:526
msgid "Unignore"
msgstr "Não ignorar"
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
-#: ../../mod/notifications.php:51
+#: ../../mod/connedit.php:526 ../../mod/notifications.php:51
msgid "Ignore"
msgstr "Ignorar"
-#: ../../mod/connedit.php:527
+#: ../../mod/connedit.php:529
msgid "Ignore (or Unignore) all inbound communications from this connection"
msgstr "Ignorar (desfazer) todas as entradas de comunicação desta conexão"
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:533
msgid "Unarchive"
msgstr "Não arquivar"
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:533
msgid "Archive"
msgstr "Arquivar"
-#: ../../mod/connedit.php:533
+#: ../../mod/connedit.php:536
msgid ""
"Archive (or Unarchive) this connection - mark channel dead but keep content"
msgstr "Arquivar (desarquivar) essa conexão - marcar o canal como morto mas manter o conteúdo"
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:540
msgid "Unhide"
msgstr "Não ocultar"
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:540
msgid "Hide"
msgstr "Ocultar"
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:543
msgid "Hide or Unhide this connection from your other connections"
msgstr "Esconder (mostrar) essa conexão de suas outras conexões"
-#: ../../mod/connedit.php:546
+#: ../../mod/connedit.php:550
msgid "Delete this connection"
msgstr "Deletar esta conexão"
-#: ../../mod/connedit.php:637 ../../mod/connedit.php:675
+#: ../../mod/connedit.php:631
msgid "Approve this connection"
msgstr "Aprovar esta conexão"
-#: ../../mod/connedit.php:637
+#: ../../mod/connedit.php:631
msgid "Accept connection to allow communication"
msgstr "Aceite a conexão para permitir comunicação"
-#: ../../mod/connedit.php:653
-#, php-format
-msgid "Connections: settings for %s"
-msgstr "Conexões: configurações para %s"
+#: ../../mod/connedit.php:636
+msgid "Set Affinity"
+msgstr "Definir afinidade"
-#: ../../mod/connedit.php:654
+#: ../../mod/connedit.php:639
+msgid "Set Profile"
+msgstr "Definir perfil"
+
+#: ../../mod/connedit.php:642
+msgid "Set Affinity & Profile"
+msgstr "Definir afinidade & perfil"
+
+#: ../../mod/connedit.php:659
msgid "Apply these permissions automatically"
msgstr "Aplicar essas permissões automaticamente"
-#: ../../mod/connedit.php:658
-msgid "Apply the permissions indicated on this page to all new connections."
-msgstr "Aplicar as permissões indicadas nesta página para todas as novas conexões."
+#: ../../mod/connedit.php:661
+msgid "This connection's address is"
+msgstr "O endereço dessa conexão é"
-#: ../../mod/connedit.php:662
+#: ../../mod/connedit.php:664
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
+msgstr "As permissões indicadas nesta página serão aplicadas a todas as novas conexões."
+
+#: ../../mod/connedit.php:666
msgid "Slide to adjust your degree of friendship"
msgstr "Deslize para ajustar seu grau de amizade"
+#: ../../mod/connedit.php:668
+msgid "Slide to adjust your rating"
+msgstr "Deslize para ajustar sua avaliação"
+
+#: ../../mod/connedit.php:669 ../../mod/connedit.php:674
+msgid "Optionally explain your rating"
+msgstr "Opcionalmente explique sua avaliação"
+
#: ../../mod/connedit.php:671
-msgid ""
-"Default permissions for your channel type have (just) been applied. They "
-"have not yet been submitted. Please review the permissions on this page and "
-"make any desired changes at this time. This new connection may <em>not</em> "
-"be able to communicate with you until you submit this page, which will "
-"install and apply the selected permissions."
-msgstr "Permissões padrões para seu tipo de canal foram (apenas) aplicadas. Elas ainda não foram enviadas. Por favor, revise as permissões nesta página e faça as alterações desejadas neste momento. Esta nova ligação poderá <em> não </ em> ser capaz de se comunicar com você até que você envie os dados desta página, que instalará e aplicará as permissões selecionadas."
-
-#: ../../mod/connedit.php:674
-msgid "inherited"
-msgstr "herdado"
+msgid "Custom Filter"
+msgstr "Filtro personalizado"
-#: ../../mod/connedit.php:677
-msgid "Connection has no individual permissions!"
-msgstr "A conexão não tem permissões individuais!"
+#: ../../mod/connedit.php:672
+msgid "Only import posts with this text"
+msgstr "Importar apenas publicações com este texto"
-#: ../../mod/connedit.php:678
+#: ../../mod/connedit.php:672 ../../mod/connedit.php:673
msgid ""
-"This may be appropriate based on your <a href=\"settings\">privacy "
-"settings</a>, though you may wish to review the \"Advanced Permissions\"."
-msgstr "Isso pode ser adequado baseado nas suas <a href=\"settings\">configurações de privacidade</a>, mas talvez você queira rever suas \"Permissões Avançadas\"."
+"words one per line or #tags or /patterns/, leave blank to import all posts"
+msgstr "palavras uma por linha ou #tags ou /padrões/, deixe branco para importar todas as publicações"
+
+#: ../../mod/connedit.php:673
+msgid "Do not import posts with this text"
+msgstr "Não importar posts com este texto"
+
+#: ../../mod/connedit.php:675
+msgid "This information is public!"
+msgstr "Esta informação é pública!"
#: ../../mod/connedit.php:680
-msgid "Profile Visibility"
-msgstr "Visibilidade do perfil"
+msgid "Connection Pending Approval"
+msgstr "Conexão pendente de aprovação"
#: ../../mod/connedit.php:681
+msgid "Connection Request"
+msgstr "Solicitação de conexão"
+
+#: ../../mod/connedit.php:682
+#, php-format
+msgid ""
+"(%s) would like to connect with you. Please approve this connection to allow"
+" communication."
+msgstr "(%s) gostaria de conectar-se contigo. Por favor aprove esta conexão para permitir comunicação."
+
+#: ../../mod/connedit.php:684
+msgid "Approve Later"
+msgstr "Aprovar depois"
+
+#: ../../mod/connedit.php:687
+msgid "inherited"
+msgstr "herdado"
+
+#: ../../mod/connedit.php:689
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr "Por favor, selecione o perfil que você gostaria de exibir para %s quando estiver visualizando seu perfil de modo seguro."
-#: ../../mod/connedit.php:682
-msgid "Contact Information / Notes"
-msgstr "Informações de contato / Notas"
-
-#: ../../mod/connedit.php:683
-msgid "Edit contact notes"
-msgstr "Editar anotações sobre o contato"
-
-#: ../../mod/connedit.php:685
+#: ../../mod/connedit.php:691
msgid "Their Settings"
msgstr "Configurações dele/a"
-#: ../../mod/connedit.php:686
+#: ../../mod/connedit.php:692
msgid "My Settings"
msgstr "Minhas configurações"
-#: ../../mod/connedit.php:688
-msgid ""
-"Default permissions for this channel type have (just) been applied. They "
-"have <em>not</em> been saved and there are currently no stored default "
-"permissions. Please review/edit the applied settings and click [Submit] to "
-"finalize."
-msgstr "Permissões padrões para este tipo de canal foram (apenas) aplicadas. Elas <em> não </ em> foram salvas e não existem no momento permissões padrões armazenadas. Por favor, reveja / edite as configurações aplicadas e clique em [Enviar] para finalizar."
-
-#: ../../mod/connedit.php:689
-msgid "Clear/Disable Automatic Permissions"
-msgstr "Limpa/Desabilita permissões automáticas"
-
-#: ../../mod/connedit.php:690
-msgid "Forum Members"
-msgstr "Membros de fórum"
-
-#: ../../mod/connedit.php:691
-msgid "Soapbox"
-msgstr "Caixa de sabão"
-
-#: ../../mod/connedit.php:692
-msgid "Full Sharing (typical social network permissions)"
-msgstr "Compartilhamento completo (permissões típicas de redes sociais)"
-
-#: ../../mod/connedit.php:693
-msgid "Cautious Sharing "
-msgstr "Compartilhamento cauteloso"
-
#: ../../mod/connedit.php:694
-msgid "Follow Only"
-msgstr "Apenas seguir"
-
-#: ../../mod/connedit.php:695
msgid "Individual Permissions"
msgstr "Permissões individuais"
+#: ../../mod/connedit.php:695
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can <strong>not</strong> change those"
+" settings here."
+msgstr "Algumas permissões podem ser herdadas das <a href=\"settings\"><strong>configurações de privacidade</strong></a> do seu canal, que tem prioridade sobre configurações individuais. Você <strong>não</strong> pode mudar tais configurações aqui."
+
#: ../../mod/connedit.php:696
msgid ""
-"Some permissions may be inherited from your channel <a "
-"href=\"settings\">privacy settings</a>, which have higher priority than "
-"individual settings. Changing those inherited settings on this page will "
-"have no effect."
-msgstr "Algumas permissões serão herdadas das <a href=\"settings\">configurações de privacidade</a> do seu canal, e terão prioridade sobre as configurações individuais. Modificar nesta página tais configurações herdadas não surtirá efeito algum."
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can change those settings here but "
+"they wont have any impact unless the inherited setting changes."
+msgstr "Algumas permissões serão herdadas das <a href=\"settings\"><strong>configurações de privacidade<strong></a> do seu canal, que tem prioridade sobre configurações individuais. Você pode modificar tais configurações individuais nesta página mas elas não surtirão efeito sem mudar a configuração do canal sendo herdada."
#: ../../mod/connedit.php:697
-msgid "Advanced Permissions"
-msgstr "Permissões avançadas"
-
-#: ../../mod/connedit.php:698
-msgid "Simple Permissions (select one and submit)"
-msgstr "Permissões simples (slecione uma e submeta)"
-
-#: ../../mod/connedit.php:702
-#, php-format
-msgid "Visit %s's profile - %s"
-msgstr "Ver o perfil de %s - %s"
-
-#: ../../mod/connedit.php:703
-msgid "Block/Unblock contact"
-msgstr "Bloquear/desbloquear o contato"
-
-#: ../../mod/connedit.php:704
-msgid "Ignore contact"
-msgstr "Ignorar o contato"
-
-#: ../../mod/connedit.php:705
-msgid "Repair URL settings"
-msgstr "Reparar configurações de URL"
-
-#: ../../mod/connedit.php:706
-msgid "View conversations"
-msgstr "Ver as conversas"
-
-#: ../../mod/connedit.php:708
-msgid "Delete contact"
-msgstr "Excluir o contato"
-
-#: ../../mod/connedit.php:712
msgid "Last update:"
msgstr "Última atualização:"
-#: ../../mod/connedit.php:714
-msgid "Update public posts"
-msgstr "Atualizar publicações públicas"
-
-#: ../../mod/connedit.php:716
-msgid "Update now"
-msgstr "Atualizar agora"
-
-#: ../../mod/connedit.php:722
-msgid "Currently blocked"
-msgstr "Atualmente bloqueado"
-
-#: ../../mod/connedit.php:723
-msgid "Currently ignored"
-msgstr "Atualmente ignorado"
-
-#: ../../mod/connedit.php:724
-msgid "Currently archived"
-msgstr "Atualmente arquivado"
-
-#: ../../mod/connedit.php:725
-msgid "Currently pending"
-msgstr "Atualmente pendente"
-
#: ../../mod/rmagic.php:40
msgid ""
"We encountered a problem while logging in with the OpenID you provided. "
@@ -8569,37 +8680,26 @@ msgstr "adicionou seu canal"
msgid "posted an event"
msgstr "publicou um evento"
-#: ../../mod/network.php:91
-msgid "No such group"
-msgstr "Este grupo não existe"
-
-#: ../../mod/network.php:129
-msgid "No such channel"
-msgstr "Nenhum canal"
-
-#: ../../mod/network.php:143
-msgid "Search Results For:"
-msgstr "Resultados da busca por:"
-
-#: ../../mod/network.php:198
-msgid "Collection is empty"
-msgstr "A coleção está vazia"
+#: ../../mod/layouts.php:176
+msgid "Comanche page description language help"
+msgstr "Página de Ajuda da descrição da Linguagem Comanche "
-#: ../../mod/network.php:207
-msgid "Collection: "
-msgstr "Coleção:"
+#: ../../mod/layouts.php:180
+msgid "Layout Description"
+msgstr "Descrição de Layout"
-#: ../../mod/network.php:226
-msgid "Connection: "
-msgstr "Conexão:"
+#: ../../mod/layouts.php:185
+msgid "Download PDL file"
+msgstr "Baixar arquivo PDL"
-#: ../../mod/network.php:233
-msgid "Invalid connection."
-msgstr "Conexão inválida."
+#: ../../mod/home.php:73
+#, php-format
+msgid "Welcome to %s"
+msgstr "Bem-vindo(a) a %s"
-#: ../../mod/page.php:122
-msgid "Ipsum Lorem"
-msgstr "Ipsum Lorem"
+#: ../../mod/page.php:126
+msgid "Lorem Ipsum"
+msgstr "Lorem ipsum"
#: ../../mod/bookmarks.php:38
msgid "Bookmark added"
@@ -8617,6 +8717,21 @@ msgstr "Links guardados das minhas conexões"
msgid "Insufficient permissions. Request redirected to profile page."
msgstr "Permissões insuficientes. Requisição redirecionada para a página de perfil."
+#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Essa configuração requer processamento especial e a edição foi bloqueada."
+
+#: ../../mod/pconfig.php:49
+msgid "Configuration Editor"
+msgstr "Editor de configurações"
+
+#: ../../mod/pconfig.php:50
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please"
+" leave this page unless you are comfortable with and knowledgeable about how"
+" to correctly use this feature."
+msgstr "Atenção: Mudar algumas configurações pode deixar seu canal inoperável. Por favor deixe essa página a não ser que esteja confortável e tenha o conhecimento para utilizar este recurso."
+
#: ../../mod/suggest.php:35
msgid ""
"No suggestions available. If this is a new site, please try again in 24 "
@@ -8665,7 +8780,7 @@ msgid "Monospace"
msgstr "Monospace"
#: ../../view/theme/apw/php/config.php:259
-#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/redbasic/php/config.php:102
msgid "Theme settings"
msgstr "Configurações de tema"
@@ -8674,7 +8789,7 @@ msgid "Set scheme"
msgstr "Definir esquema"
#: ../../view/theme/apw/php/config.php:261
-#: ../../view/theme/redbasic/php/config.php:122
+#: ../../view/theme/redbasic/php/config.php:124
msgid "Set font-size for posts and comments"
msgstr "Definir o tamanho da fonte para publicações e comentários"
@@ -8798,175 +8913,175 @@ msgstr "Deslocamento direito do aparte"
msgid "Light (Red Matrix default)"
msgstr "Leve (padrão da Red Matrix)"
-#: ../../view/theme/redbasic/php/config.php:101
+#: ../../view/theme/redbasic/php/config.php:103
msgid "Select scheme"
msgstr "Selecione esquema"
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:104
msgid "Narrow navbar"
msgstr "Barra de navegação estreita"
-#: ../../view/theme/redbasic/php/config.php:103
+#: ../../view/theme/redbasic/php/config.php:105
msgid "Navigation bar background color"
msgstr "Cor de fundo da barra de navegação"
-#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:106
msgid "Navigation bar gradient top color"
msgstr "Cor no topo de gradiente da barra de navegação"
-#: ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:107
msgid "Navigation bar gradient bottom color"
msgstr "Cor na base de gradiente da barra de navegação"
-#: ../../view/theme/redbasic/php/config.php:106
+#: ../../view/theme/redbasic/php/config.php:108
msgid "Navigation active button gradient top color"
msgstr "Cor no topo de gradiente de botão ativo de navegação"
-#: ../../view/theme/redbasic/php/config.php:107
+#: ../../view/theme/redbasic/php/config.php:109
msgid "Navigation active button gradient bottom color"
msgstr "Cor na base de gradiente de botão ativo de navegação"
-#: ../../view/theme/redbasic/php/config.php:108
+#: ../../view/theme/redbasic/php/config.php:110
msgid "Navigation bar border color "
msgstr "Cor de borda da barra de navegação"
-#: ../../view/theme/redbasic/php/config.php:109
+#: ../../view/theme/redbasic/php/config.php:111
msgid "Navigation bar icon color "
msgstr "Cor de ícone da barra de navegação"
-#: ../../view/theme/redbasic/php/config.php:110
+#: ../../view/theme/redbasic/php/config.php:112
msgid "Navigation bar active icon color "
msgstr "Cor de ícone ativo da barra de navegação"
-#: ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:113
msgid "link color"
msgstr "cor dos links"
-#: ../../view/theme/redbasic/php/config.php:112
+#: ../../view/theme/redbasic/php/config.php:114
msgid "Set font-color for banner"
msgstr "Definir a cor da fonte para o cartaz"
-#: ../../view/theme/redbasic/php/config.php:113
+#: ../../view/theme/redbasic/php/config.php:115
msgid "Set the background color"
msgstr "Definir a cor do pano de fundo"
-#: ../../view/theme/redbasic/php/config.php:114
+#: ../../view/theme/redbasic/php/config.php:116
msgid "Set the background image"
msgstr "Definir a imagem do pano de fundo"
-#: ../../view/theme/redbasic/php/config.php:115
+#: ../../view/theme/redbasic/php/config.php:117
msgid "Set the background color of items"
msgstr "Definir a cor de fundo dos items"
-#: ../../view/theme/redbasic/php/config.php:116
+#: ../../view/theme/redbasic/php/config.php:118
msgid "Set the background color of comments"
msgstr "Definir a cor de fundo dos comentários"
-#: ../../view/theme/redbasic/php/config.php:117
+#: ../../view/theme/redbasic/php/config.php:119
msgid "Set the border color of comments"
msgstr "Definir a cor da borda dos comentários"
-#: ../../view/theme/redbasic/php/config.php:118
+#: ../../view/theme/redbasic/php/config.php:120
msgid "Set the indent for comments"
msgstr "Definir a indentação de comentários"
-#: ../../view/theme/redbasic/php/config.php:119
+#: ../../view/theme/redbasic/php/config.php:121
msgid "Set the basic color for item icons"
msgstr "Definir a cor básica para ícones de itens"
-#: ../../view/theme/redbasic/php/config.php:120
+#: ../../view/theme/redbasic/php/config.php:122
msgid "Set the hover color for item icons"
msgstr "Definir a cor para ícones de itens quando que o mouse está sobre eles"
-#: ../../view/theme/redbasic/php/config.php:121
+#: ../../view/theme/redbasic/php/config.php:123
msgid "Set font-size for the entire application"
msgstr "Definir o tamanho da fonte para a aplicação como um todo"
-#: ../../view/theme/redbasic/php/config.php:121
+#: ../../view/theme/redbasic/php/config.php:123
msgid "Example: 14px"
msgstr "Exemplo: 14px"
-#: ../../view/theme/redbasic/php/config.php:123
+#: ../../view/theme/redbasic/php/config.php:125
msgid "Set font-color for posts and comments"
msgstr "Definir a cor da fonte para publicações e comentários"
-#: ../../view/theme/redbasic/php/config.php:124
+#: ../../view/theme/redbasic/php/config.php:126
msgid "Set radius of corners"
msgstr "Definir o raio de curvatura dos cantos"
-#: ../../view/theme/redbasic/php/config.php:125
+#: ../../view/theme/redbasic/php/config.php:127
msgid "Set shadow depth of photos"
msgstr "Definir a profundidade de sombra das fotos"
-#: ../../view/theme/redbasic/php/config.php:126
+#: ../../view/theme/redbasic/php/config.php:128
msgid "Set maximum width of content region in pixel"
msgstr "Escolha a largura máxima da região de conteúdo em pixel"
-#: ../../view/theme/redbasic/php/config.php:126
+#: ../../view/theme/redbasic/php/config.php:128
msgid "Leave empty for default width"
msgstr "Deixe vazio para a largura padrão"
-#: ../../view/theme/redbasic/php/config.php:127
+#: ../../view/theme/redbasic/php/config.php:129
msgid "Center page content"
msgstr "Conteúdo centralizado na página"
-#: ../../view/theme/redbasic/php/config.php:128
+#: ../../view/theme/redbasic/php/config.php:130
msgid "Set minimum opacity of nav bar - to hide it"
msgstr "Definir opacidade mínima para a barra de navegação - para escondê-la"
-#: ../../view/theme/redbasic/php/config.php:129
+#: ../../view/theme/redbasic/php/config.php:131
msgid "Set size of conversation author photo"
msgstr "Definir o tamanho da foto do autor da conversa"
-#: ../../view/theme/redbasic/php/config.php:130
+#: ../../view/theme/redbasic/php/config.php:132
msgid "Set size of followup author photos"
msgstr "Definir o tamanho da foto dos autores de comentários"
-#: ../../boot.php:1355
+#: ../../boot.php:1356
#, php-format
msgid "Update %s failed. See error logs."
msgstr "A atualização %s falhou. Veja os logs de erro."
-#: ../../boot.php:1358
+#: ../../boot.php:1359
#, php-format
msgid "Update Error at %s"
msgstr "Erro de atualização em %s"
-#: ../../boot.php:1525
+#: ../../boot.php:1526
msgid ""
"Create an account to access services and applications within the Red Matrix"
msgstr "Crie uma conta para acessar serviços e aplicações na Red Matrix"
-#: ../../boot.php:1553
+#: ../../boot.php:1554
msgid "Password"
msgstr "Senha"
-#: ../../boot.php:1554
+#: ../../boot.php:1555
msgid "Remember me"
msgstr "Lembrar de mim"
-#: ../../boot.php:1557
+#: ../../boot.php:1558
msgid "Forgot your password?"
msgstr "Esqueceu a sua senha?"
-#: ../../boot.php:2178
+#: ../../boot.php:2179
msgid "toggle mobile"
msgstr "alternar para interface móvel"
-#: ../../boot.php:2313
+#: ../../boot.php:2314
msgid "Website SSL certificate is not valid. Please correct."
msgstr "Certificado SSL do Website não é válido. Por favor corrija-o."
-#: ../../boot.php:2316
+#: ../../boot.php:2317
#, php-format
msgid "[red] Website SSL error for %s"
msgstr "[red] erro SSL da página para %s"
-#: ../../boot.php:2353
+#: ../../boot.php:2354
msgid "Cron/Scheduled tasks not running."
msgstr "Agendamento de tarefas não está rodando."
-#: ../../boot.php:2357
+#: ../../boot.php:2358
#, php-format
msgid "[red] Cron tasks not running on %s"
msgstr "[red] Agendador de tarefas não está rodando em %s"
diff --git a/view/pt-br/strings.php b/view/pt-br/strings.php
index ace6e1679..c51803fc7 100644
--- a/view/pt-br/strings.php
+++ b/view/pt-br/strings.php
@@ -7,108 +7,36 @@ function string_plural_select_pt_br($n){
;
$a->strings["Cannot locate DNS info for database server '%s'"] = "Não foi possível localizar a informação de DNS para o servidor de banco de dados '%s'";
$a->strings["Profile Photos"] = "Fotos do perfil";
-$a->strings["prev"] = "anterior";
-$a->strings["first"] = "primeiro";
-$a->strings["last"] = "último";
-$a->strings["next"] = "próximo";
-$a->strings["older"] = "mais antigo";
-$a->strings["newer"] = "mais recente";
-$a->strings["No connections"] = "Nenhuma conexão";
-$a->strings["%d Connection"] = array(
- 0 => "%d conexão",
- 1 => "%d conexões",
-);
-$a->strings["View Connections"] = "Ver conexões";
-$a->strings["Search"] = "Pesquisar";
-$a->strings["Save"] = "Salvar";
-$a->strings["poke"] = "cutucar";
-$a->strings["poked"] = "cutucado";
-$a->strings["ping"] = "pingar";
-$a->strings["pinged"] = "pingou";
-$a->strings["prod"] = "espetar";
-$a->strings["prodded"] = "espetou";
-$a->strings["slap"] = "estapear";
-$a->strings["slapped"] = "estapeou";
-$a->strings["finger"] = "dar um toque";
-$a->strings["fingered"] = "deu um toque";
-$a->strings["rebuff"] = "rebater";
-$a->strings["rebuffed"] = "rebateu";
-$a->strings["happy"] = "feliz";
-$a->strings["sad"] = "triste";
-$a->strings["mellow"] = "suave";
-$a->strings["tired"] = "cansad@";
-$a->strings["perky"] = "animad@";
-$a->strings["angry"] = "nervos@";
-$a->strings["stupified"] = "embasbacad@";
-$a->strings["puzzled"] = "confus@";
-$a->strings["interested"] = "interessad@";
-$a->strings["bitter"] = "amarg@";
-$a->strings["cheerful"] = "animad@";
-$a->strings["alive"] = "viv@";
-$a->strings["annoyed"] = "aborrecid@";
-$a->strings["anxious"] = "ansios@";
-$a->strings["cranky"] = "irritad@";
-$a->strings["disturbed"] = "perturbad@";
-$a->strings["frustrated"] = "frustrad@";
-$a->strings["depressed"] = "deprimido";
-$a->strings["motivated"] = "motivad@";
-$a->strings["relaxed"] = "relaxad@";
-$a->strings["surprised"] = "surpres@";
-$a->strings["Monday"] = "Segunda";
-$a->strings["Tuesday"] = "Terça";
-$a->strings["Wednesday"] = "Quarta";
-$a->strings["Thursday"] = "Quinta";
-$a->strings["Friday"] = "Sexta";
-$a->strings["Saturday"] = "SaÌbado";
-$a->strings["Sunday"] = "Domingo";
-$a->strings["January"] = "Janeiro";
-$a->strings["February"] = "Fevereiro";
-$a->strings["March"] = "Março";
-$a->strings["April"] = "Abril";
-$a->strings["May"] = "Maio";
-$a->strings["June"] = "Junho";
-$a->strings["July"] = "Julho";
-$a->strings["August"] = "Agosto";
-$a->strings["September"] = "Setembro";
-$a->strings["October"] = "Outubro";
-$a->strings["November"] = "Novembro";
-$a->strings["December"] = "Dezembro";
-$a->strings["unknown.???"] = "desconhecido.???";
-$a->strings["bytes"] = "bytes";
-$a->strings["remove category"] = "remover categoria";
-$a->strings["remove from file"] = "remover do arquivo";
-$a->strings["Click to open/close"] = "Clique para abrir/fechar";
-$a->strings["Link to Source"] = "Link para a origem";
-$a->strings["default"] = "default";
-$a->strings["Page layout"] = "aparência da página";
-$a->strings["You can create your own with the layouts tool"] = "Você pode criar sua própria com as ferramentas de layouts";
-$a->strings["Page content type"] = "Tipo de conteúdo da página";
-$a->strings["Select an alternate language"] = "Selecione um idioma alternativo";
+$a->strings["Edit"] = "Editar";
$a->strings["photo"] = "foto";
-$a->strings["event"] = "evento";
$a->strings["status"] = "status";
-$a->strings["comment"] = "comentário";
-$a->strings["activity"] = "atividade";
-$a->strings["Design Tools"] = "Ferramentas de Design";
-$a->strings["Blocks"] = "Blocos";
-$a->strings["Menus"] = "Menus";
-$a->strings["Layouts"] = "Layouts";
-$a->strings["Pages"] = "Páginas";
-$a->strings["Collection"] = "Coleção";
-$a->strings["Image/photo"] = "Imagem/foto";
-$a->strings["Encrypted content"] = "Conteúdo criptografado";
-$a->strings["Install %s element: "] = "Instalar elemento %s:";
-$a->strings["webpage"] = "página web";
-$a->strings["layout"] = "layout";
-$a->strings["block"] = "bloco";
-$a->strings["QR code"] = "código QR";
-$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escreveu a seguinte %2\$s %3\$s";
-$a->strings["post"] = "publicação";
-$a->strings["Different viewers will see this text differently"] = "Visualizadores diferentes verão esse texto diferentemente";
-$a->strings["$1 spoiler"] = "$1 spoiler";
-$a->strings["$1 wrote:"] = "$1 escreveu:";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s gosta de %3\$s de %2\$s";
+$a->strings["Please choose"] = "Por favor, escolha";
+$a->strings["Agree"] = "Concordo";
+$a->strings["Disagree"] = "Discordo";
+$a->strings["Abstain"] = "Abstenho";
+$a->strings["\$projectname"] = "\$projectname";
+$a->strings["Frequently"] = "Frequentemente";
+$a->strings["Hourly"] = "De hora em hora";
+$a->strings["Twice daily"] = "Duas vezes ao dia";
+$a->strings["Daily"] = "Diariamente";
+$a->strings["Weekly"] = "Semanalmente";
+$a->strings["Monthly"] = "Mensalmente";
+$a->strings["Friendica"] = "Friendica";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Email"] = "E-mail";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Zot!"] = "Zot!";
+$a->strings["LinkedIn"] = "LinkedIn";
+$a->strings["XMPP/IM"] = "XMPP/MI";
+$a->strings["MySpace"] = "MySpace";
$a->strings["created a new post"] = "criou uma nova publicação";
$a->strings["commented on %s's post"] = "comentou a publicação de %s";
+$a->strings["No username found in import file."] = "Nenhum nome de usuário encontrado no arquivo de importação.";
+$a->strings["Unable to create a unique channel address. Import failed."] = "Não foi possível criar um endereço de canal único. Importação falhou.";
+$a->strings["Import completed."] = "A importação foi completada.";
$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Um grupo com esse nome, anteriormente excluído, foi reativado. Permissões de itens já existentes <strong>poderão</strong> ser aplicadas a esse grupo e qualquer futuros membros. Se não é essa a sua intenção, favor criar outro grupo com um nome diferente.";
$a->strings["Default privacy group for new contacts"] = "Grupo de privacidade padrão para novos contatos";
$a->strings["All Channels"] = "Todos os canais";
@@ -158,8 +86,13 @@ $a->strings["seconds"] = "segundos";
$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s atrás";
$a->strings["%1\$s's birthday"] = "Aniversário de %1\$s ";
$a->strings["Happy Birthday %1\$s"] = "Feliz Aniversário %1\$s";
+$a->strings["Directory Options"] = "Opções do Diretório";
+$a->strings["Safe Mode"] = "Modo tranquilo";
+$a->strings["No"] = "Não";
+$a->strings["Yes"] = "Sim";
+$a->strings["Public Forums Only"] = "Somente Fóruns públicos";
+$a->strings["This Website Only"] = "Somente este Website";
$a->strings["New Page"] = "Nova página";
-$a->strings["Edit"] = "Editar";
$a->strings["View"] = "Ver";
$a->strings["Preview"] = "Pré-visualizar";
$a->strings["Actions"] = "Ações";
@@ -169,15 +102,6 @@ $a->strings["Created"] = "Criado";
$a->strings["Edited"] = "Editado";
$a->strings["Public Timeline"] = "Linha do tempo pública";
$a->strings["Default"] = "Default";
-$a->strings["Directory Options"] = "Opções do Diretório";
-$a->strings["Alphabetic"] = "Alfabética";
-$a->strings["Reverse Alphabetic"] = "Alfabética reversa";
-$a->strings["Newest to Oldest"] = "Das mais recentes para as mais antigas";
-$a->strings["Oldest to Newest"] = "Do mais Antigo para o mais Novo";
-$a->strings["Sort"] = "Ordenar";
-$a->strings["Safe Mode"] = "Modo tranquilo";
-$a->strings["Public Forums Only"] = "Somente Fóruns públicos";
-$a->strings["This Website Only"] = "Somente este Website";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
$a->strings["Starts:"] = "Início:";
$a->strings["Finishes:"] = "Fim:";
@@ -220,6 +144,92 @@ $a->strings["about a year"] = "aproximadamente um ano";
$a->strings["%d years"] = "%d anos";
$a->strings[" "] = " ";
$a->strings["timeago.numbers"] = "timeago.numbers";
+$a->strings["prev"] = "anterior";
+$a->strings["first"] = "primeiro";
+$a->strings["last"] = "último";
+$a->strings["next"] = "próximo";
+$a->strings["older"] = "mais antigo";
+$a->strings["newer"] = "mais recente";
+$a->strings["No connections"] = "Nenhuma conexão";
+$a->strings["%d Connection"] = array(
+ 0 => "%d conexão",
+ 1 => "%d conexões",
+);
+$a->strings["View Connections"] = "Ver conexões";
+$a->strings["Search"] = "Pesquisar";
+$a->strings["Save"] = "Salvar";
+$a->strings["poke"] = "cutucar";
+$a->strings["poked"] = "cutucado";
+$a->strings["ping"] = "pingar";
+$a->strings["pinged"] = "pingou";
+$a->strings["prod"] = "espetar";
+$a->strings["prodded"] = "espetou";
+$a->strings["slap"] = "estapear";
+$a->strings["slapped"] = "estapeou";
+$a->strings["finger"] = "dar um toque";
+$a->strings["fingered"] = "deu um toque";
+$a->strings["rebuff"] = "rebater";
+$a->strings["rebuffed"] = "rebateu";
+$a->strings["happy"] = "feliz";
+$a->strings["sad"] = "triste";
+$a->strings["mellow"] = "suave";
+$a->strings["tired"] = "cansad@";
+$a->strings["perky"] = "animad@";
+$a->strings["angry"] = "nervos@";
+$a->strings["stupified"] = "embasbacad@";
+$a->strings["puzzled"] = "confus@";
+$a->strings["interested"] = "interessad@";
+$a->strings["bitter"] = "amarg@";
+$a->strings["cheerful"] = "animad@";
+$a->strings["alive"] = "viv@";
+$a->strings["annoyed"] = "aborrecid@";
+$a->strings["anxious"] = "ansios@";
+$a->strings["cranky"] = "irritad@";
+$a->strings["disturbed"] = "perturbad@";
+$a->strings["frustrated"] = "frustrad@";
+$a->strings["depressed"] = "deprimido";
+$a->strings["motivated"] = "motivad@";
+$a->strings["relaxed"] = "relaxad@";
+$a->strings["surprised"] = "surpres@";
+$a->strings["Monday"] = "Segunda";
+$a->strings["Tuesday"] = "Terça";
+$a->strings["Wednesday"] = "Quarta";
+$a->strings["Thursday"] = "Quinta";
+$a->strings["Friday"] = "Sexta";
+$a->strings["Saturday"] = "SaÌbado";
+$a->strings["Sunday"] = "Domingo";
+$a->strings["January"] = "Janeiro";
+$a->strings["February"] = "Fevereiro";
+$a->strings["March"] = "Março";
+$a->strings["April"] = "Abril";
+$a->strings["May"] = "Maio";
+$a->strings["June"] = "Junho";
+$a->strings["July"] = "Julho";
+$a->strings["August"] = "Agosto";
+$a->strings["September"] = "Setembro";
+$a->strings["October"] = "Outubro";
+$a->strings["November"] = "Novembro";
+$a->strings["December"] = "Dezembro";
+$a->strings["unknown.???"] = "desconhecido.???";
+$a->strings["bytes"] = "bytes";
+$a->strings["remove category"] = "remover categoria";
+$a->strings["remove from file"] = "remover do arquivo";
+$a->strings["Click to open/close"] = "Clique para abrir/fechar";
+$a->strings["Link to Source"] = "Link para a origem";
+$a->strings["default"] = "default";
+$a->strings["Page layout"] = "aparência da página";
+$a->strings["You can create your own with the layouts tool"] = "Você pode criar sua própria com as ferramentas de layouts";
+$a->strings["Page content type"] = "Tipo de conteúdo da página";
+$a->strings["Select an alternate language"] = "Selecione um idioma alternativo";
+$a->strings["event"] = "evento";
+$a->strings["comment"] = "comentário";
+$a->strings["activity"] = "atividade";
+$a->strings["Design Tools"] = "Ferramentas de Design";
+$a->strings["Blocks"] = "Blocos";
+$a->strings["Menus"] = "Menus";
+$a->strings["Layouts"] = "Layouts";
+$a->strings["Pages"] = "Páginas";
+$a->strings["Collection"] = "Coleção";
$a->strings["parent"] = "nível superior";
$a->strings["Principal"] = "Principal";
$a->strings["Addressbook"] = "Livro de endereços";
@@ -243,6 +253,10 @@ $a->strings["Create new folder"] = "Criar uma nova pasta";
$a->strings["Upload file"] = "Enviar arquivo";
$a->strings["%1\$s's bookmarks"] = "Links guardados de %1\$s";
$a->strings["view full size"] = "ver na tela inteira";
+$a->strings["\$Projectname Notification"] = "\$Projectname Notificação";
+$a->strings["Thank You,"] = "Obrigado(a),";
+$a->strings["%s Administrator"] = "Administrador de %s";
+$a->strings["No Subject"] = "Sem Assunto";
$a->strings["General Features"] = "Recursos gerais";
$a->strings["Content Expiration"] = "Expiração de conteúdo";
$a->strings["Remove posts/comments and/or private messages at a future time"] = "Remover publicações/comentários e/ou mensagens privadas num momento futuro.";
@@ -273,8 +287,8 @@ $a->strings["Channel Sources"] = "Fontes do canal";
$a->strings["Automatically import channel content from other channels or feeds"] = "Importar automaticamente conteúdo de outros canais ou fontes";
$a->strings["Even More Encryption"] = "Mais encriptação ainda";
$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Permitir encriptação opcional de conteúdo, ponta-a-ponta com uma chave secreta compartilhada";
-$a->strings["Enable voting tools"] = "Habilitar ferramenta de votos";
-$a->strings["Provide a class of post which others can vote on"] = "Forneça uma classe de publicação que outros possam votar";
+$a->strings["Enable voting tools"] = "Habilitar ferramentas de enquete";
+$a->strings["Provide a class of post which others can vote on"] = "Forneça uma classe de publicação que permite enquetes";
$a->strings["Network and Stream Filtering"] = "Filtragem de rede e fluxo";
$a->strings["Search by Date"] = "Pesquisar por data";
$a->strings["Ability to select posts by date ranges"] = "capacidade de selecionar publicações por intervalos de datas";
@@ -288,6 +302,8 @@ $a->strings["Network New Tab"] = "Aba de novidades da rede";
$a->strings["Enable tab to display all new Network activity"] = "Habilita uma aba para exibir todas as novas atividades da rede";
$a->strings["Affinity Tool"] = "Ferramenta de afinidade";
$a->strings["Filter stream activity by depth of relationships"] = "Filtra o fluxo de atividades de acordo com o nível do relacionamento";
+$a->strings["Connection Filtering"] = "Filtragem de conexões";
+$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filtrar publicações de conexões baseado em palavras-chave/conteúdo";
$a->strings["Suggest Channels"] = "Sugerir canais";
$a->strings["Show channel suggestions"] = "Exibir sugestões de canais";
$a->strings["Post/Comment Tools"] = "Ferramentas de publicação/comentário";
@@ -347,10 +363,6 @@ $a->strings["photo/image"] = "foto/imagem";
$a->strings["Rate Me"] = "Avalie-me";
$a->strings["View Ratings"] = "Ver avaliações";
$a->strings["Public Hubs"] = "Hubs Públicos";
-$a->strings["\$Projectname Notification"] = "\$Projectname Notificação";
-$a->strings["\$projectname"] = "\$projectname";
-$a->strings["Thank You,"] = "Obrigado(a),";
-$a->strings["%s Administrator"] = "Administrador de %s";
$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
$a->strings["[Red:Notify] New mail received at %s"] = "[Red:Notify] Nova mensagem recebida em %s";
$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s te enviou uma nova mensagem privada em %3\$s.";
@@ -387,22 +399,6 @@ $a->strings["Name:"] = "Nome:";
$a->strings["Photo:"] = "Foto:";
$a->strings["Please visit %s to approve or reject the suggestion."] = "Por favor, visite %s para aprovar ou rejeitar a sugestão.";
$a->strings["[Red:Notify]"] = "[Red:Notify]";
-$a->strings["Frequently"] = "Frequentemente";
-$a->strings["Hourly"] = "De hora em hora";
-$a->strings["Twice daily"] = "Duas vezes ao dia";
-$a->strings["Daily"] = "Diariamente";
-$a->strings["Weekly"] = "Semanalmente";
-$a->strings["Monthly"] = "Mensalmente";
-$a->strings["Friendica"] = "Friendica";
-$a->strings["OStatus"] = "OStatus";
-$a->strings["RSS/Atom"] = "RSS/Atom";
-$a->strings["Email"] = "E-mail";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings["Facebook"] = "Facebook";
-$a->strings["Zot!"] = "Zot!";
-$a->strings["LinkedIn"] = "LinkedIn";
-$a->strings["XMPP/IM"] = "XMPP/MI";
-$a->strings["MySpace"] = "MySpace";
$a->strings["No recipient provided."] = "Falta o destinatário.";
$a->strings["[no subject]"] = "[sem assunto]";
$a->strings["Unable to determine sender."] = "Não foi possível determinar o remetente.";
@@ -412,6 +408,7 @@ $a->strings["Channel location missing."] = "A localização do canal foi perdida
$a->strings["Response from remote channel was incomplete."] = "A resposta do canal remoto está incompleta.";
$a->strings["Channel was deleted and no longer exists."] = "O canal foi deletado e não existe mais.";
$a->strings["Protocol disabled."] = "Protocolo desabilitado.";
+$a->strings["Protocol blocked for this channel."] = "Protocolo bloqueado para este canal.";
$a->strings["Channel discovery failed."] = "A descoberta de canais falhou.";
$a->strings["local account not found."] = "a conta local não foi encontrada.";
$a->strings["Cannot connect to yourself."] = "Não é possível conectar-se consigo mesmo.";
@@ -555,23 +552,6 @@ $a->strings["public profile"] = "perfil público";
$a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s mudou %2\$s para &ldquo;%3\$s&rdquo;";
$a->strings["Visit %1\$s's %2\$s"] = "Visite o %2\$s de %1\$s";
$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s atualizou %2\$s, alterando %3\$s.";
-$a->strings["Permission denied"] = "Permissão negada";
-$a->strings["(Unknown)"] = "(Desconhecido)";
-$a->strings["Visible to anybody on the internet."] = "Visível para todos na internet.";
-$a->strings["Visible to you only."] = "Visível somente para você.";
-$a->strings["Visible to anybody in this network."] = "Visível para todos nesta rede.";
-$a->strings["Visible to anybody authenticated."] = "Visível para todos autenticados.";
-$a->strings["Visible to anybody on %s."] = "Visível para todos em %s.";
-$a->strings["Visible to all connections."] = "Visível para todas as conexões.";
-$a->strings["Visible to approved connections."] = "Visível para conexões aprovadas.";
-$a->strings["Visible to specific connections."] = "Visível para conexões específicas.";
-$a->strings["Item not found."] = "O item não foi encontrado.";
-$a->strings["Permission denied."] = "Permissão negada.";
-$a->strings["Collection not found."] = "A coleção não foi encontrada.";
-$a->strings["Collection is empty."] = "A coleção está vazia.";
-$a->strings["Collection: %s"] = "Coleção: %s";
-$a->strings["Connection: %s"] = "Conexão: %s";
-$a->strings["Connection not found."] = "A conexão não foi encontrada.";
$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "O token de segurança do formulário não estava correto. Isso provavelmente aconteceu porque o formulário ficou aberto por muito tempo (>3 horas) antes da sua submissão.";
$a->strings["Can view my normal stream and posts"] = "Pode ver meus fluxo e publicações normais";
$a->strings["Can view my default channel profile"] = "Pode ver o perfil padrão do meu canal";
@@ -607,7 +587,6 @@ $a->strings["Group Repository"] = "Repositório para grupo";
$a->strings["Other"] = "Outro";
$a->strings["Custom/Expert Mode"] = "Personalizado/Modo expert";
$a->strings["channel"] = "canal";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s gosta de %3\$s de %2\$s";
$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s não gosta de %3\$s de %2\$s";
$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s agora está conectado com %2\$s";
$a->strings["%1\$s poked %2\$s"] = "%1\$s cutucou %2\$s";
@@ -674,7 +653,7 @@ $a->strings["Insert audio link"] = "Inserir link de áudio";
$a->strings["audio link"] = "link de áudio";
$a->strings["Set your location"] = "Definir sua localização";
$a->strings["set location"] = "definir localização";
-$a->strings["Toggle voting"] = "Alternar votação";
+$a->strings["Toggle voting"] = "Alternar enquete";
$a->strings["Clear browser location"] = "Limpar a localização do navegador";
$a->strings["clear location"] = "limpar a localização";
$a->strings["Title (optional)"] = "Título (opcional)";
@@ -732,11 +711,23 @@ $a->strings["__ctx:noun__ Abstain"] = array(
0 => "Abstenção",
1 => "Abstenções",
);
-$a->strings["Image exceeds website size limit of %lu bytes"] = "A imagem excede o limite de tamanho do site, que é de %";
-$a->strings["Image file is empty."] = "O arquivo de imagem está vazio.";
-$a->strings["Unable to process image"] = "Não foi possível processar a imagem";
-$a->strings["Photo storage failed."] = "Não foi possível armazenar a foto.";
-$a->strings["Upload New Photos"] = "Enviar novas fotos";
+$a->strings["Permission denied"] = "Permissão negada";
+$a->strings["(Unknown)"] = "(Desconhecido)";
+$a->strings["Visible to anybody on the internet."] = "Visível para todos na internet.";
+$a->strings["Visible to you only."] = "Visível somente para você.";
+$a->strings["Visible to anybody in this network."] = "Visível para todos nesta rede.";
+$a->strings["Visible to anybody authenticated."] = "Visível para todos autenticados.";
+$a->strings["Visible to anybody on %s."] = "Visível para todos em %s.";
+$a->strings["Visible to all connections."] = "Visível para todas as conexões.";
+$a->strings["Visible to approved connections."] = "Visível para conexões aprovadas.";
+$a->strings["Visible to specific connections."] = "Visível para conexões específicas.";
+$a->strings["Item not found."] = "O item não foi encontrado.";
+$a->strings["Permission denied."] = "Permissão negada.";
+$a->strings["Collection not found."] = "A coleção não foi encontrada.";
+$a->strings["Collection is empty."] = "A coleção está vazia.";
+$a->strings["Collection: %s"] = "Coleção: %s";
+$a->strings["Connection: %s"] = "Conexão: %s";
+$a->strings["Connection not found."] = "A conexão não foi encontrada.";
$a->strings["Invalid data packet"] = "Pacote de dados inválido";
$a->strings["Unable to verify channel signature"] = "Não foi possível verificar a assinatura do canal";
$a->strings["Unable to verify site signature for %s"] = "Não foi possível verificar a assinatura do site para %s";
@@ -909,15 +900,30 @@ $a->strings["Profile Photo"] = "Foto do perfil";
$a->strings["Update"] = "Atualizar";
$a->strings["Install"] = "Instalar";
$a->strings["Purchase"] = "Compras";
+$a->strings["Image/photo"] = "Imagem/foto";
+$a->strings["Encrypted content"] = "Conteúdo criptografado";
+$a->strings["Install %s element: "] = "Instalar elemento %s:";
+$a->strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta publicação contém um elemento %s instalável, porém você não tem permissões para instalá-lo neste site.";
+$a->strings["webpage"] = "página web";
+$a->strings["layout"] = "layout";
+$a->strings["block"] = "bloco";
+$a->strings["menu"] = "menu";
+$a->strings["QR code"] = "código QR";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escreveu a seguinte %2\$s %3\$s";
+$a->strings["post"] = "publicação";
+$a->strings["Different viewers will see this text differently"] = "Visualizadores diferentes verão esse texto diferentemente";
+$a->strings["$1 spoiler"] = "$1 spoiler";
+$a->strings["$1 wrote:"] = "$1 escreveu:";
$a->strings["Missing room name"] = "Nome da sala vazio";
$a->strings["Duplicate room name"] = "Nome da sala duplicado";
$a->strings["Invalid room specifier."] = "Especificador de sala inválido.";
$a->strings["Room not found."] = "A sala não foi encontrada.";
$a->strings["Room is full"] = "A sala está cheia";
-$a->strings["Please choose"] = "Por favor, escolha";
-$a->strings["Agree"] = "Concordo";
-$a->strings["Disagree"] = "Discordo";
-$a->strings["Abstain"] = "Abstenho";
+$a->strings["Image exceeds website size limit of %lu bytes"] = "A imagem excede o limite de tamanho do site, que é de %";
+$a->strings["Image file is empty."] = "O arquivo de imagem está vazio.";
+$a->strings["Unable to process image"] = "Não foi possível processar a imagem";
+$a->strings["Photo storage failed."] = "Não foi possível armazenar a foto.";
+$a->strings["Upload New Photos"] = "Enviar novas fotos";
$a->strings["Some blurb about what to do when you're new here"] = "Alguma coisa sobre o que fazer quando se é novo aqui";
$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Você criou %1$.0f de %2$.0f canais permitidos.";
$a->strings["Create a new channel"] = "Criar um novo canal";
@@ -928,149 +934,30 @@ $a->strings["Make Default"] = "Tornar padrão";
$a->strings["%d new messages"] = "%d novas mensagens";
$a->strings["%d new introductions"] = "%d novas apresentações";
$a->strings["Delegated Channels"] = "Canais delegados";
-$a->strings["Name is required"] = "É necessário informar o nome";
-$a->strings["Key and Secret are required"] = "A chave e o segredo são obrigatórios";
-$a->strings["Diaspora Policy Settings updated."] = "Configurações da política do Diáspora atualizadas.";
-$a->strings["Passwords do not match. Password unchanged."] = "As senhas não correspondem. A senha não foi modificada.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "Não é permitido uma senha em branco. A senha não foi modificada.";
-$a->strings["Password changed."] = "A senha foi modificada.";
-$a->strings["Password update failed. Please try again."] = "Não foi possível atualizar a senha. Por favor, tente novamente.";
-$a->strings["Not valid email."] = "Não é um e-mail válido";
-$a->strings["Protected email address. Cannot change to that email."] = "Endereço de e-mail protegido. Não é possível mudar para esse e-mail.";
-$a->strings["System failure storing new email. Please try again."] = "Falha do sistema ao armazenar novo e-mail. Por favor, tente novamente.";
-$a->strings["Settings updated."] = "As configurações foram atualizadas.";
-$a->strings["No"] = "Não";
-$a->strings["Yes"] = "Sim";
-$a->strings["Add application"] = "Adicionar aplicação";
-$a->strings["Name of application"] = "Nome da aplicação";
-$a->strings["Consumer Key"] = "Chave de consumidor";
-$a->strings["Automatically generated - change if desired. Max length 20"] = "Gerado automaticamente - troque se desejável. Comprimento máximo 20";
-$a->strings["Consumer Secret"] = "Segredo de consumidor";
-$a->strings["Redirect"] = "Redirecionamento";
-$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI de redirecionamento - deixe em branco, a não ser que sua aplicação especificamente requeira isso";
-$a->strings["Icon url"] = "URL do ícone";
-$a->strings["Optional"] = "Opcional";
-$a->strings["You can't edit this application."] = "Você não pode editar esta aplicação.";
-$a->strings["Connected Apps"] = "Aplicações conectadas";
-$a->strings["Client key starts with"] = "Chave do cliente começa com";
-$a->strings["No name"] = "Sem nome";
-$a->strings["Remove authorization"] = "Remover autorização";
-$a->strings["No feature settings configured"] = "Não foi definida nenhuma configuração do recurso";
-$a->strings["Feature/Addon Settings"] = "Configuração de Característica/Plugins";
-$a->strings["Settings for the built-in Diaspora emulator"] = "Configurações para construir um emulador de Diáspora";
-$a->strings["Allow any Diaspora member to comment on your public posts"] = "Permitir que qualquer membro do Diaspora comente em suas postagens públicas";
-$a->strings["Diaspora Policy Settings"] = "Configurações de Política do Diáspora";
-$a->strings["Prevent your hashtags from being redirected to other sites"] = "Previne que suas hashtags sejam redirecionadas para outros sítios";
-$a->strings["Account Settings"] = "Configurações da conta";
-$a->strings["Enter New Password:"] = "Digite a Nova Senha:";
-$a->strings["Confirm New Password:"] = "Confirme a Nova Senha:";
-$a->strings["Leave password fields blank unless changing"] = "Deixe os campos de senha em branco, a não ser que você queira alterá-la";
-$a->strings["Email Address:"] = "Endereço de e-mail:";
-$a->strings["Remove Account"] = "Remover conta";
-$a->strings["Remove this account including all its channels"] = "Exclua esta conta, incluindo todos seus canais";
-$a->strings["Off"] = "Desligado";
-$a->strings["On"] = "Ligado";
-$a->strings["Additional Features"] = "Recursos adicionais";
-$a->strings["Connector Settings"] = "Configurações do conector";
-$a->strings["No special theme for mobile devices"] = "Sem tema especial para aparelhos móveis";
-$a->strings["%s - (Experimental)"] = "%s - (Experimental)";
-$a->strings["mobile"] = "móvel";
-$a->strings["Display Settings"] = "Configurações de exibição";
-$a->strings["Display Theme:"] = "Tema do perfil:";
-$a->strings["Mobile Theme:"] = "Tema móvel:";
-$a->strings["Enable user zoom on mobile devices"] = "Permitir zoom pelo usuário em dispositivos móveis";
-$a->strings["Update browser every xx seconds"] = "Atualizar navegador a cada xx segundos";
-$a->strings["Minimum of 10 seconds, no maximum"] = "Mínimo de 10 segundos, sem máximo";
-$a->strings["Maximum number of conversations to load at any time:"] = "Número máximo permitido de conversas carregadas:";
-$a->strings["Maximum of 100 items"] = "Máximo de 100 itens";
-$a->strings["Show emoticons (smilies) as images"] = "Mostrar emoticons (smilies) como imagens";
-$a->strings["Link post titles to source"] = "Ligar o título dos posts à fonte";
-$a->strings["System Page Layout Editor - (advanced)"] = "Editor de layout de página do sistema - (avançado)";
-$a->strings["Use blog/list mode on channel page"] = "Usar modo blog/lista na página do canal";
-$a->strings["(comments displayed separately)"] = "(comentários mostrados separadamente)";
-$a->strings["Use blog/list mode on matrix page"] = "Use modo de blogue/lista na página da matriz";
-$a->strings["Channel page max height of content (in pixels)"] = "Altura máxima do conteúdo na página (em pixels)";
-$a->strings["click to expand content exceeding this height"] = "clique para expandir o conteúdo que excede essa altura";
-$a->strings["Matrix page max height of content (in pixels)"] = "Máxima altura de conteúdo na página Matriz (in pixesl)";
-$a->strings["Nobody except yourself"] = "Ninguém exceto você mesmo";
-$a->strings["Only those you specifically allow"] = "Apenas quem você der permissão";
-$a->strings["Approved connections"] = "Conexões aprovadas";
-$a->strings["Any connections"] = "Quaisquer conexões";
-$a->strings["Anybody on this website"] = "Qualquer um neste site";
-$a->strings["Anybody in this network"] = "Qualquer um nesta rede";
-$a->strings["Anybody authenticated"] = "Qualquer um autenticado";
-$a->strings["Anybody on the internet"] = "Qualquer um na internet";
-$a->strings["Publish your default profile in the network directory"] = "Publicar seu perfil padrão no diretório da rede?";
-$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Permitir sugerir você como amigo potencial para outros membros?";
-$a->strings["or"] = "ou";
-$a->strings["Your channel address is"] = "O endereço do seu canal é";
-$a->strings["Channel Settings"] = "Configurações do canal";
-$a->strings["Basic Settings"] = "Configurações básicas";
-$a->strings["Your Timezone:"] = "Seu fuso horário:";
-$a->strings["Default Post Location:"] = "Localização padrão de suas publicações:";
-$a->strings["Geographical location to display on your posts"] = "Localização geográfica para exibir em suas publicações";
-$a->strings["Use Browser Location:"] = "Usar localizador do navegador:";
-$a->strings["Adult Content"] = "Conteúdo adulto";
-$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Este canal frequentemente ou regularmente publica conteúdo adulto. (Por favor marque qualquer material adulto e/ou nudez com #NSFW)";
-$a->strings["Security and Privacy Settings"] = "Configurações de segurança e privacidade";
-$a->strings["Your permissions are already configured. Click to view/adjust"] = "Suas permissões já foram configuradas. Clique para vê-las/ajustá-las";
-$a->strings["Hide my online presence"] = "Esconda minha presença online";
-$a->strings["Prevents displaying in your profile that you are online"] = "Previne exibir em seu perfil que você está online";
-$a->strings["Simple Privacy Settings:"] = "Configurações de privacidade simples:";
-$a->strings["Very Public - <em>extremely permissive (should be used with caution)</em>"] = "Muito público - <em>extremamente permissivo (deve ser usado com cuidado)</em>";
-$a->strings["Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>"] = "Típico - <em>público por padrão, privado quando desejável (similar às permissões de redes sociais, mas com melhor privacidade)</em>";
-$a->strings["Private - <em>default private, never open or public</em>"] = "Privado - <em>privado por padrão, nunca aberto ou público</em>";
-$a->strings["Blocked - <em>default blocked to/from everybody</em>"] = "Bloqueado - <em>por padrão bloquado de/para todos</em>";
-$a->strings["Allow others to tag your posts"] = "Permitir que outros etiquetem suas publicações";
-$a->strings["Often used by the community to retro-actively flag inappropriate content"] = "Frequentemente utilizado pela comunidade para retroativamente sinalizar conteúdo inapropriado";
-$a->strings["Advanced Privacy Settings"] = "Configurações de privacidade avançadas";
-$a->strings["Expire other channel content after this many days"] = "Expirar outros conteúdos do canal após este número de dias";
-$a->strings["0 or blank prevents expiration"] = "0 ou em branco previne expiração";
-$a->strings["Maximum Friend Requests/Day:"] = "Número máximo de requisições de amizade por dia:";
-$a->strings["May reduce spam activity"] = "Pode reduzir a frequência de spam";
-$a->strings["Default Post Permissions"] = "Permissões padrão de publicação";
-$a->strings["(click to open/close)"] = "(clique para abrir/fechar)";
-$a->strings["Channel permissions category:"] = "Categoria de permissões do canal:";
-$a->strings["Maximum private messages per day from unknown people:"] = "Máximo número de mensagens privadas por dia de pessoas desconhecidas:";
-$a->strings["Useful to reduce spamming"] = "Útil para reduzir a frequência de spam";
-$a->strings["Notification Settings"] = "Configurações de notificação";
-$a->strings["By default post a status message when:"] = "Por padrão, publicar uma mensagem de status quando:";
-$a->strings["accepting a friend request"] = "aceitar um pedido de amizade";
-$a->strings["joining a forum/community"] = "associar-se a um fórum/comunidade";
-$a->strings["making an <em>interesting</em> profile change"] = "modificar algo <em>interessante</em> em seu perfil";
-$a->strings["Send a notification email when:"] = "Enviar um e-mail de notificação quando:";
-$a->strings["You receive a connection request"] = "Você recebe uma solicitação de conexão";
-$a->strings["Your connections are confirmed"] = "Suas conexões são confirmadas";
-$a->strings["Someone writes on your profile wall"] = "Alguém escrever no mural do seu perfil";
-$a->strings["Someone writes a followup comment"] = "Alguém comenta uma publicação";
-$a->strings["You receive a private message"] = "Você recebeu uma mensagem privada";
-$a->strings["You receive a friend suggestion"] = "Você recebe uma sugestão de amizade";
-$a->strings["You are tagged in a post"] = "Você é mencionado num post";
-$a->strings["You are poked/prodded/etc. in a post"] = "Você foi cutucado/espetado/etc. numa publicação";
-$a->strings["Show visual notifications including:"] = "Exibir notificações visuais incluindo:";
-$a->strings["Unseen matrix activity"] = "Atividade não vista na matriz";
-$a->strings["Unseen channel activity"] = "Atividade não vista no canal";
-$a->strings["Unseen private messages"] = "Mensagens privadas não vistas";
-$a->strings["Recommended"] = "Recomendado";
-$a->strings["Upcoming events"] = "Eventos próximos";
-$a->strings["Events today"] = "Eventos hoje";
-$a->strings["Upcoming birthdays"] = "Aniversários próximos";
-$a->strings["Not available in all themes"] = "Não disponível em todos os temas";
-$a->strings["System (personal) notifications"] = "Notificações de sistema (pessoais)";
-$a->strings["System info messages"] = "Mensagens de informação do sistema";
-$a->strings["System critical alerts"] = "Alertas críticos do sistema";
-$a->strings["New connections"] = "Novas conexões";
-$a->strings["System Registrations"] = "Registros no sistema";
-$a->strings["Also show new wall posts, private messages and connections under Notices"] = "Também mostra novos textos, mensagens privadas e conexões nos Avisos";
-$a->strings["Notify me of events this many days in advance"] = "Notifique-me de eventos adiante esse número de dias";
-$a->strings["Must be greater than 0"] = "Deve ser maior que 0";
-$a->strings["Advanced Account/Page Type Settings"] = "Configurações avançadas de conta/tipo de página";
-$a->strings["Change the behaviour of this account for special situations"] = "Mudar o comportamento dessa conta em situações especiais";
-$a->strings["Please enable expert mode (in <a href=\"settings/features\">Settings > Additional features</a>) to adjust!"] = "Por favor, habilite o modo expert (em <a href=\"settings/features\">Configurações > Recursos adicionais</a>) para ajustar!";
-$a->strings["Miscellaneous Settings"] = "Configurações miscelâneas";
-$a->strings["Personal menu to display in your channel pages"] = "Menu pessoal para exibir nas páginas dos seus canais";
-$a->strings["Remove Channel"] = "Remover canal";
-$a->strings["Remove this channel."] = "Remover este canal";
+$a->strings["Public access denied."] = "Acesso público negado.";
+$a->strings["%d rating"] = array(
+ 0 => "%d avaliação",
+ 1 => "%d avaliações",
+);
+$a->strings["Gender: "] = "Gênero: ";
+$a->strings["Status: "] = "Status:";
+$a->strings["Homepage: "] = "Website:";
+$a->strings["Description:"] = "Descrição:";
+$a->strings["Public Forum:"] = "Fórum público:";
+$a->strings["Keywords: "] = "Palavras-chave:";
+$a->strings["Don't suggest"] = "Não sugerir";
+$a->strings["Common connections:"] = "Conexões em comum:";
+$a->strings["Global Directory"] = "Diretório global";
+$a->strings["Local Directory"] = "Diretório local";
+$a->strings["Finding:"] = "Pesquisando:";
+$a->strings["next page"] = "próxima página";
+$a->strings["previous page"] = "página anterior";
+$a->strings["Sort options"] = "Opções de ordenação";
+$a->strings["Alphabetic"] = "Alfabética";
+$a->strings["Reverse Alphabetic"] = "Alfabética reversa";
+$a->strings["Newest to Oldest"] = "Das mais recentes para as mais antigas";
+$a->strings["Oldest to Newest"] = "Do mais Antigo para o mais Novo";
+$a->strings["No entries (some entries may be hidden)."] = "Nenhuma entrada (algumas entradas podem estar escondidas).";
$a->strings["Xchan Lookup"] = "Encontrar Xchan";
$a->strings["Lookup xchan beginning with (or webbie): "] = "Encontrar xchan iniciado por (ou webbie):";
$a->strings["Not found."] = "Não encontrado.";
@@ -1109,8 +996,6 @@ $a->strings["URL for photo of thing (optional)"] = "URL para foto da coisa (opci
$a->strings["Add Thing to your Profile"] = "Adicionar a coisa ao seu perfil";
$a->strings["Item not available."] = "O item não está disponível.";
$a->strings["Fetching URL returns error: %1\$s"] = "Carregar o URL retorna o erro: %1\$s";
-$a->strings["\$Projectname"] = "\$Projectname";
-$a->strings["Welcome to %s"] = "Bem-vindo(a) a %s";
$a->strings["Image uploaded but image cropping failed."] = "A imagem foi enviada, mas não foi possível cortá-la.";
$a->strings["Image resize failed."] = "Falha ao modificar o tamanho da imagem.";
$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Se a nova foto não aparecer imediatamente, recarregue a página segurando a tecla \"shift\" ou limpe o cache do navegador, ";
@@ -1120,6 +1005,7 @@ $a->strings["Photo not available."] = "A foto não está disponível.";
$a->strings["Upload File:"] = "Enviar arquivo:";
$a->strings["Select a profile:"] = "Selecione um perfil:";
$a->strings["Upload Profile Photo"] = "Enviar foto do perfil";
+$a->strings["or"] = "ou";
$a->strings["skip this step"] = "pule esta etapa";
$a->strings["select a photo from your photo albums"] = "selecione uma foto do seu álbum de fotos";
$a->strings["Crop Image"] = "Cortar a imagem";
@@ -1167,7 +1053,6 @@ $a->strings["Finish date/time is not known or not relevant"] = "A data/hora de t
$a->strings["Event Finishes:"] = "Término do evento:";
$a->strings["Adjust for viewer timezone"] = "Ajustar para o fuso horário do visualizador";
$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante para eventos que ocorrem em um lugar específico. Não prático para feriados globais.";
-$a->strings["Description:"] = "Descrição:";
$a->strings["Title:"] = "Título:";
$a->strings["Share this event"] = "Compartilhar este evento";
$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está acompanhando %3\$s de %2\$s";
@@ -1198,95 +1083,30 @@ $a->strings["Click on a channel to add or remove."] = "Clique em um canal para a
$a->strings["Version %s"] = "Versão %s";
$a->strings["Installed plugins/addons/apps:"] = "Plugins/complementos/aplicações instalados:";
$a->strings["No installed plugins/addons/apps"] = "Nenhum plugin/complemento/aplicação instalado";
+$a->strings["\$Projectname"] = "\$Projectname";
$a->strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Este é um hub da \$Projectname - uma rede global cooperativa de websites descentralizados com privacidade aprimorada.";
$a->strings["Tag: "] = "Etiqueta:";
$a->strings["Last background fetch: "] = "Buscar último fundo:";
$a->strings["Running at web location"] = "Sendo executado no endereço web";
$a->strings["Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more about \$Projectname."] = "Por favor visite <a href=\"https://redmatrix.me\">redmatrix.me</a> para aprender mais sobre a \$Projectname.";
$a->strings["Bug reports and issues: please visit"] = "Relatos e acompanhamentos de erros podem ser encontrados em";
+$a->strings["\$projectname issues"] = "Questões de \$projectname";
$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Sugestões, elogios, etc - mande um e-mail para \"redmatrix\" arrôba librelist ponto com";
$a->strings["Site Administrators"] = "Administradores do site";
-$a->strings["Help:"] = "Ajuda:";
-$a->strings["Not Found"] = "Não encontrada";
-$a->strings["\$Projectname Server - Setup"] = "Servidor \$Projectname - Configuração";
-$a->strings["Could not connect to database."] = "Não foi possível conectar ao banco de dados.";
-$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Não foi possível conectar à URL especificada para o site. Provavlmente um problema de DNS ou com o certificado SSL.";
-$a->strings["Could not create table."] = "Não foi possível criar a tabela.";
-$a->strings["Your site database has been installed."] = "O banco de dados do seu site foi instalado.";
-$a->strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Você pode precisar importar o arquivo \"install/schema_xxx.sql\" manualmente usando um cliente do banco de dados.";
-$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Por favor, veja o arquivo \"install/INSTALL.txt\".";
-$a->strings["System check"] = "Checagem do sistema";
-$a->strings["Check again"] = "Cheque novamente";
-$a->strings["Database connection"] = "Conexão ao banco de dados";
-$a->strings["In order to install \$Projectname we need to know how to connect to your database."] = "Para instalar a \$Projectname é necessário saber como se conectar ao seu banco de dados.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Por favor, entre em contato com a sua hospedagem ou com o administrador do site caso você tenha alguma dúvida em relação a isso.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "O banco de dados que você especificar abaixo já deve existir. Caso contrário, crie-o antes de prosseguir.";
-$a->strings["Database Server Name"] = "Nome do servidor de banco de dados";
-$a->strings["Default is localhost"] = "O default é localhost";
-$a->strings["Database Port"] = "Porta do banco de dados";
-$a->strings["Communication port number - use 0 for default"] = "Número da porta de comunicação - use 0 para o default";
-$a->strings["Database Login Name"] = "Nome do usuário do banco de dados";
-$a->strings["Database Login Password"] = "Senha do usuário do banco de dados";
-$a->strings["Database Name"] = "Nome do banco de dados";
-$a->strings["Database Type"] = "Tipo do banco de dados";
-$a->strings["Site administrator email address"] = "Endereço de email do administrador do site";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "O endereço de email da sua conta deve ser igual a este para que você possa utilizar o painel de administração web.";
-$a->strings["Website URL"] = "URL do website";
-$a->strings["Please use SSL (https) URL if available."] = "Por favor, use uma URL SSL (https) se disponível.";
-$a->strings["Please select a default timezone for your website"] = "Por favor, selecione o fuso horário padrão para o seu site";
-$a->strings["Site settings"] = "Configurações do site";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Não foi possível encontrar uma versão de linha de comando do PHP nos caminhos do seu servidor web.";
-$a->strings["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."] = "Caso você não tenha uma versão de linha de comando do PHP instalada no seu servidor, você não será capaz de executar coletas em segundo plano pelo cron.";
-$a->strings["PHP executable path"] = "Caminho para o executável do PHP";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Digite o caminho completo do executável PHP. Você pode deixar isso em branco para continuar com a instalação.";
-$a->strings["Command line PHP"] = "PHP em linha de comando";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "\"register_argc_argv\" não está habilitado na versão de linha de comando do PHP no seu sistema.";
-$a->strings["This is required for message delivery to work."] = "Isto é necessário para o funcionamento do envio de mensagens.";
-$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Erro: a função \"openssl_pkey_new\" no seu sistema não é capaz de gerar as chaves de criptografia";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Se estiver usando o Windows, por favor dê uma olhada em \"http://www.php.net/manual/en/openssl.installation.php\".";
-$a->strings["Generate encryption keys"] = "Gerar chaves de criptografia";
-$a->strings["libCurl PHP module"] = "Módulo PHP libCurl";
-$a->strings["GD graphics PHP module"] = "Módulo PHP GD graphics";
-$a->strings["OpenSSL PHP module"] = "Módulo PHP OpenSSL";
-$a->strings["mysqli or postgres PHP module"] = "módulo 'mysqli' ou 'postgres' do PHP";
-$a->strings["mb_string PHP module"] = "Módulo PHP mb_string ";
-$a->strings["mcrypt PHP module"] = "Módulo PHP mcrypt";
-$a->strings["Apache mod_rewrite module"] = "Módulo mod_rewrite do Apache";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Erro: o módulo mod-rewrite do Apache é necessário, mas não está instalado.";
-$a->strings["proc_open"] = "proc_open";
-$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Erro: proc_open é necessário, mas não está instalado ou foi desabilitado no php.ini";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Erro: o módulo libCURL do PHP é necessário, mas não está instalado.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Erro: o módulo gráfico GD, com suporte a JPEG, do PHP é necessário, mas não está instalado.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Erro: o módulo openssl do PHP é necessário, mas não está instalado.";
-$a->strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Erro: módulo 'mysqli' ou 'postgres' do PHP é necessário mas nenhum deles está instalado.";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Erro: o módulo mb_string do PHP é necessário, mas não está instalado.";
-$a->strings["Error: mcrypt PHP module required but not installed."] = "Erro: o módulo mcrypt do PHP é necessário, mas não está instalado.";
-$a->strings["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."] = "O instalador web precisa criar um arquivo chamado \".htconfig.php\" na pasta raiz da instalação e não está conseguindo.";
-$a->strings["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."] = "Geralmente isso está relacionado às definições de permissão, uma vez que o servidor web pode não estar conseguindo escrever os arquivos nesta pasta.";
-$a->strings["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."] = "Ao final desse procedimento, será fornecido um texto que deverá ser salvo em um arquivo de nome .htconfig.php, na pasta raiz do seu Red.";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Você também pode pular esse procedimento e executar uma instalação manual. Por favor, dê uma olhada no arquivo \"install/INSTALL.TXT\" para instruções.";
-$a->strings[".htconfig.php is writable"] = ".htconfig.php tem permissão de escrita";
-$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red usa o engine de template Smarty3 para renderizar suas telas. Smarty3 compila templates para PHP para acelerar a renderização.";
-$a->strings["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."] = "Para guardar os templates compilados, o servidor web necessita de permissão de escrita no diretório %s no diretório raiz da Red.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Por favor, certifique-se de que o usuário sob o qual o servidor web roda (ex: www-data) tenha permissão de escrita nesse diretório.";
-$a->strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Nota: como uma medida de segurança, você deve fornecer ao servidor web permissão de escrita somente em %s e não aos arquivos de template (.tpl) que ele contém.";
-$a->strings["%s is writable"] = "%s tem permissão de escrita";
-$a->strings["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"] = "A Red usa o diretório store para salvar arquivos carregados. O servidor web necessita de permissão de escrita no diretório store dentro do diretório raiz da Red";
-$a->strings["store is writable"] = "store tem permissão de escrita";
-$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Não foi possível validar o certificado SSL. Corrija o certificado ou desabilite o acesso via https ao site.";
-$a->strings["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!"] = "Se você oferece acesso https ao seu website ou permite conexões na porta TCP 443 (a porta https:), você DEVE usar um certificado reconhecido pelos navegadores. Você NÃO DEVE usar certificados assinados por você mesmo!";
-$a->strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "Essa restrição é incorporada porque publicações públicas suas podem, por exemplo, conter referências a imagens no seu próprio hub.";
-$a->strings["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."] = "Se seu certificado não for reconhecido, membros de outros sites (que podem ter certificados válidos) receberão uma mensagem de aviso nos seus próprios sites reclamando de problemas de segurança.";
-$a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Isso pode causar problemas de usabilidade (não só no seu site) então nós precisamos insistir nesse requisito.";
-$a->strings["Providers are available that issue free certificates which are browser-valid."] = "Existem provedores que disponibilizam gratuitamente certificados reconhecidos por navegadores.";
-$a->strings["SSL certificate validation"] = "Validação do certificado SSL";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "A reescrita de URLs não está funcionando no .htaccess. Verifique as configurações do servidor. Teste:";
-$a->strings["Url rewrite is working"] = "A reescrita de URLs está funcionando";
-$a->strings["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."] = "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendika em seu servidor web.";
-$a->strings["Errors encountered creating database tables."] = "Foram encontrados erros durante a criação das tabelas do banco de dados.";
-$a->strings["<h1>What next</h1>"] = "<h1>Próximos passos</h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Você deve configurar [manualmente] uma tarefa agendada para o coletor.";
+$a->strings["Unable to locate original post."] = "Não foi possível localizar a publicação original.";
+$a->strings["Empty post discarded."] = "A publicação em branco foi descartada.";
+$a->strings["Executable content type not permitted to this channel."] = "Conteúdo de tipo executável não permitido para este canal.";
+$a->strings["System error. Post not saved."] = "Erro no sistema. A publicação não foi salva.";
+$a->strings["Unable to obtain post information from database."] = "Impossível obter informação do texto no banco de dados";
+$a->strings["You have reached your limit of %1$.0f top level posts."] = "Você atingiu o seu limite de %1$.0f publicações de novos tópicos.";
+$a->strings["You have reached your limit of %1$.0f webpages."] = "Você atingiu o seu limite de %1$.0f páginas web.";
+$a->strings["No such group"] = "Este grupo não existe";
+$a->strings["No such channel"] = "Nenhum canal";
+$a->strings["Search Results For:"] = "Resultados da busca por:";
+$a->strings["Collection is empty"] = "A coleção está vazia";
+$a->strings["Collection: "] = "Coleção:";
+$a->strings["Connection: "] = "Conexão:";
+$a->strings["Invalid connection."] = "Conexão inválida.";
$a->strings["No channel."] = "Nenhum canal.";
$a->strings["Common connections"] = "Conexões em comum";
$a->strings["No connections in common."] = "Nenhuma conexão em comum.";
@@ -1316,13 +1136,17 @@ $a->strings["Search your connections"] = "Pesquisar em suas conexões";
$a->strings["Finding: "] = "Pesquisando: ";
$a->strings["Block Name"] = "Nome do bloco";
$a->strings["Block Title"] = "Título do Bloco";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s marcou %3\$s de %2\$s com %4\$s";
+$a->strings["Item not found"] = "O item não foi encontrado";
+$a->strings["Item is not editable"] = "O item não está editável";
+$a->strings["Delete item?"] = "Deletar item?";
+$a->strings["Insert YouTube video"] = "Inserir vídeo do YouTube";
+$a->strings["Insert Vorbis [.ogg] video"] = "Inserir vídeo Vorbis (.ogg)";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Inserir áudio Vorbis (.ogg)";
$a->strings["\$Projectname - Guests: Username: {your email address}, Password: +++"] = "\$Projectname - Convidados: Nome de usuário: {seu endereço de e-mail}, Senha: +++";
$a->strings["Page owner information could not be retrieved."] = "As informações do dono da pagina não puderam ser obtidas.";
$a->strings["Album not found."] = "O álbum não foi encontrado.";
$a->strings["Delete Album"] = "Excluir o álbum";
$a->strings["Delete Photo"] = "Excluir a foto";
-$a->strings["Public access denied."] = "Acesso público negado.";
$a->strings["No photos selected"] = "Não foi selecionada nenhuma foto";
$a->strings["Access to this item is restricted."] = "O acesso a este item está restrito.";
$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "Utilizados %1$.2f MB de %2$.2f MB para armazenamento de fotos.";
@@ -1353,6 +1177,8 @@ $a->strings["In This Photo:"] = "Nesta foto:";
$a->strings["Map"] = "Mapa";
$a->strings["View Album"] = "Ver álbum";
$a->strings["Recent Photos"] = "Fotos recentes";
+$a->strings["Items tagged with: %s"] = "Items etiquetados com: %s";
+$a->strings["Search results for: %s"] = "Resultados da busca por: %s";
$a->strings["Profile Match"] = "Correspondência de perfil";
$a->strings["No keywords to match. Please add keywords to your default profile."] = "Nenhuma palavra-chave para combinar. Por favor, adicione palavras-chave ao seu perfil padrão.";
$a->strings["is interested in:"] = "se interessa por:";
@@ -1378,14 +1204,14 @@ $a->strings["Your service plan only allows %d channels."] = "Seu plano de serviÃ
$a->strings["Nothing to import."] = "Nada a importar.";
$a->strings["Unable to download data from old server"] = "Não foi possível descarregar os dados do servidor antigo";
$a->strings["Imported file is empty."] = "O arquivo importado está vazio.";
+$a->strings["The data provided is not compatible with this project."] = "Os dados fornecidos não são compatíveis com este projeto.";
+$a->strings["Warning: Database versions differ by %1\$d updates."] = "Atenção: Versões do banco de dados diferem por %1\$d atualizações.";
$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Não foi possível criar um identificador de canal duplicado neste sistema. A importação falhou.";
-$a->strings["Unable to create a unique channel address. Import failed."] = "Não foi possível criar um endereço de canal único. Importação falhou.";
$a->strings["Channel clone failed. Import failed."] = "Clonagem do canal falhou. A importação falhou.";
$a->strings["Cloned channel not found. Import failed."] = "Canal a clonar não encontrado. A importação falhou.";
-$a->strings["Import completed."] = "A importação foi completada.";
$a->strings["You must be logged in to use this feature."] = "Você precisa estar autenticado para usar este recurso.";
$a->strings["Import Channel"] = "Importar canal";
-$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file. Only identity and connections/relationships will be imported. Importation of content is not yet available."] = "Use este formulário para importar um canal existente de um servidor/hub diferente. Você pode obter a identidade do canal do servidor/hub antigo pela rede, ou fornecer um arquivo de exportação. Somente a identidade e as conexões/relacionamentos serão importados. Importação de conteúdos ainda não está disponível.";
+$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Use este formulário para importar um canal existente de um servidor/hub diferente. Você pode obter a identidade do canal do servidor/hub antigo pela rede, ou fornecer um arquivo de exportação.";
$a->strings["File to Upload"] = "Arquivo a carregar";
$a->strings["Or provide the old server/hub details"] = "Ou forneça os detalhes do antigo servidor/hub";
$a->strings["Your old identity address (xyz@example.com)"] = "O endereço da sua velha identidade (xyz@exemplo.com)";
@@ -1393,15 +1219,12 @@ $a->strings["Your old login email address"] = "O endereço de e-mail da sua anti
$a->strings["Your old login password"] = "A senha dua sua antiga conta";
$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Para qualquer das opções, por favor escolha se deseja fazer deste hub seu novo endereço primário, ou se o velho local deve continuar com esse papel. Você será capaz de publicar a partir de ambos os locais, mas somente um pode estar designado como local primário para arquivos, fotos e mídia.";
$a->strings["Make this hub my primary location"] = "Faça deste hub meu local primário";
-$a->strings["Import existing posts if possible"] = "Importar publicações existentes se possível";
-$a->strings["Item not found"] = "O item não foi encontrado";
-$a->strings["Edit Layout"] = "Editar layout";
+$a->strings["Import existing posts if possible (experimental - limited by available memory"] = "Importar publicações existentes se possível (experimental - limitado pela memória disponível)";
+$a->strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Esse processo pode levar vários minutos para completar. Por favor envie o formulário uma única vez e deixe esta página aberta até que finalize.";
$a->strings["Delete layout?"] = "Deletar layout?";
-$a->strings["Insert YouTube video"] = "Inserir vídeo do YouTube";
-$a->strings["Insert Vorbis [.ogg] video"] = "Inserir vídeo Vorbis (.ogg)";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Inserir áudio Vorbis (.ogg)";
$a->strings["Layout Description (Optional)"] = "Descrição do Layout. (Opcional)";
$a->strings["Layout Name"] = "Nome do layout";
+$a->strings["Edit Layout"] = "Editar layout";
$a->strings["You must be logged in to see this page."] = "Você precisa estar autenticado para ver esta página.";
$a->strings["Room not found"] = "Sala não encontrada";
$a->strings["Leave Room"] = "Sair da sala";
@@ -1412,6 +1235,36 @@ $a->strings["Bookmark this room"] = "Guarde esta sala";
$a->strings["New Chatroom"] = "Nova sala de bate-papo";
$a->strings["Chatroom Name"] = "Nome da sala de bate-papo";
$a->strings["%1\$s's Chatrooms"] = "Salas de bate-papo de %1\$s";
+$a->strings["Menu not found."] = "O menu não foi encontrado.";
+$a->strings["Unable to create element."] = "Não foi possível criar elemento.";
+$a->strings["Unable to update menu element."] = "Não foi possível atualizar o elemento de menu.";
+$a->strings["Unable to add menu element."] = "Não foi possível adicionar o elemento de menu.";
+$a->strings["Menu Item Permissions"] = "Permissões do item do menu";
+$a->strings["(click to open/close)"] = "(clique para abrir/fechar)";
+$a->strings["Link Name"] = "Nome do Link";
+$a->strings["Link or Submenu Target"] = "Alvo do Link ou Submenu";
+$a->strings["Enter URL of the link or select a menu name to create a submenu"] = "Insira o URL do link ou selecione um nome de menu para criar um submenu";
+$a->strings["Use magic-auth if available"] = "Usar magic-auth se disponível";
+$a->strings["Open link in new window"] = "Abrir link em uma nova janela";
+$a->strings["Order in list"] = "Ordem na lista";
+$a->strings["Higher numbers will sink to bottom of listing"] = "Números mais altos descem para o fim da lista";
+$a->strings["Submit and finish"] = "Enviar e terminar";
+$a->strings["Submit and continue"] = "Enviar e continuar";
+$a->strings["Menu:"] = "Menu:";
+$a->strings["Link Target"] = "Alvo do Link";
+$a->strings["Edit menu"] = "Editar menu";
+$a->strings["Edit element"] = "Editar elemento";
+$a->strings["Drop element"] = "Descartar elemento";
+$a->strings["New element"] = "Novo elemento";
+$a->strings["Edit this menu container"] = "Editar esta caixa de menu";
+$a->strings["Add menu element"] = "Adicionar um elemento de menu";
+$a->strings["Delete this menu item"] = "Deleter este item de menu";
+$a->strings["Edit this menu item"] = "Editar este item de menu";
+$a->strings["Menu item not found."] = "O item de menu não foi encontrado.";
+$a->strings["Menu item deleted."] = "O item de menu foi deletado.";
+$a->strings["Menu item could not be deleted."] = "Não foi possível deletar o item de menu.";
+$a->strings["Edit Menu Element"] = "Editar elemento de menu";
+$a->strings["Link text"] = "Texto do link";
$a->strings["Delete webpage?"] = "Deletar página web?";
$a->strings["Page link title"] = "Título do link da página";
$a->strings["Edit Webpage"] = "Editar página web";
@@ -1436,8 +1289,8 @@ $a->strings["Website:"] = "Sítio web:";
$a->strings["Remote Channel [%s] (not yet known on this site)"] = "Canal Remoto [%s] (ainda não conhecido neste sítio)";
$a->strings["Rating (this information is public)"] = "Avaliações (essa informação é pública)";
$a->strings["Optionally explain your rating (this information is public)"] = "Opcionalmente justifique sua avaliação (essa informação é pública)";
-$a->strings["Item is not editable"] = "O item não está editável";
-$a->strings["Delete item?"] = "Deletar item?";
+$a->strings["Delete block?"] = "Deletar bloco?";
+$a->strings["Edit Block"] = "Editar bloco";
$a->strings["Total invitation limit exceeded."] = "Foi excedido o número total de convites.";
$a->strings["%s : Not a valid email address."] = "%s : Não é um endereço de e-mail válido.";
$a->strings["Please join us on Red"] = "Por favor, una-se a nós na Red";
@@ -1494,7 +1347,6 @@ $a->strings["Delete this menu"] = "Deletar este menu";
$a->strings["Edit menu contents"] = "Editar os conteúdos do menu";
$a->strings["Edit this menu"] = "Editar este menu";
$a->strings["Menu could not be deleted."] = "Não foi possível deletar o menu.";
-$a->strings["Menu not found."] = "O menu não foi encontrado.";
$a->strings["Edit Menu"] = "Editar menu";
$a->strings["Add or remove entries to this menu"] = "Adicionar ou remover entradas deste menu";
$a->strings["Menu name"] = "Nome do menu";
@@ -1502,7 +1354,6 @@ $a->strings["Must be unique, only seen by you"] = "Deve ser único, exibido some
$a->strings["Menu title"] = "Título do menu";
$a->strings["Menu title as seen by others"] = "Título do menu quando visto por outros";
$a->strings["Allow bookmarks"] = "Habilitar links guardados";
-$a->strings["Modify"] = "Modificar";
$a->strings["Permission Denied."] = "Permissão negada.";
$a->strings["File not found."] = "O arquivo não foi encontrado.";
$a->strings["Edit file permissions"] = "Editar permissões do arquivo";
@@ -1600,24 +1451,93 @@ $a->strings["Rating: "] = "Avaliações";
$a->strings["Website: "] = "Website:";
$a->strings["Description: "] = "Descrição:";
$a->strings["Source of Item"] = "Fonte do Item";
+$a->strings["\$Projectname Server - Setup"] = "Servidor \$Projectname - Configuração";
+$a->strings["Could not connect to database."] = "Não foi possível conectar ao banco de dados.";
+$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Não foi possível conectar à URL especificada para o site. Provavlmente um problema de DNS ou com o certificado SSL.";
+$a->strings["Could not create table."] = "Não foi possível criar a tabela.";
+$a->strings["Your site database has been installed."] = "O banco de dados do seu site foi instalado.";
+$a->strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Você pode precisar importar o arquivo \"install/schema_xxx.sql\" manualmente usando um cliente do banco de dados.";
+$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Por favor, veja o arquivo \"install/INSTALL.txt\".";
+$a->strings["System check"] = "Checagem do sistema";
+$a->strings["Check again"] = "Cheque novamente";
+$a->strings["Database connection"] = "Conexão ao banco de dados";
+$a->strings["In order to install \$Projectname we need to know how to connect to your database."] = "Para instalar a \$Projectname é necessário saber como se conectar ao seu banco de dados.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Por favor, entre em contato com a sua hospedagem ou com o administrador do site caso você tenha alguma dúvida em relação a isso.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "O banco de dados que você especificar abaixo já deve existir. Caso contrário, crie-o antes de prosseguir.";
+$a->strings["Database Server Name"] = "Nome do servidor de banco de dados";
+$a->strings["Default is localhost"] = "O default é localhost";
+$a->strings["Database Port"] = "Porta do banco de dados";
+$a->strings["Communication port number - use 0 for default"] = "Número da porta de comunicação - use 0 para o default";
+$a->strings["Database Login Name"] = "Nome do usuário do banco de dados";
+$a->strings["Database Login Password"] = "Senha do usuário do banco de dados";
+$a->strings["Database Name"] = "Nome do banco de dados";
+$a->strings["Database Type"] = "Tipo do banco de dados";
+$a->strings["Site administrator email address"] = "Endereço de email do administrador do site";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "O endereço de email da sua conta deve ser igual a este para que você possa utilizar o painel de administração web.";
+$a->strings["Website URL"] = "URL do website";
+$a->strings["Please use SSL (https) URL if available."] = "Por favor, use uma URL SSL (https) se disponível.";
+$a->strings["Please select a default timezone for your website"] = "Por favor, selecione o fuso horário padrão para o seu site";
+$a->strings["Site settings"] = "Configurações do site";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Não foi possível encontrar uma versão de linha de comando do PHP nos caminhos do seu servidor web.";
+$a->strings["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."] = "Caso você não tenha uma versão de linha de comando do PHP instalada no seu servidor, você não será capaz de executar coletas em segundo plano pelo cron.";
+$a->strings["PHP executable path"] = "Caminho para o executável do PHP";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Digite o caminho completo do executável PHP. Você pode deixar isso em branco para continuar com a instalação.";
+$a->strings["Command line PHP"] = "PHP em linha de comando";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "\"register_argc_argv\" não está habilitado na versão de linha de comando do PHP no seu sistema.";
+$a->strings["This is required for message delivery to work."] = "Isto é necessário para o funcionamento do envio de mensagens.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["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."] = "Seu volume de carregamento total está definido para %s. Tamanho máximo de um arquivo carregado para %s. Você pode carregar até %d arquivos ao mesmo tempo.";
+$a->strings["You can adjust these settings in the servers php.ini."] = "Você pode ajustar essas configurações no php.ini do servidor.";
+$a->strings["PHP upload limits"] = "Limites de carregamento do PHP";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Erro: a função \"openssl_pkey_new\" no seu sistema não é capaz de gerar as chaves de criptografia";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Se estiver usando o Windows, por favor dê uma olhada em \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["Generate encryption keys"] = "Gerar chaves de criptografia";
+$a->strings["libCurl PHP module"] = "Módulo PHP libCurl";
+$a->strings["GD graphics PHP module"] = "Módulo PHP GD graphics";
+$a->strings["OpenSSL PHP module"] = "Módulo PHP OpenSSL";
+$a->strings["mysqli or postgres PHP module"] = "módulo 'mysqli' ou 'postgres' do PHP";
+$a->strings["mb_string PHP module"] = "Módulo PHP mb_string ";
+$a->strings["mcrypt PHP module"] = "Módulo PHP mcrypt";
+$a->strings["xml PHP module"] = "Módulo PHP xml";
+$a->strings["Apache mod_rewrite module"] = "Módulo mod_rewrite do Apache";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Erro: o módulo mod-rewrite do Apache é necessário, mas não está instalado.";
+$a->strings["proc_open"] = "proc_open";
+$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Erro: proc_open é necessário, mas não está instalado ou foi desabilitado no php.ini";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Erro: o módulo libCURL do PHP é necessário, mas não está instalado.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Erro: o módulo gráfico GD, com suporte a JPEG, do PHP é necessário, mas não está instalado.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Erro: o módulo openssl do PHP é necessário, mas não está instalado.";
+$a->strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Erro: módulo 'mysqli' ou 'postgres' do PHP é necessário mas nenhum deles está instalado.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Erro: o módulo mb_string do PHP é necessário, mas não está instalado.";
+$a->strings["Error: mcrypt PHP module required but not installed."] = "Erro: o módulo mcrypt do PHP é necessário, mas não está instalado.";
+$a->strings["Error: xml PHP module required for DAV but not installed."] = "Erro: o módulo xml do PHP é necessário para DAV, mas não está instalado.";
+$a->strings["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."] = "O instalador web precisa criar um arquivo chamado \".htconfig.php\" na pasta raiz da instalação e não está conseguindo.";
+$a->strings["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."] = "Geralmente isso está relacionado às definições de permissão, uma vez que o servidor web pode não estar conseguindo escrever os arquivos nesta pasta.";
+$a->strings["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."] = "Ao final desse procedimento, será fornecido um texto que deverá ser salvo em um arquivo de nome .htconfig.php, na pasta raiz do seu Red.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Você também pode pular esse procedimento e executar uma instalação manual. Por favor, dê uma olhada no arquivo \"install/INSTALL.TXT\" para instruções.";
+$a->strings[".htconfig.php is writable"] = ".htconfig.php tem permissão de escrita";
+$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red usa o engine de template Smarty3 para renderizar suas telas. Smarty3 compila templates para PHP para acelerar a renderização.";
+$a->strings["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."] = "Para guardar os templates compilados, o servidor web necessita de permissão de escrita no diretório %s no diretório raiz da Red.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Por favor, certifique-se de que o usuário sob o qual o servidor web roda (ex: www-data) tenha permissão de escrita nesse diretório.";
+$a->strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Nota: como uma medida de segurança, você deve fornecer ao servidor web permissão de escrita somente em %s e não aos arquivos de template (.tpl) que ele contém.";
+$a->strings["%s is writable"] = "%s tem permissão de escrita";
+$a->strings["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"] = "A Red usa o diretório store para salvar arquivos carregados. O servidor web necessita de permissão de escrita no diretório store dentro do diretório raiz da Red";
+$a->strings["store is writable"] = "store tem permissão de escrita";
+$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Não foi possível validar o certificado SSL. Corrija o certificado ou desabilite o acesso via https ao site.";
+$a->strings["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!"] = "Se você oferece acesso https ao seu website ou permite conexões na porta TCP 443 (a porta https:), você DEVE usar um certificado reconhecido pelos navegadores. Você NÃO DEVE usar certificados assinados por você mesmo!";
+$a->strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "Essa restrição é incorporada porque publicações públicas suas podem, por exemplo, conter referências a imagens no seu próprio hub.";
+$a->strings["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."] = "Se seu certificado não for reconhecido, membros de outros sites (que podem ter certificados válidos) receberão uma mensagem de aviso nos seus próprios sites reclamando de problemas de segurança.";
+$a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Isso pode causar problemas de usabilidade (não só no seu site) então nós precisamos insistir nesse requisito.";
+$a->strings["Providers are available that issue free certificates which are browser-valid."] = "Existem provedores que disponibilizam gratuitamente certificados reconhecidos por navegadores.";
+$a->strings["SSL certificate validation"] = "Validação do certificado SSL";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "A reescrita de URLs não está funcionando no .htaccess. Verifique as configurações do servidor. Teste:";
+$a->strings["Url rewrite is working"] = "A reescrita de URLs está funcionando";
+$a->strings["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."] = "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendika em seu servidor web.";
+$a->strings["Errors encountered creating database tables."] = "Foram encontrados erros durante a criação das tabelas do banco de dados.";
+$a->strings["<h1>What next</h1>"] = "<h1>Próximos passos</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Você deve configurar [manualmente] uma tarefa agendada para o coletor.";
$a->strings["OpenID protocol error. No ID returned."] = "Erro do protocolo OpenID. Nenhuma ID retornada.";
$a->strings["Welcome %s. Remote authentication successful."] = "Bem vindo %s. Autenticação remota realizada com sucesso.";
-$a->strings["%d rating"] = array(
- 0 => "%d avaliação",
- 1 => "%d avaliações",
-);
-$a->strings["Gender: "] = "Gênero: ";
-$a->strings["Status: "] = "Status:";
-$a->strings["Homepage: "] = "Website:";
-$a->strings["Hometown: "] = "Cidade natal:";
-$a->strings["About: "] = "Sobre:";
-$a->strings["Public Forum:"] = "Fórum público:";
-$a->strings["Keywords: "] = "Palavras-chave:";
-$a->strings["Common connections: %s"] = "Conexões em Comum: %s";
-$a->strings["Finding:"] = "Pesquisando:";
-$a->strings["next page"] = "próxima página";
-$a->strings["previous page"] = "página anterior";
-$a->strings["No entries (some entries may be hidden)."] = "Nenhuma entrada (algumas entradas podem estar escondidas).";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s marcou %3\$s de %2\$s com %4\$s";
$a->strings["Export Channel"] = "Exportar o canal";
$a->strings["Export your basic channel information to a small file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new hub, but\tdoes not contain your content."] = "Exportar suas informações básicas do canal para um arquivo pequeno. Isso funciona como um backup das suas ligações, permissões, perfis e dados básicos, que podem ser usados para importar os dados para um novo hub, não mas não contém seu conteúdo.";
$a->strings["Export Content"] = "Exportar conteúdo";
@@ -1653,6 +1573,7 @@ $a->strings["Registered channels"] = "Canais Registrados";
$a->strings["Active plugins"] = "Plugins ativos";
$a->strings["Version"] = "Versão";
$a->strings["Site settings updated."] = "As configurações de site foram atualizadas.";
+$a->strings["mobile"] = "móvel";
$a->strings["experimental"] = "experimental";
$a->strings["unsupported"] = "não suportado";
$a->strings["Yes - with approval"] = "Sim - pendente aprovação";
@@ -1682,6 +1603,10 @@ $a->strings["Does this site allow new member registration?"] = "Este site permit
$a->strings["Which best describes the types of account offered by this hub?"] = "Qual descreve melhor os tipos de conta oferecidas por este hub?";
$a->strings["Register text"] = "Texto de registro";
$a->strings["Will be displayed prominently on the registration page."] = "Será exibido proeminentemente na página de registro.";
+$a->strings["Site homepage to show visitors (default: login box)"] = "Deinir página inicial para exibir a visitantes (padrão: caixa de login)";
+$a->strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "exemplo: 'public' para mostrar o fluxo público, 'page/sys/home' para mostrar uma página web do sistema chamada 'home', ou 'include:home.html' para incluir um arquivo.";
+$a->strings["Preserve site homepage URL"] = "Preservar o URL da homepage do site";
+$a->strings["Present the site homepage in a frame at the original location instead of redirecting"] = "Apresentar a homepage do site em um frame na localização original ao invés de redirecionar";
$a->strings["Accounts abandoned after x days"] = "Contas abandonadas após x dias";
$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Não gastará recursos do sistema coletando de sites externos para contas abandonadas. Use 0 para sem limite de tempo.";
$a->strings["Allowed friend domains"] = "Domínios permitidos para amigos";
@@ -1698,8 +1623,8 @@ $a->strings["Force publish"] = "Forçar publicação";
$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Marque para forçar todos os perfis neste site a aparecerem listados no diretório do site.";
$a->strings["Disable discovery tab"] = "Desabilitar a aba \"Descubra\"";
$a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Remove da visualização de rede a aba com conteúdos públicos obtidos de fontes escolhidas para esse site.";
-$a->strings["No login on Homepage"] = "Sem formulário de autenticação na página inicial";
-$a->strings["Check to hide the login form from your sites homepage when visitors arrive who are not logged in (e.g. when you put the content of the homepage in via the site channel)."] = "Marque para esconder o formulário de autenticação da página inicial do seu site quando visitantes chegarem sem estar autenticados (e.g. quando você inclui os conteúdos da página inicial através do canal do site).";
+$a->strings["login on Homepage"] = "login na Página inicial";
+$a->strings["Present a login box to visitors on the home page if no other content has been configured."] = "Apresentar uma caixa de login para visitantes na página inicial se nenhum outro conteúdo foi configurado.";
$a->strings["Proxy user"] = "Usuário do proxy";
$a->strings["Proxy URL"] = "URL do proxy";
$a->strings["Network timeout"] = "Timeout da rede";
@@ -1764,16 +1689,24 @@ $a->strings["%s channel censored/uncensored"] = array(
0 => "%s canal censurado/descensurado",
1 => "%s canais censurados/descensurados",
);
+$a->strings["%s channel code allowed/disallowed"] = array(
+ 0 => "%s canal com código permitido/proibido",
+ 1 => "%s canais com código permitido/proibido",
+);
$a->strings["%s channel deleted"] = array(
0 => "%s canal deletado",
1 => "%s canais deletados",
);
$a->strings["Channel not found"] = "Canal não encontrado";
$a->strings["Channel '%s' deleted"] = "Canal '%s' deletado";
-$a->strings["Channel '%s' uncensored"] = "Canal '%s' não censurado";
$a->strings["Channel '%s' censored"] = "Canal '%s' censurado";
+$a->strings["Channel '%s' uncensored"] = "Canal '%s' não censurado";
+$a->strings["Channel '%s' code allowed"] = "Código permitido para o canal '%s'";
+$a->strings["Channel '%s' code disallowed"] = "Código proibido para o canal '%s'";
$a->strings["Censor"] = "Censurar";
$a->strings["Uncensor"] = "Não censurar";
+$a->strings["Allow Code"] = "Permitir código";
+$a->strings["Disallow Code"] = "Proibir código";
$a->strings["UID"] = "UID";
$a->strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Os canais selecionados serão deletados!\\n\\nTudo que foi postado nesses canais nesse site será permanentemente deletado!\\n\\nVocê tem certeza?";
$a->strings["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?"] = "O canal {0} será deletado!\\n\\nTudo o que foi postado nesse canal nesse site será permanentemente deletado!\\n\\nVocê tem certeza?";
@@ -1806,8 +1739,6 @@ $a->strings["Field definition not found"] = "A dfinição de campo não foi enco
$a->strings["Edit Profile Field"] = "Editar campo de perfil";
$a->strings["Unable to find your hub."] = "Não foi possível localizar seu hub.";
$a->strings["Post successful."] = "Publicado com sucesso.";
-$a->strings["Edit Block"] = "Editar bloco";
-$a->strings["Delete block?"] = "Deletar bloco?";
$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Número máximo de novos registros neste site excedido por hoje. Por favor, tente novamente amanhã.";
$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Por favor, indique a aceitação dos Termos de Serviço. Falha ao registrar.";
$a->strings["Passwords do not match."] = "Senhas não conferem.";
@@ -1833,19 +1764,154 @@ $a->strings["This action is permanent and can not be undone!"] = "Esta ação é
$a->strings["Please enter your password for verification:"] = "Por favor, digite a sua senha para verificação:";
$a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Remove esta conta, todos os seus canais e todos os clones desses canais da rede.";
$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Por padrão, apenas as instâncias dos canais localizadas neste hub serão removidas da rede";
-$a->strings["Unable to locate original post."] = "Não foi possível localizar a publicação original.";
-$a->strings["Empty post discarded."] = "A publicação em branco foi descartada.";
-$a->strings["Executable content type not permitted to this channel."] = "Conteúdo de tipo executável não permitido para este canal.";
-$a->strings["System error. Post not saved."] = "Erro no sistema. A publicação não foi salva.";
-$a->strings["Unable to obtain post information from database."] = "Impossível obter informação do texto no banco de dados";
-$a->strings["You have reached your limit of %1$.0f top level posts."] = "Você atingiu o seu limite de %1$.0f publicações de novos tópicos.";
-$a->strings["You have reached your limit of %1$.0f webpages."] = "Você atingiu o seu limite de %1$.0f páginas web.";
+$a->strings["Remove Account"] = "Remover conta";
+$a->strings["Help:"] = "Ajuda:";
+$a->strings["Not Found"] = "Não encontrada";
+$a->strings["\$Projectname Documentation"] = "Documentação de \$Projectname";
$a->strings["[Embedded content - reload page to view]"] = "[Conteúdo incorporado - recarregue a página para ver]";
$a->strings["Remote privacy information not available."] = "Não existe informação disponível sobre a privacidade remota.";
$a->strings["Visible to:"] = "Visível para:";
-$a->strings["Comanche page description language help"] = "Página de Ajuda da descrição da Linguagem Comanche ";
-$a->strings["Layout Description"] = "Descrição de Layout";
-$a->strings["Download PDL file"] = "Baixar arquivo PDL";
+$a->strings["Name is required"] = "É necessário informar o nome";
+$a->strings["Key and Secret are required"] = "A chave e o segredo são obrigatórios";
+$a->strings["Diaspora Policy Settings updated."] = "Configurações da política do Diáspora atualizadas.";
+$a->strings["Passwords do not match. Password unchanged."] = "As senhas não correspondem. A senha não foi modificada.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "Não é permitido uma senha em branco. A senha não foi modificada.";
+$a->strings["Password changed."] = "A senha foi modificada.";
+$a->strings["Password update failed. Please try again."] = "Não foi possível atualizar a senha. Por favor, tente novamente.";
+$a->strings["Not valid email."] = "Não é um e-mail válido";
+$a->strings["Protected email address. Cannot change to that email."] = "Endereço de e-mail protegido. Não é possível mudar para esse e-mail.";
+$a->strings["System failure storing new email. Please try again."] = "Falha do sistema ao armazenar novo e-mail. Por favor, tente novamente.";
+$a->strings["Settings updated."] = "As configurações foram atualizadas.";
+$a->strings["Add application"] = "Adicionar aplicação";
+$a->strings["Name of application"] = "Nome da aplicação";
+$a->strings["Consumer Key"] = "Chave de consumidor";
+$a->strings["Automatically generated - change if desired. Max length 20"] = "Gerado automaticamente - troque se desejável. Comprimento máximo 20";
+$a->strings["Consumer Secret"] = "Segredo de consumidor";
+$a->strings["Redirect"] = "Redirecionamento";
+$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI de redirecionamento - deixe em branco, a não ser que sua aplicação especificamente requeira isso";
+$a->strings["Icon url"] = "URL do ícone";
+$a->strings["Optional"] = "Opcional";
+$a->strings["You can't edit this application."] = "Você não pode editar esta aplicação.";
+$a->strings["Connected Apps"] = "Aplicações conectadas";
+$a->strings["Client key starts with"] = "Chave do cliente começa com";
+$a->strings["No name"] = "Sem nome";
+$a->strings["Remove authorization"] = "Remover autorização";
+$a->strings["No feature settings configured"] = "Não foi definida nenhuma configuração do recurso";
+$a->strings["Feature/Addon Settings"] = "Configuração de Característica/Plugins";
+$a->strings["Settings for the built-in Diaspora emulator"] = "Configurações para construir um emulador de Diáspora";
+$a->strings["Allow any Diaspora member to comment on your public posts"] = "Permitir que qualquer membro do Diaspora comente em suas postagens públicas";
+$a->strings["Enable the Diaspora protocol for this channel"] = "Habilitar o protocolo Diaspora para este canal";
+$a->strings["Diaspora Policy Settings"] = "Configurações de Política do Diáspora";
+$a->strings["Prevent your hashtags from being redirected to other sites"] = "Previne que suas hashtags sejam redirecionadas para outros sítios";
+$a->strings["Account Settings"] = "Configurações da conta";
+$a->strings["Enter New Password:"] = "Digite a Nova Senha:";
+$a->strings["Confirm New Password:"] = "Confirme a Nova Senha:";
+$a->strings["Leave password fields blank unless changing"] = "Deixe os campos de senha em branco, a não ser que você queira alterá-la";
+$a->strings["Email Address:"] = "Endereço de e-mail:";
+$a->strings["Remove this account including all its channels"] = "Exclua esta conta, incluindo todos seus canais";
+$a->strings["Off"] = "Desligado";
+$a->strings["On"] = "Ligado";
+$a->strings["Additional Features"] = "Recursos adicionais";
+$a->strings["Connector Settings"] = "Configurações do conector";
+$a->strings["No special theme for mobile devices"] = "Sem tema especial para aparelhos móveis";
+$a->strings["%s - (Experimental)"] = "%s - (Experimental)";
+$a->strings["Display Settings"] = "Configurações de exibição";
+$a->strings["Theme Settings"] = "Configurações de tema";
+$a->strings["Custom Theme Settings"] = "Configurações personalizadas de tema";
+$a->strings["Content Settings"] = "Configurações de conteúdo";
+$a->strings["Display Theme:"] = "Tema do perfil:";
+$a->strings["Mobile Theme:"] = "Tema móvel:";
+$a->strings["Enable user zoom on mobile devices"] = "Permitir zoom pelo usuário em dispositivos móveis";
+$a->strings["Update browser every xx seconds"] = "Atualizar navegador a cada xx segundos";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Mínimo de 10 segundos, sem máximo";
+$a->strings["Maximum number of conversations to load at any time:"] = "Número máximo permitido de conversas carregadas:";
+$a->strings["Maximum of 100 items"] = "Máximo de 100 itens";
+$a->strings["Show emoticons (smilies) as images"] = "Mostrar emoticons (smilies) como imagens";
+$a->strings["Link post titles to source"] = "Ligar o título dos posts à fonte";
+$a->strings["System Page Layout Editor - (advanced)"] = "Editor de layout de página do sistema - (avançado)";
+$a->strings["Use blog/list mode on channel page"] = "Usar modo blog/lista na página do canal";
+$a->strings["(comments displayed separately)"] = "(comentários mostrados separadamente)";
+$a->strings["Use blog/list mode on matrix page"] = "Use modo de blogue/lista na página da matriz";
+$a->strings["Channel page max height of content (in pixels)"] = "Altura máxima do conteúdo na página (em pixels)";
+$a->strings["click to expand content exceeding this height"] = "clique para expandir o conteúdo que excede essa altura";
+$a->strings["Matrix page max height of content (in pixels)"] = "Máxima altura de conteúdo na página Matriz (in pixesl)";
+$a->strings["Nobody except yourself"] = "Ninguém exceto você mesmo";
+$a->strings["Only those you specifically allow"] = "Apenas quem você der permissão";
+$a->strings["Approved connections"] = "Conexões aprovadas";
+$a->strings["Any connections"] = "Quaisquer conexões";
+$a->strings["Anybody on this website"] = "Qualquer um neste site";
+$a->strings["Anybody in this network"] = "Qualquer um nesta rede";
+$a->strings["Anybody authenticated"] = "Qualquer um autenticado";
+$a->strings["Anybody on the internet"] = "Qualquer um na internet";
+$a->strings["Publish your default profile in the network directory"] = "Publicar seu perfil padrão no diretório da rede?";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Permitir sugerir você como amigo potencial para outros membros?";
+$a->strings["Your channel address is"] = "O endereço do seu canal é";
+$a->strings["Channel Settings"] = "Configurações do canal";
+$a->strings["Basic Settings"] = "Configurações básicas";
+$a->strings["Your Timezone:"] = "Seu fuso horário:";
+$a->strings["Default Post Location:"] = "Localização padrão de suas publicações:";
+$a->strings["Geographical location to display on your posts"] = "Localização geográfica para exibir em suas publicações";
+$a->strings["Use Browser Location:"] = "Usar localizador do navegador:";
+$a->strings["Adult Content"] = "Conteúdo adulto";
+$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Este canal frequentemente ou regularmente publica conteúdo adulto. (Por favor marque qualquer material adulto e/ou nudez com #NSFW)";
+$a->strings["Security and Privacy Settings"] = "Configurações de segurança e privacidade";
+$a->strings["Your permissions are already configured. Click to view/adjust"] = "Suas permissões já foram configuradas. Clique para vê-las/ajustá-las";
+$a->strings["Hide my online presence"] = "Esconda minha presença online";
+$a->strings["Prevents displaying in your profile that you are online"] = "Previne exibir em seu perfil que você está online";
+$a->strings["Simple Privacy Settings:"] = "Configurações de privacidade simples:";
+$a->strings["Very Public - <em>extremely permissive (should be used with caution)</em>"] = "Muito público - <em>extremamente permissivo (deve ser usado com cuidado)</em>";
+$a->strings["Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>"] = "Típico - <em>público por padrão, privado quando desejável (similar às permissões de redes sociais, mas com melhor privacidade)</em>";
+$a->strings["Private - <em>default private, never open or public</em>"] = "Privado - <em>privado por padrão, nunca aberto ou público</em>";
+$a->strings["Blocked - <em>default blocked to/from everybody</em>"] = "Bloqueado - <em>por padrão bloquado de/para todos</em>";
+$a->strings["Allow others to tag your posts"] = "Permitir que outros etiquetem suas publicações";
+$a->strings["Often used by the community to retro-actively flag inappropriate content"] = "Frequentemente utilizado pela comunidade para retroativamente sinalizar conteúdo inapropriado";
+$a->strings["Advanced Privacy Settings"] = "Configurações de privacidade avançadas";
+$a->strings["Expire other channel content after this many days"] = "Expirar outros conteúdos do canal após este número de dias";
+$a->strings["0 or blank prevents expiration"] = "0 ou em branco previne expiração";
+$a->strings["Maximum Friend Requests/Day:"] = "Número máximo de requisições de amizade por dia:";
+$a->strings["May reduce spam activity"] = "Pode reduzir a frequência de spam";
+$a->strings["Default Post Permissions"] = "Permissões padrão de publicação";
+$a->strings["Channel permissions category:"] = "Categoria de permissões do canal:";
+$a->strings["Maximum private messages per day from unknown people:"] = "Máximo número de mensagens privadas por dia de pessoas desconhecidas:";
+$a->strings["Useful to reduce spamming"] = "Útil para reduzir a frequência de spam";
+$a->strings["Notification Settings"] = "Configurações de notificação";
+$a->strings["By default post a status message when:"] = "Por padrão, publicar uma mensagem de status quando:";
+$a->strings["accepting a friend request"] = "aceitar um pedido de amizade";
+$a->strings["joining a forum/community"] = "associar-se a um fórum/comunidade";
+$a->strings["making an <em>interesting</em> profile change"] = "modificar algo <em>interessante</em> em seu perfil";
+$a->strings["Send a notification email when:"] = "Enviar um e-mail de notificação quando:";
+$a->strings["You receive a connection request"] = "Você recebe uma solicitação de conexão";
+$a->strings["Your connections are confirmed"] = "Suas conexões são confirmadas";
+$a->strings["Someone writes on your profile wall"] = "Alguém escrever no mural do seu perfil";
+$a->strings["Someone writes a followup comment"] = "Alguém comenta uma publicação";
+$a->strings["You receive a private message"] = "Você recebeu uma mensagem privada";
+$a->strings["You receive a friend suggestion"] = "Você recebe uma sugestão de amizade";
+$a->strings["You are tagged in a post"] = "Você é mencionado num post";
+$a->strings["You are poked/prodded/etc. in a post"] = "Você foi cutucado/espetado/etc. numa publicação";
+$a->strings["Show visual notifications including:"] = "Exibir notificações visuais incluindo:";
+$a->strings["Unseen matrix activity"] = "Atividade não vista na matriz";
+$a->strings["Unseen channel activity"] = "Atividade não vista no canal";
+$a->strings["Unseen private messages"] = "Mensagens privadas não vistas";
+$a->strings["Recommended"] = "Recomendado";
+$a->strings["Upcoming events"] = "Eventos próximos";
+$a->strings["Events today"] = "Eventos hoje";
+$a->strings["Upcoming birthdays"] = "Aniversários próximos";
+$a->strings["Not available in all themes"] = "Não disponível em todos os temas";
+$a->strings["System (personal) notifications"] = "Notificações de sistema (pessoais)";
+$a->strings["System info messages"] = "Mensagens de informação do sistema";
+$a->strings["System critical alerts"] = "Alertas críticos do sistema";
+$a->strings["New connections"] = "Novas conexões";
+$a->strings["System Registrations"] = "Registros no sistema";
+$a->strings["Also show new wall posts, private messages and connections under Notices"] = "Também mostra novos textos, mensagens privadas e conexões nos Avisos";
+$a->strings["Notify me of events this many days in advance"] = "Notifique-me de eventos adiante esse número de dias";
+$a->strings["Must be greater than 0"] = "Deve ser maior que 0";
+$a->strings["Advanced Account/Page Type Settings"] = "Configurações avançadas de conta/tipo de página";
+$a->strings["Change the behaviour of this account for special situations"] = "Mudar o comportamento dessa conta em situações especiais";
+$a->strings["Please enable expert mode (in <a href=\"settings/features\">Settings > Additional features</a>) to adjust!"] = "Por favor, habilite o modo expert (em <a href=\"settings/features\">Configurações > Recursos adicionais</a>) para ajustar!";
+$a->strings["Miscellaneous Settings"] = "Configurações miscelâneas";
+$a->strings["Personal menu to display in your channel pages"] = "Menu pessoal para exibir nas páginas dos seus canais";
+$a->strings["Remove Channel"] = "Remover canal";
+$a->strings["Remove this channel."] = "Remover este canal";
$a->strings["First Name"] = "Primeiro Nome";
$a->strings["Last Name"] = "Último Nome";
$a->strings["Nickname"] = "Apelido";
@@ -1866,37 +1932,9 @@ $a->strings["Conversation removed."] = "A conversa foi removida.";
$a->strings["No messages."] = "Nenhuma mensagem.";
$a->strings["Delete conversation"] = "Excluir conversa";
$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
-$a->strings["Unable to create element."] = "Não foi possível criar elemento.";
-$a->strings["Unable to update menu element."] = "Não foi possível atualizar o elemento de menu.";
-$a->strings["Unable to add menu element."] = "Não foi possível adicionar o elemento de menu.";
-$a->strings["Menu Item Permissions"] = "Permissões do item do menu";
-$a->strings["Link Name"] = "Nome do Link";
-$a->strings["Link or Submenu Target"] = "Alvo do Link ou Submenu";
-$a->strings["Enter URL of the link or select a menu name to create a submenu"] = "Insira o URL do link ou selecione um nome de menu para criar um submenu";
-$a->strings["Use magic-auth if available"] = "Usar magic-auth se disponível";
-$a->strings["Open link in new window"] = "Abrir link em uma nova janela";
-$a->strings["Order in list"] = "Ordem na lista";
-$a->strings["Higher numbers will sink to bottom of listing"] = "Números mais altos descem para o fim da lista";
-$a->strings["Submit and finish"] = "Enviar e terminar";
-$a->strings["Submit and continue"] = "Enviar e continuar";
-$a->strings["Menu:"] = "Menu:";
-$a->strings["Link Target"] = "Alvo do Link";
-$a->strings["Edit menu"] = "Editar menu";
-$a->strings["Edit element"] = "Editar elemento";
-$a->strings["Drop element"] = "Descartar elemento";
-$a->strings["New element"] = "Novo elemento";
-$a->strings["Edit this menu container"] = "Editar esta caixa de menu";
-$a->strings["Add menu element"] = "Adicionar um elemento de menu";
-$a->strings["Delete this menu item"] = "Deleter este item de menu";
-$a->strings["Edit this menu item"] = "Editar este item de menu";
-$a->strings["Menu item not found."] = "O item de menu não foi encontrado.";
-$a->strings["Menu item deleted."] = "O item de menu foi deletado.";
-$a->strings["Menu item could not be deleted."] = "Não foi possível deletar o item de menu.";
-$a->strings["Edit Menu Element"] = "Editar elemento de menu";
-$a->strings["Link text"] = "Texto do link";
$a->strings["Set your current mood and tell your friends"] = "Marque seu humor atual e compartilhe com seus amigos";
$a->strings["Total votes"] = "Votos totais";
-$a->strings["Average Rating"] = "Avaliação média";
+$a->strings["Average Rating"] = "Média das avaliações";
$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "A remoção da canais fica desabilitada por 48 horas após uma troca de senha da conta.";
$a->strings["Remove This Channel"] = "Remover este canal";
$a->strings["This channel will be completely removed from the network. "] = "Este canal será completamente excluído da rede.";
@@ -1935,44 +1973,32 @@ $a->strings["Hide or Unhide this connection from your other connections"] = "Esc
$a->strings["Delete this connection"] = "Deletar esta conexão";
$a->strings["Approve this connection"] = "Aprovar esta conexão";
$a->strings["Accept connection to allow communication"] = "Aceite a conexão para permitir comunicação";
-$a->strings["Connections: settings for %s"] = "Conexões: configurações para %s";
+$a->strings["Set Affinity"] = "Definir afinidade";
+$a->strings["Set Profile"] = "Definir perfil";
+$a->strings["Set Affinity & Profile"] = "Definir afinidade & perfil";
$a->strings["Apply these permissions automatically"] = "Aplicar essas permissões automaticamente";
-$a->strings["Apply the permissions indicated on this page to all new connections."] = "Aplicar as permissões indicadas nesta página para todas as novas conexões.";
+$a->strings["This connection's address is"] = "O endereço dessa conexão é";
+$a->strings["The permissions indicated on this page will be applied to all new connections."] = "As permissões indicadas nesta página serão aplicadas a todas as novas conexões.";
$a->strings["Slide to adjust your degree of friendship"] = "Deslize para ajustar seu grau de amizade";
-$a->strings["Default permissions for your channel type have (just) been applied. They have not yet been submitted. Please review the permissions on this page and make any desired changes at this time. This new connection may <em>not</em> be able to communicate with you until you submit this page, which will install and apply the selected permissions."] = "Permissões padrões para seu tipo de canal foram (apenas) aplicadas. Elas ainda não foram enviadas. Por favor, revise as permissões nesta página e faça as alterações desejadas neste momento. Esta nova ligação poderá <em> não </ em> ser capaz de se comunicar com você até que você envie os dados desta página, que instalará e aplicará as permissões selecionadas.";
+$a->strings["Slide to adjust your rating"] = "Deslize para ajustar sua avaliação";
+$a->strings["Optionally explain your rating"] = "Opcionalmente explique sua avaliação";
+$a->strings["Custom Filter"] = "Filtro personalizado";
+$a->strings["Only import posts with this text"] = "Importar apenas publicações com este texto";
+$a->strings["words one per line or #tags or /patterns/, leave blank to import all posts"] = "palavras uma por linha ou #tags ou /padrões/, deixe branco para importar todas as publicações";
+$a->strings["Do not import posts with this text"] = "Não importar posts com este texto";
+$a->strings["This information is public!"] = "Esta informação é pública!";
+$a->strings["Connection Pending Approval"] = "Conexão pendente de aprovação";
+$a->strings["Connection Request"] = "Solicitação de conexão";
+$a->strings["(%s) would like to connect with you. Please approve this connection to allow communication."] = "(%s) gostaria de conectar-se contigo. Por favor aprove esta conexão para permitir comunicação.";
+$a->strings["Approve Later"] = "Aprovar depois";
$a->strings["inherited"] = "herdado";
-$a->strings["Connection has no individual permissions!"] = "A conexão não tem permissões individuais!";
-$a->strings["This may be appropriate based on your <a href=\"settings\">privacy settings</a>, though you may wish to review the \"Advanced Permissions\"."] = "Isso pode ser adequado baseado nas suas <a href=\"settings\">configurações de privacidade</a>, mas talvez você queira rever suas \"Permissões Avançadas\".";
-$a->strings["Profile Visibility"] = "Visibilidade do perfil";
$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, selecione o perfil que você gostaria de exibir para %s quando estiver visualizando seu perfil de modo seguro.";
-$a->strings["Contact Information / Notes"] = "Informações de contato / Notas";
-$a->strings["Edit contact notes"] = "Editar anotações sobre o contato";
$a->strings["Their Settings"] = "Configurações dele/a";
$a->strings["My Settings"] = "Minhas configurações";
-$a->strings["Default permissions for this channel type have (just) been applied. They have <em>not</em> been saved and there are currently no stored default permissions. Please review/edit the applied settings and click [Submit] to finalize."] = "Permissões padrões para este tipo de canal foram (apenas) aplicadas. Elas <em> não </ em> foram salvas e não existem no momento permissões padrões armazenadas. Por favor, reveja / edite as configurações aplicadas e clique em [Enviar] para finalizar.";
-$a->strings["Clear/Disable Automatic Permissions"] = "Limpa/Desabilita permissões automáticas";
-$a->strings["Forum Members"] = "Membros de fórum";
-$a->strings["Soapbox"] = "Caixa de sabão";
-$a->strings["Full Sharing (typical social network permissions)"] = "Compartilhamento completo (permissões típicas de redes sociais)";
-$a->strings["Cautious Sharing "] = "Compartilhamento cauteloso";
-$a->strings["Follow Only"] = "Apenas seguir";
$a->strings["Individual Permissions"] = "Permissões individuais";
-$a->strings["Some permissions may be inherited from your channel <a href=\"settings\">privacy settings</a>, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = "Algumas permissões serão herdadas das <a href=\"settings\">configurações de privacidade</a> do seu canal, e terão prioridade sobre as configurações individuais. Modificar nesta página tais configurações herdadas não surtirá efeito algum.";
-$a->strings["Advanced Permissions"] = "Permissões avançadas";
-$a->strings["Simple Permissions (select one and submit)"] = "Permissões simples (slecione uma e submeta)";
-$a->strings["Visit %s's profile - %s"] = "Ver o perfil de %s - %s";
-$a->strings["Block/Unblock contact"] = "Bloquear/desbloquear o contato";
-$a->strings["Ignore contact"] = "Ignorar o contato";
-$a->strings["Repair URL settings"] = "Reparar configurações de URL";
-$a->strings["View conversations"] = "Ver as conversas";
-$a->strings["Delete contact"] = "Excluir o contato";
+$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Algumas permissões podem ser herdadas das <a href=\"settings\"><strong>configurações de privacidade</strong></a> do seu canal, que tem prioridade sobre configurações individuais. Você <strong>não</strong> pode mudar tais configurações aqui.";
+$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Algumas permissões serão herdadas das <a href=\"settings\"><strong>configurações de privacidade<strong></a> do seu canal, que tem prioridade sobre configurações individuais. Você pode modificar tais configurações individuais nesta página mas elas não surtirão efeito sem mudar a configuração do canal sendo herdada.";
$a->strings["Last update:"] = "Última atualização:";
-$a->strings["Update public posts"] = "Atualizar publicações públicas";
-$a->strings["Update now"] = "Atualizar agora";
-$a->strings["Currently blocked"] = "Atualmente bloqueado";
-$a->strings["Currently ignored"] = "Atualmente ignorado";
-$a->strings["Currently archived"] = "Atualmente arquivado";
-$a->strings["Currently pending"] = "Atualmente pendente";
$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Encontramos um problema ao entrar com a OpenID fornecida. Por favor, verifique se digitou corretamente a ID.";
$a->strings["The error message was:"] = "A mensagem de erro foi:";
$a->strings["Authentication failed."] = "A autenticação falhou.";
@@ -2024,18 +2050,18 @@ $a->strings["Location (URL) to purchase app"] = "Endereço (URL) para comprar o
$a->strings["sent you a private message"] = "lhe enviou uma mensagem privada";
$a->strings["added your channel"] = "adicionou seu canal";
$a->strings["posted an event"] = "publicou um evento";
-$a->strings["No such group"] = "Este grupo não existe";
-$a->strings["No such channel"] = "Nenhum canal";
-$a->strings["Search Results For:"] = "Resultados da busca por:";
-$a->strings["Collection is empty"] = "A coleção está vazia";
-$a->strings["Collection: "] = "Coleção:";
-$a->strings["Connection: "] = "Conexão:";
-$a->strings["Invalid connection."] = "Conexão inválida.";
-$a->strings["Ipsum Lorem"] = "Ipsum Lorem";
+$a->strings["Comanche page description language help"] = "Página de Ajuda da descrição da Linguagem Comanche ";
+$a->strings["Layout Description"] = "Descrição de Layout";
+$a->strings["Download PDL file"] = "Baixar arquivo PDL";
+$a->strings["Welcome to %s"] = "Bem-vindo(a) a %s";
+$a->strings["Lorem Ipsum"] = "Lorem ipsum";
$a->strings["Bookmark added"] = "O link foi guardado";
$a->strings["My Bookmarks"] = "Meus links guardados";
$a->strings["My Connections Bookmarks"] = "Links guardados das minhas conexões";
$a->strings["Insufficient permissions. Request redirected to profile page."] = "Permissões insuficientes. Requisição redirecionada para a página de perfil.";
+$a->strings["This setting requires special processing and editing has been blocked."] = "Essa configuração requer processamento especial e a edição foi bloqueada.";
+$a->strings["Configuration Editor"] = "Editor de configurações";
+$a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Atenção: Mudar algumas configurações pode deixar seu canal inoperável. Por favor deixe essa página a não ser que esteja confortável e tenha o conhecimento para utilizar este recurso.";
$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Nenhuma sugestão disponível. Se este site é novo, por favor tente novamente em 24 horas.";
$a->strings["Poll"] = "Enquete";
$a->strings["View Results"] = "Ver resultados";
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index fcc089cf0..046d8471b 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -264,12 +264,20 @@ footer {
}
/*TODO: we should use one class for all this. */
-/*
-.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
- color: #444 !important;
- text-decoration: none !important;
+
+.group-selected,
+.fileas-selected,
+.categories-selected,
+.search-selected,
+.active,
+.group-selected:hover,
+.fileas-selected:hover,
+.categories-selected:hover,
+.search-selected:hover,
+.active:hover {
+ color: $font_colour;
}
-*/
+
.fileas-all {
text-decoration: none !important;
@@ -347,7 +355,8 @@ footer {
word-wrap: break-word;
}
-.vcard dl {
+.vcard dl,
+.vcard .title {
margin-top: 10px;
margin-bottom: 0px;
}
@@ -406,13 +415,19 @@ footer {
#profile-photo-wrapper img {
- padding: 10px;
- width: 197px;
- height: 197px;
+ width: 100%;
+ height: 100%;
+ max-width: 300px;
+ max-height: 300px;
}
#profile-photo-wrapper {
- margin-top: 10px;
+ width: 251px;
+ height: 251px;
+ margin-top: -10px;
+ margin-bottom: 10px;
+ border: 1px solid #ccc;
+ border-radius: $radiuspx;
}
@@ -504,7 +519,6 @@ footer {
display: block;
}
-
.pager {
padding: 10px;
text-align: center;
@@ -570,10 +584,6 @@ footer {
margin-left: 5px;
}
-.photo {
- border: 1px solid #AAAAAA;
-}
-
.photo-top-photo, .photo-album-photo {
/* padding: 10px;
max-width: 300px;
@@ -704,8 +714,8 @@ a.rateme, div.rateme {
.contact-block-div {
float: left;
- width: 49px;
- height: 49px;
+ width: 50px;
+ height: 50px;
}
.contact-block-textdiv {
float: left;
@@ -720,8 +730,8 @@ a.rateme, div.rateme {
float: left;
}
.contact-block-img {
- width:47px;
- height:47px;
+ width:48px;
+ height:48px;
}
#tag-remove {
@@ -741,8 +751,8 @@ a.rateme, div.rateme {
}
.wall-item-conv {
- margin-top: 5px;
- margin-bottom: 25px;
+ padding-top: 5px;
+ padding-bottom: 10px;
}
@@ -1274,12 +1284,6 @@ div.jGrowl div.jGrowl-notification {
text-align: center;
}
-#contact-slider {
- position: relative;
- left: 5%;
- width: 90%;
-}
-
a.rconnect, a.rateme, div.rateme {
color: $nav_active_icon_colour;
text-decoration: none;
@@ -1587,8 +1591,8 @@ img.mail-list-sender-photo {
}
.jothidden > input {
- border: 1px solid $bgcolour;
- background-color: $bgcolour;
+ border: 1px solid transparent;
+ background-color: transparent;
}
.jothidden > input:hover,
.jothidden > input:focus {
@@ -1922,7 +1926,7 @@ nav .dropdown-menu {
.section-content-wrapper .section-content-warning-wrapper,
.section-content-tools-wrapper .section-content-danger-wrapper,
.section-content-wrapper .section-content-danger-wrapper {
- margin-bottom: 0px;
+ margin-bottom: 10px;
border-radius: $radiuspx;
}
@@ -1932,12 +1936,14 @@ nav .dropdown-menu {
background-color: $comment_item_colour;
border-bottom-left-radius: $radiuspx;
border-bottom-right-radius: $radiuspx;
+ word-wrap: break-word;
}
.section-content-wrapper-np {
background-color: $comment_item_colour;
border-bottom-left-radius: $radiuspx;
border-bottom-right-radius: $radiuspx;
+ word-wrap: break-word;
}
[id^="cloud-index-"]:hover td,
@@ -1953,6 +1959,10 @@ nav .dropdown-menu {
background-color: $item_colour;
}
+#perms-tool-table .highlight:hover {
+ background-color: $item_colour;
+}
+
nav ul li .undefined,
nav ul li .notify-seen,
nav ul li .notify-unseen
@@ -2107,6 +2117,7 @@ nav .badge.mail-update:hover {
}
@media screen and (max-width: 767px) {
+
aside#region_1 {
background: rgba(0, 0, 0, .1);
border-right: 1px solid $nav_bd;
@@ -2285,4 +2296,3 @@ nav .badge.mail-update:hover {
.channels_ckbx, .pending_ckbx, .users_ckbx {
margin-top: -5px !important;
}
-
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 68190778c..302efc365 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -7,7 +7,7 @@ $(document).ready(function() {
if( $('#css3-calc').width() == 10) {
$(window).resize(function() {
if($(window).width() < 767) {
- $('main').css('width', $(window).width() + 231 );
+ $('main').css('width', $(window).width() + 285 );
} else {
$('main').css('width', '100%' );
}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 6e68d38d5..96dba59e5 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -154,7 +154,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
$x = file_get_contents('view/theme/redbasic/css/style.css');
- $aside_width = 231;
+ $aside_width = 285;
// left aside and right aside are is 231px + converse width
if($converse_center) {
diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css
index 8d945a83e..ea983ffc8 100644
--- a/view/theme/redbasic/schema/focus.css
+++ b/view/theme/redbasic/schema/focus.css
@@ -16,12 +16,7 @@
background-color: #fff;
}
-#redbasic_converse_center_container {
- display: none;
-}
-
.wall-item-conv {
- margin-bottom: 10px;
- margin-top: 10px;
- margin-left: 10px;
+ padding-top: 10px;
+ padding-left: 10px;
}
diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php
index 2a6900271..1f1963764 100644
--- a/view/theme/redbasic/schema/focus.php
+++ b/view/theme/redbasic/schema/focus.php
@@ -46,7 +46,7 @@ if (! $radius)
if (! $shadow)
$shadow = "0";
if (! $converse_width)
- $converse_width = "640";
+ $converse_width = "790";
if(! $top_photo)
$top_photo = '48px';
if(! $comment_indent)
@@ -61,5 +61,3 @@ else {
$nav_float_min_opacity = (float) $nav_min_opacity;
$nav_percent_min_opacity = (int) 100 * $nav_min_opacity;
}
-
-$converse_center = "1";
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index d118cbb9c..0a7cf2d4d 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -1,140 +1,223 @@
-<div class="generic-content-wrapper-styled">
-<h2>{{$header}}</h2>
-
-<h3>{{$addr}}</h3>
-
-{{if $notself}}
-<div id="connection-flag-tabs">
-{{$tabs}}
-</div>
-<div id="connection-edit-buttons">
-{{foreach $buttons as $b }}
-<button class="btn btn-sm btn-default" title="{{$b.title}}" onclick="window.location.href='{{$b.url}}'; return false;">{{$b.label}}</button>
-{{/foreach}}
-{{/if}}
-
-
-<div id="contact-edit-wrapper">
-<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
-
-<div class="abook-permsnew" style="display: none;">
-<div class="abook-perms-msg">{{$perms_step1}}</div>
-</div>
-
-<div class="abook-permsmsg" style="display: none;">
-<div class="abook-perms-msg">{{$perms_new}}</div>
-</div>
-
-
-<div class="abook-permssave" style="display: none;">
-<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
-</div>
-
-{{if $last_update}}
-{{$lastupdtext}} {{$last_update}}
-{{/if}}
-
-
-{{if $is_pending}}
-<div class="abook-pending-contact">
-{{include file="field_checkbox.tpl" field=$unapproved}}
-</div>
-{{/if}}
-
-
-{{if $notself}}
-{{if $slide}}
-<h3>{{$lbl_slider}}</h3>
-
-{{$slide}}
-
-{{/if}}
-
-{{if $connfilter}}
- {{include file="field_textarea.tpl" field=$incl}}
- {{include file="field_textarea.tpl" field=$excl}}
-{{else}}
- <input type="hidden" name="{{$incl.0}}" value="{{$incl.2}}" />
- <input type="hidden" name="{{$excl.0}}" value="{{$excl.2}}" />
-{{/if}}
-
-{{if $rating}}
-<h3>{{$lbl_rating}}</h3>
-
-{{$rating}}
-
-
-{{/if}}
-
-
-
-{{/if}}
-
-
-{{if $self}}
-<div class="abook-autotext">
-<div id="autoperm-desc" class="descriptive-paragraph">{{$autolbl}}</div>
-{{include file="field_checkbox.tpl" field=$autoperms}}
-</div>
-{{/if}}
-
-<input type="hidden" name="contact_id" value="{{$contact_id}}">
-<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
-<input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
-
-
-{{if $rating}}
-{{if $notself}}
- {{include file="field_textarea.tpl" field=$rating_text}}
-{{/if}}
-{{/if}}
-
-{{if $notself}}
-{{if $multiprofs }}
-<div>
-<h3>{{$lbl_vis1}}</h3>
-<div>{{$lbl_vis2}}</div>
-
-{{$profile_select}}
-</div>
-{{/if}}
-{{/if}}
-
-<h3>{{$permlbl}}</h3>
-
-{{if $notself}}
-<div id="connedit-perms-wrap" class="fakelink" onclick="openClose('connedit-perms');">{{$clickme}}</div>
-<div id="connedit-perms" style="display: none;" >
-{{/if}}
-
-<div id="perm-desc" class="descriptive-text">{{$permnote}}</div>
-<table>
-<tr><td></td><td class="abook-them">{{$them}}</td><td colspan="2" class="abook-me">{{$me}}</td><td></td></tr>
-<tr><td colspan="5"><hr /></td></tr>
-{{foreach $perms as $prm}}
-{{include file="field_acheckbox.tpl" field=$prm}}
-{{/foreach}}
-<tr><td colspan="5"><hr /></td></tr>
-</table>
-
-</div>
-
-{{if $notself}}
-</div>
-{{/if}}
-
-<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
-
-{{if $self && $noperms}}
-<script>
- if(typeof(connectDefaultShare) !== 'undefined')
- connectDefaultShare();
- else
- connectFullShare();
- abook_perms_msg();
-</script>
-{{/if}}
-
-</form>
-</div>
+<div class="generic-content-wrapper">
+ <div class="section-title-wrapper">
+ {{if $notself}}
+ <div class="dropdown pull-right">
+ <button id="connection-dropdown" class="btn btn-default btn-xs" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <i class="icon-caret-down"></i>
+ </button>
+ <ul class="dropdown-menu" aria-labelledby="dLabel">
+ <li><a href="{{$buttons.view.url}}" title="{{$buttons.view.title}}">{{$buttons.view.label}}</a></li>
+ <li><a href="{{$buttons.recent.url}}" title="{{$buttons.recent.title}}">{{$buttons.recent.label}}</a></li>
+ <li class="divider"></li>
+ <li><a href="#" title="{{$buttons.refresh.title}}" onclick="window.location.href='{{$buttons.refresh.url}}'; return false;">{{$buttons.refresh.label}}</a></li>
+ <li><a href="#" title="{{$buttons.block.title}}" onclick="window.location.href='{{$buttons.block.url}}'; return false;">{{$buttons.block.label}}</a></li>
+ <li><a href="#" title="{{$buttons.ignore.title}}" onclick="window.location.href='{{$buttons.ignore.url}}'; return false;">{{$buttons.ignore.label}}</a></li>
+ <li><a href="#" title="{{$buttons.archive.title}}" onclick="window.location.href='{{$buttons.archive.url}}'; return false;">{{$buttons.archive.label}}</a></li>
+ <li><a href="#" title="{{$buttons.hide.title}}" onclick="window.location.href='{{$buttons.hide.url}}'; return false;">{{$buttons.hide.label}}</a></li>
+ <li><a href="#" title="{{$buttons.delete.title}}" onclick="window.location.href='{{$buttons.delete.url}}'; return false;">{{$buttons.delete.label}}</a></li>
+ </ul>
+ </div>
+ {{/if}}
+ <h2>{{$header}}</h2>
+ </div>
+ <div class="section-content-wrapper-np">
+ {{if $notself}}
+ {{foreach $buttons as $b}}
+ {{if $b.info}}
+ <div class="section-content-danger-wrapper">
+ <div>
+ {{$b.info}}
+ </div>
+ </div>
+ {{/if}}
+ {{/foreach}}
+ <div class="section-content-info-wrapper">
+ <div>
+ {{$addr_text}} <strong>'{{$addr}}'</strong>
+ </div>
+ {{if $last_update}}
+ <div>
+ {{$lastupdtext}} {{$last_update}}
+ </div>
+ {{/if}}
+ </div>
+ {{/if}}
+
+ <form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
+
+ <input type="hidden" name="contact_id" value="{{$contact_id}}">
+
+ <div class="panel-group" id="contact-edit-tools" role="tablist" aria-multiselectable="true">
+ {{if $notself}}
+
+ {{if $is_pending}}
+ <div class="panel">
+ <div class="section-subtitle-wrapper" role="tab" id="pending-tool">
+ <h3>
+ <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#pending-tool-collapse" aria-expanded="true" aria-controls="pending-tool-collapse">
+ {{$pending_label}}
+ </a>
+ </h3>
+ </div>
+ <div id="pending-tool-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="pending-tool">
+ <div class="section-content-tools-wrapper">
+ {{include file="field_checkbox.tpl" field=$unapproved}}
+ <div class="settings-submit-wrapper" >
+ <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="modal" id="abook-pending-modal" tabindex="-1" role="dialog">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+ <h4 class="modal-title" id="myModalLabel">{{$pending_modal_title}}</h4>
+ </div>
+ <div class="modal-body">
+ <strong>{{$name}}</strong> {{$pending_modal_body}}
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-sm btn-danger pull-left" title="{{$buttons.delete.title}}" onclick="window.location.href='{{$buttons.delete.url}}'; return false;">{{$buttons.delete.label}}</button>
+ <button type="button" class="btn btn-default" data-dismiss="modal">{{$pending_modal_dismiss}}</button>
+ <button type="submit" class="btn btn-primary" name="pending" value="1">{{$pending_modal_approve}}</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>$('#abook-pending-modal').modal('show');</script>
+ {{/if}}
+
+ {{if $affinity }}
+ <div class="panel">
+ <div class="section-subtitle-wrapper" role="tab" id="affinity-tool">
+ <h3>
+ <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#affinity-tool-collapse" aria-expanded="true" aria-controls="affinity-tool-collapse">
+ {{$affinity }}
+ </a>
+ </h3>
+ </div>
+ <div id="affinity-tool-collapse" class="panel-collapse collapse{{if !$is_pending}} in{{/if}}" role="tabpanel" aria-labelledby="affinity-tool">
+ <div class="section-content-tools-wrapper">
+ {{if $slide}}
+ <div class="form-group"><strong>{{$lbl_slider}}</strong></div>
+ {{$slide}}
+ <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
+ {{/if}}
+
+ {{if $multiprofs }}
+ <div class="form-group">
+ <strong>{{$lbl_vis2}}</strong>
+ {{$profile_select}}
+ </div>
+ {{/if}}
+ <div class="settings-submit-wrapper" >
+ <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ {{/if}}
+
+ {{if $connfilter}}
+ <div class="panel">
+ <div class="section-subtitle-wrapper" role="tab" id="fitert-tool">
+ <h3>
+ <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#fitert-tool-collapse" aria-expanded="true" aria-controls="fitert-tool-collapse">
+ {{$connfilter_label}}
+ </a>
+ </h3>
+ </div>
+ <div id="fitert-tool-collapse" class="panel-collapse collapse{{if !$is_pending && !($slide || $multiprofs)}} in{{/if}}" role="tabpanel" aria-labelledby="fitert-tool">
+ <div class="section-content-tools-wrapper">
+ {{include file="field_textarea.tpl" field=$incl}}
+ {{include file="field_textarea.tpl" field=$excl}}
+ <div class="settings-submit-wrapper" >
+ <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ {{else}}
+ <input type="hidden" name="{{$incl.0}}" value="{{$incl.2}}" />
+ <input type="hidden" name="{{$excl.0}}" value="{{$excl.2}}" />
+ {{/if}}
+
+ {{if $rating}}
+ <div class="panel">
+ <div class="section-subtitle-wrapper" role="tab" id="rating-tool">
+ <h3>
+ <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#rating-tool-collapse" aria-expanded="true" aria-controls="rating-tool-collapse">
+ {{$lbl_rating}}
+ </a>
+ </h3>
+ </div>
+ <div id="rating-tool-collapse" class="panel-collapse collapse{{if !$is_pending && !($slide || $multiprofs) && !$connfilter}} in{{/if}}" role="tabpanel" aria-labelledby="rating-tool">
+ <div class="section-content-tools-wrapper">
+ <div class="section-content-warning-wrapper">
+ {{$rating_info}}
+ </div>
+ <div class="form-group"><strong>{{$lbl_rating_label}}</strong></div>
+ {{$rating}}
+ {{include file="field_textarea.tpl" field=$rating_text}}
+ <input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
+ <div class="settings-submit-wrapper" >
+ <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ {{/if}}
+
+ {{/if}}
+
+ <div class="panel">
+ {{if $notself}}
+ <div class="section-subtitle-wrapper" role="tab" id="perms-tool">
+ <h3>
+ <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
+ {{$permlbl}}
+ </a>
+ </h3>
+ </div>
+ {{/if}}
+ <div id="perms-tool-collapse" class="panel-collapse collapse{{if $self}} in{{/if}}" role="tabpanel" aria-labelledby="perms-tool">
+ <div class="section-content-tools-wrapper">
+ <div class="section-content-warning-wrapper">
+ {{if $notself}}{{$permnote}}{{/if}}
+ {{if $self}}{{$permnote_self}}{{/if}}
+ </div>
+
+ <table id="perms-tool-table" class=form-group>
+ <tr>
+ <td></td>
+ {{if $notself}}
+ <td class="abook-them">{{$them}}</td>
+ {{/if}}
+ <td colspan="2" class="abook-me">{{$me}}</td>
+ </tr>
+ {{foreach $perms as $prm}}
+ {{include file="field_acheckbox.tpl" field=$prm}}
+ {{/foreach}}
+ </table>
+
+ {{if $self}}
+ <div>
+ <div class="section-content-info-wrapper">
+ {{$autolbl}}
+ </div>
+ {{include file="field_checkbox.tpl" field=$autoperms}}
+ </div>
+ {{/if}}
+
+ <div class="settings-submit-wrapper" >
+ <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
</div>
diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl
index 5c15e1c2c..550abc147 100755
--- a/view/tpl/contact_slider.tpl
+++ b/view/tpl/contact_slider.tpl
@@ -1,4 +1,20 @@
-<div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div>
+<div id="contact-slider" class="slider form-group"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div>
<script>
- $("#contact-range").jRange({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false, onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } });
+$(document).ready(function() {
+ // The slider does not render correct if width is given in % and
+ // the slider container is hidden (display: none) during rendering.
+ // So let's unhide it to render and hide again afterwards.
+ if(!$("#affinity-tool-collapse").hasClass("in")) {
+ $("#affinity-tool-collapse").addClass("in");
+ makeContactSlider();
+ $("#affinity-tool-collapse").removeClass("in");
+ }
+ else {
+ makeContactSlider();
+ }
+});
+
+function makeContactSlider() {
+ $("#contact-range").jRange({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: [{{$labels}}], width:'98%', showLabels: false, onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } });
+}
</script>
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 27632d770..30a007bd6 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -165,8 +165,7 @@
</div>
<div class="clear"></div>
</div>
- <div class="wall-item-wrapper-end"></div>
- <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+ <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div>
</div>
{{if $item.toplevel}}
{{foreach $item.children as $child}}
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index cb2fb8959..5487d5937 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -179,8 +179,7 @@
</div>
<div class="clear"></div>
</div>
- <div class="wall-item-wrapper-end"></div>
- <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+ <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div>
</div>
</div>
{{if $item.comment_lastcollapsed}}
diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl
index da5b1e859..4794c0b83 100755
--- a/view/tpl/cropbody.tpl
+++ b/view/tpl/cropbody.tpl
@@ -25,8 +25,8 @@
'croppa',
{
previewWrap: 'previewWrap',
- minWidth: 175,
- minHeight: 175,
+ minWidth: 300,
+ minHeight: 300,
maxWidth: 640,
maxHeight: 640,
ratioDim: { x: 100, y:100 },
diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl
index 5cefe2f28..9346a7455 100644
--- a/view/tpl/dir_sort_links.tpl
+++ b/view/tpl/dir_sort_links.tpl
@@ -5,11 +5,4 @@
{{include file="field_checkbox.tpl" field=$globaldir}}
{{include file="field_checkbox.tpl" field=$pubforums}}
-{{$sort}}: <select onchange='window.location.href="{{$sorturl}}&order="+this.value'>
-<option value='normal' {{if $selected_sort == 'normal'}}selected='selected'{{/if}}>{{$normal}}</option>
-<option value='reverse' {{if $selected_sort == 'reverse'}}selected='selected'{{/if}}>{{$reverse}}</option>
-<option value='date' {{if $selected_sort == 'date'}}selected='selected'{{/if}}>{{$date}}</option>
-<option value='reversedate' {{if $selected_sort == 'reversedate'}}selected='selected'{{/if}}>{{$reversedate}}</option>
-</select><br />
-
</div>
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
index 26739efc3..79598fc9a 100755
--- a/view/tpl/directory_header.tpl
+++ b/view/tpl/directory_header.tpl
@@ -1,6 +1,18 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
+ <div class="btn-group pull-right">
+ <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
+ <i class="icon-sort"></i>
+ </button>
+ <ul class="dropdown-menu">
+ <li><a href="directory?f=&order=date{{$suggest}}">{{$date}}</a></li>
+ <li><a href="directory?f=&order=normal{{$suggest}}">{{$normal}}</a></li>
+ <li><a href="directory?f=&order=reversedate{{$suggest}}">{{$reversedate}}</a></li>
+ <li><a href="directory?f=&order=reverse{{$suggest}}">{{$reverse}}</a></li>
+ </ul>
+ </div>
<h2>{{$dirlbl}}{{if $search}}:&nbsp;{{$safetxt}}{{/if}}</h2>
+ <div class="clear"></div>
</div>
{{foreach $entries as $entry}}
{{include file="direntry.tpl"}}
diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
index 20e597909..3be40e978 100755
--- a/view/tpl/edpost_head.tpl
+++ b/view/tpl/edpost_head.tpl
@@ -1,12 +1,14 @@
-<div class="section-title-wrapper">
- {{if $delete}}
- <div class="pull-right">
- <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i>&nbsp;{{$delete}}</a>
+<div class="generic-content-wrapper">
+ <div class="section-title-wrapper">
+ {{if $delete}}
+ <div class="pull-right">
+ <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i>&nbsp;{{$delete}}</a>
+ </div>
+ {{/if}}
+ <h2>{{$title}}</h2>
+ <div class="clear"></div>
+ </div>
+ <div id="webpage-editor" class="section-content-tools-wrapper">
+ {{$editor}}
</div>
- {{/if}}
- <h2>{{$title}}</h2>
- <div class="clear"></div>
-</div>
-<div id="webpage-editor" class="section-content-tools-wrapper">
- {{$editor}}
</div>
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index 9812291bf..bb6ca63a4 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -2,9 +2,20 @@
<div class="generic-content-wrapper-styled">
<h2>{{$title}}</h2>
+<div class="pull-right">
+<button class="btn btn-xs" onclick="window.location.href='{{$new_event.0}}'; return false;" >{{$new_event.1}}</button>&nbsp;<button class="btn btn-xs" onclick="exportDate(); return false;" ><i class="icon-download"></i>&nbsp;{{$export.1}}</button>&nbsp;<button class="btn btn-xs" onclick="openClose('event-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
+</div>
-<div id="export-event-link"><button class="btn btn-default btn-sm" onclick="exportDate(); return false;" >{{$export.1}}</button></div>
-<div id="new-event-link"><button class="btn btn-default btn-sm" onclick="window.location.href='{{$new_event.0}}'; return false;" >{{$new_event.1}}</button></div>
+<div id="event-upload-form" style="display:none;">
+ <div class="section-content-tools-wrapper">
+ <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form">
+ <div class="form-group">
+ <input id="event-upload-choose" type="file" name="userfile" />
+ </div>
+ <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
+ </form>
+ </div>
+</div>
<script>
function exportDate() {
@@ -13,6 +24,7 @@ function exportDate() {
window.location.href=sT;
}
</script>
-
+<div class="clear"></div>
+<br />
<div id="events-calendar"></div>
</div>
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index 816af2a65..e99128bbb 100755
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -1,17 +1,22 @@
-<tr>
+<tr class="highlight">
<td>
- <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label>
+ <label class="mainlabel" for='me_id_{{$field.0}}'>{{$field.1}}</label><br>
+ <span class='field_abook_help'>{{$field.6}}</span>
</td>
+ {{if $notself}}
<td class="abook-them">
- <input type="checkbox" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} />
+ {{if $field.2}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty"></i>{{/if}}
</td>
+ {{/if}}
<td class="abook-me">
+ {{if $self || !$field.5}}
<input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />
+ {{/if}}
+ {{if $notself && $field.5}}
+ {{if $field.3}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty"></i>{{/if}}
+ {{/if}}
</td>
<td>
- {{if $field.5}}<span class="permission-inherited">{{$inherited}}</span> {{/if}}
- </td>
- <td>
- <span class='field_abook_help'>{{$field.6}}</span>
+ {{if $field.5}}<span class="permission-inherited">{{$inherited}}{{if $self}}{{if $field.7}} <i class="icon-check"></i>{{else}} <i class="icon-check-empty"></i>{{/if}}{{/if}}</span>{{/if}}
</td>
-</tr> \ No newline at end of file
+</tr>
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
index 7fc17471c..5c8734ef7 100644
--- a/view/tpl/menuedit.tpl
+++ b/view/tpl/menuedit.tpl
@@ -1,8 +1,9 @@
{{if $header}}
+<div class="generic-content-wrapper">
<div class="section-title-wrapper">
- {{if $menu_id}}
+ {{if $menu_edit_link}}
<div class="pull-right">
- <a href="mitem/{{$menu_id}}" title="{{$hintedit}}" class="btn btn-xs btn-success"><i class="icon-edit"></i>&nbsp;{{$editcontents}}</a>
+ <a href="{{$menu_edit_link}}" title="{{$hintedit}}" class="btn btn-xs btn-success"><i class="icon-edit"></i>&nbsp;{{$editcontents}}</a>
</div>
{{/if}}
<h2>{{$header}}</h2>
@@ -27,3 +28,6 @@
<div class="clear"></div>
</form>
</div>
+{{if $header}}
+</div>
+{{/if}}
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index cdc022c5c..f9dc4e2cc 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -1,37 +1,42 @@
{{if $header}}
-<div class="section-title-wrapper">
- <h2>{{$header}}</h2>
-</div>
+<div class="generic-content-wrapper">
+ <div class="section-title-wrapper">
+ <h2>{{$header}}</h2>
+ </div>
{{/if}}
-<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
- <form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" >
- <input type="hidden" name="menu_id" value="{{$menu_id}}" />
- {{if $mitem_id}}
- <input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
- {{/if}}
- {{include file="field_input.tpl" field=$mitem_desc}}
- {{include file="field_input.tpl" field=$mitem_link}}
- {{if $menu_names}}
- <datalist id="menu-names">
- {{foreach $menu_names as $menu_name}}
- <option value="{{$menu_name}}">
- {{/foreach}}
- </datalist>
- {{/if}}
- {{include file="field_input.tpl" field=$mitem_order}}
- {{include file="field_checkbox.tpl" field=$usezid}}
- {{include file="field_checkbox.tpl" field=$newwin}}
- <div class="pull-right form-group">
- <div class="btn-group">
- <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
- <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
- </button>
- {{if $submit_more}}
- <button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i class="icon-caret-right"></i></button>
- {{/if}}
- <button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+ <div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
+ <form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" >
+ <input type="hidden" name="menu_id" value="{{$menu_id}}" />
+ {{if $mitem_id}}
+ <input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
+ {{/if}}
+ {{include file="field_input.tpl" field=$mitem_desc}}
+ {{include file="field_input.tpl" field=$mitem_link}}
+ {{if $menu_names}}
+ <datalist id="menu-names">
+ {{foreach $menu_names as $menu_name}}
+ <option value="{{$menu_name}}">
+ {{/foreach}}
+ </datalist>
+ {{/if}}
+ {{include file="field_input.tpl" field=$mitem_order}}
+ {{include file="field_checkbox.tpl" field=$usezid}}
+ {{include file="field_checkbox.tpl" field=$newwin}}
+ <div class="pull-right form-group">
+ <div class="btn-group">
+ <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+ <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
+ </button>
+ {{if $submit_more}}
+ <button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i class="icon-caret-right"></i></button>
+ {{/if}}
+ <button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+ </div>
+ {{$aclselect}}
</div>
- {{$aclselect}}
- </div>
- </form>
+ <div class="clear"></div>
+ </form>
+ </div>
+{{if $header}}
</div>
+{{/if}}
diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl
index 4e606654f..8686d4204 100644
--- a/view/tpl/mitemlist.tpl
+++ b/view/tpl/mitemlist.tpl
@@ -1,35 +1,34 @@
-<div class="section-title-wrapper">
- <div class="pull-right">
- <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i>&nbsp;{{$hintnew}}</button>
+<div class="generic-content-wrapper">
+ <div class="section-title-wrapper">
+ <div class="pull-right">
+ <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i>&nbsp;{{$hintnew}}</button>
+ </div>
+ <h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
+ <div class="clear"></div>
</div>
- <h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
- <div class="clear"></div>
-</div>
-{{$create}}
+ {{$create}}
-{{if $mlist }}
-<div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
- <table id="mitem-list-table">
- <tr>
- <th width="1%">{{$nametitle}}</th>
- <th width="96%">{{$targettitle}}</th>
- <th width="1%"></th>
- <th width="1%"></th>
- <th width="1%"></th>
- </tr>
- {{foreach $mlist as $m }}
- <tr id="mitem-list-item-{{$m.mitem_id}}">
- <td width="1%">{{$m.mitem_desc}}</td>
- <td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
- <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
- <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
- <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
- </tr>
- {{/foreach}}
- </table>
+ {{if $mlist }}
+ <div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
+ <table id="mitem-list-table">
+ <tr>
+ <th width="1%">{{$nametitle}}</th>
+ <th width="96%">{{$targettitle}}</th>
+ <th width="1%"></th>
+ <th width="1%"></th>
+ <th width="1%"></th>
+ </tr>
+ {{foreach $mlist as $m }}
+ <tr id="mitem-list-item-{{$m.mitem_id}}">
+ <td width="1%">{{$m.mitem_desc}}</td>
+ <td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
+ <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
+ <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
+ <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
+ </tr>
+ {{/foreach}}
+ </table>
+ </div>
+ {{/if}}
</div>
-{{/if}}
-
-
-
diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl
index 5328648b9..a320920c7 100755
--- a/view/tpl/page_display.tpl
+++ b/view/tpl/page_display.tpl
@@ -1,9 +1,14 @@
<div class="page">
-
-<div class="generic-content-wrapper" id="page-content-wrapper" >
- {{if $title}}<h2 class="page-title">{{$title}}</h2>{{/if}}
- <div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
- <div class="page-date">{{$date}}</div>
- <div class="page-body">{{$body}}</div>
-</div>
+ <div class="generic-content-wrapper" id="page-content-wrapper" >
+ {{if $title}}
+ <div class="section-title-wrapper">
+ <h2 class="page-title">{{$title}}</h2>
+ </div>
+ {{/if}}
+ <div class="section-content-wrapper">
+ <div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
+ <div class="page-date">{{$date}}</div>
+ <div class="page-body">{{$body}}</div>
+ </div>
+ </div>
</div>
diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl
index 16f9a76c2..2ea7aa9f3 100755
--- a/view/tpl/photo_item.tpl
+++ b/view/tpl/photo_item.tpl
@@ -21,7 +21,7 @@
{{$comment}}
- <div class="wall-item-outside-wrapper-end{{$indent}}" ></div>
+ <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div>
</div>
</div>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 63d5ad778..f5ff23700 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -2,7 +2,6 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="pull-right">
-
{{if $tools}}
<a class="btn btn-default btn-xs" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a>
{{/if}}
@@ -11,7 +10,6 @@
<i class="icon-globe btn btn-default btn-xs" title="{{$map_text}}" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); }" ></i>
</div>
{{/if}}
-
<div class="btn-group btn-group dropdown">
{{if $edit}}
<i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i>
@@ -29,11 +27,8 @@
{{/if}}
</div>
</div>
-
<h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2>
-
<div class="clear"></div>
-
</div>
<div id="photo-map">
{{$map}}
@@ -88,12 +83,9 @@
</form>
<div id="photo-edit-end" class="clear"></div>
</div>
-
<div id="photo-view-wrapper">
-
<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div>
<div id="photo-photo-end" class="clear"></div>
-
{{if $tags}}
<div class="photo-item-tools-left" id="in-this-photo">
<span id="in-this-photo-text">{{$tag_hdr}}</span>
@@ -102,31 +94,29 @@
{{/foreach}}
</div>
{{/if}}
-
<div class="photo-item-tools">
-
- {{if $responses.count }}
- <div class="photo-item-tools-left pull-left">
- <div class="{{if $responses.count > 1}}btn-group{{/if}}">
- {{foreach $responses as $verb=>$response}}
- {{if $response.count}}
- <div class="btn-group">
- <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button>
- {{if $response.list_part}}
- <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
- {{else}}
- <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
- {{/if}}
- {{if $response.list_part}}
+ {{if $responses.count }}
+ <div class="photo-item-tools-left pull-left">
+ <div class="{{if $responses.count > 1}}btn-group{{/if}}">
+ {{foreach $responses as $verb=>$response}}
+ {{if $response.count}}
+ <div class="btn-group">
+ <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button>
+ {{if $response.list_part}}
+ <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+ {{else}}
+ <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+ {{/if}}
+ {{if $response.list_part}}
<div class="modal" id="{{$verb}}Modal-{{$id}}">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
- <h4 class="modal-title">{{$response.title}}</h4>
+ <h4 class="modal-title">{{$response.title}}</h4>
</div>
<div class="modal-body">
- <ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+ <ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
</div>
<div class="modal-footer clear">
<button type="button" class="btn btn-default" data-dismiss="modal">{{$modal_dismiss}}</button>
@@ -134,37 +124,34 @@
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
+ {{/if}}
+ </div>
{{/if}}
+ {{/foreach}}
</div>
- {{/if}}
- {{/foreach}}
- </div>
- {{/if}}
- </div>
- {{if $likebuttons}}
- <div class="photo-item-tools-right btn-group pull-right">
- <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false">
- <i class="icon-thumbs-up-alt" title="{{$likethis}}"></i>
- </button>
- <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'dislike'); return false">
- <i class="icon-thumbs-down-alt" title="{{$nolike}}"></i>
- </button>
+ </div>
+ {{/if}}
+ {{if $likebuttons}}
+ <div class="photo-item-tools-right btn-group pull-right">
+ <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false">
+ <i class="icon-thumbs-up-alt" title="{{$likethis}}"></i>
+ </button>
+ <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'dislike'); return false">
+ <i class="icon-thumbs-down-alt" title="{{$nolike}}"></i>
+ </button>
+ </div>
+ <div id="like-rotator-{{$id}}" class="photo-like-rotator pull-right"></div>
+ {{/if}}
+ <div class="clear"></div>
</div>
- <div id="like-rotator-{{$id}}" class="photo-like-rotator pull-right"></div>
- {{/if}}
- <div class="clear"></div>
</div>
-
{{$comments}}
-
{{if $commentbox}}
<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
{{$commentbox}}
</div>
{{/if}}
-
<div class="clear"></div>
</div>
-
{{$paginate}}
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 2964d9c4b..bea0d894f 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -1,5 +1,5 @@
<div class="vcard">
-
+ <div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
{{if $profile.edit}}
<div class="dropdown">
<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a>
@@ -18,7 +18,6 @@
<div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
{{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
- <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
diff --git a/view/tpl/rating_slider.tpl b/view/tpl/rating_slider.tpl
index 4702fc65b..4c36504e6 100644
--- a/view/tpl/rating_slider.tpl
+++ b/view/tpl/rating_slider.tpl
@@ -1,4 +1,19 @@
-<div id="rating-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="rating-range" type="text" name="fake-rating" value="{{$val}}" /></div>
+<div id="rating-slider" class="slider form-group"><input id="rating-range" type="text" name="fake-rating" value="{{$val}}" /></div>
<script>
- $("#rating-range").jRange({ from: -10, to: 10, step: 1, width:'100%', showLabels: false, showScale: true, scale : [ '-10','-8','-6','-4','-2','0','2','4','6','8','10' ], onstatechange: function(v) { $("#contact-rating-mirror").val(v); } });
+$(document).ready(function() {
+ // The slider does not render correct if width is given in % and
+ // the slider container is hidden (display: none) during rendering.
+ // So let's unhide it to render and hide again afterwards.
+ if(!$("#rating-tool-collapse").hasClass("in")) {
+ $("#rating-tool-collapse").addClass("in");
+ makeRatingSlider();
+ $("#rating-tool-collapse").removeClass("in");
+ }
+ else {
+ makeRatingSlider();
+ }
+});
+function makeRatingSlider() {
+ $("#rating-range").jRange({ from: -10, to: 10, step: 1, width:'98%', showLabels: false, showScale: true, scale : [ '-10','-8','-6','-4','-2','0','2','4','6','8','10' ], onstatechange: function(v) { $("#contact-rating-mirror").val(v); } });
+}
</script>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index dee33f1b3..256443b84 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -57,7 +57,7 @@
<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
</div>
{{/if}}
- <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+ <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div>
</div>
</div>
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index ca0fe76be..2acbb24e4 100755
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -1,6 +1,6 @@
<div class="vcard">
-<div class="fn">{{$name}}</div>
<div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
+<div class="fn">{{$name}}</div>
</div>