From ee01e67fa709197bdf3b0e2f990cdf1bf312856b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 09:41:27 +0200 Subject: use default style for default webpage --- view/tpl/page_display.tpl | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index 5328648b9..a4870d623 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -1,9 +1,14 @@
- -
- {{if $title}}

{{$title}}

{{/if}} -
{{$author}}
-
{{$date}}
-
{{$body}}
-
+
+
+ {{if $title}} +

{{$title}}

+ {{/if}} +
+
+
{{$author}}
+
{{$date}}
+
{{$body}}
+
+
-- cgit v1.2.3 From 807471d2a5f1b53c616376bcb5f0cdcb361f20ce Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 09:56:30 +0200 Subject: move if clause outside of the div --- view/tpl/page_display.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index a4870d623..a320920c7 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -1,10 +1,10 @@
+ {{if $title}}
- {{if $title}}

{{$title}}

- {{/if}}
+ {{/if}}
{{$author}}
{{$date}}
-- cgit v1.2.3 From 2d0d5876ba28df6cb923965bfc9984462b9c9d44 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 10:23:39 +0200 Subject: more word wrap fixes --- view/theme/redbasic/css/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index fcc089cf0..089ce20d8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1932,12 +1932,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, -- cgit v1.2.3 From adfb4072e80695a253a9a92da2b1ebbdbc7f18bf Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 12:13:15 +0200 Subject: various css fixes --- view/css/conversation.css | 4 ---- view/theme/redbasic/css/style.css | 4 ++-- view/theme/redbasic/schema/focus.css | 5 ++--- view/tpl/conv_item.tpl | 3 +-- view/tpl/conv_list.tpl | 3 +-- view/tpl/photo_item.tpl | 2 +- view/tpl/search_item.tpl | 2 +- 7 files changed, 8 insertions(+), 15 deletions(-) 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/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 089ce20d8..716298845 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -741,8 +741,8 @@ a.rateme, div.rateme { } .wall-item-conv { - margin-top: 5px; - margin-bottom: 25px; + padding-top: 5px; + padding-bottom: 10px; } diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css index 8d945a83e..3d64b8a7d 100644 --- a/view/theme/redbasic/schema/focus.css +++ b/view/theme/redbasic/schema/focus.css @@ -21,7 +21,6 @@ } .wall-item-conv { - margin-bottom: 10px; - margin-top: 10px; - margin-left: 10px; + padding-top: 10px; + padding-left: 10px; } 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 @@
-
-
+
{{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 @@
-
-
+
{{if $item.comment_lastcollapsed}} 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}} -
+
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 @@ {{$item.conv.title}} {{/if}} -
+
-- cgit v1.2.3 From 18798b1d12c1716b395d89bf214fdd42f41fd2d1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 12:23:19 +0200 Subject: schema focus: adjust width to match photo width in /photos --- view/theme/redbasic/schema/focus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php index d93ee003e..4186c9f64 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 = "676"; + $converse_width = "656"; if(! $top_photo) $top_photo = '48px'; if(! $comment_indent) -- cgit v1.2.3 From b50151d7bf5f05b4cac8afa2674605e195d12e9a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 14:46:47 +0200 Subject: make directory suggest work with directory options --- include/dir_fns.php | 8 ++++++-- include/widgets.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/dir_fns.php b/include/dir_fns.php index 77c78558c..046f05a50 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -113,6 +113,8 @@ function dir_sort_links() { $safe_mode = get_safemode_setting($observer); $globaldir = get_globaldir_setting($observer); + $suggest = ($_REQUEST['suggest']) ? '&suggest=' . $_REQUEST['suggest'] : ''; + // 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 @@ -126,18 +128,20 @@ function dir_sort_links() { $url = 'directory?f='; $tmp = array_merge($_GET,$_POST); + unset($tmp['suggest']); unset($tmp['order']); unset($tmp['q']); unset($tmp['f']); - $sorturl = $url . http_build_query($tmp); + $sorturl = $url . $suggest . http_build_query($tmp); $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 . $suggest . http_build_query($tmp); $o = replace_macros(get_markup_template('dir_sort_links.tpl'), array( '$header' => t('Directory Options'), diff --git a/include/widgets.php b/include/widgets.php index 4a9032a21..888e56733 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') -- cgit v1.2.3 From cc7eaa0d050cde57024eb7baff042513479ed0c4 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 14:52:06 +0200 Subject: code style correction --- include/dir_fns.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/dir_fns.php b/include/dir_fns.php index 046f05a50..088c0ce96 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -113,8 +113,6 @@ function dir_sort_links() { $safe_mode = get_safemode_setting($observer); $globaldir = get_globaldir_setting($observer); - $suggest = ($_REQUEST['suggest']) ? '&suggest=' . $_REQUEST['suggest'] : ''; - // 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 @@ -123,8 +121,9 @@ function dir_sort_links() { if(! $directory_sort_order) $directory_sort_order = 'date'; - $current_order = (($_REQUEST['order']) ? $_REQUEST['order'] : $directory_sort_order); + $suggest = (($_REQUEST['suggest']) ? '&suggest=' . $_REQUEST['suggest'] : ''); + $url = 'directory?f='; $tmp = array_merge($_GET,$_POST); -- cgit v1.2.3 From 9c577e042292bd8227b40f9500d19eecd974a8e4 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 21:41:37 +0200 Subject: make public forums only setting sticky and simplify function to get directory settings --- include/dir_fns.php | 42 +++++++++++++++--------------------------- include/taxonomy.php | 4 ++-- mod/directory.php | 27 +++++++++++++++++---------- 3 files changed, 34 insertions(+), 39 deletions(-) diff --git a/include/dir_fns.php b/include/dir_fns.php index 088c0ce96..e13c05100 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_settings($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 == 'safe_mode' && $ret === false) + $ret = 1; - return $safe_mode; + return $ret; } /** @@ -110,8 +97,9 @@ function dir_sort_links() { $observer = get_observer_hash(); - $safe_mode = get_safemode_setting($observer); - $globaldir = get_globaldir_setting($observer); + $safe_mode = get_directory_settings($observer, 'safemode'); + $globaldir = get_directory_settings($observer, 'globaldir'); + $pubforums = get_directory_settings($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 @@ -128,6 +116,7 @@ function dir_sort_links() { $tmp = array_merge($_GET,$_POST); unset($tmp['suggest']); + unset($tmp['pubforums']); unset($tmp['order']); unset($tmp['q']); unset($tmp['f']); @@ -152,10 +141,9 @@ function dir_sort_links() { '$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/taxonomy.php b/include/taxonomy.php index fa540ac56..135843614 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_settings($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/mod/directory.php b/mod/directory.php index 6d066a21b..6dea0e992 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_settings($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_settings($observer, 'safemode'); - $pubforums = null; - if(array_key_exists('pubforums',$_REQUEST)) - $pubforums = intval($_REQUEST['pubforums']); - if(! $pubforums) - $pubforums = null; + $pubforums = get_directory_settings($observer, 'pubforums'); $o = ''; nav_set_selected('directory'); -- cgit v1.2.3 From f67d9d59afea32a90ea546163da25e36cc4ad9fb Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 22:29:27 +0200 Subject: rename function get_directory_settings => get_directory_setting and move sort options to directory title bar --- include/dir_fns.php | 24 ++++-------------------- include/taxonomy.php | 2 +- mod/directory.php | 13 +++++++++---- view/tpl/dir_sort_links.tpl | 7 ------- view/tpl/directory_header.tpl | 12 ++++++++++++ 5 files changed, 26 insertions(+), 32 deletions(-) diff --git a/include/dir_fns.php b/include/dir_fns.php index e13c05100..29f33f46e 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -72,7 +72,7 @@ function check_upstream_directory() { set_config('system', 'directory_server', ''); } -function get_directory_settings($observer, $setting) { +function get_directory_setting($observer, $setting) { if ($observer) $ret = get_xconfig($observer, 'directory', $setting); @@ -97,14 +97,13 @@ function dir_sort_links() { $observer = get_observer_hash(); - $safe_mode = get_directory_settings($observer, 'safemode'); - $globaldir = get_directory_settings($observer, 'globaldir'); - $pubforums = get_directory_settings($observer, 'pubforums'); + $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'; @@ -114,14 +113,6 @@ function dir_sort_links() { $url = 'directory?f='; - $tmp = array_merge($_GET,$_POST); - unset($tmp['suggest']); - unset($tmp['pubforums']); - unset($tmp['order']); - unset($tmp['q']); - unset($tmp['f']); - $sorturl = $url . $suggest . http_build_query($tmp); - $tmp = array_merge($_GET,$_POST); unset($tmp['suggest']); unset($tmp['pubforums']); @@ -133,13 +124,6 @@ function dir_sort_links() { $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,'',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)\''), diff --git a/include/taxonomy.php b/include/taxonomy.php index 135843614..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_directory_settings($observer, 'globaldir')) + if(! get_directory_setting($observer, 'globaldir')) return $o; diff --git a/mod/directory.php b/mod/directory.php index 6dea0e992..ff892d381 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -62,14 +62,14 @@ function directory_content(&$a) { $observer = get_observer_hash(); - $globaldir = get_directory_settings($observer, 'globaldir'); + $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_directory_settings($observer, 'safemode'); + $safe_mode = get_directory_setting($observer, 'safemode'); - $pubforums = get_directory_settings($observer, 'pubforums'); + $pubforums = get_directory_setting($observer, 'pubforums'); $o = ''; nav_set_selected('directory'); @@ -382,7 +382,12 @@ 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'), )); 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}}:
- diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index 26739efc3..25a9b8279 100755 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -1,6 +1,18 @@
+
+ + +

{{$dirlbl}}{{if $search}}: {{$safetxt}}{{/if}}

+
{{foreach $entries as $entry}} {{include file="direntry.tpl"}} -- cgit v1.2.3 From f6cf992aee86e69d1ea5790c22d4af40c266d79e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 22:48:01 +0200 Subject: fix sorting of channel suggestions --- include/dir_fns.php | 2 +- mod/directory.php | 1 + view/tpl/directory_header.tpl | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/dir_fns.php b/include/dir_fns.php index 29f33f46e..be8175d06 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -120,7 +120,7 @@ function dir_sort_links() { unset($tmp['safe']); unset($tmp['q']); unset($tmp['f']); - $forumsurl = $url . $suggest . 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'), diff --git a/mod/directory.php b/mod/directory.php index ff892d381..44d80cff1 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -388,6 +388,7 @@ function directory_content(&$a) { '$reverse' => t('Reverse Alphabetic'), '$date' => t('Newest to Oldest'), '$reversedate' => t('Oldest to Newest'), + '$suggest' => $suggest ? '&suggest=1' : '' )); diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index 25a9b8279..79598fc9a 100755 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -5,10 +5,10 @@

{{$dirlbl}}{{if $search}}: {{$safetxt}}{{/if}}

-- cgit v1.2.3 From 78f0138270347d3e9621ba7b5cdffbc7fc34a48b Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 7 Jul 2015 16:48:36 -0700 Subject: version update --- version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.inc b/version.inc index fe5a631ad..28c637e51 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-07-06.1085 +2015-07-07.1086 -- cgit v1.2.3 From e12d58a75cf0fa32e935caa9e53cb2db953d8409 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 8 Jul 2015 21:28:36 +0200 Subject: fix typo to make directory safe mode default to on work again --- include/dir_fns.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dir_fns.php b/include/dir_fns.php index be8175d06..83073154a 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -82,7 +82,7 @@ function get_directory_setting($observer, $setting) { if($ret === false) $ret = get_config('directory', $setting); - if($setting == 'safe_mode' && $ret === false) + if($setting == 'safemode' && $ret === false) $ret = 1; return $ret; -- cgit v1.2.3 From 43354ab385cd5c7adcc86f591159f10201420aae Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 8 Jul 2015 18:05:38 -0700 Subject: inconsistent naming of block item types --- include/widgets.php | 2 +- mod/block.php | 4 ++-- mod/blocks.php | 4 ++-- mod/editblock.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/widgets.php b/include/widgets.php index d87a8c440..bafd9c7a2 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -903,7 +903,7 @@ function widget_random_block($arr) { item_type = %d $sql_options order by $randfunc limit 1", intval($channel_id), dbesc('%' . $contains . '%'), - intval(ITEM_TYPE_BUILDBLOCK) + intval(ITEM_TYPE_BLOCK) ); if($r) { diff --git a/mod/block.php b/mod/block.php index fb5645d8a..df3909629 100644 --- a/mod/block.php +++ b/mod/block.php @@ -53,7 +53,7 @@ function block_content(&$a) { item_type = %d $sql_options $revision limit 1", intval($u[0]['channel_id']), dbesc($page_id), - intval(ITEM_TYPE_BUILDBLOCK) + intval(ITEM_TYPE_BLOCK) ); if(! $r) { @@ -65,7 +65,7 @@ function block_content(&$a) { item_type = %d $revision limit 1", intval($u[0]['channel_id']), dbesc($page_id), - intval(ITEM_TYPE_BUILDBLOCK) + intval(ITEM_TYPE_BLOCK) ); if($x) { // Yes, it's there. You just aren't allowed to see it. diff --git a/mod/blocks.php b/mod/blocks.php index 95979a304..97cc5cd53 100644 --- a/mod/blocks.php +++ b/mod/blocks.php @@ -84,7 +84,7 @@ function blocks_content(&$a) { } $x = array( - 'webpage' => ITEM_TYPE_BUILDBLOCK, + 'webpage' => ITEM_TYPE_BLOCK, 'is_owner' => true, 'nickname' => $a->profile['channel_address'], 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), @@ -110,7 +110,7 @@ function blocks_content(&$a) { $r = q("select iid, sid, mid, title, body, mimetype, created, edited from item_id left join item on item_id.iid = item.id where item_id.uid = %d and service = 'BUILDBLOCK' and item_type = %d order by item.created desc", intval($owner), - intval(ITEM_TYPE_BUILDBLOCK) + intval(ITEM_TYPE_BLOCK) ); $pages = null; diff --git a/mod/editblock.php b/mod/editblock.php index 9f9770e77..21d7cc537 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -136,7 +136,7 @@ function editblock_content(&$a) { $o .= replace_macros($tpl,array( '$return_path' => $rp, '$action' => 'item', - '$webpage' => ITEM_TYPE_BUILDBLOCK, + '$webpage' => ITEM_TYPE_BLOCK, '$share' => t('Edit'), '$bold' => t('Bold'), '$italic' => t('Italic'), -- cgit v1.2.3 From efa55437d4d14dd81d10a98e5d3201d27bcbfafb Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Jul 2015 13:59:16 +0200 Subject: increase width of the aside area and make default profile image size 300x300 --- include/text.php | 2 +- mod/profile_photo.php | 4 ++-- view/css/widgets.css | 2 +- view/theme/redbasic/css/style.css | 7 ++++--- view/theme/redbasic/js/redbasic.js | 2 +- view/theme/redbasic/php/style.php | 2 +- view/tpl/cropbody.tpl | 4 ++-- 7 files changed, 12 insertions(+), 11 deletions(-) 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/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/view/css/widgets.css b/view/css/widgets.css index 63c380c75..0cfe98362 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -39,7 +39,7 @@ padding: 5px; width: 100%; resize: vertical; - height: 150px; + height: 245px; } /* saved searches */ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 716298845..c2eccc782 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -406,9 +406,10 @@ footer { #profile-photo-wrapper img { + width: 100%; + max-width: 300px; + height: auto; padding: 10px; - width: 197px; - height: 197px; } #profile-photo-wrapper { @@ -571,7 +572,7 @@ footer { } .photo { - border: 1px solid #AAAAAA; + border: 1px solid #ccc; } .photo-top-photo, .photo-album-photo { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 68190778c..9408f5a6c 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() + 279 ); } else { $('main').css('width', '100%' ); } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 6e68d38d5..64ddcce7e 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 = 279; // left aside and right aside are is 231px + converse width if($converse_center) { 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 }, -- cgit v1.2.3 From 59cddef032e3216d82694da6bab3eb3e8ae48203 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Jul 2015 14:05:35 +0200 Subject: remove padding --- view/theme/redbasic/css/style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c2eccc782..449c3a22a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -409,7 +409,6 @@ footer { width: 100%; max-width: 300px; height: auto; - padding: 10px; } #profile-photo-wrapper { -- cgit v1.2.3 From 115c18353ec73c924be7ceadf8ba2a1fd24f05e3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Jul 2015 14:44:24 +0200 Subject: move profile image up and refine the aside width --- view/css/widgets.css | 2 +- view/theme/redbasic/css/style.css | 11 ++++++----- view/theme/redbasic/js/redbasic.js | 2 +- view/theme/redbasic/php/style.php | 2 +- view/tpl/profile_vcard.tpl | 3 +-- view/tpl/xchan_vcard.tpl | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/view/css/widgets.css b/view/css/widgets.css index 0cfe98362..5b6e8aeb9 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -39,7 +39,7 @@ padding: 5px; width: 100%; resize: vertical; - height: 245px; + height: 250px; } /* saved searches */ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 449c3a22a..1bfd11f6c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -412,7 +412,8 @@ footer { } #profile-photo-wrapper { - margin-top: 10px; + margin-top: -10px; + margin-bottom: 10px; } @@ -704,8 +705,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 +721,8 @@ a.rateme, div.rateme { float: left; } .contact-block-img { - width:47px; - height:47px; + width:48px; + height:48px; } #tag-remove { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 9408f5a6c..ef3fa455c 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() + 279 ); + $('main').css('width', $(window).width() + 284 ); } else { $('main').css('width', '100%' ); } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 64ddcce7e..8dc349994 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 = 279; + $aside_width = 284; // left aside and right aside are is 231px + converse width if($converse_center) { diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 2964d9c4b..9eac48c6d 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,5 +1,5 @@
- +
{{$profile.name}}
{{if $profile.edit}}
@@ -18,7 +18,6 @@
{{$profile.name}}{{if $profile.online}} {{/if}}
{{if $reddress}}
{{$profile.reddress}}
{{/if}} {{if $pdesc}}
{{$profile.pdesc}}
{{/if}} -
{{$profile.name}}
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 @@
-
{{$name}}
{{$name}}
+
{{$name}}
-- cgit v1.2.3 From 08996e5b9b63efc4ca2fc29acb348b46c9e05741 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Jul 2015 20:54:13 +0200 Subject: fix aside width for collapsed state --- view/theme/redbasic/js/redbasic.js | 2 +- view/theme/redbasic/php/style.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index ef3fa455c..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() + 284 ); + $('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 8dc349994..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 = 284; + $aside_width = 285; // left aside and right aside are is 231px + converse width if($converse_center) { -- cgit v1.2.3 From 0bec45e5703a6f9845ae869a1b9a44f2ed559675 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Jul 2015 21:03:10 +0200 Subject: do not show status editor in /display - we most probably want to read the thread or comment. --- mod/display.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/display.php b/mod/display.php index b5daea2de..0331ffe4b 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' : ''), @@ -67,7 +68,7 @@ function display_content(&$a, $update = 0, $load = false) { ); $o .= status_editor($a,$x); - +*/ } // This page can be viewed by anybody so the query could be complicated -- cgit v1.2.3 From 2b9a480c2f1060cf423471e6dc2aad0468f8c5b5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Jul 2015 22:23:24 +0200 Subject: fix vcard title spacing --- view/theme/redbasic/css/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1bfd11f6c..321b30a43 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -347,7 +347,8 @@ footer { word-wrap: break-word; } -.vcard dl { +.vcard dl, +.vcard .title { margin-top: 10px; margin-bottom: 0px; } -- cgit v1.2.3 From c7b55f775384dbb991fdac8e9f074208083df9f8 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Jul 2015 22:31:21 +0200 Subject: revert do not show status editor in /display - we most probably want to read the thread or comment. --- mod/display.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/display.php b/mod/display.php index 0331ffe4b..4a419daa5 100644 --- a/mod/display.php +++ b/mod/display.php @@ -52,7 +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' : ''), @@ -68,7 +68,7 @@ function display_content(&$a, $update = 0, $load = false) { ); $o .= status_editor($a,$x); -*/ + } // This page can be viewed by anybody so the query could be complicated -- cgit v1.2.3 From e1f64b6748218dd2668e407dfe780348433d4a63 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 10:09:54 +0200 Subject: move section and aside padding from default.css to style.css --- view/css/default.css | 3 +-- view/theme/redbasic/css/style.css | 5 +++++ view/theme/redbasic/schema/focus.css | 4 ---- view/theme/redbasic/schema/focus.php | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/view/css/default.css b/view/css/default.css index fb6705894..e1edc2cbf 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -17,12 +17,11 @@ main { aside { display: table-cell; vertical-align: top; - padding: 65px 7px 0px 7px; + } section { width: 100%; display: table-cell; vertical-align: top; - padding: 65px 7px 200px 7px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 321b30a43..5b65226ca 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -28,12 +28,17 @@ aside#region_1 { width: $aside_widthpx; min-width: $aside_widthpx; max-width: $aside_widthpx; + padding: 65px 7px 0px 7px; } main { max-width: $main_widthpx; } +section { + padding: 65px 7px 200px 7px; +} + h1, .h1, h2, .h2 { font-size: 1.667em; } diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css index 3d64b8a7d..ea983ffc8 100644 --- a/view/theme/redbasic/schema/focus.css +++ b/view/theme/redbasic/schema/focus.css @@ -16,10 +16,6 @@ background-color: #fff; } -#redbasic_converse_center_container { - display: none; -} - .wall-item-conv { padding-top: 10px; padding-left: 10px; diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php index 4186c9f64..9ffedab0d 100644 --- a/view/theme/redbasic/schema/focus.php +++ b/view/theme/redbasic/schema/focus.php @@ -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"; -- cgit v1.2.3 From 7eb614c8aafc2f830479e1026e6a4924bda657cb Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 11:15:05 +0200 Subject: schema focus: refine content width to be more in balance with the recent aside width --- view/theme/redbasic/schema/focus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php index 9ffedab0d..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 = "656"; + $converse_width = "790"; if(! $top_photo) $top_photo = '48px'; if(! $comment_indent) -- cgit v1.2.3 From 1554b5a2eea889284ed2e13111d72029dfc96963 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 12:46:20 +0200 Subject: add generic content wrapper to post/webpage editor and make editpost render correctly --- mod/editpost.php | 14 ++++++-------- view/theme/redbasic/css/style.css | 4 ++-- view/tpl/edpost_head.tpl | 22 ++++++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/mod/editpost.php b/mod/editpost.php index 81bb91b2a..db0a86df1 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/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5b65226ca..b2d52c8a6 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1594,8 +1594,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 { 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 @@ -
- {{if $delete}} -
-  {{$delete}} +
+
+ {{if $delete}} +
+  {{$delete}} +
+ {{/if}} +

{{$title}}

+
+
+
+ {{$editor}}
- {{/if}} -

{{$title}}

-
-
-
- {{$editor}}
-- cgit v1.2.3 From fee607db56f9e87320ce2644ba61ca49266ea7ab Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 13:16:45 +0200 Subject: more webpages - generic-content-wrapper fixes --- mod/editblock.php | 15 ++++++----- mod/editlayout.php | 16 +++++++----- mod/editpost.php | 2 +- view/tpl/menuedit.tpl | 4 +++ view/tpl/mitemedit.tpl | 71 +++++++++++++++++++++++++++----------------------- view/tpl/mitemlist.tpl | 61 +++++++++++++++++++++---------------------- 6 files changed, 90 insertions(+), 79 deletions(-) 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 db0a86df1..e907a07d0 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -100,7 +100,7 @@ function editpost_content(&$a) { $cipher = 'aes256'; - $editor .= replace_macros($tpl,array( + $editor = replace_macros($tpl,array( '$return_path' => $_SESSION['return_url'], '$action' => 'item', '$share' => t('Edit'), diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 7fc17471c..0e5df2c47 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -1,4 +1,5 @@ {{if $header}} +
{{if $menu_id}}
@@ -27,3 +28,6 @@
+{{if $header}} +
+{{/if}} diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index cdc022c5c..8715d6391 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -1,37 +1,42 @@ {{if $header}} -
-

{{$header}}

-
+
+
+

{{$header}}

+
{{/if}} -
-
- - {{if $mitem_id}} - - {{/if}} - {{include file="field_input.tpl" field=$mitem_desc}} - {{include file="field_input.tpl" field=$mitem_link}} - {{if $menu_names}} - - {{foreach $menu_names as $menu_name}} - - {{/if}} - {{include file="field_input.tpl" field=$mitem_order}} - {{include file="field_checkbox.tpl" field=$usezid}} - {{include file="field_checkbox.tpl" field=$newwin}} -
-
- - {{if $submit_more}} - - {{/if}} - +
+ + + {{if $mitem_id}} + + {{/if}} + {{include file="field_input.tpl" field=$mitem_desc}} + {{include file="field_input.tpl" field=$mitem_link}} + {{if $menu_names}} + + {{foreach $menu_names as $menu_name}} + + {{/if}} + {{include file="field_input.tpl" field=$mitem_order}} + {{include file="field_checkbox.tpl" field=$usezid}} + {{include file="field_checkbox.tpl" field=$newwin}} +
+
+ + {{if $submit_more}} + + {{/if}} + +
+ {{$aclselect}}
- {{$aclselect}} -
- +
+ +
+{{if $header}}
+{{/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 @@ -
-
- +
+
+
+ +
+

{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}

+
-

{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}

-
-
-{{$create}} + {{$create}} -{{if $mlist }} -
- - - - - - - - - {{foreach $mlist as $m }} - - - - - - - - {{/foreach}} -
{{$nametitle}}{{$targettitle}}
{{$m.mitem_desc}}{{$m.mitem_link}}{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}{{/if}}
+ {{if $mlist }} +
+ + + + + + + + + {{foreach $mlist as $m }} + + + + + + + + {{/foreach}} +
{{$nametitle}}{{$targettitle}}
{{$m.mitem_desc}}{{$m.mitem_link}}{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}{{/if}}
+
+ {{/if}}
-{{/if}} - - - -- cgit v1.2.3 From ebb07de7883b5b94b1fb10b3adf0b5370afc40f3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 13:25:50 +0200 Subject: re-enable selected/active class --- view/theme/redbasic/css/style.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b2d52c8a6..1efa64b6d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -269,12 +269,11 @@ 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; + color: $font_colour; } -*/ + .fileas-all { text-decoration: none !important; -- cgit v1.2.3 From 39d68bf7c73d15062ec9807b4be669910a03f54c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 13:34:36 +0200 Subject: do not change selected/active class color on hover --- view/theme/redbasic/css/style.css | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1efa64b6d..0bb5a928f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -270,7 +270,16 @@ footer { /*TODO: we should use one class for all this. */ -.group-selected, .fileas-selected, .categories-selected, .search-selected, .active { +.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; } -- cgit v1.2.3 From 071a233fb8aa427ae0637cda1ca0b47631d6b521 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 13:44:23 +0200 Subject: css fixes --- view/theme/redbasic/css/style.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0bb5a928f..a44cf331c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -28,7 +28,7 @@ aside#region_1 { width: $aside_widthpx; min-width: $aside_widthpx; max-width: $aside_widthpx; - padding: 65px 7px 0px 7px; + padding: 80px 7px 0px 7px; } main { @@ -36,7 +36,7 @@ main { } section { - padding: 65px 7px 200px 7px; + padding: 80px 7px 200px 7px; } h1, .h1, h2, .h2 { @@ -2124,9 +2124,15 @@ nav .badge.mail-update:hover { } @media screen and (max-width: 767px) { + + section { + padding: 65px 7px 200px 7px; + } + aside#region_1 { background: rgba(0, 0, 0, .1); border-right: 1px solid $nav_bd; + padding: 65px 7px 0px 7px; } main { -- cgit v1.2.3 From 115097f1395400f1c1b21216fdba6e799366d85f Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Fri, 10 Jul 2015 21:46:19 +0200 Subject: update Dutch strings --- view/nl/messages.po | 553 ++++++++++++++++++++++++++++------------------------ view/nl/strings.php | 57 +++--- 2 files changed, 336 insertions(+), 274 deletions(-) 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 \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 " @@ -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 niet 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 privacy " "settings, though you may wish to review the \"Advanced Permissions\"." msgstr "Dit is mogelijk voldoende, wanneer er naar jouw privacy-instellingen 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 not 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 niet 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 privacy settings, which have higher priority than " @@ -8415,64 +8451,64 @@ msgid "" "have no effect." msgstr "Sommige permissies kunnen worden overgeërfd van de privacy-instellingen 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 "] = "%s "; $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["

What next

"] = "

Wat nu

"; $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 not 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 niet 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"; -- cgit v1.2.3 From b6f28900e686dc7acffd03035bcc249130a7db87 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 21:48:24 +0200 Subject: show status editor in /display on share action. --- mod/display.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mod/display.php b/mod/display.php index 4a419daa5..8c4707bb2 100644 --- a/mod/display.php +++ b/mod/display.php @@ -64,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 = '
'; $o .= status_editor($a,$x); + $o .= '
'; } -- cgit v1.2.3 From ae6541cf74a0940131d6fdb937539effe5b27e3e Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 10 Jul 2015 14:20:08 -0700 Subject: revision update --- util/messages.po | 338 ++++++++++++++++++++++++++++--------------------------- version.inc | 2 +- 2 files changed, 171 insertions(+), 169 deletions(-) diff --git a/util/messages.po b/util/messages.po index 81a7de2a7..b3ee12e89 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-07-03.1082\n" +"Project-Id-Version: 2015-07-10.1089\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-03 00:04-0700\n" +"POT-Creation-Date: 2015-07-10 00:04-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,7 +575,7 @@ msgstr "" msgid "Required" msgstr "" -#: ../../include/datetime.php:262 ../../boot.php:2354 +#: ../../include/datetime.php:262 ../../boot.php:2355 msgid "never" msgstr "" @@ -703,42 +703,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 "" @@ -752,8 +716,8 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:47 ../../include/bb2diaspora.php:481 -#: ../../include/identity.php:879 ../../mod/events.php:647 -#: ../../mod/directory.php:295 +#: ../../include/identity.php:879 ../../mod/directory.php:302 +#: ../../mod/events.php:647 msgid "Location:" msgstr "" @@ -1320,6 +1284,44 @@ msgstr "" msgid "Provide a personal tag cloud on your channel page" 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/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: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/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: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/widgets.php:35 ../../include/taxonomy.php:264 #: ../../include/contact_widgets.php:92 msgid "Categories" @@ -1348,7 +1350,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:309 +#: ../../include/identity.php:828 ../../mod/directory.php:316 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" msgstr "" @@ -1728,7 +1730,7 @@ 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 +#: ../../boot.php:1553 msgid "Email" msgstr "" @@ -2070,7 +2072,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 "" @@ -2150,7 +2152,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 "" @@ -2175,7 +2177,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 "" @@ -3000,47 +3002,47 @@ msgstr "" msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1304 +#: ../../include/items.php:1307 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1306 +#: ../../include/items.php:1309 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1308 +#: ../../include/items.php:1311 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1310 +#: ../../include/items.php:1313 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1312 +#: ../../include/items.php:1315 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1314 +#: ../../include/items.php:1317 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1316 +#: ../../include/items.php:1319 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1318 +#: ../../include/items.php:1321 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4195 ../../mod/thing.php:74 +#: ../../include/items.php:4198 ../../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 "" -#: ../../include/items.php:4268 ../../include/attach.php:137 +#: ../../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 @@ -3083,26 +3085,26 @@ msgstr "" msgid "Permission denied." msgstr "" -#: ../../include/items.php:4670 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4673 ../../mod/group.php:38 ../../mod/group.php:140 #: ../../mod/bulksetclose.php:51 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4686 +#: ../../include/items.php:4689 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4693 +#: ../../include/items.php:4696 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4703 +#: ../../include/items.php:4706 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4705 +#: ../../include/items.php:4708 msgid "Connection not found." msgstr "" @@ -3166,12 +3168,12 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413 -#: ../../mod/directory.php:372 ../../mod/directory.php:377 +#: ../../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:376 +#: ../../include/contact_widgets.php:27 ../../mod/directory.php:383 #: ../../mod/suggest.php:60 msgid "Channel Suggestions" msgstr "" @@ -3429,7 +3431,7 @@ msgstr "" msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1163 ../../mod/directory.php:290 +#: ../../include/identity.php:1163 ../../mod/directory.php:297 msgid "Age:" msgstr "" @@ -3442,7 +3444,7 @@ msgstr "" msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1179 ../../mod/directory.php:306 +#: ../../include/identity.php:1179 ../../mod/directory.php:313 #: ../../mod/profiles.php:693 msgid "Hometown:" msgstr "" @@ -3459,7 +3461,7 @@ msgstr "" msgid "Religion:" msgstr "" -#: ../../include/identity.php:1187 ../../mod/directory.php:308 +#: ../../include/identity.php:1187 ../../mod/directory.php:315 msgid "About:" msgstr "" @@ -3953,6 +3955,95 @@ msgstr "" msgid "Delegated Channels" msgstr "" +#: ../../mod/directory.php:59 ../../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 "" + +#: ../../mod/directory.php:234 +#, php-format +msgid "%d rating" +msgid_plural "%d ratings" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/directory.php:245 +msgid "Gender: " +msgstr "" + +#: ../../mod/directory.php:247 +msgid "Status: " +msgstr "" + +#: ../../mod/directory.php:249 +msgid "Homepage: " +msgstr "" + +#: ../../mod/directory.php:308 ../../mod/events.php:645 +msgid "Description:" +msgstr "" + +#: ../../mod/directory.php:317 +msgid "Public Forum:" +msgstr "" + +#: ../../mod/directory.php:320 +msgid "Keywords: " +msgstr "" + +#: ../../mod/directory.php:323 +msgid "Don't suggest" +msgstr "" + +#: ../../mod/directory.php:325 +msgid "Common connections:" +msgstr "" + +#: ../../mod/directory.php:374 +msgid "Global Directory" +msgstr "" + +#: ../../mod/directory.php:374 +msgid "Local Directory" +msgstr "" + +#: ../../mod/directory.php:380 +msgid "Finding:" +msgstr "" + +#: ../../mod/directory.php:385 +msgid "next page" +msgstr "" + +#: ../../mod/directory.php:385 +msgid "previous page" +msgstr "" + +#: ../../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 "" + #: ../../mod/xchan.php:6 msgid "Xchan Lookup" msgstr "" @@ -3983,26 +4074,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 "" @@ -4379,10 +4450,6 @@ msgid "" "global holidays." msgstr "" -#: ../../mod/events.php:645 ../../mod/directory.php:301 -msgid "Description:" -msgstr "" - #: ../../mod/events.php:649 msgid "Title:" msgstr "" @@ -4730,71 +4797,6 @@ msgstr "" msgid "Block Title" 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 -msgid "Public access denied." -msgstr "" - -#: ../../mod/directory.php:227 -#, php-format -msgid "%d rating" -msgid_plural "%d ratings" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/directory.php:238 -msgid "Gender: " -msgstr "" - -#: ../../mod/directory.php:240 -msgid "Status: " -msgstr "" - -#: ../../mod/directory.php:242 -msgid "Homepage: " -msgstr "" - -#: ../../mod/directory.php:310 -msgid "Public Forum:" -msgstr "" - -#: ../../mod/directory.php:313 -msgid "Keywords: " -msgstr "" - -#: ../../mod/directory.php:316 -msgid "Don't suggest" -msgstr "" - -#: ../../mod/directory.php:318 -msgid "Common connections:" -msgstr "" - -#: ../../mod/directory.php:367 -msgid "Global Directory" -msgstr "" - -#: ../../mod/directory.php:367 -msgid "Local Directory" -msgstr "" - -#: ../../mod/directory.php:373 -msgid "Finding:" -msgstr "" - -#: ../../mod/directory.php:378 -msgid "next page" -msgstr "" - -#: ../../mod/directory.php:378 -msgid "previous page" -msgstr "" - -#: ../../mod/directory.php:394 -msgid "No entries (some entries may be hidden)." -msgstr "" - #: ../../mod/cloud.php:120 msgid "$Projectname - Guests: Username: {your email address}, Password: +++" msgstr "" @@ -5248,7 +5250,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1558 +#: ../../mod/lostpass.php:85 ../../boot.php:1559 msgid "Password Reset" msgstr "" @@ -9077,51 +9079,51 @@ 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 "" -#: ../../boot.php:2178 +#: ../../boot.php:2179 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2313 +#: ../../boot.php:2314 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2316 +#: ../../boot.php:2317 #, php-format msgid "[red] Website SSL error for %s" msgstr "" -#: ../../boot.php:2353 +#: ../../boot.php:2354 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2357 +#: ../../boot.php:2358 #, php-format msgid "[red] Cron tasks not running on %s" msgstr "" diff --git a/version.inc b/version.inc index 28c637e51..3310f4f5f 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-07-07.1086 +2015-07-10.1089 -- cgit v1.2.3 From d592d911c5942ea5863bd9c64f7c90c27bf14b5c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 11 Jul 2015 12:05:39 +0200 Subject: add css file for mod display --- view/css/mod_display.css | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 view/css/mod_display.css 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; +} -- cgit v1.2.3 From d8e7f36c74a4ebff25d3997f5543b08faa00a496 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 11 Jul 2015 12:42:11 +0200 Subject: revert moving section and aside padding to style.css - it brings trouble to other layouts --- view/css/default.css | 14 ++++++++++++++ view/theme/redbasic/css/style.css | 5 ----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/view/css/default.css b/view/css/default.css index e1edc2cbf..f0c89a087 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -17,6 +17,7 @@ main { aside { display: table-cell; vertical-align: top; + padding: 80px 7px 0px 7px; } @@ -24,4 +25,17 @@ section { width: 100%; display: table-cell; vertical-align: top; + 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/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a44cf331c..3c812d8bc 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -28,17 +28,12 @@ aside#region_1 { width: $aside_widthpx; min-width: $aside_widthpx; max-width: $aside_widthpx; - padding: 80px 7px 0px 7px; } main { max-width: $main_widthpx; } -section { - padding: 80px 7px 200px 7px; -} - h1, .h1, h2, .h2 { font-size: 1.667em; } -- cgit v1.2.3 From d3581d85620d38ab02bdc4e25a20106527be8676 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 11 Jul 2015 12:52:06 +0200 Subject: more revert --- view/theme/redbasic/css/style.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3c812d8bc..6d23a1996 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2120,14 +2120,9 @@ nav .badge.mail-update:hover { @media screen and (max-width: 767px) { - section { - padding: 65px 7px 200px 7px; - } - aside#region_1 { background: rgba(0, 0, 0, .1); border-right: 1px solid $nav_bd; - padding: 65px 7px 0px 7px; } main { -- cgit v1.2.3 From 138e0fe4456068a2316c8462a85f4ae2727ee93c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 11 Jul 2015 13:25:06 +0200 Subject: fix issue with profile photo --- view/theme/redbasic/css/style.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6d23a1996..939b9cf54 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -416,13 +416,18 @@ footer { #profile-photo-wrapper img { width: 100%; + height: 100%; max-width: 300px; - height: auto; + max-height: 300px; } #profile-photo-wrapper { + width: 251px; + height: 251px; margin-top: -10px; margin-bottom: 10px; + border: 1px solid #ccc; + border-radius: $radiuspx; } @@ -514,7 +519,6 @@ footer { display: block; } - .pager { padding: 10px; text-align: center; @@ -580,10 +584,6 @@ footer { margin-left: 5px; } -.photo { - border: 1px solid #ccc; -} - .photo-top-photo, .photo-album-photo { /* padding: 10px; max-width: 300px; -- cgit v1.2.3 From bc6efba68ab2a545dc7922fd11a1962bf3b3abb2 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 11 Jul 2015 15:01:41 -0700 Subject: revision update --- version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.inc b/version.inc index 3310f4f5f..d193b7989 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-07-10.1089 +2015-07-11.1090 -- cgit v1.2.3 From d8f03450e7564f8a790ce514fa98330aa8535229 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 12 Jul 2015 00:40:12 +0200 Subject: make menu creation for sys channel work --- mod/menu.php | 2 +- mod/mitem.php | 7 +------ view/tpl/menuedit.tpl | 4 ++-- view/tpl/mitemedit.tpl | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/mod/menu.php b/mod/menu.php index f46dc9471..d1943960f 100644 --- a/mod/menu.php +++ b/mod/menu.php @@ -137,7 +137,7 @@ function menu_content(&$a) { $o = replace_macros(get_markup_template('menuedit.tpl'), array( '$header' => t('Edit Menu'), - '$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..e3341f5de 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) { } - - - } @@ -155,6 +149,7 @@ function mitem_content(&$a) { $create = replace_macros(get_markup_template('mitemedit.tpl'), array( '$menu_id' => $a->data['menu']['menu_id'], + '$action' => 'mitem/' . $a->data['menu']['menu_id'] . (($a->is_sys) ? '?f=&sys=1' : ''), '$permissions' => t('Menu Item Permissions'), '$permdesc' => t("\x28click to open/close\x29"), '$aclselect' => populate_acl($perm_defaults,false), diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 0e5df2c47..5c8734ef7 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -1,9 +1,9 @@ {{if $header}}
- {{if $menu_id}} + {{if $menu_edit_link}}
-  {{$editcontents}} +  {{$editcontents}}
{{/if}}

{{$header}}

diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index 8715d6391..569552e28 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -5,7 +5,7 @@
{{/if}}
-
+ {{if $mitem_id}} -- cgit v1.2.3 From 6ca4240d96280f5fbc26f7f7f8b1372727014e88 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 12 Jul 2015 00:49:03 +0200 Subject: menu_id is still needed --- mod/menu.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/menu.php b/mod/menu.php index d1943960f..92ddf5a5f 100644 --- a/mod/menu.php +++ b/mod/menu.php @@ -137,6 +137,7 @@ function menu_content(&$a) { $o = replace_macros(get_markup_template('menuedit.tpl'), array( '$header' => t('Edit Menu'), + '$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'), -- cgit v1.2.3 From f81874ca49a4a414b359a488b82fd4c274b24472 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 12 Jul 2015 01:04:57 +0200 Subject: fix sys channel menu in a morre standard way --- mod/menu.php | 4 ++-- mod/mitem.php | 4 ++-- view/tpl/mitemedit.tpl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mod/menu.php b/mod/menu.php index 92ddf5a5f..d45405005 100644 --- a/mod/menu.php +++ b/mod/menu.php @@ -37,7 +37,7 @@ function menu_post(&$a) { $_REQUEST['menu_id'] = intval(argv(1)); $r = menu_edit($_REQUEST); if($r) { - //info( t('Menu updated.') . EOL); + info( t('Menu updated.') . EOL); goaway(z_root() . '/mitem/' . $menu_id . (($a->is_sys) ? '?f=&sys=1' : '')); } else @@ -46,7 +46,7 @@ function menu_post(&$a) { else { $r = menu_create($_REQUEST); if($r) { - //info( t('Menu created.') . EOL); + info( t('Menu created.') . EOL); goaway(z_root() . '/mitem/' . $r . (($a->is_sys) ? '?f=&sys=1' : '')); } else diff --git a/mod/mitem.php b/mod/mitem.php index e3341f5de..ee2de1cf8 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -149,7 +149,6 @@ function mitem_content(&$a) { $create = replace_macros(get_markup_template('mitemedit.tpl'), array( '$menu_id' => $a->data['menu']['menu_id'], - '$action' => 'mitem/' . $a->data['menu']['menu_id'] . (($a->is_sys) ? '?f=&sys=1' : ''), '$permissions' => t('Menu Item Permissions'), '$permdesc' => t("\x28click to open/close\x29"), '$aclselect' => populate_acl($perm_defaults,false), @@ -162,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/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index 569552e28..f9dc4e2cc 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -5,7 +5,7 @@
{{/if}}
- + {{if $mitem_id}} -- cgit v1.2.3 From 04c794da107751674c82e39ce45ee1fad726a987 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 12 Jul 2015 01:12:20 +0200 Subject: whitespace and comment out info again --- mod/menu.php | 4 ++-- mod/mitem.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/menu.php b/mod/menu.php index d45405005..92ddf5a5f 100644 --- a/mod/menu.php +++ b/mod/menu.php @@ -37,7 +37,7 @@ function menu_post(&$a) { $_REQUEST['menu_id'] = intval(argv(1)); $r = menu_edit($_REQUEST); if($r) { - info( t('Menu updated.') . EOL); + //info( t('Menu updated.') . EOL); goaway(z_root() . '/mitem/' . $menu_id . (($a->is_sys) ? '?f=&sys=1' : '')); } else @@ -46,7 +46,7 @@ function menu_post(&$a) { else { $r = menu_create($_REQUEST); if($r) { - info( t('Menu created.') . EOL); + //info( t('Menu created.') . EOL); goaway(z_root() . '/mitem/' . $r . (($a->is_sys) ? '?f=&sys=1' : '')); } else diff --git a/mod/mitem.php b/mod/mitem.php index ee2de1cf8..bc93165ac 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -162,7 +162,7 @@ function mitem_content(&$a) { '$display' => $display, '$lockstate' => $lockstate, '$menu_names' => $menu_names, - '$sys' => $a->is_sys + '$sys' => $a->is_sys )); $o .= replace_macros(get_markup_template('mitemlist.tpl'),array( -- cgit v1.2.3 From 3ec2dc81f242b03668e209cd83488bf9830a8af4 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 11 Jul 2015 16:30:06 -0700 Subject: allow sys editing of menu --- mod/menu.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/menu.php b/mod/menu.php index 92ddf5a5f..7763c4ed1 100644 --- a/mod/menu.php +++ b/mod/menu.php @@ -137,6 +137,7 @@ 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'), -- cgit v1.2.3 From b7d3eb16056d4c91f60f3ae1e3b0085fdd6331b6 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 11 Jul 2015 16:36:58 -0700 Subject: Only let local logins install webpage elements --- include/bbcode.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/bbcode.php b/include/bbcode.php index e248c3771..ba9592a51 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 . '' . $text . '' . 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; } -- cgit v1.2.3 From a07be48017fd4b9a83c14153674386f2bcdc016c Mon Sep 17 00:00:00 2001 From: zottel Date: Mon, 13 Jul 2015 17:30:04 +0200 Subject: change account_default_channel if default channel is removed --- include/Contact.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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), -- cgit v1.2.3 From 800eec5bee9a63940234f94eb3c480a13de1b123 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 13 Jul 2015 17:48:11 -0700 Subject: merge from redmatrix --- include/Contact.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/Contact.php b/include/Contact.php index ad3580f42..6b5f9388c 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -333,7 +333,7 @@ function channel_remove($channel_id, $local = true, $unset_session=true) { ); // 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", + $r = q("select channel_id from channel where channel_account_id = %d and channel_removed = 0 limit 1", intval($a->account['account_id']), intval(PAGE_REMOVED)); if ($r) { -- cgit v1.2.3 From 7f712973831212694de824a2e63961b98ef53959 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jul 2015 12:46:40 +0200 Subject: cleanup connedit --- include/contact_selectors.php | 2 +- mod/connedit.php | 118 +++++-------- view/css/mod_connedit.css | 186 +------------------- view/js/mod_connedit.js | 134 +-------------- view/theme/redbasic/css/style.css | 17 +- view/tpl/abook_edit.tpl | 349 +++++++++++++++++++++++--------------- view/tpl/contact_slider.tpl | 20 ++- view/tpl/field_acheckbox.tpl | 14 +- view/tpl/rating_slider.tpl | 19 ++- 9 files changed, 309 insertions(+), 550 deletions(-) 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 .= "\r\n"; $r = q("SELECT profile_guid, profile_name FROM `profile` WHERE `uid` = %d", intval($_SESSION['uid'])); diff --git a/mod/connedit.php b/mod/connedit.php index 71166b2cc..39a69364d 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' @@ -493,59 +492,58 @@ 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'), ), - 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'), ), - 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'), ), - 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'), ), - array( + 'delete' => array( 'label' => t('Delete'), 'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/drop', 'sel' => '', @@ -556,18 +554,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 +605,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,8 +628,19 @@ 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" : ''); @@ -656,85 +655,44 @@ function connedit_content(&$a) { $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), '', 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.'), '$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'), '$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 not be able to communicate with you until you submit this page, which will install and apply the selected permissions.'), + '$affinity' => $affinity, '$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 privacy settings, 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 not 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 privacy settings, 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 privacy settings, which have higher priority than individual settings. You can not change those settings here.'), '$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/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/js/mod_connedit.js b/view/js/mod_connedit.js index ee34f0508..fd545afeb 100644 --- a/view/js/mod_connedit.js +++ b/view/js/mod_connedit.js @@ -1,138 +1,6 @@ - -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(); -} - - $(document).ready(function() { - if(typeof(after_following) !== 'undefined' && after_following) { - if(typeof(connectDefaultShare) !== 'undefined') - connectDefaultShare(); - else - connectFullShare(); - abook_perms_new(); - } - - $('#id_pending').click(function() { - if(typeof(connectDefaultShare) !== 'undefined') - connectDefaultShare(); - else - connectFullShare(); - abook_perms_new(); - }); -// $('.abook-edit-me').click(function() { -// abook_perms_msg(); -// }); + $('form').areYouSure({'addRemoveFieldsMarksDirty':true, 'message': aStr['leavethispage'] }); // Warn user about unsaved settings }); - -function connectFullShare() { - $('.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_chat').attr('checked','checked'); - $('#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/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 939b9cf54..679d48edb 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1284,13 +1284,7 @@ div.jGrowl div.jGrowl-notification { text-align: center; } -#contact-slider { - position: relative; - left: 5%; - width: 90%; -} - -a.rconnect, a.rateme, div.rateme { +.rconnect, a.rateme, div.rateme { color: $nav_active_icon_colour; text-decoration: none; font-weight: normal; @@ -1932,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; } @@ -1965,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 @@ -2299,3 +2297,6 @@ nav .badge.mail-update:hover { margin-top: -5px !important; } +.collapse { +width: 100% !important; +} diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index d118cbb9c..202c6881e 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -1,140 +1,211 @@ -
-

{{$header}}

- -

{{$addr}}

- -{{if $notself}} -
-{{$tabs}} -
-
-{{foreach $buttons as $b }} - -{{/foreach}} -{{/if}} - - -
- - - - - - - - - -{{if $last_update}} -{{$lastupdtext}} {{$last_update}} -{{/if}} - - -{{if $is_pending}} -
-{{include file="field_checkbox.tpl" field=$unapproved}} -
-{{/if}} - - -{{if $notself}} -{{if $slide}} -

{{$lbl_slider}}

- -{{$slide}} - -{{/if}} - -{{if $connfilter}} - {{include file="field_textarea.tpl" field=$incl}} - {{include file="field_textarea.tpl" field=$excl}} -{{else}} - - -{{/if}} - -{{if $rating}} -

{{$lbl_rating}}

- -{{$rating}} - - -{{/if}} - - - -{{/if}} - - -{{if $self}} -
-
{{$autolbl}}
-{{include file="field_checkbox.tpl" field=$autoperms}} -
-{{/if}} - - - - - - -{{if $rating}} -{{if $notself}} - {{include file="field_textarea.tpl" field=$rating_text}} -{{/if}} -{{/if}} - -{{if $notself}} -{{if $multiprofs }} -
-

{{$lbl_vis1}}

-
{{$lbl_vis2}}
- -{{$profile_select}} -
-{{/if}} -{{/if}} - -

{{$permlbl}}

- -{{if $notself}} - - - -{{if $notself}} -
-{{/if}} - - - -{{if $self && $noperms}} - -{{/if}} - - -
+
+
+ {{if $notself}} +
+ + +
+ {{/if}} +

{{$header}}

+
+
+ {{if $notself}} +
+
+ {{$addr_text}} '{{$addr}}' +
+ {{if $last_update}} +
+ {{$lastupdtext}} {{$last_update}} +
+ {{/if}} +
+ {{/if}} + +
+ + + +
+ {{if $notself}} + + {{if $is_pending}} +
+ +
+
+ {{include file="field_checkbox.tpl" field=$unapproved}} +
+ +
+
+
+
+ + + {{/if}} + + {{if $affinity }} +
+ +
+
+ {{if $slide}} +
{{$lbl_slider}}
+ {{$slide}} + + {{/if}} + + {{if $multiprofs }} +
+ {{$lbl_vis2}} + {{$profile_select}} +
+ {{/if}} +
+ +
+
+
+
+ {{/if}} + + {{if $connfilter}} +
+ +
+
+ {{include file="field_textarea.tpl" field=$incl}} + {{include file="field_textarea.tpl" field=$excl}} +
+ +
+
+
+
+ {{else}} + + + {{/if}} + + {{if $rating}} +
+ +
+
+
+ {{$rating_info}} +
+
{{$lbl_rating_label}}
+ {{$rating}} + {{include file="field_textarea.tpl" field=$rating_text}} + +
+ +
+
+
+
+ {{/if}} + + {{/if}} + +
+ {{if $notself}} + + {{/if}} +
+
+
+ {{$permnote}} +
+ + + + + {{if $notself}} + + {{/if}} + + + {{foreach $perms as $prm}} + {{include file="field_acheckbox.tpl" field=$prm}} + {{/foreach}} +
{{$them}}{{$me}}
+ + {{if $self}} +
+
{{$autolbl}}
+ {{include file="field_checkbox.tpl" field=$autoperms}} +
+ {{/if}} + +
+ +
+
+
+
+
+
+
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 @@ -
+
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 816af2a65..a4f271f1a 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -1,17 +1,17 @@ - + - +
+ {{$field.6}} + {{if $notself}} + {{/if}} - + {{if $field.5}}{{$inherited}} {{/if}} - - {{$field.6}} - - \ No newline at end of file + 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 @@ -
+
-- cgit v1.2.3 From a28da40fa8937e87d633689527c84594a771855d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jul 2015 12:52:50 +0200 Subject: css fixes --- view/theme/redbasic/css/style.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 679d48edb..046d8471b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1284,7 +1284,7 @@ div.jGrowl div.jGrowl-notification { text-align: center; } -.rconnect, a.rateme, div.rateme { +a.rconnect, a.rateme, div.rateme { color: $nav_active_icon_colour; text-decoration: none; font-weight: normal; @@ -2296,7 +2296,3 @@ nav .badge.mail-update:hover { .channels_ckbx, .pending_ckbx, .users_ckbx { margin-top: -5px !important; } - -.collapse { -width: 100% !important; -} -- cgit v1.2.3 From 711dd1468db2116a2003494d4fe6d8a7c5ed7c7b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jul 2015 13:16:08 +0200 Subject: provide inherited perms for connection default permissions --- mod/connedit.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mod/connedit.php b/mod/connedit.php index 39a69364d..a72714a1d 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -650,9 +650,11 @@ function connedit_content(&$a) { 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]); } + //print_r($perms); killme(); + $o .= replace_macros($tpl,array( '$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])), -- cgit v1.2.3 From d8edb66287d7f5423c7a4ca8f87ae949465f3b68 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jul 2015 13:21:39 +0200 Subject: remove dbg --- mod/connedit.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/mod/connedit.php b/mod/connedit.php index a72714a1d..a769ed686 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -653,8 +653,6 @@ function connedit_content(&$a) { $perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC) ? '' : '1'), $v[4]); } - //print_r($perms); killme(); - $o .= replace_macros($tpl,array( '$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])), -- cgit v1.2.3 From dd57864867da2a1ddaf7b96094f924de9a3262a4 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jul 2015 13:46:22 +0200 Subject: revert provide inherited perms for connection default permissions --- mod/connedit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/connedit.php b/mod/connedit.php index a769ed686..39a69364d 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -650,7 +650,7 @@ function connedit_content(&$a) { 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) ? '' : '1'), $v[4]); + $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]); } $o .= replace_macros($tpl,array( -- cgit v1.2.3 From f267bd55d68f6d3c63c33b1d307728e4ed12ddd5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jul 2015 14:20:23 +0200 Subject: revert this until further investigation --- view/tpl/field_acheckbox.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index a4f271f1a..2b5195322 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -9,7 +9,7 @@ {{/if}} - + {{if $field.5}}{{$inherited}} {{/if}} -- cgit v1.2.3 From cc1764989f70b28654b47fd58fd59b12b270b470 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jul 2015 17:37:33 +0200 Subject: fix mod_connedit.js after cleanup --- view/js/mod_connedit.js | 34 ++++++++++++++++++++++++++++++++++ view/tpl/field_acheckbox.tpl | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js index fd545afeb..d6cc42175 100644 --- a/view/js/mod_connedit.js +++ b/view/js/mod_connedit.js @@ -2,5 +2,39 @@ $(document).ready(function() { $('form').areYouSure({'addRemoveFieldsMarksDirty':true, 'message': aStr['leavethispage'] }); // Warn user about unsaved settings + if(typeof(after_following) !== 'undefined' && after_following) { + if(typeof(connectDefaultShare) !== 'undefined') + connectDefaultShare(); + else + connectFullShare(); + } + + $('#id_pending').click(function() { + if(typeof(connectDefaultShare) !== 'undefined') + connectDefaultShare(); + else + connectFullShare(); + }); + }); +function connectFullShare() { + $('.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_chat').attr('checked','checked'); + $('#me_id_perms_view_storage').attr('checked','checked'); + $('#me_id_perms_republish').attr('checked','checked'); + $('#me_id_perms_post_like').attr('checked','checked'); +} diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 2b5195322..5b03a7848 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -12,6 +12,6 @@ - {{if $field.5}}{{$inherited}} {{/if}} + {{if $field.5}}{{$inherited}}{{/if}} -- cgit v1.2.3 From 4fe64179c8c99dbcbabd1580ddf760288d049547 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jul 2015 19:29:49 +0200 Subject: disable the inherited checkboxes for notself --- view/tpl/field_acheckbox.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 5b03a7848..d2aad3875 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -9,7 +9,7 @@ {{/if}} - + {{if $field.5}}{{$inherited}}{{/if}} -- cgit v1.2.3 From 104cbcab722477340961d45a93a441bb9fbc7e7a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jul 2015 21:32:18 +0200 Subject: make strings translateable --- mod/connedit.php | 6 ++++++ view/tpl/abook_edit.tpl | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mod/connedit.php b/mod/connedit.php index 39a69364d..f628fb9d3 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -668,6 +668,7 @@ function connedit_content(&$a) { '$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'),$rating_text,''), @@ -676,6 +677,11 @@ function connedit_content(&$a) { '$rating_val' => $rating_val, '$slide' => $slide, '$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'), diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 202c6881e..71693a553 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -46,7 +46,7 @@ @@ -64,15 +64,15 @@
- +
- {{$name}} ({{$addr}}) would like to connect with you. Please approve this connection to allow communication. + {{$name}} {{$pending_modal_body}}
- - + +
@@ -116,7 +116,7 @@ -- cgit v1.2.3 From a5989b0f310b117238fc4728d359a2151f3de6e7 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 14 Jul 2015 16:54:16 -0700 Subject: coverup and ignore the illegal string offset message that some sites have been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled. --- include/zot.php | 4 +++- mod/setup.php | 2 +- version.inc | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/zot.php b/include/zot.php index 34e7f3e42..9a20084c4 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1110,7 +1110,9 @@ 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']); + } } stringify_array_elms($recip_arr); $recips = implode(',',$recip_arr); 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() { ."

".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') .t('Please see the file "install/INSTALL.txt".') ."

" - .t("Go to your new Red node registration page 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 registration page 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.") ."

"; } diff --git a/version.inc b/version.inc index d193b7989..11c628215 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-07-11.1090 +2015-07-14.1093 -- cgit v1.2.3 From 46aacfe64d317b5a38eea5495d72a1e734265b09 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 14 Jul 2015 17:15:53 -0700 Subject: stream_perms_xchans() set to empty quoted string when no results rather than return an empty string --- include/security.php | 6 ++++++ 1 file changed, 6 insertions(+) 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; -- cgit v1.2.3 From caaf7192ff82238571678cfee5aa5cd96549e46e Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 14 Jul 2015 21:02:54 -0700 Subject: provide resumable imports if things go wrong --- mod/import.php | 614 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 329 insertions(+), 285 deletions(-) diff --git a/mod/import.php b/mod/import.php index 43705913f..a87906926 100644 --- a/mod/import.php +++ b/mod/import.php @@ -35,7 +35,8 @@ function import_post(&$a) { $filename = basename($_FILES['filename']['name']); $filesize = intval($_FILES['filename']['size']); $filetype = $_FILES['filename']['type']; - $resume = ((array_key_exists('resume',$_REQUEST)) ? intval($_REQUEST['resume']) : 0); + + $completed = ((array_key_exists('import_step',$_SESSION)) ? intval($_SESSION['import_step']) : 0); if($src) { @@ -115,360 +116,402 @@ function import_post(&$a) { // import channel - $channel = $data['channel']; + if(array_key_exists('channel',$data)) { + $channel = $data['channel']; - if(! array_key_exists('channel_system',$channel)) { - $channel['channel_system'] = (($channel['channel_pageflags'] & 0x1000) ? 1 : 0); - $channel['channel_removed'] = (($channel['channel_pageflags'] & 0x8000) ? 1 : 0); - } + if($completed < 1) { - $r = q("select * from channel where (channel_guid = '%s' or channel_hash = '%s' or channel_address = '%s' ) limit 1", - dbesc($channel['channel_guid']), - dbesc($channel['channel_hash']), - dbesc($channel['channel_address']) - ); + if(! array_key_exists('channel_system',$channel)) { + $channel['channel_system'] = (($channel['channel_pageflags'] & 0x1000) ? 1 : 0); + $channel['channel_removed'] = (($channel['channel_pageflags'] & 0x8000) ? 1 : 0); + } - // We should probably also verify the hash + $r = q("select * from channel where (channel_guid = '%s' or channel_hash = '%s' or channel_address = '%s' ) limit 1", + dbesc($channel['channel_guid']), + dbesc($channel['channel_hash']), + dbesc($channel['channel_address']) + ); - if($r) { - if($r[0]['channel_guid'] === $channel['channel_guid'] || $r[0]['channel_hash'] === $channel['channel_hash']) { - logger('mod_import: duplicate channel. ', print_r($channel,true)); - notice( t('Cannot create a duplicate channel identifier on this system. Import failed.') . EOL); - return; - } - else { - // try at most ten times to generate a unique address. - $x = 0; - $found_unique = false; - do { - $tmp = $channel['channel_address'] . mt_rand(1000,9999); - $r = q("select * from channel where channel_address = '%s' limit 1", - dbesc($tmp) - ); - if(! $r) { - $channel['channel_address'] = $tmp; - $found_unique = true; - break; + // We should probably also verify the hash + + if($r) { + if($r[0]['channel_guid'] === $channel['channel_guid'] || $r[0]['channel_hash'] === $channel['channel_hash']) { + logger('mod_import: duplicate channel. ', print_r($channel,true)); + notice( t('Cannot create a duplicate channel identifier on this system. Import failed.') . EOL); + return; } - $x ++; - } while ($x < 10); - if(! $found_unique) { - logger('mod_import: duplicate channel. randomisation failed.', print_r($channel,true)); - notice( t('Unable to create a unique channel address. Import failed.') . EOL); - return; + else { + // try at most ten times to generate a unique address. + $x = 0; + $found_unique = false; + do { + $tmp = $channel['channel_address'] . mt_rand(1000,9999); + $r = q("select * from channel where channel_address = '%s' limit 1", + dbesc($tmp) + ); + if(! $r) { + $channel['channel_address'] = $tmp; + $found_unique = true; + break; + } + $x ++; + } while ($x < 10); + if(! $found_unique) { + logger('mod_import: duplicate channel. randomisation failed.', print_r($channel,true)); + notice( t('Unable to create a unique channel address. Import failed.') . EOL); + return; + } + } } - } - } - unset($channel['channel_id']); - $channel['channel_account_id'] = get_account_id(); - $channel['channel_primary'] = (($seize) ? 1 : 0); + unset($channel['channel_id']); + $channel['channel_account_id'] = get_account_id(); + $channel['channel_primary'] = (($seize) ? 1 : 0); - dbesc_array($channel); - - $r = dbq("INSERT INTO channel (`" - . implode("`, `", array_keys($channel)) - . "`) VALUES ('" - . implode("', '", array_values($channel)) - . "')" ); + dbesc_array($channel); - if(! $r) { - logger('mod_import: channel clone failed. ', print_r($channel,true)); - notice( t('Channel clone failed. Import failed.') . EOL); - return; - } + $r = dbq("INSERT INTO channel (`" + . implode("`, `", array_keys($channel)) + . "`) VALUES ('" + . implode("', '", array_values($channel)) + . "')" ); - $r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1", - intval(get_account_id()), - $channel['channel_guid'] // Already dbesc'd - ); - if(! $r) { - logger('mod_import: channel not found. ', print_r($channel,true)); - notice( t('Cloned channel not found. Import failed.') . EOL); - return; - } - // reset - $channel = $r[0]; + if(! $r) { + logger('mod_import: channel clone failed. ', print_r($channel,true)); + notice( t('Channel clone failed. Import failed.') . EOL); + return; + } - set_default_login_identity(get_account_id(),$channel['channel_id'],false); + $r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1", + intval(get_account_id()), + $channel['channel_guid'] // Already dbesc'd + ); + if(! $r) { + logger('mod_import: channel not found. ', print_r($channel,true)); + notice( t('Cloned channel not found. Import failed.') . EOL); + return; + } + // reset + $channel = $r[0]; + set_default_login_identity(get_account_id(),$channel['channel_id'],false); - $configs = $data['config']; - if($configs) { - foreach($configs as $config) { - unset($config['id']); - $config['uid'] = $channel['channel_id']; - dbesc_array($config); - $r = dbq("INSERT INTO pconfig (`" - . implode("`, `", array_keys($config)) - . "`) VALUES ('" - . implode("', '", array_values($config)) - . "')" ); + $_SESSION['import_step'] = 1; } } + else + $channel = $a->get_channel(); - if($data['photo']) { - require_once('include/photo/photo_driver.php'); - import_channel_photo(base64url_decode($data['photo']['data']),$data['photo']['type'],get_account_id(),$channel['channel_id']); - } + if($completed < 2) { + + $configs = $data['config']; + if($configs) { + foreach($configs as $config) { + unset($config['id']); + $config['uid'] = $channel['channel_id']; + dbesc_array($config); + $r = dbq("INSERT INTO pconfig (`" + . implode("`, `", array_keys($config)) + . "`) VALUES ('" + . implode("', '", array_values($config)) + . "')" ); + } + } - $profiles = $data['profile']; - if($profiles) { - foreach($profiles as $profile) { - unset($profile['id']); - $profile['aid'] = get_account_id(); - $profile['uid'] = $channel['channel_id']; + $_SESSION['import_step'] = 2; + } - // we are going to reset all profile photos to the original - // somebody will have to fix this later and put all the applicable photos into the export - $profile['photo'] = z_root() . '/photo/profile/l/' . $channel['channel_id']; - $profile['thumb'] = z_root() . '/photo/profile/m/' . $channel['channel_id']; + if($completed < 3) { - dbesc_array($profile); - $r = dbq("INSERT INTO profile (`" - . implode("`, `", array_keys($profile)) - . "`) VALUES ('" - . implode("', '", array_values($profile)) - . "')" ); + if($data['photo']) { + require_once('include/photo/photo_driver.php'); + import_channel_photo(base64url_decode($data['photo']['data']),$data['photo']['type'],get_account_id(),$channel['channel_id']); } - } + $profiles = $data['profile']; + if($profiles) { + foreach($profiles as $profile) { + unset($profile['id']); + $profile['aid'] = get_account_id(); + $profile['uid'] = $channel['channel_id']; - $hublocs = $data['hubloc']; - if($hublocs) { - foreach($hublocs as $hubloc) { - - if(! array_key_exists('hubloc_primary',$hublocs)) { - $hubloc['hubloc_primary'] = (($hubloc['hubloc_flags'] & 0x0001) ? 1 : 0); - $hubloc['hubloc_orphancheck'] = (($hubloc['hubloc_flags'] & 0x0004) ? 1 : 0); - $hubloc['hubloc_error'] = (($hubloc['hubloc_status'] & 0x0003) ? 1 : 0); - $hubloc['hubloc_deleted'] = (($hubloc['hubloc_flags'] & 0x1000) ? 1 : 0); - } + // we are going to reset all profile photos to the original + // somebody will have to fix this later and put all the applicable photos into the export + + $profile['photo'] = z_root() . '/photo/profile/l/' . $channel['channel_id']; + $profile['thumb'] = z_root() . '/photo/profile/m/' . $channel['channel_id']; - $arr = array( - 'guid' => $hubloc['hubloc_guid'], - 'guid_sig' => $hubloc['guid_sig'], - 'url' => $hubloc['hubloc_url'], - 'url_sig' => $hubloc['hubloc_url_sig'] - ); - if(($hubloc['hubloc_hash'] === $channel['channel_hash']) && intval($hubloc['hubloc_primary']) && ($seize)) - $hubloc['hubloc_primary'] = 0; - if(! zot_gethub($arr)) { - unset($hubloc['hubloc_id']); - dbesc_array($hubloc); - - $r = dbq("INSERT INTO hubloc (`" - . implode("`, `", array_keys($hubloc)) + dbesc_array($profile); + $r = dbq("INSERT INTO profile (`" + . implode("`, `", array_keys($profile)) . "`) VALUES ('" - . implode("', '", array_values($hubloc)) + . implode("', '", array_values($profile)) . "')" ); - } - } + $_SESSION['import_step'] = 3; } - // create new hubloc for the new channel at this site - - $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_network, hubloc_primary, - hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey ) - values ( '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s' )", - dbesc($channel['channel_guid']), - dbesc($channel['channel_guid_sig']), - dbesc($channel['channel_hash']), - dbesc($channel['channel_address'] . '@' . get_app()->get_hostname()), - dbesc('zot'), - intval(($seize) ? 1 : 0), - dbesc(z_root()), - dbesc(base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey']))), - dbesc(get_app()->get_hostname()), - dbesc(z_root() . '/post'), - dbesc(get_config('system','pubkey')) - ); - - // reset the original primary hubloc if it is being seized - - if($seize) - $r = q("update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' and hubloc_url != '%s' ", - dbesc($channel['channel_hash']), - dbesc(z_root()) - ); - - // import xchans and contact photos - if($seize) { + if($completed < 4) { + $hublocs = $data['hubloc']; + if($hublocs) { + foreach($hublocs as $hubloc) { - // replace any existing xchan we may have on this site if we're seizing control + if(! array_key_exists('hubloc_primary',$hublocs)) { + $hubloc['hubloc_primary'] = (($hubloc['hubloc_flags'] & 0x0001) ? 1 : 0); + $hubloc['hubloc_orphancheck'] = (($hubloc['hubloc_flags'] & 0x0004) ? 1 : 0); + $hubloc['hubloc_error'] = (($hubloc['hubloc_status'] & 0x0003) ? 1 : 0); + $hubloc['hubloc_deleted'] = (($hubloc['hubloc_flags'] & 0x1000) ? 1 : 0); + } - $r = q("delete from xchan where xchan_hash = '%s'", - dbesc($channel['channel_hash']) - ); + $arr = array( + 'guid' => $hubloc['hubloc_guid'], + 'guid_sig' => $hubloc['guid_sig'], + 'url' => $hubloc['hubloc_url'], + 'url_sig' => $hubloc['hubloc_url_sig'] + ); + if(($hubloc['hubloc_hash'] === $channel['channel_hash']) && intval($hubloc['hubloc_primary']) && ($seize)) + $hubloc['hubloc_primary'] = 0; - $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_url, xchan_follow, xchan_connurl, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_hidden, xchan_orphan, xchan_censored, xchan_selfcensored, xchan_system, xchan_pubforum, xchan_deleted ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, %d, %d, %d )", - dbesc($channel['channel_hash']), + if(! zot_gethub($arr)) { + unset($hubloc['hubloc_id']); + dbesc_array($hubloc); + + $r = dbq("INSERT INTO hubloc (`" + . implode("`, `", array_keys($hubloc)) + . "`) VALUES ('" + . implode("', '", array_values($hubloc)) + . "')" ); + } + } + } + $_SESSION['import_step'] = 4; + } + + if($completed < 5) { + // create new hubloc for the new channel at this site + + $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_network, hubloc_primary, + hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey ) + values ( '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s' )", dbesc($channel['channel_guid']), dbesc($channel['channel_guid_sig']), - dbesc($channel['channel_pubkey']), - dbesc($a->get_baseurl() . "/photo/profile/l/" . $channel['channel_id']), - dbesc($a->get_baseurl() . "/photo/profile/m/" . $channel['channel_id']), - dbesc($a->get_baseurl() . "/photo/profile/s/" . $channel['channel_id']), + dbesc($channel['channel_hash']), dbesc($channel['channel_address'] . '@' . get_app()->get_hostname()), - dbesc(z_root() . '/channel/' . $channel['channel_address']), - dbesc(z_root() . '/follow?f=&url=%s'), - dbesc(z_root() . '/poco/' . $channel['channel_address']), - dbesc($channel['channel_name']), dbesc('zot'), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - 0,0,0,0,0,0,0 + intval(($seize) ? 1 : 0), + dbesc(z_root()), + dbesc(base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey']))), + dbesc(get_app()->get_hostname()), + dbesc(z_root() . '/post'), + dbesc(get_config('system','pubkey')) ); + + // reset the original primary hubloc if it is being seized + + if($seize) { + $r = q("update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' and hubloc_url != '%s' ", + dbesc($channel['channel_hash']), + dbesc(z_root()) + ); + } + + $_SESSION['import_step'] = 5; } + - $xchans = $data['xchan']; - if($xchans) { - foreach($xchans as $xchan) { - if(! array_key_exists('xchan_hidden',$xchan)) { - $xchan['xchan_hidden'] = (($xchan['xchan_flags'] & 0x0001) ? 1 : 0); - $xchan['xchan_orphan'] = (($xchan['xchan_flags'] & 0x0002) ? 1 : 0); - $xchan['xchan_censored'] = (($xchan['xchan_flags'] & 0x0004) ? 1 : 0); - $xchan['xchan_selfcensored'] = (($xchan['xchan_flags'] & 0x0008) ? 1 : 0); - $xchan['xchan_system'] = (($xchan['xchan_flags'] & 0x0010) ? 1 : 0); - $xchan['xchan_pubforum'] = (($xchan['xchan_flags'] & 0x0020) ? 1 : 0); - $xchan['xchan_deleted'] = (($xchan['xchan_flags'] & 0x1000) ? 1 : 0); - } + if($completed < 6) { + + // import xchans and contact photos + + if($seize) { + + // replace any existing xchan we may have on this site if we're seizing control - $r = q("select xchan_hash from xchan where xchan_hash = '%s' limit 1", - dbesc($xchan['xchan_hash']) + $r = q("delete from xchan where xchan_hash = '%s'", + dbesc($channel['channel_hash']) ); - if($r) - continue; - dbesc_array($xchan); + $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_url, xchan_follow, xchan_connurl, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_hidden, xchan_orphan, xchan_censored, xchan_selfcensored, xchan_system, xchan_pubforum, xchan_deleted ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, %d, %d, %d )", + dbesc($channel['channel_hash']), + dbesc($channel['channel_guid']), + dbesc($channel['channel_guid_sig']), + dbesc($channel['channel_pubkey']), + dbesc($a->get_baseurl() . "/photo/profile/l/" . $channel['channel_id']), + dbesc($a->get_baseurl() . "/photo/profile/m/" . $channel['channel_id']), + dbesc($a->get_baseurl() . "/photo/profile/s/" . $channel['channel_id']), + dbesc($channel['channel_address'] . '@' . get_app()->get_hostname()), + dbesc(z_root() . '/channel/' . $channel['channel_address']), + dbesc(z_root() . '/follow?f=&url=%s'), + dbesc(z_root() . '/poco/' . $channel['channel_address']), + dbesc($channel['channel_name']), + dbesc('zot'), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + 0,0,0,0,0,0,0 + ); + } + $_SESSION['import_step'] = 6; + } + + if($completed < 7) { + + $xchans = $data['xchan']; + if($xchans) { + foreach($xchans as $xchan) { + if(! array_key_exists('xchan_hidden',$xchan)) { + $xchan['xchan_hidden'] = (($xchan['xchan_flags'] & 0x0001) ? 1 : 0); + $xchan['xchan_orphan'] = (($xchan['xchan_flags'] & 0x0002) ? 1 : 0); + $xchan['xchan_censored'] = (($xchan['xchan_flags'] & 0x0004) ? 1 : 0); + $xchan['xchan_selfcensored'] = (($xchan['xchan_flags'] & 0x0008) ? 1 : 0); + $xchan['xchan_system'] = (($xchan['xchan_flags'] & 0x0010) ? 1 : 0); + $xchan['xchan_pubforum'] = (($xchan['xchan_flags'] & 0x0020) ? 1 : 0); + $xchan['xchan_deleted'] = (($xchan['xchan_flags'] & 0x1000) ? 1 : 0); + } + + $r = q("select xchan_hash from xchan where xchan_hash = '%s' limit 1", + dbesc($xchan['xchan_hash']) + ); + if($r) + continue; + + dbesc_array($xchan); - $r = dbq("INSERT INTO xchan (`" - . implode("`, `", array_keys($xchan)) - . "`) VALUES ('" - . implode("', '", array_values($xchan)) - . "')" ); + $r = dbq("INSERT INTO xchan (`" + . implode("`, `", array_keys($xchan)) + . "`) VALUES ('" + . implode("', '", array_values($xchan)) + . "')" ); - require_once('include/photo/photo_driver.php'); - $photos = import_profile_photo($xchan['xchan_photo_l'],$xchan['xchan_hash']); - if($photos[4]) - $photodate = NULL_DATE; - else - $photodate = $xchan['xchan_photo_date']; - - $r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s', xchan_photo_date = '%s' - where xchan_hash = '%s'", - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc($photos[3]), - dbesc($photodate), - dbesc($xchan['xchan_hash']) - ); + require_once('include/photo/photo_driver.php'); + $photos = import_profile_photo($xchan['xchan_photo_l'],$xchan['xchan_hash']); + if($photos[4]) + $photodate = NULL_DATE; + else + $photodate = $xchan['xchan_photo_date']; + + $r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s', xchan_photo_date = '%s' + where xchan_hash = '%s'", + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc($photos[3]), + dbesc($photodate), + dbesc($xchan['xchan_hash']) + ); + } } + $_SESSION['import_step'] = 7; } + + // FIXME - ensure we have an xchan if somebody is trying to pull a fast one - - $friends = 0; - $feeds = 0; - - // import contacts - $abooks = $data['abook']; - if($abooks) { - foreach($abooks as $abook) { - if($max_friends !== false && $friends > $max_friends) - continue; - if($max_feeds !== false && intval($abook['abook_feed']) && ($feeds > $max_feeds)) - continue; - unset($abook['abook_id']); - $abook['abook_account'] = get_account_id(); - $abook['abook_channel'] = $channel['channel_id']; - if(! array_key_exists('abook_blocked',$abook)) { - $abook['abook_blocked'] = (($abook['abook_flags'] & 0x0001 ) ? 1 : 0); - $abook['abook_ignored'] = (($abook['abook_flags'] & 0x0002 ) ? 1 : 0); - $abook['abook_hidden'] = (($abook['abook_flags'] & 0x0004 ) ? 1 : 0); - $abook['abook_archived'] = (($abook['abook_flags'] & 0x0008 ) ? 1 : 0); - $abook['abook_pending'] = (($abook['abook_flags'] & 0x0010 ) ? 1 : 0); - $abook['abook_unconnected'] = (($abook['abook_flags'] & 0x0020 ) ? 1 : 0); - $abook['abook_self'] = (($abook['abook_flags'] & 0x0080 ) ? 1 : 0); - $abook['abook_feed'] = (($abook['abook_flags'] & 0x0100 ) ? 1 : 0); - } + if($completed < 8) { + $friends = 0; + $feeds = 0; + + // import contacts + $abooks = $data['abook']; + if($abooks) { + foreach($abooks as $abook) { + if($max_friends !== false && $friends > $max_friends) + continue; + if($max_feeds !== false && intval($abook['abook_feed']) && ($feeds > $max_feeds)) + continue; - if($abook['abook_self']) { - $role = get_pconfig($channel['channel_id'],'system','permissions_role'); - if(($role === 'forum') || ($abook['abook_my_perms'] & PERMS_W_TAGWALL)) { - q("update xchan set xchan_pubforum = 1 where xchan_hash = '%s' ", - dbesc($abook['abook_xchan']) - ); + unset($abook['abook_id']); + $abook['abook_account'] = get_account_id(); + $abook['abook_channel'] = $channel['channel_id']; + if(! array_key_exists('abook_blocked',$abook)) { + $abook['abook_blocked'] = (($abook['abook_flags'] & 0x0001 ) ? 1 : 0); + $abook['abook_ignored'] = (($abook['abook_flags'] & 0x0002 ) ? 1 : 0); + $abook['abook_hidden'] = (($abook['abook_flags'] & 0x0004 ) ? 1 : 0); + $abook['abook_archived'] = (($abook['abook_flags'] & 0x0008 ) ? 1 : 0); + $abook['abook_pending'] = (($abook['abook_flags'] & 0x0010 ) ? 1 : 0); + $abook['abook_unconnected'] = (($abook['abook_flags'] & 0x0020 ) ? 1 : 0); + $abook['abook_self'] = (($abook['abook_flags'] & 0x0080 ) ? 1 : 0); + $abook['abook_feed'] = (($abook['abook_flags'] & 0x0100 ) ? 1 : 0); } - } - dbesc_array($abook); - $r = dbq("INSERT INTO abook (`" - . implode("`, `", array_keys($abook)) - . "`) VALUES ('" - . implode("', '", array_values($abook)) - . "')" ); + if($abook['abook_self']) { + $role = get_pconfig($channel['channel_id'],'system','permissions_role'); + if(($role === 'forum') || ($abook['abook_my_perms'] & PERMS_W_TAGWALL)) { + q("update xchan set xchan_pubforum = 1 where xchan_hash = '%s' ", + dbesc($abook['abook_xchan']) + ); + } + } + + dbesc_array($abook); + $r = dbq("INSERT INTO abook (`" + . implode("`, `", array_keys($abook)) + . "`) VALUES ('" + . implode("', '", array_values($abook)) + . "')" ); - $friends ++; - if(intval($abook['abook_feed'])) - $feeds ++; + $friends ++; + if(intval($abook['abook_feed'])) + $feeds ++; + } } + $_SESSION['import_step'] = 8; } - $groups = $data['group']; - if($groups) { - $saved = array(); - foreach($groups as $group) { - $saved[$group['hash']] = array('old' => $group['id']); - unset($group['id']); - $group['uid'] = $channel['channel_id']; - dbesc_array($group); - $r = dbq("INSERT INTO groups (`" - . implode("`, `", array_keys($group)) - . "`) VALUES ('" - . implode("', '", array_values($group)) - . "')" ); - } - $r = q("select * from `groups` where uid = %d", - intval($channel['channel_id']) - ); - if($r) { - foreach($r as $rr) { - $saved[$rr['hash']]['new'] = $rr['id']; + if($completed < 9) { + $groups = $data['group']; + if($groups) { + $saved = array(); + foreach($groups as $group) { + $saved[$group['hash']] = array('old' => $group['id']); + unset($group['id']); + $group['uid'] = $channel['channel_id']; + dbesc_array($group); + $r = dbq("INSERT INTO groups (`" + . implode("`, `", array_keys($group)) + . "`) VALUES ('" + . implode("', '", array_values($group)) + . "')" ); } - } - } + $r = q("select * from `groups` where uid = %d", + intval($channel['channel_id']) + ); + if($r) { + foreach($r as $rr) { + $saved[$rr['hash']]['new'] = $rr['id']; + } + } + } - $group_members = $data['group_member']; - if($groups_members) { - foreach($group_members as $group_member) { - unset($group_member['id']); - $group_member['uid'] = $channel['channel_id']; - foreach($saved as $x) { - if($x['old'] == $group_member['gid']) - $group_member['gid'] = $x['new']; + $group_members = $data['group_member']; + if($groups_members) { + foreach($group_members as $group_member) { + unset($group_member['id']); + $group_member['uid'] = $channel['channel_id']; + foreach($saved as $x) { + if($x['old'] == $group_member['gid']) + $group_member['gid'] = $x['new']; + } + dbesc_array($group_member); + $r = dbq("INSERT INTO group_member (`" + . implode("`, `", array_keys($group_member)) + . "`) VALUES ('" + . implode("', '", array_values($group_member)) + . "')" ); } - dbesc_array($group_member); - $r = dbq("INSERT INTO group_member (`" - . implode("`, `", array_keys($group_member)) - . "`) VALUES ('" - . implode("', '", array_values($group_member)) - . "')" ); } + $_SESSION['import_step'] = 9; } $saved_notification_flags = notifications_off($channel['channel_id']); @@ -545,6 +588,7 @@ function import_post(&$a) { change_channel($channel['channel_id']); + unset($_SESSION['import_step']); goaway(z_root() . '/network' ); } -- cgit v1.2.3 From a87e3184032ddb15ce5c0ffe57e058ebed0641f8 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 14 Jul 2015 21:30:13 -0700 Subject: log the import progress --- mod/import.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/mod/import.php b/mod/import.php index a87906926..94638ebfd 100644 --- a/mod/import.php +++ b/mod/import.php @@ -195,7 +195,7 @@ function import_post(&$a) { $channel = $r[0]; set_default_login_identity(get_account_id(),$channel['channel_id'],false); - + logger('import step 1'); $_SESSION['import_step'] = 1; } } @@ -218,7 +218,7 @@ function import_post(&$a) { . "')" ); } } - + logger('import step 2'); $_SESSION['import_step'] = 2; } @@ -253,6 +253,7 @@ function import_post(&$a) { . "')" ); } } + logger('import step 3'); $_SESSION['import_step'] = 3; } @@ -290,6 +291,7 @@ function import_post(&$a) { } } } + logger('import step 4'); $_SESSION['import_step'] = 4; } @@ -320,7 +322,7 @@ function import_post(&$a) { dbesc(z_root()) ); } - + logger('import step 5'); $_SESSION['import_step'] = 5; } @@ -356,6 +358,7 @@ function import_post(&$a) { 0,0,0,0,0,0,0 ); } + logger('import step 6'); $_SESSION['import_step'] = 6; } @@ -408,6 +411,7 @@ function import_post(&$a) { } } + logger('import step 7'); $_SESSION['import_step'] = 7; } @@ -464,6 +468,7 @@ function import_post(&$a) { $feeds ++; } } + logger('import step 8'); $_SESSION['import_step'] = 8; } @@ -511,6 +516,7 @@ function import_post(&$a) { . "')" ); } } + logger('import step 9'); $_SESSION['import_step'] = 9; } -- cgit v1.2.3 From 89fbfd2bf80bdd7f12ed5d188a1c6b38bb5b3712 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 14 Jul 2015 22:04:07 -0700 Subject: more stuff to resume failed imports --- mod/import.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/mod/import.php b/mod/import.php index 94638ebfd..dd16593c1 100644 --- a/mod/import.php +++ b/mod/import.php @@ -37,7 +37,8 @@ function import_post(&$a) { $filetype = $_FILES['filename']['type']; $completed = ((array_key_exists('import_step',$_SESSION)) ? intval($_SESSION['import_step']) : 0); - + if($completed) + logger('saved import step: ' . $_SESSION['import_step']); if($src) { @@ -197,6 +198,7 @@ function import_post(&$a) { set_default_login_identity(get_account_id(),$channel['channel_id'],false); logger('import step 1'); $_SESSION['import_step'] = 1; + ref_session_write(session_id(), serialize($_SESSION)); } } else @@ -220,6 +222,7 @@ function import_post(&$a) { } logger('import step 2'); $_SESSION['import_step'] = 2; + ref_session_write(session_id(), serialize($_SESSION)); } @@ -255,6 +258,7 @@ function import_post(&$a) { } logger('import step 3'); $_SESSION['import_step'] = 3; + ref_session_write(session_id(), serialize($_SESSION)); } @@ -293,6 +297,7 @@ function import_post(&$a) { } logger('import step 4'); $_SESSION['import_step'] = 4; + ref_session_write(session_id(), serialize($_SESSION)); } if($completed < 5) { @@ -324,6 +329,7 @@ function import_post(&$a) { } logger('import step 5'); $_SESSION['import_step'] = 5; + ref_session_write(session_id(), serialize($_SESSION)); } @@ -360,6 +366,7 @@ function import_post(&$a) { } logger('import step 6'); $_SESSION['import_step'] = 6; + ref_session_write(session_id(), serialize($_SESSION)); } if($completed < 7) { @@ -413,6 +420,7 @@ function import_post(&$a) { } logger('import step 7'); $_SESSION['import_step'] = 7; + ref_session_write(session_id(), serialize($_SESSION)); } @@ -434,6 +442,8 @@ function import_post(&$a) { continue; unset($abook['abook_id']); + unset($abook['abook_rating']); + unset($abook['abook_rating_text']); $abook['abook_account'] = get_account_id(); $abook['abook_channel'] = $channel['channel_id']; if(! array_key_exists('abook_blocked',$abook)) { @@ -470,6 +480,7 @@ function import_post(&$a) { } logger('import step 8'); $_SESSION['import_step'] = 8; + ref_session_write(session_id(), serialize($_SESSION)); } @@ -518,6 +529,7 @@ function import_post(&$a) { } logger('import step 9'); $_SESSION['import_step'] = 9; + ref_session_write(session_id(), serialize($_SESSION)); } $saved_notification_flags = notifications_off($channel['channel_id']); -- cgit v1.2.3 From 5487b22dd79f9fd4e989db555fdd42d87aa77320 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 14 Jul 2015 22:19:21 -0700 Subject: fix import of group members --- mod/import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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']; -- cgit v1.2.3 From 9b15dbde1cf4d89468fdc153324276c12e9f7ff0 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 14 Jul 2015 22:38:04 -0700 Subject: group fixes to import --- mod/import.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/mod/import.php b/mod/import.php index dd16593c1..02f62e646 100644 --- a/mod/import.php +++ b/mod/import.php @@ -201,9 +201,19 @@ function import_post(&$a) { ref_session_write(session_id(), serialize($_SESSION)); } } - else - $channel = $a->get_channel(); - + else { + $r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1", + intval(get_account_id()), + dbesc($channel['channel_guid']) + ); + if($r) + $channel = $r[0]; + else { + logger('mod_import: channel not found. ', print_r($channel,true)); + notice( t('Cloned channel not found. Import failed.') . EOL); + return; + } + } if($completed < 2) { @@ -511,7 +521,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']; -- cgit v1.2.3 From 0c77a127f2e10bcea23e49d5eef61ce444046b31 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 15 Jul 2015 14:03:34 +0200 Subject: show inherited state in Connection Default Permissions --- mod/connedit.php | 9 +++++++-- view/tpl/abook_edit.tpl | 7 +++++-- view/tpl/field_acheckbox.tpl | 6 +++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/mod/connedit.php b/mod/connedit.php index f628fb9d3..129c07bd3 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -644,13 +644,17 @@ function connedit_content(&$a) { 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( @@ -661,7 +665,7 @@ function connedit_content(&$a) { '$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), '$lbl_slider' => t('Slide to adjust your degree of friendship'), '$lbl_rating' => t('Rating'), @@ -693,6 +697,7 @@ function connedit_content(&$a) { '$perms' => $perms, '$permlbl' => t('Individual Permissions'), '$permnote' => t('Some permissions may be inherited from your channel\'s privacy settings, which have higher priority than individual settings. You can not change those settings here.'), + '$permnote_self' => t('Some permissions may be inherited from your channel\'s privacy settings, 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:'), '$last_update' => relative_date($contact['abook_connected']), '$profile_select' => contact_profile_assign($contact['abook_profile']), diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 71693a553..93f52be8d 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -176,7 +176,8 @@
- {{$permnote}} + {{if $notself}}{{$permnote}}{{/if}} + {{if $self}}{{$permnote_self}}{{/if}}
@@ -194,7 +195,9 @@ {{if $self}}
-
{{$autolbl}}
+
+ {{$autolbl}} +
{{include file="field_checkbox.tpl" field=$autoperms}}
{{/if}} diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index d2aad3875..f96fd5fd6 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -1,6 +1,6 @@ {{if $notself}} @@ -9,9 +9,9 @@ {{/if}} -- cgit v1.2.3 From 5fcf1256bd3d60e03dc9b39779bbad6051ce4682 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 15 Jul 2015 14:07:35 +0200 Subject: whitespace --- mod/connedit.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mod/connedit.php b/mod/connedit.php index 129c07bd3..8374954fb 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -643,17 +643,13 @@ function connedit_content(&$a) { 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) ? '' : '1'), $v[4], $checkinherited); } -- cgit v1.2.3 From ca1f6f8c5b9668a4bdb0bdb3b6bc32160bfd267e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 15 Jul 2015 14:14:10 +0200 Subject: provide info text for automatic permissions --- mod/connedit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/connedit.php b/mod/connedit.php index 8374954fb..d0cf71c73 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -656,7 +656,7 @@ function connedit_content(&$a) { $o .= replace_macros($tpl,array( '$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), '', array(t('No'),('Yes'))), + '$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'), -- cgit v1.2.3 From f4a1ca0692552f1b399c6f931f43b0a1ffef1f6a Mon Sep 17 00:00:00 2001 From: zottel Date: Wed, 15 Jul 2015 15:29:08 +0200 Subject: change sh to bash in shebang to make scripts work --- util/add_addon_repo | 2 +- util/add_theme_repo | 2 +- util/add_widget_repo | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 -- cgit v1.2.3 From ba7acf88ad7f67977a9c039966c65d6e068a7f7d Mon Sep 17 00:00:00 2001 From: zottel Date: Wed, 15 Jul 2015 15:40:23 +0200 Subject: also change the update_ scripts --- util/update_addon_repo | 2 +- util/update_theme_repo | 2 +- util/update_widget_repo | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 -- cgit v1.2.3 From 86ad41a2db6dae0f27eb0a2ec305593c942c1876 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 15 Jul 2015 16:50:37 -0700 Subject: revision update --- version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.inc b/version.inc index 11c628215..a8c5cc468 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-07-14.1093 +2015-07-15.1094 -- cgit v1.2.3 From 59b67d52e60d51faa39cdad1921a64e8f64ea0ae Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 15 Jul 2015 18:14:19 -0700 Subject: clone sync fixes across red/hz --- include/zot.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/zot.php b/include/zot.php index 9a20084c4..4f80dc518 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2889,7 +2889,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) { @@ -3202,7 +3207,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'])); } } -- cgit v1.2.3 From 7f6e4d5f4a56355b01fd1ccdf433f4b215b3d669 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 15 Jul 2015 18:21:04 -0700 Subject: more clone sync issues across projects --- include/zot.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/zot.php b/include/zot.php index 4342a806a..c4860cc3b 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2854,12 +2854,12 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { } if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) { - 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; + if(array_key_exists('channel_page_flags',$arr['channel']) && intval($arr['channel']['channel_pageflags'])) { + $arr['channel']['channel_removed'] = (($arr['channel']['channel_pageflags'] & 0x8000) ? 1 : 0); + $arr['channel']['channel_system'] = (($arr['channel']['channel_pageflags'] & 0x1000) ? 1 : 0); + } - $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notifyflags', 'channel_removed', 'channel_system'); + $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notifyflags'); $clean = array(); foreach($arr['channel'] as $k => $v) { -- cgit v1.2.3 From 7db515b77cc17be545358ac1aba9b6b21c460507 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 15 Jul 2015 18:31:37 -0700 Subject: fix for empty recip array resulting from a mangled xchan --- include/zot.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/include/zot.php b/include/zot.php index 4f80dc518..95de349fe 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1114,11 +1114,14 @@ function zot_import($arr, $sender_url) { $recip_arr[] = make_xchan_hash($recip['guid'],$recip['guid_sig']); } } - 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) - ); + $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) + ); + } if(! $r) { logger('recips: no recipients on this site'); continue; -- cgit v1.2.3 From 964e461e092b15a66da891a0a4c155323e8391e1 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 15 Jul 2015 21:01:18 -0700 Subject: allow plugins to provide module handlers for arbitrary modules that haven't been installed on the system. --- include/widgets.php | 2 ++ index.php | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/include/widgets.php b/include/widgets.php index 888e56733..032b1c67e 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -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/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. -- cgit v1.2.3 From 070397ef1470972476df48b169f4d6ee844c5c1f Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 15 Jul 2015 21:43:42 -0700 Subject: make tagadelic results (including categories in wall-to-wall posts) visible to wall visitors by checking ownership rather than authorship. It is doubtful the queries will scale on redmatrix so moved forward to hubzilla tree. --- include/contact_widgets.php | 3 ++- include/taxonomy.php | 19 ++++++++++++------- include/widgets.php | 6 +++--- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 2c41ea92e..a60b8b1c3 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -79,7 +79,8 @@ function categories_widget($baseurl,$selected = '') { where item.uid = %d and term.uid = item.uid and term.type = %d - and item.author_xchan = '%s' + and item.owner_xchan = '%s' + and item.item_wall = 1 $item_normal order by term.term asc", intval($a->profile['profile_uid']), diff --git a/include/taxonomy.php b/include/taxonomy.php index de2874f9d..b57cfc5c4 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -101,7 +101,7 @@ function format_term_for_display($term) { // Tag cloud functions - need to be adpated to this database format -function tagadelic($uid, $count = 0, $authors = '', $flags = 0, $restrict = 0, $type = TERM_HASHTAG) { +function tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $restrict = 0, $type = TERM_HASHTAG) { require_once('include/security.php'); @@ -124,6 +124,11 @@ function tagadelic($uid, $count = 0, $authors = '', $flags = 0, $restrict = 0, $ $sql_options .= " and author_xchan in (" . implode(',',$authors) . ") "; } + if($owner) { + $sql_options .= " and owner_xchan = '" . dbesc($owner) . "' "; + } + + // Fetch tags $r = q("select term, count(term) as total from term left join item on term.oid = item.id where term.uid = %d and term.type = %d @@ -215,10 +220,10 @@ function dir_tagadelic($count = 0) { } -function tagblock($link,$uid,$count = 0,$authors = '',$flags = 0,$restrict = 0,$type = TERM_HASHTAG) { +function tagblock($link,$uid,$count = 0,$authors = '',$owner = '', $flags = 0,$restrict = 0,$type = TERM_HASHTAG) { $o = ''; - $r = tagadelic($uid,$count,$authors,$flags,$restrict,$type); + $r = tagadelic($uid,$count,$authors,$owner, $flags,$restrict,$type); if($r) { $o = '

' . t('Tags') . '

'; @@ -232,10 +237,10 @@ function tagblock($link,$uid,$count = 0,$authors = '',$flags = 0,$restrict = 0,$ } -function wtagblock($uid,$count = 0,$authors = '',$flags = 0,$restrict = 0,$type = TERM_HASHTAG) { +function wtagblock($uid,$count = 0,$authors = '',$owner = '', $flags = 0,$restrict = 0,$type = TERM_HASHTAG) { $o = ''; - $r = tagadelic($uid,$count,$authors,$flags,$restrict,$type); + $r = tagadelic($uid,$count,$authors,$owner, $flags,$restrict,$type); if($r) { $c = q("select channel_address from channel where channel_id = %d limit 1", @@ -253,10 +258,10 @@ function wtagblock($uid,$count = 0,$authors = '',$flags = 0,$restrict = 0,$type } -function catblock($uid,$count = 0,$authors = '',$flags = 0,$restrict = 0,$type = TERM_CATEGORY) { +function catblock($uid,$count = 0,$authors = '',$owner = '', $flags = 0,$restrict = 0,$type = TERM_CATEGORY) { $o = ''; - $r = tagadelic($uid,$count,$authors,$flags,$restrict,$type); + $r = tagadelic($uid,$count,$authors,$owner,$flags,$restrict,$type); if($r) { $c = q("select channel_address from channel where channel_id = %d limit 1", diff --git a/include/widgets.php b/include/widgets.php index bafd9c7a2..c79d2a6c0 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -29,7 +29,7 @@ function widget_tagcloud($args) { $type = TERM_CATEGORY; // FIXME there exists no $authors variable - $r = tagadelic($uid, $count, $authors, $flags, ITEM_TYPE_WEBPAGE, $type); + $r = tagadelic($uid, $count, $authors, $owner, $flags, ITEM_TYPE_WEBPAGE, $type); if($r) { $o = '

' . t('Categories') . '

'; @@ -392,7 +392,7 @@ function widget_tagcloud_wall($arr) { $limit = ((array_key_exists('limit', $arr)) ? intval($arr['limit']) : 50); if(feature_enabled($a->profile['profile_uid'], 'tagadelic')) - return wtagblock($a->profile['profile_uid'], $limit, $a->profile['channel_hash'], 'wall'); + return wtagblock($a->profile['profile_uid'], $limit, '', $a->profile['channel_hash'], 'wall'); return ''; } @@ -407,7 +407,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'], 'wall'); + return catblock($a->profile['profile_uid'], $limit, '', $a->profile['channel_hash'], 'wall'); } -- cgit v1.2.3 From 498e2f7279e48ace3c683d5e9f35250589c01d2b Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 15 Jul 2015 22:59:55 -0700 Subject: since we've got a fresh start without a lot of legacy sites to support, provide 'naked' or authored=none (no date and attribution) as the default for webpages. It will be up to designers to add this if they desire it rather than force everybody to take it away. The code for adding it isn't yet provided. --- include/conversation.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 332f9487c..65056bc9c 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1377,7 +1377,8 @@ function render_location_default($item) { function prepare_page($item) { $a = get_app(); - $naked = ((get_pconfig($item['uid'],'system','nakedpage')) ? 1 : 0); + $naked = 1; +// $naked = ((get_pconfig($item['uid'],'system','nakedpage')) ? 1 : 0); $observer = $a->get_observer(); //240 chars is the longest we can have before we start hitting problems with suhosin sites $preview = substr(urlencode($item['body']), 0, 240); -- cgit v1.2.3 From 2bd05971ab38e18773d5c32cdfa540fe5ea74ef9 Mon Sep 17 00:00:00 2001 From: zottel Date: Thu, 16 Jul 2015 08:28:37 +0200 Subject: fix observer tags for now (issue #17) --- include/text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index a02484855..cc084f6f1 100644 --- a/include/text.php +++ b/include/text.php @@ -1448,7 +1448,7 @@ function prepare_body(&$item,$attach = false) { // else { call_hooks('prepare_body_init', $item); // unobscure($item); - $s = prepare_text($item['body'],$item['mimetype'], true); + $s = prepare_text($item['body'],$item['mimetype'], false); // } $prep_arr = array('item' => $item, 'html' => $s); -- cgit v1.2.3 From c9b5046fc0a464ecee8cc1e8f93bab1195390123 Mon Sep 17 00:00:00 2001 From: Paolo Tacconi Date: Thu, 16 Jul 2015 11:33:49 +0200 Subject: Updated Italian strings --- view/it/messages.po | 615 ++++++++++++++++++++++++++++------------------------ view/it/strings.php | 59 +++-- 2 files changed, 369 insertions(+), 305 deletions(-) diff --git a/view/it/messages.po b/view/it/messages.po index bcdaa607c..411718d4a 100644 --- a/view/it/messages.po +++ b/view/it/messages.po @@ -13,10 +13,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-07-02 12:38+0000\n" +"POT-Creation-Date: 2015-07-10 00:04-0700\n" +"PO-Revision-Date: 2015-07-16 09:31+0000\n" "Last-Translator: tuscanhobbit \n" -"Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/p/red-matrix/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -311,7 +311,7 @@ msgid "remove from file" msgstr "rimuovi dal file" #: ../../include/text.php:1498 ../../include/text.php:1509 -#: ../../mod/connedit.php:661 +#: ../../mod/connedit.php:667 msgid "Click to open/close" msgstr "Clicca per aprire/chiudere" @@ -339,7 +339,7 @@ msgstr "Tipo di contenuto della pagina" msgid "Select an alternate language" msgstr "Seleziona una lingua diversa" -#: ../../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 @@ -351,10 +351,9 @@ msgstr "la foto" msgid "event" msgstr "l'evento" -#: ../../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 "il messaggio di stato" @@ -404,30 +403,31 @@ msgstr "Cartella" msgid "Edit" msgstr "Modifica" -#: ../../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 "A %1$s piace %3$s di %2$s" -#: ../../include/diaspora.php:2476 +#: ../../include/diaspora.php:2490 msgid "Please choose" msgstr "La tua scelta" -#: ../../include/diaspora.php:2478 +#: ../../include/diaspora.php:2492 msgid "Agree" msgstr "Sono d'accordo" -#: ../../include/diaspora.php:2480 +#: ../../include/diaspora.php:2494 msgid "Disagree" msgstr "Non sono d'accordo" -#: ../../include/diaspora.php:2482 +#: ../../include/diaspora.php:2496 msgid "Abstain" msgstr "Mi astengo" -#: ../../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" @@ -444,11 +444,11 @@ msgstr "ha commentato il post di %s" msgid "No username found in import file." msgstr "Impossibile trovare il nome utente nel file da importare." -#: ../../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 "Impossibile creare un indirizzo univoco per il canale. L'import è fallito." -#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:490 +#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504 msgid "Import completed." msgstr "L'importazione è terminata con successo!" @@ -530,7 +530,7 @@ msgid "Registration request at %s" msgstr "Richiesta di registrazione su %s" #: ../../include/account.php:314 ../../include/account.php:341 -#: ../../include/account.php:401 +#: ../../include/account.php:401 ../../include/network.php:1632 msgid "Administrator" msgstr "Amministratore" @@ -581,7 +581,7 @@ msgstr "AAAA-MM-GG oppure MM-GG" msgid "Required" msgstr "Obbligatorio" -#: ../../include/datetime.php:262 ../../boot.php:2354 +#: ../../include/datetime.php:262 ../../boot.php:2355 msgid "never" msgstr "mai" @@ -709,42 +709,6 @@ msgstr "Diario pubblico" msgid "Default" msgstr "Predefinito" -#: ../../include/dir_fns.php:143 -msgid "Directory Options" -msgstr "Opzioni elenco pubblico" - -#: ../../include/dir_fns.php:144 -msgid "Alphabetic" -msgstr "Alfabetico" - -#: ../../include/dir_fns.php:145 -msgid "Reverse Alphabetic" -msgstr "Alfabetico inverso" - -#: ../../include/dir_fns.php:146 -msgid "Newest to Oldest" -msgstr "Prima i più recenti" - -#: ../../include/dir_fns.php:147 -msgid "Oldest to Newest" -msgstr "Prima i più vecchi" - -#: ../../include/dir_fns.php:148 -msgid "Sort" -msgstr "Ordinamento" - -#: ../../include/dir_fns.php:152 -msgid "Safe Mode" -msgstr "Modalità SafeSearch" - -#: ../../include/dir_fns.php:154 -msgid "Public Forums Only" -msgstr "Solo forum pubblici" - -#: ../../include/dir_fns.php:155 -msgid "This Website Only" -msgstr "Solo in questo sito" - #: ../../include/event.php:19 ../../include/bb2diaspora.php:459 msgid "l F d, Y \\@ g:i A" msgstr "l d F Y \\@ G:i" @@ -758,7 +722,7 @@ msgid "Finishes:" msgstr "Fine:" #: ../../include/event.php:47 ../../include/bb2diaspora.php:481 -#: ../../include/identity.php:879 ../../mod/directory.php:296 +#: ../../include/identity.php:879 ../../mod/directory.php:302 #: ../../mod/events.php:647 msgid "Location:" msgstr "Luogo:" @@ -841,7 +805,7 @@ msgstr "Descrizione (facoltativa)" #: ../../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 @@ -852,9 +816,10 @@ msgstr "Descrizione (facoltativa)" #: ../../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 "Salva" @@ -1032,7 +997,7 @@ msgstr "Ultima modifica" #: ../../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 "Elimina" @@ -1053,6 +1018,23 @@ msgstr "I segnalibri di %1$s" msgid "view full size" msgstr "guarda nelle dimensioni reali" +#: ../../include/network.php:1585 ../../include/enotify.php:58 +msgid "$Projectname Notification" +msgstr "Notifica $Projectname" + +#: ../../include/network.php:1588 ../../include/enotify.php:61 +msgid "Thank You," +msgstr "Grazie," + +#: ../../include/network.php:1590 ../../include/enotify.php:63 +#, php-format +msgid "%s Administrator" +msgstr "L'amministratore di %s" + +#: ../../include/network.php:1646 +msgid "No Subject" +msgstr "Nessun titolo" + #: ../../include/features.php:38 msgid "General Features" msgstr "Funzionalità di base" @@ -1240,66 +1222,112 @@ msgid "Filter stream activity by depth of relationships" msgstr "Permette di selezionare i contenuti in base al livello di amicizia" #: ../../include/features.php:74 +msgid "Connection Filtering" +msgstr "Filtro sui contatti" + +#: ../../include/features.php:74 +msgid "Filter incoming posts from connections based on keywords/content" +msgstr "Filtra i post che ricevi con delle parole chiave" + +#: ../../include/features.php:75 msgid "Suggest Channels" msgstr "Suggerisci canali" -#: ../../include/features.php:74 +#: ../../include/features.php:75 msgid "Show channel suggestions" msgstr "Mostra alcuni canali che potrebbero interessarti" -#: ../../include/features.php:79 +#: ../../include/features.php:80 msgid "Post/Comment Tools" msgstr "Gestione post e commenti" -#: ../../include/features.php:80 +#: ../../include/features.php:81 msgid "Tagging" msgstr "Tag" -#: ../../include/features.php:80 +#: ../../include/features.php:81 msgid "Ability to tag existing posts" msgstr "Permetti l'aggiunta di tag su post già esistenti" -#: ../../include/features.php:81 +#: ../../include/features.php:82 msgid "Post Categories" msgstr "Categorie dei post" -#: ../../include/features.php:81 +#: ../../include/features.php:82 msgid "Add categories to your posts" msgstr "Abilita le categorie per i tuoi post" -#: ../../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 "Cartelle salvate" -#: ../../include/features.php:82 +#: ../../include/features.php:83 msgid "Ability to file posts under folders" msgstr "Abilita la raccolta dei tuoi articoli in post" -#: ../../include/features.php:83 +#: ../../include/features.php:84 msgid "Dislike Posts" msgstr "Non mi piace" -#: ../../include/features.php:83 +#: ../../include/features.php:84 msgid "Ability to dislike posts/comments" msgstr "Abilità la funzionalità \"non mi piace\" per i tuoi post" -#: ../../include/features.php:84 +#: ../../include/features.php:85 msgid "Star Posts" msgstr "Post con stella" -#: ../../include/features.php:84 +#: ../../include/features.php:85 msgid "Ability to mark special posts with a star indicator" msgstr "Mostra la stella per segnare i post preferiti" -#: ../../include/features.php:85 +#: ../../include/features.php:86 msgid "Tag Cloud" msgstr "Nuvola di tag" -#: ../../include/features.php:85 +#: ../../include/features.php:86 msgid "Provide a personal tag cloud on your channel page" msgstr "Mostra la nuvola dei tag che usi di più sulla pagina del tuo canale" +#: ../../include/dir_fns.php:126 +msgid "Directory Options" +msgstr "Opzioni elenco pubblico" + +#: ../../include/dir_fns.php:128 +msgid "Safe Mode" +msgstr "Modalità SafeSearch" + +#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129 +#: ../../include/dir_fns.php:130 ../../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:1555 +msgid "No" +msgstr "No" + +#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129 +#: ../../include/dir_fns.php:130 ../../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:1555 +msgid "Yes" +msgstr "Si" + +#: ../../include/dir_fns.php:129 +msgid "Public Forums Only" +msgstr "Solo forum pubblici" + +#: ../../include/dir_fns.php:130 +msgid "This Website Only" +msgstr "Solo in questo sito" + #: ../../include/widgets.php:35 ../../include/taxonomy.php:264 #: ../../include/contact_widgets.php:92 msgid "Categories" @@ -1328,7 +1356,7 @@ msgstr "Modifica una app personale" #: ../../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:316 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" msgstr "Aggiungi" @@ -1379,11 +1407,11 @@ msgstr "Tutto" msgid "Archives" msgstr "Archivi" -#: ../../include/widgets.php:427 ../../mod/connedit.php:572 +#: ../../include/widgets.php:427 ../../mod/connedit.php:578 msgid "Me" msgstr "Io" -#: ../../include/widgets.php:428 ../../mod/connedit.php:573 +#: ../../include/widgets.php:428 ../../mod/connedit.php:579 msgid "Family" msgstr "Famiglia" @@ -1392,16 +1420,16 @@ msgstr "Famiglia" #: ../../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 "Amici" -#: ../../include/widgets.php:430 ../../mod/connedit.php:575 +#: ../../include/widgets.php:430 ../../mod/connedit.php:581 msgid "Acquaintances" msgstr "Conoscenti" #: ../../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 "Tutti" @@ -1437,7 +1465,7 @@ msgstr "App connesse" msgid "Export channel" msgstr "Esporta il canale" -#: ../../include/widgets.php:530 ../../mod/connedit.php:653 +#: ../../include/widgets.php:530 ../../mod/connedit.php:659 msgid "Connection Default Permissions" msgstr "Permessi predefiniti dei nuovi contatti" @@ -1492,19 +1520,6 @@ msgstr "Vedi le valutazioni ricevute" msgid "Public Hubs" msgstr "Hub pubblici" -#: ../../include/enotify.php:58 -msgid "$Projectname Notification" -msgstr "Notifica $Projectname" - -#: ../../include/enotify.php:61 -msgid "Thank You," -msgstr "Grazie," - -#: ../../include/enotify.php:63 -#, php-format -msgid "%s Administrator" -msgstr "L'amministratore di %s" - #: ../../include/enotify.php:96 #, php-format msgid "%s " @@ -1722,7 +1737,7 @@ msgstr "RSS/Atom" #: ../../include/contact_selectors.php:79 ../../mod/admin.php:822 #: ../../mod/admin.php:831 ../../mod/id.php:15 ../../mod/id.php:16 -#: ../../boot.php:1552 +#: ../../boot.php:1553 msgid "Email" msgstr "Email" @@ -2064,7 +2079,7 @@ msgstr "Allegati:" msgid "$Projectname event notification:" msgstr "Notifica evento $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 "Esci" @@ -2081,7 +2096,7 @@ msgid "Your posts and conversations" msgstr "I tuoi post e conversazioni" #: ../../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 "Profilo" @@ -2144,7 +2159,7 @@ msgstr "Pagine web" msgid "Your webpages" msgstr "Le tue pagine 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 "Accedi" @@ -2159,17 +2174,17 @@ msgstr "%s - clicca per uscire" #: ../../include/nav.php:137 msgid "Remote authentication" -msgstr "Autenticazione magica dal tuo server" +msgstr "Accedi dal tuo hub" #: ../../include/nav.php:137 msgid "Click to authenticate to your home hub" -msgstr "Clicca per autenticarti sul tuo server principale" +msgstr "Accedi tramite il tuo hub principale" #: ../../include/nav.php:151 msgid "Home Page" msgstr "Bacheca" -#: ../../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 "Iscriviti" @@ -2995,47 +3010,47 @@ msgstr "Permesso negato" msgid "(Unknown)" msgstr "(Sconosciuto)" -#: ../../include/items.php:1249 +#: ../../include/items.php:1307 msgid "Visible to anybody on the internet." msgstr "Visibile a chiunque su internet." -#: ../../include/items.php:1251 +#: ../../include/items.php:1309 msgid "Visible to you only." msgstr "Visibile solo a te." -#: ../../include/items.php:1253 +#: ../../include/items.php:1311 msgid "Visible to anybody in this network." msgstr "Visibile a tutti su questa rete." -#: ../../include/items.php:1255 +#: ../../include/items.php:1313 msgid "Visible to anybody authenticated." msgstr "Visibile a chiunque sia autenticato." -#: ../../include/items.php:1257 +#: ../../include/items.php:1315 #, php-format msgid "Visible to anybody on %s." msgstr "Visibile a tutti in %s." -#: ../../include/items.php:1259 +#: ../../include/items.php:1317 msgid "Visible to all connections." msgstr "Visibile a tutti coloro che ti seguono." -#: ../../include/items.php:1261 +#: ../../include/items.php:1319 msgid "Visible to approved connections." msgstr "Visibile ai contatti approvati." -#: ../../include/items.php:1263 +#: ../../include/items.php:1321 msgid "Visible to specific connections." msgstr "Visibile ad alcuni contatti scelti." -#: ../../include/items.php:4076 ../../mod/thing.php:74 +#: ../../include/items.php:4198 ../../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 "Elemento non trovato." -#: ../../include/items.php:4149 ../../include/attach.php:137 +#: ../../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 @@ -3065,7 +3080,7 @@ msgstr "Elemento non trovato." #: ../../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 @@ -3078,26 +3093,26 @@ msgstr "Elemento non trovato." msgid "Permission denied." msgstr "Permesso negato." -#: ../../include/items.php:4551 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4673 ../../mod/group.php:38 ../../mod/group.php:140 #: ../../mod/bulksetclose.php:51 msgid "Collection not found." msgstr "Insieme di canali non trovato." -#: ../../include/items.php:4567 +#: ../../include/items.php:4689 msgid "Collection is empty." msgstr "L'insieme di canali è vuoto." -#: ../../include/items.php:4574 +#: ../../include/items.php:4696 #, php-format msgid "Collection: %s" msgstr "Insieme: %s" -#: ../../include/items.php:4584 +#: ../../include/items.php:4706 #, php-format msgid "Connection: %s" msgstr "Contatto: %s" -#: ../../include/items.php:4586 +#: ../../include/items.php:4708 msgid "Connection not found." msgstr "Contatto non trovato." @@ -3109,7 +3124,7 @@ msgstr "Dati non validi" msgid "Unable to verify channel signature" msgstr "Impossibile verificare la firma elettronica del canale" -#: ../../include/zot.php:2109 +#: ../../include/zot.php:2126 #, php-format msgid "Unable to verify site signature for %s" msgstr "Impossibile verificare la firma elettronica del sito %s" @@ -3161,12 +3176,12 @@ msgstr "Aggiungi" msgid "Examples: Robert Morgenstein, Fishing" msgstr "Per esempio: Mario Rossi, Pesca" -#: ../../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 "Cerca" -#: ../../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 "Canali suggeriti" @@ -3424,7 +3439,7 @@ msgstr "j F" msgid "Birthday:" msgstr "Compleanno:" -#: ../../include/identity.php:1163 ../../mod/directory.php:291 +#: ../../include/identity.php:1163 ../../mod/directory.php:297 msgid "Age:" msgstr "Età:" @@ -3437,7 +3452,7 @@ msgstr "per %1$d %2$s" msgid "Sexual Preference:" msgstr "Preferenze sessuali:" -#: ../../include/identity.php:1179 ../../mod/directory.php:307 +#: ../../include/identity.php:1179 ../../mod/directory.php:313 #: ../../mod/profiles.php:693 msgid "Hometown:" msgstr "Città dove vivo:" @@ -3454,7 +3469,7 @@ msgstr "Orientamento politico:" msgid "Religion:" msgstr "Religione:" -#: ../../include/identity.php:1187 ../../mod/directory.php:309 +#: ../../include/identity.php:1187 ../../mod/directory.php:315 msgid "About:" msgstr "Informazioni:" @@ -3848,7 +3863,7 @@ msgstr "QR code" msgid "%1$s wrote the following %2$s %3$s" msgstr "%1$s ha scritto %2$s %3$s" -#: ../../include/bbcode.php:264 +#: ../../include/bbcode.php:264 ../../mod/tagger.php:51 msgid "post" msgstr "il post" @@ -3948,72 +3963,92 @@ msgstr "%d nuove richieste di entrare in contatto" msgid "Delegated Channels" msgstr "Canali delegati" -#: ../../mod/directory.php:48 ../../mod/photos.php:441 ../../mod/search.php:13 +#: ../../mod/directory.php:59 ../../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 "Accesso pubblico negato." -#: ../../mod/directory.php:227 +#: ../../mod/directory.php:234 #, php-format msgid "%d rating" msgid_plural "%d ratings" msgstr[0] "%d valutazione" msgstr[1] "%d valutazioni" -#: ../../mod/directory.php:238 +#: ../../mod/directory.php:245 msgid "Gender: " msgstr "Sesso:" -#: ../../mod/directory.php:240 +#: ../../mod/directory.php:247 msgid "Status: " msgstr "Stato:" -#: ../../mod/directory.php:242 +#: ../../mod/directory.php:249 msgid "Homepage: " msgstr "Homepage:" -#: ../../mod/directory.php:302 ../../mod/events.php:645 +#: ../../mod/directory.php:308 ../../mod/events.php:645 msgid "Description:" msgstr "Descrizione:" -#: ../../mod/directory.php:311 +#: ../../mod/directory.php:317 msgid "Public Forum:" msgstr "Forum pubblico:" -#: ../../mod/directory.php:314 +#: ../../mod/directory.php:320 msgid "Keywords: " msgstr "Parole chiave:" -#: ../../mod/directory.php:317 +#: ../../mod/directory.php:323 msgid "Don't suggest" msgstr "Non fornire suggerimenti" -#: ../../mod/directory.php:319 +#: ../../mod/directory.php:325 msgid "Common connections:" msgstr "Contatti in comune:" -#: ../../mod/directory.php:368 +#: ../../mod/directory.php:374 msgid "Global Directory" msgstr "Elenco globale dei canali" -#: ../../mod/directory.php:368 +#: ../../mod/directory.php:374 msgid "Local Directory" msgstr "Elenco canali su questo server" -#: ../../mod/directory.php:374 +#: ../../mod/directory.php:380 msgid "Finding:" msgstr "Ricerca:" -#: ../../mod/directory.php:379 +#: ../../mod/directory.php:385 msgid "next page" msgstr "pagina successiva" -#: ../../mod/directory.php:379 +#: ../../mod/directory.php:385 msgid "previous page" msgstr "pagina precedente" -#: ../../mod/directory.php:395 +#: ../../mod/directory.php:386 +msgid "Sort options" +msgstr "Opzioni di ordinamento" + +#: ../../mod/directory.php:387 +msgid "Alphabetic" +msgstr "Alfabetico" + +#: ../../mod/directory.php:388 +msgid "Reverse Alphabetic" +msgstr "Alfabetico inverso" + +#: ../../mod/directory.php:389 +msgid "Newest to Oldest" +msgstr "Prima i più recenti" + +#: ../../mod/directory.php:390 +msgid "Oldest to Newest" +msgstr "Prima i più vecchi" + +#: ../../mod/directory.php:407 msgid "No entries (some entries may be hidden)." msgstr "Nessun risultato (qualche elemento potrebbe essere nascosto)." @@ -4047,26 +4082,6 @@ msgid "" " and/or create new posts for you?" msgstr "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?" -#: ../../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 "Si" - -#: ../../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 "No" - #: ../../mod/webpages.php:191 msgid "Page Title" msgstr "Titolo della pagina" @@ -4698,11 +4713,11 @@ msgstr "Non è possibile accedere alle informazioni sul contatto." msgid "Could not locate selected profile." msgstr "Non riesco a trovare il profilo selezionato." -#: ../../mod/connections.php:94 ../../mod/connedit.php:214 +#: ../../mod/connections.php:94 ../../mod/connedit.php:220 msgid "Connection updated." msgstr "Contatto aggiornato." -#: ../../mod/connections.php:96 ../../mod/connedit.php:216 +#: ../../mod/connections.php:96 ../../mod/connedit.php:222 msgid "Failed to update connection record." msgstr "Impossibile aggiornare le informazioni del contatto." @@ -4791,11 +4806,6 @@ msgstr "Nome del riquadro" msgid "Block Title" msgstr "Nome del riquadro" -#: ../../mod/tagger.php:96 -#, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" -msgstr "%1$s ha taggato %3$s di %2$s con %4$s" - #: ../../mod/cloud.php:120 msgid "$Projectname - Guests: Username: {your email address}, Password: +++" msgstr "Login su $Projectname. Username: {la tua email}, Password: {la tua password} " @@ -5050,55 +5060,64 @@ msgstr "Impossibile importare i dati dal vecchio server" msgid "Imported file is empty." msgstr "Il file da importare è vuoto." -#: ../../mod/import.php:121 +#: ../../mod/import.php:110 +msgid "The data provided is not compatible with this project." +msgstr "I dati forniti non sono compatibili con questo progetto." + +#: ../../mod/import.php:115 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." +msgstr "Attenzione: le versioni di database differiscono di %1$d aggiornamenti." + +#: ../../mod/import.php:135 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "Non posso creare un canale con un identificativo che già esiste su questo sistema. L'importazione è fallita." -#: ../../mod/import.php:162 +#: ../../mod/import.php:176 msgid "Channel clone failed. Import failed." msgstr "Impossibile clonare il canale. L'importazione è fallita." -#: ../../mod/import.php:172 +#: ../../mod/import.php:186 msgid "Cloned channel not found. Import failed." msgstr "Impossibile trovare il canale clonato. L'importazione è fallita." -#: ../../mod/import.php:502 +#: ../../mod/import.php:516 msgid "You must be logged in to use this feature." msgstr "Per questa funzionalità devi aver effettuato l'accesso." -#: ../../mod/import.php:507 +#: ../../mod/import.php:521 msgid "Import Channel" msgstr "Importa un canale" -#: ../../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 "Usa questo modulo per importare un tuo canale da un altro server/hub. Puoi ottenere le informazioni sull'identità del canale direttamente dall'altro server/hub oppure tramite un file esportato in precedenza." +msgstr "Usa questo modulo per importare un tuo canale da un altro server/hub. Puoi ottenere i dati identificativi del canale direttamente dall'altro server/hub oppure tramite un file esportato in precedenza." -#: ../../mod/import.php:509 +#: ../../mod/import.php:523 msgid "File to Upload" msgstr "File da caricare" -#: ../../mod/import.php:510 +#: ../../mod/import.php:524 msgid "Or provide the old server/hub details" msgstr "Oppure fornisci i dettagli del vecchio server/hub" -#: ../../mod/import.php:511 +#: ../../mod/import.php:525 msgid "Your old identity address (xyz@example.com)" msgstr "Il tuo vecchio identificativo (per esempio pippo@esempio.com)" -#: ../../mod/import.php:512 +#: ../../mod/import.php:526 msgid "Your old login email address" msgstr "L'email che usavi per accedere sul vecchio server" -#: ../../mod/import.php:513 +#: ../../mod/import.php:527 msgid "Your old login password" msgstr "La password per il vecchio server" -#: ../../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" @@ -5106,17 +5125,17 @@ msgid "" "primary location for files, photos, and media." msgstr "Scegli se vuoi spostare il tuo indirizzo primario su questo server, oppure se preferisci che quello vecchio resti tale. Potrai pubblicare da entrambi i server, ma solamente uno sarà indicato come posizione in cui risiedono i tuoi file, foto, ecc." -#: ../../mod/import.php:515 +#: ../../mod/import.php:529 msgid "Make this hub my primary location" msgstr "Rendi questo server il mio indirizzo primario" -#: ../../mod/import.php:516 +#: ../../mod/import.php:530 msgid "" "Import existing posts if possible (experimental - limited by available " "memory" msgstr "Importa i contenuti pubblicati, se possibile (sperimentale)" -#: ../../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." @@ -5241,7 +5260,7 @@ msgid "" "Password reset failed." msgstr "La richiesta non può essere verificata (potresti averla già usata precedentemente). La password non sarà reimpostata." -#: ../../mod/lostpass.php:85 ../../boot.php:1558 +#: ../../mod/lostpass.php:85 ../../boot.php:1559 msgid "Password Reset" msgstr "Reimposta la password" @@ -5299,11 +5318,12 @@ msgstr "Sito web:" msgid "Remote Channel [%s] (not yet known on this site)" msgstr "Canale remoto [%s] (non ancora conosciuto da questo sito)" -#: ../../mod/rate.php:161 ../../mod/connedit.php:663 +#: ../../mod/rate.php:161 ../../mod/connedit.php:669 msgid "Rating (this information is public)" msgstr "Valutazione (visibile a tutti)" -#: ../../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 "Commento alla valutazione (facoltativo, visibile a tutti)" @@ -6375,7 +6395,12 @@ msgstr "Errore del protocollo OpenID. Nessun ID ricevuto in risposta." #: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:286 #, php-format msgid "Welcome %s. Remote authentication successful." -msgstr "Ciao %s. L'autenticazione magica è avvenuta con successo." +msgstr "Ciao %s. L'accesso tramite il tuo hub è avvenuto con successo." + +#: ../../mod/tagger.php:96 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" +msgstr "%1$s ha taggato %3$s di %2$s con %4$s" #: ../../mod/uexport.php:33 ../../mod/uexport.php:34 msgid "Export Channel" @@ -6969,13 +6994,13 @@ msgstr "Approva" msgid "Deny" msgstr "Nega" -#: ../../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 "Blocca" -#: ../../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 "Sblocca" @@ -7647,7 +7672,7 @@ msgstr "Chiunque su Red" #: ../../mod/settings.php:911 msgid "Anybody authenticated" -msgstr "Chiunque sia autenticato" +msgstr "Chiunque abbia effettuato l'accesso" #: ../../mod/settings.php:912 msgid "Anybody on the internet" @@ -8053,7 +8078,7 @@ msgstr "Inserisci l'indirizzo del link o scegli il nome di un sottomenu" #: ../../mod/mitem.php:163 ../../mod/mitem.php:234 msgid "Use magic-auth if available" -msgstr "Usa la magic-auth se disponibile" +msgstr "Usa l'autenticazione magica se disponibile" #: ../../mod/mitem.php:164 ../../mod/mitem.php:235 msgid "Open link in new window" @@ -8171,161 +8196,174 @@ msgid "" "removed from the network" msgstr "L'impostazione predefinita è che sia eliminata solo l'istanza del canale presente su questo hub, non gli eventuali cloni" -#: ../../mod/connedit.php:262 +#: ../../mod/connedit.php:268 msgid "is now connected to" msgstr "ha come nuovo contatto" -#: ../../mod/connedit.php:375 +#: ../../mod/connedit.php:381 msgid "Could not access address book record." msgstr "Impossibile accedere alle informazioni della rubrica." -#: ../../mod/connedit.php:389 +#: ../../mod/connedit.php:395 msgid "Refresh failed - channel is currently unavailable." msgstr "Il canale non è disponibile - impossibile aggiornare." -#: ../../mod/connedit.php:396 +#: ../../mod/connedit.php:402 msgid "Channel has been unblocked" msgstr "Il canale è stato sbloccato" -#: ../../mod/connedit.php:397 +#: ../../mod/connedit.php:403 msgid "Channel has been blocked" msgstr "Il canale è stato bloccato" -#: ../../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 "Impossibile impostare i parametri della rubrica." -#: ../../mod/connedit.php:408 +#: ../../mod/connedit.php:414 msgid "Channel has been unignored" msgstr "Il canale non sarà più ignorato" -#: ../../mod/connedit.php:409 +#: ../../mod/connedit.php:415 msgid "Channel has been ignored" msgstr "Il canale sarà ignorato" -#: ../../mod/connedit.php:420 +#: ../../mod/connedit.php:426 msgid "Channel has been unarchived" msgstr "Il canale non è più archiviato" -#: ../../mod/connedit.php:421 +#: ../../mod/connedit.php:427 msgid "Channel has been archived" msgstr "Il canale è stato archiviato" -#: ../../mod/connedit.php:432 +#: ../../mod/connedit.php:438 msgid "Channel has been unhidden" msgstr "Il canale non è più nascosto" -#: ../../mod/connedit.php:433 +#: ../../mod/connedit.php:439 msgid "Channel has been hidden" msgstr "Il canale è stato nascosto" -#: ../../mod/connedit.php:448 +#: ../../mod/connedit.php:454 msgid "Channel has been approved" msgstr "Il canale è stato approvato" -#: ../../mod/connedit.php:449 +#: ../../mod/connedit.php:455 msgid "Channel has been unapproved" msgstr "Il canale non è più approvato" -#: ../../mod/connedit.php:477 +#: ../../mod/connedit.php:483 msgid "Connection has been removed." msgstr "Il contatto è stato rimosso." -#: ../../mod/connedit.php:497 +#: ../../mod/connedit.php:503 #, php-format msgid "View %s's profile" msgstr "Guarda il profilo di %s" -#: ../../mod/connedit.php:501 +#: ../../mod/connedit.php:507 msgid "Refresh Permissions" msgstr "Modifica i permessi" -#: ../../mod/connedit.php:504 +#: ../../mod/connedit.php:510 msgid "Fetch updated permissions" msgstr "Guarda e modifica i permessi assegnati" -#: ../../mod/connedit.php:508 +#: ../../mod/connedit.php:514 msgid "Recent Activity" msgstr "Attività recenti" -#: ../../mod/connedit.php:511 +#: ../../mod/connedit.php:517 msgid "View recent posts and comments" msgstr "Leggi i post recenti e i commenti" -#: ../../mod/connedit.php:520 +#: ../../mod/connedit.php:526 msgid "Block (or Unblock) all communications with this connection" msgstr "Blocca ogni interazione con questo contatto (abilita/disabilita)" -#: ../../mod/connedit.php:524 ../../mod/connedit.php:721 +#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 msgid "Unignore" msgstr "Non ignorare" -#: ../../mod/connedit.php:524 ../../mod/connedit.php:721 +#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 #: ../../mod/notifications.php:51 msgid "Ignore" msgstr "Ignora" -#: ../../mod/connedit.php:527 +#: ../../mod/connedit.php:533 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "Ignora tutte le comunicazioni in arrivo da questo contatto (abilita/disabilita)" -#: ../../mod/connedit.php:530 +#: ../../mod/connedit.php:536 msgid "Unarchive" msgstr "Non archiviare" -#: ../../mod/connedit.php:530 +#: ../../mod/connedit.php:536 msgid "Archive" msgstr "Archivia" -#: ../../mod/connedit.php:533 +#: ../../mod/connedit.php:539 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "Archivia questo contatto (abilita/disabilita) - segna il canale come non più attivo ma ne conserva i contenuti" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:542 msgid "Unhide" msgstr "Non nascondere" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:542 msgid "Hide" msgstr "Nascondi" -#: ../../mod/connedit.php:539 +#: ../../mod/connedit.php:545 msgid "Hide or Unhide this connection from your other connections" msgstr "Nascondi questo contatto a tutti gli altri (abilita/disabilita)" -#: ../../mod/connedit.php:546 +#: ../../mod/connedit.php:552 msgid "Delete this connection" msgstr "Elimina questo contatto" -#: ../../mod/connedit.php:637 ../../mod/connedit.php:675 +#: ../../mod/connedit.php:643 ../../mod/connedit.php:684 msgid "Approve this connection" msgstr "Approva questo contatto" -#: ../../mod/connedit.php:637 +#: ../../mod/connedit.php:643 msgid "Accept connection to allow communication" msgstr "Entra in contatto per poter comunicare" -#: ../../mod/connedit.php:653 +#: ../../mod/connedit.php:659 #, php-format msgid "Connections: settings for %s" msgstr "Contatti: impostazioni per %s" -#: ../../mod/connedit.php:654 +#: ../../mod/connedit.php:660 msgid "Apply these permissions automatically" msgstr "Applica automaticamente questi permessi" -#: ../../mod/connedit.php:658 +#: ../../mod/connedit.php:664 msgid "Apply the permissions indicated on this page to all new connections." msgstr "Applica i permessi indicati su questa pagina a tutti i nuovi contatti." -#: ../../mod/connedit.php:662 +#: ../../mod/connedit.php:668 msgid "Slide to adjust your degree of friendship" msgstr "Trascina per restringere il grado di amicizia da mostrare" -#: ../../mod/connedit.php:671 +#: ../../mod/connedit.php:672 +msgid "Only import posts with this text" +msgstr "Importa solo i post che contengono questo testo" + +#: ../../mod/connedit.php:672 ../../mod/connedit.php:673 +msgid "" +"words one per line or #tags or /patterns/, leave blank to import all posts" +msgstr "una parola per riga, oppure #tag o /pattern/ oppure lascia vuoto per importare tutto" + +#: ../../mod/connedit.php:673 +msgid "Do not import posts with this text" +msgstr "Non importare i post con questo testo" + +#: ../../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 " @@ -8334,48 +8372,48 @@ msgid "" "install and apply the selected permissions." msgstr "I tuoi nuovi contatti potrebbero non essere abilitati a comunicare con te finché non salverai questa pagina (perché non hai permessi impostati). Sono stati selezionati i permessi standard per il tipo di canale che hai scelto. Non sono stati ancora salvati però. Puoi verificare le impostazioni e fare i cambiamenti che preferisci prima di salvare. " -#: ../../mod/connedit.php:674 +#: ../../mod/connedit.php:683 msgid "inherited" msgstr "derivato" -#: ../../mod/connedit.php:677 +#: ../../mod/connedit.php:686 msgid "Connection has no individual permissions!" msgstr "Non hai assegnato permessi individuali a questo contatto!" -#: ../../mod/connedit.php:678 +#: ../../mod/connedit.php:687 msgid "" "This may be appropriate based on your privacy " "settings, though you may wish to review the \"Advanced Permissions\"." msgstr "Questo corrisponde alle tue impostazioni di privacy, ma puoi anche dare un'occhiata ai 'Permessi avanzati' per opzioni più dettagliate." -#: ../../mod/connedit.php:680 +#: ../../mod/connedit.php:689 msgid "Profile Visibility" msgstr "Visibilità del profilo" -#: ../../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 "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro." -#: ../../mod/connedit.php:682 +#: ../../mod/connedit.php:691 msgid "Contact Information / Notes" msgstr "Informazioni e annotazioni sul contatto" -#: ../../mod/connedit.php:683 +#: ../../mod/connedit.php:692 msgid "Edit contact notes" msgstr "Modifica le informazioni sul contatto" -#: ../../mod/connedit.php:685 +#: ../../mod/connedit.php:694 msgid "Their Settings" msgstr "Permessi concessi a te" -#: ../../mod/connedit.php:686 +#: ../../mod/connedit.php:695 msgid "My Settings" msgstr "I permessi che concedo" -#: ../../mod/connedit.php:688 +#: ../../mod/connedit.php:697 msgid "" "Default permissions for this channel type have (just) been applied. They " "have not been saved and there are currently no stored default " @@ -8383,35 +8421,35 @@ msgid "" "finalize." msgstr "A questo canale sono stati applicati i permessi predefiniti ma non sono stati salvati. In realtà non esistono ancora dei permessi predefiniti da usare su questo sito. Controlla e verifica le impostazioni, [Salva] per confermare." -#: ../../mod/connedit.php:689 +#: ../../mod/connedit.php:698 msgid "Clear/Disable Automatic Permissions" msgstr "Rimuovi/disabilita i permessi automatici" -#: ../../mod/connedit.php:690 +#: ../../mod/connedit.php:699 msgid "Forum Members" msgstr "Membro di un forum" -#: ../../mod/connedit.php:691 +#: ../../mod/connedit.php:700 msgid "Soapbox" msgstr "Comunicati e annunci" -#: ../../mod/connedit.php:692 +#: ../../mod/connedit.php:701 msgid "Full Sharing (typical social network permissions)" msgstr "Condivisione completa (permessi tipici dei social network)" -#: ../../mod/connedit.php:693 +#: ../../mod/connedit.php:702 msgid "Cautious Sharing " msgstr "Condivisione prudente" -#: ../../mod/connedit.php:694 +#: ../../mod/connedit.php:703 msgid "Follow Only" msgstr "Follower" -#: ../../mod/connedit.php:695 +#: ../../mod/connedit.php:704 msgid "Individual Permissions" msgstr "Permessi individuali" -#: ../../mod/connedit.php:696 +#: ../../mod/connedit.php:705 msgid "" "Some permissions may be inherited from your channel privacy settings, which have higher priority than " @@ -8419,64 +8457,64 @@ msgid "" "have no effect." msgstr "I permessi nelle impostazioni di privacy hanno priorità su quelli mostrati in questa pagina. Non avrà alcun effetto cambiarli qui, se sono indicati come derivati." -#: ../../mod/connedit.php:697 +#: ../../mod/connedit.php:706 msgid "Advanced Permissions" msgstr "Permessi avanzati" -#: ../../mod/connedit.php:698 +#: ../../mod/connedit.php:707 msgid "Simple Permissions (select one and submit)" msgstr "Permessi semplificati (seleziona e salva)" -#: ../../mod/connedit.php:702 +#: ../../mod/connedit.php:711 #, php-format msgid "Visit %s's profile - %s" msgstr "Guarda il profilo di %s - %s" -#: ../../mod/connedit.php:703 +#: ../../mod/connedit.php:712 msgid "Block/Unblock contact" msgstr "Blocca/sblocca contatto" -#: ../../mod/connedit.php:704 +#: ../../mod/connedit.php:713 msgid "Ignore contact" msgstr "Ignora il contatto" -#: ../../mod/connedit.php:705 +#: ../../mod/connedit.php:714 msgid "Repair URL settings" msgstr "Ripara le impostazioni URL" -#: ../../mod/connedit.php:706 +#: ../../mod/connedit.php:715 msgid "View conversations" msgstr "Leggi le conversazioni" -#: ../../mod/connedit.php:708 +#: ../../mod/connedit.php:717 msgid "Delete contact" msgstr "Elimina contatto" -#: ../../mod/connedit.php:712 +#: ../../mod/connedit.php:721 msgid "Last update:" msgstr "Ultimo aggiornamento:" -#: ../../mod/connedit.php:714 +#: ../../mod/connedit.php:723 msgid "Update public posts" msgstr "Aggiorna i post pubblici" -#: ../../mod/connedit.php:716 +#: ../../mod/connedit.php:725 msgid "Update now" msgstr "Aggiorna adesso" -#: ../../mod/connedit.php:722 +#: ../../mod/connedit.php:731 msgid "Currently blocked" msgstr "Attualmente bloccato" -#: ../../mod/connedit.php:723 +#: ../../mod/connedit.php:732 msgid "Currently ignored" msgstr "Attualmente ignorato" -#: ../../mod/connedit.php:724 +#: ../../mod/connedit.php:733 msgid "Currently archived" msgstr "Attualmente archiviato" -#: ../../mod/connedit.php:725 +#: ../../mod/connedit.php:734 msgid "Currently pending" msgstr "Attualmente da approvare" @@ -8496,7 +8534,7 @@ msgstr "Autenticazione fallita." #: ../../mod/rmagic.php:84 msgid "Remote Authentication" -msgstr "Autenticazione a distanza" +msgstr "Accedi dal tuo hub" #: ../../mod/rmagic.php:85 msgid "Enter your channel address (e.g. channel@example.com)" @@ -8504,7 +8542,7 @@ msgstr "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)" #: ../../mod/rmagic.php:86 msgid "Authenticate" -msgstr "Autenticazione" +msgstr "Accedi" #: ../../mod/mail.php:33 msgid "Unable to lookup recipient." @@ -8592,7 +8630,7 @@ msgstr "Effettua l'accesso." msgid "" "Remote authentication blocked. You are logged into this site locally. Please" " logout and retry." -msgstr "L'autenticazione magica dal tuo sito non è disponibile. Hai accesso solamente a questo sito. Puoi provare a disconnetterti per tentare di nuovo." +msgstr "L'autenticazione magica dal tuo hub non è disponibile. Puoi provare a disconnetterti per tentare di nuovo." #: ../../mod/new_channel.php:109 msgid "Add a Channel" @@ -8735,6 +8773,21 @@ msgstr "I segnalibri dei miei contatti" msgid "Insufficient permissions. Request redirected to profile page." msgstr "Permessi insufficienti. Sarà visualizzata la pagina del profilo." +#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60 +msgid "This setting requires special processing and editing has been blocked." +msgstr "Questa impostazione è bloccata, richiede criteri di modifica speciali" + +#: ../../mod/pconfig.php:49 +msgid "Configuration Editor" +msgstr "Editor di configurazione" + +#: ../../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 "Avviso: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare." + #: ../../mod/suggest.php:35 msgid "" "No suggestions available. If this is a new site, please try again in 24 " @@ -9040,51 +9093,51 @@ msgstr "Dimensione foto dell'autore della conversazione" msgid "Set size of followup author photos" msgstr "Dimensione foto dei partecipanti alla conversazione" -#: ../../boot.php:1355 +#: ../../boot.php:1356 #, php-format msgid "Update %s failed. See error logs." msgstr "%s: aggiornamento fallito. Controlla i log di errore." -#: ../../boot.php:1358 +#: ../../boot.php:1359 #, php-format msgid "Update Error at %s" msgstr "Errore di aggiornamento su %s" -#: ../../boot.php:1525 +#: ../../boot.php:1526 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "Registrati per accedere ai servizi e alle applicazioni di RedMatrix" -#: ../../boot.php:1553 +#: ../../boot.php:1554 msgid "Password" msgstr "Password" -#: ../../boot.php:1554 +#: ../../boot.php:1555 msgid "Remember me" msgstr "Resta connesso" -#: ../../boot.php:1557 +#: ../../boot.php:1558 msgid "Forgot your password?" msgstr "Hai dimenticato la password?" -#: ../../boot.php:2178 +#: ../../boot.php:2179 msgid "toggle mobile" msgstr "attiva/disattiva versione mobile" -#: ../../boot.php:2313 +#: ../../boot.php:2314 msgid "Website SSL certificate is not valid. Please correct." msgstr "Il certificato SSL del sito non è valido. Si prega di intervenire." -#: ../../boot.php:2316 +#: ../../boot.php:2317 #, php-format msgid "[red] Website SSL error for %s" msgstr "[red] Errore SSL %s " -#: ../../boot.php:2353 +#: ../../boot.php:2354 msgid "Cron/Scheduled tasks not running." msgstr "Processi/cron non avviati." -#: ../../boot.php:2357 +#: ../../boot.php:2358 #, php-format msgid "[red] Cron tasks not running on %s" msgstr "[red] Processi cron non avviati su %s" diff --git a/view/it/strings.php b/view/it/strings.php index 5192d3abb..44fabb521 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -166,15 +166,6 @@ $a->strings["Created"] = "Creato"; $a->strings["Edited"] = "Modificato"; $a->strings["Public Timeline"] = "Diario pubblico"; $a->strings["Default"] = "Predefinito"; -$a->strings["Directory Options"] = "Opzioni elenco pubblico"; -$a->strings["Alphabetic"] = "Alfabetico"; -$a->strings["Reverse Alphabetic"] = "Alfabetico inverso"; -$a->strings["Newest to Oldest"] = "Prima i più recenti"; -$a->strings["Oldest to Newest"] = "Prima i più vecchi"; -$a->strings["Sort"] = "Ordinamento"; -$a->strings["Safe Mode"] = "Modalità SafeSearch"; -$a->strings["Public Forums Only"] = "Solo forum pubblici"; -$a->strings["This Website Only"] = "Solo in questo sito"; $a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i"; $a->strings["Starts:"] = "Inizio:"; $a->strings["Finishes:"] = "Fine:"; @@ -240,6 +231,10 @@ $a->strings["Create new folder"] = "Crea una nuova cartella"; $a->strings["Upload file"] = "Carica un file"; $a->strings["%1\$s's bookmarks"] = "I segnalibri di %1\$s"; $a->strings["view full size"] = "guarda nelle dimensioni reali"; +$a->strings["\$Projectname Notification"] = "Notifica \$Projectname"; +$a->strings["Thank You,"] = "Grazie,"; +$a->strings["%s Administrator"] = "L'amministratore di %s"; +$a->strings["No Subject"] = "Nessun titolo"; $a->strings["General Features"] = "Funzionalità di base"; $a->strings["Content Expiration"] = "Scadenza"; $a->strings["Remove posts/comments and/or private messages at a future time"] = "Elimina i post, i commenti o i messaggi privati dopo un lasso di tempo"; @@ -285,6 +280,8 @@ $a->strings["Network New Tab"] = "Contenuti nuovi"; $a->strings["Enable tab to display all new Network activity"] = "Abilita il link per visualizzare solo i nuovi contenuti"; $a->strings["Affinity Tool"] = "Filtro per affinità"; $a->strings["Filter stream activity by depth of relationships"] = "Permette di selezionare i contenuti in base al livello di amicizia"; +$a->strings["Connection Filtering"] = "Filtro sui contatti"; +$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filtra i post che ricevi con delle parole chiave"; $a->strings["Suggest Channels"] = "Suggerisci canali"; $a->strings["Show channel suggestions"] = "Mostra alcuni canali che potrebbero interessarti"; $a->strings["Post/Comment Tools"] = "Gestione post e commenti"; @@ -300,6 +297,12 @@ $a->strings["Star Posts"] = "Post con stella"; $a->strings["Ability to mark special posts with a star indicator"] = "Mostra la stella per segnare i post preferiti"; $a->strings["Tag Cloud"] = "Nuvola di tag"; $a->strings["Provide a personal tag cloud on your channel page"] = "Mostra la nuvola dei tag che usi di più sulla pagina del tuo canale"; +$a->strings["Directory Options"] = "Opzioni elenco pubblico"; +$a->strings["Safe Mode"] = "Modalità SafeSearch"; +$a->strings["No"] = "No"; +$a->strings["Yes"] = "Si"; +$a->strings["Public Forums Only"] = "Solo forum pubblici"; +$a->strings["This Website Only"] = "Solo in questo sito"; $a->strings["Categories"] = "Categorie"; $a->strings["Apps"] = "Apps"; $a->strings["System"] = "Sistema"; @@ -344,9 +347,6 @@ $a->strings["photo/image"] = "foto/immagine"; $a->strings["Rate Me"] = "Valutami"; $a->strings["View Ratings"] = "Vedi le valutazioni ricevute"; $a->strings["Public Hubs"] = "Hub pubblici"; -$a->strings["\$Projectname Notification"] = "Notifica \$Projectname"; -$a->strings["Thank You,"] = "Grazie,"; -$a->strings["%s Administrator"] = "L'amministratore di %s"; $a->strings["%s "] = "%s "; $a->strings["[Red:Notify] New mail received at %s"] = "[RedMatrix] Nuovo messaggio su %s"; $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s ti ha mandato un messaggio privato su %3\$s."; @@ -499,8 +499,8 @@ $a->strings["Your webpages"] = "Le tue pagine web"; $a->strings["Login"] = "Accedi"; $a->strings["Sign in"] = "Accedi"; $a->strings["%s - click to logout"] = "%s - clicca per uscire"; -$a->strings["Remote authentication"] = "Autenticazione magica dal tuo server"; -$a->strings["Click to authenticate to your home hub"] = "Clicca per autenticarti sul tuo server principale"; +$a->strings["Remote authentication"] = "Accedi dal tuo hub"; +$a->strings["Click to authenticate to your home hub"] = "Accedi tramite il tuo hub principale"; $a->strings["Home Page"] = "Bacheca"; $a->strings["Register"] = "Iscriviti"; $a->strings["Create an account"] = "Crea un account"; @@ -951,6 +951,11 @@ $a->strings["Local Directory"] = "Elenco canali su questo server"; $a->strings["Finding:"] = "Ricerca:"; $a->strings["next page"] = "pagina successiva"; $a->strings["previous page"] = "pagina precedente"; +$a->strings["Sort options"] = "Opzioni di ordinamento"; +$a->strings["Alphabetic"] = "Alfabetico"; +$a->strings["Reverse Alphabetic"] = "Alfabetico inverso"; +$a->strings["Newest to Oldest"] = "Prima i più recenti"; +$a->strings["Oldest to Newest"] = "Prima i più vecchi"; $a->strings["No entries (some entries may be hidden)."] = "Nessun risultato (qualche elemento potrebbe essere nascosto)."; $a->strings["Xchan Lookup"] = "Ricerca canale"; $a->strings["Lookup xchan beginning with (or webbie): "] = "Cerca un canale (o un webbie) che inizia per:"; @@ -959,8 +964,6 @@ $a->strings["Authorize application connection"] = "Autorizza la app"; $a->strings["Return to your app and insert this Securty Code:"] = "Torna alla app e inserisci questo codice di sicurezza:"; $a->strings["Please login to continue."] = "Accedi al sito per continuare."; $a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?"; -$a->strings["Yes"] = "Si"; -$a->strings["No"] = "No"; $a->strings["Page Title"] = "Titolo della pagina"; $a->strings["Channel added."] = "Canale aggiunto."; $a->strings["Tag removed"] = "Tag rimosso"; @@ -1132,7 +1135,6 @@ $a->strings["Search your connections"] = "Cerca tra i contatti"; $a->strings["Finding: "] = "Ricerca: "; $a->strings["Block Name"] = "Nome del riquadro"; $a->strings["Block Title"] = "Nome del riquadro"; -$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha taggato %3\$s di %2\$s con %4\$s"; $a->strings["\$Projectname - Guests: Username: {your email address}, Password: +++"] = "Login su \$Projectname. Username: {la tua email}, Password: {la tua password} "; $a->strings["Page owner information could not be retrieved."] = "Impossibile ottenere informazioni sul proprietario della pagina."; $a->strings["Album not found."] = "Album non trovato."; @@ -1195,12 +1197,14 @@ $a->strings["Your service plan only allows %d channels."] = "Il tuo account perm $a->strings["Nothing to import."] = "Non c'è niente da importare."; $a->strings["Unable to download data from old server"] = "Impossibile importare i dati dal vecchio server"; $a->strings["Imported file is empty."] = "Il file da importare è vuoto."; +$a->strings["The data provided is not compatible with this project."] = "I dati forniti non sono compatibili con questo progetto."; +$a->strings["Warning: Database versions differ by %1\$d updates."] = "Attenzione: le versioni di database differiscono di %1\$d aggiornamenti."; $a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Non posso creare un canale con un identificativo che già esiste su questo sistema. L'importazione è fallita."; $a->strings["Channel clone failed. Import failed."] = "Impossibile clonare il canale. L'importazione è fallita."; $a->strings["Cloned channel not found. Import failed."] = "Impossibile trovare il canale clonato. L'importazione è fallita."; $a->strings["You must be logged in to use this feature."] = "Per questa funzionalità devi aver effettuato l'accesso."; $a->strings["Import Channel"] = "Importa un canale"; -$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."] = "Usa questo modulo per importare un tuo canale da un altro server/hub. Puoi ottenere le informazioni sull'identità del canale direttamente dall'altro server/hub oppure tramite un file esportato in precedenza."; +$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."] = "Usa questo modulo per importare un tuo canale da un altro server/hub. Puoi ottenere i dati identificativi del canale direttamente dall'altro server/hub oppure tramite un file esportato in precedenza."; $a->strings["File to Upload"] = "File da caricare"; $a->strings["Or provide the old server/hub details"] = "Oppure fornisci i dettagli del vecchio server/hub"; $a->strings["Your old identity address (xyz@example.com)"] = "Il tuo vecchio identificativo (per esempio pippo@esempio.com)"; @@ -1500,7 +1504,8 @@ $a->strings["Errors encountered creating database tables."] = "La creazione dell $a->strings["

What next

"] = "

I prossimi passi

"; $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Devi creare [manualmente] la pianificazione del polling."; $a->strings["OpenID protocol error. No ID returned."] = "Errore del protocollo OpenID. Nessun ID ricevuto in risposta."; -$a->strings["Welcome %s. Remote authentication successful."] = "Ciao %s. L'autenticazione magica è avvenuta con successo."; +$a->strings["Welcome %s. Remote authentication successful."] = "Ciao %s. L'accesso tramite il tuo hub è avvenuto con successo."; +$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha taggato %3\$s di %2\$s con %4\$s"; $a->strings["Export Channel"] = "Esporta il canale"; $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."] = "Esporta le informazioni di base del tuo canale in un piccolo file. E' utile per avere un salvataggio di sicurezza dei tuoi contatti, del tuo profilo ed altre informazioni fondamentali. Può essere usato per importare il tuo canale su un nuovo server, ma non include i contenuti, per esempio post e foto."; $a->strings["Export Content"] = "Esporta i contenuti"; @@ -1806,7 +1811,7 @@ $a->strings["Approved connections"] = "Contatti approvati"; $a->strings["Any connections"] = "Tutti i contatti"; $a->strings["Anybody on this website"] = "Chiunque su questo sito"; $a->strings["Anybody in this network"] = "Chiunque su Red"; -$a->strings["Anybody authenticated"] = "Chiunque sia autenticato"; +$a->strings["Anybody authenticated"] = "Chiunque abbia effettuato l'accesso"; $a->strings["Anybody on the internet"] = "Chiunque su internet"; $a->strings["Publish your default profile in the network directory"] = "Mostra il mio profilo predefinito nell'elenco pubblico dei canali"; $a->strings["Allow us to suggest you as a potential friend to new members?"] = "Vuoi essere suggerito come amico ai nuovi membri?"; @@ -1905,7 +1910,7 @@ $a->strings["Menu Item Permissions"] = "Permessi del menu"; $a->strings["Link Name"] = "Nome link"; $a->strings["Link or Submenu Target"] = "Destinazione del link o del sottomenu"; $a->strings["Enter URL of the link or select a menu name to create a submenu"] = "Inserisci l'indirizzo del link o scegli il nome di un sottomenu"; -$a->strings["Use magic-auth if available"] = "Usa la magic-auth se disponibile"; +$a->strings["Use magic-auth if available"] = "Usa l'autenticazione magica se disponibile"; $a->strings["Open link in new window"] = "Apri il link in una nuova finestra"; $a->strings["Order in list"] = "Ordine dell'elenco"; $a->strings["Higher numbers will sink to bottom of listing"] = "I numeri più alti andranno in fondo all'elenco"; @@ -1971,6 +1976,9 @@ $a->strings["Connections: settings for %s"] = "Contatti: impostazioni per %s"; $a->strings["Apply these permissions automatically"] = "Applica automaticamente questi permessi"; $a->strings["Apply the permissions indicated on this page to all new connections."] = "Applica i permessi indicati su questa pagina a tutti i nuovi contatti."; $a->strings["Slide to adjust your degree of friendship"] = "Trascina per restringere il grado di amicizia da mostrare"; +$a->strings["Only import posts with this text"] = "Importa solo i post che contengono questo testo"; +$a->strings["words one per line or #tags or /patterns/, leave blank to import all posts"] = "una parola per riga, oppure #tag o /pattern/ oppure lascia vuoto per importare tutto"; +$a->strings["Do not import posts with this text"] = "Non importare i post con questo testo"; $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 not be able to communicate with you until you submit this page, which will install and apply the selected permissions."] = "I tuoi nuovi contatti potrebbero non essere abilitati a comunicare con te finché non salverai questa pagina (perché non hai permessi impostati). Sono stati selezionati i permessi standard per il tipo di canale che hai scelto. Non sono stati ancora salvati però. Puoi verificare le impostazioni e fare i cambiamenti che preferisci prima di salvare. "; $a->strings["inherited"] = "derivato"; $a->strings["Connection has no individual permissions!"] = "Non hai assegnato permessi individuali a questo contatto!"; @@ -2008,9 +2016,9 @@ $a->strings["Currently pending"] = "Attualmente da approvare"; $a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Non è possibile effettuare login con l'OpenID che hai fornito. Per favore controlla che sia scritto correttamente."; $a->strings["The error message was:"] = "Messaggio di errore ricevuto:"; $a->strings["Authentication failed."] = "Autenticazione fallita."; -$a->strings["Remote Authentication"] = "Autenticazione a distanza"; +$a->strings["Remote Authentication"] = "Accedi dal tuo hub"; $a->strings["Enter your channel address (e.g. channel@example.com)"] = "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)"; -$a->strings["Authenticate"] = "Autenticazione"; +$a->strings["Authenticate"] = "Accedi"; $a->strings["Unable to lookup recipient."] = "Impossibile associare un destinatario."; $a->strings["Unable to communicate with requested channel."] = "Impossibile comunicare con il canale richiesto."; $a->strings["Cannot verify requested channel."] = "Impossibile verificare il canale richiesto."; @@ -2031,7 +2039,7 @@ $a->strings["Send Reply"] = "Invia la risposta"; $a->strings["Invalid request identifier."] = "L'identificativo della richiesta non è valido."; $a->strings["Discard"] = "Rifiuta"; $a->strings["Please login."] = "Effettua l'accesso."; -$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "L'autenticazione magica dal tuo sito non è disponibile. Hai accesso solamente a questo sito. Puoi provare a disconnetterti per tentare di nuovo."; +$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "L'autenticazione magica dal tuo hub non è disponibile. Puoi provare a disconnetterti per tentare di nuovo."; $a->strings["Add a Channel"] = "Aggiungi un canale"; $a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "I contenuti che pubblichi sono mostrati nel tuo \"canale\". Un canale può essere usato come bacheca personale, come blog, oppure può essere un forum di discussione, un gruppo di interesse, una pagina di celebrità e molto altro. Puoi creare tanti canali quanti ne permette il tuo sito."; $a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Per esempio: \"Mario Rossi\", \"Lisa e le sue ricette\", \"Il campionato\", \"Il gruppo di escursionismo\""; @@ -2065,6 +2073,9 @@ $a->strings["Bookmark added"] = "Segnalibro aggiunto"; $a->strings["My Bookmarks"] = "I miei segnalibri"; $a->strings["My Connections Bookmarks"] = "I segnalibri dei miei contatti"; $a->strings["Insufficient permissions. Request redirected to profile page."] = "Permessi insufficienti. Sarà visualizzata la pagina del profilo."; +$a->strings["This setting requires special processing and editing has been blocked."] = "Questa impostazione è bloccata, richiede criteri di modifica speciali"; +$a->strings["Configuration Editor"] = "Editor di configurazione"; +$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."] = "Avviso: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare."; $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Nessun suggerimento disponibile. Se questo sito è nuovo, riprova tra 24 ore."; $a->strings["Poll"] = "Sondaggio"; $a->strings["View Results"] = "Guarda i risultati"; -- cgit v1.2.3 From 39a09eb525df95a38c14bf3e6f9b8c74bda68314 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 16 Jul 2015 22:04:52 +0200 Subject: fix missing div and a regression introduced in ec23a94b6d7f6db1e1d34275b8143cbc947db802 which broke tag removal for photos --- include/items.php | 10 +++---- view/tpl/photo_view.tpl | 77 ++++++++++++++++++++----------------------------- 2 files changed, 37 insertions(+), 50 deletions(-) diff --git a/include/items.php b/include/items.php index 73ed64116..054008d58 100755 --- a/include/items.php +++ b/include/items.php @@ -2657,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') ", @@ -2673,7 +2674,6 @@ function item_store_update($arr,$allow_exec = false) { dbesc($t['url']) ); } - $arr['term'] = $terms; } 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 @@
- {{if $tools}} {{/if}} @@ -11,7 +10,6 @@
{{/if}} -
{{if $edit}} @@ -29,11 +27,8 @@ {{/if}}
-

{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}

-
-
{{$map}} @@ -88,12 +83,9 @@
-
-
- {{if $tags}}
{{$tag_hdr}} @@ -102,31 +94,29 @@ {{/foreach}}
{{/if}} -
- - {{if $responses.count }} -
-
- {{foreach $responses as $verb=>$response}} - {{if $response.count}} -
- - {{if $response.list_part}} - - {{else}} - - {{/if}} - {{if $response.list_part}} + {{if $responses.count }} +
+
+ {{foreach $responses as $verb=>$response}} + {{if $response.count}} +
+ + {{if $response.list_part}} + + {{else}} + + {{/if}} + {{if $response.list_part}} {{/if}} + {{/foreach}}
- {{/if}} - {{/foreach}} -
- {{/if}} -
- {{if $likebuttons}} -
- - +
+ {{/if}} + {{if $likebuttons}} +
+ + +
+
+ {{/if}} +
-
- {{/if}} -
- {{$comments}} - {{if $commentbox}}
{{$commentbox}}
{{/if}} -
- {{$paginate}} -- cgit v1.2.3 From c3dbacfb88e1fec97496592807a310f71dd6b156 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 16 Jul 2015 17:53:59 -0700 Subject: don't including rating stuff from cloned abooks --- include/zot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/zot.php b/include/zot.php index 1c6a09494..e7ab70fc4 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2896,7 +2896,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { $total_feeds ++; } - $disallowed = array('abook_id','abook_account','abook_channel'); + $disallowed = array('abook_id','abook_account','abook_channel','abook_rating','abook_rating_text'); foreach($arr['abook'] as $abook) { -- cgit v1.2.3 From 4299ae65a4ec406bbd932e0948197c5127a57b3b Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 16 Jul 2015 18:07:23 -0700 Subject: abook clone sync - change logic to also unset existing cross-project flags besides just setting them --- include/zot.php | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/include/zot.php b/include/zot.php index e7ab70fc4..b8954f2ad 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2902,22 +2902,14 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { if(! array_key_exists('abook_blocked',$abook)) { // convert from redmatrix - if($abook['abook_flags'] & 0x0001) - $abook['abook_blocked'] = 1; - if($abook['abook_flags'] & 0x0002) - $abook['abook_ignored'] = 1; - if($abook['abook_flags'] & 0x0004) - $abook['abook_hidden'] = 1; - if($abook['abook_flags'] & 0x0008) - $abook['abook_archived'] = 1; - if($abook['abook_flags'] & 0x0010) - $abook['abook_pending'] = 1; - if($abook['abook_flags'] & 0x0020) - $abook['abook_unconnected'] = 1; - if($abook['abook_flags'] & 0x0080) - $abook['abook_self'] = 1; - if($abook['abook_flags'] & 0x0100) - $abook['abook_feed'] = 1; + $abook['abook_blocked'] = (($abook['abook_flags'] & 0x0001) ? 1 : 0); + $abook['abook_ignored'] = (($abook['abook_flags'] & 0x0002) ? 1 : 0); + $abook['abook_hidden'] = (($abook['abook_flags'] & 0x0004) ? 1 : 0); + $abook['abook_archived'] = (($abook['abook_flags'] & 0x0008) ? 1 : 0); + $abook['abook_pending'] = (($abook['abook_flags'] & 0x0010) ? 1 : 0); + $abook['abook_unconnected'] = (($abook['abook_flags'] & 0x0020) ? 1 : 0); + $abook['abook_self'] = (($abook['abook_flags'] & 0x0080) ? 1 : 0); + $abook['abook_feed'] = (($abook['abook_flags'] & 0x0100) ? 1 : 0); } $clean = array(); -- cgit v1.2.3 From ec249d465b60407b2e7c64e7a99be8ccf4b95e64 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 16 Jul 2015 20:19:20 -0700 Subject: provide a way to export a single year of items (to potentially keep from exhausting resources either on export or import) --- include/identity.php | 31 ++++++++++++++++++++++++++++++- mod/uexport.php | 10 +++++++++- version.inc | 2 +- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/include/identity.php b/include/identity.php index 29d9ef022..3925c3537 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. * 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/version.inc b/version.inc index a8c5cc468..b66e936cd 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-07-15.1094 +2015-07-16.1095 -- cgit v1.2.3 From 3c60a0c22cc7945d8298a76d9dc2e30c1b2fb3c3 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 16 Jul 2015 20:20:42 -0700 Subject: provide any single year of exported items --- include/identity.php | 37 +++++++++++++++++++++++++++++++++++-- include/items.php | 1 - mod/uexport.php | 14 ++++++++++++-- 3 files changed, 47 insertions(+), 5 deletions(-) diff --git a/include/identity.php b/include/identity.php index 8ba5d64db..5ca626c72 100644 --- a/include/identity.php +++ b/include/identity.php @@ -583,8 +583,14 @@ 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_wall = 1 and item_deleted = 0 and uid = %d", - intval($channel_id) + /** export one year of posts. If you want to export and import all posts you have to start with + * the first year and export/import them in ascending order. + */ + + $r = q("select * from item where item_wall = 1 and item_deleted = 0 and uid = %d and created > %s - INTERVAL %s", + intval($channel_id), + db_utcnow(), + db_quoteinterval('1 YEAR') ); if($r) { $ret['item'] = array(); @@ -598,6 +604,33 @@ 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_wall = 1 and item_deleted = 0 and uid = %d and created >= '%s' and created < '%s' ", + 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. * diff --git a/include/items.php b/include/items.php index c067d3c1e..b1a0dacdf 100755 --- a/include/items.php +++ b/include/items.php @@ -4389,7 +4389,6 @@ function first_post_date($uid,$wall = false) { $r = q("select id, created from item where uid = %d and id = parent $item_normal $wall_sql order by created asc limit 1", - intval(ITEM_VISIBLE), intval($uid) ); diff --git a/mod/uexport.php b/mod/uexport.php index edcb2fa84..8217a17c4 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())); @@ -34,7 +42,9 @@ function uexport_content(&$a) { '$basictitle' => t('Export Channel'), '$basic' => t('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 does not contain your content.'), '$fulltitle' => t('Export Content'), - '$full' => t('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 content, but is generally not suitable for importing a channel to a new hub as this file may be VERY large. Please be patient - it may take several minutes for this download to begin.') + '$full' => t('Export your channel information and all the content to a JSON backup. This backs up all of your connections, permissions, profile data and the last year of posts. This file may be VERY large. Please be patient - it may take several minutes for this download to begin.'), + '$by_year' => t('Export your posts from a given year.'), + )); return $o; } -- cgit v1.2.3 From 09f6337930a5686f91dd174fd22356966d4e584a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 17 Jul 2015 22:45:35 +0200 Subject: make likes/dislikes work again --- mod/like.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/like.php b/mod/like.php index ffd302efa..9077adbda 100755 --- a/mod/like.php +++ b/mod/like.php @@ -242,8 +242,8 @@ function like_content(&$a) { // get the item. Allow linked photos (which are normally hidden) to be liked $r = q("SELECT * FROM item WHERE id = %d - and item_blocked = 0 and item_moderated = 0 and item_spam = 0 - and item_deleted = 0 and item_unpublished = 0 and item_delayed_publish = 0 LIMIT 1", + and item_type = 0 and item_deleted = 0 and item_unpublished = 0 + and item_delayed = 0 and item_pending_remove = 0 and item_blocked = 0 LIMIT 1", intval($item_id) ); -- cgit v1.2.3 From ed3d9d1f80773417b0fba491ed762b90be340863 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 18 Jul 2015 16:39:12 -0700 Subject: some photo/attach permissions issues --- include/attach.php | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/include/attach.php b/include/attach.php index 812090d5c..e89ca7cb2 100644 --- a/include/attach.php +++ b/include/attach.php @@ -391,13 +391,18 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { $hash = (($arr && $arr['hash']) ? $arr['hash'] : null); $upload_path = (($arr && $arr['directory']) ? $arr['directory'] : ''); - // logger('arr: ' . print_r($arr,true)); + logger('arr: ' . print_r($arr,true)); if(! perm_is_allowed($channel_id,get_observer_hash(), 'write_storage')) { $ret['message'] = t('Permission denied.'); return $ret; } + $str_group_allow = perms2str($arr['group_allow']); + $str_contact_allow = perms2str($arr['contact_allow']); + $str_group_deny = perms2str($arr['group_deny']); + $str_contact_deny = perms2str($arr['contact_deny']); + // The 'update' option sets db values without uploading a new attachment // 'replace' replaces the existing uploaded data @@ -473,14 +478,13 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { } $darr = array('pathname' => $pathname); - if($arr && array_key_exists('allow_cid',$arr)) - $darr['allow_cid'] = $arr['allow_cid']; - if($arr && array_key_exists('allow_gid',$arr)) - $darr['allow_gid'] = $arr['allow_gid']; - if($arr && array_key_exists('deny_cid',$arr)) - $darr['deny_cid'] = $arr['deny_cid']; - if($arr && array_key_exists('deny_gid',$arr)) - $darr['deny_gid'] = $arr['deny_gid']; + + // if we need to create a directory, use the channel default permissions. + + $darr['allow_cid'] = $channel['allow_cid']; + $darr['allow_gid'] = $channel['allow_gid']; + $darr['deny_cid'] = $channel['deny_cid']; + $darr['deny_gid'] = $channel['deny_gid']; if($pathname) { @@ -652,9 +656,9 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { dbesc($created), dbesc($created), dbesc(($arr && array_key_exists('allow_cid',$arr)) ? $arr['allow_cid'] : $str_contact_allow), - dbesc(($arr && array_key_exists('allow_gid',$arr)) ? $arr['allow_gid'] : ''), - dbesc(($arr && array_key_exists('deny_cid',$arr)) ? $arr['deny_cid'] : ''), - dbesc(($arr && array_key_exists('deny_gid',$arr)) ? $arr['deny_gid'] : '') + dbesc(($arr && array_key_exists('allow_gid',$arr)) ? $arr['allow_gid'] : $str_group_allow), + dbesc(($arr && array_key_exists('deny_cid',$arr)) ? $arr['deny_cid'] : $str_contact_deny), + dbesc(($arr && array_key_exists('deny_gid',$arr)) ? $arr['deny_gid'] : $str_group_deny) ); } @@ -662,6 +666,12 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { $args = array( 'source' => $source, 'visible' => 0, 'resource_id' => $hash, 'album' => basename($pathname), 'os_path' => $os_basepath . $os_relpath, 'filename' => $filename, 'getimagesize' => $gis); if($arr['contact_allow']) $args['contact_allow'] = $arr['contact_allow']; + if($arr['group_allow']) + $args['group_allow'] = $arr['group_allow']; + if($arr['contact_deny']) + $args['contact_deny'] = $arr['contact_deny']; + if($arr['group_deny']) + $args['group_deny'] = $arr['group_deny']; $p = photo_upload($channel,get_app()->get_observer(),$args); if($p['success']) { $ret['body'] = $p['body']; -- cgit v1.2.3 From 736db4992b37e4e54d85e5734157e62c6500c431 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 19 Jul 2015 13:20:04 -0700 Subject: string update --- util/messages.po | 2172 ++++++++++++++++++++++++++---------------------------- version.inc | 2 +- 2 files changed, 1057 insertions(+), 1117 deletions(-) diff --git a/util/messages.po b/util/messages.po index b3ee12e89..3e4a7873c 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-07-10.1089\n" +"Project-Id-Version: 2015-07-17.1096\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-10 00:04-0700\n" +"POT-Creation-Date: 2015-07-17 00:04-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,875 +28,980 @@ msgstr "" msgid "Profile Photos" msgstr "" -#: ../../include/text.php:395 -msgid "prev" +#: ../../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:397 -msgid "first" +#: ../../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 "" -#: ../../include/text.php:426 -msgid "last" +#: ../../include/diaspora.php:2115 ../../include/text.php:1894 +#: ../../include/conversation.php:148 ../../mod/like.php:346 +#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 +msgid "status" msgstr "" -#: ../../include/text.php:429 -msgid "next" +#: ../../include/diaspora.php:2144 ../../include/conversation.php:164 +#: ../../mod/like.php:394 +#, php-format +msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/text.php:439 -msgid "older" +#: ../../include/diaspora.php:2490 +msgid "Please choose" msgstr "" -#: ../../include/text.php:441 -msgid "newer" +#: ../../include/diaspora.php:2492 +msgid "Agree" msgstr "" -#: ../../include/text.php:834 -msgid "No connections" +#: ../../include/diaspora.php:2494 +msgid "Disagree" 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" +#: ../../include/diaspora.php:2496 +msgid "Abstain" msgstr "" -#: ../../include/text.php:918 ../../include/text.php:930 -#: ../../include/nav.php:165 ../../include/apps.php:147 -#: ../../mod/search.php:38 -msgid "Search" +#: ../../include/diaspora.php:2518 ../../include/diaspora.php:2529 +#: ../../include/network.php:1586 ../../include/enotify.php:59 +#: ../../mod/p.php:46 +msgid "$projectname" 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" +#: ../../include/contact_selectors.php:56 +msgid "Frequently" msgstr "" -#: ../../include/text.php:994 -msgid "poke" +#: ../../include/contact_selectors.php:57 +msgid "Hourly" msgstr "" -#: ../../include/text.php:994 ../../include/conversation.php:243 -msgid "poked" +#: ../../include/contact_selectors.php:58 +msgid "Twice daily" msgstr "" -#: ../../include/text.php:995 -msgid "ping" +#: ../../include/contact_selectors.php:59 +msgid "Daily" msgstr "" -#: ../../include/text.php:995 -msgid "pinged" +#: ../../include/contact_selectors.php:60 +msgid "Weekly" msgstr "" -#: ../../include/text.php:996 -msgid "prod" +#: ../../include/contact_selectors.php:61 +msgid "Monthly" msgstr "" -#: ../../include/text.php:996 -msgid "prodded" +#: ../../include/contact_selectors.php:76 +msgid "Friendica" msgstr "" -#: ../../include/text.php:997 -msgid "slap" +#: ../../include/contact_selectors.php:77 +msgid "OStatus" msgstr "" -#: ../../include/text.php:997 -msgid "slapped" +#: ../../include/contact_selectors.php:78 +msgid "RSS/Atom" msgstr "" -#: ../../include/text.php:998 -msgid "finger" +#: ../../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/text.php:998 -msgid "fingered" +#: ../../include/contact_selectors.php:80 +msgid "Diaspora" msgstr "" -#: ../../include/text.php:999 -msgid "rebuff" +#: ../../include/contact_selectors.php:81 +msgid "Facebook" msgstr "" -#: ../../include/text.php:999 -msgid "rebuffed" +#: ../../include/contact_selectors.php:82 +msgid "Zot!" msgstr "" -#: ../../include/text.php:1009 -msgid "happy" +#: ../../include/contact_selectors.php:83 +msgid "LinkedIn" msgstr "" -#: ../../include/text.php:1010 -msgid "sad" +#: ../../include/contact_selectors.php:84 +msgid "XMPP/IM" msgstr "" -#: ../../include/text.php:1011 -msgid "mellow" +#: ../../include/contact_selectors.php:85 +msgid "MySpace" msgstr "" -#: ../../include/text.php:1012 -msgid "tired" +#: ../../include/notify.php:23 +msgid "created a new post" msgstr "" -#: ../../include/text.php:1013 -msgid "perky" +#: ../../include/notify.php:24 +#, php-format +msgid "commented on %s's post" msgstr "" -#: ../../include/text.php:1014 -msgid "angry" +#: ../../include/Import/import_diaspora.php:17 +msgid "No username found in import file." msgstr "" -#: ../../include/text.php:1015 -msgid "stupified" +#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:156 +msgid "Unable to create a unique channel address. Import failed." msgstr "" -#: ../../include/text.php:1016 -msgid "puzzled" +#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504 +msgid "Import completed." msgstr "" -#: ../../include/text.php:1017 -msgid "interested" +#: ../../include/group.php:26 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"may apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." msgstr "" -#: ../../include/text.php:1018 -msgid "bitter" +#: ../../include/group.php:235 +msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/text.php:1019 -msgid "cheerful" +#: ../../include/group.php:254 ../../mod/admin.php:831 +msgid "All Channels" msgstr "" -#: ../../include/text.php:1020 -msgid "alive" +#: ../../include/group.php:276 +msgid "edit" msgstr "" -#: ../../include/text.php:1021 -msgid "annoyed" +#: ../../include/group.php:298 +msgid "Collections" msgstr "" -#: ../../include/text.php:1022 -msgid "anxious" +#: ../../include/group.php:299 +msgid "Edit collection" msgstr "" -#: ../../include/text.php:1023 -msgid "cranky" +#: ../../include/group.php:300 +msgid "Add new collection" msgstr "" -#: ../../include/text.php:1024 -msgid "disturbed" +#: ../../include/group.php:301 +msgid "Channels not in any collection" msgstr "" -#: ../../include/text.php:1025 -msgid "frustrated" +#: ../../include/group.php:303 ../../include/widgets.php:275 +msgid "add" msgstr "" -#: ../../include/text.php:1026 -msgid "depressed" +#: ../../include/account.php:27 +msgid "Not a valid email address" msgstr "" -#: ../../include/text.php:1027 -msgid "motivated" +#: ../../include/account.php:29 +msgid "Your email domain is not among those allowed on this site" msgstr "" -#: ../../include/text.php:1028 -msgid "relaxed" +#: ../../include/account.php:35 +msgid "Your email address is already registered at this site." msgstr "" -#: ../../include/text.php:1029 -msgid "surprised" +#: ../../include/account.php:67 +msgid "An invitation is required." msgstr "" -#: ../../include/text.php:1201 -msgid "Monday" +#: ../../include/account.php:71 +msgid "Invitation could not be verified." msgstr "" -#: ../../include/text.php:1201 -msgid "Tuesday" +#: ../../include/account.php:121 +msgid "Please enter the required information." msgstr "" -#: ../../include/text.php:1201 -msgid "Wednesday" +#: ../../include/account.php:188 +msgid "Failed to store account information." msgstr "" -#: ../../include/text.php:1201 -msgid "Thursday" +#: ../../include/account.php:246 +#, php-format +msgid "Registration confirmation for %s" msgstr "" -#: ../../include/text.php:1201 -msgid "Friday" +#: ../../include/account.php:312 +#, php-format +msgid "Registration request at %s" msgstr "" -#: ../../include/text.php:1201 -msgid "Saturday" +#: ../../include/account.php:314 ../../include/account.php:341 +#: ../../include/account.php:401 ../../include/network.php:1632 +msgid "Administrator" msgstr "" -#: ../../include/text.php:1201 -msgid "Sunday" +#: ../../include/account.php:336 +msgid "your registration password" msgstr "" -#: ../../include/text.php:1205 -msgid "January" +#: ../../include/account.php:339 ../../include/account.php:399 +#, php-format +msgid "Registration details for %s" msgstr "" -#: ../../include/text.php:1205 -msgid "February" +#: ../../include/account.php:408 +msgid "Account approved." msgstr "" -#: ../../include/text.php:1205 -msgid "March" +#: ../../include/account.php:447 +#, php-format +msgid "Registration revoked for %s" msgstr "" -#: ../../include/text.php:1205 -msgid "April" +#: ../../include/account.php:492 +msgid "Account verified. Please login." msgstr "" -#: ../../include/text.php:1205 -msgid "May" +#: ../../include/account.php:705 ../../include/account.php:707 +msgid "Click here to upgrade." msgstr "" -#: ../../include/text.php:1205 -msgid "June" +#: ../../include/account.php:713 +msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/text.php:1205 -msgid "July" +#: ../../include/account.php:718 +msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/text.php:1205 -msgid "August" +#: ../../include/datetime.php:48 +msgid "Miscellaneous" msgstr "" -#: ../../include/text.php:1205 -msgid "September" +#: ../../include/datetime.php:132 +msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/text.php:1205 -msgid "October" +#: ../../include/datetime.php:235 ../../mod/events.php:635 +#: ../../mod/appman.php:91 ../../mod/appman.php:92 +msgid "Required" msgstr "" -#: ../../include/text.php:1205 -msgid "November" +#: ../../include/datetime.php:262 ../../boot.php:2355 +msgid "never" msgstr "" -#: ../../include/text.php:1205 -msgid "December" +#: ../../include/datetime.php:268 +msgid "less than a second ago" msgstr "" -#: ../../include/text.php:1310 -msgid "unknown.???" +#: ../../include/datetime.php:271 +msgid "year" msgstr "" -#: ../../include/text.php:1311 -msgid "bytes" +#: ../../include/datetime.php:271 +msgid "years" msgstr "" -#: ../../include/text.php:1347 -msgid "remove category" +#: ../../include/datetime.php:272 +msgid "month" msgstr "" -#: ../../include/text.php:1422 -msgid "remove from file" +#: ../../include/datetime.php:272 +msgid "months" msgstr "" -#: ../../include/text.php:1498 ../../include/text.php:1509 -#: ../../mod/connedit.php:667 -msgid "Click to open/close" +#: ../../include/datetime.php:273 +msgid "week" msgstr "" -#: ../../include/text.php:1665 ../../mod/events.php:444 -msgid "Link to Source" +#: ../../include/datetime.php:273 +msgid "weeks" msgstr "" -#: ../../include/text.php:1686 ../../include/text.php:1757 -msgid "default" +#: ../../include/datetime.php:274 +msgid "day" msgstr "" -#: ../../include/text.php:1694 -msgid "Page layout" +#: ../../include/datetime.php:274 +msgid "days" msgstr "" -#: ../../include/text.php:1694 -msgid "You can create your own with the layouts tool" +#: ../../include/datetime.php:275 +msgid "hour" msgstr "" -#: ../../include/text.php:1735 -msgid "Page content type" +#: ../../include/datetime.php:275 +msgid "hours" msgstr "" -#: ../../include/text.php:1769 -msgid "Select an alternate language" +#: ../../include/datetime.php:276 +msgid "minute" msgstr "" -#: ../../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 -msgid "photo" +#: ../../include/datetime.php:276 +msgid "minutes" msgstr "" -#: ../../include/text.php:1891 ../../include/conversation.php:123 -#: ../../mod/like.php:348 ../../mod/tagger.php:47 -msgid "event" +#: ../../include/datetime.php:277 +msgid "second" msgstr "" -#: ../../include/text.php:1894 ../../include/diaspora.php:2115 -#: ../../include/conversation.php:148 ../../mod/like.php:346 -#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 -msgid "status" +#: ../../include/datetime.php:277 +msgid "seconds" msgstr "" -#: ../../include/text.php:1896 ../../include/conversation.php:150 -#: ../../mod/tagger.php:53 -msgid "comment" +#: ../../include/datetime.php:285 +#, php-format +msgctxt "e.g. 22 hours ago, 1 minute ago" +msgid "%1$d %2$s ago" msgstr "" -#: ../../include/text.php:1901 -msgid "activity" +#: ../../include/datetime.php:519 +#, php-format +msgid "%1$s's birthday" msgstr "" -#: ../../include/text.php:2196 -msgid "Design Tools" +#: ../../include/datetime.php:520 +#, php-format +msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/text.php:2199 ../../mod/blocks.php:147 -msgid "Blocks" +#: ../../include/dir_fns.php:126 +msgid "Directory Options" msgstr "" -#: ../../include/text.php:2200 ../../mod/menu.php:98 -msgid "Menus" +#: ../../include/dir_fns.php:128 +msgid "Safe Mode" msgstr "" -#: ../../include/text.php:2201 ../../mod/layouts.php:174 -msgid "Layouts" +#: ../../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 "" -#: ../../include/text.php:2202 -msgid "Pages" +#: ../../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/text.php:2553 ../../include/RedDAV/RedBrowser.php:131 -msgid "Collection" +#: ../../include/dir_fns.php:129 +msgid "Public Forums Only" 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/dir_fns.php:130 +msgid "This Website Only" msgstr "" -#: ../../include/diaspora.php:2144 ../../include/conversation.php:164 -#: ../../mod/like.php:394 -#, php-format -msgid "%1$s likes %2$s's %3$s" +#: ../../include/page_widgets.php:6 +msgid "New Page" msgstr "" -#: ../../include/diaspora.php:2490 -msgid "Please choose" +#: ../../include/page_widgets.php:39 ../../mod/webpages.php:187 +#: ../../mod/blocks.php:159 ../../mod/layouts.php:188 +msgid "View" msgstr "" -#: ../../include/diaspora.php:2492 -msgid "Agree" +#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677 +#: ../../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 "" -#: ../../include/diaspora.php:2494 -msgid "Disagree" +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189 +msgid "Actions" msgstr "" -#: ../../include/diaspora.php:2496 -msgid "Abstain" +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190 +msgid "Page Link" msgstr "" -#: ../../include/diaspora.php:2518 ../../include/diaspora.php:2529 -#: ../../include/network.php:1586 ../../include/enotify.php:59 -#: ../../mod/p.php:46 -msgid "$projectname" +#: ../../include/page_widgets.php:43 +msgid "Title" msgstr "" -#: ../../include/notify.php:23 -msgid "created a new post" +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:192 +#: ../../mod/blocks.php:150 ../../mod/menu.php:105 ../../mod/layouts.php:181 +msgid "Created" msgstr "" -#: ../../include/notify.php:24 -#, php-format -msgid "commented on %s's post" +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:193 +#: ../../mod/blocks.php:151 ../../mod/menu.php:106 ../../mod/layouts.php:182 +msgid "Edited" msgstr "" -#: ../../include/Import/import_diaspora.php:17 -msgid "No username found in import file." +#: ../../include/api.php:1193 +msgid "Public Timeline" msgstr "" -#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:156 -msgid "Unable to create a unique channel address. Import failed." +#: ../../include/comanche.php:34 ../../mod/admin.php:390 +#: ../../view/theme/apw/php/config.php:185 +msgid "Default" msgstr "" -#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504 -msgid "Import completed." +#: ../../include/event.php:19 ../../include/bb2diaspora.php:459 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/group.php:26 -msgid "" -"A deleted group with this name was revived. Existing item permissions " -"may apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." +#: ../../include/event.php:27 ../../include/bb2diaspora.php:465 +msgid "Starts:" msgstr "" -#: ../../include/group.php:235 -msgid "Default privacy group for new contacts" +#: ../../include/event.php:37 ../../include/bb2diaspora.php:473 +msgid "Finishes:" msgstr "" -#: ../../include/group.php:254 ../../mod/admin.php:831 -msgid "All Channels" +#: ../../include/event.php:47 ../../include/bb2diaspora.php:481 +#: ../../include/identity.php:908 ../../mod/directory.php:302 +#: ../../mod/events.php:647 +msgid "Location:" msgstr "" -#: ../../include/group.php:276 -msgid "edit" +#: ../../include/event.php:391 +msgid "This event has been added to your calendar." msgstr "" -#: ../../include/group.php:298 -msgid "Collections" +#: ../../include/js_strings.php:5 +msgid "Delete this item?" msgstr "" -#: ../../include/group.php:299 -msgid "Edit collection" +#: ../../include/js_strings.php:6 ../../include/ItemObject.php:667 +#: ../../mod/photos.php:980 ../../mod/photos.php:1098 +msgid "Comment" msgstr "" -#: ../../include/group.php:300 -msgid "Add new collection" +#: ../../include/js_strings.php:7 ../../include/ItemObject.php:384 +msgid "[+] show all" msgstr "" -#: ../../include/group.php:301 -msgid "Channels not in any collection" +#: ../../include/js_strings.php:8 +msgid "[-] show less" msgstr "" -#: ../../include/group.php:303 ../../include/widgets.php:275 -msgid "add" +#: ../../include/js_strings.php:9 +msgid "[+] expand" msgstr "" -#: ../../include/account.php:27 -msgid "Not a valid email address" +#: ../../include/js_strings.php:10 +msgid "[-] collapse" msgstr "" -#: ../../include/account.php:29 -msgid "Your email domain is not among those allowed on this site" +#: ../../include/js_strings.php:11 +msgid "Password too short" msgstr "" -#: ../../include/account.php:35 -msgid "Your email address is already registered at this site." +#: ../../include/js_strings.php:12 +msgid "Passwords do not match" msgstr "" -#: ../../include/account.php:67 -msgid "An invitation is required." +#: ../../include/js_strings.php:13 ../../mod/photos.php:40 +msgid "everybody" msgstr "" -#: ../../include/account.php:71 -msgid "Invitation could not be verified." +#: ../../include/js_strings.php:14 +msgid "Secret Passphrase" msgstr "" -#: ../../include/account.php:121 -msgid "Please enter the required information." +#: ../../include/js_strings.php:15 +msgid "Passphrase hint" msgstr "" -#: ../../include/account.php:188 -msgid "Failed to store account information." +#: ../../include/js_strings.php:16 +msgid "Notice: Permissions have changed but have not yet been submitted." msgstr "" -#: ../../include/account.php:246 +#: ../../include/js_strings.php:17 +msgid "close all" +msgstr "" + +#: ../../include/js_strings.php:18 +msgid "Nothing new here" +msgstr "" + +#: ../../include/js_strings.php:19 +msgid "Rate This Channel (this is public)" +msgstr "" + +#: ../../include/js_strings.php:20 ../../mod/rate.php:156 +#: ../../mod/connedit.php:667 +msgid "Rating" +msgstr "" + +#: ../../include/js_strings.php:21 +msgid "Describe (optional)" +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: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: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 "" + +#: ../../include/js_strings.php:23 +msgid "Please enter a link URL" +msgstr "" + +#: ../../include/js_strings.php:24 +msgid "Unsaved changes. Are you sure you wish to leave this page?" +msgstr "" + +#: ../../include/js_strings.php:26 +msgid "timeago.prefixAgo" +msgstr "" + +#: ../../include/js_strings.php:27 +msgid "timeago.prefixFromNow" +msgstr "" + +#: ../../include/js_strings.php:28 +msgid "ago" +msgstr "" + +#: ../../include/js_strings.php:29 +msgid "from now" +msgstr "" + +#: ../../include/js_strings.php:30 +msgid "less than a minute" +msgstr "" + +#: ../../include/js_strings.php:31 +msgid "about a minute" +msgstr "" + +#: ../../include/js_strings.php:32 #, php-format -msgid "Registration confirmation for %s" +msgid "%d minutes" msgstr "" -#: ../../include/account.php:312 +#: ../../include/js_strings.php:33 +msgid "about an hour" +msgstr "" + +#: ../../include/js_strings.php:34 #, php-format -msgid "Registration request at %s" +msgid "about %d hours" msgstr "" -#: ../../include/account.php:314 ../../include/account.php:341 -#: ../../include/account.php:401 ../../include/network.php:1632 -msgid "Administrator" +#: ../../include/js_strings.php:35 +msgid "a day" msgstr "" -#: ../../include/account.php:336 -msgid "your registration password" +#: ../../include/js_strings.php:36 +#, php-format +msgid "%d days" msgstr "" -#: ../../include/account.php:339 ../../include/account.php:399 +#: ../../include/js_strings.php:37 +msgid "about a month" +msgstr "" + +#: ../../include/js_strings.php:38 #, php-format -msgid "Registration details for %s" +msgid "%d months" msgstr "" -#: ../../include/account.php:408 -msgid "Account approved." +#: ../../include/js_strings.php:39 +msgid "about a year" msgstr "" -#: ../../include/account.php:447 +#: ../../include/js_strings.php:40 #, php-format -msgid "Registration revoked for %s" +msgid "%d years" msgstr "" -#: ../../include/account.php:492 -msgid "Account verified. Please login." +#: ../../include/js_strings.php:41 +msgid " " msgstr "" -#: ../../include/account.php:705 ../../include/account.php:707 -msgid "Click here to upgrade." +#: ../../include/js_strings.php:42 +msgid "timeago.numbers" msgstr "" -#: ../../include/account.php:713 -msgid "This action exceeds the limits set by your subscription plan." +#: ../../include/text.php:395 +msgid "prev" msgstr "" -#: ../../include/account.php:718 -msgid "This action is not available under your subscription plan." +#: ../../include/text.php:397 +msgid "first" msgstr "" -#: ../../include/datetime.php:48 -msgid "Miscellaneous" +#: ../../include/text.php:426 +msgid "last" msgstr "" -#: ../../include/datetime.php:132 -msgid "YYYY-MM-DD or MM-DD" +#: ../../include/text.php:429 +msgid "next" msgstr "" -#: ../../include/datetime.php:235 ../../mod/events.php:635 -#: ../../mod/appman.php:91 ../../mod/appman.php:92 -msgid "Required" +#: ../../include/text.php:439 +msgid "older" msgstr "" -#: ../../include/datetime.php:262 ../../boot.php:2355 -msgid "never" +#: ../../include/text.php:441 +msgid "newer" msgstr "" -#: ../../include/datetime.php:268 -msgid "less than a second ago" +#: ../../include/text.php:834 +msgid "No connections" msgstr "" -#: ../../include/datetime.php:271 -msgid "year" +#: ../../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/datetime.php:271 -msgid "years" +#: ../../include/text.php:918 ../../include/text.php:930 +#: ../../include/nav.php:165 ../../include/apps.php:147 +#: ../../mod/search.php:38 +msgid "Search" msgstr "" -#: ../../include/datetime.php:272 -msgid "month" +#: ../../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/datetime.php:272 -msgid "months" +#: ../../include/text.php:994 +msgid "poke" msgstr "" -#: ../../include/datetime.php:273 -msgid "week" +#: ../../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/datetime.php:273 -msgid "weeks" +#: ../../include/text.php:998 +msgid "finger" msgstr "" -#: ../../include/datetime.php:274 -msgid "day" +#: ../../include/text.php:998 +msgid "fingered" msgstr "" -#: ../../include/datetime.php:274 -msgid "days" +#: ../../include/text.php:999 +msgid "rebuff" msgstr "" -#: ../../include/datetime.php:275 -msgid "hour" +#: ../../include/text.php:999 +msgid "rebuffed" msgstr "" -#: ../../include/datetime.php:275 -msgid "hours" +#: ../../include/text.php:1009 +msgid "happy" msgstr "" -#: ../../include/datetime.php:276 -msgid "minute" +#: ../../include/text.php:1010 +msgid "sad" msgstr "" -#: ../../include/datetime.php:276 -msgid "minutes" +#: ../../include/text.php:1011 +msgid "mellow" msgstr "" -#: ../../include/datetime.php:277 -msgid "second" +#: ../../include/text.php:1012 +msgid "tired" msgstr "" -#: ../../include/datetime.php:277 -msgid "seconds" +#: ../../include/text.php:1013 +msgid "perky" msgstr "" -#: ../../include/datetime.php:285 -#, php-format -msgctxt "e.g. 22 hours ago, 1 minute ago" -msgid "%1$d %2$s ago" +#: ../../include/text.php:1014 +msgid "angry" msgstr "" -#: ../../include/datetime.php:519 -#, php-format -msgid "%1$s's birthday" +#: ../../include/text.php:1015 +msgid "stupified" msgstr "" -#: ../../include/datetime.php:520 -#, php-format -msgid "Happy Birthday %1$s" +#: ../../include/text.php:1016 +msgid "puzzled" msgstr "" -#: ../../include/page_widgets.php:6 -msgid "New Page" +#: ../../include/text.php:1017 +msgid "interested" msgstr "" -#: ../../include/page_widgets.php:39 ../../mod/webpages.php:187 -#: ../../mod/blocks.php:159 ../../mod/layouts.php:188 -msgid "View" +#: ../../include/text.php:1018 +msgid "bitter" 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 -msgid "Preview" +#: ../../include/text.php:1019 +msgid "cheerful" msgstr "" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189 -msgid "Actions" +#: ../../include/text.php:1020 +msgid "alive" msgstr "" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190 -msgid "Page Link" +#: ../../include/text.php:1021 +msgid "annoyed" msgstr "" -#: ../../include/page_widgets.php:43 -msgid "Title" +#: ../../include/text.php:1022 +msgid "anxious" msgstr "" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:192 -#: ../../mod/blocks.php:150 ../../mod/menu.php:105 ../../mod/layouts.php:181 -msgid "Created" +#: ../../include/text.php:1023 +msgid "cranky" msgstr "" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:193 -#: ../../mod/blocks.php:151 ../../mod/menu.php:106 ../../mod/layouts.php:182 -msgid "Edited" +#: ../../include/text.php:1024 +msgid "disturbed" msgstr "" -#: ../../include/api.php:1193 -msgid "Public Timeline" +#: ../../include/text.php:1025 +msgid "frustrated" msgstr "" -#: ../../include/comanche.php:34 ../../mod/admin.php:390 -#: ../../view/theme/apw/php/config.php:185 -msgid "Default" +#: ../../include/text.php:1026 +msgid "depressed" msgstr "" -#: ../../include/event.php:19 ../../include/bb2diaspora.php:459 -msgid "l F d, Y \\@ g:i A" +#: ../../include/text.php:1027 +msgid "motivated" msgstr "" -#: ../../include/event.php:27 ../../include/bb2diaspora.php:465 -msgid "Starts:" +#: ../../include/text.php:1028 +msgid "relaxed" msgstr "" -#: ../../include/event.php:37 ../../include/bb2diaspora.php:473 -msgid "Finishes:" +#: ../../include/text.php:1029 +msgid "surprised" msgstr "" -#: ../../include/event.php:47 ../../include/bb2diaspora.php:481 -#: ../../include/identity.php:879 ../../mod/directory.php:302 -#: ../../mod/events.php:647 -msgid "Location:" +#: ../../include/text.php:1201 +msgid "Monday" msgstr "" -#: ../../include/event.php:391 -msgid "This event has been added to your calendar." +#: ../../include/text.php:1201 +msgid "Tuesday" msgstr "" -#: ../../include/js_strings.php:5 -msgid "Delete this item?" +#: ../../include/text.php:1201 +msgid "Wednesday" msgstr "" -#: ../../include/js_strings.php:6 ../../include/ItemObject.php:667 -#: ../../mod/photos.php:980 ../../mod/photos.php:1098 -msgid "Comment" +#: ../../include/text.php:1201 +msgid "Thursday" msgstr "" -#: ../../include/js_strings.php:7 ../../include/ItemObject.php:384 -msgid "[+] show all" +#: ../../include/text.php:1201 +msgid "Friday" msgstr "" -#: ../../include/js_strings.php:8 -msgid "[-] show less" +#: ../../include/text.php:1201 +msgid "Saturday" msgstr "" -#: ../../include/js_strings.php:9 -msgid "[+] expand" +#: ../../include/text.php:1201 +msgid "Sunday" msgstr "" -#: ../../include/js_strings.php:10 -msgid "[-] collapse" +#: ../../include/text.php:1205 +msgid "January" msgstr "" -#: ../../include/js_strings.php:11 -msgid "Password too short" +#: ../../include/text.php:1205 +msgid "February" msgstr "" -#: ../../include/js_strings.php:12 -msgid "Passwords do not match" +#: ../../include/text.php:1205 +msgid "March" msgstr "" -#: ../../include/js_strings.php:13 ../../mod/photos.php:40 -msgid "everybody" +#: ../../include/text.php:1205 +msgid "April" msgstr "" -#: ../../include/js_strings.php:14 -msgid "Secret Passphrase" +#: ../../include/text.php:1205 +msgid "May" msgstr "" -#: ../../include/js_strings.php:15 -msgid "Passphrase hint" +#: ../../include/text.php:1205 +msgid "June" msgstr "" -#: ../../include/js_strings.php:16 -msgid "Notice: Permissions have changed but have not yet been submitted." +#: ../../include/text.php:1205 +msgid "July" msgstr "" -#: ../../include/js_strings.php:17 -msgid "close all" +#: ../../include/text.php:1205 +msgid "August" msgstr "" -#: ../../include/js_strings.php:18 -msgid "Nothing new here" +#: ../../include/text.php:1205 +msgid "September" msgstr "" -#: ../../include/js_strings.php:19 -msgid "Rate This Channel (this is public)" +#: ../../include/text.php:1205 +msgid "October" msgstr "" -#: ../../include/js_strings.php:20 ../../mod/rate.php:156 -msgid "Rating" +#: ../../include/text.php:1205 +msgid "November" msgstr "" -#: ../../include/js_strings.php:21 -msgid "Describe (optional)" +#: ../../include/text.php:1205 +msgid "December" 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: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 -#: ../../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: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" +#: ../../include/text.php:1310 +msgid "unknown.???" msgstr "" -#: ../../include/js_strings.php:23 -msgid "Please enter a link URL" +#: ../../include/text.php:1311 +msgid "bytes" msgstr "" -#: ../../include/js_strings.php:24 -msgid "Unsaved changes. Are you sure you wish to leave this page?" +#: ../../include/text.php:1347 +msgid "remove category" msgstr "" -#: ../../include/js_strings.php:26 -msgid "timeago.prefixAgo" +#: ../../include/text.php:1422 +msgid "remove from file" msgstr "" -#: ../../include/js_strings.php:27 -msgid "timeago.prefixFromNow" +#: ../../include/text.php:1498 ../../include/text.php:1509 +msgid "Click to open/close" msgstr "" -#: ../../include/js_strings.php:28 -msgid "ago" +#: ../../include/text.php:1665 ../../mod/events.php:444 +msgid "Link to Source" msgstr "" -#: ../../include/js_strings.php:29 -msgid "from now" +#: ../../include/text.php:1686 ../../include/text.php:1757 +msgid "default" msgstr "" -#: ../../include/js_strings.php:30 -msgid "less than a minute" +#: ../../include/text.php:1694 +msgid "Page layout" msgstr "" -#: ../../include/js_strings.php:31 -msgid "about a minute" +#: ../../include/text.php:1694 +msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/js_strings.php:32 -#, php-format -msgid "%d minutes" +#: ../../include/text.php:1735 +msgid "Page content type" msgstr "" -#: ../../include/js_strings.php:33 -msgid "about an hour" +#: ../../include/text.php:1769 +msgid "Select an alternate language" msgstr "" -#: ../../include/js_strings.php:34 -#, php-format -msgid "about %d hours" +#: ../../include/text.php:1891 ../../include/conversation.php:123 +#: ../../mod/like.php:348 ../../mod/tagger.php:47 +msgid "event" msgstr "" -#: ../../include/js_strings.php:35 -msgid "a day" +#: ../../include/text.php:1896 ../../include/conversation.php:150 +#: ../../mod/tagger.php:53 +msgid "comment" msgstr "" -#: ../../include/js_strings.php:36 -#, php-format -msgid "%d days" +#: ../../include/text.php:1901 +msgid "activity" msgstr "" -#: ../../include/js_strings.php:37 -msgid "about a month" +#: ../../include/text.php:2196 +msgid "Design Tools" msgstr "" -#: ../../include/js_strings.php:38 -#, php-format -msgid "%d months" +#: ../../include/text.php:2199 ../../mod/blocks.php:147 +msgid "Blocks" msgstr "" -#: ../../include/js_strings.php:39 -msgid "about a year" +#: ../../include/text.php:2200 ../../mod/menu.php:98 +msgid "Menus" msgstr "" -#: ../../include/js_strings.php:40 -#, php-format -msgid "%d years" +#: ../../include/text.php:2201 ../../mod/layouts.php:174 +msgid "Layouts" msgstr "" -#: ../../include/js_strings.php:41 -msgid " " +#: ../../include/text.php:2202 +msgid "Pages" msgstr "" -#: ../../include/js_strings.php:42 -msgid "timeago.numbers" +#: ../../include/text.php:2553 ../../include/RedDAV/RedBrowser.php:131 +msgid "Collection" msgstr "" #: ../../include/RedDAV/RedBrowser.php:107 @@ -989,9 +1094,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:549 +#: ../../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 "" @@ -1137,7 +1242,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 "" @@ -1284,44 +1389,6 @@ msgstr "" msgid "Provide a personal tag cloud on your channel page" 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/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: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/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: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/widgets.php:35 ../../include/taxonomy.php:264 #: ../../include/contact_widgets.php:92 msgid "Categories" @@ -1350,7 +1417,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:316 +#: ../../include/identity.php:857 ../../mod/directory.php:316 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" msgstr "" @@ -1401,116 +1468,116 @@ msgstr "" msgid "Archives" msgstr "" -#: ../../include/widgets.php:427 ../../mod/connedit.php:578 +#: ../../include/widgets.php:429 ../../mod/connedit.php:567 msgid "Me" msgstr "" -#: ../../include/widgets.php:428 ../../mod/connedit.php:579 +#: ../../include/widgets.php:430 ../../mod/connedit.php:568 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:580 +#: ../../mod/connedit.php:569 msgid "Friends" msgstr "" -#: ../../include/widgets.php:430 ../../mod/connedit.php:581 +#: ../../include/widgets.php:432 ../../mod/connedit.php:570 msgid "Acquaintances" msgstr "" -#: ../../include/widgets.php:431 ../../mod/connections.php:231 -#: ../../mod/connections.php:246 ../../mod/connedit.php:582 +#: ../../include/widgets.php:433 ../../mod/connections.php:231 +#: ../../mod/connections.php:246 ../../mod/connedit.php:571 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:659 +#: ../../include/widgets.php:532 ../../mod/connedit.php:658 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 "" @@ -1692,72 +1759,6 @@ 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:1553 -msgid "Email" -msgstr "" - -#: ../../include/contact_selectors.php:80 -msgid "Diaspora" -msgstr "" - -#: ../../include/contact_selectors.php:81 -msgid "Facebook" -msgstr "" - -#: ../../include/contact_selectors.php:82 -msgid "Zot!" -msgstr "" - -#: ../../include/contact_selectors.php:83 -msgid "LinkedIn" -msgstr "" - -#: ../../include/contact_selectors.php:84 -msgid "XMPP/IM" -msgstr "" - -#: ../../include/contact_selectors.php:85 -msgid "MySpace" -msgstr "" - #: ../../include/message.php:18 msgid "No recipient provided." msgstr "" @@ -1853,7 +1854,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" @@ -1992,9 +1993,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 "" @@ -2005,32 +2006,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 "" @@ -2047,7 +2048,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 "" @@ -2089,7 +2090,7 @@ msgid "Your posts and conversations" msgstr "" #: ../../include/nav.php:91 ../../include/conversation.php:942 -#: ../../mod/connedit.php:500 ../../mod/connedit.php:666 +#: ../../mod/connedit.php:498 msgid "View Profile" msgstr "" @@ -2105,7 +2106,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 "" @@ -2722,7 +2723,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 "" @@ -2740,9 +2741,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 "" @@ -2750,9 +2751,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 "" @@ -2760,9 +2761,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 "" @@ -2786,9 +2787,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 "" @@ -2796,13 +2797,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 "" @@ -2810,20 +2811,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 "" @@ -2831,32 +2832,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 +#: ../../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/fbrowser.php:117 ../../mod/editpost.php:154 #: ../../mod/settings.php:589 ../../mod/settings.php:615 msgid "Cancel" msgstr "" @@ -2994,7 +2995,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 "" @@ -3036,9 +3037,9 @@ msgid "Visible to specific connections." msgstr "" #: ../../include/items.php:4198 ../../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 +#: ../../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 "" @@ -3057,22 +3058,22 @@ msgstr "" #: ../../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/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:337 +#: ../../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 @@ -3081,7 +3082,7 @@ 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 "" @@ -3099,7 +3100,7 @@ msgstr "" msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4706 +#: ../../include/items.php:4706 ../../mod/connedit.php:658 #, php-format msgid "Connection: %s" msgstr "" @@ -3116,7 +3117,7 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2126 +#: ../../include/zot.php:2131 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -3314,206 +3315,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:297 +#: ../../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:313 +#: ../../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:315 +#: ../../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 "" @@ -3811,17 +3812,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 "" @@ -3830,44 +3831,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 ../../mod/tagger.php:51 +#: ../../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 "" @@ -3956,8 +3964,8 @@ msgid "Delegated Channels" msgstr "" #: ../../mod/directory.php:59 ../../mod/photos.php:441 ../../mod/search.php:13 -#: ../../mod/display.php:13 ../../mod/ratings.php:82 -#: ../../mod/viewconnections.php:17 +#: ../../mod/ratings.php:82 ../../mod/viewconnections.php:17 +#: ../../mod/display.php:13 msgid "Public access denied." msgstr "" @@ -4052,7 +4060,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 "" @@ -4291,8 +4299,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 "" @@ -4508,7 +4516,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 "" @@ -4704,11 +4712,11 @@ msgstr "" msgid "Could not locate selected profile." msgstr "" -#: ../../mod/connections.php:94 ../../mod/connedit.php:220 +#: ../../mod/connections.php:94 ../../mod/connedit.php:219 msgid "Connection updated." msgstr "" -#: ../../mod/connections.php:96 ../../mod/connedit.php:222 +#: ../../mod/connections.php:96 ../../mod/connedit.php:221 msgid "Failed to update connection record." msgstr "" @@ -4797,6 +4805,35 @@ msgstr "" msgid "Block Title" msgstr "" +#: ../../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 msgid "$Projectname - Guests: Username: {your email address}, Password: +++" msgstr "" @@ -5131,83 +5168,182 @@ msgid "" "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" +#: ../../mod/editlayout.php:111 +msgid "Delete layout?" +msgstr "" + +#: ../../mod/editlayout.php:158 ../../mod/layouts.php:124 +msgid "Layout Description (Optional)" +msgstr "" + +#: ../../mod/editlayout.php:160 ../../mod/layouts.php:121 +#: ../../mod/layouts.php:179 +msgid "Layout Name" msgstr "" -#: ../../mod/editlayout.php:106 +#: ../../mod/editlayout.php:177 msgid "Edit Layout" msgstr "" -#: ../../mod/editlayout.php:117 -msgid "Delete layout?" +#: ../../mod/chat.php:19 ../../mod/channel.php:25 +msgid "You must be logged in to see this page." +msgstr "" + +#: ../../mod/chat.php:167 +msgid "Room not found" +msgstr "" + +#: ../../mod/chat.php:178 +msgid "Leave Room" +msgstr "" + +#: ../../mod/chat.php:179 +msgid "Delete This Room" +msgstr "" + +#: ../../mod/chat.php:180 +msgid "I am away right now" +msgstr "" + +#: ../../mod/chat.php:181 +msgid "I am online" +msgstr "" + +#: ../../mod/chat.php:183 +msgid "Bookmark this room" +msgstr "" + +#: ../../mod/chat.php:207 ../../mod/chat.php:229 +msgid "New Chatroom" +msgstr "" + +#: ../../mod/chat.php:208 +msgid "Chatroom Name" +msgstr "" + +#: ../../mod/chat.php:225 +#, php-format +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/editlayout.php:148 ../../mod/editwebpage.php:187 -#: ../../mod/editpost.php:122 ../../mod/editblock.php:150 -msgid "Insert YouTube video" +#: ../../mod/mitem.php:169 +msgid "Menu:" msgstr "" -#: ../../mod/editlayout.php:149 ../../mod/editwebpage.php:188 -#: ../../mod/editpost.php:123 ../../mod/editblock.php:151 -msgid "Insert Vorbis [.ogg] video" +#: ../../mod/mitem.php:172 +msgid "Link Target" msgstr "" -#: ../../mod/editlayout.php:150 ../../mod/editwebpage.php:189 -#: ../../mod/editpost.php:124 ../../mod/editblock.php:152 -msgid "Insert Vorbis [.ogg] audio" +#: ../../mod/mitem.php:175 +msgid "Edit menu" msgstr "" -#: ../../mod/editlayout.php:164 ../../mod/layouts.php:124 -msgid "Layout Description (Optional)" +#: ../../mod/mitem.php:178 +msgid "Edit element" msgstr "" -#: ../../mod/editlayout.php:166 ../../mod/layouts.php:121 -#: ../../mod/layouts.php:179 -msgid "Layout Name" +#: ../../mod/mitem.php:179 +msgid "Drop element" msgstr "" -#: ../../mod/chat.php:19 ../../mod/channel.php:25 -msgid "You must be logged in to see this page." +#: ../../mod/mitem.php:180 +msgid "New element" msgstr "" -#: ../../mod/chat.php:167 -msgid "Room not found" +#: ../../mod/mitem.php:181 +msgid "Edit this menu container" msgstr "" -#: ../../mod/chat.php:178 -msgid "Leave Room" +#: ../../mod/mitem.php:182 +msgid "Add menu element" msgstr "" -#: ../../mod/chat.php:179 -msgid "Delete This Room" +#: ../../mod/mitem.php:183 +msgid "Delete this menu item" msgstr "" -#: ../../mod/chat.php:180 -msgid "I am away right now" +#: ../../mod/mitem.php:184 +msgid "Edit this menu item" msgstr "" -#: ../../mod/chat.php:181 -msgid "I am online" +#: ../../mod/mitem.php:201 +msgid "Menu item not found." msgstr "" -#: ../../mod/chat.php:183 -msgid "Bookmark this room" +#: ../../mod/mitem.php:212 +msgid "Menu item deleted." msgstr "" -#: ../../mod/chat.php:207 ../../mod/chat.php:229 -msgid "New Chatroom" +#: ../../mod/mitem.php:214 +msgid "Menu item could not be deleted." msgstr "" -#: ../../mod/chat.php:208 -msgid "Chatroom Name" +#: ../../mod/mitem.php:221 +msgid "Edit Menu Element" msgstr "" -#: ../../mod/chat.php:225 -#, php-format -msgid "%1$s's Chatrooms" +#: ../../mod/mitem.php:227 +msgid "Link text" msgstr "" #: ../../mod/editwebpage.php:152 @@ -5308,21 +5444,20 @@ msgstr "" msgid "Remote Channel [%s] (not yet known on this site)" msgstr "" -#: ../../mod/rate.php:161 ../../mod/connedit.php:669 +#: ../../mod/rate.php:161 msgid "Rating (this information is public)" msgstr "" -#: ../../mod/rate.php:162 ../../mod/connedit.php:670 -#: ../../mod/connedit.php:674 +#: ../../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 @@ -5513,11 +5648,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 "" @@ -5533,7 +5668,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 "" @@ -5545,35 +5680,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 "" @@ -6389,22 +6520,22 @@ msgstr "" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../mod/uexport.php:33 ../../mod/uexport.php:34 +#: ../../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 " @@ -6972,7 +7103,7 @@ msgstr "" msgid "No registrations." msgstr "" -#: ../../mod/admin.php:824 +#: ../../mod/admin.php:824 ../../mod/connedit.php:683 msgid "Approve" msgstr "" @@ -6980,13 +7111,11 @@ msgstr "" msgid "Deny" msgstr "" -#: ../../mod/admin.php:827 ../../mod/connedit.php:523 -#: ../../mod/connedit.php:729 +#: ../../mod/admin.php:827 ../../mod/connedit.php:519 msgid "Block" msgstr "" -#: ../../mod/admin.php:828 ../../mod/connedit.php:523 -#: ../../mod/connedit.php:729 +#: ../../mod/admin.php:828 ../../mod/connedit.php:519 msgid "Unblock" msgstr "" @@ -7219,14 +7348,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 "" @@ -7349,7 +7470,7 @@ msgstr "" msgid "Help:" msgstr "" -#: ../../mod/help.php:76 ../../index.php:227 +#: ../../mod/help.php:76 ../../index.php:238 msgid "Not Found" msgstr "" @@ -7780,10 +7901,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 "" @@ -8032,118 +8149,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 "" @@ -8180,160 +8185,184 @@ msgid "" "removed from the network" msgstr "" -#: ../../mod/connedit.php:268 +#: ../../mod/connedit.php:267 msgid "is now connected to" msgstr "" -#: ../../mod/connedit.php:381 +#: ../../mod/connedit.php:380 msgid "Could not access address book record." msgstr "" -#: ../../mod/connedit.php:395 +#: ../../mod/connedit.php:394 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/connedit.php:402 +#: ../../mod/connedit.php:401 msgid "Channel has been unblocked" msgstr "" -#: ../../mod/connedit.php:403 +#: ../../mod/connedit.php:402 msgid "Channel has been blocked" msgstr "" -#: ../../mod/connedit.php:407 ../../mod/connedit.php:419 -#: ../../mod/connedit.php:431 ../../mod/connedit.php:443 -#: ../../mod/connedit.php:459 +#: ../../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:414 +#: ../../mod/connedit.php:413 msgid "Channel has been unignored" msgstr "" -#: ../../mod/connedit.php:415 +#: ../../mod/connedit.php:414 msgid "Channel has been ignored" msgstr "" -#: ../../mod/connedit.php:426 +#: ../../mod/connedit.php:425 msgid "Channel has been unarchived" msgstr "" -#: ../../mod/connedit.php:427 +#: ../../mod/connedit.php:426 msgid "Channel has been archived" msgstr "" -#: ../../mod/connedit.php:438 +#: ../../mod/connedit.php:437 msgid "Channel has been unhidden" msgstr "" -#: ../../mod/connedit.php:439 +#: ../../mod/connedit.php:438 msgid "Channel has been hidden" msgstr "" -#: ../../mod/connedit.php:454 +#: ../../mod/connedit.php:453 msgid "Channel has been approved" msgstr "" -#: ../../mod/connedit.php:455 +#: ../../mod/connedit.php:454 msgid "Channel has been unapproved" msgstr "" -#: ../../mod/connedit.php:483 +#: ../../mod/connedit.php:482 msgid "Connection has been removed." msgstr "" -#: ../../mod/connedit.php:503 +#: ../../mod/connedit.php:501 #, php-format msgid "View %s's profile" msgstr "" -#: ../../mod/connedit.php:507 +#: ../../mod/connedit.php:505 msgid "Refresh Permissions" msgstr "" -#: ../../mod/connedit.php:510 +#: ../../mod/connedit.php:508 msgid "Fetch updated permissions" msgstr "" -#: ../../mod/connedit.php:514 +#: ../../mod/connedit.php:512 msgid "Recent Activity" msgstr "" -#: ../../mod/connedit.php:517 +#: ../../mod/connedit.php:515 msgid "View recent posts and comments" msgstr "" -#: ../../mod/connedit.php:526 +#: ../../mod/connedit.php:522 msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 +#: ../../mod/connedit.php:526 msgid "Unignore" msgstr "" -#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 -#: ../../mod/notifications.php:51 +#: ../../mod/connedit.php:526 ../../mod/notifications.php:51 msgid "Ignore" msgstr "" -#: ../../mod/connedit.php:533 +#: ../../mod/connedit.php:529 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:533 msgid "Unarchive" msgstr "" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:533 msgid "Archive" msgstr "" -#: ../../mod/connedit.php:539 +#: ../../mod/connedit.php:536 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../mod/connedit.php:542 +#: ../../mod/connedit.php:540 msgid "Unhide" msgstr "" -#: ../../mod/connedit.php:542 +#: ../../mod/connedit.php:540 msgid "Hide" msgstr "" -#: ../../mod/connedit.php:545 +#: ../../mod/connedit.php:543 msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../mod/connedit.php:552 +#: ../../mod/connedit.php:550 msgid "Delete this connection" msgstr "" -#: ../../mod/connedit.php:643 ../../mod/connedit.php:684 +#: ../../mod/connedit.php:631 msgid "Approve this connection" msgstr "" -#: ../../mod/connedit.php:643 +#: ../../mod/connedit.php:631 msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/connedit.php:659 -#, php-format -msgid "Connections: settings for %s" +#: ../../mod/connedit.php:636 +msgid "Set Affinity" +msgstr "" + +#: ../../mod/connedit.php:639 +msgid "Set Profile" +msgstr "" + +#: ../../mod/connedit.php:642 +msgid "Set Affinity & Profile" msgstr "" -#: ../../mod/connedit.php:660 +#: ../../mod/connedit.php:659 msgid "Apply these permissions automatically" msgstr "" +#: ../../mod/connedit.php:661 +msgid "This connection's address is" +msgstr "" + #: ../../mod/connedit.php:664 -msgid "Apply the permissions indicated on this page to all new connections." +msgid "" +"The permissions indicated on this page will be applied to all new " +"connections." msgstr "" -#: ../../mod/connedit.php:668 +#: ../../mod/connedit.php:666 msgid "Slide to adjust your degree of friendship" msgstr "" +#: ../../mod/connedit.php:668 +msgid "Slide to adjust your rating" +msgstr "" + +#: ../../mod/connedit.php:669 ../../mod/connedit.php:674 +msgid "Optionally explain your rating" +msgstr "" + +#: ../../mod/connedit.php:671 +msgid "Custom Filter" +msgstr "" + #: ../../mod/connedit.php:672 msgid "Only import posts with this text" msgstr "" @@ -8347,34 +8376,34 @@ msgstr "" msgid "Do not import posts with this text" msgstr "" -#: ../../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 " -"make any desired changes at this time. This new connection may not " -"be able to communicate with you until you submit this page, which will " -"install and apply the selected permissions." +#: ../../mod/connedit.php:675 +msgid "This information is public!" msgstr "" -#: ../../mod/connedit.php:683 -msgid "inherited" +#: ../../mod/connedit.php:680 +msgid "Connection Pending Approval" msgstr "" -#: ../../mod/connedit.php:686 -msgid "Connection has no individual permissions!" +#: ../../mod/connedit.php:681 +msgid "Connection Request" msgstr "" -#: ../../mod/connedit.php:687 +#: ../../mod/connedit.php:682 +#, php-format msgid "" -"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." +"(%s) would like to connect with you. Please approve this connection to allow " +"communication." msgstr "" -#: ../../mod/connedit.php:689 -msgid "Profile Visibility" +#: ../../mod/connedit.php:684 +msgid "Approve Later" +msgstr "" + +#: ../../mod/connedit.php:687 +msgid "inherited" msgstr "" -#: ../../mod/connedit.php:690 +#: ../../mod/connedit.php:689 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " @@ -8382,125 +8411,36 @@ msgid "" msgstr "" #: ../../mod/connedit.php:691 -msgid "Contact Information / Notes" +msgid "Their Settings" msgstr "" #: ../../mod/connedit.php:692 -msgid "Edit contact notes" +msgid "My Settings" msgstr "" #: ../../mod/connedit.php:694 -msgid "Their Settings" +msgid "Individual Permissions" msgstr "" #: ../../mod/connedit.php:695 -msgid "My Settings" -msgstr "" - -#: ../../mod/connedit.php:697 msgid "" -"Default permissions for this channel type have (just) been applied. They " -"have not been saved and there are currently no stored default " -"permissions. Please review/edit the applied settings and click [Submit] to " -"finalize." -msgstr "" - -#: ../../mod/connedit.php:698 -msgid "Clear/Disable Automatic Permissions" -msgstr "" - -#: ../../mod/connedit.php:699 -msgid "Forum Members" -msgstr "" - -#: ../../mod/connedit.php:700 -msgid "Soapbox" -msgstr "" - -#: ../../mod/connedit.php:701 -msgid "Full Sharing (typical social network permissions)" -msgstr "" - -#: ../../mod/connedit.php:702 -msgid "Cautious Sharing " -msgstr "" - -#: ../../mod/connedit.php:703 -msgid "Follow Only" -msgstr "" - -#: ../../mod/connedit.php:704 -msgid "Individual Permissions" +"Some permissions may be inherited from your channel's privacy settings, which have higher priority than " +"individual settings. You can not change those settings here." msgstr "" -#: ../../mod/connedit.php:705 +#: ../../mod/connedit.php:696 msgid "" -"Some permissions may be inherited from your channel privacy settings, which have higher priority than individual " -"settings. Changing those inherited settings on this page will have no effect." -msgstr "" - -#: ../../mod/connedit.php:706 -msgid "Advanced Permissions" -msgstr "" - -#: ../../mod/connedit.php:707 -msgid "Simple Permissions (select one and submit)" -msgstr "" - -#: ../../mod/connedit.php:711 -#, php-format -msgid "Visit %s's profile - %s" -msgstr "" - -#: ../../mod/connedit.php:712 -msgid "Block/Unblock contact" -msgstr "" - -#: ../../mod/connedit.php:713 -msgid "Ignore contact" -msgstr "" - -#: ../../mod/connedit.php:714 -msgid "Repair URL settings" -msgstr "" - -#: ../../mod/connedit.php:715 -msgid "View conversations" -msgstr "" - -#: ../../mod/connedit.php:717 -msgid "Delete contact" +"Some permissions may be inherited from your channel's privacy settings, 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:721 +#: ../../mod/connedit.php:697 msgid "Last update:" msgstr "" -#: ../../mod/connedit.php:723 -msgid "Update public posts" -msgstr "" - -#: ../../mod/connedit.php:725 -msgid "Update now" -msgstr "" - -#: ../../mod/connedit.php:731 -msgid "Currently blocked" -msgstr "" - -#: ../../mod/connedit.php:732 -msgid "Currently ignored" -msgstr "" - -#: ../../mod/connedit.php:733 -msgid "Currently archived" -msgstr "" - -#: ../../mod/connedit.php:734 -msgid "Currently pending" -msgstr "" - #: ../../mod/rmagic.php:40 msgid "" "We encountered a problem while logging in with the OpenID you provided. " diff --git a/version.inc b/version.inc index b66e936cd..249734f42 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-07-16.1095 +2015-07-19.1098 -- cgit v1.2.3 From ec00c5b18a1efea64517b18fa12bb9df6f0b95f7 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 19 Jul 2015 17:53:52 -0700 Subject: the view_photos and post_photos permissions are redundant and are now mapped to view_storage and write_storage --- include/conversation.php | 6 ++--- include/permissions.php | 68 ++++++++++++++++-------------------------------- include/photos.php | 10 +++---- include/widgets.php | 2 +- mod/editblock.php | 2 +- mod/editwebpage.php | 5 +--- mod/photo.php | 2 +- mod/photos.php | 6 ++--- view/js/mod_connedit.js | 1 - view/js/mod_settings.js | 8 ------ 10 files changed, 36 insertions(+), 74 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 65056bc9c..d14d7ba84 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1168,7 +1168,7 @@ function status_editor($a, $x, $popup = false) { '$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''), '$id_select' => $id_select, '$id_seltext' => t('Post as'), - '$writefiles' => (perm_is_allowed($x['profile_uid'], get_observer_hash(), 'post_photos') || perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage')), + '$writefiles' => perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage'), '$bold' => t('Bold'), '$italic' => t('Italic'), '$underline' => t('Underline'), @@ -1587,7 +1587,7 @@ function profile_tabs($a, $is_owner = false, $nickname = null){ 'id' => 'profile-tab', ); } - if ($p['view_photos']) { + if ($p['view_storage']) { $tabs[] = array( 'label' => t('Photos'), 'url' => $a->get_baseurl() . '/photos/' . $nickname, @@ -1595,8 +1595,6 @@ function profile_tabs($a, $is_owner = false, $nickname = null){ 'title' => t('Photo Albums'), 'id' => 'photo-tab', ); - } - if ($p['view_storage']) { $tabs[] = array( 'label' => t('Files'), 'url' => $a->get_baseurl() . '/cloud/' . $nickname . ((get_observer_hash()) ? '' : '?f=&davguest=1'), diff --git a/include/permissions.php b/include/permissions.php index 59c6694d6..a8e761f87 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -25,9 +25,8 @@ function get_perms() { // Read only permissions 'view_stream' => array('channel_r_stream', intval(PERMS_R_STREAM), true, t('Can view my normal stream and posts'), ''), 'view_profile' => array('channel_r_profile', intval(PERMS_R_PROFILE), true, t('Can view my default channel profile'), ''), - 'view_photos' => array('channel_r_photos', intval(PERMS_R_PHOTOS), true, t('Can view my photo albums'), ''), 'view_contacts' => array('channel_r_abook', intval(PERMS_R_ABOOK), true, t('Can view my connections'), ''), - 'view_storage' => array('channel_r_storage', intval(PERMS_R_STORAGE), true, t('Can view my file storage'), ''), + 'view_storage' => array('channel_r_storage', intval(PERMS_R_STORAGE), true, t('Can view my file storage and photos'), ''), 'view_pages' => array('channel_r_pages', intval(PERMS_R_PAGES), true, t('Can view my webpages'), ''), // Write permissions @@ -35,12 +34,11 @@ function get_perms() { 'post_wall' => array('channel_w_wall', intval(PERMS_W_WALL), false, t('Can post on my channel page ("wall")'), ''), 'post_comments' => array('channel_w_comment', intval(PERMS_W_COMMENT), false, t('Can comment on or like my posts'), ''), 'post_mail' => array('channel_w_mail', intval(PERMS_W_MAIL), false, t('Can send me private mail messages'), ''), - 'post_photos' => array('channel_w_photos', intval(PERMS_W_PHOTOS), false, t('Can post photos to my photo albums'), ''), 'post_like' => array('channel_w_like', intval(PERMS_W_LIKE), false, t('Can like/dislike stuff'), t('Profiles and things other than posts/comments')), 'tag_deliver' => array('channel_w_tagwall', intval(PERMS_W_TAGWALL), false, t('Can forward to all my channel contacts via post @mentions'), t('Advanced - useful for creating group forum channels')), 'chat' => array('channel_w_chat', intval(PERMS_W_CHAT), false, t('Can chat with me (when available)'), t('')), - 'write_storage' => array('channel_w_storage', intval(PERMS_W_STORAGE), false, t('Can write to my file storage'), ''), + 'write_storage' => array('channel_w_storage', intval(PERMS_W_STORAGE), false, t('Can write to my file storage and photos'), ''), 'write_pages' => array('channel_w_pages', intval(PERMS_W_PAGES), false, t('Can edit my webpages'), ''), 'republish' => array('channel_a_republish', intval(PERMS_A_REPUBLISH), false, t('Can source my public posts in derived channels'), t('Somewhat advanced - very useful in open communities')), @@ -496,7 +494,6 @@ function site_default_perms() { $typical = array( 'view_stream' => PERMS_PUBLIC, 'view_profile' => PERMS_PUBLIC, - 'view_photos' => PERMS_PUBLIC, 'view_contacts' => PERMS_PUBLIC, 'view_storage' => PERMS_PUBLIC, 'view_pages' => PERMS_PUBLIC, @@ -504,7 +501,6 @@ function site_default_perms() { 'post_wall' => PERMS_SPECIFIC, 'post_comments' => PERMS_SPECIFIC, 'post_mail' => PERMS_SPECIFIC, - 'post_photos' => PERMS_SPECIFIC, 'tag_deliver' => PERMS_SPECIFIC, 'chat' => PERMS_SPECIFIC, 'write_storage' => PERMS_SPECIFIC, @@ -554,22 +550,20 @@ function get_role_perms($role) { $ret['default_collection'] = false; $ret['directory_publish'] = true; $ret['online'] = true; - $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE; - $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE; $ret['channel_r_stream'] = PERMS_PUBLIC; $ret['channel_r_profile'] = PERMS_PUBLIC; - $ret['channel_r_photos'] = PERMS_PUBLIC; $ret['channel_r_abook'] = PERMS_PUBLIC; $ret['channel_w_stream'] = PERMS_SPECIFIC; $ret['channel_w_wall'] = PERMS_SPECIFIC; $ret['channel_w_tagwall'] = PERMS_SPECIFIC; $ret['channel_w_comment'] = PERMS_SPECIFIC; $ret['channel_w_mail'] = PERMS_SPECIFIC; - $ret['channel_w_photos'] = PERMS_SPECIFIC; $ret['channel_w_chat'] = PERMS_SPECIFIC; $ret['channel_a_delegate'] = PERMS_SPECIFIC; $ret['channel_r_storage'] = PERMS_PUBLIC; @@ -586,22 +580,20 @@ function get_role_perms($role) { $ret['default_collection'] = true; $ret['directory_publish'] = true; $ret['online'] = true; - $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; - $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; $ret['channel_r_stream'] = PERMS_PUBLIC; $ret['channel_r_profile'] = PERMS_PUBLIC; - $ret['channel_r_photos'] = PERMS_PUBLIC; $ret['channel_r_abook'] = PERMS_PUBLIC; $ret['channel_w_stream'] = PERMS_SPECIFIC; $ret['channel_w_wall'] = PERMS_SPECIFIC; $ret['channel_w_tagwall'] = PERMS_SPECIFIC; $ret['channel_w_comment'] = PERMS_SPECIFIC; $ret['channel_w_mail'] = PERMS_SPECIFIC; - $ret['channel_w_photos'] = PERMS_SPECIFIC; $ret['channel_w_chat'] = PERMS_SPECIFIC; $ret['channel_a_delegate'] = PERMS_SPECIFIC; $ret['channel_r_storage'] = PERMS_PUBLIC; @@ -618,22 +610,20 @@ function get_role_perms($role) { $ret['default_collection'] = true; $ret['directory_publish'] = false; $ret['online'] = false; - $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; - $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; $ret['channel_r_stream'] = PERMS_PUBLIC; $ret['channel_r_profile'] = PERMS_PUBLIC; - $ret['channel_r_photos'] = PERMS_PUBLIC; $ret['channel_r_abook'] = PERMS_SPECIFIC; $ret['channel_w_stream'] = PERMS_SPECIFIC; $ret['channel_w_wall'] = PERMS_SPECIFIC; $ret['channel_w_tagwall'] = PERMS_SPECIFIC; $ret['channel_w_comment'] = PERMS_SPECIFIC; $ret['channel_w_mail'] = PERMS_SPECIFIC; - $ret['channel_w_photos'] = PERMS_SPECIFIC; $ret['channel_w_chat'] = PERMS_SPECIFIC; $ret['channel_a_delegate'] = PERMS_SPECIFIC; $ret['channel_r_storage'] = PERMS_PUBLIC; @@ -650,22 +640,20 @@ function get_role_perms($role) { $ret['default_collection'] = false; $ret['directory_publish'] = true; $ret['online'] = false; - $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL; - $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL; $ret['channel_r_stream'] = PERMS_PUBLIC; $ret['channel_r_profile'] = PERMS_PUBLIC; - $ret['channel_r_photos'] = PERMS_PUBLIC; $ret['channel_r_abook'] = PERMS_PUBLIC; $ret['channel_w_stream'] = PERMS_SPECIFIC; $ret['channel_w_wall'] = PERMS_SPECIFIC; $ret['channel_w_tagwall'] = PERMS_SPECIFIC; $ret['channel_w_comment'] = PERMS_SPECIFIC; $ret['channel_w_mail'] = PERMS_SPECIFIC; - $ret['channel_w_photos'] = PERMS_SPECIFIC; $ret['channel_w_chat'] = PERMS_SPECIFIC; $ret['channel_a_delegate'] = PERMS_SPECIFIC; $ret['channel_r_storage'] = PERMS_PUBLIC; @@ -682,22 +670,20 @@ function get_role_perms($role) { $ret['default_collection'] = true; $ret['directory_publish'] = true; $ret['online'] = false; - $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE|PERMS_W_TAGWALL; - $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE|PERMS_W_TAGWALL; $ret['channel_r_stream'] = PERMS_PUBLIC; $ret['channel_r_profile'] = PERMS_PUBLIC; - $ret['channel_r_photos'] = PERMS_PUBLIC; $ret['channel_r_abook'] = PERMS_PUBLIC; $ret['channel_w_stream'] = PERMS_SPECIFIC; $ret['channel_w_wall'] = PERMS_SPECIFIC; $ret['channel_w_tagwall'] = PERMS_SPECIFIC; $ret['channel_w_comment'] = PERMS_SPECIFIC; $ret['channel_w_mail'] = PERMS_SPECIFIC; - $ret['channel_w_photos'] = PERMS_SPECIFIC; $ret['channel_w_chat'] = PERMS_SPECIFIC; $ret['channel_a_delegate'] = PERMS_SPECIFIC; $ret['channel_r_storage'] = PERMS_PUBLIC; @@ -714,22 +700,20 @@ function get_role_perms($role) { $ret['default_collection'] = true; $ret['directory_publish'] = false; $ret['online'] = false; - $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; - $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILEPERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; $ret['channel_r_stream'] = PERMS_PUBLIC; $ret['channel_r_profile'] = PERMS_SPECIFIC; - $ret['channel_r_photos'] = PERMS_SPECIFIC; $ret['channel_r_abook'] = PERMS_SPECIFIC; $ret['channel_w_stream'] = PERMS_SPECIFIC; $ret['channel_w_wall'] = PERMS_SPECIFIC; $ret['channel_w_tagwall'] = PERMS_SPECIFIC; $ret['channel_w_comment'] = PERMS_SPECIFIC; $ret['channel_w_mail'] = PERMS_SPECIFIC; - $ret['channel_w_photos'] = PERMS_SPECIFIC; $ret['channel_w_chat'] = PERMS_SPECIFIC; $ret['channel_a_delegate'] = PERMS_SPECIFIC; $ret['channel_r_storage'] = PERMS_SPECIFIC; @@ -746,22 +730,20 @@ function get_role_perms($role) { $ret['default_collection'] = false; $ret['directory_publish'] = true; $ret['online'] = false; - $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE; - $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE; $ret['channel_r_stream'] = PERMS_PUBLIC; $ret['channel_r_profile'] = PERMS_PUBLIC; - $ret['channel_r_photos'] = PERMS_PUBLIC; $ret['channel_r_abook'] = PERMS_PUBLIC; $ret['channel_w_stream'] = PERMS_SPECIFIC; $ret['channel_w_wall'] = PERMS_SPECIFIC; $ret['channel_w_tagwall'] = PERMS_SPECIFIC; $ret['channel_w_comment'] = PERMS_SPECIFIC; $ret['channel_w_mail'] = PERMS_SPECIFIC; - $ret['channel_w_photos'] = PERMS_SPECIFIC; $ret['channel_w_chat'] = PERMS_SPECIFIC; $ret['channel_a_delegate'] = PERMS_SPECIFIC; $ret['channel_r_storage'] = PERMS_PUBLIC; @@ -778,22 +760,20 @@ function get_role_perms($role) { $ret['default_collection'] = true; $ret['directory_publish'] = false; $ret['online'] = false; - $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; - $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_W_LIKE; $ret['channel_r_stream'] = PERMS_PUBLIC; $ret['channel_r_profile'] = PERMS_PUBLIC; - $ret['channel_r_photos'] = PERMS_PUBLIC; $ret['channel_r_abook'] = PERMS_PUBLIC; $ret['channel_w_stream'] = PERMS_SPECIFIC; $ret['channel_w_wall'] = PERMS_SPECIFIC; $ret['channel_w_tagwall'] = PERMS_SPECIFIC; $ret['channel_w_comment'] = PERMS_SPECIFIC; $ret['channel_w_mail'] = PERMS_SPECIFIC; - $ret['channel_w_photos'] = PERMS_SPECIFIC; $ret['channel_w_chat'] = PERMS_SPECIFIC; $ret['channel_a_delegate'] = PERMS_SPECIFIC; $ret['channel_r_storage'] = PERMS_PUBLIC; @@ -810,20 +790,18 @@ function get_role_perms($role) { $ret['default_collection'] = false; $ret['directory_publish'] = true; $ret['online'] = false; - $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE; - $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE; $ret['channel_r_stream'] = PERMS_PUBLIC; $ret['channel_r_profile'] = PERMS_PUBLIC; - $ret['channel_r_photos'] = PERMS_PUBLIC; $ret['channel_r_abook'] = PERMS_PUBLIC; $ret['channel_w_stream'] = PERMS_SPECIFIC; $ret['channel_w_wall'] = PERMS_SPECIFIC; $ret['channel_w_tagwall'] = PERMS_SPECIFIC; $ret['channel_w_comment'] = PERMS_SPECIFIC; $ret['channel_w_mail'] = PERMS_SPECIFIC; - $ret['channel_w_photos'] = PERMS_SPECIFIC; $ret['channel_w_chat'] = PERMS_SPECIFIC; $ret['channel_a_delegate'] = PERMS_SPECIFIC; $ret['channel_r_storage'] = PERMS_PUBLIC; @@ -840,22 +818,20 @@ function get_role_perms($role) { $ret['default_collection'] = false; $ret['directory_publish'] = true; $ret['online'] = false; - $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_W_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL; - $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK + $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_W_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL; $ret['channel_r_stream'] = PERMS_PUBLIC; $ret['channel_r_profile'] = PERMS_PUBLIC; - $ret['channel_r_photos'] = PERMS_PUBLIC; $ret['channel_r_abook'] = PERMS_PUBLIC; $ret['channel_w_stream'] = PERMS_SPECIFIC; $ret['channel_w_wall'] = PERMS_SPECIFIC; $ret['channel_w_tagwall'] = PERMS_SPECIFIC; $ret['channel_w_comment'] = PERMS_SPECIFIC; $ret['channel_w_mail'] = PERMS_SPECIFIC; - $ret['channel_w_photos'] = PERMS_SPECIFIC; $ret['channel_w_chat'] = PERMS_SPECIFIC; $ret['channel_a_delegate'] = PERMS_SPECIFIC; $ret['channel_r_storage'] = PERMS_PUBLIC; diff --git a/include/photos.php b/include/photos.php index 867571f8f..c5ea3971a 100644 --- a/include/photos.php +++ b/include/photos.php @@ -22,7 +22,7 @@ function photo_upload($channel, $observer, $args) { $channel_id = $channel['channel_id']; $account_id = $channel['channel_account_id']; - if(! perm_is_allowed($channel_id, $observer['xchan_hash'], 'post_photos')) { + if(! perm_is_allowed($channel_id, $observer['xchan_hash'], 'write_storage')) { $ret['message'] = t('Permission denied.'); return $ret; } @@ -313,7 +313,7 @@ function photo_upload($channel, $observer, $args) { * * @param array $channel * @param array $observer - * @return bool|array false if no view_photos permission or an array + * @return bool|array false if no view_storage permission or an array * * success (bool) * * albums (array) */ @@ -322,7 +322,7 @@ function photos_albums_list($channel, $observer) { $channel_id = $channel['channel_id']; $observer_xchan = (($observer) ? $observer['xchan_hash'] : ''); - if(! perm_is_allowed($channel_id, $observer_xchan, 'view_photos')) + if(! perm_is_allowed($channel_id, $observer_xchan, 'view_storage')) return false; /** @FIXME create a permissions SQL which works on arbitrary observers and channels, regardless of login or web status */ @@ -378,7 +378,7 @@ function photos_album_widget($channelx,$observer,$albums = null) { '$title' => t('Photo Albums'), '$albums' => $albums['albums'], '$baseurl' => z_root(), - '$upload' => ((perm_is_allowed($channelx['channel_id'],(($observer) ? $observer['xchan_hash'] : ''),'post_photos')) + '$upload' => ((perm_is_allowed($channelx['channel_id'],(($observer) ? $observer['xchan_hash'] : ''),'write_storage')) ? t('Upload New Photos') : '') )); } @@ -399,7 +399,7 @@ function photos_list_photos($channel, $observer, $album = '') { $channel_id = $channel['channel_id']; $observer_xchan = (($observer) ? $observer['xchan_hash'] : ''); - if(! perm_is_allowed($channel_id,$observer_xchan,'view_photos')) + if(! perm_is_allowed($channel_id,$observer_xchan,'view_storage')) return false; $sql_extra = permissions_sql($channel_id); diff --git a/include/widgets.php b/include/widgets.php index c79d2a6c0..6c1df3022 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -604,7 +604,7 @@ function widget_photo_albums($arr) { if(! $a->profile['profile_uid']) return ''; $channelx = channelx_by_n($a->profile['profile_uid']); - if((! $channelx) || (! perm_is_allowed($a->profile['profile_uid'], get_observer_hash(), 'view_photos'))) + if((! $channelx) || (! perm_is_allowed($a->profile['profile_uid'], get_observer_hash(), 'view_storage'))) return ''; require_once('include/photos.php'); diff --git a/mod/editblock.php b/mod/editblock.php index 818dc5ec7..b4d954ef5 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -137,7 +137,7 @@ function editblock_content(&$a) { '$underline' => t('Underline'), '$quote' => t('Quote'), '$code' => t('Code'), - '$writefiles' => (perm_is_allowed($owner, get_observer_hash(), 'post_photos') || perm_is_allowed($owner, get_observer_hash(), 'write_storage')), + '$writefiles' => perm_is_allowed($owner, get_observer_hash(), 'write_storage'), '$upload' => t('Upload photo'), '$attach' => t('Attach file'), '$weblink' => t('Insert web link'), diff --git a/mod/editwebpage.php b/mod/editwebpage.php index 3b0b543a6..974e8cc38 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -165,15 +165,12 @@ function editwebpage_content(&$a) { $rp = 'webpages/' . $which; - logger('canwrite: ' . (perm_is_allowed($owner, get_observer_hash(), 'post_photos') || perm_is_allowed($owner, get_observer_hash(), 'write_storage'))); - $editor = replace_macros($tpl,array( '$return_path' => $rp, '$webpage' => ITEM_TYPE_WEBPAGE, '$placeholdpagetitle' => t('Page link title'), '$pagetitle' => $page_title, - '$writefiles' => (perm_is_allowed($owner, get_observer_hash(), 'post_photos') || perm_is_allowed($owner, get_observer_hash(), 'write_storage')), - + '$writefiles' => perm_is_allowed($owner, get_observer_hash(), 'write_storage'), '$action' => 'item', '$share' => t('Edit'), '$bold' => t('Bold'), diff --git a/mod/photo.php b/mod/photo.php index 2e16fc1d9..e8cd95f1c 100644 --- a/mod/photo.php +++ b/mod/photo.php @@ -123,7 +123,7 @@ function photo_init(&$a) { ); if($r) { - $allowed = (($r[0]['uid']) ? perm_is_allowed($r[0]['uid'],$observer_xchan,'view_photos') : true); + $allowed = (($r[0]['uid']) ? perm_is_allowed($r[0]['uid'],$observer_xchan,'view_storage') : true); $sql_extra = permissions_sql($r[0]['uid']); diff --git a/mod/photos.php b/mod/photos.php index c65c87c27..b65218e94 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -63,7 +63,7 @@ function photos_post(&$a) { $page_owner_uid = $a->data['channel']['channel_id']; - if(perm_is_allowed($page_owner_uid,get_observer_hash(),'post_photos')) + if(perm_is_allowed($page_owner_uid,get_observer_hash(),'write_storage')) $can_post = true; if(! $can_post) { @@ -495,8 +495,8 @@ function photos_content(&$a) { $observer = $a->get_observer(); - $can_post = perm_is_allowed($owner_uid,$observer['xchan_hash'],'post_photos'); - $can_view = perm_is_allowed($owner_uid,$observer['xchan_hash'],'view_photos'); + $can_post = perm_is_allowed($owner_uid,$observer['xchan_hash'],'write_storage'); + $can_view = perm_is_allowed($owner_uid,$observer['xchan_hash'],'view_storage'); if(! $can_view) { notice( t('Access to this item is restricted.') . EOL); diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js index d6cc42175..84fff5ed1 100644 --- a/view/js/mod_connedit.js +++ b/view/js/mod_connedit.js @@ -25,7 +25,6 @@ function connectFullShare() { }); $('#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'); diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js index 5dac96940..e28a18b9f 100644 --- a/view/js/mod_settings.js +++ b/view/js/mod_settings.js @@ -46,7 +46,6 @@ function channel_privacy_macro(n) { if(n == 0) { $('#id_view_stream option').eq(0).attr('selected','selected'); $('#id_view_profile option').eq(0).attr('selected','selected'); - $('#id_view_photos option').eq(0).attr('selected','selected'); $('#id_view_contacts option').eq(0).attr('selected','selected'); $('#id_view_storage option').eq(0).attr('selected','selected'); $('#id_view_pages option').eq(0).attr('selected','selected'); @@ -54,7 +53,6 @@ function channel_privacy_macro(n) { $('#id_post_wall option').eq(0).attr('selected','selected'); $('#id_post_comments option').eq(0).attr('selected','selected'); $('#id_post_mail option').eq(0).attr('selected','selected'); - $('#id_post_photos option').eq(0).attr('selected','selected'); $('#id_tag_deliver option').eq(0).attr('selected','selected'); $('#id_chat option').eq(0).attr('selected','selected'); $('#id_write_storage option').eq(0).attr('selected','selected'); @@ -69,7 +67,6 @@ function channel_privacy_macro(n) { if(n == 1) { $('#id_view_stream option').eq(1).attr('selected','selected'); $('#id_view_profile option').eq(1).attr('selected','selected'); - $('#id_view_photos option').eq(1).attr('selected','selected'); $('#id_view_contacts option').eq(1).attr('selected','selected'); $('#id_view_storage option').eq(1).attr('selected','selected'); $('#id_view_pages option').eq(1).attr('selected','selected'); @@ -77,7 +74,6 @@ function channel_privacy_macro(n) { $('#id_post_wall option').eq(1).attr('selected','selected'); $('#id_post_comments option').eq(1).attr('selected','selected'); $('#id_post_mail option').eq(1).attr('selected','selected'); - $('#id_post_photos option').eq(1).attr('selected','selected'); $('#id_tag_deliver option').eq(1).attr('selected','selected'); $('#id_chat option').eq(1).attr('selected','selected'); $('#id_write_storage option').eq(1).attr('selected','selected'); @@ -92,7 +88,6 @@ function channel_privacy_macro(n) { if(n == 2) { $('#id_view_stream option').eq(7).attr('selected','selected'); $('#id_view_profile option').eq(7).attr('selected','selected'); - $('#id_view_photos option').eq(7).attr('selected','selected'); $('#id_view_contacts option').eq(7).attr('selected','selected'); $('#id_view_storage option').eq(7).attr('selected','selected'); $('#id_view_pages option').eq(7).attr('selected','selected'); @@ -100,7 +95,6 @@ function channel_privacy_macro(n) { $('#id_post_wall option').eq(1).attr('selected','selected'); $('#id_post_comments option').eq(2).attr('selected','selected'); $('#id_post_mail option').eq(1).attr('selected','selected'); - $('#id_post_photos option').eq(0).attr('selected','selected'); $('#id_tag_deliver option').eq(1).attr('selected','selected'); $('#id_chat option').eq(1).attr('selected','selected'); $('#id_write_storage option').eq(0).attr('selected','selected'); @@ -115,7 +109,6 @@ function channel_privacy_macro(n) { if(n == 3) { $('#id_view_stream option').eq(7).attr('selected','selected'); $('#id_view_profile option').eq(7).attr('selected','selected'); - $('#id_view_photos option').eq(7).attr('selected','selected'); $('#id_view_contacts option').eq(7).attr('selected','selected'); $('#id_view_storage option').eq(7).attr('selected','selected'); $('#id_view_pages option').eq(7).attr('selected','selected'); @@ -123,7 +116,6 @@ function channel_privacy_macro(n) { $('#id_post_wall option').eq(5).attr('selected','selected'); $('#id_post_comments option').eq(5).attr('selected','selected'); $('#id_post_mail option').eq(5).attr('selected','selected'); - $('#id_post_photos option').eq(2).attr('selected','selected'); $('#id_tag_deliver option').eq(1).attr('selected','selected'); $('#id_chat option').eq(5).attr('selected','selected'); $('#id_write_storage option').eq(2).attr('selected','selected'); -- cgit v1.2.3 From fd8e6f313088f124cdd80387e1a1c7887f0c7300 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 19 Jul 2015 21:04:02 -0700 Subject: typo --- include/zot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/zot.php b/include/zot.php index b8954f2ad..89d6c6616 100644 --- a/include/zot.php +++ b/include/zot.php @@ -566,7 +566,7 @@ function zot_gethub($arr) { } /** - * @brief Registers an unknown hup. + * @brief Registers an unknown hub. * * A communication has been received which has an unknown (to us) sender. * Perform discovery based on our calculated hash of the sender at the -- cgit v1.2.3 From 24ec104819bbc3778a159ea4790398988a6e2fd7 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 19 Jul 2015 21:18:13 -0700 Subject: silence warning about non array diaspora_meta but report it in the logs so we can find out what it actually is and why. --- include/items.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index d24dbed9f..af57e3eda 100755 --- a/include/items.php +++ b/include/items.php @@ -1282,10 +1282,12 @@ function encode_item($item,$mirror = false) { if($item['diaspora_meta']) { $z = json_decode($item['diaspora_meta'],true); if($z) { - if(array_key_exists('iv',$z)) + if(is_array($z) && array_key_exists('iv',$z)) $x['diaspora_signature'] = crypto_unencapsulate($z,$key); else $x['diaspora_signature'] = $z; + if(! is_array($z)) + logger('encode_item: diaspora meta is not an array: ' . print_r($z,true)); } } logger('encode_item: ' . print_r($x,true), LOGGER_DATA); -- cgit v1.2.3 From 6645846ad30ed0689d5e2848f9ae337bf8f28219 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 20 Jul 2015 02:04:51 -0700 Subject: allow per-connection content filter to specify a detected language to include/exclude (in addition to text, tags, and regexes) --- include/items.php | 6 ++++++ version.inc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 054008d58..a460c8fd2 100755 --- a/include/items.php +++ b/include/items.php @@ -3381,6 +3381,8 @@ function post_is_importable($item,$abook) { $text = prepare_text($item['body'],$item['mimetype']); $text = html2plain($text); + $lang = detect_language($text); + $tags = ((count($item['term'])) ? $item['term'] : false); // exclude always has priority @@ -3397,6 +3399,8 @@ function post_is_importable($item,$abook) { } elseif((strpos($word,'/') === 0) && preg_match($word,$body)) return false; + elseif((strpos($word,'lang=') === 0) && ($lang) && (stricmp($lang,trim(substr($word,5))) == 0)) + return false; elseif(stristr($text,$word) !== false) return false; } @@ -3414,6 +3418,8 @@ function post_is_importable($item,$abook) { } elseif((strpos($word,'/') === 0) && preg_match($word,$body)) return true; + elseif((strpos($word,'lang=') === 0) && ($lang) && (stricmp($lang,trim(substr($word,5))) == 0)) + return true; elseif(stristr($text,$word) !== false) return true; } diff --git a/version.inc b/version.inc index 249734f42..3548f0180 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-07-19.1098 +2015-07-20.1099 -- cgit v1.2.3 From 464625cd9107a82785bca40eb771a5c1149d8f2d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Jul 2015 15:03:55 +0200 Subject: show icons instead of disabled checkboxes --- view/tpl/field_acheckbox.tpl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index f96fd5fd6..e99128bbb 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -5,11 +5,16 @@ {{if $notself}}
{{/if}}
-
+
{{$field.6}} 		- + - {{if $field.5}}{{$inherited}}{{/if}} + {{if $field.5}}{{$inherited}}{{if $self}}{{if $field.7}} {{else}} {{/if}}{{/if}}{{/if}}
- + {{if $field.2}}{{else}}{{/if}} - + {{if $self || !$field.5}} + + {{/if}} + {{if $notself && $field.5}} + {{if $field.3}}{{else}}{{/if}} + {{/if}} {{if $field.5}}{{$inherited}}{{if $self}}{{if $field.7}} {{else}} {{/if}}{{/if}}{{/if}} -- cgit v1.2.3 From 4d45bc9da185c4c8f558b07f8020dce8171fb957 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Jul 2015 21:01:11 +0200 Subject: Fixes regarding the new default profile photo size. The default profile photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format. --- images/default_profile_photos/alpha/175.png | Bin 3817 -> 0 bytes images/default_profile_photos/alpha/300.png | Bin 0 -> 3817 bytes images/default_profile_photos/black_avatar_1/175.png | Bin 6420 -> 0 bytes images/default_profile_photos/black_avatar_1/300.png | Bin 0 -> 6420 bytes images/default_profile_photos/black_avatar_2/175.png | Bin 5802 -> 0 bytes images/default_profile_photos/black_avatar_2/300.png | Bin 0 -> 5802 bytes images/default_profile_photos/blank/175.jpg | Bin 910 -> 0 bytes images/default_profile_photos/blank/175.png | Bin 3817 -> 0 bytes images/default_profile_photos/blank/300.jpg | Bin 0 -> 910 bytes images/default_profile_photos/blank/300.png | Bin 0 -> 3817 bytes images/default_profile_photos/rainbow_man/175.jpg | Bin 8510 -> 0 bytes images/default_profile_photos/rainbow_man/175.png | Bin 57998 -> 0 bytes images/default_profile_photos/rainbow_man/300.jpg | Bin 0 -> 8510 bytes images/default_profile_photos/rainbow_man/300.png | Bin 0 -> 57998 bytes images/default_profile_photos/rainbow_man_trans/175.png | Bin 71198 -> 0 bytes images/default_profile_photos/rainbow_man_trans/300.png | Bin 0 -> 71198 bytes images/default_profile_photos/red_avatar/175.png | Bin 4621 -> 0 bytes images/default_profile_photos/red_avatar/300.png | Bin 0 -> 4621 bytes images/default_profile_photos/red_koala/175.jpg | Bin 22969 -> 0 bytes images/default_profile_photos/red_koala/175.png | Bin 20722 -> 0 bytes images/default_profile_photos/red_koala/300.jpg | Bin 0 -> 22969 bytes images/default_profile_photos/red_koala/300.png | Bin 0 -> 20722 bytes images/default_profile_photos/red_koala_trans/175.png | Bin 25546 -> 0 bytes images/default_profile_photos/red_koala_trans/300.png | Bin 0 -> 25546 bytes .../redmatrix_logo_smiley/175.png | Bin 3834 -> 0 bytes .../redmatrix_logo_smiley/300.png | Bin 0 -> 3834 bytes include/identity.php | 4 ++-- include/network.php | 4 ++-- include/photo/photo_driver.php | 8 ++++---- view/tpl/profile_vcard.tpl | 2 +- 30 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 images/default_profile_photos/alpha/175.png create mode 100644 images/default_profile_photos/alpha/300.png delete mode 100644 images/default_profile_photos/black_avatar_1/175.png create mode 100644 images/default_profile_photos/black_avatar_1/300.png delete mode 100644 images/default_profile_photos/black_avatar_2/175.png create mode 100644 images/default_profile_photos/black_avatar_2/300.png delete mode 100644 images/default_profile_photos/blank/175.jpg delete mode 100644 images/default_profile_photos/blank/175.png create mode 100644 images/default_profile_photos/blank/300.jpg create mode 100644 images/default_profile_photos/blank/300.png delete mode 100644 images/default_profile_photos/rainbow_man/175.jpg delete mode 100644 images/default_profile_photos/rainbow_man/175.png create mode 100644 images/default_profile_photos/rainbow_man/300.jpg create mode 100644 images/default_profile_photos/rainbow_man/300.png delete mode 100644 images/default_profile_photos/rainbow_man_trans/175.png create mode 100644 images/default_profile_photos/rainbow_man_trans/300.png delete mode 100644 images/default_profile_photos/red_avatar/175.png create mode 100644 images/default_profile_photos/red_avatar/300.png delete mode 100644 images/default_profile_photos/red_koala/175.jpg delete mode 100644 images/default_profile_photos/red_koala/175.png create mode 100644 images/default_profile_photos/red_koala/300.jpg create mode 100644 images/default_profile_photos/red_koala/300.png delete mode 100644 images/default_profile_photos/red_koala_trans/175.png create mode 100644 images/default_profile_photos/red_koala_trans/300.png delete mode 100644 images/default_profile_photos/redmatrix_logo_smiley/175.png create mode 100644 images/default_profile_photos/redmatrix_logo_smiley/300.png diff --git a/images/default_profile_photos/alpha/175.png b/images/default_profile_photos/alpha/175.png deleted file mode 100644 index 17211ee27..000000000 Binary files a/images/default_profile_photos/alpha/175.png and /dev/null differ diff --git a/images/default_profile_photos/alpha/300.png b/images/default_profile_photos/alpha/300.png new file mode 100644 index 000000000..17211ee27 Binary files /dev/null and b/images/default_profile_photos/alpha/300.png differ diff --git a/images/default_profile_photos/black_avatar_1/175.png b/images/default_profile_photos/black_avatar_1/175.png deleted file mode 100644 index bc5b19793..000000000 Binary files a/images/default_profile_photos/black_avatar_1/175.png and /dev/null differ diff --git a/images/default_profile_photos/black_avatar_1/300.png b/images/default_profile_photos/black_avatar_1/300.png new file mode 100644 index 000000000..bc5b19793 Binary files /dev/null and b/images/default_profile_photos/black_avatar_1/300.png differ diff --git a/images/default_profile_photos/black_avatar_2/175.png b/images/default_profile_photos/black_avatar_2/175.png deleted file mode 100644 index 8ff3cbd4c..000000000 Binary files a/images/default_profile_photos/black_avatar_2/175.png and /dev/null differ diff --git a/images/default_profile_photos/black_avatar_2/300.png b/images/default_profile_photos/black_avatar_2/300.png new file mode 100644 index 000000000..8ff3cbd4c Binary files /dev/null and b/images/default_profile_photos/black_avatar_2/300.png differ diff --git a/images/default_profile_photos/blank/175.jpg b/images/default_profile_photos/blank/175.jpg deleted file mode 100644 index 4024d6e88..000000000 Binary files a/images/default_profile_photos/blank/175.jpg and /dev/null differ diff --git a/images/default_profile_photos/blank/175.png b/images/default_profile_photos/blank/175.png deleted file mode 100644 index 1edb25b76..000000000 Binary files a/images/default_profile_photos/blank/175.png and /dev/null differ diff --git a/images/default_profile_photos/blank/300.jpg b/images/default_profile_photos/blank/300.jpg new file mode 100644 index 000000000..4024d6e88 Binary files /dev/null and b/images/default_profile_photos/blank/300.jpg differ diff --git a/images/default_profile_photos/blank/300.png b/images/default_profile_photos/blank/300.png new file mode 100644 index 000000000..1edb25b76 Binary files /dev/null and b/images/default_profile_photos/blank/300.png differ diff --git a/images/default_profile_photos/rainbow_man/175.jpg b/images/default_profile_photos/rainbow_man/175.jpg deleted file mode 100644 index fc0ec3d77..000000000 Binary files a/images/default_profile_photos/rainbow_man/175.jpg and /dev/null differ diff --git a/images/default_profile_photos/rainbow_man/175.png b/images/default_profile_photos/rainbow_man/175.png deleted file mode 100644 index 30a7e0ffb..000000000 Binary files a/images/default_profile_photos/rainbow_man/175.png and /dev/null differ diff --git a/images/default_profile_photos/rainbow_man/300.jpg b/images/default_profile_photos/rainbow_man/300.jpg new file mode 100644 index 000000000..fc0ec3d77 Binary files /dev/null and b/images/default_profile_photos/rainbow_man/300.jpg differ diff --git a/images/default_profile_photos/rainbow_man/300.png b/images/default_profile_photos/rainbow_man/300.png new file mode 100644 index 000000000..30a7e0ffb Binary files /dev/null and b/images/default_profile_photos/rainbow_man/300.png differ diff --git a/images/default_profile_photos/rainbow_man_trans/175.png b/images/default_profile_photos/rainbow_man_trans/175.png deleted file mode 100644 index a0a236841..000000000 Binary files a/images/default_profile_photos/rainbow_man_trans/175.png and /dev/null differ diff --git a/images/default_profile_photos/rainbow_man_trans/300.png b/images/default_profile_photos/rainbow_man_trans/300.png new file mode 100644 index 000000000..a0a236841 Binary files /dev/null and b/images/default_profile_photos/rainbow_man_trans/300.png differ diff --git a/images/default_profile_photos/red_avatar/175.png b/images/default_profile_photos/red_avatar/175.png deleted file mode 100644 index 31d39a41a..000000000 Binary files a/images/default_profile_photos/red_avatar/175.png and /dev/null differ diff --git a/images/default_profile_photos/red_avatar/300.png b/images/default_profile_photos/red_avatar/300.png new file mode 100644 index 000000000..31d39a41a Binary files /dev/null and b/images/default_profile_photos/red_avatar/300.png differ diff --git a/images/default_profile_photos/red_koala/175.jpg b/images/default_profile_photos/red_koala/175.jpg deleted file mode 100644 index e49343b1d..000000000 Binary files a/images/default_profile_photos/red_koala/175.jpg and /dev/null differ diff --git a/images/default_profile_photos/red_koala/175.png b/images/default_profile_photos/red_koala/175.png deleted file mode 100644 index ee4a701d9..000000000 Binary files a/images/default_profile_photos/red_koala/175.png and /dev/null differ diff --git a/images/default_profile_photos/red_koala/300.jpg b/images/default_profile_photos/red_koala/300.jpg new file mode 100644 index 000000000..e49343b1d Binary files /dev/null and b/images/default_profile_photos/red_koala/300.jpg differ diff --git a/images/default_profile_photos/red_koala/300.png b/images/default_profile_photos/red_koala/300.png new file mode 100644 index 000000000..ee4a701d9 Binary files /dev/null and b/images/default_profile_photos/red_koala/300.png differ diff --git a/images/default_profile_photos/red_koala_trans/175.png b/images/default_profile_photos/red_koala_trans/175.png deleted file mode 100644 index 4e51c80e2..000000000 Binary files a/images/default_profile_photos/red_koala_trans/175.png and /dev/null differ diff --git a/images/default_profile_photos/red_koala_trans/300.png b/images/default_profile_photos/red_koala_trans/300.png new file mode 100644 index 000000000..4e51c80e2 Binary files /dev/null and b/images/default_profile_photos/red_koala_trans/300.png differ diff --git a/images/default_profile_photos/redmatrix_logo_smiley/175.png b/images/default_profile_photos/redmatrix_logo_smiley/175.png deleted file mode 100644 index 7299c4494..000000000 Binary files a/images/default_profile_photos/redmatrix_logo_smiley/175.png and /dev/null differ diff --git a/images/default_profile_photos/redmatrix_logo_smiley/300.png b/images/default_profile_photos/redmatrix_logo_smiley/300.png new file mode 100644 index 000000000..7299c4494 Binary files /dev/null and b/images/default_profile_photos/redmatrix_logo_smiley/300.png differ diff --git a/include/identity.php b/include/identity.php index 3925c3537..5a3861b31 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1393,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/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/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 9eac48c6d..bea0d894f 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,5 +1,5 @@
-
{{$profile.name}}
+
{{$profile.name}}
{{if $profile.edit}}
-- cgit v1.2.3 From 9495d2c7014b7e8a943ecf72798c40bce9a10a96 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 20 Jul 2015 17:13:47 -0700 Subject: indicate where progress has been made --- doc/roadmap.bb | 20 ++++++++++++-------- doc/to_do_code.bb | 16 ++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) 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] -- cgit v1.2.3 From d87c7ceeb03a348526cd2f8bb5643b13a1860b40 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 20 Jul 2015 19:33:42 -0700 Subject: there is no stricmp() in php, use strcasecmp() - also only detect language if we plan to use it. --- include/items.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/items.php b/include/items.php index a460c8fd2..5e84944a4 100755 --- a/include/items.php +++ b/include/items.php @@ -3381,7 +3381,10 @@ function post_is_importable($item,$abook) { $text = prepare_text($item['body'],$item['mimetype']); $text = html2plain($text); - $lang = detect_language($text); + $lang = null; + + if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_incl'],'lang=') !== false)) + $lang = detect_language($text); $tags = ((count($item['term'])) ? $item['term'] : false); @@ -3399,7 +3402,7 @@ function post_is_importable($item,$abook) { } elseif((strpos($word,'/') === 0) && preg_match($word,$body)) return false; - elseif((strpos($word,'lang=') === 0) && ($lang) && (stricmp($lang,trim(substr($word,5))) == 0)) + elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0)) return false; elseif(stristr($text,$word) !== false) return false; @@ -3418,7 +3421,7 @@ function post_is_importable($item,$abook) { } elseif((strpos($word,'/') === 0) && preg_match($word,$body)) return true; - elseif((strpos($word,'lang=') === 0) && ($lang) && (stricmp($lang,trim(substr($word,5))) == 0)) + elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0)) return true; elseif(stristr($text,$word) !== false) return true; -- cgit v1.2.3 From db9a0282c4a5b9efba2beb194f6551082c315ea9 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 20 Jul 2015 21:28:33 -0700 Subject: provide content-disposition for exported ics file --- mod/events.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/events.php b/mod/events.php index 289ddfb15..fa00970b4 100755 --- a/mod/events.php +++ b/mod/events.php @@ -450,6 +450,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(); } -- cgit v1.2.3 From 3ec6a431b62c20952f07f889acfeedd0ac456d04 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 21 Jul 2015 17:07:16 -0700 Subject: ics calendar export - commas need to be escaped --- include/event.php | 2 +- version.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/event.php b/include/event.php index 0b1e56ae2..db604cc6a 100644 --- a/include/event.php +++ b/include/event.php @@ -100,7 +100,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)); } diff --git a/version.inc b/version.inc index 3548f0180..4b4237878 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-07-20.1099 +2015-07-21.1100 -- cgit v1.2.3 From 5c52120fb4a320d71dd2d7b1967d824848c04120 Mon Sep 17 00:00:00 2001 From: zottel Date: Wed, 22 Jul 2015 09:34:32 +0200 Subject: make content filter by language work for excludes --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 5e84944a4..fdcae3a6c 100755 --- a/include/items.php +++ b/include/items.php @@ -3383,7 +3383,7 @@ function post_is_importable($item,$abook) { $lang = null; - if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_incl'],'lang=') !== false)) + if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_excl'],'lang=') !== false)) $lang = detect_language($text); $tags = ((count($item['term'])) ? $item['term'] : false); -- cgit v1.2.3 From c0e67db070ae562f8e717a12faf5df9ecd7160d6 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 22 Jul 2015 18:57:48 -0700 Subject: refresh diaspora xchan every month or so since receiving profile update messages from that network reliably are just as unlikely as receiving any other kind of message from that network reliably. The problem is that if somebody changes their profile name or photo once every few years and you miss it because of their shitty unreliable communications, your data could be stale for a long time. --- include/diaspora.php | 14 ++++++++++++-- include/items.php | 4 ++++ include/network.php | 22 ++++++++++++++++++++-- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index d59da6fff..187793d2b 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -329,6 +329,7 @@ function diaspora_get_contact_by_handle($uid,$handle) { function find_diaspora_person_by_handle($handle) { $person = false; + $refresh = false; if(diaspora_is_blacklisted($handle)) return false; @@ -339,9 +340,13 @@ function find_diaspora_person_by_handle($handle) { if($r) { $person = $r[0]; logger('find_diaspora_person_by handle: in cache ' . print_r($r,true), LOGGER_DATA); + if($person['xchan_name_date'] < datetime_convert('UTC','UTC', 'now - 1 month')) { + logger('Updating Diaspora cached record for ' . $handle); + $refresh = true; + } } - if(! $person) { + if((! $person) || ($refresh)) { // try webfinger. Make sure to distinguish between diaspora, // hubzilla w/diaspora protocol and friendica w/diaspora protocol. @@ -349,7 +354,7 @@ function find_diaspora_person_by_handle($handle) { $result = discover_by_webbie($handle); if($result) { $r = q("select * from xchan where xchan_addr = '%s' limit 1", - dbesc($handle) + dbesc(str_replace('acct:','',$handle)) ); if($r) { $person = $r[0]; @@ -1003,6 +1008,11 @@ function diaspora_post($importer,$xml,$msg) { return 202; } + if(! is_importable($datarray,$contact)) { + logger('diaspora_post: filtering this author.'); + return 202; + } + $result = item_store($datarray); return; diff --git a/include/items.php b/include/items.php index af76fe203..9a2c8d5da 100755 --- a/include/items.php +++ b/include/items.php @@ -3766,6 +3766,10 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { $author['owner_avatar'] = $contact['thumb']; } + if(! 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 5173bc3d0..5d01b7eba 100644 --- a/include/network.php +++ b/include/network.php @@ -1135,9 +1135,27 @@ function discover_by_webbie($webbie) { } $r = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($webbie) + dbesc($addr) ); - if(! $r) { + + /** + * + * Diaspora communications are notoriously unreliable and receiving profile update messages (indeed any messages) + * are pretty much random luck. We'll check the timestamp of the xchan_name_date at a higher level and refresh + * this record once a month; because if you miss a profile update message and they update their profile photo or name + * you're otherwise stuck with stale info until they change their profile again - which could be years from now. + * + */ + + if($r) { + $r = q("update xchan set xchan_name = '%s', xchan_network = '%s', xchan_name_date = '%s' where xchan_hash = '%s' limit 1", + dbesc($vcard['fn']), + dbesc($network), + dbesc(datetime_convert()), + dbesc($addr) + ); + } + else { $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_pubkey, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_instance_url, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", dbesc($addr), -- cgit v1.2.3 From 27fa908233640eed51072fe77e7a9658a331ba20 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 23 Jul 2015 18:49:37 -0700 Subject: patch to allow theme based widgets --- boot.php | 1 - include/comanche.php | 5 +++++ include/diaspora.php | 1 - include/zot.php | 3 ++- version.inc | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index eb678853d..53a3aebee 100755 --- a/boot.php +++ b/boot.php @@ -2051,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/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/diaspora.php b/include/diaspora.php index cf8d89023..79d3909ca 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1009,7 +1009,6 @@ function diaspora_post($importer,$xml,$msg) { return 202; } - $result = item_store($datarray); return; diff --git a/include/zot.php b/include/zot.php index 95de349fe..a677da808 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1277,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'])) { diff --git a/version.inc b/version.inc index 4b4237878..73b533b5e 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-07-21.1100 +2015-07-23.1102 -- cgit v1.2.3 From 908da4589dc4961c07d049c97bcfd59bc2973c89 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 23 Jul 2015 21:02:41 -0700 Subject: event privacy issue --- mod/events.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mod/events.php b/mod/events.php index fa00970b4..a3540ab0a 100755 --- a/mod/events.php +++ b/mod/events.php @@ -148,10 +148,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; } } -- cgit v1.2.3 From a3de9f9e41216c26fce677822d4531b7ac135c45 Mon Sep 17 00:00:00 2001 From: Alexandre Hannud Abdo Date: Fri, 24 Jul 2015 22:37:09 -0300 Subject: update pt-br strings --- view/pt-br/messages.po | 9571 ++++++++++++++++++++++++------------------------ view/pt-br/strings.php | 1022 +++--- 2 files changed, 5367 insertions(+), 5226 deletions(-) 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 \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/red-matrix/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -34,517 +34,235 @@ 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/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:360 -msgid "last" -msgstr "último" +#: ../../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:363 -msgid "next" -msgstr "próximo" +#: ../../include/diaspora.php:2115 ../../include/text.php:1894 +#: ../../include/conversation.php:148 ../../mod/like.php:346 +#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 +msgid "status" +msgstr "status" -#: ../../include/text.php:373 -msgid "older" -msgstr "mais antigo" +#: ../../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:375 -msgid "newer" -msgstr "mais recente" +#: ../../include/diaspora.php:2490 +msgid "Please choose" +msgstr "Por favor, escolha" -#: ../../include/text.php:768 -msgid "No connections" -msgstr "Nenhuma conexão" +#: ../../include/diaspora.php:2492 +msgid "Agree" +msgstr "Concordo" -#: ../../include/text.php:782 -#, php-format -msgid "%d Connection" -msgid_plural "%d Connections" -msgstr[0] "%d conexão" -msgstr[1] "%d conexões" +#: ../../include/diaspora.php:2494 +msgid "Disagree" +msgstr "Discordo" -#: ../../include/text.php:795 ../../mod/viewconnections.php:104 -msgid "View Connections" -msgstr "Ver conexões" +#: ../../include/diaspora.php:2496 +msgid "Abstain" +msgstr "Abstenho" -#: ../../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/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: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/contact_selectors.php:56 +msgid "Frequently" +msgstr "Frequentemente" -#: ../../include/text.php:928 -msgid "poke" -msgstr "cutucar" +#: ../../include/contact_selectors.php:57 +msgid "Hourly" +msgstr "De hora em hora" -#: ../../include/text.php:928 ../../include/conversation.php:243 -msgid "poked" -msgstr "cutucado" +#: ../../include/contact_selectors.php:58 +msgid "Twice daily" +msgstr "Duas vezes ao dia" -#: ../../include/text.php:929 -msgid "ping" -msgstr "pingar" +#: ../../include/contact_selectors.php:59 +msgid "Daily" +msgstr "Diariamente" -#: ../../include/text.php:929 -msgid "pinged" -msgstr "pingou" +#: ../../include/contact_selectors.php:60 +msgid "Weekly" +msgstr "Semanalmente" -#: ../../include/text.php:930 -msgid "prod" -msgstr "espetar" +#: ../../include/contact_selectors.php:61 +msgid "Monthly" +msgstr "Mensalmente" -#: ../../include/text.php:930 -msgid "prodded" -msgstr "espetou" +#: ../../include/contact_selectors.php:76 +msgid "Friendica" +msgstr "Friendica" -#: ../../include/text.php:931 -msgid "slap" -msgstr "estapear" +#: ../../include/contact_selectors.php:77 +msgid "OStatus" +msgstr "OStatus" -#: ../../include/text.php:931 -msgid "slapped" -msgstr "estapeou" +#: ../../include/contact_selectors.php:78 +msgid "RSS/Atom" +msgstr "RSS/Atom" -#: ../../include/text.php:932 -msgid "finger" -msgstr "dar um toque" +#: ../../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/text.php:932 -msgid "fingered" -msgstr "deu um toque" +#: ../../include/contact_selectors.php:80 +msgid "Diaspora" +msgstr "Diaspora" -#: ../../include/text.php:933 -msgid "rebuff" -msgstr "rebater" +#: ../../include/contact_selectors.php:81 +msgid "Facebook" +msgstr "Facebook" -#: ../../include/text.php:933 -msgid "rebuffed" -msgstr "rebateu" +#: ../../include/contact_selectors.php:82 +msgid "Zot!" +msgstr "Zot!" -#: ../../include/text.php:943 -msgid "happy" -msgstr "feliz" +#: ../../include/contact_selectors.php:83 +msgid "LinkedIn" +msgstr "LinkedIn" -#: ../../include/text.php:944 -msgid "sad" -msgstr "triste" +#: ../../include/contact_selectors.php:84 +msgid "XMPP/IM" +msgstr "XMPP/MI" -#: ../../include/text.php:945 -msgid "mellow" -msgstr "suave" +#: ../../include/contact_selectors.php:85 +msgid "MySpace" +msgstr "MySpace" -#: ../../include/text.php:946 -msgid "tired" -msgstr "cansad@" +#: ../../include/notify.php:23 +msgid "created a new post" +msgstr "criou uma nova publicação" -#: ../../include/text.php:947 -msgid "perky" -msgstr "animad@" +#: ../../include/notify.php:24 +#, php-format +msgid "commented on %s's post" +msgstr "comentou a publicação de %s" -#: ../../include/text.php:948 -msgid "angry" -msgstr "nervos@" +#: ../../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/text.php:949 -msgid "stupified" -msgstr "embasbacad@" +#: ../../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/text.php:950 -msgid "puzzled" -msgstr "confus@" +#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504 +msgid "Import completed." +msgstr "A importação foi completada." -#: ../../include/text.php:951 -msgid "interested" -msgstr "interessad@" +#: ../../include/group.php:26 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"may apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." +msgstr "Um grupo com esse nome, anteriormente excluído, foi reativado. Permissões de itens já existentes poderão 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." -#: ../../include/text.php:952 -msgid "bitter" -msgstr "amarg@" +#: ../../include/group.php:235 +msgid "Default privacy group for new contacts" +msgstr "Grupo de privacidade padrão para novos contatos" -#: ../../include/text.php:953 -msgid "cheerful" -msgstr "animad@" +#: ../../include/group.php:254 ../../mod/admin.php:831 +msgid "All Channels" +msgstr "Todos os canais" -#: ../../include/text.php:954 -msgid "alive" -msgstr "viv@" +#: ../../include/group.php:276 +msgid "edit" +msgstr "editar" -#: ../../include/text.php:955 -msgid "annoyed" -msgstr "aborrecid@" +#: ../../include/group.php:298 +msgid "Collections" +msgstr "Coleções" -#: ../../include/text.php:956 -msgid "anxious" -msgstr "ansios@" +#: ../../include/group.php:299 +msgid "Edit collection" +msgstr "Editar coleção" -#: ../../include/text.php:957 -msgid "cranky" -msgstr "irritad@" +#: ../../include/group.php:300 +msgid "Add new collection" +msgstr "Adicionar nova coleção" -#: ../../include/text.php:958 -msgid "disturbed" -msgstr "perturbad@" +#: ../../include/group.php:301 +msgid "Channels not in any collection" +msgstr "Canais que não estão em nenhuma coleção" -#: ../../include/text.php:959 -msgid "frustrated" -msgstr "frustrad@" +#: ../../include/group.php:303 ../../include/widgets.php:275 +msgid "add" +msgstr "adicionar" -#: ../../include/text.php:960 -msgid "depressed" -msgstr "deprimido" +#: ../../include/account.php:27 +msgid "Not a valid email address" +msgstr "Não é um endereço de e-mail válido" -#: ../../include/text.php:961 -msgid "motivated" -msgstr "motivad@" +#: ../../include/account.php:29 +msgid "Your email domain is not among those allowed on this site" +msgstr "O domínio do seu e-mail não está entre os permitidos neste site" -#: ../../include/text.php:962 -msgid "relaxed" -msgstr "relaxad@" +#: ../../include/account.php:35 +msgid "Your email address is already registered at this site." +msgstr "O seu endereço de e-mail já está registrado neste site." -#: ../../include/text.php:963 -msgid "surprised" -msgstr "surpres@" +#: ../../include/account.php:67 +msgid "An invitation is required." +msgstr "É necessário um convite." -#: ../../include/text.php:1135 -msgid "Monday" -msgstr "Segunda" +#: ../../include/account.php:71 +msgid "Invitation could not be verified." +msgstr "Não foi possível verificar o convite." -#: ../../include/text.php:1135 -msgid "Tuesday" -msgstr "Terça" +#: ../../include/account.php:121 +msgid "Please enter the required information." +msgstr "Por favor, forneça a informação solicitada." -#: ../../include/text.php:1135 -msgid "Wednesday" -msgstr "Quarta" +#: ../../include/account.php:188 +msgid "Failed to store account information." +msgstr "Não foi possível armazenar a informação da conta." -#: ../../include/text.php:1135 -msgid "Thursday" -msgstr "Quinta" +#: ../../include/account.php:246 +#, php-format +msgid "Registration confirmation for %s" +msgstr "Confirmação de registro para %s" -#: ../../include/text.php:1135 -msgid "Friday" -msgstr "Sexta" +#: ../../include/account.php:312 +#, php-format +msgid "Registration request at %s" +msgstr "Solicitação de registro em %s" -#: ../../include/text.php:1135 -msgid "Saturday" -msgstr "Sábado" +#: ../../include/account.php:314 ../../include/account.php:341 +#: ../../include/account.php:401 ../../include/network.php:1632 +msgid "Administrator" +msgstr "Administrador" -#: ../../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/text.php:1822 ../../include/conversation.php:120 -#: ../../include/diaspora.php:2081 ../../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 -#: ../../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/text.php:1835 -msgid "activity" -msgstr "atividade" - -#: ../../include/text.php:2130 -msgid "Design Tools" -msgstr "Ferramentas de Design" - -#: ../../include/text.php:2133 ../../mod/blocks.php:147 -msgid "Blocks" -msgstr "Blocos" - -#: ../../include/text.php:2134 ../../mod/menu.php:95 -msgid "Menus" -msgstr "Menus" - -#: ../../include/text.php:2135 ../../mod/layouts.php:174 -msgid "Layouts" -msgstr "Layouts" - -#: ../../include/text.php:2136 -msgid "Pages" -msgstr "Páginas" - -#: ../../include/text.php:2487 ../../include/RedDAV/RedBrowser.php:131 -msgid "Collection" -msgstr "Coleção" - -#: ../../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/bbcode.php:161 ../../include/bbcode.php:811 -msgid "Encrypted content" -msgstr "Conteúdo criptografado" - -#: ../../include/bbcode.php:178 -#, php-format -msgid "Install %s element: " -msgstr "Instalar elemento %s:" - -#: ../../include/bbcode.php:188 ../../mod/impel.php:33 -msgid "webpage" -msgstr "página web" - -#: ../../include/bbcode.php:191 ../../mod/impel.php:43 -msgid "layout" -msgstr "layout" - -#: ../../include/bbcode.php:194 ../../mod/impel.php:38 -msgid "block" -msgstr "bloco" - -#: ../../include/bbcode.php:208 -msgid "QR code" -msgstr "código QR" - -#: ../../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/bbcode.php:261 -msgid "post" -msgstr "publicação" - -#: ../../include/bbcode.php:511 -msgid "Different viewers will see this text differently" -msgstr "Visualizadores diferentes verão esse texto diferentemente" - -#: ../../include/bbcode.php:722 -msgid "$1 spoiler" -msgstr "$1 spoiler" - -#: ../../include/bbcode.php:749 -msgid "$1 wrote:" -msgstr "$1 escreveu:" - -#: ../../include/notify.php:23 -msgid "created a new post" -msgstr "criou uma nova publicação" - -#: ../../include/notify.php:24 -#, php-format -msgid "commented on %s's post" -msgstr "comentou a publicação de %s" - -#: ../../include/group.php:26 -msgid "" -"A deleted group with this name was revived. Existing item permissions " -"may apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." -msgstr "Um grupo com esse nome, anteriormente excluído, foi reativado. Permissões de itens já existentes poderão 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." - -#: ../../include/group.php:235 -msgid "Default privacy group for new contacts" -msgstr "Grupo de privacidade padrão para novos contatos" - -#: ../../include/group.php:254 ../../mod/admin.php:822 -msgid "All Channels" -msgstr "Todos os canais" - -#: ../../include/group.php:276 -msgid "edit" -msgstr "editar" - -#: ../../include/group.php:298 -msgid "Collections" -msgstr "Coleções" - -#: ../../include/group.php:299 -msgid "Edit collection" -msgstr "Editar coleção" - -#: ../../include/group.php:300 -msgid "Add new collection" -msgstr "Adicionar nova coleção" - -#: ../../include/group.php:301 -msgid "Channels not in any collection" -msgstr "Canais que não estão em nenhuma coleção" - -#: ../../include/group.php:303 ../../include/widgets.php:275 -msgid "add" -msgstr "adicionar" - -#: ../../include/account.php:27 -msgid "Not a valid email address" -msgstr "Não é um endereço de e-mail válido" - -#: ../../include/account.php:29 -msgid "Your email domain is not among those allowed on this site" -msgstr "O domínio do seu e-mail não está entre os permitidos neste site" - -#: ../../include/account.php:35 -msgid "Your email address is already registered at this site." -msgstr "O seu endereço de e-mail já está registrado neste site." - -#: ../../include/account.php:67 -msgid "An invitation is required." -msgstr "É necessário um convite." - -#: ../../include/account.php:71 -msgid "Invitation could not be verified." -msgstr "Não foi possível verificar o convite." - -#: ../../include/account.php:121 -msgid "Please enter the required information." -msgstr "Por favor, forneça a informação solicitada." - -#: ../../include/account.php:188 -msgid "Failed to store account information." -msgstr "Não foi possível armazenar a informação da conta." - -#: ../../include/account.php:246 -#, php-format -msgid "Registration confirmation for %s" -msgstr "Confirmação de registro para %s" - -#: ../../include/account.php:312 -#, php-format -msgid "Registration request at %s" -msgstr "Solicitação de registro em %s" - -#: ../../include/account.php:314 ../../include/account.php:341 -#: ../../include/account.php:401 -msgid "Administrator" -msgstr "Administrador" - -#: ../../include/account.php:336 -msgid "your registration password" -msgstr "sua senha de registro" +#: ../../include/account.php:336 +msgid "your registration password" +msgstr "sua senha de registro" #: ../../include/account.php:339 ../../include/account.php:399 #, php-format @@ -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/page_widgets.php:6 -msgid "New Page" -msgstr "Nova página" +#: ../../include/dir_fns.php:126 +msgid "Directory Options" +msgstr "Opções do Diretório" -#: ../../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/dir_fns.php:128 +msgid "Safe Mode" +msgstr "Modo tranquilo" -#: ../../include/page_widgets.php:39 ../../mod/webpages.php:186 -#: ../../mod/blocks.php:159 ../../mod/layouts.php:188 -msgid "View" -msgstr "Ver" +#: ../../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/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 -msgid "Preview" +#: ../../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: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: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,603 +672,951 @@ msgstr " " msgid "timeago.numbers" msgstr "timeago.numbers" -#: ../../include/RedDAV/RedBrowser.php:107 -#: ../../include/RedDAV/RedBrowser.php:268 -msgid "parent" -msgstr "nível superior" +#: ../../include/text.php:395 +msgid "prev" +msgstr "anterior" -#: ../../include/RedDAV/RedBrowser.php:134 -msgid "Principal" -msgstr "Principal" +#: ../../include/text.php:397 +msgid "first" +msgstr "primeiro" -#: ../../include/RedDAV/RedBrowser.php:137 -msgid "Addressbook" -msgstr "Livro de endereços" +#: ../../include/text.php:426 +msgid "last" +msgstr "último" -#: ../../include/RedDAV/RedBrowser.php:140 -msgid "Calendar" -msgstr "Calendário" +#: ../../include/text.php:429 +msgid "next" +msgstr "próximo" -#: ../../include/RedDAV/RedBrowser.php:143 -msgid "Schedule Inbox" -msgstr "Caixa de entrada da agenda" +#: ../../include/text.php:439 +msgid "older" +msgstr "mais antigo" -#: ../../include/RedDAV/RedBrowser.php:146 -msgid "Schedule Outbox" -msgstr "Caixa de saída da agenda" +#: ../../include/text.php:441 +msgid "newer" +msgstr "mais recente" -#: ../../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 -msgid "Unknown" -msgstr "Desconhecido" +#: ../../include/text.php:834 +msgid "No connections" +msgstr "Nenhuma conexão" -#: ../../include/RedDAV/RedBrowser.php:227 +#: ../../include/text.php:848 #, php-format -msgid "%1$s used" -msgstr "%1$s usados" +msgid "%d Connection" +msgid_plural "%d Connections" +msgstr[0] "%d conexão" +msgstr[1] "%d conexões" -#: ../../include/RedDAV/RedBrowser.php:232 -#, php-format -msgid "%1$s used of %2$s (%3$s%)" -msgstr "%1$s usados de %2$s (%3$s%)" +#: ../../include/text.php:861 ../../mod/viewconnections.php:104 +msgid "View Connections" +msgstr "Ver conexões" -#: ../../include/RedDAV/RedBrowser.php:251 ../../include/nav.php:98 -#: ../../include/conversation.php:1609 ../../include/apps.php:135 -#: ../../mod/fbrowser.php:114 -msgid "Files" -msgstr "Arquivos" +#: ../../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/RedDAV/RedBrowser.php:253 -msgid "Total" -msgstr "Total" +#: ../../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/RedDAV/RedBrowser.php:255 -msgid "Shared" -msgstr "Compartilhado" +#: ../../include/text.php:994 +msgid "poke" +msgstr "cutucar" -#: ../../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 -msgid "Create" -msgstr "Criar" +#: ../../include/text.php:994 ../../include/conversation.php:243 +msgid "poked" +msgstr "cutucado" -#: ../../include/RedDAV/RedBrowser.php:257 -#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/profile_photo.php:362 -#: ../../mod/photos.php:706 ../../mod/photos.php:1236 -msgid "Upload" -msgstr "Enviar" +#: ../../include/text.php:995 +msgid "ping" +msgstr "pingar" -#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/settings.php:589 -#: ../../mod/settings.php:615 ../../mod/admin.php:953 -#: ../../mod/sharedwithme.php:95 -msgid "Name" -msgstr "Nome" +#: ../../include/text.php:995 +msgid "pinged" +msgstr "pingou" -#: ../../include/RedDAV/RedBrowser.php:265 -msgid "Type" -msgstr "Tipo" +#: ../../include/text.php:996 +msgid "prod" +msgstr "espetar" -#: ../../include/RedDAV/RedBrowser.php:266 ../../mod/sharedwithme.php:97 -msgid "Size" -msgstr "Tamanho" +#: ../../include/text.php:996 +msgid "prodded" +msgstr "espetou" -#: ../../include/RedDAV/RedBrowser.php:267 ../../mod/sharedwithme.php:98 -msgid "Last Modified" -msgstr "Última modificação" +#: ../../include/text.php:997 +msgid "slap" +msgstr "estapear" -#: ../../include/RedDAV/RedBrowser.php:270 ../../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 -msgid "Delete" -msgstr "Excluir" +#: ../../include/text.php:997 +msgid "slapped" +msgstr "estapeou" -#: ../../include/RedDAV/RedBrowser.php:305 -msgid "Create new folder" -msgstr "Criar uma nova pasta" +#: ../../include/text.php:998 +msgid "finger" +msgstr "dar um toque" -#: ../../include/RedDAV/RedBrowser.php:307 -msgid "Upload file" -msgstr "Enviar arquivo" +#: ../../include/text.php:998 +msgid "fingered" +msgstr "deu um toque" -#: ../../include/bookmarks.php:35 -#, php-format -msgid "%1$s's bookmarks" -msgstr "Links guardados de %1$s" +#: ../../include/text.php:999 +msgid "rebuff" +msgstr "rebater" -#: ../../include/network.php:635 -msgid "view full size" -msgstr "ver na tela inteira" +#: ../../include/text.php:999 +msgid "rebuffed" +msgstr "rebateu" -#: ../../include/features.php:38 -msgid "General Features" -msgstr "Recursos gerais" +#: ../../include/text.php:1009 +msgid "happy" +msgstr "feliz" -#: ../../include/features.php:40 -msgid "Content Expiration" -msgstr "Expiração de conteúdo" +#: ../../include/text.php:1010 +msgid "sad" +msgstr "triste" -#: ../../include/features.php:40 -msgid "Remove posts/comments and/or private messages at a future time" -msgstr "Remover publicações/comentários e/ou mensagens privadas num momento futuro." +#: ../../include/text.php:1011 +msgid "mellow" +msgstr "suave" -#: ../../include/features.php:41 -msgid "Multiple Profiles" -msgstr "Múltiplos perfis" +#: ../../include/text.php:1012 +msgid "tired" +msgstr "cansad@" -#: ../../include/features.php:41 -msgid "Ability to create multiple profiles" -msgstr "Possibilidade de criar múltiplos perfis" +#: ../../include/text.php:1013 +msgid "perky" +msgstr "animad@" -#: ../../include/features.php:42 -msgid "Advanced Profiles" -msgstr "Perfis avançados" +#: ../../include/text.php:1014 +msgid "angry" +msgstr "nervos@" -#: ../../include/features.php:42 -msgid "Additional profile sections and selections" -msgstr "Seções e seleções adicionais no perfil" +#: ../../include/text.php:1015 +msgid "stupified" +msgstr "embasbacad@" -#: ../../include/features.php:43 -msgid "Profile Import/Export" -msgstr "Importar/exportar perfis" +#: ../../include/text.php:1016 +msgid "puzzled" +msgstr "confus@" -#: ../../include/features.php:43 -msgid "Save and load profile details across sites/channels" -msgstr "Salvar e carregar detalhes de perfis entre sites/canais" +#: ../../include/text.php:1017 +msgid "interested" +msgstr "interessad@" -#: ../../include/features.php:44 -msgid "Web Pages" -msgstr "Páginas web" +#: ../../include/text.php:1018 +msgid "bitter" +msgstr "amarg@" -#: ../../include/features.php:44 -msgid "Provide managed web pages on your channel" -msgstr "Fornece páginas web gerenciáveis no seu canal" +#: ../../include/text.php:1019 +msgid "cheerful" +msgstr "animad@" -#: ../../include/features.php:45 -msgid "Private Notes" -msgstr "Notas privadas" +#: ../../include/text.php:1020 +msgid "alive" +msgstr "viv@" -#: ../../include/features.php:45 -msgid "Enables a tool to store notes and reminders" -msgstr "Habilita uma ferramenta para guardar notas e lembretes" +#: ../../include/text.php:1021 +msgid "annoyed" +msgstr "aborrecid@" -#: ../../include/features.php:46 -msgid "Navigation Channel Select" -msgstr "Seletor de canais na navegação" +#: ../../include/text.php:1022 +msgid "anxious" +msgstr "ansios@" -#: ../../include/features.php:46 -msgid "Change channels directly from within the navigation dropdown menu" -msgstr "Trocar canais diretamente a partir do menu expansível na navegação" +#: ../../include/text.php:1023 +msgid "cranky" +msgstr "irritad@" -#: ../../include/features.php:47 -msgid "Photo Location" -msgstr "Localização da Foto" +#: ../../include/text.php:1024 +msgid "disturbed" +msgstr "perturbad@" -#: ../../include/features.php:47 -msgid "If location data is available on uploaded photos, link this to a map." -msgstr "Se os dados de localização estão disponíveis na foto enviada, link isso para um mapa." +#: ../../include/text.php:1025 +msgid "frustrated" +msgstr "frustrad@" -#: ../../include/features.php:49 -msgid "Expert Mode" -msgstr "Modo Expert" +#: ../../include/text.php:1026 +msgid "depressed" +msgstr "deprimido" -#: ../../include/features.php:49 -msgid "Enable Expert Mode to provide advanced configuration options" -msgstr "O Modo Expert fornece opções de configurações avançadas" +#: ../../include/text.php:1027 +msgid "motivated" +msgstr "motivad@" -#: ../../include/features.php:50 -msgid "Premium Channel" -msgstr "Canal premium" +#: ../../include/text.php:1028 +msgid "relaxed" +msgstr "relaxad@" -#: ../../include/features.php:50 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" -msgstr "Permite definir restrições e termos para aqueles que se conectarem ao seu canal" +#: ../../include/text.php:1029 +msgid "surprised" +msgstr "surpres@" -#: ../../include/features.php:55 -msgid "Post Composition Features" -msgstr "Recursos de composição de publicações" +#: ../../include/text.php:1201 +msgid "Monday" +msgstr "Segunda" -#: ../../include/features.php:57 -msgid "Use Markdown" -msgstr "Usar Markdown" +#: ../../include/text.php:1201 +msgid "Tuesday" +msgstr "Terça" -#: ../../include/features.php:57 -msgid "Allow use of \"Markdown\" to format posts" -msgstr "Permitir o uso de \"Markdown\" para formatar publicações" +#: ../../include/text.php:1201 +msgid "Wednesday" +msgstr "Quarta" -#: ../../include/features.php:58 -msgid "Large Photos" -msgstr "Fotos Grandes" +#: ../../include/text.php:1201 +msgid "Thursday" +msgstr "Quinta" -#: ../../include/features.php:58 -msgid "" -"Include large (640px) photo thumbnails in posts. If not enabled, use small " -"(320px) photo thumbnails" -msgstr "Inclua miniatura grande (640px) no texto. Se não habilitado, use miniatura pequena (320px)" +#: ../../include/text.php:1201 +msgid "Friday" +msgstr "Sexta" -#: ../../include/features.php:59 ../../include/widgets.php:546 -#: ../../mod/sources.php:88 -msgid "Channel Sources" -msgstr "Fontes do canal" +#: ../../include/text.php:1201 +msgid "Saturday" +msgstr "Sábado" -#: ../../include/features.php:59 -msgid "Automatically import channel content from other channels or feeds" -msgstr "Importar automaticamente conteúdo de outros canais ou fontes" +#: ../../include/text.php:1201 +msgid "Sunday" +msgstr "Domingo" -#: ../../include/features.php:60 -msgid "Even More Encryption" -msgstr "Mais encriptação ainda" +#: ../../include/text.php:1205 +msgid "January" +msgstr "Janeiro" -#: ../../include/features.php:60 -msgid "" -"Allow optional encryption of content end-to-end with a shared secret key" -msgstr "Permitir encriptação opcional de conteúdo, ponta-a-ponta com uma chave secreta compartilhada" +#: ../../include/text.php:1205 +msgid "February" +msgstr "Fevereiro" -#: ../../include/features.php:61 -msgid "Enable voting tools" -msgstr "Habilitar ferramenta de votos" +#: ../../include/text.php:1205 +msgid "March" +msgstr "Março" -#: ../../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" +#: ../../include/text.php:1205 +msgid "April" +msgstr "Abril" -#: ../../include/features.php:67 -msgid "Network and Stream Filtering" -msgstr "Filtragem de rede e fluxo" +#: ../../include/text.php:1205 +msgid "May" +msgstr "Maio" -#: ../../include/features.php:68 -msgid "Search by Date" -msgstr "Pesquisar por data" +#: ../../include/text.php:1205 +msgid "June" +msgstr "Junho" -#: ../../include/features.php:68 -msgid "Ability to select posts by date ranges" -msgstr "capacidade de selecionar publicações por intervalos de datas" +#: ../../include/text.php:1205 +msgid "July" +msgstr "Julho" -#: ../../include/features.php:69 -msgid "Collections Filter" -msgstr "Filtros de coleções" +#: ../../include/text.php:1205 +msgid "August" +msgstr "Agosto" -#: ../../include/features.php:69 -msgid "Enable widget to display Network posts only from selected collections" -msgstr "Habilita widget para exibir publicações da rede apenas para determinadas coleções" +#: ../../include/text.php:1205 +msgid "September" +msgstr "Setembro" -#: ../../include/features.php:70 ../../include/widgets.php:274 -msgid "Saved Searches" -msgstr "Pesquisas salvas" +#: ../../include/text.php:1205 +msgid "October" +msgstr "Outubro" -#: ../../include/features.php:70 -msgid "Save search terms for re-use" -msgstr "Termos de pesquisa salvos para reutilização" +#: ../../include/text.php:1205 +msgid "November" +msgstr "Novembro" -#: ../../include/features.php:71 -msgid "Network Personal Tab" -msgstr "Aba de interações na rede" +#: ../../include/text.php:1205 +msgid "December" +msgstr "Dezembro" -#: ../../include/features.php:71 -msgid "Enable tab to display only Network posts that you've interacted on" -msgstr "Habilita uma aba para exibir apenas publicações da rede com as quais você interagiu" +#: ../../include/text.php:1310 +msgid "unknown.???" +msgstr "desconhecido.???" -#: ../../include/features.php:72 -msgid "Network New Tab" -msgstr "Aba de novidades da rede" +#: ../../include/text.php:1311 +msgid "bytes" +msgstr "bytes" -#: ../../include/features.php:72 -msgid "Enable tab to display all new Network activity" -msgstr "Habilita uma aba para exibir todas as novas atividades da rede" +#: ../../include/text.php:1347 +msgid "remove category" +msgstr "remover categoria" -#: ../../include/features.php:73 -msgid "Affinity Tool" -msgstr "Ferramenta de afinidade" +#: ../../include/text.php:1422 +msgid "remove from file" +msgstr "remover do arquivo" -#: ../../include/features.php:73 -msgid "Filter stream activity by depth of relationships" -msgstr "Filtra o fluxo de atividades de acordo com o nível do relacionamento" +#: ../../include/text.php:1498 ../../include/text.php:1509 +msgid "Click to open/close" +msgstr "Clique para abrir/fechar" -#: ../../include/features.php:74 -msgid "Suggest Channels" -msgstr "Sugerir canais" +#: ../../include/text.php:1665 ../../mod/events.php:444 +msgid "Link to Source" +msgstr "Link para a origem" -#: ../../include/features.php:74 -msgid "Show channel suggestions" -msgstr "Exibir sugestões de canais" +#: ../../include/text.php:1686 ../../include/text.php:1757 +msgid "default" +msgstr "default" -#: ../../include/features.php:79 -msgid "Post/Comment Tools" -msgstr "Ferramentas de publicação/comentário" +#: ../../include/text.php:1694 +msgid "Page layout" +msgstr "aparência da página" -#: ../../include/features.php:80 -msgid "Tagging" -msgstr "Etiquetagem" +#: ../../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/features.php:80 -msgid "Ability to tag existing posts" -msgstr "Possibilidade de colocar etiquetas em publicações existentes" +#: ../../include/text.php:1735 +msgid "Page content type" +msgstr "Tipo de conteúdo da página" -#: ../../include/features.php:81 -msgid "Post Categories" -msgstr "Categorizar publicações" +#: ../../include/text.php:1769 +msgid "Select an alternate language" +msgstr "Selecione um idioma alternativo" -#: ../../include/features.php:81 -msgid "Add categories to your posts" -msgstr "Adiciona categorias às suas publicações" +#: ../../include/text.php:1891 ../../include/conversation.php:123 +#: ../../mod/like.php:348 ../../mod/tagger.php:47 +msgid "event" +msgstr "evento" -#: ../../include/features.php:82 ../../include/widgets.php:304 -#: ../../include/contact_widgets.php:57 -msgid "Saved Folders" -msgstr "Pastas salvas" +#: ../../include/text.php:1896 ../../include/conversation.php:150 +#: ../../mod/tagger.php:53 +msgid "comment" +msgstr "comentário" -#: ../../include/features.php:82 -msgid "Ability to file posts under folders" -msgstr "Possibilidade de arquivar publicações em pastas" +#: ../../include/text.php:1901 +msgid "activity" +msgstr "atividade" -#: ../../include/features.php:83 -msgid "Dislike Posts" -msgstr "Desgostar de publicações" +#: ../../include/text.php:2196 +msgid "Design Tools" +msgstr "Ferramentas de Design" -#: ../../include/features.php:83 -msgid "Ability to dislike posts/comments" -msgstr "Possibilidade de desgostar de publicações/comentários" +#: ../../include/text.php:2199 ../../mod/blocks.php:147 +msgid "Blocks" +msgstr "Blocos" -#: ../../include/features.php:84 -msgid "Star Posts" -msgstr "Destacar publicações" +#: ../../include/text.php:2200 ../../mod/menu.php:98 +msgid "Menus" +msgstr "Menus" -#: ../../include/features.php:84 -msgid "Ability to mark special posts with a star indicator" -msgstr "Possibilidade de marcar publicações em destaque com uma estrela indicadora" +#: ../../include/text.php:2201 ../../mod/layouts.php:174 +msgid "Layouts" +msgstr "Layouts" -#: ../../include/features.php:85 -msgid "Tag Cloud" -msgstr "Nuvem de etiquetas" +#: ../../include/text.php:2202 +msgid "Pages" +msgstr "Páginas" -#: ../../include/features.php:85 -msgid "Provide a personal tag cloud on your channel page" -msgstr "Fornece uma nuvem de etiquetas pessoais à página do seu canal" +#: ../../include/text.php:2553 ../../include/RedDAV/RedBrowser.php:131 +msgid "Collection" +msgstr "Coleção" -#: ../../include/widgets.php:35 ../../include/taxonomy.php:264 -#: ../../include/contact_widgets.php:92 -msgid "Categories" -msgstr "Categorias" +#: ../../include/RedDAV/RedBrowser.php:107 +#: ../../include/RedDAV/RedBrowser.php:265 +msgid "parent" +msgstr "nível superior" -#: ../../include/widgets.php:91 ../../include/nav.php:163 -#: ../../mod/apps.php:34 -msgid "Apps" -msgstr "Aplicações" +#: ../../include/RedDAV/RedBrowser.php:134 +msgid "Principal" +msgstr "Principal" -#: ../../include/widgets.php:92 -msgid "System" -msgstr "Sistema" +#: ../../include/RedDAV/RedBrowser.php:137 +msgid "Addressbook" +msgstr "Livro de endereços" -#: ../../include/widgets.php:94 ../../include/conversation.php:1504 -msgid "Personal" -msgstr "Pessoal" +#: ../../include/RedDAV/RedBrowser.php:140 +msgid "Calendar" +msgstr "Calendário" -#: ../../include/widgets.php:95 -msgid "Create Personal App" -msgstr "Criar aplicações pessoais" +#: ../../include/RedDAV/RedBrowser.php:143 +msgid "Schedule Inbox" +msgstr "Caixa de entrada da agenda" -#: ../../include/widgets.php:96 -msgid "Edit Personal App" -msgstr "Editar aplicações pessoais" +#: ../../include/RedDAV/RedBrowser.php:146 +msgid "Schedule Outbox" +msgstr "Caixa de saída da agenda" -#: ../../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 -msgid "Connect" -msgstr "Conectar" - -#: ../../include/widgets.php:138 ../../mod/suggest.php:54 -msgid "Ignore/Hide" -msgstr "Ignorar/Ocultar" - -#: ../../include/widgets.php:143 ../../mod/connections.php:268 -msgid "Suggestions" -msgstr "Sugestões" +#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1019 +#: ../../include/apps.php:336 ../../include/apps.php:387 +#: ../../mod/photos.php:693 ../../mod/photos.php:1131 +msgid "Unknown" +msgstr "Desconhecido" -#: ../../include/widgets.php:144 -msgid "See more..." -msgstr "Veja mais..." +#: ../../include/RedDAV/RedBrowser.php:227 +#, php-format +msgid "%1$s used" +msgstr "%1$s usados" -#: ../../include/widgets.php:166 +#: ../../include/RedDAV/RedBrowser.php:232 #, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "Você tem %1$.0f de %2$.0f conexões permitidas." +msgid "%1$s used of %2$s (%3$s%)" +msgstr "%1$s usados de %2$s (%3$s%)" -#: ../../include/widgets.php:172 -msgid "Add New Connection" -msgstr "Adicionar nova conexão" +#: ../../include/RedDAV/RedBrowser.php:251 ../../include/nav.php:98 +#: ../../include/conversation.php:1609 ../../include/apps.php:135 +#: ../../mod/fbrowser.php:114 +msgid "Files" +msgstr "Arquivos" -#: ../../include/widgets.php:173 -msgid "Enter the channel address" -msgstr "Digite o endereço do canal" +#: ../../include/RedDAV/RedBrowser.php:253 +msgid "Total" +msgstr "Total" -#: ../../include/widgets.php:174 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "Por exemplo: joao@exemplo.com, http://exemplo.com/maria" +#: ../../include/RedDAV/RedBrowser.php:255 +msgid "Shared" +msgstr "Compartilhado" -#: ../../include/widgets.php:190 -msgid "Notes" -msgstr "Notas" +#: ../../include/RedDAV/RedBrowser.php:256 +#: ../../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/widgets.php:266 -msgid "Remove term" -msgstr "Remover termo" +#: ../../include/RedDAV/RedBrowser.php:257 +#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362 +#: ../../mod/photos.php:718 ../../mod/photos.php:1248 +msgid "Upload" +msgstr "Enviar" -#: ../../include/widgets.php:307 ../../include/contact_widgets.php:60 -#: ../../include/contact_widgets.php:95 -msgid "Everything" -msgstr "Tudo" +#: ../../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/widgets.php:349 -msgid "Archives" -msgstr "Arquivos" +#: ../../include/RedDAV/RedBrowser.php:262 +msgid "Type" +msgstr "Tipo" -#: ../../include/widgets.php:427 ../../mod/connedit.php:572 -msgid "Me" -msgstr "Eu" +#: ../../include/RedDAV/RedBrowser.php:263 ../../mod/sharedwithme.php:97 +msgid "Size" +msgstr "Tamanho" -#: ../../include/widgets.php:428 ../../mod/connedit.php:573 -msgid "Family" -msgstr "Família" +#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:98 +msgid "Last Modified" +msgstr "Última modificação" -#: ../../include/widgets.php:429 ../../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 -msgid "Friends" -msgstr "Amigos" +#: ../../include/RedDAV/RedBrowser.php:267 ../../include/ItemObject.php:120 +#: ../../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: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/widgets.php:430 ../../mod/connedit.php:575 -msgid "Acquaintances" -msgstr "Conhecidos" +#: ../../include/RedDAV/RedBrowser.php:302 +msgid "Create new folder" +msgstr "Criar uma nova pasta" -#: ../../include/widgets.php:431 ../../mod/connections.php:231 -#: ../../mod/connections.php:246 ../../mod/connedit.php:576 -msgid "All" -msgstr "Todos" +#: ../../include/RedDAV/RedBrowser.php:304 +msgid "Upload file" +msgstr "Enviar arquivo" -#: ../../include/widgets.php:450 -msgid "Refresh" -msgstr "Atualizar" +#: ../../include/bookmarks.php:35 +#, php-format +msgid "%1$s's bookmarks" +msgstr "Links guardados de %1$s" -#: ../../include/widgets.php:485 -msgid "Account settings" -msgstr "Configurações da conta" +#: ../../include/network.php:635 +msgid "view full size" +msgstr "ver na tela inteira" -#: ../../include/widgets.php:491 -msgid "Channel settings" -msgstr "Configurações do canal" +#: ../../include/network.php:1585 ../../include/enotify.php:58 +msgid "$Projectname Notification" +msgstr "$Projectname Notificação" -#: ../../include/widgets.php:497 -msgid "Additional features" -msgstr "Recursos adicionais" +#: ../../include/network.php:1588 ../../include/enotify.php:61 +msgid "Thank You," +msgstr "Obrigado(a)," -#: ../../include/widgets.php:503 -msgid "Feature/Addon settings" -msgstr "Configurações característica/plugins" +#: ../../include/network.php:1590 ../../include/enotify.php:63 +#, php-format +msgid "%s Administrator" +msgstr "Administrador de %s" -#: ../../include/widgets.php:509 -msgid "Display settings" -msgstr "Configurações de exibição" +#: ../../include/network.php:1646 +msgid "No Subject" +msgstr "Sem Assunto" -#: ../../include/widgets.php:515 -msgid "Connected apps" -msgstr "Aplicações conectadas" +#: ../../include/features.php:38 +msgid "General Features" +msgstr "Recursos gerais" -#: ../../include/widgets.php:521 -msgid "Export channel" -msgstr "Exportar o canal" +#: ../../include/features.php:40 +msgid "Content Expiration" +msgstr "Expiração de conteúdo" -#: ../../include/widgets.php:530 ../../mod/connedit.php:653 -msgid "Connection Default Permissions" -msgstr "Permissões padrão para conexões" +#: ../../include/features.php:40 +msgid "Remove posts/comments and/or private messages at a future time" +msgstr "Remover publicações/comentários e/ou mensagens privadas num momento futuro." -#: ../../include/widgets.php:538 -msgid "Premium Channel Settings" -msgstr "Configurações de canal premium" +#: ../../include/features.php:41 +msgid "Multiple Profiles" +msgstr "Múltiplos perfis" -#: ../../include/widgets.php:554 ../../include/nav.php:208 -#: ../../include/apps.php:134 ../../mod/admin.php:1038 -#: ../../mod/admin.php:1238 -msgid "Settings" -msgstr "Configurações" +#: ../../include/features.php:41 +msgid "Ability to create multiple profiles" +msgstr "Possibilidade de criar múltiplos perfis" -#: ../../include/widgets.php:567 ../../mod/message.php:31 -#: ../../mod/mail.php:128 -msgid "Messages" -msgstr "Mensagens" +#: ../../include/features.php:42 +msgid "Advanced Profiles" +msgstr "Perfis avançados" -#: ../../include/widgets.php:570 -msgid "Check Mail" -msgstr "Checar mensagens" +#: ../../include/features.php:42 +msgid "Additional profile sections and selections" +msgstr "Seções e seleções adicionais no perfil" -#: ../../include/widgets.php:575 ../../include/nav.php:199 -msgid "New Message" -msgstr "Nova mensagem" +#: ../../include/features.php:43 +msgid "Profile Import/Export" +msgstr "Importar/exportar perfis" -#: ../../include/widgets.php:650 -msgid "Chat Rooms" -msgstr "Salas de bate-papo" +#: ../../include/features.php:43 +msgid "Save and load profile details across sites/channels" +msgstr "Salvar e carregar detalhes de perfis entre sites/canais" -#: ../../include/widgets.php:670 -msgid "Bookmarked Chatrooms" -msgstr "Salas de bate-papo guardadas" +#: ../../include/features.php:44 +msgid "Web Pages" +msgstr "Páginas web" -#: ../../include/widgets.php:690 -msgid "Suggested Chatrooms" -msgstr "Salas de bate-papo sugeridas" +#: ../../include/features.php:44 +msgid "Provide managed web pages on your channel" +msgstr "Fornece páginas web gerenciáveis no seu canal" -#: ../../include/widgets.php:817 ../../include/widgets.php:875 -msgid "photo/image" -msgstr "foto/imagem" +#: ../../include/features.php:45 +msgid "Private Notes" +msgstr "Notas privadas" -#: ../../include/widgets.php:970 ../../include/widgets.php:972 -msgid "Rate Me" -msgstr "Avalie-me" +#: ../../include/features.php:45 +msgid "Enables a tool to store notes and reminders" +msgstr "Habilita uma ferramenta para guardar notas e lembretes" -#: ../../include/widgets.php:976 -msgid "View Ratings" -msgstr "Ver avaliações" +#: ../../include/features.php:46 +msgid "Navigation Channel Select" +msgstr "Seletor de canais na navegação" -#: ../../include/widgets.php:987 -msgid "Public Hubs" -msgstr "Hubs Públicos" +#: ../../include/features.php:46 +msgid "Change channels directly from within the navigation dropdown menu" +msgstr "Trocar canais diretamente a partir do menu expansível na navegação" -#: ../../include/enotify.php:58 -msgid "$Projectname Notification" -msgstr "$Projectname Notificação" +#: ../../include/features.php:47 +msgid "Photo Location" +msgstr "Localização da Foto" -#: ../../include/enotify.php:59 ../../include/diaspora.php:2461 -#: ../../include/diaspora.php:2472 ../../mod/p.php:46 -msgid "$projectname" -msgstr "$projectname" +#: ../../include/features.php:47 +msgid "If location data is available on uploaded photos, link this to a map." +msgstr "Se os dados de localização estão disponíveis na foto enviada, link isso para um mapa." -#: ../../include/enotify.php:61 -msgid "Thank You," -msgstr "Obrigado(a)," +#: ../../include/features.php:49 +msgid "Expert Mode" +msgstr "Modo Expert" -#: ../../include/enotify.php:63 -#, php-format -msgid "%s Administrator" -msgstr "Administrador de %s" +#: ../../include/features.php:49 +msgid "Enable Expert Mode to provide advanced configuration options" +msgstr "O Modo Expert fornece opções de configurações avançadas" -#: ../../include/enotify.php:96 -#, php-format -msgid "%s " -msgstr "%s " +#: ../../include/features.php:50 +msgid "Premium Channel" +msgstr "Canal premium" -#: ../../include/enotify.php:100 -#, php-format -msgid "[Red:Notify] New mail received at %s" -msgstr "[Red:Notify] Nova mensagem recebida em %s" +#: ../../include/features.php:50 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" +msgstr "Permite definir restrições e termos para aqueles que se conectarem ao seu canal" -#: ../../include/enotify.php:102 -#, php-format -msgid "%1$s, %2$s sent you a new private message at %3$s." -msgstr "%1$s, %2$s te enviou uma nova mensagem privada em %3$s." +#: ../../include/features.php:55 +msgid "Post Composition Features" +msgstr "Recursos de composição de publicações" -#: ../../include/enotify.php:103 -#, php-format -msgid "%1$s sent you %2$s." -msgstr "%1$s enviou %2$s para você." +#: ../../include/features.php:57 +msgid "Use Markdown" +msgstr "Usar Markdown" -#: ../../include/enotify.php:103 -msgid "a private message" -msgstr "uma mensagem privada" +#: ../../include/features.php:57 +msgid "Allow use of \"Markdown\" to format posts" +msgstr "Permitir o uso de \"Markdown\" para formatar publicações" -#: ../../include/enotify.php:104 -#, php-format +#: ../../include/features.php:58 +msgid "Large Photos" +msgstr "Fotos Grandes" + +#: ../../include/features.php:58 +msgid "" +"Include large (640px) photo thumbnails in posts. If not enabled, use small " +"(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:548 +#: ../../mod/sources.php:88 +msgid "Channel Sources" +msgstr "Fontes do canal" + +#: ../../include/features.php:59 +msgid "Automatically import channel content from other channels or feeds" +msgstr "Importar automaticamente conteúdo de outros canais ou fontes" + +#: ../../include/features.php:60 +msgid "Even More Encryption" +msgstr "Mais encriptação ainda" + +#: ../../include/features.php:60 +msgid "" +"Allow optional encryption of content end-to-end with a shared secret key" +msgstr "Permitir encriptação opcional de conteúdo, ponta-a-ponta com uma chave secreta compartilhada" + +#: ../../include/features.php:61 +msgid "Enable voting tools" +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 permite enquetes" + +#: ../../include/features.php:67 +msgid "Network and Stream Filtering" +msgstr "Filtragem de rede e fluxo" + +#: ../../include/features.php:68 +msgid "Search by Date" +msgstr "Pesquisar por data" + +#: ../../include/features.php:68 +msgid "Ability to select posts by date ranges" +msgstr "capacidade de selecionar publicações por intervalos de datas" + +#: ../../include/features.php:69 +msgid "Collections Filter" +msgstr "Filtros de coleções" + +#: ../../include/features.php:69 +msgid "Enable widget to display Network posts only from selected collections" +msgstr "Habilita widget para exibir publicações da rede apenas para determinadas coleções" + +#: ../../include/features.php:70 ../../include/widgets.php:274 +msgid "Saved Searches" +msgstr "Pesquisas salvas" + +#: ../../include/features.php:70 +msgid "Save search terms for re-use" +msgstr "Termos de pesquisa salvos para reutilização" + +#: ../../include/features.php:71 +msgid "Network Personal Tab" +msgstr "Aba de interações na rede" + +#: ../../include/features.php:71 +msgid "Enable tab to display only Network posts that you've interacted on" +msgstr "Habilita uma aba para exibir apenas publicações da rede com as quais você interagiu" + +#: ../../include/features.php:72 +msgid "Network New Tab" +msgstr "Aba de novidades da rede" + +#: ../../include/features.php:72 +msgid "Enable tab to display all new Network activity" +msgstr "Habilita uma aba para exibir todas as novas atividades da rede" + +#: ../../include/features.php:73 +msgid "Affinity Tool" +msgstr "Ferramenta de afinidade" + +#: ../../include/features.php:73 +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:75 +msgid "Show channel suggestions" +msgstr "Exibir sugestões de canais" + +#: ../../include/features.php:80 +msgid "Post/Comment Tools" +msgstr "Ferramentas de publicação/comentário" + +#: ../../include/features.php:81 +msgid "Tagging" +msgstr "Etiquetagem" + +#: ../../include/features.php:81 +msgid "Ability to tag existing posts" +msgstr "Possibilidade de colocar etiquetas em publicações existentes" + +#: ../../include/features.php:82 +msgid "Post Categories" +msgstr "Categorizar publicações" + +#: ../../include/features.php:82 +msgid "Add categories to your posts" +msgstr "Adiciona categorias às suas publicações" + +#: ../../include/features.php:83 ../../include/widgets.php:304 +#: ../../include/contact_widgets.php:57 +msgid "Saved Folders" +msgstr "Pastas salvas" + +#: ../../include/features.php:83 +msgid "Ability to file posts under folders" +msgstr "Possibilidade de arquivar publicações em pastas" + +#: ../../include/features.php:84 +msgid "Dislike Posts" +msgstr "Desgostar de publicações" + +#: ../../include/features.php:84 +msgid "Ability to dislike posts/comments" +msgstr "Possibilidade de desgostar de publicações/comentários" + +#: ../../include/features.php:85 +msgid "Star Posts" +msgstr "Destacar publicações" + +#: ../../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:86 +msgid "Tag Cloud" +msgstr "Nuvem de etiquetas" + +#: ../../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" + +#: ../../include/widgets.php:35 ../../include/taxonomy.php:264 +#: ../../include/contact_widgets.php:92 +msgid "Categories" +msgstr "Categorias" + +#: ../../include/widgets.php:91 ../../include/nav.php:163 +#: ../../mod/apps.php:36 +msgid "Apps" +msgstr "Aplicações" + +#: ../../include/widgets.php:92 +msgid "System" +msgstr "Sistema" + +#: ../../include/widgets.php:94 ../../include/conversation.php:1504 +msgid "Personal" +msgstr "Pessoal" + +#: ../../include/widgets.php:95 +msgid "Create Personal App" +msgstr "Criar aplicações pessoais" + +#: ../../include/widgets.php:96 +msgid "Edit Personal App" +msgstr "Editar aplicações pessoais" + +#: ../../include/widgets.php:136 ../../include/widgets.php:175 +#: ../../include/Contact.php:107 ../../include/conversation.php:945 +#: ../../include/identity.php:857 ../../mod/directory.php:316 +#: ../../mod/match.php:64 ../../mod/suggest.php:52 +msgid "Connect" +msgstr "Conectar" + +#: ../../include/widgets.php:138 ../../mod/suggest.php:54 +msgid "Ignore/Hide" +msgstr "Ignorar/Ocultar" + +#: ../../include/widgets.php:143 ../../mod/connections.php:268 +msgid "Suggestions" +msgstr "Sugestões" + +#: ../../include/widgets.php:144 +msgid "See more..." +msgstr "Veja mais..." + +#: ../../include/widgets.php:166 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "Você tem %1$.0f de %2$.0f conexões permitidas." + +#: ../../include/widgets.php:172 +msgid "Add New Connection" +msgstr "Adicionar nova conexão" + +#: ../../include/widgets.php:173 +msgid "Enter the channel address" +msgstr "Digite o endereço do canal" + +#: ../../include/widgets.php:174 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "Por exemplo: joao@exemplo.com, http://exemplo.com/maria" + +#: ../../include/widgets.php:190 +msgid "Notes" +msgstr "Notas" + +#: ../../include/widgets.php:266 +msgid "Remove term" +msgstr "Remover termo" + +#: ../../include/widgets.php:307 ../../include/contact_widgets.php:60 +#: ../../include/contact_widgets.php:95 +msgid "Everything" +msgstr "Tudo" + +#: ../../include/widgets.php:349 +msgid "Archives" +msgstr "Arquivos" + +#: ../../include/widgets.php:429 ../../mod/connedit.php:567 +msgid "Me" +msgstr "Eu" + +#: ../../include/widgets.php:430 ../../mod/connedit.php:568 +msgid "Family" +msgstr "Família" + +#: ../../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:569 +msgid "Friends" +msgstr "Amigos" + +#: ../../include/widgets.php:432 ../../mod/connedit.php:570 +msgid "Acquaintances" +msgstr "Conhecidos" + +#: ../../include/widgets.php:433 ../../mod/connections.php:231 +#: ../../mod/connections.php:246 ../../mod/connedit.php:571 +msgid "All" +msgstr "Todos" + +#: ../../include/widgets.php:452 +msgid "Refresh" +msgstr "Atualizar" + +#: ../../include/widgets.php:487 +msgid "Account settings" +msgstr "Configurações da conta" + +#: ../../include/widgets.php:493 +msgid "Channel settings" +msgstr "Configurações do canal" + +#: ../../include/widgets.php:499 +msgid "Additional features" +msgstr "Recursos adicionais" + +#: ../../include/widgets.php:505 +msgid "Feature/Addon settings" +msgstr "Configurações característica/plugins" + +#: ../../include/widgets.php:511 +msgid "Display settings" +msgstr "Configurações de exibição" + +#: ../../include/widgets.php:517 +msgid "Connected apps" +msgstr "Aplicações conectadas" + +#: ../../include/widgets.php:523 +msgid "Export channel" +msgstr "Exportar o canal" + +#: ../../include/widgets.php:532 ../../mod/connedit.php:658 +msgid "Connection Default Permissions" +msgstr "Permissões padrão para conexões" + +#: ../../include/widgets.php:540 +msgid "Premium Channel Settings" +msgstr "Configurações de canal premium" + +#: ../../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:569 ../../mod/message.php:31 +#: ../../mod/mail.php:128 +msgid "Messages" +msgstr "Mensagens" + +#: ../../include/widgets.php:572 +msgid "Check Mail" +msgstr "Checar mensagens" + +#: ../../include/widgets.php:577 ../../include/nav.php:199 +msgid "New Message" +msgstr "Nova mensagem" + +#: ../../include/widgets.php:652 +msgid "Chat Rooms" +msgstr "Salas de bate-papo" + +#: ../../include/widgets.php:672 +msgid "Bookmarked Chatrooms" +msgstr "Salas de bate-papo guardadas" + +#: ../../include/widgets.php:692 +msgid "Suggested Chatrooms" +msgstr "Salas de bate-papo sugeridas" + +#: ../../include/widgets.php:819 ../../include/widgets.php:877 +msgid "photo/image" +msgstr "foto/imagem" + +#: ../../include/widgets.php:972 ../../include/widgets.php:974 +msgid "Rate Me" +msgstr "Avalie-me" + +#: ../../include/widgets.php:978 +msgid "View Ratings" +msgstr "Ver avaliações" + +#: ../../include/widgets.php:989 +msgid "Public Hubs" +msgstr "Hubs Públicos" + +#: ../../include/enotify.php:96 +#, php-format +msgid "%s " +msgstr "%s " + +#: ../../include/enotify.php:100 +#, php-format +msgid "[Red:Notify] New mail received at %s" +msgstr "[Red:Notify] Nova mensagem recebida em %s" + +#: ../../include/enotify.php:102 +#, php-format +msgid "%1$s, %2$s sent you a new private message at %3$s." +msgstr "%1$s, %2$s te enviou uma nova mensagem privada em %3$s." + +#: ../../include/enotify.php:103 +#, php-format +msgid "%1$s sent you %2$s." +msgstr "%1$s enviou %2$s para você." + +#: ../../include/enotify.php:103 +msgid "a private message" +msgstr "uma mensagem privada" + +#: ../../include/enotify.php:104 +#, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "Por favor, visite %s para ver e/ou responder as suas mensagens privadas." @@ -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,4078 +3975,4199 @@ 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/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:80 -msgid "Key and Secret are required" -msgstr "A chave e o segredo são obrigatórios" +#: ../../mod/directory.php:234 +#, php-format +msgid "%d rating" +msgid_plural "%d ratings" +msgstr[0] "%d avaliação" +msgstr[1] "%d avaliações" -#: ../../mod/settings.php:129 -msgid "Diaspora Policy Settings updated." -msgstr "Configurações da política do Diáspora atualizadas." +#: ../../mod/directory.php:245 +msgid "Gender: " +msgstr "Gênero: " -#: ../../mod/settings.php:237 -msgid "Passwords do not match. Password unchanged." -msgstr "As senhas não correspondem. A senha não foi modificada." +#: ../../mod/directory.php:247 +msgid "Status: " +msgstr "Status:" -#: ../../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/directory.php:249 +msgid "Homepage: " +msgstr "Website:" -#: ../../mod/settings.php:255 -msgid "Password changed." -msgstr "A senha foi modificada." +#: ../../mod/directory.php:308 ../../mod/events.php:645 +msgid "Description:" +msgstr "Descrição:" -#: ../../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/directory.php:317 +msgid "Public Forum:" +msgstr "Fórum público:" -#: ../../mod/settings.php:271 -msgid "Not valid email." -msgstr "Não é um e-mail válido" +#: ../../mod/directory.php:320 +msgid "Keywords: " +msgstr "Palavras-chave:" -#: ../../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/directory.php:323 +msgid "Don't suggest" +msgstr "Não sugerir" -#: ../../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/directory.php:325 +msgid "Common connections:" +msgstr "Conexões em comum:" -#: ../../mod/settings.php:522 -msgid "Settings updated." -msgstr "As configurações foram atualizadas." +#: ../../mod/directory.php:374 +msgid "Global Directory" +msgstr "Diretório global" -#: ../../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/directory.php:374 +msgid "Local Directory" +msgstr "Diretório local" -#: ../../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/directory.php:380 +msgid "Finding:" +msgstr "Pesquisando:" -#: ../../mod/settings.php:586 ../../mod/settings.php:612 -#: ../../mod/settings.php:648 -msgid "Add application" -msgstr "Adicionar aplicação" +#: ../../mod/directory.php:385 +msgid "next page" +msgstr "próxima página" -#: ../../mod/settings.php:589 -msgid "Name of application" -msgstr "Nome da aplicação" +#: ../../mod/directory.php:385 +msgid "previous page" +msgstr "página anterior" -#: ../../mod/settings.php:590 ../../mod/settings.php:616 -msgid "Consumer Key" -msgstr "Chave de consumidor" +#: ../../mod/directory.php:386 +msgid "Sort options" +msgstr "Opções de ordenação" -#: ../../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/directory.php:387 +msgid "Alphabetic" +msgstr "Alfabética" -#: ../../mod/settings.php:591 ../../mod/settings.php:617 -msgid "Consumer Secret" -msgstr "Segredo de consumidor" +#: ../../mod/directory.php:388 +msgid "Reverse Alphabetic" +msgstr "Alfabética reversa" -#: ../../mod/settings.php:592 ../../mod/settings.php:618 -msgid "Redirect" -msgstr "Redirecionamento" +#: ../../mod/directory.php:389 +msgid "Newest to Oldest" +msgstr "Das mais recentes para as mais antigas" + +#: ../../mod/directory.php:390 +msgid "Oldest to Newest" +msgstr "Do mais Antigo para o mais Novo" + +#: ../../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" +msgstr "Encontrar Xchan" + +#: ../../mod/xchan.php:9 +msgid "Lookup xchan beginning with (or webbie): " +msgstr "Encontrar xchan iniciado por (ou webbie):" + +#: ../../mod/xchan.php:37 ../../mod/mitem.php:114 ../../mod/menu.php:156 +msgid "Not found." +msgstr "Não encontrado." + +#: ../../mod/api.php:76 ../../mod/api.php:102 +msgid "Authorize application connection" +msgstr "Autorizar a conexão com a aplicação" + +#: ../../mod/api.php:77 +msgid "Return to your app and insert this Securty Code:" +msgstr "Volte para a sua aplicação e digite este código de segurança:" + +#: ../../mod/api.php:89 +msgid "Please login to continue." +msgstr "Por favor, autentique-se para continuar." -#: ../../mod/settings.php:592 +#: ../../mod/api.php:104 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" +"Do you want to authorize this application to access your posts and contacts," +" 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/settings.php:593 ../../mod/settings.php:619 -msgid "Icon url" -msgstr "URL do ícone" +#: ../../mod/webpages.php:191 +msgid "Page Title" +msgstr "Título da Página" -#: ../../mod/settings.php:593 -msgid "Optional" -msgstr "Opcional" +#: ../../mod/follow.php:25 +msgid "Channel added." +msgstr "Canal adicionado." -#: ../../mod/settings.php:604 -msgid "You can't edit this application." -msgstr "Você não pode editar esta aplicação." +#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94 +msgid "Tag removed" +msgstr "A etiqueta foi removida" -#: ../../mod/settings.php:647 -msgid "Connected Apps" -msgstr "Aplicações conectadas" +#: ../../mod/tagrm.php:119 +msgid "Remove Item Tag" +msgstr "Remover a etiqueta de item" -#: ../../mod/settings.php:651 -msgid "Client key starts with" -msgstr "Chave do cliente começa com" +#: ../../mod/tagrm.php:121 +msgid "Select a tag to remove: " +msgstr "Selecione uma etiqueta para remover: " -#: ../../mod/settings.php:652 -msgid "No name" -msgstr "Sem nome" +#: ../../mod/tagrm.php:133 ../../mod/photos.php:887 +msgid "Remove" +msgstr "Remover" -#: ../../mod/settings.php:653 -msgid "Remove authorization" -msgstr "Remover autorização" +#: ../../mod/connect.php:56 ../../mod/connect.php:104 +msgid "Continue" +msgstr "Continuar" -#: ../../mod/settings.php:667 -msgid "No feature settings configured" -msgstr "Não foi definida nenhuma configuração do recurso" +#: ../../mod/connect.php:85 +msgid "Premium Channel Setup" +msgstr "Configuração de canal premium" + +#: ../../mod/connect.php:87 +msgid "Enable premium channel connection restrictions" +msgstr "Habilitar restrições de canal premium para conexão" + +#: ../../mod/connect.php:88 +msgid "" +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." +msgstr "Por favor, insira suas restrições ou condições, como um recibo de depósito, normas de conduta, etc." + +#: ../../mod/connect.php:90 ../../mod/connect.php:110 +msgid "" +"This channel may require additional steps or acknowledgement of the " +"following conditions prior to connecting:" +msgstr "Este canal pode exigir passos adicionais ou compreensão das seguintes condições antes de conectar:" + +#: ../../mod/connect.php:91 +msgid "" +"Potential connections will then see the following text before proceeding:" +msgstr "Tentativas de conexões verão então o seguinte texto antes de prosseguir:" + +#: ../../mod/connect.php:92 ../../mod/connect.php:113 +msgid "" +"By continuing, I certify that I have complied with any instructions provided" +" on this page." +msgstr "Ao prosseguir, eu certifico que cumpri todas as instruções exibidas nesta página." -#: ../../mod/settings.php:683 -msgid "Feature/Addon Settings" -msgstr "Configuração de Característica/Plugins" +#: ../../mod/connect.php:101 +msgid "(No specific instructions have been provided by the channel owner.)" +msgstr "(Nenhuma instrução foi especificada pelo dono do canal.)" -#: ../../mod/settings.php:685 -msgid "Settings for the built-in Diaspora emulator" -msgstr "Configurações para construir um emulador de Diáspora" +#: ../../mod/connect.php:109 +msgid "Restricted or Premium Channel" +msgstr "Canal restrito ou premium" -#: ../../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/thing.php:94 +msgid "Thing updated" +msgstr "A coisa foi atualizada" -#: ../../mod/settings.php:687 -msgid "Diaspora Policy Settings" -msgstr "Configurações de Política do Diáspora" +#: ../../mod/thing.php:153 +msgid "Object store: failed" +msgstr "Armazenamento do objeto: falhou" -#: ../../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/thing.php:157 +msgid "Thing added" +msgstr "A coisa foi adicionada" -#: ../../mod/settings.php:712 -msgid "Account Settings" -msgstr "Configurações da conta" +#: ../../mod/thing.php:175 +#, php-format +msgid "OBJ: %1$s %2$s %3$s" +msgstr "OBJ: %1$s %2$s %3$s" -#: ../../mod/settings.php:713 -msgid "Enter New Password:" -msgstr "Digite a Nova Senha:" +#: ../../mod/thing.php:226 +msgid "Show Thing" +msgstr "Exibir coisa" -#: ../../mod/settings.php:714 -msgid "Confirm New Password:" -msgstr "Confirme a Nova Senha:" +#: ../../mod/thing.php:233 +msgid "item not found." +msgstr "o item não foi encontrado" -#: ../../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/thing.php:261 +msgid "Edit Thing" +msgstr "Editar coisa" -#: ../../mod/settings.php:716 ../../mod/settings.php:1051 -msgid "Email Address:" -msgstr "Endereço de e-mail:" +#: ../../mod/thing.php:263 ../../mod/thing.php:310 +msgid "Select a profile" +msgstr "Selecione um perfil" -#: ../../mod/settings.php:717 ../../mod/removeaccount.php:61 -msgid "Remove Account" -msgstr "Remover conta" +#: ../../mod/thing.php:267 ../../mod/thing.php:313 +msgid "Post an activity" +msgstr "Publique uma atividade" -#: ../../mod/settings.php:718 -msgid "Remove this account including all its channels" -msgstr "Exclua esta conta, incluindo todos seus canais" +#: ../../mod/thing.php:267 ../../mod/thing.php:313 +msgid "Only sends to viewers of the applicable profile" +msgstr "Envia apenas para a audiência do perfil aplicável" -#: ../../mod/settings.php:734 -msgid "Off" -msgstr "Desligado" +#: ../../mod/thing.php:269 ../../mod/thing.php:315 +msgid "Name of thing e.g. something" +msgstr "Nome da coisa e.g. coisinha" -#: ../../mod/settings.php:734 -msgid "On" -msgstr "Ligado" +#: ../../mod/thing.php:271 ../../mod/thing.php:316 +msgid "URL of thing (optional)" +msgstr "URL da coisa (opcional)" -#: ../../mod/settings.php:741 -msgid "Additional Features" -msgstr "Recursos adicionais" +#: ../../mod/thing.php:273 ../../mod/thing.php:317 +msgid "URL for photo of thing (optional)" +msgstr "URL para foto da coisa (opcional)" -#: ../../mod/settings.php:765 -msgid "Connector Settings" -msgstr "Configurações do conector" +#: ../../mod/thing.php:308 +msgid "Add Thing to your Profile" +msgstr "Adicionar a coisa ao seu perfil" -#: ../../mod/settings.php:804 -msgid "No special theme for mobile devices" -msgstr "Sem tema especial para aparelhos móveis" +#: ../../mod/attach.php:9 +msgid "Item not available." +msgstr "O item não está disponível." -#: ../../mod/settings.php:807 +#: ../../mod/probe.php:24 ../../mod/probe.php:30 #, php-format -msgid "%s - (Experimental)" -msgstr "%s - (Experimental)" +msgid "Fetching URL returns error: %1$s" +msgstr "Carregar o URL retorna o erro: %1$s" -#: ../../mod/settings.php:810 ../../mod/admin.php:396 -msgid "mobile" -msgstr "móvel" +#: ../../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." -#: ../../mod/settings.php:846 -msgid "Display Settings" -msgstr "Configurações de exibição" +#: ../../mod/profile_photo.php:162 +msgid "Image resize failed." +msgstr "Falha ao modificar o tamanho da imagem." -#: ../../mod/settings.php:852 -msgid "Display Theme:" -msgstr "Tema do perfil:" +#: ../../mod/profile_photo.php:206 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "Se a nova foto não aparecer imediatamente, recarregue a página segurando a tecla \"shift\" ou limpe o cache do navegador, " -#: ../../mod/settings.php:853 -msgid "Mobile Theme:" -msgstr "Tema móvel:" +#: ../../mod/profile_photo.php:233 +#, php-format +msgid "Image exceeds size limit of %d" +msgstr "A imagem excede o limite de tamanho de %d" -#: ../../mod/settings.php:854 -msgid "Enable user zoom on mobile devices" -msgstr "Permitir zoom pelo usuário em dispositivos móveis" +#: ../../mod/profile_photo.php:242 +msgid "Unable to process image." +msgstr "Não foi possível processar a imagem." -#: ../../mod/settings.php:855 -msgid "Update browser every xx seconds" -msgstr "Atualizar navegador a cada xx segundos" +#: ../../mod/profile_photo.php:291 ../../mod/profile_photo.php:340 +msgid "Photo not available." +msgstr "A foto não está disponível." -#: ../../mod/settings.php:855 -msgid "Minimum of 10 seconds, no maximum" -msgstr "Mínimo de 10 segundos, sem máximo" +#: ../../mod/profile_photo.php:359 +msgid "Upload File:" +msgstr "Enviar arquivo:" -#: ../../mod/settings.php:856 -msgid "Maximum number of conversations to load at any time:" -msgstr "Número máximo permitido de conversas carregadas:" +#: ../../mod/profile_photo.php:360 +msgid "Select a profile:" +msgstr "Selecione um perfil:" -#: ../../mod/settings.php:856 -msgid "Maximum of 100 items" -msgstr "Máximo de 100 itens" +#: ../../mod/profile_photo.php:361 +msgid "Upload Profile Photo" +msgstr "Enviar foto do perfil" -#: ../../mod/settings.php:857 -msgid "Show emoticons (smilies) as images" -msgstr "Mostrar emoticons (smilies) como imagens" +#: ../../mod/profile_photo.php:366 ../../mod/settings.php:995 +msgid "or" +msgstr "ou" -#: ../../mod/settings.php:858 -msgid "Link post titles to source" -msgstr "Ligar o título dos posts à fonte" +#: ../../mod/profile_photo.php:366 +msgid "skip this step" +msgstr "pule esta etapa" -#: ../../mod/settings.php:859 -msgid "System Page Layout Editor - (advanced)" -msgstr "Editor de layout de página do sistema - (avançado)" +#: ../../mod/profile_photo.php:366 +msgid "select a photo from your photo albums" +msgstr "selecione uma foto do seu álbum de fotos" -#: ../../mod/settings.php:862 -msgid "Use blog/list mode on channel page" -msgstr "Usar modo blog/lista na página do canal" +#: ../../mod/profile_photo.php:382 +msgid "Crop Image" +msgstr "Cortar a imagem" -#: ../../mod/settings.php:862 ../../mod/settings.php:863 -msgid "(comments displayed separately)" -msgstr "(comentários mostrados separadamente)" +#: ../../mod/profile_photo.php:383 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "Por favor, ajuste o corte da imagem para a melhor visualização." -#: ../../mod/settings.php:863 -msgid "Use blog/list mode on matrix page" -msgstr "Use modo de blogue/lista na página da matriz" +#: ../../mod/profile_photo.php:385 +msgid "Done Editing" +msgstr "Encerrar a edição" -#: ../../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/profile_photo.php:428 +msgid "Image uploaded successfully." +msgstr "A imagem foi enviada com sucesso." -#: ../../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/profile_photo.php:430 +msgid "Image upload failed." +msgstr "Não foi possível enviar a imagem." -#: ../../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/profile_photo.php:439 +#, php-format +msgid "Image size reduction [%s] failed." +msgstr "Não foi possível reduzir o tamanho da imagem [%s]." -#: ../../mod/settings.php:899 -msgid "Nobody except yourself" -msgstr "Ninguém exceto você mesmo" +#: ../../mod/block.php:27 ../../mod/page.php:36 +msgid "Invalid item." +msgstr "Item inválido." -#: ../../mod/settings.php:900 -msgid "Only those you specifically allow" -msgstr "Apenas quem você der permissão" +#: ../../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/settings.php:901 -msgid "Approved connections" -msgstr "Conexões aprovadas" +#: ../../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." -#: ../../mod/settings.php:902 -msgid "Any connections" -msgstr "Quaisquer conexões" +#: ../../mod/like.php:15 +msgid "Like/Dislike" +msgstr "Gostar/Desgostar" -#: ../../mod/settings.php:903 -msgid "Anybody on this website" -msgstr "Qualquer um neste site" +#: ../../mod/like.php:20 +msgid "This action is restricted to members." +msgstr "Esta ação é restrita a membros." -#: ../../mod/settings.php:904 -msgid "Anybody in this network" -msgstr "Qualquer um nesta rede" +#: ../../mod/like.php:21 +msgid "" +"Please login with your $Projectname ID or register as a new $Projectname member to continue." +msgstr "Por favor entre com sua $Projectname ID ou registre-se como novo membro da $Projectname para continuar." -#: ../../mod/settings.php:905 -msgid "Anybody authenticated" -msgstr "Qualquer um autenticado" +#: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166 +msgid "Invalid request." +msgstr "Solicitação inválida." -#: ../../mod/settings.php:906 -msgid "Anybody on the internet" -msgstr "Qualquer um na internet" +#: ../../mod/like.php:143 +msgid "thing" +msgstr "coisa" -#: ../../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/like.php:189 +msgid "Channel unavailable." +msgstr "Canal não disponível." -#: ../../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/like.php:228 +msgid "Previous action reversed." +msgstr "Ação anterior revertida." -#: ../../mod/settings.php:989 ../../mod/profile_photo.php:366 -msgid "or" -msgstr "ou" +#: ../../mod/like.php:398 +#, php-format +msgid "%1$s agrees with %2$s's %3$s" +msgstr "%1$s concordam com %2$s %3$s" + +#: ../../mod/like.php:400 +#, php-format +msgid "%1$s doesn't agree with %2$s's %3$s" +msgstr "%1$s não concordam com %2$s %3$s" -#: ../../mod/settings.php:994 -msgid "Your channel address is" -msgstr "O endereço do seu canal é" +#: ../../mod/like.php:402 +#, php-format +msgid "%1$s abstains from a decision on %2$s's %3$s" +msgstr "%1$s se abstém da decisão sobre %2$s %3$s" -#: ../../mod/settings.php:1042 -msgid "Channel Settings" -msgstr "Configurações do canal" +#: ../../mod/like.php:404 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "%1$s comparecerá em %3$s de %2$s" -#: ../../mod/settings.php:1049 -msgid "Basic Settings" -msgstr "Configurações básicas" +#: ../../mod/like.php:406 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" +msgstr "%1$s não comparecerá em %3$s de %2$s" -#: ../../mod/settings.php:1052 -msgid "Your Timezone:" -msgstr "Seu fuso horário:" +#: ../../mod/like.php:408 +#, php-format +msgid "%1$s may attend %2$s's %3$s" +msgstr "%1$s talvez compareça em %3$s de %2$s" -#: ../../mod/settings.php:1053 -msgid "Default Post Location:" -msgstr "Localização padrão de suas publicações:" +#: ../../mod/like.php:492 +msgid "Action completed." +msgstr "Ação completada." -#: ../../mod/settings.php:1053 -msgid "Geographical location to display on your posts" -msgstr "Localização geográfica para exibir em suas publicações" +#: ../../mod/like.php:493 +msgid "Thank you." +msgstr "Obrigado." -#: ../../mod/settings.php:1054 -msgid "Use Browser Location:" -msgstr "Usar localizador do navegador:" +#: ../../mod/events.php:87 +msgid "Event can not end before it has started." +msgstr "Um evento não pode terminar antes de seu início." -#: ../../mod/settings.php:1056 -msgid "Adult Content" -msgstr "Conteúdo adulto" +#: ../../mod/events.php:89 ../../mod/events.php:98 ../../mod/events.php:116 +msgid "Unable to generate preview." +msgstr "Não pode gerar pré-visualização." -#: ../../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/events.php:96 +msgid "Event title and start time are required." +msgstr "O título do evento e a hora de início são obrigatórios." -#: ../../mod/settings.php:1058 -msgid "Security and Privacy Settings" -msgstr "Configurações de segurança e privacidade" +#: ../../mod/events.php:114 +msgid "Event not found." +msgstr "Evento não encontrado." -#: ../../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/events.php:396 +msgid "l, F j" +msgstr "l, F j" -#: ../../mod/settings.php:1062 -msgid "Hide my online presence" -msgstr "Esconda minha presença online" +#: ../../mod/events.php:418 +msgid "Edit event" +msgstr "Editar o evento" -#: ../../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/events.php:419 +msgid "Delete event" +msgstr "Excluir evento" -#: ../../mod/settings.php:1064 -msgid "Simple Privacy Settings:" -msgstr "Configurações de privacidade simples:" +#: ../../mod/events.php:473 +msgid "Create New Event" +msgstr "Criar um novo evento" -#: ../../mod/settings.php:1065 -msgid "" -"Very Public - extremely permissive (should be used with caution)" -msgstr "Muito público - extremamente permissivo (deve ser usado com cuidado)" +#: ../../mod/events.php:474 ../../mod/photos.php:839 +msgid "Previous" +msgstr "Anterior" -#: ../../mod/settings.php:1066 -msgid "" -"Typical - default public, privacy when desired (similar to social " -"network permissions but with improved privacy)" -msgstr "Típico - público por padrão, privado quando desejável (similar às permissões de redes sociais, mas com melhor privacidade)" +#: ../../mod/events.php:475 ../../mod/photos.php:848 ../../mod/setup.php:281 +msgid "Next" +msgstr "Próximo" -#: ../../mod/settings.php:1067 -msgid "Private - default private, never open or public" -msgstr "Privado - privado por padrão, nunca aberto ou público" +#: ../../mod/events.php:476 +msgid "Export" +msgstr "Exportar" -#: ../../mod/settings.php:1068 -msgid "Blocked - default blocked to/from everybody" -msgstr "Bloqueado - por padrão bloquado de/para todos" +#: ../../mod/events.php:504 +msgid "Event removed" +msgstr "Evento removido" -#: ../../mod/settings.php:1070 -msgid "Allow others to tag your posts" -msgstr "Permitir que outros etiquetem suas publicações" +#: ../../mod/events.php:507 +msgid "Failed to remove event" +msgstr "Falha ao excluir evento" -#: ../../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/events.php:627 +msgid "Event details" +msgstr "Detalhes do evento" -#: ../../mod/settings.php:1072 -msgid "Advanced Privacy Settings" -msgstr "Configurações de privacidade avançadas" +#: ../../mod/events.php:628 +msgid "Starting date and Title are required." +msgstr "Data de início e título são obrigatórios." -#: ../../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/events.php:630 +msgid "Categories (comma-separated list)" +msgstr "Categorias (lista separada por vírgulas)" -#: ../../mod/settings.php:1074 -msgid "0 or blank prevents expiration" -msgstr "0 ou em branco previne expiração" +#: ../../mod/events.php:632 +msgid "Event Starts:" +msgstr "Início do evento:" -#: ../../mod/settings.php:1075 -msgid "Maximum Friend Requests/Day:" -msgstr "Número máximo de requisições de amizade por dia:" +#: ../../mod/events.php:639 +msgid "Finish date/time is not known or not relevant" +msgstr "A data/hora de término não é conhecida ou não é relevante" -#: ../../mod/settings.php:1075 -msgid "May reduce spam activity" -msgstr "Pode reduzir a frequência de spam" +#: ../../mod/events.php:641 +msgid "Event Finishes:" +msgstr "Término do evento:" -#: ../../mod/settings.php:1076 -msgid "Default Post Permissions" -msgstr "Permissões padrão de publicação" +#: ../../mod/events.php:643 ../../mod/events.php:644 +msgid "Adjust for viewer timezone" +msgstr "Ajustar para o fuso horário do visualizador" -#: ../../mod/settings.php:1077 ../../mod/mitem.php:159 ../../mod/mitem.php:229 -msgid "(click to open/close)" -msgstr "(clique para abrir/fechar)" +#: ../../mod/events.php:643 +msgid "" +"Important for events that happen in a particular place. Not practical for " +"global holidays." +msgstr "Importante para eventos que ocorrem em um lugar específico. Não prático para feriados globais." -#: ../../mod/settings.php:1081 -msgid "Channel permissions category:" -msgstr "Categoria de permissões do canal:" +#: ../../mod/events.php:649 +msgid "Title:" +msgstr "Título:" -#: ../../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/events.php:651 +msgid "Share this event" +msgstr "Compartilhar este evento" -#: ../../mod/settings.php:1087 -msgid "Useful to reduce spamming" -msgstr "Útil para reduzir a frequência de spam" +#: ../../mod/subthread.php:103 +#, php-format +msgid "%1$s is following %2$s's %3$s" +msgstr "%1$s está acompanhando %3$s de %2$s" -#: ../../mod/settings.php:1090 -msgid "Notification Settings" -msgstr "Configurações de notificação" +#: ../../mod/pubsites.php:16 +msgid "Public Sites" +msgstr "Sites públicos" -#: ../../mod/settings.php:1091 -msgid "By default post a status message when:" -msgstr "Por padrão, publicar uma mensagem de status quando:" +#: ../../mod/pubsites.php:19 +msgid "" +"The listed sites allow public registration for the $Projectname network. All" +" sites in the network are interlinked so membership on any of them conveys " +"membership in the network as a whole. Some sites may require subscription or" +" provide tiered service plans. The provider links may " +"provide additional details." +msgstr "Os sites listados permitem ao público geral registrar contas na $Projectname. Todos os sites na matrix são interligados, portanto ser membro em qualquer um deles te torna membro na matrix como um todo. Alguns sites podem solicitar uma assinatura ou prover planos em níveis. Os links para cada provedor podem fornecer mais detalhes." -#: ../../mod/settings.php:1092 -msgid "accepting a friend request" -msgstr "aceitar um pedido de amizade" +#: ../../mod/pubsites.php:25 +msgid "Rate this hub" +msgstr "Avalie esse hub." -#: ../../mod/settings.php:1093 -msgid "joining a forum/community" -msgstr "associar-se a um fórum/comunidade" +#: ../../mod/pubsites.php:26 +msgid "Site URL" +msgstr "URL do site" -#: ../../mod/settings.php:1094 -msgid "making an interesting profile change" -msgstr "modificar algo interessante em seu perfil" +#: ../../mod/pubsites.php:26 +msgid "Access Type" +msgstr "Tipo de acesso" -#: ../../mod/settings.php:1095 -msgid "Send a notification email when:" -msgstr "Enviar um e-mail de notificação quando:" +#: ../../mod/pubsites.php:26 +msgid "Registration Policy" +msgstr "Política de registro" -#: ../../mod/settings.php:1096 -msgid "You receive a connection request" -msgstr "Você recebe uma solicitação de conexão" +#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454 +msgid "Location" +msgstr "Localização" -#: ../../mod/settings.php:1097 -msgid "Your connections are confirmed" -msgstr "Suas conexões são confirmadas" +#: ../../mod/pubsites.php:26 +msgid "View hub ratings" +msgstr "Ver avaliações do hub" -#: ../../mod/settings.php:1098 -msgid "Someone writes on your profile wall" -msgstr "Alguém escrever no mural do seu perfil" +#: ../../mod/pubsites.php:30 +msgid "Rate" +msgstr "Avalie" -#: ../../mod/settings.php:1099 -msgid "Someone writes a followup comment" -msgstr "Alguém comenta uma publicação" +#: ../../mod/pubsites.php:31 +msgid "View ratings" +msgstr "Veja avaliações" -#: ../../mod/settings.php:1100 -msgid "You receive a private message" -msgstr "Você recebeu uma mensagem privada" +#: ../../mod/rpost.php:131 ../../mod/editpost.php:158 +msgid "Edit post" +msgstr "Editar a publicação" -#: ../../mod/settings.php:1101 -msgid "You receive a friend suggestion" -msgstr "Você recebe uma sugestão de amizade" +#: ../../mod/dav.php:121 +msgid "$Projectname channel" +msgstr "Canal na $Projectname" -#: ../../mod/settings.php:1102 -msgid "You are tagged in a post" -msgstr "Você é mencionado num post" +#: ../../mod/group.php:20 +msgid "Collection created." +msgstr "A coleção foi criada." -#: ../../mod/settings.php:1103 -msgid "You are poked/prodded/etc. in a post" -msgstr "Você foi cutucado/espetado/etc. numa publicação" +#: ../../mod/group.php:26 +msgid "Could not create collection." +msgstr "Não foi possível criar a coleção." -#: ../../mod/settings.php:1106 -msgid "Show visual notifications including:" -msgstr "Exibir notificações visuais incluindo:" +#: ../../mod/group.php:54 +msgid "Collection updated." +msgstr "Coleção atualizada" -#: ../../mod/settings.php:1108 -msgid "Unseen matrix activity" -msgstr "Atividade não vista na matriz" +#: ../../mod/group.php:86 +msgid "Create a collection of channels." +msgstr "Criar uma coleção de canais." -#: ../../mod/settings.php:1109 -msgid "Unseen channel activity" -msgstr "Atividade não vista no canal" +#: ../../mod/group.php:87 ../../mod/group.php:183 +msgid "Collection Name: " +msgstr "Nome da coleção:" -#: ../../mod/settings.php:1110 -msgid "Unseen private messages" -msgstr "Mensagens privadas não vistas" +#: ../../mod/group.php:89 ../../mod/group.php:186 +msgid "Members are visible to other channels" +msgstr "Membros são visíveis para outros canais" -#: ../../mod/settings.php:1110 ../../mod/settings.php:1115 -#: ../../mod/settings.php:1116 ../../mod/settings.php:1117 -msgid "Recommended" -msgstr "Recomendado" +#: ../../mod/group.php:107 +msgid "Collection removed." +msgstr "Coleção removida." -#: ../../mod/settings.php:1111 -msgid "Upcoming events" -msgstr "Eventos próximos" +#: ../../mod/group.php:109 +msgid "Unable to remove collection." +msgstr "Não foi possível remover a coleção." -#: ../../mod/settings.php:1112 -msgid "Events today" -msgstr "Eventos hoje" +#: ../../mod/group.php:182 +msgid "Collection Editor" +msgstr "Editor de coleção" -#: ../../mod/settings.php:1113 -msgid "Upcoming birthdays" -msgstr "Aniversários próximos" +#: ../../mod/group.php:196 ../../mod/bulksetclose.php:89 +msgid "Members" +msgstr "Membros" -#: ../../mod/settings.php:1113 -msgid "Not available in all themes" -msgstr "Não disponível em todos os temas" +#: ../../mod/group.php:198 ../../mod/bulksetclose.php:91 +msgid "All Connected Channels" +msgstr "Todas os canais conectados" -#: ../../mod/settings.php:1114 -msgid "System (personal) notifications" -msgstr "Notificações de sistema (pessoais)" +#: ../../mod/group.php:233 ../../mod/bulksetclose.php:126 +msgid "Click on a channel to add or remove." +msgstr "Clique em um canal para adicionar ou remover." -#: ../../mod/settings.php:1115 -msgid "System info messages" -msgstr "Mensagens de informação do sistema" +#: ../../mod/siteinfo.php:112 +#, php-format +msgid "Version %s" +msgstr "Versão %s" -#: ../../mod/settings.php:1116 -msgid "System critical alerts" -msgstr "Alertas críticos do sistema" +#: ../../mod/siteinfo.php:133 +msgid "Installed plugins/addons/apps:" +msgstr "Plugins/complementos/aplicações instalados:" -#: ../../mod/settings.php:1117 -msgid "New connections" -msgstr "Novas conexões" +#: ../../mod/siteinfo.php:146 +msgid "No installed plugins/addons/apps" +msgstr "Nenhum plugin/complemento/aplicação instalado" -#: ../../mod/settings.php:1118 -msgid "System Registrations" -msgstr "Registros no sistema" +#: ../../mod/siteinfo.php:155 ../../mod/home.php:58 ../../mod/home.php:64 +msgid "$Projectname" +msgstr "$Projectname" -#: ../../mod/settings.php:1119 +#: ../../mod/siteinfo.php:156 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:1121 -msgid "Notify me of events this many days in advance" -msgstr "Notifique-me de eventos adiante esse número de dias" +"This is a hub of $Projectname - a global cooperative network of " +"decentralized privacy enhanced websites." +msgstr "Este é um hub da $Projectname - uma rede global cooperativa de websites descentralizados com privacidade aprimorada." -#: ../../mod/settings.php:1121 -msgid "Must be greater than 0" -msgstr "Deve ser maior que 0" +#: ../../mod/siteinfo.php:158 +msgid "Tag: " +msgstr "Etiqueta:" -#: ../../mod/settings.php:1123 -msgid "Advanced Account/Page Type Settings" -msgstr "Configurações avançadas de conta/tipo de página" +#: ../../mod/siteinfo.php:160 +msgid "Last background fetch: " +msgstr "Buscar último fundo:" -#: ../../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/siteinfo.php:163 +msgid "Running at web location" +msgstr "Sendo executado no endereço web" -#: ../../mod/settings.php:1127 +#: ../../mod/siteinfo.php:164 msgid "" -"Please enable expert mode (in Settings > " -"Additional features) to adjust!" -msgstr "Por favor, habilite o modo expert (em Configurações > Recursos adicionais) para ajustar!" +"Please visit redmatrix.me to learn more" +" about $Projectname." +msgstr "Por favor visite redmatrix.me para aprender mais sobre a $Projectname." -#: ../../mod/settings.php:1128 -msgid "Miscellaneous Settings" -msgstr "Configurações miscelâneas" +#: ../../mod/siteinfo.php:165 +msgid "Bug reports and issues: please visit" +msgstr "Relatos e acompanhamentos de erros podem ser encontrados em" -#: ../../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/siteinfo.php:167 +msgid "$projectname issues" +msgstr "Questões de $projectname" -#: ../../mod/settings.php:1131 ../../mod/removeme.php:61 -msgid "Remove Channel" -msgstr "Remover canal" +#: ../../mod/siteinfo.php:168 +msgid "" +"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot " +"com" +msgstr "Sugestões, elogios, etc - mande um e-mail para \"redmatrix\" arrôba librelist ponto com" -#: ../../mod/settings.php:1132 -msgid "Remove this channel." -msgstr "Remover este canal" +#: ../../mod/siteinfo.php:170 +msgid "Site Administrators" +msgstr "Administradores do site" -#: ../../mod/xchan.php:6 -msgid "Xchan Lookup" -msgstr "Encontrar Xchan" +#: ../../mod/item.php:174 +msgid "Unable to locate original post." +msgstr "Não foi possível localizar a publicação original." -#: ../../mod/xchan.php:9 -msgid "Lookup xchan beginning with (or webbie): " -msgstr "Encontrar xchan iniciado por (ou webbie):" +#: ../../mod/item.php:440 +msgid "Empty post discarded." +msgstr "A publicação em branco foi descartada." -#: ../../mod/xchan.php:37 ../../mod/menu.php:149 ../../mod/mitem.php:120 -msgid "Not found." -msgstr "Não encontrado." +#: ../../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/api.php:76 ../../mod/api.php:102 -msgid "Authorize application connection" -msgstr "Autorizar a conexão com a aplicação" +#: ../../mod/item.php:901 +msgid "System error. Post not saved." +msgstr "Erro no sistema. A publicação não foi salva." -#: ../../mod/api.php:77 -msgid "Return to your app and insert this Securty Code:" -msgstr "Volte para a sua aplicação e digite este código de segurança:" +#: ../../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/api.php:89 -msgid "Please login to continue." -msgstr "Por favor, autentique-se para continuar." +#: ../../mod/item.php:1126 +#, 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/api.php:104 -msgid "" -"Do you want to authorize this application to access your posts and contacts," -" 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/item.php:1133 +#, 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/webpages.php:190 -msgid "Page Title" -msgstr "Título da Página" +#: ../../mod/network.php:91 +msgid "No such group" +msgstr "Este grupo não existe" -#: ../../mod/follow.php:25 -msgid "Channel added." -msgstr "Canal adicionado." +#: ../../mod/network.php:129 +msgid "No such channel" +msgstr "Nenhum canal" -#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94 -msgid "Tag removed" -msgstr "A etiqueta foi removida" +#: ../../mod/network.php:143 +msgid "Search Results For:" +msgstr "Resultados da busca por:" -#: ../../mod/tagrm.php:119 -msgid "Remove Item Tag" -msgstr "Remover a etiqueta de item" +#: ../../mod/network.php:198 +msgid "Collection is empty" +msgstr "A coleção está vazia" -#: ../../mod/tagrm.php:121 -msgid "Select a tag to remove: " -msgstr "Selecione uma etiqueta para remover: " +#: ../../mod/network.php:207 +msgid "Collection: " +msgstr "Coleção:" -#: ../../mod/tagrm.php:133 ../../mod/photos.php:875 -msgid "Remove" -msgstr "Remover" +#: ../../mod/network.php:226 +msgid "Connection: " +msgstr "Conexão:" -#: ../../mod/connect.php:56 ../../mod/connect.php:104 -msgid "Continue" -msgstr "Continuar" +#: ../../mod/network.php:233 +msgid "Invalid connection." +msgstr "Conexão inválida." -#: ../../mod/connect.php:85 -msgid "Premium Channel Setup" -msgstr "Configuração de canal premium" +#: ../../mod/common.php:10 +msgid "No channel." +msgstr "Nenhum canal." -#: ../../mod/connect.php:87 -msgid "Enable premium channel connection restrictions" -msgstr "Habilitar restrições de canal premium para conexão" +#: ../../mod/common.php:39 +msgid "Common connections" +msgstr "Conexões em comum" -#: ../../mod/connect.php:88 -msgid "" -"Please enter your restrictions or conditions, such as paypal receipt, usage " -"guidelines, etc." -msgstr "Por favor, insira suas restrições ou condições, como um recibo de depósito, normas de conduta, etc." +#: ../../mod/common.php:44 +msgid "No connections in common." +msgstr "Nenhuma conexão em comum." -#: ../../mod/connect.php:90 ../../mod/connect.php:110 -msgid "" -"This channel may require additional steps or acknowledgement of the " -"following conditions prior to connecting:" -msgstr "Este canal pode exigir passos adicionais ou compreensão das seguintes condições antes de conectar:" +#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21 +msgid "This site is not a directory server" +msgstr "Este site não é um servidor de diretório" -#: ../../mod/connect.php:91 -msgid "" -"Potential connections will then see the following text before proceeding:" -msgstr "Tentativas de conexões verão então o seguinte texto antes de prosseguir:" +#: ../../mod/connections.php:37 ../../mod/connedit.php:75 +msgid "Could not access contact record." +msgstr "Não foi possível acessar o registro do contato." -#: ../../mod/connect.php:92 ../../mod/connect.php:113 -msgid "" -"By continuing, I certify that I have complied with any instructions provided" -" on this page." -msgstr "Ao prosseguir, eu certifico que cumpri todas as instruções exibidas nesta página." +#: ../../mod/connections.php:51 ../../mod/connedit.php:99 +msgid "Could not locate selected profile." +msgstr "Não foi possível localizar o perfil selecionado." -#: ../../mod/connect.php:101 -msgid "(No specific instructions have been provided by the channel owner.)" -msgstr "(Nenhuma instrução foi especificada pelo dono do canal.)" +#: ../../mod/connections.php:94 ../../mod/connedit.php:219 +msgid "Connection updated." +msgstr "A conexão foi atualizada." -#: ../../mod/connect.php:109 -msgid "Restricted or Premium Channel" -msgstr "Canal restrito ou premium" +#: ../../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." -#: ../../mod/thing.php:94 -msgid "Thing updated" -msgstr "A coisa foi atualizada" +#: ../../mod/connections.php:192 ../../mod/connections.php:293 +msgid "Blocked" +msgstr "Bloqueado" -#: ../../mod/thing.php:153 -msgid "Object store: failed" -msgstr "Armazenamento do objeto: falhou" +#: ../../mod/connections.php:197 ../../mod/connections.php:300 +msgid "Ignored" +msgstr "Ignorado" -#: ../../mod/thing.php:157 -msgid "Thing added" -msgstr "A coisa foi adicionada" +#: ../../mod/connections.php:202 ../../mod/connections.php:314 +msgid "Hidden" +msgstr "Oculto" -#: ../../mod/thing.php:175 -#, php-format -msgid "OBJ: %1$s %2$s %3$s" -msgstr "OBJ: %1$s %2$s %3$s" +#: ../../mod/connections.php:207 ../../mod/connections.php:307 +msgid "Archived" +msgstr "Arquivado" -#: ../../mod/thing.php:226 -msgid "Show Thing" -msgstr "Exibir coisa" +#: ../../mod/connections.php:271 +msgid "Suggest new connections" +msgstr "Sugerir novas conexões" -#: ../../mod/thing.php:233 -msgid "item not found." -msgstr "o item não foi encontrado" +#: ../../mod/connections.php:274 +msgid "New Connections" +msgstr "Novas conexões" -#: ../../mod/thing.php:261 -msgid "Edit Thing" -msgstr "Editar coisa" +#: ../../mod/connections.php:277 +msgid "Show pending (new) connections" +msgstr "Exibir conexões pendentes (novas)" -#: ../../mod/thing.php:263 ../../mod/thing.php:310 -msgid "Select a profile" -msgstr "Selecione um perfil" +#: ../../mod/connections.php:280 ../../mod/profperm.php:139 +msgid "All Connections" +msgstr "Todas as conexões" -#: ../../mod/thing.php:267 ../../mod/thing.php:313 -msgid "Post an activity" -msgstr "Publique uma atividade" +#: ../../mod/connections.php:283 +msgid "Show all connections" +msgstr "Exibir todas as conexões" -#: ../../mod/thing.php:267 ../../mod/thing.php:313 -msgid "Only sends to viewers of the applicable profile" -msgstr "Envia apenas para a audiência do perfil aplicável" +#: ../../mod/connections.php:286 +msgid "Unblocked" +msgstr "Não bloqueado" -#: ../../mod/thing.php:269 ../../mod/thing.php:315 -msgid "Name of thing e.g. something" -msgstr "Nome da coisa e.g. coisinha" +#: ../../mod/connections.php:289 +msgid "Only show unblocked connections" +msgstr "Exibir apenas conexões não bloqueadas" -#: ../../mod/thing.php:271 ../../mod/thing.php:316 -msgid "URL of thing (optional)" -msgstr "URL da coisa (opcional)" +#: ../../mod/connections.php:296 +msgid "Only show blocked connections" +msgstr "Exibir apenas conexões bloqueadas" -#: ../../mod/thing.php:273 ../../mod/thing.php:317 -msgid "URL for photo of thing (optional)" -msgstr "URL para foto da coisa (opcional)" +#: ../../mod/connections.php:303 +msgid "Only show ignored connections" +msgstr "Exibir apenas conexões ignoradas" -#: ../../mod/thing.php:308 -msgid "Add Thing to your Profile" -msgstr "Adicionar a coisa ao seu perfil" +#: ../../mod/connections.php:310 +msgid "Only show archived connections" +msgstr "Exibir apenas conexões arquivadas" -#: ../../mod/attach.php:9 -msgid "Item not available." -msgstr "O item não está disponível." +#: ../../mod/connections.php:317 +msgid "Only show hidden connections" +msgstr "Exibir apenas conexões ocultas" -#: ../../mod/probe.php:24 ../../mod/probe.php:30 +#: ../../mod/connections.php:372 #, php-format -msgid "Fetching URL returns error: %1$s" -msgstr "Carregar o URL retorna o erro: %1$s" +msgid "%1$s [%2$s]" +msgstr "%1$s [%2$s]" -#: ../../mod/home.php:53 ../../mod/siteinfo.php:155 -msgid "$Projectname" -msgstr "$Projectname" +#: ../../mod/connections.php:373 +msgid "Edit connection" +msgstr "Editar conexão" -#: ../../mod/home.php:124 -#, php-format -msgid "Welcome to %s" -msgstr "Bem-vindo(a) a %s" +#: ../../mod/connections.php:411 +msgid "Search your connections" +msgstr "Pesquisar em suas conexões" -#: ../../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." +#: ../../mod/connections.php:412 +msgid "Finding: " +msgstr "Pesquisando: " -#: ../../mod/profile_photo.php:162 -msgid "Image resize failed." -msgstr "Falha ao modificar o tamanho da imagem." +#: ../../mod/blocks.php:95 ../../mod/blocks.php:148 +msgid "Block Name" +msgstr "Nome do bloco" -#: ../../mod/profile_photo.php:206 -msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." -msgstr "Se a nova foto não aparecer imediatamente, recarregue a página segurando a tecla \"shift\" ou limpe o cache do navegador, " +#: ../../mod/blocks.php:149 +msgid "Block Title" +msgstr "Título do Bloco" -#: ../../mod/profile_photo.php:233 -#, php-format -msgid "Image exceeds size limit of %d" -msgstr "A imagem excede o limite de tamanho de %d" +#: ../../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/profile_photo.php:242 -msgid "Unable to process image." -msgstr "Não foi possível processar a imagem." +#: ../../mod/editpost.php:31 +msgid "Item is not editable" +msgstr "O item não está editável" -#: ../../mod/profile_photo.php:291 ../../mod/profile_photo.php:340 -msgid "Photo not available." -msgstr "A foto não está disponível." +#: ../../mod/editpost.php:48 +msgid "Delete item?" +msgstr "Deletar item?" -#: ../../mod/profile_photo.php:359 -msgid "Upload File:" -msgstr "Enviar arquivo:" +#: ../../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/profile_photo.php:360 -msgid "Select a profile:" -msgstr "Selecione um perfil:" +#: ../../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/profile_photo.php:361 -msgid "Upload Profile Photo" -msgstr "Enviar foto do perfil" +#: ../../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/profile_photo.php:366 -msgid "skip this step" -msgstr "pule esta etapa" +#: ../../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/profile_photo.php:366 -msgid "select a photo from your photo albums" -msgstr "selecione uma foto do seu álbum de fotos" +#: ../../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/profile_photo.php:382 -msgid "Crop Image" -msgstr "Cortar a imagem" +#: ../../mod/photos.php:98 +msgid "Album not found." +msgstr "O álbum não foi encontrado." -#: ../../mod/profile_photo.php:383 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "Por favor, ajuste o corte da imagem para a melhor visualização." +#: ../../mod/photos.php:120 ../../mod/photos.php:655 +msgid "Delete Album" +msgstr "Excluir o álbum" -#: ../../mod/profile_photo.php:385 -msgid "Done Editing" -msgstr "Encerrar a edição" +#: ../../mod/photos.php:160 ../../mod/photos.php:942 +msgid "Delete Photo" +msgstr "Excluir a foto" -#: ../../mod/profile_photo.php:428 -msgid "Image uploaded successfully." -msgstr "A imagem foi enviada com sucesso." +#: ../../mod/photos.php:452 +msgid "No photos selected" +msgstr "Não foi selecionada nenhuma foto" -#: ../../mod/profile_photo.php:430 -msgid "Image upload failed." -msgstr "Não foi possível enviar a imagem." +#: ../../mod/photos.php:496 +msgid "Access to this item is restricted." +msgstr "O acesso a este item está restrito." -#: ../../mod/profile_photo.php:439 +#: ../../mod/photos.php:535 #, php-format -msgid "Image size reduction [%s] failed." -msgstr "Não foi possível reduzir o tamanho da imagem [%s]." +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/block.php:27 ../../mod/page.php:33 -msgid "Invalid item." -msgstr "Item inválido." +#: ../../mod/photos.php:538 +#, php-format +msgid "%1$.2f MB photo storage used." +msgstr "Utilizados %1$.2f MB para armazenamento de fotos." -#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:49 -msgid "Channel not found." -msgstr "O canal não foi encontrado." +#: ../../mod/photos.php:562 +msgid "Upload Photos" +msgstr "Enviar fotos" -#: ../../mod/block.php:75 ../../mod/help.php:79 ../../mod/display.php:106 -#: ../../mod/page.php:85 ../../index.php:241 -msgid "Page not found." -msgstr "Página não encontrada." +#: ../../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/like.php:15 -msgid "Like/Dislike" -msgstr "Gostar/Desgostar" +#: ../../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:568 +msgid "Create a status post for this upload" +msgstr "Crie uma publicação de status para este upload." + +#: ../../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:637 ../../mod/photos.php:1169 +#: ../../mod/photos.php:1185 +msgid "Contact Photos" +msgstr "Fotos dos contatos" + +#: ../../mod/photos.php:661 +msgid "Show Newest First" +msgstr "Exibir primeiro os mais recentes" + +#: ../../mod/photos.php:663 +msgid "Show Oldest First" +msgstr "Exibir primeiro os mais antigos" + +#: ../../mod/photos.php:687 ../../mod/photos.php:1217 +msgid "View Photo" +msgstr "Ver a foto" -#: ../../mod/like.php:20 -msgid "This action is restricted to members." -msgstr "Esta ação é restrita a membros." +#: ../../mod/photos.php:716 +msgid "Edit Album" +msgstr "Editar o álbum" -#: ../../mod/like.php:21 -msgid "" -"Please login with your $Projectname ID or register as a new $Projectname member to continue." -msgstr "Por favor entre com sua $Projectname ID ou registre-se como novo membro da $Projectname para continuar." +#: ../../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/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166 -msgid "Invalid request." -msgstr "Solicitação inválida." +#: ../../mod/photos.php:763 +msgid "Photo not available" +msgstr "A foto não está disponível" -#: ../../mod/like.php:143 -msgid "thing" -msgstr "coisa" +#: ../../mod/photos.php:821 +msgid "Use as profile photo" +msgstr "Usar como uma foto de perfil" -#: ../../mod/like.php:189 -msgid "Channel unavailable." -msgstr "Canal não disponível." +#: ../../mod/photos.php:828 +msgid "Private Photo" +msgstr "Foto privada" -#: ../../mod/like.php:228 -msgid "Previous action reversed." -msgstr "Ação anterior revertida." +#: ../../mod/photos.php:843 +msgid "View Full Size" +msgstr "Ver no tamanho real" -#: ../../mod/like.php:398 -#, php-format -msgid "%1$s agrees with %2$s's %3$s" -msgstr "%1$s concordam com %2$s %3$s" +#: ../../mod/photos.php:921 +msgid "Edit photo" +msgstr "Editar a foto" -#: ../../mod/like.php:400 -#, php-format -msgid "%1$s doesn't agree with %2$s's %3$s" -msgstr "%1$s não concordam com %2$s %3$s" +#: ../../mod/photos.php:923 +msgid "Rotate CW (right)" +msgstr "Rotacionar H (horário)" -#: ../../mod/like.php:402 -#, php-format -msgid "%1$s abstains from a decision on %2$s's %3$s" -msgstr "%1$s se abstém da decisão sobre %2$s %3$s" +#: ../../mod/photos.php:924 +msgid "Rotate CCW (left)" +msgstr "Rotacionar AH (anti-horário)" -#: ../../mod/like.php:404 -#, php-format -msgid "%1$s is attending %2$s's %3$s" -msgstr "%1$s comparecerá em %3$s de %2$s" +#: ../../mod/photos.php:931 +msgid "Caption" +msgstr "Legenda" -#: ../../mod/like.php:406 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" -msgstr "%1$s não comparecerá em %3$s de %2$s" +#: ../../mod/photos.php:933 +msgid "Add a Tag" +msgstr "Adicionar uma etiqueta" -#: ../../mod/like.php:408 -#, php-format -msgid "%1$s may attend %2$s's %3$s" -msgstr "%1$s talvez compareça em %3$s de %2$s" +#: ../../mod/photos.php:937 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" +msgstr "Exemplo: @beto, @Barbara_Almeida, @julia@exemplo.com" -#: ../../mod/like.php:492 -msgid "Action completed." -msgstr "Ação completada." +#: ../../mod/photos.php:940 +msgid "Flag as adult in album view" +msgstr "Sinalizar como adulto na apresentação de álbuns" -#: ../../mod/like.php:493 -msgid "Thank you." -msgstr "Obrigado." +#: ../../mod/photos.php:1132 +msgid "In This Photo:" +msgstr "Nesta foto:" -#: ../../mod/events.php:87 -msgid "Event can not end before it has started." -msgstr "Um evento não pode terminar antes de seu início." +#: ../../mod/photos.php:1137 +msgid "Map" +msgstr "Mapa" -#: ../../mod/events.php:89 ../../mod/events.php:98 ../../mod/events.php:116 -msgid "Unable to generate preview." -msgstr "Não pode gerar pré-visualização." +#: ../../mod/photos.php:1223 +msgid "View Album" +msgstr "Ver álbum" -#: ../../mod/events.php:96 -msgid "Event title and start time are required." -msgstr "O título do evento e a hora de início são obrigatórios." +#: ../../mod/photos.php:1246 +msgid "Recent Photos" +msgstr "Fotos recentes" -#: ../../mod/events.php:114 -msgid "Event not found." -msgstr "Evento não encontrado." +#: ../../mod/search.php:206 +#, php-format +msgid "Items tagged with: %s" +msgstr "Items etiquetados com: %s" -#: ../../mod/events.php:396 -msgid "l, F j" -msgstr "l, F j" +#: ../../mod/search.php:208 +#, php-format +msgid "Search results for: %s" +msgstr "Resultados da busca por: %s" -#: ../../mod/events.php:418 -msgid "Edit event" -msgstr "Editar o evento" +#: ../../mod/match.php:22 +msgid "Profile Match" +msgstr "Correspondência de perfil" -#: ../../mod/events.php:419 -msgid "Delete event" -msgstr "Excluir evento" +#: ../../mod/match.php:31 +msgid "No keywords to match. Please add keywords to your default profile." +msgstr "Nenhuma palavra-chave para combinar. Por favor, adicione palavras-chave ao seu perfil padrão." -#: ../../mod/events.php:473 -msgid "Create New Event" -msgstr "Criar um novo evento" +#: ../../mod/match.php:63 +msgid "is interested in:" +msgstr "se interessa por:" -#: ../../mod/events.php:474 ../../mod/photos.php:827 -msgid "Previous" -msgstr "Anterior" +#: ../../mod/match.php:70 +msgid "No matches" +msgstr "Nenhuma correspondência" -#: ../../mod/events.php:475 ../../mod/setup.php:265 ../../mod/photos.php:836 -msgid "Next" -msgstr "Próximo" +#: ../../mod/chatsvc.php:111 +msgid "Away" +msgstr "Ausente" -#: ../../mod/events.php:476 -msgid "Export" -msgstr "Exportar" +#: ../../mod/chatsvc.php:115 +msgid "Online" +msgstr "Online" -#: ../../mod/events.php:504 -msgid "Event removed" -msgstr "Evento removido" +#: ../../mod/rbmark.php:88 +msgid "Select a bookmark folder" +msgstr "Escolha uma pasta de links onde guardar" -#: ../../mod/events.php:507 -msgid "Failed to remove event" -msgstr "Falha ao excluir evento" +#: ../../mod/rbmark.php:93 +msgid "Save Bookmark" +msgstr "Guardar link" -#: ../../mod/events.php:627 -msgid "Event details" -msgstr "Detalhes do evento" +#: ../../mod/rbmark.php:94 +msgid "URL of bookmark" +msgstr "URL do link guardado" -#: ../../mod/events.php:628 -msgid "Starting date and Title are required." -msgstr "Data de início e título são obrigatórios." +#: ../../mod/rbmark.php:95 ../../mod/appman.php:93 +msgid "Description" +msgstr "Descrição" -#: ../../mod/events.php:630 -msgid "Categories (comma-separated list)" -msgstr "Categorias (lista separada por vírgulas)" +#: ../../mod/rbmark.php:99 +msgid "Or enter new bookmark folder name" +msgstr "Ou digite o nome para uma nova pasta de links" -#: ../../mod/events.php:632 -msgid "Event Starts:" -msgstr "Início do evento:" +#: ../../mod/notify.php:53 ../../mod/notifications.php:94 +msgid "No more system notifications." +msgstr "Sem novas notificações do sistema." -#: ../../mod/events.php:639 -msgid "Finish date/time is not known or not relevant" -msgstr "A data/hora de término não é conhecida ou não é relevante" +#: ../../mod/notify.php:57 ../../mod/notifications.php:98 +msgid "System Notifications" +msgstr "Notificações do sistema" -#: ../../mod/events.php:641 -msgid "Event Finishes:" -msgstr "Término do evento:" +#: ../../mod/acl.php:231 +msgid "network" +msgstr "+ rede" -#: ../../mod/events.php:643 ../../mod/events.php:644 -msgid "Adjust for viewer timezone" -msgstr "Ajustar para o fuso horário do visualizador" +#: ../../mod/acl.php:241 +msgid "RSS" +msgstr "RSS" -#: ../../mod/events.php:643 -msgid "" -"Important for events that happen in a particular place. Not practical for " -"global holidays." -msgstr "Importante para eventos que ocorrem em um lugar específico. Não prático para feriados globais." +#: ../../mod/pdledit.php:13 +msgid "Layout updated." +msgstr "Layout atualizado." -#: ../../mod/events.php:645 -msgid "Description:" -msgstr "Descrição:" +#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53 +msgid "Edit System Page Description" +msgstr "Editar descrição de página do sistema" -#: ../../mod/events.php:649 -msgid "Title:" -msgstr "Título:" +#: ../../mod/pdledit.php:48 +msgid "Layout not found." +msgstr "Layout não encontrado." -#: ../../mod/events.php:651 -msgid "Share this event" -msgstr "Compartilhar este evento" +#: ../../mod/pdledit.php:54 +msgid "Module Name:" +msgstr "Nome do módulo:" -#: ../../mod/subthread.php:103 -#, php-format -msgid "%1$s is following %2$s's %3$s" -msgstr "%1$s está acompanhando %3$s de %2$s" +#: ../../mod/pdledit.php:55 +msgid "Layout Help" +msgstr "Ajuda de layout" -#: ../../mod/pubsites.php:16 -msgid "Public Sites" -msgstr "Sites públicos" +#: ../../mod/filer.php:49 +msgid "- select -" +msgstr "- selecionar -" -#: ../../mod/pubsites.php:19 -msgid "" -"The listed sites allow public registration for the $Projectname network. All" -" sites in the network are interlinked so membership on any of them conveys " -"membership in the network as a whole. Some sites may require subscription or" -" provide tiered service plans. The provider links may " -"provide additional details." -msgstr "Os sites listados permitem ao público geral registrar contas na $Projectname. Todos os sites na matrix são interligados, portanto ser membro em qualquer um deles te torna membro na matrix como um todo. Alguns sites podem solicitar uma assinatura ou prover planos em níveis. Os links para cada provedor podem fornecer mais detalhes." +#: ../../mod/import.php:25 +#, php-format +msgid "Your service plan only allows %d channels." +msgstr "Seu plano de serviço permite apenas %d canais." -#: ../../mod/pubsites.php:25 -msgid "Rate this hub" -msgstr "Avalie esse hub." +#: ../../mod/import.php:60 +msgid "Nothing to import." +msgstr "Nada a importar." -#: ../../mod/pubsites.php:26 -msgid "Site URL" -msgstr "URL do site" +#: ../../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/pubsites.php:26 -msgid "Access Type" -msgstr "Tipo de acesso" +#: ../../mod/import.php:90 +msgid "Imported file is empty." +msgstr "O arquivo importado está vazio." -#: ../../mod/pubsites.php:26 -msgid "Registration Policy" -msgstr "Política de registro" +#: ../../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/pubsites.php:26 ../../mod/profiles.php:454 -msgid "Location" -msgstr "Localização" +#: ../../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/pubsites.php:26 -msgid "View hub ratings" -msgstr "Ver avaliações do hub" +#: ../../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/pubsites.php:30 -msgid "Rate" -msgstr "Avalie" +#: ../../mod/import.php:176 +msgid "Channel clone failed. Import failed." +msgstr "Clonagem do canal falhou. A importação falhou." -#: ../../mod/pubsites.php:31 -msgid "View ratings" -msgstr "Veja avaliações" +#: ../../mod/import.php:186 +msgid "Cloned channel not found. Import failed." +msgstr "Canal a clonar não encontrado. A importação falhou." -#: ../../mod/rpost.php:131 ../../mod/editpost.php:42 -msgid "Edit post" -msgstr "Editar a publicação" +#: ../../mod/import.php:516 +msgid "You must be logged in to use this feature." +msgstr "Você precisa estar autenticado para usar este recurso." -#: ../../mod/dav.php:121 -msgid "$Projectname channel" -msgstr "Canal na $Projectname" +#: ../../mod/import.php:521 +msgid "Import Channel" +msgstr "Importar canal" -#: ../../mod/group.php:20 -msgid "Collection created." -msgstr "A coleção foi criada." +#: ../../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 "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/group.php:26 -msgid "Could not create collection." -msgstr "Não foi possível criar a coleção." +#: ../../mod/import.php:523 +msgid "File to Upload" +msgstr "Arquivo a carregar" -#: ../../mod/group.php:54 -msgid "Collection updated." -msgstr "Coleção atualizada" +#: ../../mod/import.php:524 +msgid "Or provide the old server/hub details" +msgstr "Ou forneça os detalhes do antigo servidor/hub" -#: ../../mod/group.php:86 -msgid "Create a collection of channels." -msgstr "Criar uma coleção de canais." +#: ../../mod/import.php:525 +msgid "Your old identity address (xyz@example.com)" +msgstr "O endereço da sua velha identidade (xyz@exemplo.com)" -#: ../../mod/group.php:87 ../../mod/group.php:183 -msgid "Collection Name: " -msgstr "Nome da coleção:" +#: ../../mod/import.php:526 +msgid "Your old login email address" +msgstr "O endereço de e-mail da sua antiga conta" -#: ../../mod/group.php:89 ../../mod/group.php:186 -msgid "Members are visible to other channels" -msgstr "Membros são visíveis para outros canais" +#: ../../mod/import.php:527 +msgid "Your old login password" +msgstr "A senha dua sua antiga conta" -#: ../../mod/group.php:107 -msgid "Collection removed." -msgstr "Coleção removida." +#: ../../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" +" able to post from either location, but only one can be marked as the " +"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/group.php:109 -msgid "Unable to remove collection." -msgstr "Não foi possível remover a coleção." +#: ../../mod/import.php:529 +msgid "Make this hub my primary location" +msgstr "Faça deste hub meu local primário" -#: ../../mod/group.php:182 -msgid "Collection Editor" -msgstr "Editor de coleção" +#: ../../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/group.php:196 ../../mod/bulksetclose.php:89 -msgid "Members" -msgstr "Membros" +#: ../../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/group.php:198 ../../mod/bulksetclose.php:91 -msgid "All Connected Channels" -msgstr "Todas os canais conectados" +#: ../../mod/editlayout.php:111 +msgid "Delete layout?" +msgstr "Deletar layout?" -#: ../../mod/group.php:233 ../../mod/bulksetclose.php:126 -msgid "Click on a channel to add or remove." -msgstr "Clique em um canal para adicionar ou remover." +#: ../../mod/editlayout.php:158 ../../mod/layouts.php:124 +msgid "Layout Description (Optional)" +msgstr "Descrição do Layout. (Opcional)" -#: ../../mod/siteinfo.php:112 -#, php-format -msgid "Version %s" -msgstr "Versão %s" +#: ../../mod/editlayout.php:160 ../../mod/layouts.php:121 +#: ../../mod/layouts.php:179 +msgid "Layout Name" +msgstr "Nome do layout" -#: ../../mod/siteinfo.php:133 -msgid "Installed plugins/addons/apps:" -msgstr "Plugins/complementos/aplicações instalados:" +#: ../../mod/editlayout.php:177 +msgid "Edit Layout" +msgstr "Editar layout" -#: ../../mod/siteinfo.php:146 -msgid "No installed plugins/addons/apps" -msgstr "Nenhum plugin/complemento/aplicação instalado" +#: ../../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." -#: ../../mod/siteinfo.php:156 -msgid "" -"This is a hub of $Projectname - a global cooperative network of " -"decentralized privacy enhanced websites." -msgstr "Este é um hub da $Projectname - uma rede global cooperativa de websites descentralizados com privacidade aprimorada." +#: ../../mod/chat.php:167 +msgid "Room not found" +msgstr "Sala não encontrada" -#: ../../mod/siteinfo.php:158 -msgid "Tag: " -msgstr "Etiqueta:" +#: ../../mod/chat.php:178 +msgid "Leave Room" +msgstr "Sair da sala" -#: ../../mod/siteinfo.php:160 -msgid "Last background fetch: " -msgstr "Buscar último fundo:" +#: ../../mod/chat.php:179 +msgid "Delete This Room" +msgstr "Deletar esta sala" -#: ../../mod/siteinfo.php:163 -msgid "Running at web location" -msgstr "Sendo executado no endereço web" +#: ../../mod/chat.php:180 +msgid "I am away right now" +msgstr "Eu estou ausente no momento" -#: ../../mod/siteinfo.php:164 -msgid "" -"Please visit redmatrix.me to learn more" -" about $Projectname." -msgstr "Por favor visite redmatrix.me para aprender mais sobre a $Projectname." +#: ../../mod/chat.php:181 +msgid "I am online" +msgstr "Eu estou online" -#: ../../mod/siteinfo.php:165 -msgid "Bug reports and issues: please visit" -msgstr "Relatos e acompanhamentos de erros podem ser encontrados em" +#: ../../mod/chat.php:183 +msgid "Bookmark this room" +msgstr "Guarde esta sala" -#: ../../mod/siteinfo.php:168 -msgid "" -"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot " -"com" -msgstr "Sugestões, elogios, etc - mande um e-mail para \"redmatrix\" arrôba librelist ponto com" +#: ../../mod/chat.php:207 ../../mod/chat.php:229 +msgid "New Chatroom" +msgstr "Nova sala de bate-papo" -#: ../../mod/siteinfo.php:170 -msgid "Site Administrators" -msgstr "Administradores do site" +#: ../../mod/chat.php:208 +msgid "Chatroom Name" +msgstr "Nome da sala de bate-papo" -#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61 -msgid "Help:" -msgstr "Ajuda:" +#: ../../mod/chat.php:225 +#, php-format +msgid "%1$s's Chatrooms" +msgstr "Salas de bate-papo de %1$s" -#: ../../mod/help.php:76 ../../index.php:238 -msgid "Not Found" -msgstr "Não encontrada" +#: ../../mod/mitem.php:24 ../../mod/menu.php:134 +msgid "Menu not found." +msgstr "O menu não foi encontrado." -#: ../../mod/setup.php:166 -msgid "$Projectname Server - Setup" -msgstr "Servidor $Projectname - Configuração" +#: ../../mod/mitem.php:48 +msgid "Unable to create element." +msgstr "Não foi possível criar elemento." -#: ../../mod/setup.php:172 -msgid "Could not connect to database." -msgstr "Não foi possível conectar ao banco de dados." +#: ../../mod/mitem.php:71 +msgid "Unable to update menu element." +msgstr "Não foi possível atualizar o elemento de menu." -#: ../../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/mitem.php:86 +msgid "Unable to add menu element." +msgstr "Não foi possível adicionar o elemento de menu." -#: ../../mod/setup.php:183 -msgid "Could not create table." -msgstr "Não foi possível criar a tabela." +#: ../../mod/mitem.php:152 ../../mod/mitem.php:223 +msgid "Menu Item Permissions" +msgstr "Permissões do item do menu" -#: ../../mod/setup.php:189 -msgid "Your site database has been installed." -msgstr "O banco de dados do seu site foi instalado." +#: ../../mod/mitem.php:153 ../../mod/mitem.php:224 ../../mod/settings.php:1083 +msgid "(click to open/close)" +msgstr "(clique para abrir/fechar)" -#: ../../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/mitem.php:155 ../../mod/mitem.php:171 +msgid "Link Name" +msgstr "Nome do Link" -#: ../../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/mitem.php:156 ../../mod/mitem.php:228 +msgid "Link or Submenu Target" +msgstr "Alvo do Link ou Submenu" -#: ../../mod/setup.php:261 -msgid "System check" -msgstr "Checagem do sistema" +#: ../../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/setup.php:266 -msgid "Check again" -msgstr "Cheque novamente" +#: ../../mod/mitem.php:157 ../../mod/mitem.php:229 +msgid "Use magic-auth if available" +msgstr "Usar magic-auth se disponível" -#: ../../mod/setup.php:289 -msgid "Database connection" -msgstr "Conexão ao banco de dados" +#: ../../mod/mitem.php:158 ../../mod/mitem.php:230 +msgid "Open link in new window" +msgstr "Abrir link em uma nova janela" -#: ../../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/mitem.php:159 ../../mod/mitem.php:231 +msgid "Order in list" +msgstr "Ordem na lista" -#: ../../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/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/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/mitem.php:160 +msgid "Submit and finish" +msgstr "Enviar e terminar" -#: ../../mod/setup.php:296 -msgid "Database Server Name" -msgstr "Nome do servidor de banco de dados" +#: ../../mod/mitem.php:161 +msgid "Submit and continue" +msgstr "Enviar e continuar" -#: ../../mod/setup.php:296 -msgid "Default is localhost" -msgstr "O default é localhost" +#: ../../mod/mitem.php:169 +msgid "Menu:" +msgstr "Menu:" -#: ../../mod/setup.php:297 -msgid "Database Port" -msgstr "Porta do banco de dados" +#: ../../mod/mitem.php:172 +msgid "Link Target" +msgstr "Alvo do Link" + +#: ../../mod/mitem.php:175 +msgid "Edit menu" +msgstr "Editar menu" -#: ../../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/mitem.php:178 +msgid "Edit element" +msgstr "Editar elemento" -#: ../../mod/setup.php:298 -msgid "Database Login Name" -msgstr "Nome do usuário do banco de dados" +#: ../../mod/mitem.php:179 +msgid "Drop element" +msgstr "Descartar elemento" -#: ../../mod/setup.php:299 -msgid "Database Login Password" -msgstr "Senha do usuário do banco de dados" +#: ../../mod/mitem.php:180 +msgid "New element" +msgstr "Novo elemento" -#: ../../mod/setup.php:300 -msgid "Database Name" -msgstr "Nome do banco de dados" +#: ../../mod/mitem.php:181 +msgid "Edit this menu container" +msgstr "Editar esta caixa de menu" -#: ../../mod/setup.php:301 -msgid "Database Type" -msgstr "Tipo do banco de dados" +#: ../../mod/mitem.php:182 +msgid "Add menu element" +msgstr "Adicionar um elemento de menu" -#: ../../mod/setup.php:303 ../../mod/setup.php:347 -msgid "Site administrator email address" -msgstr "Endereço de email do administrador do site" +#: ../../mod/mitem.php:183 +msgid "Delete this menu item" +msgstr "Deleter este item de menu" -#: ../../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/mitem.php:184 +msgid "Edit this menu item" +msgstr "Editar este item de menu" -#: ../../mod/setup.php:304 ../../mod/setup.php:349 -msgid "Website URL" -msgstr "URL do website" +#: ../../mod/mitem.php:201 +msgid "Menu item not found." +msgstr "O item de menu não foi encontrado." -#: ../../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/mitem.php:212 +msgid "Menu item deleted." +msgstr "O item de menu foi deletado." -#: ../../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/mitem.php:214 +msgid "Menu item could not be deleted." +msgstr "Não foi possível deletar o item de menu." -#: ../../mod/setup.php:335 -msgid "Site settings" -msgstr "Configurações do site" +#: ../../mod/mitem.php:221 +msgid "Edit Menu Element" +msgstr "Editar elemento de menu" -#: ../../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/mitem.php:227 +msgid "Link text" +msgstr "Texto do link" -#: ../../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/editwebpage.php:152 +msgid "Delete webpage?" +msgstr "Deletar página web?" -#: ../../mod/setup.php:400 -msgid "PHP executable path" -msgstr "Caminho para o executável do PHP" +#: ../../mod/editwebpage.php:173 +msgid "Page link title" +msgstr "Título do link da página" -#: ../../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/editwebpage.php:224 +msgid "Edit Webpage" +msgstr "Editar página web" -#: ../../mod/setup.php:405 -msgid "Command line PHP" -msgstr "PHP em linha de comando" +#: ../../mod/dirsearch.php:29 +msgid "This directory server requires an access token" +msgstr "O servidor deste diretório requer um token de acesso" -#: ../../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/lostpass.php:15 +msgid "No valid account found." +msgstr "Não foi encontrada uma conta válida." -#: ../../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/lostpass.php:29 +msgid "Password reset request issued. Check your email." +msgstr "A solicitação de restauração de senha foi encaminhada. Verifique seu e-mail." -#: ../../mod/setup.php:417 -msgid "PHP register_argc_argv" -msgstr "PHP register_argc_argv" +#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 +#, php-format +msgid "Site Member (%s)" +msgstr "Membro do site (%s)" -#: ../../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/lostpass.php:40 +#, php-format +msgid "Password reset requested at %s" +msgstr "Foi feita uma solicitação de restauração de senha em %s" -#: ../../mod/setup.php:439 +#: ../../mod/lostpass.php:63 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\"." +"Request could not be verified. (You may have previously submitted it.) " +"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/setup.php:441 -msgid "Generate encryption keys" -msgstr "Gerar chaves de criptografia" +#: ../../mod/lostpass.php:85 ../../boot.php:1559 +msgid "Password Reset" +msgstr "Reiniciar a senha" -#: ../../mod/setup.php:448 -msgid "libCurl PHP module" -msgstr "Módulo PHP libCurl" +#: ../../mod/lostpass.php:86 +msgid "Your password has been reset as requested." +msgstr "Sua senha foi restaurada, conforme solicitado." -#: ../../mod/setup.php:449 -msgid "GD graphics PHP module" -msgstr "Módulo PHP GD graphics" +#: ../../mod/lostpass.php:87 +msgid "Your new password is" +msgstr "Sua nova senha é" -#: ../../mod/setup.php:450 -msgid "OpenSSL PHP module" -msgstr "Módulo PHP OpenSSL" +#: ../../mod/lostpass.php:88 +msgid "Save or copy your new password - and then" +msgstr "Salve ou copie a sua nova senha e, então" -#: ../../mod/setup.php:451 -msgid "mysqli or postgres PHP module" -msgstr "módulo 'mysqli' ou 'postgres' do PHP" +#: ../../mod/lostpass.php:89 +msgid "click here to login" +msgstr "clique aqui para entrar" -#: ../../mod/setup.php:452 -msgid "mb_string PHP module" -msgstr "Módulo PHP mb_string " +#: ../../mod/lostpass.php:90 +msgid "" +"Your password may be changed from the Settings page after " +"successful login." +msgstr "Sua senha pode ser alterada na página de Configurações após você entrar em sua conta." -#: ../../mod/setup.php:453 -msgid "mcrypt PHP module" -msgstr "Módulo PHP mcrypt" +#: ../../mod/lostpass.php:107 +#, php-format +msgid "Your password has changed at %s" +msgstr "Sua senha foi modificada em %s" -#: ../../mod/setup.php:458 ../../mod/setup.php:460 -msgid "Apache mod_rewrite module" -msgstr "Módulo mod_rewrite do Apache" +#: ../../mod/lostpass.php:122 +msgid "Forgot your Password?" +msgstr "Esqueceu a sua senha?" -#: ../../mod/setup.php:458 +#: ../../mod/lostpass.php:123 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" +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." +msgstr "Digite o seu endereço de e-mail e clique em 'Restaurar' para prosseguir com a restauração da sua senha. Após isso, verifique seu e-mail para mais instruções." -#: ../../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/lostpass.php:124 +msgid "Email Address" +msgstr "Endereço de e-mail" -#: ../../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/lostpass.php:125 +msgid "Reset" +msgstr "Restaurar" -#: ../../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/rate.php:157 +msgid "Website:" +msgstr "Sítio web:" -#: ../../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/rate.php:160 +#, php-format +msgid "Remote Channel [%s] (not yet known on this site)" +msgstr "Canal Remoto [%s] (ainda não conhecido neste sítio)" -#: ../../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/rate.php:161 +msgid "Rating (this information is public)" +msgstr "Avaliações (essa informação é pública)" -#: ../../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/rate.php:162 +msgid "Optionally explain your rating (this information is public)" +msgstr "Opcionalmente justifique sua avaliação (essa informação é pública)" -#: ../../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/editblock.php:117 +msgid "Delete block?" +msgstr "Deletar bloco?" -#: ../../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/editblock.php:179 +msgid "Edit Block" +msgstr "Editar bloco" -#: ../../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/invite.php:25 +msgid "Total invitation limit exceeded." +msgstr "Foi excedido o número total de convites." -#: ../../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/invite.php:49 +#, php-format +msgid "%s : Not a valid email address." +msgstr "%s : Não é um endereço de e-mail válido." -#: ../../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/invite.php:76 +msgid "Please join us on Red" +msgstr "Por favor, una-se a nós na Red" -#: ../../mod/setup.php:514 -msgid ".htconfig.php is writable" -msgstr ".htconfig.php tem permissão de escrita" +#: ../../mod/invite.php:87 +msgid "Invitation limit exceeded. Please contact your site administrator." +msgstr "Você excedeu o limite de convites. Por favor, entre em contato com o administrador do site." -#: ../../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/invite.php:92 +#, php-format +msgid "%s : Message delivery failed." +msgstr "%s : Não foi possível enviar a mensagem." -#: ../../mod/setup.php:525 +#: ../../mod/invite.php:96 #, 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." +msgid "%d message sent." +msgid_plural "%d messages sent." +msgstr[0] "%d mensagem enviada." +msgstr[1] "%d mensagens enviadas." + +#: ../../mod/invite.php:115 +msgid "You have no more invitations available" +msgstr "Você não possui mais convites disponíveis" -#: ../../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/invite.php:129 +msgid "Send invitations" +msgstr "Enviar convites." -#: ../../mod/setup.php:527 -#, 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/invite.php:130 +msgid "Enter email addresses, one per line:" +msgstr "Digite os endereços de e-mail, um por linha:" -#: ../../mod/setup.php:530 -#, php-format -msgid "%s is writable" -msgstr "%s tem permissão de escrita" +#: ../../mod/invite.php:131 ../../mod/mail.php:235 ../../mod/mail.php:348 +msgid "Your message:" +msgstr "Sua mensagem:" -#: ../../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/invite.php:132 +msgid "Please join my community on $Projectname." +msgstr "Por favor junte-se à minha comunidade na $Projectname." -#: ../../mod/setup.php:547 -msgid "store is writable" -msgstr "store tem permissão de escrita" +#: ../../mod/invite.php:134 +msgid "You will need to supply this invitation code: " +msgstr "Você precisará fornecer este código de convite:" -#: ../../mod/setup.php:577 +#: ../../mod/invite.php:135 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." +"1. Register at any $Projectname location (they are all inter-connected)" +msgstr "1. Registre-se em qualquer site da $Projectname (eles são todos interconectados)" -#: ../../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/invite.php:137 +msgid "2. Enter my $Projectname network address into the site searchbar." +msgstr "2. Entre com meu endereço da $Projectname na barra de busca do site." -#: ../../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/invite.php:138 +msgid "or visit " +msgstr "ou visite" -#: ../../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/invite.php:140 +msgid "3. Click [Connect]" +msgstr "3. Clique [Conectar]" -#: ../../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/locs.php:21 ../../mod/locs.php:52 +msgid "Location not found." +msgstr "A localização não foi encontrada." -#: ../../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." +#: ../../mod/locs.php:56 +msgid "Primary location cannot be removed." +msgstr "A localização primária não pode ser removida." -#: ../../mod/setup.php:584 -msgid "SSL certificate validation" -msgstr "Validação do certificado SSL" +#: ../../mod/locs.php:88 +msgid "No locations found." +msgstr "Nenhuma localização encontrada." -#: ../../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/locs.php:101 +msgid "Manage Channel Locations" +msgstr "Gerenciar localizações do canal" -#: ../../mod/setup.php:592 -msgid "Url rewrite is working" -msgstr "A reescrita de URLs está funcionando" +#: ../../mod/locs.php:102 +msgid "Location (address)" +msgstr "Localização (endereço)" -#: ../../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/locs.php:103 +msgid "Primary Location" +msgstr "Localização primária" -#: ../../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/locs.php:104 +msgid "Drop location" +msgstr "Descartar localização" -#: ../../mod/setup.php:660 -msgid "

What next

" -msgstr "

Próximos passos

" +#: ../../mod/sources.php:32 +msgid "Failed to create source. No channel selected." +msgstr "Falha ao criar a fonte. Nenhum canal selecionado." -#: ../../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/sources.php:45 +msgid "Source created." +msgstr "A fonte foi criada." -#: ../../mod/common.php:10 -msgid "No channel." -msgstr "Nenhum canal." +#: ../../mod/sources.php:57 +msgid "Source updated." +msgstr "A fonte foi atualizada." -#: ../../mod/common.php:39 -msgid "Common connections" -msgstr "Conexões em comum" +#: ../../mod/sources.php:82 +msgid "*" +msgstr "*" -#: ../../mod/common.php:44 -msgid "No connections in common." -msgstr "Nenhuma conexão em comum." +#: ../../mod/sources.php:89 +msgid "Manage remote sources of content for your channel." +msgstr "Administrar as fontes remotas de conteúdo para o seu canal." -#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21 -msgid "This site is not a directory server" -msgstr "Este site não é um servidor de diretório" +#: ../../mod/sources.php:90 ../../mod/sources.php:100 +msgid "New Source" +msgstr "Nova fonte" -#: ../../mod/connections.php:37 ../../mod/connedit.php:75 -msgid "Could not access contact record." -msgstr "Não foi possível acessar o registro do contato." +#: ../../mod/sources.php:101 ../../mod/sources.php:133 +msgid "" +"Import all or selected content from the following channel into this channel " +"and distribute it according to your channel settings." +msgstr "Importar todo ou uma seleção do conteúdo do seguinte canal para este canal, e distribuí-lo de acordo com as configurações do seu canal." -#: ../../mod/connections.php:51 ../../mod/connedit.php:99 -msgid "Could not locate selected profile." -msgstr "Não foi possível localizar o perfil selecionado." +#: ../../mod/sources.php:102 ../../mod/sources.php:134 +msgid "Only import content with these words (one per line)" +msgstr "Importar apenas conteúd com estas palavras (uma por linha)" -#: ../../mod/connections.php:94 ../../mod/connedit.php:214 -msgid "Connection updated." -msgstr "A conexão foi atualizada." +#: ../../mod/sources.php:102 ../../mod/sources.php:134 +msgid "Leave blank to import all public content" +msgstr "Deixe em branco para importar todo o conteúdo público" -#: ../../mod/connections.php:96 ../../mod/connedit.php:216 -msgid "Failed to update connection record." -msgstr "Não foi possível atualizar o registro da conexão." +#: ../../mod/sources.php:103 ../../mod/sources.php:137 +#: ../../mod/new_channel.php:112 +msgid "Channel Name" +msgstr "Nome do canal" -#: ../../mod/connections.php:192 ../../mod/connections.php:293 -msgid "Blocked" -msgstr "Bloqueado" +#: ../../mod/sources.php:123 ../../mod/sources.php:150 +msgid "Source not found." +msgstr "A fonte não foi encontrada." -#: ../../mod/connections.php:197 ../../mod/connections.php:300 -msgid "Ignored" -msgstr "Ignorado" +#: ../../mod/sources.php:130 +msgid "Edit Source" +msgstr "Editar fonte" -#: ../../mod/connections.php:202 ../../mod/connections.php:314 -msgid "Hidden" -msgstr "Oculto" +#: ../../mod/sources.php:131 +msgid "Delete Source" +msgstr "Deletar fonte" -#: ../../mod/connections.php:207 ../../mod/connections.php:307 -msgid "Archived" -msgstr "Arquivado" +#: ../../mod/sources.php:158 +msgid "Source removed" +msgstr "A fonte foi removida." -#: ../../mod/connections.php:271 -msgid "Suggest new connections" -msgstr "Sugerir novas conexões" +#: ../../mod/sources.php:160 +msgid "Unable to remove source." +msgstr "Não foi possível remover a fonte." -#: ../../mod/connections.php:274 -msgid "New Connections" -msgstr "Novas conexões" +#: ../../mod/menu.php:44 +msgid "Unable to update menu." +msgstr "Não foi possível atualizar o menu." -#: ../../mod/connections.php:277 -msgid "Show pending (new) connections" -msgstr "Exibir conexões pendentes (novas)" +#: ../../mod/menu.php:53 +msgid "Unable to create menu." +msgstr "Não foi possível criar o menu." -#: ../../mod/connections.php:280 ../../mod/profperm.php:139 -msgid "All Connections" -msgstr "Todas as conexões" +#: ../../mod/menu.php:89 ../../mod/menu.php:101 +msgid "Menu Name" +msgstr "Nome do Menu" -#: ../../mod/connections.php:283 -msgid "Show all connections" -msgstr "Exibir todas as conexões" +#: ../../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/connections.php:286 -msgid "Unblocked" -msgstr "Não bloqueado" +#: ../../mod/menu.php:90 ../../mod/menu.php:102 +msgid "Menu Title" +msgstr "Título do Menu" -#: ../../mod/connections.php:289 -msgid "Only show unblocked connections" -msgstr "Exibir apenas conexões não bloqueadas" +#: ../../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/connections.php:296 -msgid "Only show blocked connections" -msgstr "Exibir apenas conexões bloqueadas" +#: ../../mod/menu.php:91 +msgid "Allow Bookmarks" +msgstr "Permite Favoritos" -#: ../../mod/connections.php:303 -msgid "Only show ignored connections" -msgstr "Exibir apenas conexões ignoradas" +#: ../../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/connections.php:310 -msgid "Only show archived connections" -msgstr "Exibir apenas conexões arquivadas" +#: ../../mod/menu.php:92 ../../mod/menu.php:149 +msgid "Submit and proceed" +msgstr "Envie e Prossiga" -#: ../../mod/connections.php:317 -msgid "Only show hidden connections" -msgstr "Exibir apenas conexões ocultas" +#: ../../mod/menu.php:104 +msgid "Drop" +msgstr "Descartar" + +#: ../../mod/menu.php:108 +msgid "Bookmarks allowed" +msgstr "Permitindo guardar links" -#: ../../mod/connections.php:372 -#, php-format -msgid "%1$s [%2$s]" -msgstr "%1$s [%2$s]" +#: ../../mod/menu.php:110 +msgid "Delete this menu" +msgstr "Deletar este menu" -#: ../../mod/connections.php:373 -msgid "Edit connection" -msgstr "Editar conexão" +#: ../../mod/menu.php:111 ../../mod/menu.php:144 +msgid "Edit menu contents" +msgstr "Editar os conteúdos do menu" -#: ../../mod/connections.php:411 -msgid "Search your connections" -msgstr "Pesquisar em suas conexões" +#: ../../mod/menu.php:112 +msgid "Edit this menu" +msgstr "Editar este menu" -#: ../../mod/connections.php:412 -msgid "Finding: " -msgstr "Pesquisando: " +#: ../../mod/menu.php:126 +msgid "Menu could not be deleted." +msgstr "Não foi possível deletar o menu." -#: ../../mod/blocks.php:95 ../../mod/blocks.php:148 -msgid "Block Name" -msgstr "Nome do bloco" +#: ../../mod/menu.php:139 +msgid "Edit Menu" +msgstr "Editar menu" -#: ../../mod/blocks.php:149 -msgid "Block Title" -msgstr "Título do Bloco" +#: ../../mod/menu.php:143 +msgid "Add or remove entries to this menu" +msgstr "Adicionar ou remover entradas deste menu" -#: ../../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/menu.php:145 +msgid "Menu name" +msgstr "Nome do menu" -#: ../../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/menu.php:145 +msgid "Must be unique, only seen by you" +msgstr "Deve ser único, exibido somente para você" -#: ../../mod/photos.php:77 -msgid "Page owner information could not be retrieved." -msgstr "As informações do dono da pagina não puderam ser obtidas." +#: ../../mod/menu.php:146 +msgid "Menu title" +msgstr "Título do menu" -#: ../../mod/photos.php:97 -msgid "Album not found." -msgstr "O álbum não foi encontrado." +#: ../../mod/menu.php:146 +msgid "Menu title as seen by others" +msgstr "Título do menu quando visto por outros" -#: ../../mod/photos.php:119 ../../mod/photos.php:643 -msgid "Delete Album" -msgstr "Excluir o álbum" +#: ../../mod/menu.php:147 +msgid "Allow bookmarks" +msgstr "Habilitar links guardados" -#: ../../mod/photos.php:159 ../../mod/photos.php:930 -msgid "Delete Photo" -msgstr "Excluir a foto" +#: ../../mod/filestorage.php:82 +msgid "Permission Denied." +msgstr "Permissão negada." -#: ../../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/filestorage.php:98 +msgid "File not found." +msgstr "O arquivo não foi encontrado." -#: ../../mod/photos.php:440 -msgid "No photos selected" -msgstr "Não foi selecionada nenhuma foto" +#: ../../mod/filestorage.php:141 +msgid "Edit file permissions" +msgstr "Editar permissões do arquivo" -#: ../../mod/photos.php:484 -msgid "Access to this item is restricted." -msgstr "O acesso a este item está restrito." +#: ../../mod/filestorage.php:150 +msgid "Set/edit permissions" +msgstr "Definir/editar permissões" -#: ../../mod/photos.php:523 -#, 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/filestorage.php:151 +msgid "Include all files and sub folders" +msgstr "Incluir todos os arquivos e subpastas" -#: ../../mod/photos.php:526 -#, php-format -msgid "%1$.2f MB photo storage used." -msgstr "Utilizados %1$.2f MB para armazenamento de fotos." +#: ../../mod/filestorage.php:152 +msgid "Return to file list" +msgstr "Retornar à lista de arquivos" -#: ../../mod/photos.php:550 -msgid "Upload Photos" -msgstr "Enviar fotos" +#: ../../mod/filestorage.php:154 +msgid "Copy/paste this code to attach file to a post" +msgstr "Copiar/colar este código para anexar um arquivo a uma publicação" -#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:915 -msgid "Enter a new album name" -msgstr "Digite um nome para o novo álbum" +#: ../../mod/filestorage.php:155 +msgid "Copy/paste this URL to link file from a web page" +msgstr "Copiar/colar este URL para linkar para o arquivo em uma página web" -#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:916 -msgid "or select an existing one (doubleclick)" -msgstr "ou escolha um já existente (duplo clique)" +#: ../../mod/filestorage.php:157 +msgid "Share this file" +msgstr "Compartilhe esse arquivo" -#: ../../mod/photos.php:556 -msgid "Create a status post for this upload" -msgstr "Crie uma publicação de status para este upload." +#: ../../mod/filestorage.php:158 +msgid "Show URL to this file" +msgstr "Mostre URL para esse arquivo" -#: ../../mod/photos.php:584 -msgid "Album name could not be decoded" -msgstr "Não foi possível decodificar o nome do álbum" +#: ../../mod/filestorage.php:159 +msgid "Notify your contacts about this file" +msgstr "Notifique seus contatos sobre esse arquivo" -#: ../../mod/photos.php:625 ../../mod/photos.php:1157 -#: ../../mod/photos.php:1173 -msgid "Contact Photos" -msgstr "Fotos dos contatos" +#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92 +msgid "Contact not found." +msgstr "O contato não foi encontrado." -#: ../../mod/photos.php:649 -msgid "Show Newest First" -msgstr "Exibir primeiro os mais recentes" +#: ../../mod/fsuggest.php:63 +msgid "Friend suggestion sent." +msgstr "Sugestão de amizade enviada." -#: ../../mod/photos.php:651 -msgid "Show Oldest First" -msgstr "Exibir primeiro os mais antigos" +#: ../../mod/fsuggest.php:97 +msgid "Suggest Friends" +msgstr "Sugerir amigos" -#: ../../mod/photos.php:675 ../../mod/photos.php:1205 -msgid "View Photo" -msgstr "Ver a foto" +#: ../../mod/fsuggest.php:99 +#, php-format +msgid "Suggest a friend for %s" +msgstr "Sugerir um amigo para %s" -#: ../../mod/photos.php:704 -msgid "Edit Album" -msgstr "Editar o álbum" +#: ../../mod/magic.php:69 +msgid "Hub not found." +msgstr "O hub não foi encontrado." -#: ../../mod/photos.php:749 -msgid "Permission denied. Access to this item may be restricted." -msgstr "Permissão negada. Acesso a este item pode estar restrito." +#: ../../mod/poke.php:159 +msgid "Poke/Prod" +msgstr "Cutucar/Espetar" -#: ../../mod/photos.php:751 -msgid "Photo not available" -msgstr "A foto não está disponível" +#: ../../mod/poke.php:160 +msgid "poke, prod or do other things to somebody" +msgstr "Cutucar, espetar ou fazer outras coisas a alguém" -#: ../../mod/photos.php:809 -msgid "Use as profile photo" -msgstr "Usar como uma foto de perfil" +#: ../../mod/poke.php:161 +msgid "Recipient" +msgstr "Destinatário" -#: ../../mod/photos.php:816 -msgid "Private Photo" -msgstr "Foto privada" +#: ../../mod/poke.php:162 +msgid "Choose what you wish to do to recipient" +msgstr "Escolha o que você deseja fazer com seu alvo" -#: ../../mod/photos.php:831 -msgid "View Full Size" -msgstr "Ver no tamanho real" +#: ../../mod/poke.php:165 +msgid "Make this post private" +msgstr "Torne esta publicação privada" -#: ../../mod/photos.php:909 -msgid "Edit photo" -msgstr "Editar a foto" +#: ../../mod/profperm.php:29 ../../mod/profperm.php:58 +msgid "Invalid profile identifier." +msgstr "Identificador de perfil inválido." -#: ../../mod/photos.php:911 -msgid "Rotate CW (right)" -msgstr "Rotacionar H (horário)" +#: ../../mod/profperm.php:110 +msgid "Profile Visibility Editor" +msgstr "Editor de visibilidade do perfil" -#: ../../mod/photos.php:912 -msgid "Rotate CCW (left)" -msgstr "Rotacionar AH (anti-horário)" +#: ../../mod/profperm.php:114 +msgid "Click on a contact to add or remove." +msgstr "Clique em um contato para adicionar ou remover." -#: ../../mod/photos.php:919 -msgid "Caption" -msgstr "Legenda" +#: ../../mod/profperm.php:123 +msgid "Visible To" +msgstr "Visível para" -#: ../../mod/photos.php:921 -msgid "Add a Tag" -msgstr "Adicionar uma etiqueta" +#: ../../mod/impel.php:191 +#, php-format +msgid "%s element installed" +msgstr "Elemento %s instalado" -#: ../../mod/photos.php:925 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" -msgstr "Exemplo: @beto, @Barbara_Almeida, @julia@exemplo.com" +#: ../../mod/impel.php:194 +#, php-format +msgid "%s element installation failed" +msgstr "Instalação de elemento %s falhou" -#: ../../mod/photos.php:928 -msgid "Flag as adult in album view" -msgstr "Sinalizar como adulto na apresentação de álbuns" +#: ../../mod/profiles.php:18 ../../mod/profiles.php:174 +#: ../../mod/profiles.php:231 ../../mod/profiles.php:600 +msgid "Profile not found." +msgstr "O perfil não foi encontrado." -#: ../../mod/photos.php:1120 -msgid "In This Photo:" -msgstr "Nesta foto:" +#: ../../mod/profiles.php:38 +msgid "Profile deleted." +msgstr "O perfil foi excluído." -#: ../../mod/photos.php:1125 -msgid "Map" -msgstr "Mapa" +#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 +msgid "Profile-" +msgstr "Perfil-" -#: ../../mod/photos.php:1211 -msgid "View Album" -msgstr "Ver álbum" +#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 +msgid "New profile created." +msgstr "O novo perfil foi criado." -#: ../../mod/photos.php:1234 -msgid "Recent Photos" -msgstr "Fotos recentes" +#: ../../mod/profiles.php:98 +msgid "Profile unavailable to clone." +msgstr "O perfil não está disponível para clonagem." -#: ../../mod/match.php:22 -msgid "Profile Match" -msgstr "Correspondência de perfil" +#: ../../mod/profiles.php:136 +msgid "Profile unavailable to export." +msgstr "Perfil indisponível para exportar." -#: ../../mod/match.php:31 -msgid "No keywords to match. Please add keywords to your default profile." -msgstr "Nenhuma palavra-chave para combinar. Por favor, adicione palavras-chave ao seu perfil padrão." +#: ../../mod/profiles.php:241 +msgid "Profile Name is required." +msgstr "É obrigatório informar o nome do perfil." -#: ../../mod/match.php:63 -msgid "is interested in:" -msgstr "se interessa por:" +#: ../../mod/profiles.php:404 +msgid "Marital Status" +msgstr "Estado civil" -#: ../../mod/match.php:70 -msgid "No matches" -msgstr "Nenhuma correspondência" +#: ../../mod/profiles.php:408 +msgid "Romantic Partner" +msgstr "Parceiro/a romântico/a" -#: ../../mod/chatsvc.php:111 -msgid "Away" -msgstr "Ausente" +#: ../../mod/profiles.php:412 +msgid "Likes" +msgstr "Gosta de" -#: ../../mod/chatsvc.php:115 -msgid "Online" -msgstr "Online" +#: ../../mod/profiles.php:416 +msgid "Dislikes" +msgstr "Não gosta de" -#: ../../mod/rbmark.php:88 -msgid "Select a bookmark folder" -msgstr "Escolha uma pasta de links onde guardar" +#: ../../mod/profiles.php:420 +msgid "Work/Employment" +msgstr "Trabalho/Emprego" -#: ../../mod/rbmark.php:93 -msgid "Save Bookmark" -msgstr "Guardar link" +#: ../../mod/profiles.php:423 +msgid "Religion" +msgstr "Religião" -#: ../../mod/rbmark.php:94 -msgid "URL of bookmark" -msgstr "URL do link guardado" +#: ../../mod/profiles.php:427 +msgid "Political Views" +msgstr "Posição política" -#: ../../mod/rbmark.php:95 ../../mod/appman.php:93 -msgid "Description" -msgstr "Descrição" +#: ../../mod/profiles.php:431 ../../mod/id.php:33 +msgid "Gender" +msgstr "Gênero" -#: ../../mod/rbmark.php:99 -msgid "Or enter new bookmark folder name" -msgstr "Ou digite o nome para uma nova pasta de links" +#: ../../mod/profiles.php:435 +msgid "Sexual Preference" +msgstr "Preferência sexual" -#: ../../mod/notify.php:53 ../../mod/notifications.php:94 -msgid "No more system notifications." -msgstr "Sem novas notificações do sistema." +#: ../../mod/profiles.php:439 +msgid "Homepage" +msgstr "Página web" -#: ../../mod/notify.php:57 ../../mod/notifications.php:98 -msgid "System Notifications" -msgstr "Notificações do sistema" +#: ../../mod/profiles.php:443 +msgid "Interests" +msgstr "Interesses" -#: ../../mod/acl.php:231 -msgid "network" -msgstr "+ rede" +#: ../../mod/profiles.php:447 ../../mod/admin.php:994 +msgid "Address" +msgstr "Endereço" -#: ../../mod/acl.php:241 -msgid "RSS" -msgstr "RSS" +#: ../../mod/profiles.php:537 +msgid "Profile updated." +msgstr "O perfil foi atualizado." -#: ../../mod/pdledit.php:13 -msgid "Layout updated." -msgstr "Layout atualizado." +#: ../../mod/profiles.php:626 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "Esconder sua lista de contatos/amigos dos visitantes no seu perfil?" -#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53 -msgid "Edit System Page Description" -msgstr "Editar descrição de página do sistema" +#: ../../mod/profiles.php:666 +msgid "Edit Profile Details" +msgstr "Editar os detalhes do perfil" -#: ../../mod/pdledit.php:48 -msgid "Layout not found." -msgstr "Layout não encontrado." +#: ../../mod/profiles.php:668 +msgid "View this profile" +msgstr "Ver este perfil" -#: ../../mod/pdledit.php:54 -msgid "Module Name:" -msgstr "Nome do módulo:" +#: ../../mod/profiles.php:670 +msgid "Change Profile Photo" +msgstr "Mudar a foto do perfil" -#: ../../mod/pdledit.php:55 -msgid "Layout Help" -msgstr "Ajuda de layout" +#: ../../mod/profiles.php:671 +msgid "Create a new profile using these settings" +msgstr "Criar um novo perfil usando estas configurações" -#: ../../mod/filer.php:49 -msgid "- select -" -msgstr "- selecionar -" +#: ../../mod/profiles.php:672 +msgid "Clone this profile" +msgstr "Clonar este perfil" -#: ../../mod/import.php:25 -#, php-format -msgid "Your service plan only allows %d channels." -msgstr "Seu plano de serviço permite apenas %d canais." +#: ../../mod/profiles.php:673 +msgid "Delete this profile" +msgstr "Excluir este perfil" -#: ../../mod/import.php:51 -msgid "Nothing to import." -msgstr "Nada a importar." +#: ../../mod/profiles.php:675 +msgid "Import profile from file" +msgstr "Importar perfil dum arquivo" -#: ../../mod/import.php:75 -msgid "Unable to download data from old server" -msgstr "Não foi possível descarregar os dados do servidor antigo" +#: ../../mod/profiles.php:676 +msgid "Export profile to file" +msgstr "Exportar perfil para arquivo" -#: ../../mod/import.php:81 -msgid "Imported file is empty." -msgstr "O arquivo importado está vazio." +#: ../../mod/profiles.php:677 +msgid "Profile Name:" +msgstr "Nome do perfil:" -#: ../../mod/import.php:106 -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/profiles.php:678 +msgid "Your Full Name:" +msgstr "Seu nome completo:" -#: ../../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/profiles.php:679 +msgid "Title/Description:" +msgstr "Título/Descrição:" -#: ../../mod/import.php:147 -msgid "Channel clone failed. Import failed." -msgstr "Clonagem do canal falhou. A importação falhou." +#: ../../mod/profiles.php:680 +msgid "Your Gender:" +msgstr "Seu gênero:" -#: ../../mod/import.php:157 -msgid "Cloned channel not found. Import failed." -msgstr "Canal a clonar não encontrado. A importação falhou." +#: ../../mod/profiles.php:681 +msgid "Birthday :" +msgstr "Data de nascimento :" -#: ../../mod/import.php:475 -msgid "Import completed." -msgstr "A importação foi completada." +#: ../../mod/profiles.php:682 +msgid "Street Address:" +msgstr "Endereço:" -#: ../../mod/import.php:487 -msgid "You must be logged in to use this feature." -msgstr "Você precisa estar autenticado para usar este recurso." +#: ../../mod/profiles.php:683 +msgid "Locality/City:" +msgstr "Localidade/Cidade:" -#: ../../mod/import.php:492 -msgid "Import Channel" -msgstr "Importar canal" +#: ../../mod/profiles.php:684 +msgid "Postal/Zip Code:" +msgstr "CEP:" -#: ../../mod/import.php:493 -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." +#: ../../mod/profiles.php:685 +msgid "Country:" +msgstr "País:" -#: ../../mod/import.php:494 -msgid "File to Upload" -msgstr "Arquivo a carregar" +#: ../../mod/profiles.php:686 +msgid "Region/State:" +msgstr "Região/Estado:" -#: ../../mod/import.php:495 -msgid "Or provide the old server/hub details" -msgstr "Ou forneça os detalhes do antigo servidor/hub" +#: ../../mod/profiles.php:687 +msgid "♥ Marital Status:" +msgstr "Estado civil ♥:" -#: ../../mod/import.php:496 -msgid "Your old identity address (xyz@example.com)" -msgstr "O endereço da sua velha identidade (xyz@exemplo.com)" +#: ../../mod/profiles.php:688 +msgid "Who: (if applicable)" +msgstr "Quem: (se aplicável)" -#: ../../mod/import.php:497 -msgid "Your old login email address" -msgstr "O endereço de e-mail da sua antiga conta" +#: ../../mod/profiles.php:689 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "Exemplos: fulano123, Fulano de Tal, fulano@exemplo.com" -#: ../../mod/import.php:498 -msgid "Your old login password" -msgstr "A senha dua sua antiga conta" +#: ../../mod/profiles.php:690 +msgid "Since [date]:" +msgstr "Desde [data]:" -#: ../../mod/import.php:499 -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" -" able to post from either location, but only one can be marked as the " -"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/profiles.php:692 +msgid "Homepage URL:" +msgstr "Endereço do website:" -#: ../../mod/import.php:500 -msgid "Make this hub my primary location" -msgstr "Faça deste hub meu local primário" +#: ../../mod/profiles.php:695 +msgid "Religious Views:" +msgstr "Orientação religiosa:" -#: ../../mod/import.php:501 -msgid "Import existing posts if possible" -msgstr "Importar publicações existentes se possível" +#: ../../mod/profiles.php:696 +msgid "Keywords:" +msgstr "Palavras-chave:" -#: ../../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/profiles.php:699 +msgid "Example: fishing photography software" +msgstr "Exemplo: pesca fotografia software" -#: ../../mod/editlayout.php:106 -msgid "Edit Layout" -msgstr "Editar layout" +#: ../../mod/profiles.php:700 +msgid "Used in directory listings" +msgstr "Usado em listas de diretório" -#: ../../mod/editlayout.php:117 -msgid "Delete layout?" -msgstr "Deletar layout?" +#: ../../mod/profiles.php:701 +msgid "Tell us about yourself..." +msgstr "Fale um pouco sobre você..." -#: ../../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/profiles.php:702 +msgid "Hobbies/Interests" +msgstr "Hobbies/Interesses" -#: ../../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/profiles.php:703 +msgid "Contact information and Social Networks" +msgstr "Informações de contato e redes sociais" -#: ../../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/profiles.php:704 +msgid "My other channels" +msgstr "Meus outros canais" -#: ../../mod/editlayout.php:164 ../../mod/layouts.php:124 -msgid "Layout Description (Optional)" -msgstr "Descrição do Layout. (Opcional)" +#: ../../mod/profiles.php:705 +msgid "Musical interests" +msgstr "Interesses musicais" -#: ../../mod/editlayout.php:166 ../../mod/layouts.php:121 -#: ../../mod/layouts.php:179 -msgid "Layout Name" -msgstr "Nome do layout" +#: ../../mod/profiles.php:706 +msgid "Books, literature" +msgstr "Livros, literatura" -#: ../../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." +#: ../../mod/profiles.php:707 +msgid "Television" +msgstr "Televisão" -#: ../../mod/chat.php:167 -msgid "Room not found" -msgstr "Sala não encontrada" +#: ../../mod/profiles.php:708 +msgid "Film/dance/culture/entertainment" +msgstr "Filme/dança/cultura/entretenimento" -#: ../../mod/chat.php:178 -msgid "Leave Room" -msgstr "Sair da sala" +#: ../../mod/profiles.php:709 +msgid "Love/romance" +msgstr "Amor/romance" -#: ../../mod/chat.php:179 -msgid "Delete This Room" -msgstr "Deletar esta sala" +#: ../../mod/profiles.php:710 +msgid "Work/employment" +msgstr "Trabalho/emprego" -#: ../../mod/chat.php:180 -msgid "I am away right now" -msgstr "Eu estou ausente no momento" +#: ../../mod/profiles.php:711 +msgid "School/education" +msgstr "Escola/educação" -#: ../../mod/chat.php:181 -msgid "I am online" -msgstr "Eu estou online" +#: ../../mod/profiles.php:717 +msgid "This is your default profile." +msgstr "Este é seu perfil padrão." -#: ../../mod/chat.php:183 -msgid "Bookmark this room" -msgstr "Guarde esta sala" +#: ../../mod/profiles.php:728 +msgid "Age: " +msgstr "Idade: " -#: ../../mod/chat.php:207 ../../mod/chat.php:229 -msgid "New Chatroom" -msgstr "Nova sala de bate-papo" +#: ../../mod/profiles.php:771 +msgid "Edit/Manage Profiles" +msgstr "Editar/Administrar perfis" -#: ../../mod/chat.php:208 -msgid "Chatroom Name" -msgstr "Nome da sala de bate-papo" +#: ../../mod/profiles.php:772 +msgid "Add profile things" +msgstr "Adicionar coisas ao perfil" -#: ../../mod/chat.php:225 -#, php-format -msgid "%1$s's Chatrooms" -msgstr "Salas de bate-papo de %1$s" +#: ../../mod/profiles.php:773 +msgid "Include desirable objects in your profile" +msgstr "Inclua objetos desejáveis no seu perfil" -#: ../../mod/editwebpage.php:152 -msgid "Delete webpage?" -msgstr "Deletar página web?" +#: ../../mod/ratings.php:69 +msgid "No ratings" +msgstr "Sem avaliações" -#: ../../mod/editwebpage.php:173 -msgid "Page link title" -msgstr "Título do link da página" +#: ../../mod/ratings.php:99 +msgid "Ratings" +msgstr "Avaliações" -#: ../../mod/editwebpage.php:224 -msgid "Edit Webpage" -msgstr "Editar página web" +#: ../../mod/ratings.php:100 +msgid "Rating: " +msgstr "Avaliações" -#: ../../mod/dirsearch.php:29 -msgid "This directory server requires an access token" -msgstr "O servidor deste diretório requer um token de acesso" +#: ../../mod/ratings.php:101 +msgid "Website: " +msgstr "Website:" -#: ../../mod/lostpass.php:15 -msgid "No valid account found." -msgstr "Não foi encontrada uma conta válida." +#: ../../mod/ratings.php:103 +msgid "Description: " +msgstr "Descrição:" -#: ../../mod/lostpass.php:29 -msgid "Password reset request issued. Check your email." -msgstr "A solicitação de restauração de senha foi encaminhada. Verifique seu e-mail." +#: ../../mod/viewsrc.php:38 +msgid "Source of Item" +msgstr "Fonte do Item" -#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 -#, php-format -msgid "Site Member (%s)" -msgstr "Membro do site (%s)" +#: ../../mod/setup.php:187 +msgid "$Projectname Server - Setup" +msgstr "Servidor $Projectname - Configuração" -#: ../../mod/lostpass.php:40 -#, php-format -msgid "Password reset requested at %s" -msgstr "Foi feita uma solicitação de restauração de senha em %s" +#: ../../mod/setup.php:191 +msgid "Could not connect to database." +msgstr "Não foi possível conectar ao banco de dados." -#: ../../mod/lostpass.php:63 +#: ../../mod/setup.php:195 msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"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." +"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/lostpass.php:85 ../../boot.php:1558 -msgid "Password Reset" -msgstr "Reiniciar a senha" +#: ../../mod/setup.php:202 +msgid "Could not create table." +msgstr "Não foi possível criar a tabela." -#: ../../mod/lostpass.php:86 -msgid "Your password has been reset as requested." -msgstr "Sua senha foi restaurada, conforme solicitado." +#: ../../mod/setup.php:207 +msgid "Your site database has been installed." +msgstr "O banco de dados do seu site foi instalado." -#: ../../mod/lostpass.php:87 -msgid "Your new password is" -msgstr "Sua nova senha é" +#: ../../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/lostpass.php:88 -msgid "Save or copy your new password - and then" -msgstr "Salve ou copie a sua nova senha e, então" +#: ../../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/lostpass.php:89 -msgid "click here to login" -msgstr "clique aqui para entrar" +#: ../../mod/setup.php:277 +msgid "System check" +msgstr "Checagem do sistema" -#: ../../mod/lostpass.php:90 -msgid "" -"Your password may be changed from the Settings page after " -"successful login." -msgstr "Sua senha pode ser alterada na página de Configurações após você entrar em sua conta." +#: ../../mod/setup.php:282 +msgid "Check again" +msgstr "Cheque novamente" -#: ../../mod/lostpass.php:107 -#, php-format -msgid "Your password has changed at %s" -msgstr "Sua senha foi modificada em %s" +#: ../../mod/setup.php:304 +msgid "Database connection" +msgstr "Conexão ao banco de dados" -#: ../../mod/lostpass.php:122 -msgid "Forgot your Password?" -msgstr "Esqueceu a sua senha?" +#: ../../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/lostpass.php:123 +#: ../../mod/setup.php:306 msgid "" -"Enter your email address and submit to have your password reset. Then check " -"your email for further instructions." -msgstr "Digite o seu endereço de e-mail e clique em 'Restaurar' para prosseguir com a restauração da sua senha. Após isso, verifique seu e-mail para mais instruções." +"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/lostpass.php:124 -msgid "Email Address" -msgstr "Endereço de e-mail" +#: ../../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/lostpass.php:125 -msgid "Reset" -msgstr "Restaurar" +#: ../../mod/setup.php:311 +msgid "Database Server Name" +msgstr "Nome do servidor de banco de dados" -#: ../../mod/rate.php:157 -msgid "Website:" -msgstr "Sítio web:" +#: ../../mod/setup.php:311 +msgid "Default is localhost" +msgstr "O default é localhost" -#: ../../mod/rate.php:160 -#, php-format -msgid "Remote Channel [%s] (not yet known on this site)" -msgstr "Canal Remoto [%s] (ainda não conhecido neste sítio)" +#: ../../mod/setup.php:312 +msgid "Database Port" +msgstr "Porta do banco de dados" -#: ../../mod/rate.php:161 ../../mod/connedit.php:663 -msgid "Rating (this information is public)" -msgstr "Avaliações (essa informação é pública)" +#: ../../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/rate.php:162 ../../mod/connedit.php:664 -msgid "Optionally explain your rating (this information is public)" -msgstr "Opcionalmente justifique sua avaliação (essa informação é pública)" +#: ../../mod/setup.php:313 +msgid "Database Login Name" +msgstr "Nome do usuário do banco de dados" -#: ../../mod/editpost.php:31 -msgid "Item is not editable" -msgstr "O item não está editável" +#: ../../mod/setup.php:314 +msgid "Database Login Password" +msgstr "Senha do usuário do banco de dados" -#: ../../mod/editpost.php:53 -msgid "Delete item?" -msgstr "Deletar item?" +#: ../../mod/setup.php:315 +msgid "Database Name" +msgstr "Nome do banco de dados" -#: ../../mod/invite.php:25 -msgid "Total invitation limit exceeded." -msgstr "Foi excedido o número total de convites." +#: ../../mod/setup.php:316 +msgid "Database Type" +msgstr "Tipo do banco de dados" -#: ../../mod/invite.php:49 -#, php-format -msgid "%s : Not a valid email address." -msgstr "%s : Não é um endereço de e-mail válido." +#: ../../mod/setup.php:318 ../../mod/setup.php:359 +msgid "Site administrator email address" +msgstr "Endereço de email do administrador do site" -#: ../../mod/invite.php:76 -msgid "Please join us on Red" -msgstr "Por favor, una-se a nós na Red" +#: ../../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/invite.php:87 -msgid "Invitation limit exceeded. Please contact your site administrator." -msgstr "Você excedeu o limite de convites. Por favor, entre em contato com o administrador do site." +#: ../../mod/setup.php:319 ../../mod/setup.php:361 +msgid "Website URL" +msgstr "URL do website" -#: ../../mod/invite.php:92 -#, php-format -msgid "%s : Message delivery failed." -msgstr "%s : Não foi possível enviar a mensagem." +#: ../../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/invite.php:96 -#, php-format -msgid "%d message sent." -msgid_plural "%d messages sent." -msgstr[0] "%d mensagem enviada." -msgstr[1] "%d mensagens enviadas." +#: ../../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/invite.php:115 -msgid "You have no more invitations available" -msgstr "Você não possui mais convites disponíveis" +#: ../../mod/setup.php:348 +msgid "Site settings" +msgstr "Configurações do site" -#: ../../mod/invite.php:129 -msgid "Send invitations" -msgstr "Enviar convites." +#: ../../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/invite.php:130 -msgid "Enter email addresses, one per line:" -msgstr "Digite os endereços de e-mail, um por linha:" +#: ../../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/invite.php:131 ../../mod/mail.php:235 ../../mod/mail.php:348 -msgid "Your message:" -msgstr "Sua mensagem:" +#: ../../mod/setup.php:418 +msgid "PHP executable path" +msgstr "Caminho para o executável do PHP" -#: ../../mod/invite.php:132 -msgid "Please join my community on $Projectname." -msgstr "Por favor junte-se à minha comunidade na $Projectname." +#: ../../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/invite.php:134 -msgid "You will need to supply this invitation code: " -msgstr "Você precisará fornecer este código de convite:" +#: ../../mod/setup.php:423 +msgid "Command line PHP" +msgstr "PHP em linha de comando" -#: ../../mod/invite.php:135 +#: ../../mod/setup.php:432 msgid "" -"1. Register at any $Projectname location (they are all inter-connected)" -msgstr "1. Registre-se em qualquer site da $Projectname (eles são todos interconectados)" +"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/invite.php:137 -msgid "2. Enter my $Projectname network address into the site searchbar." -msgstr "2. Entre com meu endereço da $Projectname na barra de busca do site." +#: ../../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/invite.php:138 -msgid "or visit " -msgstr "ou visite" +#: ../../mod/setup.php:436 +msgid "PHP register_argc_argv" +msgstr "PHP register_argc_argv" -#: ../../mod/invite.php:140 -msgid "3. Click [Connect]" -msgstr "3. Clique [Conectar]" +#: ../../mod/setup.php:454 +#, php-format +msgid "" +"Your max allowed total upload size is set to %s. Maximum size of one file to" +" upload is set to %s. You are allowed to upload up to %d files at once." +msgstr "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/locs.php:21 ../../mod/locs.php:52 -msgid "Location not found." -msgstr "A localização não foi encontrada." +#: ../../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/locs.php:56 -msgid "Primary location cannot be removed." -msgstr "A localização primária não pode ser removida." +#: ../../mod/setup.php:461 +msgid "PHP upload limits" +msgstr "Limites de carregamento do PHP" -#: ../../mod/locs.php:88 -msgid "No locations found." -msgstr "Nenhuma localização encontrada." +#: ../../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/locs.php:101 -msgid "Manage Channel Locations" -msgstr "Gerenciar localizações do canal" +#: ../../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/locs.php:102 -msgid "Location (address)" -msgstr "Localização (endereço)" +#: ../../mod/setup.php:488 +msgid "Generate encryption keys" +msgstr "Gerar chaves de criptografia" -#: ../../mod/locs.php:103 -msgid "Primary Location" -msgstr "Localização primária" +#: ../../mod/setup.php:500 +msgid "libCurl PHP module" +msgstr "Módulo PHP libCurl" -#: ../../mod/locs.php:104 -msgid "Drop location" -msgstr "Descartar localização" +#: ../../mod/setup.php:501 +msgid "GD graphics PHP module" +msgstr "Módulo PHP GD graphics" -#: ../../mod/sources.php:32 -msgid "Failed to create source. No channel selected." -msgstr "Falha ao criar a fonte. Nenhum canal selecionado." +#: ../../mod/setup.php:502 +msgid "OpenSSL PHP module" +msgstr "Módulo PHP OpenSSL" -#: ../../mod/sources.php:45 -msgid "Source created." -msgstr "A fonte foi criada." +#: ../../mod/setup.php:503 +msgid "mysqli or postgres PHP module" +msgstr "módulo 'mysqli' ou 'postgres' do PHP" -#: ../../mod/sources.php:57 -msgid "Source updated." -msgstr "A fonte foi atualizada." +#: ../../mod/setup.php:504 +msgid "mb_string PHP module" +msgstr "Módulo PHP mb_string " -#: ../../mod/sources.php:82 -msgid "*" -msgstr "*" +#: ../../mod/setup.php:505 +msgid "mcrypt PHP module" +msgstr "Módulo PHP mcrypt" -#: ../../mod/sources.php:89 -msgid "Manage remote sources of content for your channel." -msgstr "Administrar as fontes remotas de conteúdo para o seu canal." +#: ../../mod/setup.php:506 +msgid "xml PHP module" +msgstr "Módulo PHP xml" -#: ../../mod/sources.php:90 ../../mod/sources.php:100 -msgid "New Source" -msgstr "Nova fonte" +#: ../../mod/setup.php:510 ../../mod/setup.php:512 +msgid "Apache mod_rewrite module" +msgstr "Módulo mod_rewrite do Apache" -#: ../../mod/sources.php:101 ../../mod/sources.php:133 +#: ../../mod/setup.php:510 msgid "" -"Import all or selected content from the following channel into this channel " -"and distribute it according to your channel settings." -msgstr "Importar todo ou uma seleção do conteúdo do seguinte canal para este canal, e distribuí-lo de acordo com as configurações do seu canal." +"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/sources.php:102 ../../mod/sources.php:134 -msgid "Only import content with these words (one per line)" -msgstr "Importar apenas conteúd com estas palavras (uma por linha)" +#: ../../mod/setup.php:516 ../../mod/setup.php:519 +msgid "proc_open" +msgstr "proc_open" -#: ../../mod/sources.php:102 ../../mod/sources.php:134 -msgid "Leave blank to import all public content" -msgstr "Deixe em branco para importar todo o conteúdo público" +#: ../../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/sources.php:103 ../../mod/sources.php:137 -#: ../../mod/new_channel.php:112 -msgid "Channel Name" -msgstr "Nome do canal" +#: ../../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/sources.php:123 ../../mod/sources.php:150 -msgid "Source not found." -msgstr "A fonte não foi encontrada." +#: ../../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/sources.php:130 -msgid "Edit Source" -msgstr "Editar fonte" +#: ../../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/sources.php:131 -msgid "Delete Source" -msgstr "Deletar fonte" +#: ../../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/sources.php:158 -msgid "Source removed" -msgstr "A fonte foi removida." +#: ../../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/sources.php:160 -msgid "Unable to remove source." -msgstr "Não foi possível remover a fonte." +#: ../../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/menu.php:44 -msgid "Unable to update menu." -msgstr "Não foi possível atualizar o menu." +#: ../../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/menu.php:53 -msgid "Unable to create menu." -msgstr "Não foi possível criar o menu." +#: ../../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/menu.php:86 ../../mod/menu.php:98 -msgid "Menu Name" -msgstr "Nome do Menu" +#: ../../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/menu.php:86 -msgid "Unique name (not visible on webpage) - required" -msgstr "Nome único (não visível na página web) - necessário" +#: ../../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/menu.php:87 ../../mod/menu.php:99 -msgid "Menu Title" -msgstr "Título do Menu" +#: ../../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/menu.php:87 -msgid "Visible on webpage - leave empty for no title" -msgstr "Visível na Página web - Deixe vazio para nenhum título" +#: ../../mod/setup.php:572 +msgid ".htconfig.php is writable" +msgstr ".htconfig.php tem permissão de escrita" -#: ../../mod/menu.php:88 -msgid "Allow Bookmarks" -msgstr "Permite Favoritos" +#: ../../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/menu.php:88 ../../mod/menu.php:140 -msgid "Menu may be used to store saved bookmarks" -msgstr "O menu pode ser utilizado para armazenar links guardados" +#: ../../mod/setup.php:587 +#, 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/menu.php:89 -msgid "Submit and proceed" -msgstr "Envie e Prossiga" +#: ../../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/menu.php:101 -msgid "Drop" -msgstr "Descartar" +#: ../../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/menu.php:103 -msgid "Bookmarks allowed" -msgstr "Permitindo guardar links" +#: ../../mod/setup.php:592 +#, php-format +msgid "%s is writable" +msgstr "%s tem permissão de escrita" -#: ../../mod/menu.php:105 -msgid "Delete this menu" -msgstr "Deletar este menu" +#: ../../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/menu.php:106 ../../mod/menu.php:137 -msgid "Edit menu contents" -msgstr "Editar os conteúdos do menu" +#: ../../mod/setup.php:612 +msgid "store is writable" +msgstr "store tem permissão de escrita" -#: ../../mod/menu.php:107 -msgid "Edit this menu" -msgstr "Editar este menu" +#: ../../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/menu.php:121 -msgid "Menu could not be deleted." -msgstr "Não foi possível deletar o menu." +#: ../../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/menu.php:129 ../../mod/mitem.php:24 -msgid "Menu not found." -msgstr "O menu não foi encontrado." +#: ../../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/menu.php:134 -msgid "Edit Menu" -msgstr "Editar menu" +#: ../../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/menu.php:136 -msgid "Add or remove entries to this menu" -msgstr "Adicionar ou remover entradas deste menu" +#: ../../mod/setup.php:652 +msgid "SSL certificate validation" +msgstr "Validação do certificado SSL" -#: ../../mod/menu.php:138 -msgid "Menu name" -msgstr "Nome do menu" +#: ../../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/menu.php:138 -msgid "Must be unique, only seen by you" -msgstr "Deve ser único, exibido somente para você" +#: ../../mod/setup.php:661 +msgid "Url rewrite is working" +msgstr "A reescrita de URLs está funcionando" -#: ../../mod/menu.php:139 -msgid "Menu title" -msgstr "Título do menu" +#: ../../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/menu.php:139 -msgid "Menu title as seen by others" -msgstr "Título do menu quando visto por outros" +#: ../../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/menu.php:140 -msgid "Allow bookmarks" -msgstr "Habilitar links guardados" +#: ../../mod/setup.php:728 +msgid "

What next

" +msgstr "

Próximos passos

" -#: ../../mod/menu.php:142 -msgid "Modify" -msgstr "Modificar" +#: ../../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/filestorage.php:82 -msgid "Permission Denied." -msgstr "Permissão negada." +#: ../../mod/openid.php:26 +msgid "OpenID protocol error. No ID returned." +msgstr "Erro do protocolo OpenID. Nenhuma ID retornada." -#: ../../mod/filestorage.php:98 -msgid "File not found." -msgstr "O arquivo não foi encontrado." +#: ../../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/filestorage.php:141 -msgid "Edit file permissions" -msgstr "Editar permissões do arquivo" +#: ../../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/filestorage.php:150 -msgid "Set/edit permissions" -msgstr "Definir/editar permissões" +#: ../../mod/uexport.php:41 ../../mod/uexport.php:42 +msgid "Export Channel" +msgstr "Exportar o canal" -#: ../../mod/filestorage.php:151 -msgid "Include all files and sub folders" -msgstr "Incluir todos os arquivos e subpastas" +#: ../../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 "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/filestorage.php:152 -msgid "Return to file list" -msgstr "Retornar à lista de arquivos" +#: ../../mod/uexport.php:44 +msgid "Export Content" +msgstr "Exportar conteúdo" -#: ../../mod/filestorage.php:154 -msgid "Copy/paste this code to attach file to a post" -msgstr "Copiar/colar este código para anexar um arquivo a uma publicação" +#: ../../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 " +"content, but is generally not suitable for importing a channel to a new hub " +"as this file may be VERY large. Please be patient - it may take several " +"minutes for this download to begin." +msgstr "Exportar as informações do seu canal e todo conteúdo para um backup JSON. Este backup irá conter todas suas conexões, permissões, dados de perfil e todo seu conteúdo, mas geralmente não é adequado para importar um canal para um novo hub, pois esse arquivo pode ser MUITO grande. Por favor seja paciente - pode demorar muitos minutos para este download começar." -#: ../../mod/filestorage.php:155 -msgid "Copy/paste this URL to link file from a web page" -msgstr "Copiar/colar este URL para linkar para o arquivo em uma página web" +#: ../../mod/viewconnections.php:62 +msgid "No connections." +msgstr "Nenhuma conexão." -#: ../../mod/filestorage.php:157 -msgid "Share this file" -msgstr "Compartilhe esse arquivo" +#: ../../mod/viewconnections.php:75 +#, php-format +msgid "Visit %s's profile [%s]" +msgstr "Ver o perfil de %s [%s]" -#: ../../mod/filestorage.php:158 -msgid "Show URL to this file" -msgstr "Mostre URL para esse arquivo" +#: ../../mod/zfinger.php:23 +msgid "invalid target signature" +msgstr "assinatura do destino inválida" -#: ../../mod/filestorage.php:159 -msgid "Notify your contacts about this file" -msgstr "Notifique seus contatos sobre esse arquivo" +#: ../../mod/admin.php:52 +msgid "Theme settings updated." +msgstr "As configurações de tema foram atualizadas." -#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92 -msgid "Contact not found." -msgstr "O contato não foi encontrado." +#: ../../mod/admin.php:93 ../../mod/admin.php:452 +msgid "Site" +msgstr "Site" -#: ../../mod/fsuggest.php:63 -msgid "Friend suggestion sent." -msgstr "Sugestão de amizade enviada." +#: ../../mod/admin.php:94 +msgid "Accounts" +msgstr "Contas" -#: ../../mod/fsuggest.php:97 -msgid "Suggest Friends" -msgstr "Sugerir amigos" +#: ../../mod/admin.php:95 ../../mod/admin.php:985 +msgid "Channels" +msgstr "Canais" -#: ../../mod/fsuggest.php:99 -#, php-format -msgid "Suggest a friend for %s" -msgstr "Sugerir um amigo para %s" +#: ../../mod/admin.php:96 ../../mod/admin.php:1077 ../../mod/admin.php:1117 +msgid "Plugins" +msgstr "Plugins" -#: ../../mod/magic.php:69 -msgid "Hub not found." -msgstr "O hub não foi encontrado." +#: ../../mod/admin.php:97 ../../mod/admin.php:1277 ../../mod/admin.php:1311 +msgid "Themes" +msgstr "Temas" -#: ../../mod/poke.php:159 -msgid "Poke/Prod" -msgstr "Cutucar/Espetar" +#: ../../mod/admin.php:98 +msgid "Inspect queue" +msgstr "Inspecione fila" -#: ../../mod/poke.php:160 -msgid "poke, prod or do other things to somebody" -msgstr "Cutucar, espetar ou fazer outras coisas a alguém" +#: ../../mod/admin.php:100 +msgid "Profile Config" +msgstr "Configuração de perfis" -#: ../../mod/poke.php:161 -msgid "Recipient" -msgstr "Destinatário" +#: ../../mod/admin.php:101 +msgid "DB updates" +msgstr "Atualizações do Banco de Dados" -#: ../../mod/poke.php:162 -msgid "Choose what you wish to do to recipient" -msgstr "Escolha o que você deseja fazer com seu alvo" +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1396 +msgid "Logs" +msgstr "Logs" -#: ../../mod/poke.php:165 -msgid "Make this post private" -msgstr "Torne esta publicação privada" +#: ../../mod/admin.php:121 +msgid "Plugin Features" +msgstr "Recursos dos plugins" -#: ../../mod/profperm.php:29 ../../mod/profperm.php:58 -msgid "Invalid profile identifier." -msgstr "Identificador de perfil inválido." +#: ../../mod/admin.php:123 +msgid "User registrations waiting for confirmation" +msgstr "Registros de usuário aguardando confirmação" -#: ../../mod/profperm.php:110 -msgid "Profile Visibility Editor" -msgstr "Editor de visibilidade do perfil" +#: ../../mod/admin.php:200 +msgid "# Accounts" +msgstr "# Contas" -#: ../../mod/profperm.php:114 -msgid "Click on a contact to add or remove." -msgstr "Clique em um contato para adicionar ou remover." +#: ../../mod/admin.php:201 +msgid "# blocked accounts" +msgstr "# Contas bloqueadas" -#: ../../mod/profperm.php:123 -msgid "Visible To" -msgstr "Visível para" +#: ../../mod/admin.php:202 +msgid "# expired accounts" +msgstr "# Contas expiradas" -#: ../../mod/impel.php:121 -#, php-format -msgid "%s element installed" -msgstr "Elemento %s instalado" +#: ../../mod/admin.php:203 +msgid "# expiring accounts" +msgstr "#contas expirando" -#: ../../mod/impel.php:124 -#, php-format -msgid "%s element installation failed" -msgstr "Instalação de elemento %s falhou" +#: ../../mod/admin.php:216 +msgid "# Channels" +msgstr "# Canais" -#: ../../mod/profiles.php:18 ../../mod/profiles.php:174 -#: ../../mod/profiles.php:231 ../../mod/profiles.php:600 -msgid "Profile not found." -msgstr "O perfil não foi encontrado." +#: ../../mod/admin.php:217 +msgid "# primary" +msgstr "# Primário" -#: ../../mod/profiles.php:38 -msgid "Profile deleted." -msgstr "O perfil foi excluído." +#: ../../mod/admin.php:218 +msgid "# clones" +msgstr "# clones" -#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 -msgid "Profile-" -msgstr "Perfil-" +#: ../../mod/admin.php:224 +msgid "Message queues" +msgstr "Filas de mensagem" -#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 -msgid "New profile created." -msgstr "O novo perfil foi criado." +#: ../../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" -#: ../../mod/profiles.php:98 -msgid "Profile unavailable to clone." -msgstr "O perfil não está disponível para clonagem." +#: ../../mod/admin.php:241 +msgid "Summary" +msgstr "Resumo" -#: ../../mod/profiles.php:136 -msgid "Profile unavailable to export." -msgstr "Perfil indisponível para exportar." +#: ../../mod/admin.php:244 +msgid "Registered accounts" +msgstr "Contas Registradas" -#: ../../mod/profiles.php:241 -msgid "Profile Name is required." -msgstr "É obrigatório informar o nome do perfil." +#: ../../mod/admin.php:245 ../../mod/admin.php:552 +msgid "Pending registrations" +msgstr "Registros pendentes" -#: ../../mod/profiles.php:404 -msgid "Marital Status" -msgstr "Estado civil" +#: ../../mod/admin.php:246 +msgid "Registered channels" +msgstr "Canais Registrados" -#: ../../mod/profiles.php:408 -msgid "Romantic Partner" -msgstr "Parceiro/a romântico/a" +#: ../../mod/admin.php:247 ../../mod/admin.php:553 +msgid "Active plugins" +msgstr "Plugins ativos" + +#: ../../mod/admin.php:248 +msgid "Version" +msgstr "Versão" -#: ../../mod/profiles.php:412 -msgid "Likes" -msgstr "Gosta de" +#: ../../mod/admin.php:363 +msgid "Site settings updated." +msgstr "As configurações de site foram atualizadas." -#: ../../mod/profiles.php:416 -msgid "Dislikes" -msgstr "Não gosta de" +#: ../../mod/admin.php:400 ../../mod/settings.php:813 +msgid "mobile" +msgstr "móvel" -#: ../../mod/profiles.php:420 -msgid "Work/Employment" -msgstr "Trabalho/Emprego" +#: ../../mod/admin.php:402 +msgid "experimental" +msgstr "experimental" -#: ../../mod/profiles.php:423 -msgid "Religion" -msgstr "Religião" +#: ../../mod/admin.php:404 +msgid "unsupported" +msgstr "não suportado" -#: ../../mod/profiles.php:427 -msgid "Political Views" -msgstr "Posição política" +#: ../../mod/admin.php:429 +msgid "Yes - with approval" +msgstr "Sim - pendente aprovação" -#: ../../mod/profiles.php:431 ../../mod/id.php:33 -msgid "Gender" -msgstr "Gênero" +#: ../../mod/admin.php:435 +msgid "My site is not a public server" +msgstr "Meu site não é um servidor público" -#: ../../mod/profiles.php:435 -msgid "Sexual Preference" -msgstr "Preferência sexual" +#: ../../mod/admin.php:436 +msgid "My site has paid access only" +msgstr "Meu site oferece somente acesso pago" -#: ../../mod/profiles.php:439 -msgid "Homepage" -msgstr "Página web" +#: ../../mod/admin.php:437 +msgid "My site has free access only" +msgstr "Meu site oferece somente acesso gratuito" -#: ../../mod/profiles.php:443 -msgid "Interests" -msgstr "Interesses" +#: ../../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/profiles.php:447 ../../mod/admin.php:953 -msgid "Address" -msgstr "Endereço" +#: ../../mod/admin.php:454 ../../mod/register.php:207 +msgid "Registration" +msgstr "Registro" -#: ../../mod/profiles.php:537 -msgid "Profile updated." -msgstr "O perfil foi atualizado." +#: ../../mod/admin.php:455 +msgid "File upload" +msgstr "Carregamento de arquivos" -#: ../../mod/profiles.php:626 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "Esconder sua lista de contatos/amigos dos visitantes no seu perfil?" +#: ../../mod/admin.php:456 +msgid "Policies" +msgstr "Políticas" -#: ../../mod/profiles.php:666 -msgid "Edit Profile Details" -msgstr "Editar os detalhes do perfil" +#: ../../mod/admin.php:461 +msgid "Site name" +msgstr "Nome do site" -#: ../../mod/profiles.php:668 -msgid "View this profile" -msgstr "Ver este perfil" +#: ../../mod/admin.php:462 +msgid "Banner/Logo" +msgstr "Cartaz/Logo" -#: ../../mod/profiles.php:670 -msgid "Change Profile Photo" -msgstr "Mudar a foto do perfil" +#: ../../mod/admin.php:463 +msgid "Administrator Information" +msgstr "Informações do Administrador" -#: ../../mod/profiles.php:671 -msgid "Create a new profile using these settings" -msgstr "Criar um novo perfil usando estas configurações" +#: ../../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/profiles.php:672 -msgid "Clone this profile" -msgstr "Clonar este perfil" +#: ../../mod/admin.php:464 +msgid "System language" +msgstr "Idioma do sistema" -#: ../../mod/profiles.php:673 -msgid "Delete this profile" -msgstr "Excluir este perfil" +#: ../../mod/admin.php:465 +msgid "System theme" +msgstr "Tema do sistema" -#: ../../mod/profiles.php:675 -msgid "Import profile from file" -msgstr "Importar perfil dum arquivo" +#: ../../mod/admin.php:465 +msgid "" +"Default system theme - may be over-ridden by user profiles - change theme settings" +msgstr "Tema padrão do sistema - pode ser sobrescrito por perfis de usuário - mudar configurações do tema" -#: ../../mod/profiles.php:676 -msgid "Export profile to file" -msgstr "Exportar perfil para arquivo" +#: ../../mod/admin.php:466 +msgid "Mobile system theme" +msgstr "Tema do sistema móvel" -#: ../../mod/profiles.php:677 -msgid "Profile Name:" -msgstr "Nome do perfil:" +#: ../../mod/admin.php:466 +msgid "Theme for mobile devices" +msgstr "Tema para dispositivos móveis" -#: ../../mod/profiles.php:678 -msgid "Your Full Name:" -msgstr "Seu nome completo:" +#: ../../mod/admin.php:468 +msgid "Enable Diaspora Protocol" +msgstr "Habilitar protocolo Diaspora" -#: ../../mod/profiles.php:679 -msgid "Title/Description:" -msgstr "Título/Descrição:" +#: ../../mod/admin.php:468 +msgid "Communicate with Diaspora and Friendica - experimental" +msgstr "Comunicar com Diaspora e Friendica - experimental" -#: ../../mod/profiles.php:680 -msgid "Your Gender:" -msgstr "Seu gênero:" +#: ../../mod/admin.php:469 +msgid "Allow Feeds as Connections" +msgstr "Permitir Feeds como conexões" -#: ../../mod/profiles.php:681 -msgid "Birthday :" -msgstr "Data de nascimento :" +#: ../../mod/admin.php:469 +msgid "(Heavy system resource usage)" +msgstr "(Alto uso de recursos do sistema)" -#: ../../mod/profiles.php:682 -msgid "Street Address:" -msgstr "Endereço:" +#: ../../mod/admin.php:470 +msgid "Maximum image size" +msgstr "Tamanho máximo de imagens" -#: ../../mod/profiles.php:683 -msgid "Locality/City:" -msgstr "Localidade/Cidade:" +#: ../../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/profiles.php:684 -msgid "Postal/Zip Code:" -msgstr "CEP:" +#: ../../mod/admin.php:471 +msgid "Does this site allow new member registration?" +msgstr "Este site permite o registro de novos membros?" -#: ../../mod/profiles.php:685 -msgid "Country:" -msgstr "País:" +#: ../../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/profiles.php:686 -msgid "Region/State:" -msgstr "Região/Estado:" +#: ../../mod/admin.php:473 +msgid "Register text" +msgstr "Texto de registro" -#: ../../mod/profiles.php:687 -msgid "♥ Marital Status:" -msgstr "Estado civil ♥:" +#: ../../mod/admin.php:473 +msgid "Will be displayed prominently on the registration page." +msgstr "Será exibido proeminentemente na página de registro." -#: ../../mod/profiles.php:688 -msgid "Who: (if applicable)" -msgstr "Quem: (se aplicável)" +#: ../../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/profiles.php:689 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "Exemplos: fulano123, Fulano de Tal, fulano@exemplo.com" +#: ../../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/profiles.php:690 -msgid "Since [date]:" -msgstr "Desde [data]:" +#: ../../mod/admin.php:475 +msgid "Preserve site homepage URL" +msgstr "Preservar o URL da homepage do site" -#: ../../mod/profiles.php:692 -msgid "Homepage URL:" -msgstr "Endereço do website:" +#: ../../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/profiles.php:695 -msgid "Religious Views:" -msgstr "Orientação religiosa:" +#: ../../mod/admin.php:476 +msgid "Accounts abandoned after x days" +msgstr "Contas abandonadas após x dias" -#: ../../mod/profiles.php:696 -msgid "Keywords:" -msgstr "Palavras-chave:" +#: ../../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/profiles.php:699 -msgid "Example: fishing photography software" -msgstr "Exemplo: pesca fotografia software" +#: ../../mod/admin.php:477 +msgid "Allowed friend domains" +msgstr "Domínios permitidos para amigos" -#: ../../mod/profiles.php:700 -msgid "Used in directory listings" -msgstr "Usado em listas de diretório" +#: ../../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. Wildcards são aceitas. Vazio para permitir qualquer domínio" -#: ../../mod/profiles.php:701 -msgid "Tell us about yourself..." -msgstr "Fale um pouco sobre você..." +#: ../../mod/admin.php:478 +msgid "Allowed email domains" +msgstr "Domínios permitidos de e-mail" -#: ../../mod/profiles.php:702 -msgid "Hobbies/Interests" -msgstr "Hobbies/Interesses" +#: ../../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. Wildcards são aceitas. Vazio para permitir qualquer domínio" -#: ../../mod/profiles.php:703 -msgid "Contact information and Social Networks" -msgstr "Informações de contato e redes sociais" +#: ../../mod/admin.php:479 +msgid "Not allowed email domains" +msgstr "Não permitido domínios de e-mail" -#: ../../mod/profiles.php:704 -msgid "My other channels" -msgstr "Meus outros canais" +#: ../../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/profiles.php:705 -msgid "Musical interests" -msgstr "Interesses musicais" +#: ../../mod/admin.php:480 +msgid "Block public" +msgstr "Bloquear público" -#: ../../mod/profiles.php:706 -msgid "Books, literature" -msgstr "Livros, literatura" +#: ../../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/profiles.php:707 -msgid "Television" -msgstr "Televisão" +#: ../../mod/admin.php:481 +msgid "Verify Email Addresses" +msgstr "Verificar endereços de email" -#: ../../mod/profiles.php:708 -msgid "Film/dance/culture/entertainment" -msgstr "Filme/dança/cultura/entretenimento" +#: ../../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/profiles.php:709 -msgid "Love/romance" -msgstr "Amor/romance" +#: ../../mod/admin.php:482 +msgid "Force publish" +msgstr "Forçar publicação" -#: ../../mod/profiles.php:710 -msgid "Work/employment" -msgstr "Trabalho/emprego" +#: ../../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/profiles.php:711 -msgid "School/education" -msgstr "Escola/educação" +#: ../../mod/admin.php:483 +msgid "Disable discovery tab" +msgstr "Desabilitar a aba \"Descubra\"" -#: ../../mod/profiles.php:717 -msgid "This is your default profile." -msgstr "Este é seu perfil padrão." +#: ../../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/profiles.php:728 ../../mod/directory.php:218 -msgid "Age: " -msgstr "Idade: " +#: ../../mod/admin.php:484 +msgid "login on Homepage" +msgstr "login na Página inicial" -#: ../../mod/profiles.php:771 -msgid "Edit/Manage Profiles" -msgstr "Editar/Administrar perfis" +#: ../../mod/admin.php:484 +msgid "" +"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/profiles.php:772 -msgid "Add profile things" -msgstr "Adicionar coisas ao perfil" +#: ../../mod/admin.php:486 +msgid "Proxy user" +msgstr "Usuário do proxy" -#: ../../mod/profiles.php:773 -msgid "Include desirable objects in your profile" -msgstr "Inclua objetos desejáveis no seu perfil" +#: ../../mod/admin.php:487 +msgid "Proxy URL" +msgstr "URL do proxy" -#: ../../mod/ratings.php:69 -msgid "No ratings" -msgstr "Sem avaliações" +#: ../../mod/admin.php:488 +msgid "Network timeout" +msgstr "Timeout da rede" -#: ../../mod/ratings.php:99 -msgid "Ratings" -msgstr "Avaliações" +#: ../../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/ratings.php:100 -msgid "Rating: " -msgstr "Avaliações" +#: ../../mod/admin.php:489 +msgid "Delivery interval" +msgstr "Intervalo de entrega" -#: ../../mod/ratings.php:101 -msgid "Website: " -msgstr "Website:" +#: ../../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/ratings.php:103 -msgid "Description: " -msgstr "Descrição:" +#: ../../mod/admin.php:490 +msgid "Poll interval" +msgstr "Intervalo de coleta" -#: ../../mod/viewsrc.php:38 -msgid "Source of Item" -msgstr "Fonte do Item" +#: ../../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/openid.php:26 -msgid "OpenID protocol error. No ID returned." -msgstr "Erro do protocolo OpenID. Nenhuma ID retornada." +#: ../../mod/admin.php:491 +msgid "Maximum Load Average" +msgstr "Carga média máxima" -#: ../../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/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/directory.php:224 -#, php-format -msgid "%d rating" -msgid_plural "%d ratings" -msgstr[0] "%d avaliação" -msgstr[1] "%d avaliações" +#: ../../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/directory.php:236 -msgid "Gender: " -msgstr "Gênero: " +#: ../../mod/admin.php:492 +msgid "0 for no expiration of imported content" +msgstr "0 para nunca expirar o conteúdo importado" -#: ../../mod/directory.php:238 -msgid "Status: " -msgstr "Status:" +#: ../../mod/admin.php:540 +msgid "No server found" +msgstr "Nenhum servidor foi encontrado" -#: ../../mod/directory.php:240 -msgid "Homepage: " -msgstr "Website:" +#: ../../mod/admin.php:547 ../../mod/admin.php:831 +msgid "ID" +msgstr "ID" -#: ../../mod/directory.php:243 -msgid "Hometown: " -msgstr "Cidade natal:" +#: ../../mod/admin.php:547 +msgid "for channel" +msgstr "para o canal" -#: ../../mod/directory.php:245 -msgid "About: " -msgstr "Sobre:" +#: ../../mod/admin.php:547 +msgid "on server" +msgstr "no servidor" -#: ../../mod/directory.php:303 -msgid "Public Forum:" -msgstr "Fórum público:" +#: ../../mod/admin.php:547 +msgid "Status" +msgstr "Status" -#: ../../mod/directory.php:306 -msgid "Keywords: " -msgstr "Palavras-chave:" +#: ../../mod/admin.php:549 +msgid "Server" +msgstr "Servidor" -#: ../../mod/directory.php:311 -#, php-format -msgid "Common connections: %s" -msgstr "Conexões em Comum: %s" +#: ../../mod/admin.php:566 +msgid "Update has been marked successful" +msgstr "A atualização foi designada bem sucedida" -#: ../../mod/directory.php:363 -msgid "Finding:" -msgstr "Pesquisando:" +#: ../../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/directory.php:368 -msgid "next page" -msgstr "próxima página" +#: ../../mod/admin.php:579 +#, php-format +msgid "Update %s was successfully applied." +msgstr "A atualização %s foi aplicada com sucesso." -#: ../../mod/directory.php:368 -msgid "previous page" -msgstr "página anterior" +#: ../../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/directory.php:385 -msgid "No entries (some entries may be hidden)." -msgstr "Nenhuma entrada (algumas entradas podem estar escondidas)." +#: ../../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/uexport.php:33 ../../mod/uexport.php:34 -msgid "Export Channel" -msgstr "Exportar o canal" +#: ../../mod/admin.php:602 +msgid "No failed updates." +msgstr "Nenhuma falha nas atualizações." -#: ../../mod/uexport.php:35 -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 "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/admin.php:606 +msgid "Failed Updates" +msgstr "Falha nas atualizações" -#: ../../mod/uexport.php:36 -msgid "Export Content" -msgstr "Exportar conteúdo" +#: ../../mod/admin.php:608 +msgid "Mark success (if update was manually applied)" +msgstr "Marque sucesso (se a atualização foi aplicada manualmente)" -#: ../../mod/uexport.php:37 -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 " -"content, but is generally not suitable for importing a channel to a new hub " -"as this file may be VERY large. Please be patient - it may take several " -"minutes for this download to begin." -msgstr "Exportar as informações do seu canal e todo conteúdo para um backup JSON. Este backup irá conter todas suas conexões, permissões, dados de perfil e todo seu conteúdo, mas geralmente não é adequado para importar um canal para um novo hub, pois esse arquivo pode ser MUITO grande. Por favor seja paciente - pode demorar muitos minutos para este download começar." +#: ../../mod/admin.php:609 +msgid "Attempt to execute this update step automatically" +msgstr "Tente executar este passo da atualização automaticamente" -#: ../../mod/viewconnections.php:62 -msgid "No connections." -msgstr "Nenhuma conexão." +#: ../../mod/admin.php:641 +msgid "Queue Statistics" +msgstr "Filas de Estatísticas" -#: ../../mod/viewconnections.php:75 -#, php-format -msgid "Visit %s's profile [%s]" -msgstr "Ver o perfil de %s [%s]" +#: ../../mod/admin.php:642 +msgid "Total Entries" +msgstr "Total de Entradas" -#: ../../mod/zfinger.php:23 -msgid "invalid target signature" -msgstr "assinatura do destino inválida" +#: ../../mod/admin.php:643 +msgid "Priority" +msgstr "Prioridade" -#: ../../mod/admin.php:52 -msgid "Theme settings updated." -msgstr "As configurações de tema foram atualizadas." +#: ../../mod/admin.php:644 +msgid "Destination URL" +msgstr "URL de destino" -#: ../../mod/admin.php:93 ../../mod/admin.php:445 -msgid "Site" -msgstr "Site" +#: ../../mod/admin.php:645 +msgid "Mark hub permanently offline" +msgstr "Marque o Hub como permanentemente fora do ar" -#: ../../mod/admin.php:94 -msgid "Accounts" -msgstr "Contas" +#: ../../mod/admin.php:646 +msgid "Empty queue for this hub" +msgstr "Fila vazia para esse hub" -#: ../../mod/admin.php:95 ../../mod/admin.php:945 -msgid "Channels" -msgstr "Canais" +#: ../../mod/admin.php:647 +msgid "Last known contact" +msgstr "Último contato conhecido" -#: ../../mod/admin.php:96 ../../mod/admin.php:1036 ../../mod/admin.php:1076 -msgid "Plugins" -msgstr "Plugins" +#: ../../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:97 ../../mod/admin.php:1236 ../../mod/admin.php:1270 -msgid "Themes" -msgstr "Temas" +#: ../../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:98 -msgid "Inspect queue" -msgstr "Inspecione fila" +#: ../../mod/admin.php:727 +msgid "Account not found" +msgstr "A conta não foi encontrada" -#: ../../mod/admin.php:100 -msgid "Profile Config" -msgstr "Configuração de perfis" +#: ../../mod/admin.php:747 +#, php-format +msgid "User '%s' blocked" +msgstr "O usuário/a '%s' foi bloqueado/a" -#: ../../mod/admin.php:101 -msgid "DB updates" -msgstr "Atualizações do Banco de Dados" +#: ../../mod/admin.php:755 +#, php-format +msgid "User '%s' unblocked" +msgstr "O usuário/a '%s' foi desbloqueado/a" -#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1355 -msgid "Logs" -msgstr "Logs" +#: ../../mod/admin.php:818 ../../mod/admin.php:830 +msgid "Users" +msgstr "Usuários" -#: ../../mod/admin.php:121 -msgid "Plugin Features" -msgstr "Recursos dos plugins" +#: ../../mod/admin.php:820 ../../mod/admin.php:987 +msgid "select all" +msgstr "selecionar tudo" -#: ../../mod/admin.php:123 -msgid "User registrations waiting for confirmation" +#: ../../mod/admin.php:821 +msgid "User registrations waiting for confirm" msgstr "Registros de usuário aguardando confirmação" -#: ../../mod/admin.php:200 -msgid "# Accounts" -msgstr "# Contas" +#: ../../mod/admin.php:822 +msgid "Request date" +msgstr "Data de requisição" -#: ../../mod/admin.php:201 -msgid "# blocked accounts" -msgstr "# Contas bloqueadas" +#: ../../mod/admin.php:823 +msgid "No registrations." +msgstr "Nenhum registro." -#: ../../mod/admin.php:202 -msgid "# expired accounts" -msgstr "# Contas expiradas" +#: ../../mod/admin.php:824 ../../mod/connedit.php:683 +msgid "Approve" +msgstr "Aprovar" -#: ../../mod/admin.php:203 -msgid "# expiring accounts" -msgstr "#contas expirando" +#: ../../mod/admin.php:825 +msgid "Deny" +msgstr "Negar" -#: ../../mod/admin.php:216 -msgid "# Channels" -msgstr "# Canais" +#: ../../mod/admin.php:827 ../../mod/connedit.php:519 +msgid "Block" +msgstr "Bloquear" -#: ../../mod/admin.php:217 -msgid "# primary" -msgstr "# Primário" +#: ../../mod/admin.php:828 ../../mod/connedit.php:519 +msgid "Unblock" +msgstr "Desbloquear" -#: ../../mod/admin.php:218 -msgid "# clones" -msgstr "# clones" +#: ../../mod/admin.php:831 +msgid "Register date" +msgstr "Data de registro" -#: ../../mod/admin.php:224 -msgid "Message queues" -msgstr "Filas de mensagem" +#: ../../mod/admin.php:831 +msgid "Last login" +msgstr "Última autenticação" -#: ../../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 -msgid "Administration" -msgstr "Administração" +#: ../../mod/admin.php:831 +msgid "Expires" +msgstr "Expira" -#: ../../mod/admin.php:241 -msgid "Summary" -msgstr "Resumo" +#: ../../mod/admin.php:831 +msgid "Service Class" +msgstr "Classe de serviço" -#: ../../mod/admin.php:244 -msgid "Registered accounts" -msgstr "Contas Registradas" +#: ../../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:245 ../../mod/admin.php:543 -msgid "Pending registrations" -msgstr "Registros pendentes" +#: ../../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:246 -msgid "Registered channels" -msgstr "Canais Registrados" +#: ../../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:247 ../../mod/admin.php:544 -msgid "Active plugins" -msgstr "Plugins ativos" +#: ../../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:248 -msgid "Version" -msgstr "Versão" +#: ../../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:359 -msgid "Site settings updated." -msgstr "As configurações de site foram atualizadas." +#: ../../mod/admin.php:906 +msgid "Channel not found" +msgstr "Canal não encontrado" -#: ../../mod/admin.php:398 -msgid "experimental" -msgstr "experimental" +#: ../../mod/admin.php:917 +#, php-format +msgid "Channel '%s' deleted" +msgstr "Canal '%s' deletado" -#: ../../mod/admin.php:400 -msgid "unsupported" -msgstr "não suportado" +#: ../../mod/admin.php:929 +#, php-format +msgid "Channel '%s' censored" +msgstr "Canal '%s' censurado" -#: ../../mod/admin.php:425 -msgid "Yes - with approval" -msgstr "Sim - pendente aprovação" +#: ../../mod/admin.php:929 +#, php-format +msgid "Channel '%s' uncensored" +msgstr "Canal '%s' não censurado" -#: ../../mod/admin.php:431 -msgid "My site is not a public server" -msgstr "Meu site não é um servidor público" +#: ../../mod/admin.php:940 +#, php-format +msgid "Channel '%s' code allowed" +msgstr "Código permitido para o canal '%s'" -#: ../../mod/admin.php:432 -msgid "My site has paid access only" -msgstr "Meu site oferece somente acesso pago" +#: ../../mod/admin.php:940 +#, php-format +msgid "Channel '%s' code disallowed" +msgstr "Código proibido para o canal '%s'" -#: ../../mod/admin.php:433 -msgid "My site has free access only" -msgstr "Meu site oferece somente acesso gratuito" +#: ../../mod/admin.php:989 +msgid "Censor" +msgstr "Censurar" -#: ../../mod/admin.php:434 -msgid "My site offers free accounts with optional paid upgrades" -msgstr "Meu site oferece contas gratuitas com recursos adicionais pagos" +#: ../../mod/admin.php:990 +msgid "Uncensor" +msgstr "Não censurar" -#: ../../mod/admin.php:447 ../../mod/register.php:207 -msgid "Registration" -msgstr "Registro" +#: ../../mod/admin.php:991 +msgid "Allow Code" +msgstr "Permitir código" -#: ../../mod/admin.php:448 -msgid "File upload" -msgstr "Carregamento de arquivos" +#: ../../mod/admin.php:992 +msgid "Disallow Code" +msgstr "Proibir código" -#: ../../mod/admin.php:449 -msgid "Policies" -msgstr "Políticas" +#: ../../mod/admin.php:994 +msgid "UID" +msgstr "UID" -#: ../../mod/admin.php:454 -msgid "Site name" -msgstr "Nome do site" +#: ../../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:455 -msgid "Banner/Logo" -msgstr "Cartaz/Logo" +#: ../../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:456 -msgid "Administrator Information" -msgstr "Informações do Administrador" +#: ../../mod/admin.php:1037 +#, php-format +msgid "Plugin %s disabled." +msgstr "Plugin %s desabilitado." -#: ../../mod/admin.php:456 -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:1041 +#, php-format +msgid "Plugin %s enabled." +msgstr "Plugin %s habilitado." -#: ../../mod/admin.php:457 -msgid "System language" -msgstr "Idioma do sistema" +#: ../../mod/admin.php:1051 ../../mod/admin.php:1249 +msgid "Disable" +msgstr "Desabilitar" -#: ../../mod/admin.php:458 -msgid "System theme" -msgstr "Tema do sistema" +#: ../../mod/admin.php:1054 ../../mod/admin.php:1251 +msgid "Enable" +msgstr "Habilitar" -#: ../../mod/admin.php:458 -msgid "" -"Default system theme - may be over-ridden by user profiles - change theme settings" -msgstr "Tema padrão do sistema - pode ser sobrescrito por perfis de usuário - mudar configurações do tema" +#: ../../mod/admin.php:1078 ../../mod/admin.php:1278 +msgid "Toggle" +msgstr "Alternar" -#: ../../mod/admin.php:459 -msgid "Mobile system theme" -msgstr "Tema do sistema móvel" +#: ../../mod/admin.php:1086 ../../mod/admin.php:1288 +msgid "Author: " +msgstr "Autor:" -#: ../../mod/admin.php:459 -msgid "Theme for mobile devices" -msgstr "Tema para dispositivos móveis" +#: ../../mod/admin.php:1087 ../../mod/admin.php:1289 +msgid "Maintainer: " +msgstr "Mantenedor:" -#: ../../mod/admin.php:461 -msgid "Enable Diaspora Protocol" -msgstr "Habilitar protocolo Diaspora" +#: ../../mod/admin.php:1214 +msgid "No themes found." +msgstr "Nenhum tema foi encontrado." -#: ../../mod/admin.php:461 -msgid "Communicate with Diaspora and Friendica - experimental" -msgstr "Comunicar com Diaspora e Friendica - experimental" +#: ../../mod/admin.php:1270 +msgid "Screenshot" +msgstr "Captura de tela" -#: ../../mod/admin.php:462 -msgid "Allow Feeds as Connections" -msgstr "Permitir Feeds como conexões" +#: ../../mod/admin.php:1316 +msgid "[Experimental]" +msgstr "[Experimental]" -#: ../../mod/admin.php:462 -msgid "(Heavy system resource usage)" -msgstr "(Alto uso de recursos do sistema)" +#: ../../mod/admin.php:1317 +msgid "[Unsupported]" +msgstr "[Desassistido]" -#: ../../mod/admin.php:463 -msgid "Maximum image size" -msgstr "Tamanho máximo de imagens" +#: ../../mod/admin.php:1341 +msgid "Log settings updated." +msgstr "As configurações de log foram atualizadas." -#: ../../mod/admin.php:463 -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:1398 +msgid "Clear" +msgstr "Limpar" -#: ../../mod/admin.php:464 -msgid "Does this site allow new member registration?" -msgstr "Este site permite o registro de novos membros?" +#: ../../mod/admin.php:1404 +msgid "Debugging" +msgstr "Depuração" -#: ../../mod/admin.php:465 -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:1405 +msgid "Log file" +msgstr "Arquivo de log" -#: ../../mod/admin.php:466 -msgid "Register text" -msgstr "Texto de registro" +#: ../../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:466 -msgid "Will be displayed prominently on the registration page." -msgstr "Será exibido proeminentemente na página de registro." +#: ../../mod/admin.php:1406 +msgid "Log level" +msgstr "Nível do log" + +#: ../../mod/admin.php:1452 +msgid "New Profile Field" +msgstr "Novo campo de perfil" + +#: ../../mod/admin.php:1453 ../../mod/admin.php:1473 +msgid "Field nickname" +msgstr "Nome de apresentação do campo" -#: ../../mod/admin.php:467 -msgid "Accounts abandoned after x days" -msgstr "Contas abandonadas após x dias" +#: ../../mod/admin.php:1453 ../../mod/admin.php:1473 +msgid "System name of field" +msgstr "Nome de sistema do campo" -#: ../../mod/admin.php:467 -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:1454 ../../mod/admin.php:1474 +msgid "Input type" +msgstr "Tipo de entrada" -#: ../../mod/admin.php:468 -msgid "Allowed friend domains" -msgstr "Domínios permitidos para amigos" +#: ../../mod/admin.php:1455 ../../mod/admin.php:1475 +msgid "Field Name" +msgstr "Nome do campo" -#: ../../mod/admin.php:468 -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. Wildcards são aceitas. Vazio para permitir qualquer domínio" +#: ../../mod/admin.php:1455 ../../mod/admin.php:1475 +msgid "Label on profile pages" +msgstr "Rótulo nas páginas de perfil" -#: ../../mod/admin.php:469 -msgid "Allowed email domains" -msgstr "Domínios permitidos de e-mail" +#: ../../mod/admin.php:1456 ../../mod/admin.php:1476 +msgid "Help text" +msgstr "Texto de ajuda" -#: ../../mod/admin.php:469 -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. Wildcards são aceitas. Vazio para permitir qualquer domínio" +#: ../../mod/admin.php:1456 ../../mod/admin.php:1476 +msgid "Additional info (optional)" +msgstr "Informações adicionais (opcional)" -#: ../../mod/admin.php:470 -msgid "Not allowed email domains" -msgstr "Não permitido domínios de e-mail" +#: ../../mod/admin.php:1466 +msgid "Field definition not found" +msgstr "A dfinição de campo não foi encontrada" -#: ../../mod/admin.php:470 -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:1472 +msgid "Edit Profile Field" +msgstr "Editar campo de perfil" -#: ../../mod/admin.php:471 -msgid "Block public" -msgstr "Bloquear público" +#: ../../mod/oexchange.php:23 +msgid "Unable to find your hub." +msgstr "Não foi possível localizar seu hub." -#: ../../mod/admin.php:471 -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/oexchange.php:37 +msgid "Post successful." +msgstr "Publicado com sucesso." -#: ../../mod/admin.php:472 -msgid "Verify Email Addresses" -msgstr "Verificar endereços de email" +#: ../../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ã." -#: ../../mod/admin.php:472 +#: ../../mod/register.php:50 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)." +"Please indicate acceptance of the Terms of Service. Registration failed." +msgstr "Por favor, indique a aceitação dos Termos de Serviço. Falha ao registrar." -#: ../../mod/admin.php:473 -msgid "Force publish" -msgstr "Forçar publicação" +#: ../../mod/register.php:84 +msgid "Passwords do not match." +msgstr "Senhas não conferem." -#: ../../mod/admin.php:473 +#: ../../mod/register.php:117 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." +"Registration successful. Please check your email for validation " +"instructions." +msgstr "O registro foi bem sucedido. Por favor, verifique seu e-mail para confirmar o registro." -#: ../../mod/admin.php:474 -msgid "Disable discovery tab" -msgstr "Desabilitar a aba \"Descubra\"" +#: ../../mod/register.php:123 +msgid "Your registration is pending approval by the site owner." +msgstr "A aprovação do seu registro está pendente junto ao administrador do site." -#: ../../mod/admin.php:474 -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/register.php:126 +msgid "Your registration can not be processed." +msgstr "Não foi possível processar o seu registro." -#: ../../mod/admin.php:475 -msgid "No login on Homepage" -msgstr "Sem formulário de autenticação na página inicial" +#: ../../mod/register.php:163 +msgid "Registration on this site/hub is by approval only." +msgstr "O registro neste site/hub requer aprovação." -#: ../../mod/admin.php:475 -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)." +#: ../../mod/register.php:164 +msgid "Register at another affiliated site/hub" +msgstr "Registre em um outro site/hub afiliado" -#: ../../mod/admin.php:477 -msgid "Proxy user" -msgstr "Usuário do proxy" +#: ../../mod/register.php:174 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "Este site excedeu o número máximo de registros de novas contas. Por favor, tente novamente amanhã." -#: ../../mod/admin.php:478 -msgid "Proxy URL" -msgstr "URL do proxy" +#: ../../mod/register.php:185 +msgid "Terms of Service" +msgstr "Termos de Serviço" -#: ../../mod/admin.php:479 -msgid "Network timeout" -msgstr "Timeout da rede" +#: ../../mod/register.php:191 +#, php-format +msgid "I accept the %s for this website" +msgstr "Eu aceito os %s deste website." -#: ../../mod/admin.php:479 -msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." -msgstr "Valor em segundos. Use 0 para ilimitado (não recomendado)." +#: ../../mod/register.php:193 +#, php-format +msgid "I am over 13 years of age and accept the %s for this website" +msgstr "Eu sou maior de 13 anos e aceito os %s deste website" -#: ../../mod/admin.php:480 -msgid "Delivery interval" -msgstr "Intervalo de entrega" +#: ../../mod/register.php:212 +msgid "Membership on this site is by invitation only." +msgstr "Novas contas neste site se dão apenas por convite." -#: ../../mod/admin.php:480 -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/register.php:213 +msgid "Please enter your invitation code" +msgstr "Por favor, digite o código do seu convite" -#: ../../mod/admin.php:481 -msgid "Poll interval" -msgstr "Intervalo de coleta" +#: ../../mod/register.php:216 +msgid "Your email address" +msgstr "Seu endereço de e-mail" -#: ../../mod/admin.php:481 -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/register.php:217 +msgid "Choose a password" +msgstr "Escolha uma senha" -#: ../../mod/admin.php:482 -msgid "Maximum Load Average" -msgstr "Carga média máxima" +#: ../../mod/register.php:218 +msgid "Please re-enter your password" +msgstr "Por favor, digite sua senha novamente" -#: ../../mod/admin.php:482 +#: ../../mod/removeaccount.php:30 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." +"Account removals are not allowed within 48 hours of changing the account " +"password." +msgstr "A remoção da conta fica desabilitada por 48 horas após uma troca de senha da conta." -#: ../../mod/admin.php:483 -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/removeaccount.php:57 +msgid "Remove This Account" +msgstr "Remover esta conta" -#: ../../mod/admin.php:483 -msgid "0 for no expiration of imported content" -msgstr "0 para nunca expirar o conteúdo importado" +#: ../../mod/removeaccount.php:58 ../../mod/removeme.php:58 +msgid "WARNING: " +msgstr "AVISO:" -#: ../../mod/admin.php:531 -msgid "No server found" -msgstr "Nenhum servidor foi encontrado" +#: ../../mod/removeaccount.php:58 +msgid "" +"This account and all its channels will be completely removed from the " +"network. " +msgstr "Esta conta e todos seus canais será completamente excluída da rede." -#: ../../mod/admin.php:538 ../../mod/admin.php:822 -msgid "ID" -msgstr "ID" +#: ../../mod/removeaccount.php:58 ../../mod/removeme.php:58 +msgid "This action is permanent and can not be undone!" +msgstr "Esta ação é permanente e não pode ser desfeita!" -#: ../../mod/admin.php:538 -msgid "for channel" -msgstr "para o canal" +#: ../../mod/removeaccount.php:59 ../../mod/removeme.php:59 +msgid "Please enter your password for verification:" +msgstr "Por favor, digite a sua senha para verificação:" -#: ../../mod/admin.php:538 -msgid "on server" -msgstr "no servidor" +#: ../../mod/removeaccount.php:60 +msgid "" +"Remove this account, all its channels and all its channel clones from the " +"network" +msgstr "Remove esta conta, todos os seus canais e todos os clones desses canais da rede." -#: ../../mod/admin.php:538 -msgid "Status" -msgstr "Status" +#: ../../mod/removeaccount.php:60 +msgid "" +"By default only the instances of the channels located on this hub will be " +"removed from the network" +msgstr "Por padrão, apenas as instâncias dos canais localizadas neste hub serão removidas da rede" -#: ../../mod/admin.php:540 -msgid "Server" -msgstr "Servidor" +#: ../../mod/removeaccount.php:61 ../../mod/settings.php:720 +msgid "Remove Account" +msgstr "Remover conta" -#: ../../mod/admin.php:557 -msgid "Update has been marked successful" -msgstr "A atualização foi designada bem sucedida" +#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61 +msgid "Help:" +msgstr "Ajuda:" -#: ../../mod/admin.php:567 -#, php-format -msgid "Executing %s failed. Check system logs." -msgstr "Execução de %s falhou. Verifique os logs do sistema." +#: ../../mod/help.php:76 ../../index.php:238 +msgid "Not Found" +msgstr "Não encontrada" -#: ../../mod/admin.php:570 -#, php-format -msgid "Update %s was successfully applied." -msgstr "A atualização %s foi aplicada com sucesso." +#: ../../mod/help.php:100 +msgid "$Projectname Documentation" +msgstr "Documentação de $Projectname" -#: ../../mod/admin.php:574 -#, 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/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_public.php:21 +msgid "[Embedded content - reload page to view]" +msgstr "[Conteúdo incorporado - recarregue a página para ver]" + +#: ../../mod/lockview.php:37 +msgid "Remote privacy information not available." +msgstr "Não existe informação disponível sobre a privacidade remota." -#: ../../mod/admin.php:577 -#, php-format -msgid "Update function %s could not be found." -msgstr "A função de atualização %s não foi encontrada." +#: ../../mod/lockview.php:58 +msgid "Visible to:" +msgstr "Visível para:" -#: ../../mod/admin.php:593 -msgid "No failed updates." -msgstr "Nenhuma falha nas atualizações." +#: ../../mod/settings.php:76 +msgid "Name is required" +msgstr "É necessário informar o nome" -#: ../../mod/admin.php:597 -msgid "Failed Updates" -msgstr "Falha nas atualizações" +#: ../../mod/settings.php:80 +msgid "Key and Secret are required" +msgstr "A chave e o segredo são obrigatórios" -#: ../../mod/admin.php:599 -msgid "Mark success (if update was manually applied)" -msgstr "Marque sucesso (se a atualização foi aplicada manualmente)" +#: ../../mod/settings.php:130 +msgid "Diaspora Policy Settings updated." +msgstr "Configurações da política do Diáspora atualizadas." -#: ../../mod/admin.php:600 -msgid "Attempt to execute this update step automatically" -msgstr "Tente executar este passo da atualização automaticamente" +#: ../../mod/settings.php:238 +msgid "Passwords do not match. Password unchanged." +msgstr "As senhas não correspondem. A senha não foi modificada." -#: ../../mod/admin.php:632 -msgid "Queue Statistics" -msgstr "Filas de Estatísticas" +#: ../../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/admin.php:633 -msgid "Total Entries" -msgstr "Total de Entradas" +#: ../../mod/settings.php:256 +msgid "Password changed." +msgstr "A senha foi modificada." -#: ../../mod/admin.php:634 -msgid "Priority" -msgstr "Prioridade" +#: ../../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/admin.php:635 -msgid "Destination URL" -msgstr "URL de destino" +#: ../../mod/settings.php:272 +msgid "Not valid email." +msgstr "Não é um e-mail válido" -#: ../../mod/admin.php:636 -msgid "Mark hub permanently offline" -msgstr "Marque o Hub como permanentemente fora do ar" +#: ../../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/admin.php:637 -msgid "Empty queue for this hub" -msgstr "Fila vazia para esse hub" +#: ../../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/admin.php:638 -msgid "Last known contact" -msgstr "Último contato conhecido" +#: ../../mod/settings.php:523 +msgid "Settings updated." +msgstr "As configurações foram atualizadas." -#: ../../mod/admin.php:674 -#, 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/settings.php:587 ../../mod/settings.php:613 +#: ../../mod/settings.php:649 +msgid "Add application" +msgstr "Adicionar aplicação" -#: ../../mod/admin.php:682 -#, 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/settings.php:590 +msgid "Name of application" +msgstr "Nome da aplicação" -#: ../../mod/admin.php:718 -msgid "Account not found" -msgstr "A conta não foi encontrada" +#: ../../mod/settings.php:591 ../../mod/settings.php:617 +msgid "Consumer Key" +msgstr "Chave de consumidor" -#: ../../mod/admin.php:738 -#, php-format -msgid "User '%s' blocked" -msgstr "O usuário/a '%s' foi bloqueado/a" +#: ../../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/admin.php:746 -#, php-format -msgid "User '%s' unblocked" -msgstr "O usuário/a '%s' foi desbloqueado/a" +#: ../../mod/settings.php:592 ../../mod/settings.php:618 +msgid "Consumer Secret" +msgstr "Segredo de consumidor" -#: ../../mod/admin.php:809 ../../mod/admin.php:821 -msgid "Users" -msgstr "Usuários" +#: ../../mod/settings.php:593 ../../mod/settings.php:619 +msgid "Redirect" +msgstr "Redirecionamento" -#: ../../mod/admin.php:811 ../../mod/admin.php:947 -msgid "select all" -msgstr "selecionar tudo" +#: ../../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/admin.php:812 -msgid "User registrations waiting for confirm" -msgstr "Registros de usuário aguardando confirmação" +#: ../../mod/settings.php:594 ../../mod/settings.php:620 +msgid "Icon url" +msgstr "URL do ícone" -#: ../../mod/admin.php:813 -msgid "Request date" -msgstr "Data de requisição" +#: ../../mod/settings.php:594 +msgid "Optional" +msgstr "Opcional" -#: ../../mod/admin.php:814 -msgid "No registrations." -msgstr "Nenhum registro." +#: ../../mod/settings.php:605 +msgid "You can't edit this application." +msgstr "Você não pode editar esta aplicação." -#: ../../mod/admin.php:815 -msgid "Approve" -msgstr "Aprovar" +#: ../../mod/settings.php:648 +msgid "Connected Apps" +msgstr "Aplicações conectadas" -#: ../../mod/admin.php:816 -msgid "Deny" -msgstr "Negar" +#: ../../mod/settings.php:652 +msgid "Client key starts with" +msgstr "Chave do cliente começa com" -#: ../../mod/admin.php:818 ../../mod/connedit.php:517 -#: ../../mod/connedit.php:720 -msgid "Block" -msgstr "Bloquear" +#: ../../mod/settings.php:653 +msgid "No name" +msgstr "Sem nome" -#: ../../mod/admin.php:819 ../../mod/connedit.php:517 -#: ../../mod/connedit.php:720 -msgid "Unblock" -msgstr "Desbloquear" +#: ../../mod/settings.php:654 +msgid "Remove authorization" +msgstr "Remover autorização" -#: ../../mod/admin.php:822 -msgid "Register date" -msgstr "Data de registro" +#: ../../mod/settings.php:668 +msgid "No feature settings configured" +msgstr "Não foi definida nenhuma configuração do recurso" -#: ../../mod/admin.php:822 -msgid "Last login" -msgstr "Última autenticação" +#: ../../mod/settings.php:685 +msgid "Feature/Addon Settings" +msgstr "Configuração de Característica/Plugins" -#: ../../mod/admin.php:822 -msgid "Expires" -msgstr "Expira" +#: ../../mod/settings.php:687 +msgid "Settings for the built-in Diaspora emulator" +msgstr "Configurações para construir um emulador de Diáspora" -#: ../../mod/admin.php:822 -msgid "Service Class" -msgstr "Classe de serviço" +#: ../../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/admin.php:824 -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/settings.php:689 +msgid "Enable the Diaspora protocol for this channel" +msgstr "Habilitar o protocolo Diaspora para este canal" -#: ../../mod/admin.php:825 -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/settings.php:690 +msgid "Diaspora Policy Settings" +msgstr "Configurações de Política do Diáspora" -#: ../../mod/admin.php:859 -#, 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/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/admin.php:866 -#, php-format -msgid "%s channel deleted" -msgid_plural "%s channels deleted" -msgstr[0] "%s canal deletado" -msgstr[1] "%s canais deletados" +#: ../../mod/settings.php:715 +msgid "Account Settings" +msgstr "Configurações da conta" -#: ../../mod/admin.php:886 -msgid "Channel not found" -msgstr "Canal não encontrado" +#: ../../mod/settings.php:716 +msgid "Enter New Password:" +msgstr "Digite a Nova Senha:" -#: ../../mod/admin.php:897 -#, php-format -msgid "Channel '%s' deleted" -msgstr "Canal '%s' deletado" +#: ../../mod/settings.php:717 +msgid "Confirm New Password:" +msgstr "Confirme a Nova Senha:" -#: ../../mod/admin.php:908 -#, php-format -msgid "Channel '%s' uncensored" -msgstr "Canal '%s' não censurado" +#: ../../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/admin.php:908 -#, php-format -msgid "Channel '%s' censored" -msgstr "Canal '%s' censurado" +#: ../../mod/settings.php:719 ../../mod/settings.php:1057 +msgid "Email Address:" +msgstr "Endereço de e-mail:" -#: ../../mod/admin.php:949 -msgid "Censor" -msgstr "Censurar" +#: ../../mod/settings.php:721 +msgid "Remove this account including all its channels" +msgstr "Exclua esta conta, incluindo todos seus canais" -#: ../../mod/admin.php:950 -msgid "Uncensor" -msgstr "Não censurar" +#: ../../mod/settings.php:737 +msgid "Off" +msgstr "Desligado" -#: ../../mod/admin.php:953 -msgid "UID" -msgstr "UID" +#: ../../mod/settings.php:737 +msgid "On" +msgstr "Ligado" -#: ../../mod/admin.php:955 -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/settings.php:744 +msgid "Additional Features" +msgstr "Recursos adicionais" -#: ../../mod/admin.php:956 -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/settings.php:768 +msgid "Connector Settings" +msgstr "Configurações do conector" -#: ../../mod/admin.php:996 -#, php-format -msgid "Plugin %s disabled." -msgstr "Plugin %s desabilitado." +#: ../../mod/settings.php:807 +msgid "No special theme for mobile devices" +msgstr "Sem tema especial para aparelhos móveis" -#: ../../mod/admin.php:1000 +#: ../../mod/settings.php:810 #, php-format -msgid "Plugin %s enabled." -msgstr "Plugin %s habilitado." - -#: ../../mod/admin.php:1010 ../../mod/admin.php:1208 -msgid "Disable" -msgstr "Desabilitar" +msgid "%s - (Experimental)" +msgstr "%s - (Experimental)" -#: ../../mod/admin.php:1013 ../../mod/admin.php:1210 -msgid "Enable" -msgstr "Habilitar" +#: ../../mod/settings.php:849 +msgid "Display Settings" +msgstr "Configurações de exibição" -#: ../../mod/admin.php:1037 ../../mod/admin.php:1237 -msgid "Toggle" -msgstr "Alternar" +#: ../../mod/settings.php:850 +msgid "Theme Settings" +msgstr "Configurações de tema" -#: ../../mod/admin.php:1045 ../../mod/admin.php:1247 -msgid "Author: " -msgstr "Autor:" +#: ../../mod/settings.php:851 +msgid "Custom Theme Settings" +msgstr "Configurações personalizadas de tema" -#: ../../mod/admin.php:1046 ../../mod/admin.php:1248 -msgid "Maintainer: " -msgstr "Mantenedor:" +#: ../../mod/settings.php:852 +msgid "Content Settings" +msgstr "Configurações de conteúdo" -#: ../../mod/admin.php:1173 -msgid "No themes found." -msgstr "Nenhum tema foi encontrado." +#: ../../mod/settings.php:858 +msgid "Display Theme:" +msgstr "Tema do perfil:" -#: ../../mod/admin.php:1229 -msgid "Screenshot" -msgstr "Captura de tela" +#: ../../mod/settings.php:859 +msgid "Mobile Theme:" +msgstr "Tema móvel:" -#: ../../mod/admin.php:1275 -msgid "[Experimental]" -msgstr "[Experimental]" +#: ../../mod/settings.php:860 +msgid "Enable user zoom on mobile devices" +msgstr "Permitir zoom pelo usuário em dispositivos móveis" -#: ../../mod/admin.php:1276 -msgid "[Unsupported]" -msgstr "[Desassistido]" +#: ../../mod/settings.php:861 +msgid "Update browser every xx seconds" +msgstr "Atualizar navegador a cada xx segundos" -#: ../../mod/admin.php:1300 -msgid "Log settings updated." -msgstr "As configurações de log foram atualizadas." +#: ../../mod/settings.php:861 +msgid "Minimum of 10 seconds, no maximum" +msgstr "Mínimo de 10 segundos, sem máximo" -#: ../../mod/admin.php:1357 -msgid "Clear" -msgstr "Limpar" +#: ../../mod/settings.php:862 +msgid "Maximum number of conversations to load at any time:" +msgstr "Número máximo permitido de conversas carregadas:" -#: ../../mod/admin.php:1363 -msgid "Debugging" -msgstr "Depuração" +#: ../../mod/settings.php:862 +msgid "Maximum of 100 items" +msgstr "Máximo de 100 itens" -#: ../../mod/admin.php:1364 -msgid "Log file" -msgstr "Arquivo de log" +#: ../../mod/settings.php:863 +msgid "Show emoticons (smilies) as images" +msgstr "Mostrar emoticons (smilies) como imagens" -#: ../../mod/admin.php:1364 -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/settings.php:864 +msgid "Link post titles to source" +msgstr "Ligar o título dos posts à fonte" -#: ../../mod/admin.php:1365 -msgid "Log level" -msgstr "Nível do log" +#: ../../mod/settings.php:865 +msgid "System Page Layout Editor - (advanced)" +msgstr "Editor de layout de página do sistema - (avançado)" -#: ../../mod/admin.php:1411 -msgid "New Profile Field" -msgstr "Novo campo de perfil" +#: ../../mod/settings.php:868 +msgid "Use blog/list mode on channel page" +msgstr "Usar modo blog/lista na página do canal" -#: ../../mod/admin.php:1412 ../../mod/admin.php:1432 -msgid "Field nickname" -msgstr "Nome de apresentação do campo" +#: ../../mod/settings.php:868 ../../mod/settings.php:869 +msgid "(comments displayed separately)" +msgstr "(comentários mostrados separadamente)" -#: ../../mod/admin.php:1412 ../../mod/admin.php:1432 -msgid "System name of field" -msgstr "Nome de sistema do campo" +#: ../../mod/settings.php:869 +msgid "Use blog/list mode on matrix page" +msgstr "Use modo de blogue/lista na página da matriz" -#: ../../mod/admin.php:1413 ../../mod/admin.php:1433 -msgid "Input type" -msgstr "Tipo de entrada" +#: ../../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/admin.php:1414 ../../mod/admin.php:1434 -msgid "Field Name" -msgstr "Nome do campo" +#: ../../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/admin.php:1414 ../../mod/admin.php:1434 -msgid "Label on profile pages" -msgstr "Rótulo nas páginas de perfil" +#: ../../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/admin.php:1415 ../../mod/admin.php:1435 -msgid "Help text" -msgstr "Texto de ajuda" +#: ../../mod/settings.php:905 +msgid "Nobody except yourself" +msgstr "Ninguém exceto você mesmo" -#: ../../mod/admin.php:1415 ../../mod/admin.php:1435 -msgid "Additional info (optional)" -msgstr "Informações adicionais (opcional)" +#: ../../mod/settings.php:906 +msgid "Only those you specifically allow" +msgstr "Apenas quem você der permissão" -#: ../../mod/admin.php:1425 -msgid "Field definition not found" -msgstr "A dfinição de campo não foi encontrada" +#: ../../mod/settings.php:907 +msgid "Approved connections" +msgstr "Conexões aprovadas" -#: ../../mod/admin.php:1431 -msgid "Edit Profile Field" -msgstr "Editar campo de perfil" +#: ../../mod/settings.php:908 +msgid "Any connections" +msgstr "Quaisquer conexões" -#: ../../mod/oexchange.php:23 -msgid "Unable to find your hub." -msgstr "Não foi possível localizar seu hub." +#: ../../mod/settings.php:909 +msgid "Anybody on this website" +msgstr "Qualquer um neste site" -#: ../../mod/oexchange.php:37 -msgid "Post successful." -msgstr "Publicado com sucesso." +#: ../../mod/settings.php:910 +msgid "Anybody in this network" +msgstr "Qualquer um nesta rede" -#: ../../mod/editblock.php:112 -msgid "Edit Block" -msgstr "Editar bloco" +#: ../../mod/settings.php:911 +msgid "Anybody authenticated" +msgstr "Qualquer um autenticado" -#: ../../mod/editblock.php:123 -msgid "Delete block?" -msgstr "Deletar bloco?" +#: ../../mod/settings.php:912 +msgid "Anybody on the internet" +msgstr "Qualquer um na internet" -#: ../../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ã." +#: ../../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/register.php:50 -msgid "" -"Please indicate acceptance of the Terms of Service. Registration failed." -msgstr "Por favor, indique a aceitação dos Termos de Serviço. Falha ao registrar." +#: ../../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/register.php:84 -msgid "Passwords do not match." -msgstr "Senhas não conferem." +#: ../../mod/settings.php:1000 +msgid "Your channel address is" +msgstr "O endereço do seu canal é" -#: ../../mod/register.php:117 -msgid "" -"Registration successful. Please check your email for validation " -"instructions." -msgstr "O registro foi bem sucedido. Por favor, verifique seu e-mail para confirmar o registro." +#: ../../mod/settings.php:1048 +msgid "Channel Settings" +msgstr "Configurações do canal" -#: ../../mod/register.php:123 -msgid "Your registration is pending approval by the site owner." -msgstr "A aprovação do seu registro está pendente junto ao administrador do site." +#: ../../mod/settings.php:1055 +msgid "Basic Settings" +msgstr "Configurações básicas" -#: ../../mod/register.php:126 -msgid "Your registration can not be processed." -msgstr "Não foi possível processar o seu registro." +#: ../../mod/settings.php:1058 +msgid "Your Timezone:" +msgstr "Seu fuso horário:" -#: ../../mod/register.php:163 -msgid "Registration on this site/hub is by approval only." -msgstr "O registro neste site/hub requer aprovação." +#: ../../mod/settings.php:1059 +msgid "Default Post Location:" +msgstr "Localização padrão de suas publicações:" -#: ../../mod/register.php:164 -msgid "Register at another affiliated site/hub" -msgstr "Registre em um outro site/hub afiliado" +#: ../../mod/settings.php:1059 +msgid "Geographical location to display on your posts" +msgstr "Localização geográfica para exibir em suas publicações" -#: ../../mod/register.php:174 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "Este site excedeu o número máximo de registros de novas contas. Por favor, tente novamente amanhã." +#: ../../mod/settings.php:1060 +msgid "Use Browser Location:" +msgstr "Usar localizador do navegador:" -#: ../../mod/register.php:185 -msgid "Terms of Service" -msgstr "Termos de Serviço" +#: ../../mod/settings.php:1062 +msgid "Adult Content" +msgstr "Conteúdo adulto" -#: ../../mod/register.php:191 -#, php-format -msgid "I accept the %s for this website" -msgstr "Eu aceito os %s deste website." +#: ../../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/register.php:193 -#, php-format -msgid "I am over 13 years of age and accept the %s for this website" -msgstr "Eu sou maior de 13 anos e aceito os %s deste website" +#: ../../mod/settings.php:1064 +msgid "Security and Privacy Settings" +msgstr "Configurações de segurança e privacidade" -#: ../../mod/register.php:212 -msgid "Membership on this site is by invitation only." -msgstr "Novas contas neste site se dão apenas por convite." +#: ../../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/register.php:213 -msgid "Please enter your invitation code" -msgstr "Por favor, digite o código do seu convite" +#: ../../mod/settings.php:1068 +msgid "Hide my online presence" +msgstr "Esconda minha presença online" -#: ../../mod/register.php:216 -msgid "Your email address" -msgstr "Seu endereço de e-mail" +#: ../../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/register.php:217 -msgid "Choose a password" -msgstr "Escolha uma senha" +#: ../../mod/settings.php:1070 +msgid "Simple Privacy Settings:" +msgstr "Configurações de privacidade simples:" -#: ../../mod/register.php:218 -msgid "Please re-enter your password" -msgstr "Por favor, digite sua senha novamente" +#: ../../mod/settings.php:1071 +msgid "" +"Very Public - extremely permissive (should be used with caution)" +msgstr "Muito público - extremamente permissivo (deve ser usado com cuidado)" -#: ../../mod/removeaccount.php:30 +#: ../../mod/settings.php:1072 msgid "" -"Account removals are not allowed within 48 hours of changing the account " -"password." -msgstr "A remoção da conta fica desabilitada por 48 horas após uma troca de senha da conta." +"Typical - default public, privacy when desired (similar to social " +"network permissions but with improved privacy)" +msgstr "Típico - público por padrão, privado quando desejável (similar às permissões de redes sociais, mas com melhor privacidade)" -#: ../../mod/removeaccount.php:57 -msgid "Remove This Account" -msgstr "Remover esta conta" +#: ../../mod/settings.php:1073 +msgid "Private - default private, never open or public" +msgstr "Privado - privado por padrão, nunca aberto ou público" -#: ../../mod/removeaccount.php:58 ../../mod/removeme.php:58 -msgid "WARNING: " -msgstr "AVISO:" +#: ../../mod/settings.php:1074 +msgid "Blocked - default blocked to/from everybody" +msgstr "Bloqueado - por padrão bloquado de/para todos" -#: ../../mod/removeaccount.php:58 +#: ../../mod/settings.php:1076 +msgid "Allow others to tag your posts" +msgstr "Permitir que outros etiquetem suas publicações" + +#: ../../mod/settings.php:1076 msgid "" -"This account and all its channels will be completely removed from the " -"network. " -msgstr "Esta conta e todos seus canais será completamente excluída da rede." +"Often used by the community to retro-actively flag inappropriate content" +msgstr "Frequentemente utilizado pela comunidade para retroativamente sinalizar conteúdo inapropriado" -#: ../../mod/removeaccount.php:58 ../../mod/removeme.php:58 -msgid "This action is permanent and can not be undone!" -msgstr "Esta ação é permanente e não pode ser desfeita!" +#: ../../mod/settings.php:1078 +msgid "Advanced Privacy Settings" +msgstr "Configurações de privacidade avançadas" -#: ../../mod/removeaccount.php:59 ../../mod/removeme.php:59 -msgid "Please enter your password for verification:" -msgstr "Por favor, digite a sua senha para verificação:" +#: ../../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/removeaccount.php:60 -msgid "" -"Remove this account, all its channels and all its channel clones from the " -"network" -msgstr "Remove esta conta, todos os seus canais e todos os clones desses canais da rede." +#: ../../mod/settings.php:1080 +msgid "0 or blank prevents expiration" +msgstr "0 ou em branco previne expiração" -#: ../../mod/removeaccount.php:60 -msgid "" -"By default only the instances of the channels located on this hub will be " -"removed from the network" -msgstr "Por padrão, apenas as instâncias dos canais localizadas neste hub serão removidas da rede" +#: ../../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/item.php:174 -msgid "Unable to locate original post." -msgstr "Não foi possível localizar a publicação original." +#: ../../mod/settings.php:1082 +msgid "Default Post Permissions" +msgstr "Permissões padrão de publicação" -#: ../../mod/item.php:440 -msgid "Empty post discarded." -msgstr "A publicação em branco foi descartada." +#: ../../mod/settings.php:1087 +msgid "Channel permissions category:" +msgstr "Categoria de permissões do canal:" -#: ../../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/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/item.php:897 -msgid "System error. Post not saved." -msgstr "Erro no sistema. A publicação não foi salva." +#: ../../mod/settings.php:1093 +msgid "Useful to reduce spamming" +msgstr "Útil para reduzir a frequência de spam" -#: ../../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/settings.php:1096 +msgid "Notification Settings" +msgstr "Configurações de notificação" -#: ../../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/settings.php:1097 +msgid "By default post a status message when:" +msgstr "Por padrão, publicar uma mensagem de status quando:" -#: ../../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/settings.php:1098 +msgid "accepting a friend request" +msgstr "aceitar um pedido de amizade" -#: ../../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 -msgid "[Embedded content - reload page to view]" -msgstr "[Conteúdo incorporado - recarregue a página para ver]" +#: ../../mod/settings.php:1099 +msgid "joining a forum/community" +msgstr "associar-se a um fórum/comunidade" -#: ../../mod/lockview.php:37 -msgid "Remote privacy information not available." -msgstr "Não existe informação disponível sobre a privacidade remota." +#: ../../mod/settings.php:1100 +msgid "making an interesting profile change" +msgstr "modificar algo interessante em seu perfil" -#: ../../mod/lockview.php:58 -msgid "Visible to:" -msgstr "Visível para:" +#: ../../mod/settings.php:1101 +msgid "Send a notification email when:" +msgstr "Enviar um e-mail de notificação quando:" -#: ../../mod/layouts.php:176 -msgid "Comanche page description language help" -msgstr "Página de Ajuda da descrição da Linguagem Comanche " +#: ../../mod/settings.php:1102 +msgid "You receive a connection request" +msgstr "Você recebe uma solicitação de conexão" -#: ../../mod/layouts.php:180 -msgid "Layout Description" -msgstr "Descrição de Layout" +#: ../../mod/settings.php:1103 +msgid "Your connections are confirmed" +msgstr "Suas conexões são confirmadas" -#: ../../mod/layouts.php:185 -msgid "Download PDL file" -msgstr "Baixar arquivo PDL" +#: ../../mod/settings.php:1104 +msgid "Someone writes on your profile wall" +msgstr "Alguém escrever no mural do seu perfil" -#: ../../mod/id.php:11 -msgid "First Name" -msgstr "Primeiro Nome" +#: ../../mod/settings.php:1105 +msgid "Someone writes a followup comment" +msgstr "Alguém comenta uma publicação" -#: ../../mod/id.php:12 -msgid "Last Name" -msgstr "Último Nome" +#: ../../mod/settings.php:1106 +msgid "You receive a private message" +msgstr "Você recebeu uma mensagem privada" -#: ../../mod/id.php:13 -msgid "Nickname" -msgstr "Apelido" +#: ../../mod/settings.php:1107 +msgid "You receive a friend suggestion" +msgstr "Você recebe uma sugestão de amizade" -#: ../../mod/id.php:14 -msgid "Full Name" -msgstr "Nome Completo" +#: ../../mod/settings.php:1108 +msgid "You are tagged in a post" +msgstr "Você é mencionado num post" -#: ../../mod/id.php:20 -msgid "Profile Photo 16px" -msgstr "Foto de Perfil 16px" +#: ../../mod/settings.php:1109 +msgid "You are poked/prodded/etc. in a post" +msgstr "Você foi cutucado/espetado/etc. numa publicação" -#: ../../mod/id.php:21 -msgid "Profile Photo 32px" -msgstr "Foto de Perfil 32px" +#: ../../mod/settings.php:1112 +msgid "Show visual notifications including:" +msgstr "Exibir notificações visuais incluindo:" -#: ../../mod/id.php:22 -msgid "Profile Photo 48px" -msgstr "Foto de Perfil 48px" +#: ../../mod/settings.php:1114 +msgid "Unseen matrix activity" +msgstr "Atividade não vista na matriz" -#: ../../mod/id.php:23 -msgid "Profile Photo 64px" -msgstr "Foto de Perfil 64px" +#: ../../mod/settings.php:1115 +msgid "Unseen channel activity" +msgstr "Atividade não vista no canal" -#: ../../mod/id.php:24 -msgid "Profile Photo 80px" -msgstr "Foto de Perfil 80px" +#: ../../mod/settings.php:1116 +msgid "Unseen private messages" +msgstr "Mensagens privadas não vistas" -#: ../../mod/id.php:25 -msgid "Profile Photo 128px" -msgstr "Foto de Perfil 128px" +#: ../../mod/settings.php:1116 ../../mod/settings.php:1121 +#: ../../mod/settings.php:1122 ../../mod/settings.php:1123 +msgid "Recommended" +msgstr "Recomendado" -#: ../../mod/id.php:26 -msgid "Timezone" -msgstr "Fuso Horário" +#: ../../mod/settings.php:1117 +msgid "Upcoming events" +msgstr "Eventos próximos" -#: ../../mod/id.php:27 -msgid "Homepage URL" -msgstr "URL da Página" +#: ../../mod/settings.php:1118 +msgid "Events today" +msgstr "Eventos hoje" -#: ../../mod/id.php:29 -msgid "Birth Year" -msgstr "Ano de Nascimento" +#: ../../mod/settings.php:1119 +msgid "Upcoming birthdays" +msgstr "Aniversários próximos" -#: ../../mod/id.php:30 -msgid "Birth Month" -msgstr "Mês de Nascimento" +#: ../../mod/settings.php:1119 +msgid "Not available in all themes" +msgstr "Não disponível em todos os temas" -#: ../../mod/id.php:31 -msgid "Birth Day" -msgstr "Dia de Nascimento" +#: ../../mod/settings.php:1120 +msgid "System (personal) notifications" +msgstr "Notificações de sistema (pessoais)" -#: ../../mod/id.php:32 -msgid "Birthdate" -msgstr "Data de Nascimento" +#: ../../mod/settings.php:1121 +msgid "System info messages" +msgstr "Mensagens de informação do sistema" -#: ../../mod/message.php:41 -msgid "Conversation removed." -msgstr "A conversa foi removida." +#: ../../mod/settings.php:1122 +msgid "System critical alerts" +msgstr "Alertas críticos do sistema" -#: ../../mod/message.php:56 -msgid "No messages." -msgstr "Nenhuma mensagem." +#: ../../mod/settings.php:1123 +msgid "New connections" +msgstr "Novas conexões" -#: ../../mod/message.php:72 ../../mod/mail.php:336 -msgid "Delete conversation" -msgstr "Excluir conversa" +#: ../../mod/settings.php:1124 +msgid "System Registrations" +msgstr "Registros no sistema" -#: ../../mod/message.php:74 -msgid "D, d M Y - g:i A" -msgstr "D, d M Y - g:i A" +#: ../../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/mitem.php:51 -msgid "Unable to create element." -msgstr "Não foi possível criar elemento." +#: ../../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/mitem.php:74 -msgid "Unable to update menu element." -msgstr "Não foi possível atualizar o elemento de menu." +#: ../../mod/settings.php:1127 +msgid "Must be greater than 0" +msgstr "Deve ser maior que 0" -#: ../../mod/mitem.php:89 -msgid "Unable to add menu element." -msgstr "Não foi possível adicionar o elemento de menu." +#: ../../mod/settings.php:1129 +msgid "Advanced Account/Page Type Settings" +msgstr "Configurações avançadas de conta/tipo de página" -#: ../../mod/mitem.php:158 ../../mod/mitem.php:228 -msgid "Menu Item Permissions" -msgstr "Permissões do item do menu" +#: ../../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/mitem.php:161 ../../mod/mitem.php:176 -msgid "Link Name" -msgstr "Nome do Link" +#: ../../mod/settings.php:1133 +msgid "" +"Please enable expert mode (in Settings > " +"Additional features) to adjust!" +msgstr "Por favor, habilite o modo expert (em Configurações > Recursos adicionais) para ajustar!" -#: ../../mod/mitem.php:162 ../../mod/mitem.php:233 -msgid "Link or Submenu Target" -msgstr "Alvo do Link ou Submenu" +#: ../../mod/settings.php:1134 +msgid "Miscellaneous Settings" +msgstr "Configurações miscelâneas" -#: ../../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/settings.php:1136 +msgid "Personal menu to display in your channel pages" +msgstr "Menu pessoal para exibir nas páginas dos seus canais" -#: ../../mod/mitem.php:163 ../../mod/mitem.php:234 -msgid "Use magic-auth if available" -msgstr "Usar magic-auth se disponível" +#: ../../mod/settings.php:1137 ../../mod/removeme.php:61 +msgid "Remove Channel" +msgstr "Remover canal" -#: ../../mod/mitem.php:164 ../../mod/mitem.php:235 -msgid "Open link in new window" -msgstr "Abrir link em uma nova janela" +#: ../../mod/settings.php:1138 +msgid "Remove this channel." +msgstr "Remover este canal" -#: ../../mod/mitem.php:165 ../../mod/mitem.php:236 -msgid "Order in list" -msgstr "Ordem na lista" +#: ../../mod/id.php:11 +msgid "First Name" +msgstr "Primeiro Nome" -#: ../../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/id.php:12 +msgid "Last Name" +msgstr "Último Nome" -#: ../../mod/mitem.php:166 -msgid "Submit and finish" -msgstr "Enviar e terminar" +#: ../../mod/id.php:13 +msgid "Nickname" +msgstr "Apelido" -#: ../../mod/mitem.php:167 -msgid "Submit and continue" -msgstr "Enviar e continuar" +#: ../../mod/id.php:14 +msgid "Full Name" +msgstr "Nome Completo" + +#: ../../mod/id.php:20 +msgid "Profile Photo 16px" +msgstr "Foto de Perfil 16px" -#: ../../mod/mitem.php:174 -msgid "Menu:" -msgstr "Menu:" +#: ../../mod/id.php:21 +msgid "Profile Photo 32px" +msgstr "Foto de Perfil 32px" -#: ../../mod/mitem.php:177 -msgid "Link Target" -msgstr "Alvo do Link" +#: ../../mod/id.php:22 +msgid "Profile Photo 48px" +msgstr "Foto de Perfil 48px" -#: ../../mod/mitem.php:180 -msgid "Edit menu" -msgstr "Editar menu" +#: ../../mod/id.php:23 +msgid "Profile Photo 64px" +msgstr "Foto de Perfil 64px" -#: ../../mod/mitem.php:183 -msgid "Edit element" -msgstr "Editar elemento" +#: ../../mod/id.php:24 +msgid "Profile Photo 80px" +msgstr "Foto de Perfil 80px" -#: ../../mod/mitem.php:184 -msgid "Drop element" -msgstr "Descartar elemento" +#: ../../mod/id.php:25 +msgid "Profile Photo 128px" +msgstr "Foto de Perfil 128px" -#: ../../mod/mitem.php:185 -msgid "New element" -msgstr "Novo elemento" +#: ../../mod/id.php:26 +msgid "Timezone" +msgstr "Fuso Horário" -#: ../../mod/mitem.php:186 -msgid "Edit this menu container" -msgstr "Editar esta caixa de menu" +#: ../../mod/id.php:27 +msgid "Homepage URL" +msgstr "URL da Página" -#: ../../mod/mitem.php:187 -msgid "Add menu element" -msgstr "Adicionar um elemento de menu" +#: ../../mod/id.php:29 +msgid "Birth Year" +msgstr "Ano de Nascimento" -#: ../../mod/mitem.php:188 -msgid "Delete this menu item" -msgstr "Deleter este item de menu" +#: ../../mod/id.php:30 +msgid "Birth Month" +msgstr "Mês de Nascimento" -#: ../../mod/mitem.php:189 -msgid "Edit this menu item" -msgstr "Editar este item de menu" +#: ../../mod/id.php:31 +msgid "Birth Day" +msgstr "Dia de Nascimento" -#: ../../mod/mitem.php:206 -msgid "Menu item not found." -msgstr "O item de menu não foi encontrado." +#: ../../mod/id.php:32 +msgid "Birthdate" +msgstr "Data de Nascimento" -#: ../../mod/mitem.php:217 -msgid "Menu item deleted." -msgstr "O item de menu foi deletado." +#: ../../mod/message.php:41 +msgid "Conversation removed." +msgstr "A conversa foi removida." -#: ../../mod/mitem.php:219 -msgid "Menu item could not be deleted." -msgstr "Não foi possível deletar o item de menu." +#: ../../mod/message.php:56 +msgid "No messages." +msgstr "Nenhuma mensagem." -#: ../../mod/mitem.php:226 -msgid "Edit Menu Element" -msgstr "Editar elemento de menu" +#: ../../mod/message.php:72 ../../mod/mail.php:336 +msgid "Delete conversation" +msgstr "Excluir conversa" -#: ../../mod/mitem.php:232 -msgid "Link text" -msgstr "Texto do link" +#: ../../mod/message.php:74 +msgid "D, d M Y - g:i A" +msgstr "D, d M Y - g:i A" #: ../../mod/mood.php:131 msgid "Set your current mood and tell your friends" @@ -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:639 +msgid "Set Profile" +msgstr "Definir perfil" -#: ../../mod/connedit.php:654 +#: ../../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: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:662 +#: ../../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 not " -"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á não 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 privacy " -"settings, though you may wish to review the \"Advanced Permissions\"." -msgstr "Isso pode ser adequado baseado nas suas configurações de privacidade, 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 not 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 não 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 privacy settings, which have higher " +"priority than individual settings. You can not change those" +" settings here." +msgstr "Algumas permissões podem ser herdadas das configurações de privacidade do seu canal, que tem prioridade sobre configurações individuais. Você não pode mudar tais configurações aqui." + #: ../../mod/connedit.php:696 msgid "" -"Some permissions may be inherited from your channel privacy settings, 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 configurações de privacidade 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 privacy settings, 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 configurações de privacidade 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"] = "Sá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 may 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 poderão 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"] = "Sá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 "] = "%s "; $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 “%3\$s”"] = "%1\$s mudou %2\$s para “%3\$s”"; $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 - extremely permissive (should be used with caution)"] = "Muito público - extremamente permissivo (deve ser usado com cuidado)"; -$a->strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = "Típico - público por padrão, privado quando desejável (similar às permissões de redes sociais, mas com melhor privacidade)"; -$a->strings["Private - default private, never open or public"] = "Privado - privado por padrão, nunca aberto ou público"; -$a->strings["Blocked - default blocked to/from everybody"] = "Bloqueado - por padrão bloquado de/para todos"; -$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 interesting profile change"] = "modificar algo interessante 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 Settings > Additional features) to adjust!"] = "Por favor, habilite o modo expert (em Configurações > Recursos adicionais) 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 redmatrix.me to learn more about \$Projectname."] = "Por favor visite redmatrix.me 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["

What next

"] = "

Próximos passos

"; -$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["

What next

"] = "

Próximos passos

"; +$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 - extremely permissive (should be used with caution)"] = "Muito público - extremamente permissivo (deve ser usado com cuidado)"; +$a->strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = "Típico - público por padrão, privado quando desejável (similar às permissões de redes sociais, mas com melhor privacidade)"; +$a->strings["Private - default private, never open or public"] = "Privado - privado por padrão, nunca aberto ou público"; +$a->strings["Blocked - default blocked to/from everybody"] = "Bloqueado - por padrão bloquado de/para todos"; +$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 interesting profile change"] = "modificar algo interessante 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 Settings > Additional features) to adjust!"] = "Por favor, habilite o modo expert (em Configurações > Recursos adicionais) 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 not 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á não 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 privacy settings, though you may wish to review the \"Advanced Permissions\"."] = "Isso pode ser adequado baseado nas suas configurações de privacidade, 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 not 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 não 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 privacy settings, 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 configurações de privacidade 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 privacy settings, which have higher priority than individual settings. You can not change those settings here."] = "Algumas permissões podem ser herdadas das configurações de privacidade do seu canal, que tem prioridade sobre configurações individuais. Você não pode mudar tais configurações aqui."; +$a->strings["Some permissions may be inherited from your channel's privacy settings, 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 configurações de privacidade 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"; -- cgit v1.2.3 From 6e557aa153592a4e30e133403f281a84c472ec91 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 25 Jul 2015 17:41:19 +0200 Subject: fix abook_pending reset to 1 loop if $new_friend is false and remove unused var --- mod/connedit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/connedit.php b/mod/connedit.php index 2340ce678..91dfc21e2 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -130,7 +130,6 @@ function connedit_post(&$a) { } } - $abook_flags = $orig_record[0]['abook_flags']; $new_friend = false; if(! $is_self) { @@ -191,6 +190,7 @@ function connedit_post(&$a) { } } + $abook_pending = $new_friend ? 0 : $orig_record[0]['abook_pending']; $r = q("UPDATE abook SET abook_profile = '%s', abook_my_perms = %d , abook_closeness = %d, abook_pending = %d, abook_incl = '%s', abook_excl = '%s' @@ -198,7 +198,7 @@ function connedit_post(&$a) { dbesc($profile_id), intval($abook_my_perms), intval($closeness), - intval(1 - intval($new_friend)), + intval($abook_pending), dbesc($abook_incl), dbesc($abook_excl), intval($contact_id), -- cgit v1.2.3 From f6142d18c43a77473dd4e2e3ea6c25154487ff2b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 26 Jul 2015 20:54:09 +0200 Subject: Provide connection status if status is "a-normal" --- mod/connedit.php | 4 ++++ view/tpl/abook_edit.tpl | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/mod/connedit.php b/mod/connedit.php index d0cf71c73..b2f23ea7f 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -520,6 +520,7 @@ function connedit_content(&$a) { '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!') : ''), ), 'ignore' => array( @@ -527,6 +528,7 @@ function connedit_content(&$a) { '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!') : ''), ), 'archive' => array( @@ -534,6 +536,7 @@ function connedit_content(&$a) { '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!') : ''), ), 'hide' => array( @@ -541,6 +544,7 @@ function connedit_content(&$a) { '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!') : ''), ), 'delete' => array( diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 93f52be8d..0a7cf2d4d 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -22,6 +22,15 @@
{{if $notself}} + {{foreach $buttons as $b}} + {{if $b.info}} +
+
+ {{$b.info}} +
+
+ {{/if}} + {{/foreach}}
{{$addr_text}} '{{$addr}}' -- cgit v1.2.3 From 54336ba43b8f944df2189fdbd949b96a4651b08e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 26 Jul 2015 21:24:33 +0200 Subject: comment out some popover infos - we provide enough visual feedback now --- mod/connedit.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/mod/connedit.php b/mod/connedit.php index b2f23ea7f..bc8ae5e2e 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -397,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 @@ -409,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 @@ -421,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 @@ -433,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 @@ -449,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 -- cgit v1.2.3 From 4b96b76f5c6c76878e8b0d37214b798498eb0b29 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 26 Jul 2015 16:42:36 -0700 Subject: revision and string update --- util/messages.po | 62 ++++++++++++++++++++++++++++++-------------------------- version.inc | 2 +- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/util/messages.po b/util/messages.po index 3e4a7873c..6db106a2c 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-07-17.1096\n" +"Project-Id-Version: 2015-07-24.1103\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-17 00:04-0700\n" +"POT-Creation-Date: 2015-07-24 00:04-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,42 +40,42 @@ msgstr "" msgid "Edit" msgstr "" -#: ../../include/diaspora.php:2115 ../../include/text.php:1888 +#: ../../include/diaspora.php:2114 ../../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 "" -#: ../../include/diaspora.php:2115 ../../include/text.php:1894 +#: ../../include/diaspora.php:2114 ../../include/text.php:1894 #: ../../include/conversation.php:148 ../../mod/like.php:346 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174 msgid "status" msgstr "" -#: ../../include/diaspora.php:2144 ../../include/conversation.php:164 +#: ../../include/diaspora.php:2143 ../../include/conversation.php:164 #: ../../mod/like.php:394 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/diaspora.php:2490 +#: ../../include/diaspora.php:2489 msgid "Please choose" msgstr "" -#: ../../include/diaspora.php:2492 +#: ../../include/diaspora.php:2491 msgid "Agree" msgstr "" -#: ../../include/diaspora.php:2494 +#: ../../include/diaspora.php:2493 msgid "Disagree" msgstr "" -#: ../../include/diaspora.php:2496 +#: ../../include/diaspora.php:2495 msgid "Abstain" msgstr "" -#: ../../include/diaspora.php:2518 ../../include/diaspora.php:2529 +#: ../../include/diaspora.php:2517 ../../include/diaspora.php:2528 #: ../../include/network.php:1586 ../../include/enotify.php:59 #: ../../mod/p.php:46 msgid "$projectname" @@ -297,7 +297,7 @@ msgstr "" msgid "Required" msgstr "" -#: ../../include/datetime.php:262 ../../boot.php:2355 +#: ../../include/datetime.php:262 ../../boot.php:2354 msgid "never" msgstr "" @@ -942,7 +942,7 @@ msgstr "" msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1665 ../../mod/events.php:444 +#: ../../include/text.php:1665 ../../mod/events.php:443 msgid "Link to Source" msgstr "" @@ -3036,14 +3036,14 @@ msgstr "" msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4198 ../../mod/thing.php:74 +#: ../../include/items.php:4207 ../../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:4271 ../../include/attach.php:137 +#: ../../include/items.php:4280 ../../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 @@ -3055,7 +3055,7 @@ 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:218 ../../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 @@ -3086,26 +3086,26 @@ msgstr "" msgid "Permission denied." msgstr "" -#: ../../include/items.php:4673 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4682 ../../mod/group.php:38 ../../mod/group.php:140 #: ../../mod/bulksetclose.php:51 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4689 +#: ../../include/items.php:4698 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4696 +#: ../../include/items.php:4705 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4706 ../../mod/connedit.php:658 +#: ../../include/items.php:4715 ../../mod/connedit.php:658 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4708 +#: ../../include/items.php:4717 msgid "Connection not found." msgstr "" @@ -3117,7 +3117,7 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2131 +#: ../../include/zot.php:2132 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -4388,18 +4388,22 @@ msgstr "" msgid "Event not found." msgstr "" -#: ../../mod/events.php:396 +#: ../../mod/events.php:395 msgid "l, F j" msgstr "" -#: ../../mod/events.php:418 +#: ../../mod/events.php:417 msgid "Edit event" msgstr "" -#: ../../mod/events.php:419 +#: ../../mod/events.php:418 msgid "Delete event" msgstr "" +#: ../../mod/events.php:452 +msgid "calendar" +msgstr "" + #: ../../mod/events.php:473 msgid "Create New Event" msgstr "" @@ -9046,24 +9050,24 @@ msgstr "" msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2179 +#: ../../boot.php:2178 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2314 +#: ../../boot.php:2313 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2317 +#: ../../boot.php:2316 #, php-format msgid "[red] Website SSL error for %s" msgstr "" -#: ../../boot.php:2354 +#: ../../boot.php:2353 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2358 +#: ../../boot.php:2357 #, php-format msgid "[red] Cron tasks not running on %s" msgstr "" diff --git a/version.inc b/version.inc index 73b533b5e..35b7084c7 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-07-23.1102 +2015-07-26.1105 -- cgit v1.2.3 From 9e6aea73822741a742f4630e60629442dae5633b Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 26 Jul 2015 21:39:46 -0700 Subject: backend code for importing events from "simple" ics calendar files. --- include/event.php | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/include/event.php b/include/event.php index db604cc6a..8e9492690 100644 --- a/include/event.php +++ b/include/event.php @@ -90,6 +90,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; @@ -364,6 +365,70 @@ function event_addtocal($item_id, $uid) { } +function parse_ical_file($f,$uid) { + require_once('library/ical.php'); + $ical = new ICAL($f); + if($ical) { + $events = $ical->events(); + if($events) { + foreach($events as $ev) { + event_import_ical($ev,$uid); + } + } + 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($ical['UID']) + $ev['event_hash'] = $ical['UID']; + if($ical['CREATED']) + $ev['created'] = $ical['CREATED']; + if($ical['LAST-MODIFIED']) + $ev['edited'] = $ical['LAST-MODIFIED']; + if($ical['LOCATION']) + $ev['location'] = $ical['LOCATION']; + if($ical['DESCRIPTION']) + $ev['description'] = $ical['DESCRIPTION']; + if($ical['DTEND']) + $ev['finish'] = datetime_convert('UTC','UTC', $ical['DTEND']); + else + $ev['nofinish'] = 1; + $ev['start'] = datetime_convert('UTC','UTC',$ical['DTSTART']); + if(substr($ical['DTSTART'],-1) === 'Z') + $ev['adjust'] = 1; + + if($ical['SUMMARY'] && $ical['DTSTART']) { + $ev['event_xchan'] = $channel['channel_hash']; + $ev['uid'] = $channel['channel_id']; + $ev['account'] = $channel['channel_account_id']; + $ev['private'] = 1; + + $event = event_store_event($ev); + if($event) { + return true; + } + } + + return false; + +} + + function event_store_item($arr, $event) { require_once('include/datetime.php'); -- cgit v1.2.3 From 85f546e691351efbab36da34be6e625c7198066a Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 26 Jul 2015 22:44:49 -0700 Subject: crude but more or less functional event import from thunderbird ics files --- include/event.php | 31 +++++++++++++++++++++++++------ mod/events.php | 18 ++++++++++++++++-- view/tpl/events-js.tpl | 13 +++++++++++++ 3 files changed, 54 insertions(+), 8 deletions(-) diff --git a/include/event.php b/include/event.php index 8e9492690..a5cd93215 100644 --- a/include/event.php +++ b/include/event.php @@ -209,6 +209,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']) { @@ -276,7 +277,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(); $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) @@ -367,11 +372,12 @@ function event_addtocal($item_id, $uid) { function parse_ical_file($f,$uid) { require_once('library/ical.php'); - $ical = new ICAL($f); + $ical = new ICal($f); if($ical) { $events = $ical->events(); if($events) { foreach($events as $ev) { + logger('event parsed: ' . print_r($ev,true), LOGGER_ALL); event_import_ical($ev,$uid); } } @@ -394,16 +400,16 @@ function event_import_ical($ical, $uid) { $channel = $c[0]; $ev = array(); - if($ical['UID']) - $ev['event_hash'] = $ical['UID']; if($ical['CREATED']) - $ev['created'] = $ical['CREATED']; + $ev['created'] = datetime_convert('UTC','UTC',$ical['CREATED']); if($ical['LAST-MODIFIED']) - $ev['edited'] = $ical['LAST-MODIFIED']; + $ev['edited'] = datetime_convert('UTC','UTC',$ical['LAST-MODIFIED']); if($ical['LOCATION']) $ev['location'] = $ical['LOCATION']; if($ical['DESCRIPTION']) $ev['description'] = $ical['DESCRIPTION']; + if($ical['SUMMARY']) + $ev['summary'] = $ical['SUMMARY']; if($ical['DTEND']) $ev['finish'] = datetime_convert('UTC','UTC', $ical['DTEND']); else @@ -411,6 +417,17 @@ function event_import_ical($ical, $uid) { $ev['start'] = datetime_convert('UTC','UTC',$ical['DTSTART']); if(substr($ical['DTSTART'],-1) === 'Z') $ev['adjust'] = 1; + + if($ical['UID']) { + $r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1", + dbesc($ical['UID']), + intval($arr['uid']) + ); + if($r) + $ev['event_hash'] = $ical['UID']; + else + $ev['external_id'] = $ical['UID']; + } if($ical['SUMMARY'] && $ical['DTSTART']) { $ev['event_xchan'] = $channel['channel_hash']; @@ -418,8 +435,10 @@ function event_import_ical($ical, $uid) { $ev['account'] = $channel['channel_account_id']; $ev['private'] = 1; + 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; } } diff --git a/mod/events.php b/mod/events.php index a3540ab0a..7fc4b26f2 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'] : ''); @@ -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('Upload'), + '$submit' => t('Submit') )); if (x($_GET,'id')){ echo $o; killme(); } diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 9812291bf..7ecf2e753 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -3,6 +3,19 @@

{{$title}}

+ + + + -- cgit v1.2.3 From 0b232a610cdcbb701dacf8dd661b86b64bb582fc Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 27 Jul 2015 13:48:41 -0700 Subject: logic issue in connection filter --- include/items.php | 7 +++---- version.inc | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/items.php b/include/items.php index fdcae3a6c..f0b7d6a7f 100755 --- a/include/items.php +++ b/include/items.php @@ -3373,19 +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)) + 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 diff --git a/version.inc b/version.inc index 35b7084c7..928fb3ee9 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-07-26.1105 +2015-07-27.1106 -- cgit v1.2.3 From 52ccbd6b64d46aa7f2dfbf73599889efeaf66a08 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 27 Jul 2015 20:58:25 -0700 Subject: align buttons on event calendar --- view/tpl/events-js.tpl | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 7ecf2e753..c91419783 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -2,8 +2,9 @@

{{$title}}

- - +
+   +
- - - - +
+
-- cgit v1.2.3