From 6b31e72905a826b4e25c50a2be87657178634056 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 29 Jun 2018 06:20:04 +0000 Subject: [PATCH 01/25] Fix for: empty posts and comments that hadn't been transmitted to Diaspora --- mod/item.php | 2 +- src/Model/Item.php | 49 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/mod/item.php b/mod/item.php index 0a3c3e2fa..be9fa09c4 100644 --- a/mod/item.php +++ b/mod/item.php @@ -737,7 +737,7 @@ function item_post(App $a) { goaway($return_path); } - $datarray = dba::selectFirst('item', [], ['id' => $post_id]); + $datarray = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]); if (!DBM::is_result($datarray)) { logger("Item with id ".$post_id." couldn't be fetched."); diff --git a/src/Model/Item.php b/src/Model/Item.php index 9fafe26aa..8a5264a7b 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -24,6 +24,7 @@ use Friendica\Protocol\Diaspora; use Friendica\Protocol\OStatus; use Friendica\Util\DateTimeFormat; use Friendica\Util\XML; +use Friendica\Util\Lock; use dba; use Text_LanguageDetect; @@ -59,7 +60,7 @@ class Item extends BaseObject // Field list for "item-content" table that is mixed with the item table const CONTENT_FIELDLIST = ['title', 'content-warning', 'body', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'verb', - 'object-type', 'object', 'target-type', 'target']; + 'object-type', 'object', 'target-type', 'target', 'plink']; // All fields in the item table const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid', @@ -399,7 +400,7 @@ class Item extends BaseObject $fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid', 'contact-id', 'owner-id', 'author-id', 'type', 'wall', 'gravity', 'extid', 'created', 'edited', 'commented', 'received', 'changed', 'postopts', - 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform', + 'resource-id', 'event-id', 'tag', 'attach', 'inform', 'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark', 'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global', @@ -1404,7 +1405,7 @@ class Item extends BaseObject // update the commented timestamp on the parent // Only update "commented" if it is really a comment - if (($item['verb'] == ACTIVITY_POST) || !Config::get("system", "like_no_comment")) { + if (($item['gravity'] != GRAVITY_ACTIVITY) || !Config::get("system", "like_no_comment")) { dba::update('item', ['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]); } else { dba::update('item', ['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]); @@ -1491,8 +1492,6 @@ class Item extends BaseObject $fields = ['uri' => $item['uri'], 'plink' => $item['plink'], 'uri-plink-hash' => hash('sha1', $item['plink']).hash('sha1', $item['uri'])]; - unset($item['plink']); - foreach (self::CONTENT_FIELDLIST as $field) { if (isset($item[$field])) { $fields[$field] = $item[$field]; @@ -1500,15 +1499,43 @@ class Item extends BaseObject } } - // Do we already have this content? - if (!dba::exists('item-content', ['uri' => $item['uri']])) { - dba::insert('item-content', $fields, true); + // To avoid timing problems, we are using locks. + $locked = Lock::set('item_insert_content'); + if (!$locked) { + logger("Couldn't acquire lock for URI " . $item['uri'] . " - proceeding anyway."); } + // Do we already have this content? $item_content = dba::selectFirst('item-content', ['id'], ['uri' => $item['uri']]); if (DBM::is_result($item_content)) { $item['icid'] = $item_content['id']; - logger('Insert content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')'); + logger('Fetched content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')'); + } elseif (dba::insert('item-content', $fields)) { + $item['icid'] = dba::lastInsertId(); + logger('Inserted content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')'); + } else { + // By setting the ICID value through the worker we should avoid timing problems. + // When the locking works, this shouldn't be needed. But better be prepared. + Worker::add(PRIORITY_HIGH, 'SetItemContentID', $uri); + } + if ($locked) { + Lock::remove('item_insert_content'); + } + } + + /** + * @brief Set the item content id for a given URI + * + * @param string $uri The item URI + */ + public static function setICIDforURI($uri) + { + $item_content = dba::selectFirst('item-content', ['id'], ['uri' => $uri]); + if (DBM::is_result($item_content)) { + dba::update('item', ['icid' => $item_content['id']], ['icid' => 0, 'uri' => $uri]); + logger('Asynchronously fetched content id for URI ' . $uri . ' (' . $item_content['id'] . ')'); + } else { + logger('No item-content found for URI ' . $uri); } } @@ -1533,8 +1560,10 @@ class Item extends BaseObject } if (!empty($item['plink'])) { - $fields['plink'] = $item['plink']; $fields['uri-plink-hash'] = hash('sha1', $item['plink']) . hash('sha1', $condition['uri']); + } else { + // Ensure that we don't delete the plink + unset($fields['plink']); } logger('Update content for URI ' . $condition['uri']); From 4807797eaf1d9545dd94bbc3e6613e57c0bb3ead Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 29 Jun 2018 06:24:18 +0000 Subject: [PATCH 02/25] New worker to fix empty icid --- src/Worker/SetItemContentID.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/Worker/SetItemContentID.php diff --git a/src/Worker/SetItemContentID.php b/src/Worker/SetItemContentID.php new file mode 100644 index 000000000..96863b360 --- /dev/null +++ b/src/Worker/SetItemContentID.php @@ -0,0 +1,21 @@ + Date: Fri, 29 Jun 2018 06:51:48 +0000 Subject: [PATCH 03/25] Delete item content for older item records --- src/Model/Item.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 8a5264a7b..55e824895 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -750,8 +750,12 @@ class Item extends BaseObject self::deleteTagsFromItem($item); // Set the item to "deleted" - dba::update('item', ['deleted' => true, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], - ['id' => $item['id']]); + // This erasing of item content is superfluous for items with a matching item-content. + // But for the next time we will still have old content in the item table. + $item_fields = ['deleted' => true, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow(), + 'body' => '', 'title' => '', 'content-warning' => '', 'rendered-hash' => '', 'rendered-html' => '', + 'object' => '', 'target' => '']; + dba::update('item', $item_fields, ['id' => $item['id']]); Term::insertFromTagFieldByItemId($item['id']); Term::insertFromFileFieldByItemId($item['id']); From 59f8cb16e59808c32c0f48d7b93e128ef9f6ee17 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 29 Jun 2018 11:10:36 +0000 Subject: [PATCH 04/25] Add item content before the transaction --- src/Model/Item.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 55e824895..12046d4ff 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -754,7 +754,7 @@ class Item extends BaseObject // But for the next time we will still have old content in the item table. $item_fields = ['deleted' => true, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow(), 'body' => '', 'title' => '', 'content-warning' => '', 'rendered-hash' => '', 'rendered-html' => '', - 'object' => '', 'target' => '']; + 'object' => '', 'target' => '', 'tag' => '', 'postopts' => '', 'attach' => '', 'file' => '']; dba::update('item', $item_fields, ['id' => $item['id']]); Term::insertFromTagFieldByItemId($item['id']); @@ -1337,8 +1337,10 @@ class Item extends BaseObject logger('' . print_r($item,true), LOGGER_DATA); - dba::transaction(); + // We are doing this outside of the transaction to avoid timing problems self::insertContent($item); + + dba::transaction(); $ret = dba::insert('item', $item); // When the item was successfully stored we fetch the ID of the item. @@ -1520,7 +1522,8 @@ class Item extends BaseObject } else { // By setting the ICID value through the worker we should avoid timing problems. // When the locking works, this shouldn't be needed. But better be prepared. - Worker::add(PRIORITY_HIGH, 'SetItemContentID', $uri); + Worker::add(PRIORITY_HIGH, 'SetItemContentID', $item['uri']); + logger('Could not insert content for URI ' . $item['uri'] . ' - trying asynchronously'); } if ($locked) { Lock::remove('item_insert_content'); @@ -1537,7 +1540,7 @@ class Item extends BaseObject $item_content = dba::selectFirst('item-content', ['id'], ['uri' => $uri]); if (DBM::is_result($item_content)) { dba::update('item', ['icid' => $item_content['id']], ['icid' => 0, 'uri' => $uri]); - logger('Asynchronously fetched content id for URI ' . $uri . ' (' . $item_content['id'] . ')'); + logger('Asynchronously set item content id for URI ' . $uri . ' (' . $item_content['id'] . ') - Affected: '. (int)dba::affected_rows()); } else { logger('No item-content found for URI ' . $uri); } From a8a189eec4d5a6b6be863d631a0a95e50a02f233 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 30 Jun 2018 05:18:43 +0000 Subject: [PATCH 05/25] The detected language now moved to "item-content" as well --- boot.php | 2 +- database.sql | 3 +- src/Database/DBStructure.php | 1 + src/Model/Item.php | 55 +++++++++++++----------------------- 4 files changed, 23 insertions(+), 38 deletions(-) diff --git a/boot.php b/boot.php index 864e7804c..786a846f3 100644 --- a/boot.php +++ b/boot.php @@ -41,7 +41,7 @@ define('FRIENDICA_PLATFORM', 'Friendica'); define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily'); define('FRIENDICA_VERSION', '2018.08-dev'); define('DFRN_PROTOCOL_VERSION', '2.23'); -define('DB_UPDATE_VERSION', 1272); +define('DB_UPDATE_VERSION', 1273); define('NEW_UPDATE_ROUTINE_VERSION', 1170); /** diff --git a/database.sql b/database.sql index 1a08a5ba9..c452832ac 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ -- Friendica 2018.08-dev (The Tazmans Flax-lily) --- DB_UPDATE_VERSION 1272 +-- DB_UPDATE_VERSION 1273 -- ------------------------------------------ @@ -557,6 +557,7 @@ CREATE TABLE IF NOT EXISTS `item-content` ( `body` mediumtext COMMENT 'item body content', `location` varchar(255) NOT NULL DEFAULT '' COMMENT 'text location where this item originated', `coord` varchar(255) NOT NULL DEFAULT '' COMMENT 'longitude/latitude pair representing location where this item originated', + `language` text COMMENT 'Language information about this post', `app` varchar(255) NOT NULL DEFAULT '' COMMENT 'application which generated this item', `rendered-hash` varchar(32) NOT NULL DEFAULT '' COMMENT '', `rendered-html` mediumtext COMMENT 'item.body converted to html', diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php index 8fb2afddb..fa49c2903 100644 --- a/src/Database/DBStructure.php +++ b/src/Database/DBStructure.php @@ -1262,6 +1262,7 @@ class DBStructure "body" => ["type" => "mediumtext", "comment" => "item body content"], "location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "text location where this item originated"], "coord" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "longitude/latitude pair representing location where this item originated"], + "language" => ["type" => "text", "comment" => "Language information about this post"], "app" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "application which generated this item"], "rendered-hash" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""], "rendered-html" => ["type" => "mediumtext", "comment" => "item.body converted to html"], diff --git a/src/Model/Item.php b/src/Model/Item.php index 12046d4ff..5fe03a81b 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -37,7 +37,7 @@ class Item extends BaseObject // Field list that is used to display the items const DISPLAY_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network', 'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink', - 'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach', + 'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach', 'language', 'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id', 'author-id', 'author-link', 'author-name', 'author-avatar', @@ -58,10 +58,13 @@ class Item extends BaseObject 'signed_text', 'signature', 'signer']; // Field list for "item-content" table that is mixed with the item table - const CONTENT_FIELDLIST = ['title', 'content-warning', 'body', 'location', + const MIXED_CONTENT_FIELDLIST = ['title', 'content-warning', 'body', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'verb', 'object-type', 'object', 'target-type', 'target', 'plink']; + // Field list for "item-content" table that is not present in the "item" table + const CONTENT_FIELDLIST = ['language']; + // All fields in the item table const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid', 'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', @@ -86,7 +89,7 @@ class Item extends BaseObject $row = dba::fetch($stmt); // Fetch data from the item-content table whenever there is content there - foreach (self::CONTENT_FIELDLIST as $field) { + foreach (self::MIXED_CONTENT_FIELDLIST as $field) { if (empty($row[$field]) && !empty($row['item-' . $field])) { $row[$field] = $row['item-' . $field]; } @@ -406,7 +409,7 @@ class Item extends BaseObject 'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global', 'id' => 'item_id', 'network', 'icid']; - $fields['item-content'] = self::CONTENT_FIELDLIST; + $fields['item-content'] = array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST); $fields['author'] = ['url' => 'author-link', 'name' => 'author-name', 'thumb' => 'author-avatar', 'nick' => 'author-nick']; @@ -526,7 +529,7 @@ class Item extends BaseObject foreach ($fields as $table => $table_fields) { foreach ($table_fields as $field => $select) { if (empty($selected) || in_array($select, $selected)) { - if (in_array($select, self::CONTENT_FIELDLIST)) { + if (in_array($select, self::MIXED_CONTENT_FIELDLIST)) { $selection[] = "`item`.`".$select."` AS `item-" . $select . "`"; } if (is_int($field)) { @@ -594,7 +597,7 @@ class Item extends BaseObject $items = dba::select('item', ['id', 'origin', 'uri', 'plink'], $condition); $content_fields = []; - foreach (self::CONTENT_FIELDLIST as $field) { + foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) { if (isset($fields[$field])) { $content_fields[$field] = $fields[$field]; unset($fields[$field]); @@ -1032,7 +1035,7 @@ class Item extends BaseObject } } - self::addLanguageInPostopts($item); + self::addLanguageToItemArray($item); $item['wall'] = intval(defaults($item, 'wall', 0)); $item['extid'] = trim(defaults($item, 'extid', '')); @@ -1498,7 +1501,7 @@ class Item extends BaseObject $fields = ['uri' => $item['uri'], 'plink' => $item['plink'], 'uri-plink-hash' => hash('sha1', $item['plink']).hash('sha1', $item['uri'])]; - foreach (self::CONTENT_FIELDLIST as $field) { + foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) { if (isset($item[$field])) { $fields[$field] = $item[$field]; unset($item[$field]); @@ -1556,7 +1559,7 @@ class Item extends BaseObject { // We have to select only the fields from the "item-content" table $fields = []; - foreach (self::CONTENT_FIELDLIST as $field) { + foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) { if (isset($item[$field])) { $fields[$field] = $item[$field]; } @@ -1822,39 +1825,19 @@ class Item extends BaseObject } /** - * Adds a "lang" specification in a "postopts" element of given $arr, - * if possible and not already present. + * Adds a language specification in a "language" element of given $arr. * Expects "body" element to exist in $arr. */ - private static function addLanguageInPostopts(&$item) + private static function addLanguageToItemArray(&$item) { - $postopts = ""; - - if (!empty($item['postopts'])) { - if (strstr($item['postopts'], 'lang=')) { - // do not override - return; - } - $postopts = $item['postopts']; - } - $naked_body = Text\BBCode::toPlaintext($item['body'], false); - $languages = (new Text_LanguageDetect())->detect($naked_body, 3); + $ld = new Text_LanguageDetect(); + $ld->setNameMode(2); + $languages = $ld->detect($naked_body, 3); - if (sizeof($languages) > 0) { - if ($postopts != '') { - $postopts .= '&'; // arbitrary separator, to be reviewed - } - - $postopts .= 'lang='; - $sep = ""; - - foreach ($languages as $language => $score) { - $postopts .= $sep . $language . ";" . $score; - $sep = ':'; - } - $item['postopts'] = $postopts; + if (is_array($languages)) { + $item['language'] = json_encode($languages); } } From bccd59d6c56b38d142f885c4df0cefc01a5571ab Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 30 Jun 2018 09:58:40 +0200 Subject: [PATCH 06/25] regen credits --- util/credits.txt | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/util/credits.txt b/util/credits.txt index f88d1f793..edbfbfdd5 100644 --- a/util/credits.txt +++ b/util/credits.txt @@ -4,6 +4,7 @@ Abrax Adam Clark Adam Jurkiewicz Adam Magness +Aditoo AgnesElisa Albert Alberto Díaz Tormo @@ -22,6 +23,7 @@ André Lohan Andy H3 Andy Hee AndyHee +Angristan Anthronaut Arian - Cazare Muncitori Athalbert @@ -89,6 +91,7 @@ Gregory Smith Haakon Meland Eriksen Hans Meine hauke +Hauke Hauke Altmann Hauke Zühl Herbert Thielen @@ -110,7 +113,6 @@ Josef Moravek juanman julia.domagalska Karel -Karel Vandecandelaere Karolina Keith Fernie Klaus Weidenbach @@ -120,6 +122,7 @@ Lea1995polish Leberwurscht Leonard Lausen Lionel Triay +Lorem Ipsum Ludovic Grossard maase2 Magdalena Gazda @@ -144,6 +147,7 @@ Michael Vogel Michal Šupler Michalina Mike Macgirvin +miqrogroove mytbk Nicola Spanti Olaf Conradi @@ -152,13 +156,16 @@ Olivier Olivier Mehani Olivier Migeot Paolo Wave +Pascal +Pascal Deklerck Pavel Morozov -Perig Gouanvic +PerigGouanvic peturisfeld Philipp Holzer Pierre Rudloff Piotr Blonkowski pokerazor +R C Rabuzarus Radek Rafael Garau @@ -172,6 +179,7 @@ Ricardo Pereira RJ Madsen Roland Häder Rui Andrada +RyDroid S.Krumbholz Sakałoŭ Alaksiej Sam @@ -216,15 +224,17 @@ ufic Vasudev Kamath Vasya Novikov vislav +VVelox Vít Šesták 'v6ak' Waldemar Stoczkowski Yasen Pramatarov ylms Zach Prezkuta +Zane C. Bowers-Hadley Zered zotlabs zottel Zvi ben Yaakov (a.k.a rdc) Михаил Олексій Замковий -朱陈锬 +朱陈锬 \ No newline at end of file From eb5edad07a0c77e53ccfbca2ddde0f78c6c41977 Mon Sep 17 00:00:00 2001 From: hoergen Date: Sat, 30 Jun 2018 13:39:11 +0200 Subject: [PATCH 07/25] Add files via upload frio: new scheme Plusminus aims to minimize empty design spaces --- view/theme/frio/scheme/plusminus.css | 99 +++++++++++++++++++++++++++ view/theme/frio/scheme/plusminus.jpg | Bin 0 -> 22877 bytes view/theme/frio/scheme/plusminus.php | 17 +++++ 3 files changed, 116 insertions(+) create mode 100644 view/theme/frio/scheme/plusminus.css create mode 100644 view/theme/frio/scheme/plusminus.jpg create mode 100644 view/theme/frio/scheme/plusminus.php diff --git a/view/theme/frio/scheme/plusminus.css b/view/theme/frio/scheme/plusminus.css new file mode 100644 index 000000000..4c753dd12 --- /dev/null +++ b/view/theme/frio/scheme/plusminus.css @@ -0,0 +1,99 @@ +/* + Licence : AGPL + + Created on : 29.06.2018, 15:03:06 + Author : hoergen + Color picker : https://www.w3schools.com/colors/colors_names.asp + CSS UTF8 icons : https://www.utf8icons.com + +*/ + +body { + background: url(scheme/plusminus.jpg); + background-repeat: no-repeat; + background-size: cover; + background-attachment: fixed; + height: auto; +} + +aside .widget, .form-control, .panel, .nav-container, .wall-item-content, .e-content, .p-name, .topbar, post, shiny, tread-wrapper, #topbar-second { + color: #000; + background-color: #f5f5f5; +} + +.form-control { + font-family: ".SFNSText-Regular","San Francisco","Roboto","Segoe UI","Helvetica Neue","Lucida Grande",Helvetica,Arial,sans-serif; +} + +#topbar-first #nav-notifications-menu li.notify-unseen { + + border-left: 3px solid #f3fcfd; + background-color: antiquewhite; +} + +.birthday-notice { + background-color:#cc0000; + color: white; +} + +#birthday-title { + background-color:#ff0000; + color: white; + text-indent: 6px; +} + +.birthday-list:before { + content: "\1F382 "; +} + +.birthday-list{ + margin: 1px; + color: black; + background-color: yellow; + text-indent: 10px; + border-radius: 5px; +} + +#event-notice{ + color: white; + background-color: #004c5b; + text-indent: 2px; +} + +#event-title{ + color: whitesmoke; + background-color: #006c83; + text-indent: 6px; +} + +.event-list:before { + content: "\1F5D3 "; +} + +.event-list { + margin: 1px; + color: black; + background-color: #00c7f0; + text-indent: 10px; + border-radius: 5px; +} + +.panel .panel-body { + padding-top: 1px; + padding-bottom: 1px; + padding-left:5px; + padding-right:5px; + border: 1px; +} + +.wall-item-network { + font-size: 12px; +} + +.wall-item-content .clearfix .post .comment-container .well .well-sm .wall-item-body .e-content .p-name .media .comment .wall-item-bottom .wall-item-links .wall-item-tags .wall-item-actions .wall-item-responses #hr { + box-sizing: border-box; + margin-top: 0px; + margin-bottom: 0px; + border:0px; + padding:0px; +} diff --git a/view/theme/frio/scheme/plusminus.jpg b/view/theme/frio/scheme/plusminus.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7d333a2e1d49d449c2df58016fb31e207dfbeb22 GIT binary patch literal 22877 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 literal 0 HcmV?d00001 diff --git a/view/theme/frio/scheme/plusminus.php b/view/theme/frio/scheme/plusminus.php new file mode 100644 index 000000000..a8ce7af1d --- /dev/null +++ b/view/theme/frio/scheme/plusminus.php @@ -0,0 +1,17 @@ + Date: Sat, 30 Jun 2018 13:54:01 +0000 Subject: [PATCH 08/25] Preparations to not store the tags in the item table anymore --- database.sql | 1 - include/enotify.php | 41 ++++++++++++++++-------------------- src/Database/DBStructure.php | 1 - src/Model/Item.php | 30 ++++++++++++++++++++++---- src/Model/Term.php | 26 ++++++++++++++++++++--- 5 files changed, 67 insertions(+), 32 deletions(-) diff --git a/database.sql b/database.sql index c452832ac..1ea6abfa0 100644 --- a/database.sql +++ b/database.sql @@ -987,7 +987,6 @@ CREATE TABLE IF NOT EXISTS `term` ( `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `global` boolean NOT NULL DEFAULT '0' COMMENT '', - `aid` int unsigned NOT NULL DEFAULT 0 COMMENT '', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id', PRIMARY KEY(`tid`), INDEX `oid_otype_type_term` (`oid`,`otype`,`type`,`term`(32)), diff --git a/include/enotify.php b/include/enotify.php index be9468dd8..f33b16f50 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -738,18 +738,13 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { // Only act if it is a "real" post // We need the additional check for the "local_profile" because of mixed situations on connector networks - $item = q("SELECT `id`, `mention`, `tag`,`parent`, `title`, `body`, `author-id`, `guid`, - `parent-uri`, `uri`, `contact-id`, `network` - FROM `item` WHERE `id` = %d AND `gravity` IN (%d, %d) AND - NOT (`author-id` IN ($contact_list)) LIMIT 1", - intval($itemid), intval(GRAVITY_PARENT), intval(GRAVITY_COMMENT)); - if (!$item) - return false; - - if ($item[0]['network'] != NETWORK_FEED) { - $author = dba::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item[0]['author-id']]); - } else { - $author = dba::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item[0]['contact-id']]); + $fields = ['id', 'mention', 'tag', 'parent', 'title', 'body', + 'author-link', 'author-name', 'author-avatar', 'author-id', + 'guid', 'parent-uri', 'uri', 'contact-id', 'network']; + $condition = ['id' => $itemid, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]]; + $item = Item::selectFirst($fields, $condition); + if (!DBM::is_result($item) || in_array($item['author-id'], $contacts)) { + return; } // Generate the notification array @@ -759,17 +754,17 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { $params["language"] = $user["language"]; $params["to_name"] = $user["username"]; $params["to_email"] = $user["email"]; - $params["item"] = $item[0]; - $params["parent"] = $item[0]["parent"]; - $params["link"] = System::baseUrl().'/display/'.urlencode($item[0]["guid"]); + $params["item"] = $item; + $params["parent"] = $item["parent"]; + $params["link"] = System::baseUrl().'/display/'.urlencode($item["guid"]); $params["otype"] = 'item'; - $params["source_name"] = $author["name"]; - $params["source_link"] = $author["url"]; - $params["source_photo"] = $author["thumb"]; + $params["source_name"] = $item["author-name"]; + $params["source_link"] = $item["author-link"]; + $params["source_photo"] = $item["author-avatar"]; - if ($item[0]["parent-uri"] === $item[0]["uri"]) { + if ($item["parent-uri"] === $item["uri"]) { // Send a notification for every new post? - $send_notification = dba::exists('contact', ['id' => $item[0]['contact-id'], 'notify_new_posts' => true]); + $send_notification = dba::exists('contact', ['id' => $item['contact-id'], 'notify_new_posts' => true]); if (!$send_notification) { $tags = q("SELECT `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` = %d AND `uid` = %d", @@ -796,11 +791,11 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { $tagged = false; foreach ($profiles AS $profile) { - if (strpos($item[0]["tag"], "=".$profile."]") || strpos($item[0]["body"], "=".$profile."]")) + if (strpos($item["tag"], "=".$profile."]") || strpos($item["body"], "=".$profile."]")) $tagged = true; } - if ($item[0]["mention"] || $tagged || ($defaulttype == NOTIFY_TAGSELF)) { + if ($item["mention"] || $tagged || ($defaulttype == NOTIFY_TAGSELF)) { $params["type"] = NOTIFY_TAGSELF; $params["verb"] = ACTIVITY_TAG; } @@ -810,7 +805,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { WHERE `thread`.`iid` = %d AND NOT `thread`.`ignored` AND (`thread`.`mention` OR `item`.`author-id` IN ($contact_list)) LIMIT 1", - intval($item[0]["parent"])); + intval($item["parent"])); if ($parent && !isset($params["type"])) { $params["type"] = NOTIFY_COMMENT; diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php index fa49c2903..8970241b2 100644 --- a/src/Database/DBStructure.php +++ b/src/Database/DBStructure.php @@ -1716,7 +1716,6 @@ class DBStructure "created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""], "received" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""], "global" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""], - "aid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""], "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"], ], "indexes" => [ diff --git a/src/Model/Item.php b/src/Model/Item.php index 5fe03a81b..c6e4e131c 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -117,6 +117,11 @@ class Item extends BaseObject } } + // Build the tag string out of the term entries + if (isset($row['id']) && isset($row['tag'])) { + $row['tag'] = Term::tagTextFromItemId($row['id']); + } + // We can always comment on posts from these networks if (isset($row['writable']) && !empty($row['network']) && in_array($row['network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) { @@ -525,6 +530,11 @@ class Item extends BaseObject */ private static function constructSelectFields($fields, $selected) { + // To be able to fetch the tags we need the item id + if (in_array('tag', $selected) && !in_array('id', $selected)) { + $selected[] = 'id'; + } + $selection = []; foreach ($fields as $table => $table_fields) { foreach ($table_fields as $field => $select) { @@ -622,8 +632,15 @@ class Item extends BaseObject $content_fields['plink'] = $item['plink']; } self::updateContent($content_fields, ['uri' => $item['uri']]); - Term::insertFromTagFieldByItemId($item['id']); - Term::insertFromFileFieldByItemId($item['id']); + + if (array_key_exists('tag', $fields)) { + Term::insertFromTagFieldByItemId($item['id']); + } + + if (array_key_exists('file', $fields)) { + Term::insertFromFileFieldByItemId($item['id']); + } + self::updateThread($item['id']); // We only need to notfiy others when it is an original entry from us. @@ -1471,8 +1488,13 @@ class Item extends BaseObject * Due to deadlock issues with the "term" table we are doing these steps after the commit. * This is not perfect - but a workable solution until we found the reason for the problem. */ - Term::insertFromTagFieldByItemId($current_post); - Term::insertFromFileFieldByItemId($current_post); + if (array_key_exists('tag', $item)) { + Term::insertFromTagFieldByItemId($current_post); + } + + if (array_key_exists('file', $item)) { + Term::insertFromFileFieldByItemId($current_post); + } if ($item['parent-uri'] === $item['uri']) { self::addShadow($current_post); diff --git a/src/Model/Term.php b/src/Model/Term.php index 858714209..53c9da8aa 100644 --- a/src/Model/Term.php +++ b/src/Model/Term.php @@ -15,6 +15,26 @@ require_once 'include/dba.php'; class Term { + public static function tagTextFromItemId($itemid) + { + $tag_text = ''; + $condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]]; + $tags = dba::select('term', [], $condition); + while ($tag = dba::fetch($tags)) { + if ($tag_text != '') { + $tag_text .= ','; + } + + if ($tag['type'] == 1) { + $tag_text .= '#'; + } else { + $tag_text .= '@'; + } + $tag_text .= '[url=' . $tag['url'] . ']' . $tag['term'] . '[/url]'; + } + return $tag_text; + } + public static function insertFromTagFieldByItemId($itemid) { $profile_base = System::baseUrl(); @@ -57,14 +77,14 @@ class Term $pattern = '/\W\#([^\[].*?)[\s\'".,:;\?!\[\]\/]/ism'; if (preg_match_all($pattern, $data, $matches)) { foreach ($matches[1] as $match) { - $tags['#' . strtolower($match)] = ''; + $tags['#' . $match] = ''; } } $pattern = '/\W([\#@])\[url\=(.*?)\](.*?)\[\/url\]/ism'; if (preg_match_all($pattern, $data, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { - $tags[$match[1] . strtolower(trim($match[3], ',.:;[]/\"?!'))] = $match[2]; + $tags[$match[1] . trim($match[3], ',.:;[]/\"?!')] = $match[2]; } } @@ -193,7 +213,7 @@ class Term while ($tag = dba::fetch($taglist)) { if ($tag["url"] == "") { - $tag["url"] = $searchpath . strtolower($tag["term"]); + $tag["url"] = $searchpath . $tag["term"]; } $orig_tag = $tag["url"]; From 5ba14278066ce7a398c0aabb41e1c86fe12ea7d8 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 30 Jun 2018 15:21:32 +0000 Subject: [PATCH 09/25] We don't store tags in the item table anymore --- src/Model/Item.php | 26 ++++++++++++++++++++------ src/Model/Term.php | 6 ++++-- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index c6e4e131c..2cc9041bf 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -118,7 +118,7 @@ class Item extends BaseObject } // Build the tag string out of the term entries - if (isset($row['id']) && isset($row['tag'])) { + if (isset($row['id']) && array_key_exists('tag', $row)) { $row['tag'] = Term::tagTextFromItemId($row['id']); } @@ -614,6 +614,13 @@ class Item extends BaseObject } } + if (array_key_exists('tag', $fields)) { + $tags = $fields['tag']; + unset($fields['tag']); + } else { + $tags = ''; + } + if (!empty($fields)) { $success = dba::update('item', $fields, $condition); @@ -633,8 +640,8 @@ class Item extends BaseObject } self::updateContent($content_fields, ['uri' => $item['uri']]); - if (array_key_exists('tag', $fields)) { - Term::insertFromTagFieldByItemId($item['id']); + if (!empty($tags)) { + Term::insertFromTagFieldByItemId($item['id'], $tags); } if (array_key_exists('file', $fields)) { @@ -777,7 +784,7 @@ class Item extends BaseObject 'object' => '', 'target' => '', 'tag' => '', 'postopts' => '', 'attach' => '', 'file' => '']; dba::update('item', $item_fields, ['id' => $item['id']]); - Term::insertFromTagFieldByItemId($item['id']); + Term::insertFromTagFieldByItemId($item['id'], ''); Term::insertFromFileFieldByItemId($item['id']); self::deleteThread($item['id'], $item['parent-uri']); @@ -1357,6 +1364,13 @@ class Item extends BaseObject logger('' . print_r($item,true), LOGGER_DATA); + if (array_key_exists('tag', $item)) { + $tags = $item['tag']; + unset($item['tag']); + } else { + $tags = ''; + } + // We are doing this outside of the transaction to avoid timing problems self::insertContent($item); @@ -1488,8 +1502,8 @@ class Item extends BaseObject * Due to deadlock issues with the "term" table we are doing these steps after the commit. * This is not perfect - but a workable solution until we found the reason for the problem. */ - if (array_key_exists('tag', $item)) { - Term::insertFromTagFieldByItemId($current_post); + if (!empty($tags)) { + Term::insertFromTagFieldByItemId($current_post, $tags); } if (array_key_exists('file', $item)) { diff --git a/src/Model/Term.php b/src/Model/Term.php index 53c9da8aa..85b14174a 100644 --- a/src/Model/Term.php +++ b/src/Model/Term.php @@ -35,7 +35,7 @@ class Term return $tag_text; } - public static function insertFromTagFieldByItemId($itemid) + public static function insertFromTagFieldByItemId($itemid, $tags) { $profile_base = System::baseUrl(); $profile_data = parse_url($profile_base); @@ -43,12 +43,14 @@ class Term $profile_base_friendica = $profile_data['host'] . $profile_path . '/profile/'; $profile_base_diaspora = $profile_data['host'] . $profile_path . '/u/'; - $fields = ['guid', 'uid', 'id', 'edited', 'deleted', 'created', 'received', 'title', 'body', 'tag', 'parent']; + $fields = ['guid', 'uid', 'id', 'edited', 'deleted', 'created', 'received', 'title', 'body', 'parent']; $message = Item::selectFirst($fields, ['id' => $itemid]); if (!DBM::is_result($message)) { return; } + $message['tag'] = $tags; + // Clean up all tags dba::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]]); From bc3a569b2fca6f3be7c821b8fdcad2b4b25fe3b4 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 30 Jun 2018 17:34:27 +0200 Subject: [PATCH 10/25] Label for the Events happening in the next 7 days was wrong --- src/Model/Profile.php | 2 +- util/messages.po | 2048 +++++++++++++++++++++-------------------- 2 files changed, 1028 insertions(+), 1022 deletions(-) diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 2e70af4d5..631ddd2f0 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -710,7 +710,7 @@ class Profile '$classtoday' => $classtoday, '$count' => count($r), '$event_reminders' => L10n::t('Event Reminders'), - '$event_title' => L10n::t('Events this week:'), + '$event_title' => L10n::t('Upcoming events the next 7 days:'), '$events' => $r, ]); } diff --git a/util/messages.po b/util/messages.po index 41951abf7..3e6f26b37 100644 --- a/util/messages.po +++ b/util/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-20 08:17+0200\n" +"POT-Creation-Date: 2018-06-30 17:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,87 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" +#: include/items.php:342 mod/notice.php:22 mod/admin.php:277 mod/admin.php:1888 +#: mod/admin.php:2136 mod/viewsrc.php:22 mod/display.php:70 mod/display.php:244 +#: mod/display.php:341 +msgid "Item not found." +msgstr "" + +#: include/items.php:379 +msgid "Do you really want to delete this item?" +msgstr "" + +#: include/items.php:381 mod/api.php:110 mod/follow.php:150 +#: mod/profiles.php:543 mod/profiles.php:546 mod/profiles.php:568 +#: mod/settings.php:1094 mod/settings.php:1100 mod/settings.php:1107 +#: mod/settings.php:1111 mod/settings.php:1115 mod/settings.php:1119 +#: mod/settings.php:1123 mod/settings.php:1127 mod/settings.php:1147 +#: mod/settings.php:1148 mod/settings.php:1149 mod/settings.php:1150 +#: mod/settings.php:1151 mod/contacts.php:472 mod/dfrn_request.php:647 +#: mod/register.php:238 mod/suggest.php:38 mod/message.php:138 +msgid "Yes" +msgstr "" + +#: include/items.php:384 include/conversation.php:1148 mod/fbrowser.php:103 +#: mod/fbrowser.php:134 mod/follow.php:161 mod/settings.php:670 +#: mod/settings.php:696 mod/videos.php:147 mod/contacts.php:475 +#: mod/dfrn_request.php:657 mod/editpost.php:135 mod/suggest.php:41 +#: mod/tagrm.php:19 mod/tagrm.php:91 mod/unfollow.php:117 mod/message.php:141 +#: mod/photos.php:244 mod/photos.php:313 +msgid "Cancel" +msgstr "" + +#: include/items.php:398 mod/api.php:35 mod/api.php:40 mod/attach.php:38 +#: mod/common.php:26 mod/nogroup.php:28 mod/repair_ostatus.php:13 +#: mod/uimport.php:28 mod/manage.php:131 mod/wall_attach.php:74 +#: mod/wall_attach.php:77 mod/regmod.php:108 mod/wallmessage.php:16 +#: mod/wallmessage.php:40 mod/wallmessage.php:79 mod/wallmessage.php:103 +#: mod/fsuggest.php:80 mod/cal.php:304 mod/delegate.php:25 mod/delegate.php:43 +#: mod/delegate.php:54 mod/ostatus_subscribe.php:16 mod/profile_photo.php:30 +#: mod/profile_photo.php:176 mod/profile_photo.php:187 +#: mod/profile_photo.php:200 mod/follow.php:17 mod/follow.php:54 +#: mod/follow.php:118 mod/invite.php:20 mod/invite.php:111 mod/crepair.php:98 +#: mod/dfrn_confirm.php:68 mod/events.php:194 mod/group.php:26 +#: mod/profiles.php:182 mod/profiles.php:513 mod/settings.php:43 +#: mod/settings.php:142 mod/settings.php:659 mod/allfriends.php:21 +#: mod/contacts.php:386 mod/dirfind.php:24 mod/editpost.php:19 +#: mod/notifications.php:65 mod/poke.php:146 mod/register.php:54 +#: mod/suggest.php:60 mod/unfollow.php:15 mod/unfollow.php:57 +#: mod/unfollow.php:90 mod/viewcontacts.php:57 mod/wall_upload.php:103 +#: mod/wall_upload.php:106 mod/item.php:160 mod/message.php:59 +#: mod/message.php:104 mod/network.php:32 mod/notes.php:31 mod/photos.php:175 +#: mod/photos.php:1033 index.php:446 +msgid "Permission denied." +msgstr "" + +#: include/items.php:468 src/Content/Feature.php:96 +msgid "Archives" +msgstr "" + +#: include/items.php:474 view/theme/vier/theme.php:258 +#: src/Content/Widget.php:317 src/Content/ForumManager.php:131 +#: src/Object/Post.php:421 src/App.php:527 +msgid "show more" +msgstr "" + +#: include/security.php:81 +msgid "Welcome " +msgstr "" + +#: include/security.php:82 +msgid "Please upload a profile photo." +msgstr "" + +#: include/security.php:84 +msgid "Welcome back " +msgstr "" + +#: include/security.php:447 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." +msgstr "" + #: include/api.php:1131 #, php-format msgid "Daily posting limit of %d post reached. The post was rejected." @@ -37,40 +118,40 @@ msgstr[1] "" msgid "Monthly posting limit of %d post reached. The post was rejected." msgstr "" -#: include/api.php:4217 mod/profile_photo.php:85 mod/profile_photo.php:93 +#: include/api.php:4218 mod/profile_photo.php:85 mod/profile_photo.php:93 #: mod/profile_photo.php:101 mod/profile_photo.php:211 #: mod/profile_photo.php:302 mod/profile_photo.php:312 mod/photos.php:89 -#: mod/photos.php:190 mod/photos.php:703 mod/photos.php:1130 -#: mod/photos.php:1147 mod/photos.php:1669 src/Model/User.php:563 +#: mod/photos.php:190 mod/photos.php:704 mod/photos.php:1131 +#: mod/photos.php:1148 mod/photos.php:1635 src/Model/User.php:563 #: src/Model/User.php:571 src/Model/User.php:579 msgid "Profile Photos" msgstr "" #: include/conversation.php:148 include/conversation.php:278 -#: include/text.php:1714 src/Model/Item.php:2449 +#: include/text.php:1714 src/Model/Item.php:2661 msgid "event" msgstr "" #: include/conversation.php:151 include/conversation.php:161 #: include/conversation.php:281 include/conversation.php:290 -#: mod/subthread.php:97 mod/tagger.php:70 src/Model/Item.php:2447 +#: mod/subthread.php:97 mod/tagger.php:70 src/Model/Item.php:2659 #: src/Protocol/Diaspora.php:1949 msgid "status" msgstr "" #: include/conversation.php:156 include/conversation.php:286 #: include/text.php:1716 mod/subthread.php:97 mod/tagger.php:70 -#: src/Model/Item.php:2447 +#: src/Model/Item.php:2659 msgid "photo" msgstr "" -#: include/conversation.php:168 src/Model/Item.php:2320 +#: include/conversation.php:168 src/Model/Item.php:2530 #: src/Protocol/Diaspora.php:1945 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: include/conversation.php:170 src/Model/Item.php:2325 +#: include/conversation.php:170 src/Model/Item.php:2535 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -114,378 +195,369 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: include/conversation.php:504 mod/profiles.php:355 mod/photos.php:1490 +#: include/conversation.php:504 mod/profiles.php:355 mod/photos.php:1464 msgid "Likes" msgstr "" -#: include/conversation.php:504 mod/profiles.php:359 mod/photos.php:1490 +#: include/conversation.php:504 mod/profiles.php:359 mod/photos.php:1464 msgid "Dislikes" msgstr "" -#: include/conversation.php:505 include/conversation.php:1462 -#: mod/photos.php:1491 +#: include/conversation.php:505 include/conversation.php:1455 +#: mod/photos.php:1465 msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:505 mod/photos.php:1491 +#: include/conversation.php:505 mod/photos.php:1465 msgid "Not attending" msgstr "" -#: include/conversation.php:505 mod/photos.php:1491 +#: include/conversation.php:505 mod/photos.php:1465 msgid "Might attend" msgstr "" -#: include/conversation.php:600 mod/photos.php:1554 src/Object/Post.php:191 +#: include/conversation.php:593 mod/photos.php:1521 src/Object/Post.php:191 msgid "Select" msgstr "" -#: include/conversation.php:601 mod/settings.php:730 mod/admin.php:1832 -#: mod/contacts.php:829 mod/contacts.php:1035 mod/photos.php:1555 +#: include/conversation.php:594 mod/settings.php:730 mod/admin.php:1832 +#: mod/contacts.php:829 mod/contacts.php:1035 mod/photos.php:1522 msgid "Delete" msgstr "" -#: include/conversation.php:635 src/Object/Post.php:362 src/Object/Post.php:363 +#: include/conversation.php:628 src/Object/Post.php:354 src/Object/Post.php:355 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: include/conversation.php:647 src/Object/Post.php:350 +#: include/conversation.php:640 src/Object/Post.php:342 msgid "Categories:" msgstr "" -#: include/conversation.php:648 src/Object/Post.php:351 +#: include/conversation.php:641 src/Object/Post.php:343 msgid "Filed under:" msgstr "" -#: include/conversation.php:655 src/Object/Post.php:376 +#: include/conversation.php:648 src/Object/Post.php:368 #, php-format msgid "%s from %s" msgstr "" -#: include/conversation.php:670 +#: include/conversation.php:663 msgid "View in context" msgstr "" -#: include/conversation.php:672 include/conversation.php:1137 -#: mod/wallmessage.php:145 mod/editpost.php:111 mod/message.php:245 -#: mod/message.php:411 mod/photos.php:1462 src/Object/Post.php:401 +#: include/conversation.php:665 include/conversation.php:1130 +#: mod/wallmessage.php:145 mod/editpost.php:111 mod/message.php:247 +#: mod/message.php:413 mod/photos.php:1436 src/Object/Post.php:393 msgid "Please wait" msgstr "" -#: include/conversation.php:743 +#: include/conversation.php:736 msgid "remove" msgstr "" -#: include/conversation.php:747 +#: include/conversation.php:740 msgid "Delete Selected Items" msgstr "" -#: include/conversation.php:845 view/theme/frio/theme.php:357 +#: include/conversation.php:838 view/theme/frio/theme.php:357 msgid "Follow Thread" msgstr "" -#: include/conversation.php:846 src/Model/Contact.php:662 +#: include/conversation.php:839 src/Model/Contact.php:662 msgid "View Status" msgstr "" -#: include/conversation.php:847 include/conversation.php:863 -#: mod/allfriends.php:73 mod/directory.php:159 mod/dirfind.php:216 -#: mod/match.php:89 mod/suggest.php:82 src/Model/Contact.php:602 +#: include/conversation.php:840 include/conversation.php:856 +#: mod/allfriends.php:73 mod/dirfind.php:216 mod/match.php:89 +#: mod/suggest.php:82 mod/directory.php:160 src/Model/Contact.php:602 #: src/Model/Contact.php:615 src/Model/Contact.php:663 msgid "View Profile" msgstr "" -#: include/conversation.php:848 src/Model/Contact.php:664 +#: include/conversation.php:841 src/Model/Contact.php:664 msgid "View Photos" msgstr "" -#: include/conversation.php:849 src/Model/Contact.php:665 +#: include/conversation.php:842 src/Model/Contact.php:665 msgid "Network Posts" msgstr "" -#: include/conversation.php:850 src/Model/Contact.php:666 +#: include/conversation.php:843 src/Model/Contact.php:666 msgid "View Contact" msgstr "" -#: include/conversation.php:851 src/Model/Contact.php:668 +#: include/conversation.php:844 src/Model/Contact.php:668 msgid "Send PM" msgstr "" -#: include/conversation.php:855 src/Model/Contact.php:669 +#: include/conversation.php:848 src/Model/Contact.php:669 msgid "Poke" msgstr "" -#: include/conversation.php:860 mod/follow.php:143 mod/allfriends.php:74 +#: include/conversation.php:853 mod/follow.php:143 mod/allfriends.php:74 #: mod/contacts.php:595 mod/dirfind.php:217 mod/match.php:90 mod/suggest.php:83 #: view/theme/vier/theme.php:201 src/Content/Widget.php:61 #: src/Model/Contact.php:616 msgid "Connect/Follow" msgstr "" -#: include/conversation.php:976 +#: include/conversation.php:969 #, php-format msgid "%s likes this." msgstr "" -#: include/conversation.php:979 +#: include/conversation.php:972 #, php-format msgid "%s doesn't like this." msgstr "" -#: include/conversation.php:982 +#: include/conversation.php:975 #, php-format msgid "%s attends." msgstr "" -#: include/conversation.php:985 +#: include/conversation.php:978 #, php-format msgid "%s doesn't attend." msgstr "" -#: include/conversation.php:988 +#: include/conversation.php:981 #, php-format msgid "%s attends maybe." msgstr "" -#: include/conversation.php:999 +#: include/conversation.php:992 msgid "and" msgstr "" -#: include/conversation.php:1005 +#: include/conversation.php:998 #, php-format msgid "and %d other people" msgstr "" -#: include/conversation.php:1014 +#: include/conversation.php:1007 #, php-format msgid "%2$d people like this" msgstr "" -#: include/conversation.php:1015 +#: include/conversation.php:1008 #, php-format msgid "%s like this." msgstr "" -#: include/conversation.php:1018 +#: include/conversation.php:1011 #, php-format msgid "%2$d people don't like this" msgstr "" -#: include/conversation.php:1019 +#: include/conversation.php:1012 #, php-format msgid "%s don't like this." msgstr "" -#: include/conversation.php:1022 +#: include/conversation.php:1015 #, php-format msgid "%2$d people attend" msgstr "" -#: include/conversation.php:1023 +#: include/conversation.php:1016 #, php-format msgid "%s attend." msgstr "" -#: include/conversation.php:1026 +#: include/conversation.php:1019 #, php-format msgid "%2$d people don't attend" msgstr "" -#: include/conversation.php:1027 +#: include/conversation.php:1020 #, php-format msgid "%s don't attend." msgstr "" -#: include/conversation.php:1030 +#: include/conversation.php:1023 #, php-format msgid "%2$d people attend maybe" msgstr "" -#: include/conversation.php:1031 +#: include/conversation.php:1024 #, php-format msgid "%s attend maybe." msgstr "" -#: include/conversation.php:1061 include/conversation.php:1077 +#: include/conversation.php:1054 include/conversation.php:1070 msgid "Visible to everybody" msgstr "" -#: include/conversation.php:1062 include/conversation.php:1078 -#: mod/wallmessage.php:120 mod/wallmessage.php:127 mod/message.php:181 -#: mod/message.php:188 mod/message.php:324 mod/message.php:331 +#: include/conversation.php:1055 include/conversation.php:1071 +#: mod/wallmessage.php:120 mod/wallmessage.php:127 mod/message.php:183 +#: mod/message.php:190 mod/message.php:326 mod/message.php:333 msgid "Please enter a link URL:" msgstr "" -#: include/conversation.php:1063 include/conversation.php:1079 +#: include/conversation.php:1056 include/conversation.php:1072 msgid "Please enter a video link/URL:" msgstr "" -#: include/conversation.php:1064 include/conversation.php:1080 +#: include/conversation.php:1057 include/conversation.php:1073 msgid "Please enter an audio link/URL:" msgstr "" -#: include/conversation.php:1065 include/conversation.php:1081 +#: include/conversation.php:1058 include/conversation.php:1074 msgid "Tag term:" msgstr "" -#: include/conversation.php:1066 include/conversation.php:1082 mod/filer.php:34 +#: include/conversation.php:1059 include/conversation.php:1075 mod/filer.php:34 msgid "Save to Folder:" msgstr "" -#: include/conversation.php:1067 include/conversation.php:1083 +#: include/conversation.php:1060 include/conversation.php:1076 msgid "Where are you right now?" msgstr "" -#: include/conversation.php:1068 +#: include/conversation.php:1061 msgid "Delete item(s)?" msgstr "" -#: include/conversation.php:1115 +#: include/conversation.php:1108 msgid "New Post" msgstr "" -#: include/conversation.php:1118 +#: include/conversation.php:1111 msgid "Share" msgstr "" -#: include/conversation.php:1119 mod/wallmessage.php:143 mod/editpost.php:97 -#: mod/message.php:243 mod/message.php:408 +#: include/conversation.php:1112 mod/wallmessage.php:143 mod/editpost.php:97 +#: mod/message.php:245 mod/message.php:410 msgid "Upload photo" msgstr "" -#: include/conversation.php:1120 mod/editpost.php:98 +#: include/conversation.php:1113 mod/editpost.php:98 msgid "upload photo" msgstr "" -#: include/conversation.php:1121 mod/editpost.php:99 +#: include/conversation.php:1114 mod/editpost.php:99 msgid "Attach file" msgstr "" -#: include/conversation.php:1122 mod/editpost.php:100 +#: include/conversation.php:1115 mod/editpost.php:100 msgid "attach file" msgstr "" -#: include/conversation.php:1123 mod/wallmessage.php:144 mod/editpost.php:101 -#: mod/message.php:244 mod/message.php:409 +#: include/conversation.php:1116 mod/wallmessage.php:144 mod/editpost.php:101 +#: mod/message.php:246 mod/message.php:411 msgid "Insert web link" msgstr "" -#: include/conversation.php:1124 mod/editpost.php:102 +#: include/conversation.php:1117 mod/editpost.php:102 msgid "web link" msgstr "" -#: include/conversation.php:1125 mod/editpost.php:103 +#: include/conversation.php:1118 mod/editpost.php:103 msgid "Insert video link" msgstr "" -#: include/conversation.php:1126 mod/editpost.php:104 +#: include/conversation.php:1119 mod/editpost.php:104 msgid "video link" msgstr "" -#: include/conversation.php:1127 mod/editpost.php:105 +#: include/conversation.php:1120 mod/editpost.php:105 msgid "Insert audio link" msgstr "" -#: include/conversation.php:1128 mod/editpost.php:106 +#: include/conversation.php:1121 mod/editpost.php:106 msgid "audio link" msgstr "" -#: include/conversation.php:1129 mod/editpost.php:107 +#: include/conversation.php:1122 mod/editpost.php:107 msgid "Set your location" msgstr "" -#: include/conversation.php:1130 mod/editpost.php:108 +#: include/conversation.php:1123 mod/editpost.php:108 msgid "set location" msgstr "" -#: include/conversation.php:1131 mod/editpost.php:109 +#: include/conversation.php:1124 mod/editpost.php:109 msgid "Clear browser location" msgstr "" -#: include/conversation.php:1132 mod/editpost.php:110 +#: include/conversation.php:1125 mod/editpost.php:110 msgid "clear location" msgstr "" -#: include/conversation.php:1134 mod/editpost.php:124 +#: include/conversation.php:1127 mod/editpost.php:124 msgid "Set title" msgstr "" -#: include/conversation.php:1136 mod/editpost.php:126 +#: include/conversation.php:1129 mod/editpost.php:126 msgid "Categories (comma-separated list)" msgstr "" -#: include/conversation.php:1138 mod/editpost.php:112 +#: include/conversation.php:1131 mod/editpost.php:112 msgid "Permission settings" msgstr "" -#: include/conversation.php:1139 mod/editpost.php:141 +#: include/conversation.php:1132 mod/editpost.php:141 msgid "permissions" msgstr "" -#: include/conversation.php:1147 mod/editpost.php:121 +#: include/conversation.php:1140 mod/editpost.php:121 msgid "Public post" msgstr "" -#: include/conversation.php:1151 mod/events.php:529 mod/editpost.php:132 -#: mod/photos.php:1481 mod/photos.php:1520 mod/photos.php:1589 -#: src/Object/Post.php:804 +#: include/conversation.php:1144 mod/events.php:529 mod/editpost.php:132 +#: mod/photos.php:1455 mod/photos.php:1494 mod/photos.php:1555 +#: src/Object/Post.php:796 msgid "Preview" msgstr "" -#: include/conversation.php:1155 include/items.php:384 mod/fbrowser.php:103 -#: mod/fbrowser.php:134 mod/follow.php:161 mod/settings.php:670 -#: mod/settings.php:696 mod/videos.php:147 mod/contacts.php:475 -#: mod/dfrn_request.php:657 mod/editpost.php:135 mod/message.php:141 -#: mod/photos.php:244 mod/photos.php:313 mod/suggest.php:41 mod/tagrm.php:19 -#: mod/tagrm.php:91 mod/unfollow.php:117 -msgid "Cancel" -msgstr "" - -#: include/conversation.php:1160 +#: include/conversation.php:1153 msgid "Post to Groups" msgstr "" -#: include/conversation.php:1161 +#: include/conversation.php:1154 msgid "Post to Contacts" msgstr "" -#: include/conversation.php:1162 +#: include/conversation.php:1155 msgid "Private post" msgstr "" -#: include/conversation.php:1167 mod/editpost.php:139 src/Model/Profile.php:338 +#: include/conversation.php:1160 mod/editpost.php:139 src/Model/Profile.php:339 msgid "Message" msgstr "" -#: include/conversation.php:1168 mod/editpost.php:140 +#: include/conversation.php:1161 mod/editpost.php:140 msgid "Browser" msgstr "" -#: include/conversation.php:1433 +#: include/conversation.php:1426 msgid "View all" msgstr "" -#: include/conversation.php:1456 +#: include/conversation.php:1449 msgid "Like" msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:1459 +#: include/conversation.php:1452 msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:1465 +#: include/conversation.php:1458 msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:1468 src/Content/ContactSelector.php:125 +#: include/conversation.php:1461 src/Content/ContactSelector.php:125 msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" @@ -785,77 +857,6 @@ msgstr "" msgid "Please visit %s to approve or reject the request." msgstr "" -#: include/items.php:342 mod/notice.php:22 mod/admin.php:277 mod/admin.php:1888 -#: mod/admin.php:2136 mod/display.php:70 mod/display.php:244 -#: mod/display.php:341 mod/viewsrc.php:22 -msgid "Item not found." -msgstr "" - -#: include/items.php:379 -msgid "Do you really want to delete this item?" -msgstr "" - -#: include/items.php:381 mod/api.php:110 mod/follow.php:150 -#: mod/profiles.php:543 mod/profiles.php:546 mod/profiles.php:568 -#: mod/settings.php:1094 mod/settings.php:1100 mod/settings.php:1107 -#: mod/settings.php:1111 mod/settings.php:1115 mod/settings.php:1119 -#: mod/settings.php:1123 mod/settings.php:1127 mod/settings.php:1147 -#: mod/settings.php:1148 mod/settings.php:1149 mod/settings.php:1150 -#: mod/settings.php:1151 mod/contacts.php:472 mod/dfrn_request.php:647 -#: mod/message.php:138 mod/register.php:238 mod/suggest.php:38 -msgid "Yes" -msgstr "" - -#: include/items.php:398 mod/api.php:35 mod/api.php:40 mod/attach.php:38 -#: mod/common.php:26 mod/nogroup.php:28 mod/repair_ostatus.php:13 -#: mod/uimport.php:28 mod/manage.php:131 mod/wall_attach.php:74 -#: mod/wall_attach.php:77 mod/regmod.php:108 mod/wallmessage.php:16 -#: mod/wallmessage.php:40 mod/wallmessage.php:79 mod/wallmessage.php:103 -#: mod/fsuggest.php:80 mod/cal.php:304 mod/delegate.php:25 mod/delegate.php:43 -#: mod/delegate.php:54 mod/ostatus_subscribe.php:16 mod/profile_photo.php:30 -#: mod/profile_photo.php:176 mod/profile_photo.php:187 -#: mod/profile_photo.php:200 mod/follow.php:17 mod/follow.php:54 -#: mod/follow.php:118 mod/invite.php:20 mod/invite.php:111 mod/crepair.php:98 -#: mod/dfrn_confirm.php:68 mod/events.php:194 mod/group.php:26 -#: mod/profiles.php:182 mod/profiles.php:513 mod/settings.php:43 -#: mod/settings.php:142 mod/settings.php:659 mod/allfriends.php:21 -#: mod/contacts.php:386 mod/dirfind.php:24 mod/editpost.php:19 mod/item.php:160 -#: mod/message.php:59 mod/message.php:104 mod/network.php:32 mod/notes.php:31 -#: mod/notifications.php:65 mod/photos.php:175 mod/photos.php:1032 -#: mod/poke.php:146 mod/register.php:54 mod/suggest.php:60 mod/unfollow.php:15 -#: mod/unfollow.php:57 mod/unfollow.php:90 mod/viewcontacts.php:57 -#: mod/wall_upload.php:103 mod/wall_upload.php:106 index.php:436 -msgid "Permission denied." -msgstr "" - -#: include/items.php:468 src/Content/Feature.php:96 -msgid "Archives" -msgstr "" - -#: include/items.php:474 view/theme/vier/theme.php:258 -#: src/Content/Widget.php:317 src/Content/ForumManager.php:131 -#: src/Object/Post.php:429 src/App.php:527 -msgid "show more" -msgstr "" - -#: include/security.php:81 -msgid "Welcome " -msgstr "" - -#: include/security.php:82 -msgid "Please upload a profile photo." -msgstr "" - -#: include/security.php:84 -msgid "Welcome back " -msgstr "" - -#: include/security.php:447 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "" - #: include/text.php:302 msgid "newer" msgstr "" @@ -930,8 +931,8 @@ msgstr "" #: include/text.php:996 mod/contacts.php:813 mod/contacts.php:874 #: mod/viewcontacts.php:122 view/theme/frio/theme.php:270 -#: src/Content/Nav.php:147 src/Content/Nav.php:213 src/Model/Profile.php:951 -#: src/Model/Profile.php:954 +#: src/Content/Nav.php:147 src/Content/Nav.php:213 src/Model/Profile.php:952 +#: src/Model/Profile.php:955 msgid "Contacts" msgstr "" @@ -1166,7 +1167,7 @@ msgstr "" msgid "activity" msgstr "" -#: include/text.php:1720 src/Object/Post.php:428 src/Object/Post.php:440 +#: include/text.php:1720 src/Object/Post.php:420 src/Object/Post.php:432 msgid "comment" msgid_plural "comments" msgstr[0] "" @@ -1176,7 +1177,7 @@ msgstr[1] "" msgid "post" msgstr "" -#: include/text.php:1881 +#: include/text.php:1878 msgid "Item filed" msgstr "" @@ -1208,7 +1209,7 @@ msgstr "" msgid "No" msgstr "" -#: mod/apps.php:14 index.php:265 +#: mod/apps.php:14 index.php:275 msgid "You must be logged in to use addons. " msgstr "" @@ -1248,13 +1249,13 @@ msgid "" msgstr "" #: mod/fbrowser.php:34 view/theme/frio/theme.php:261 src/Content/Nav.php:102 -#: src/Model/Profile.php:898 +#: src/Model/Profile.php:899 msgid "Photos" msgstr "" #: mod/fbrowser.php:43 mod/fbrowser.php:68 mod/photos.php:190 -#: mod/photos.php:1043 mod/photos.php:1130 mod/photos.php:1147 -#: mod/photos.php:1644 mod/photos.php:1658 src/Model/Photo.php:244 +#: mod/photos.php:1044 mod/photos.php:1131 mod/photos.php:1148 +#: mod/photos.php:1610 mod/photos.php:1624 src/Model/Photo.php:244 #: src/Model/Photo.php:253 msgid "Contact Photos" msgstr "" @@ -1345,8 +1346,8 @@ msgstr "" #: mod/newmember.php:24 mod/profperm.php:113 mod/contacts.php:670 #: mod/contacts.php:862 view/theme/frio/theme.php:260 src/Content/Nav.php:101 -#: src/Model/Profile.php:724 src/Model/Profile.php:857 -#: src/Model/Profile.php:890 +#: src/Model/Profile.php:725 src/Model/Profile.php:858 +#: src/Model/Profile.php:891 msgid "Profile" msgstr "" @@ -1561,12 +1562,12 @@ msgstr "" #: mod/manage.php:184 mod/localtime.php:56 mod/fsuggest.php:114 #: mod/invite.php:154 mod/crepair.php:148 mod/install.php:198 #: mod/install.php:237 mod/events.php:531 mod/profiles.php:579 -#: mod/contacts.php:609 mod/message.php:246 mod/message.php:410 -#: mod/photos.php:1061 mod/photos.php:1141 mod/photos.php:1434 -#: mod/photos.php:1480 mod/photos.php:1519 mod/photos.php:1588 mod/poke.php:196 -#: view/theme/duepuntozero/config.php:71 view/theme/frio/config.php:118 -#: view/theme/quattro/config.php:73 view/theme/vier/config.php:119 -#: src/Object/Post.php:795 +#: mod/contacts.php:609 mod/poke.php:196 mod/message.php:248 +#: mod/message.php:412 mod/photos.php:1062 mod/photos.php:1142 +#: mod/photos.php:1408 mod/photos.php:1454 mod/photos.php:1493 +#: mod/photos.php:1554 view/theme/duepuntozero/config.php:71 +#: view/theme/frio/config.php:118 view/theme/quattro/config.php:73 +#: view/theme/vier/config.php:119 src/Object/Post.php:787 msgid "Submit" msgstr "" @@ -1638,10 +1639,10 @@ msgstr "" msgid "System Notifications" msgstr "" -#: mod/probe.php:13 mod/webfinger.php:16 mod/community.php:27 -#: mod/videos.php:199 mod/dfrn_request.php:601 mod/directory.php:42 -#: mod/display.php:194 mod/photos.php:913 mod/search.php:99 mod/search.php:105 -#: mod/viewcontacts.php:45 +#: mod/probe.php:13 mod/webfinger.php:16 mod/videos.php:199 +#: mod/dfrn_request.php:601 mod/viewcontacts.php:45 mod/community.php:27 +#: mod/directory.php:42 mod/display.php:194 mod/photos.php:914 +#: mod/search.php:99 mod/search.php:105 msgid "Public access denied." msgstr "" @@ -1649,7 +1650,7 @@ msgstr "" msgid "Only logged in users are permitted to perform a probing." msgstr "" -#: mod/profperm.php:28 mod/group.php:83 index.php:435 +#: mod/profperm.php:28 mod/group.php:83 index.php:445 msgid "Permission denied" msgstr "" @@ -1740,7 +1741,7 @@ msgstr "" msgid "No recipient." msgstr "" -#: mod/wallmessage.php:132 mod/message.php:231 +#: mod/wallmessage.php:132 mod/message.php:233 msgid "Send Private Message" msgstr "" @@ -1751,16 +1752,16 @@ msgid "" "your site allow private mail from unknown senders." msgstr "" -#: mod/wallmessage.php:134 mod/message.php:232 mod/message.php:399 +#: mod/wallmessage.php:134 mod/message.php:234 mod/message.php:401 msgid "To:" msgstr "" -#: mod/wallmessage.php:135 mod/message.php:236 mod/message.php:401 +#: mod/wallmessage.php:135 mod/message.php:238 mod/message.php:403 msgid "Subject:" msgstr "" -#: mod/wallmessage.php:141 mod/invite.php:149 mod/message.php:240 -#: mod/message.php:404 +#: mod/wallmessage.php:141 mod/invite.php:149 mod/message.php:242 +#: mod/message.php:406 msgid "Your message:" msgstr "" @@ -1773,7 +1774,7 @@ msgid "The post was created" msgstr "" #: mod/fsuggest.php:30 mod/fsuggest.php:96 mod/crepair.php:110 -#: mod/dfrn_confirm.php:129 mod/redir.php:28 mod/redir.php:92 +#: mod/dfrn_confirm.php:129 mod/redir.php:28 mod/redir.php:126 msgid "Contact not found." msgstr "" @@ -1796,7 +1797,7 @@ msgstr "" #: mod/cal.php:274 mod/events.php:391 view/theme/frio/theme.php:263 #: view/theme/frio/theme.php:267 src/Content/Nav.php:104 -#: src/Content/Nav.php:170 src/Model/Profile.php:918 src/Model/Profile.php:929 +#: src/Content/Nav.php:170 src/Model/Profile.php:919 src/Model/Profile.php:930 msgid "Events" msgstr "" @@ -1956,7 +1957,7 @@ msgstr "" msgid "failed" msgstr "" -#: mod/ostatus_subscribe.php:83 src/Object/Post.php:278 +#: mod/ostatus_subscribe.php:83 src/Object/Post.php:270 msgid "ignored" msgstr "" @@ -1980,13 +1981,13 @@ msgstr "" msgid "Unable to process image" msgstr "" -#: mod/profile_photo.php:153 mod/photos.php:744 mod/photos.php:747 -#: mod/photos.php:776 mod/wall_upload.php:186 +#: mod/profile_photo.php:153 mod/wall_upload.php:186 mod/photos.php:745 +#: mod/photos.php:748 mod/photos.php:777 #, php-format msgid "Image exceeds size limit of %s" msgstr "" -#: mod/profile_photo.php:162 mod/photos.php:799 mod/wall_upload.php:200 +#: mod/profile_photo.php:162 mod/wall_upload.php:200 mod/photos.php:800 msgid "Unable to process image." msgstr "" @@ -2026,7 +2027,7 @@ msgstr "" msgid "Image uploaded successfully." msgstr "" -#: mod/profile_photo.php:307 mod/photos.php:828 mod/wall_upload.php:239 +#: mod/profile_photo.php:307 mod/wall_upload.php:239 mod/photos.php:829 msgid "Image upload failed." msgstr "" @@ -2077,12 +2078,12 @@ msgid "Profile URL" msgstr "" #: mod/follow.php:174 mod/contacts.php:665 mod/notifications.php:246 -#: src/Model/Profile.php:788 +#: src/Model/Profile.php:789 msgid "Tags:" msgstr "" #: mod/follow.php:186 mod/contacts.php:857 mod/unfollow.php:132 -#: src/Model/Profile.php:885 +#: src/Model/Profile.php:886 msgid "Status Messages and Posts" msgstr "" @@ -2545,11 +2546,6 @@ msgstr "" msgid "New photo from this URL" msgstr "" -#: mod/dfrn_poll.php:123 mod/dfrn_poll.php:539 -#, php-format -msgid "%1$s welcomes %2$s" -msgstr "" - #: mod/help.php:48 msgid "Help:" msgstr "" @@ -2559,11 +2555,11 @@ msgid "Help" msgstr "" #: mod/help.php:60 mod/fetch.php:19 mod/fetch.php:45 mod/fetch.php:52 -#: index.php:312 +#: index.php:322 msgid "Not Found" msgstr "" -#: mod/help.php:63 index.php:317 +#: mod/help.php:63 index.php:327 msgid "Page not found." msgstr "" @@ -2699,44 +2695,6 @@ msgid "" "administrator email. This will allow you to enter the site admin panel." msgstr "" -#: mod/community.php:34 mod/viewsrc.php:13 -msgid "Access denied." -msgstr "" - -#: mod/community.php:51 -msgid "Community option not available." -msgstr "" - -#: mod/community.php:68 -msgid "Not available." -msgstr "" - -#: mod/community.php:81 -msgid "Local Community" -msgstr "" - -#: mod/community.php:84 -msgid "Posts from local users on this server" -msgstr "" - -#: mod/community.php:92 -msgid "Global Community" -msgstr "" - -#: mod/community.php:95 -msgid "Posts from users of the whole federated network" -msgstr "" - -#: mod/community.php:141 mod/search.php:229 -msgid "No results." -msgstr "" - -#: mod/community.php:185 -msgid "" -"This community stream shows all public posts received by this node. They may " -"not reflect the opinions of this node’s users." -msgstr "" - #: mod/dfrn_confirm.php:74 mod/profiles.php:39 mod/profiles.php:149 #: mod/profiles.php:196 mod/profiles.php:525 msgid "Profile not found." @@ -2860,9 +2818,9 @@ msgstr "" msgid "Description:" msgstr "" -#: mod/events.php:519 mod/contacts.php:659 mod/directory.php:148 -#: mod/notifications.php:242 src/Model/Event.php:60 src/Model/Event.php:85 -#: src/Model/Event.php:421 src/Model/Event.php:895 src/Model/Profile.php:413 +#: mod/events.php:519 mod/contacts.php:659 mod/notifications.php:242 +#: mod/directory.php:149 src/Model/Event.php:60 src/Model/Event.php:85 +#: src/Model/Event.php:421 src/Model/Event.php:895 src/Model/Profile.php:414 msgid "Location:" msgstr "" @@ -2874,16 +2832,16 @@ msgstr "" msgid "Share this event" msgstr "" -#: mod/events.php:532 src/Model/Profile.php:858 +#: mod/events.php:532 src/Model/Profile.php:859 msgid "Basic" msgstr "" #: mod/events.php:533 mod/admin.php:1362 mod/contacts.php:894 -#: src/Model/Profile.php:859 +#: src/Model/Profile.php:860 msgid "Advanced" msgstr "" -#: mod/events.php:534 mod/photos.php:1079 mod/photos.php:1430 +#: mod/events.php:534 mod/photos.php:1080 mod/photos.php:1404 #: src/Core/ACL.php:318 msgid "Permissions" msgstr "" @@ -3077,7 +3035,7 @@ msgstr "" msgid "View this profile" msgstr "" -#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:389 +#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:390 msgid "Edit visibility" msgstr "" @@ -3134,7 +3092,7 @@ msgstr "" msgid "♥ Marital Status:" msgstr "" -#: mod/profiles.php:601 src/Model/Profile.php:776 +#: mod/profiles.php:601 src/Model/Profile.php:777 msgid "Sexual Preference:" msgstr "" @@ -3214,11 +3172,11 @@ msgstr "" msgid "Homepage URL:" msgstr "" -#: mod/profiles.php:628 src/Model/Profile.php:784 +#: mod/profiles.php:628 src/Model/Profile.php:785 msgid "Hometown:" msgstr "" -#: mod/profiles.php:629 src/Model/Profile.php:792 +#: mod/profiles.php:629 src/Model/Profile.php:793 msgid "Political Views:" msgstr "" @@ -3242,11 +3200,11 @@ msgstr "" msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: mod/profiles.php:633 src/Model/Profile.php:808 +#: mod/profiles.php:633 src/Model/Profile.php:809 msgid "Likes:" msgstr "" -#: mod/profiles.php:634 src/Model/Profile.php:812 +#: mod/profiles.php:634 src/Model/Profile.php:813 msgid "Dislikes:" msgstr "" @@ -3286,11 +3244,11 @@ msgstr "" msgid "Contact information and Social Networks" msgstr "" -#: mod/profiles.php:674 src/Model/Profile.php:385 +#: mod/profiles.php:674 src/Model/Profile.php:386 msgid "Profile Image" msgstr "" -#: mod/profiles.php:676 src/Model/Profile.php:388 +#: mod/profiles.php:676 src/Model/Profile.php:389 msgid "visible to everybody" msgstr "" @@ -3298,11 +3256,11 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: mod/profiles.php:684 src/Model/Profile.php:375 src/Model/Profile.php:397 +#: mod/profiles.php:684 src/Model/Profile.php:376 src/Model/Profile.php:398 msgid "Change profile photo" msgstr "" -#: mod/profiles.php:685 src/Model/Profile.php:376 +#: mod/profiles.php:685 src/Model/Profile.php:377 msgid "Create New Profile" msgstr "" @@ -4053,7 +4011,7 @@ msgstr "" msgid "Basic Settings" msgstr "" -#: mod/settings.php:1198 src/Model/Profile.php:732 +#: mod/settings.php:1198 src/Model/Profile.php:733 msgid "Full Name:" msgstr "" @@ -4103,11 +4061,11 @@ msgstr "" msgid "(click to open/close)" msgstr "" -#: mod/settings.php:1218 mod/photos.php:1087 mod/photos.php:1438 +#: mod/settings.php:1218 mod/photos.php:1088 mod/photos.php:1412 msgid "Show to Groups" msgstr "" -#: mod/settings.php:1219 mod/photos.php:1088 mod/photos.php:1439 +#: mod/settings.php:1219 mod/photos.php:1089 mod/photos.php:1413 msgid "Show to Contacts" msgstr "" @@ -4227,11 +4185,11 @@ msgstr "" msgid "No videos selected" msgstr "" -#: mod/videos.php:309 mod/photos.php:1017 +#: mod/videos.php:309 mod/photos.php:1018 msgid "Access to this item is restricted." msgstr "" -#: mod/videos.php:387 mod/photos.php:1690 +#: mod/videos.php:387 mod/photos.php:1656 msgid "View Album" msgstr "" @@ -6004,11 +5962,11 @@ msgid "No friends to display." msgstr "" #: mod/allfriends.php:90 mod/dirfind.php:214 mod/match.php:105 -#: mod/suggest.php:101 src/Content/Widget.php:37 src/Model/Profile.php:293 +#: mod/suggest.php:101 src/Content/Widget.php:37 src/Model/Profile.php:294 msgid "Connect" msgstr "" -#: mod/contacts.php:71 mod/notifications.php:255 src/Model/Profile.php:516 +#: mod/contacts.php:71 mod/notifications.php:255 src/Model/Profile.php:517 msgid "Network:" msgstr "" @@ -6249,12 +6207,12 @@ msgid "" "when \"Fetch information and keywords\" is selected" msgstr "" -#: mod/contacts.php:661 src/Model/Profile.php:420 +#: mod/contacts.php:661 src/Model/Profile.php:421 msgid "XMPP:" msgstr "" -#: mod/contacts.php:663 mod/directory.php:154 mod/notifications.php:244 -#: src/Model/Profile.php:419 src/Model/Profile.php:800 +#: mod/contacts.php:663 mod/notifications.php:244 mod/directory.php:155 +#: src/Model/Profile.php:420 src/Model/Profile.php:801 msgid "About:" msgstr "" @@ -6263,7 +6221,7 @@ msgid "Actions" msgstr "" #: mod/contacts.php:668 mod/contacts.php:854 view/theme/frio/theme.php:259 -#: src/Content/Nav.php:100 src/Model/Profile.php:882 +#: src/Content/Nav.php:100 src/Model/Profile.php:883 msgid "Status" msgstr "" @@ -6327,12 +6285,12 @@ msgstr "" msgid "Search your contacts" msgstr "" -#: mod/contacts.php:818 mod/search.php:237 +#: mod/contacts.php:818 mod/search.php:242 #, php-format msgid "Results for: %s" msgstr "" -#: mod/contacts.php:819 mod/directory.php:209 view/theme/vier/theme.php:203 +#: mod/contacts.php:819 mod/directory.php:210 view/theme/vier/theme.php:203 #: src/Content/Widget.php:63 msgid "Find" msgstr "" @@ -6349,7 +6307,7 @@ msgstr "" msgid "Batch Actions" msgstr "" -#: mod/contacts.php:865 src/Model/Profile.php:893 +#: mod/contacts.php:865 src/Model/Profile.php:894 msgid "Profile Details" msgstr "" @@ -6377,8 +6335,8 @@ msgstr "" msgid "you are a fan of" msgstr "" -#: mod/contacts.php:952 mod/photos.php:1477 mod/photos.php:1516 -#: mod/photos.php:1585 src/Object/Post.php:792 +#: mod/contacts.php:952 mod/photos.php:1451 mod/photos.php:1490 +#: mod/photos.php:1551 src/Object/Post.php:784 msgid "This is you" msgstr "" @@ -6547,40 +6505,6 @@ msgid "" "bar." msgstr "" -#: mod/directory.php:151 mod/notifications.php:248 src/Model/Profile.php:416 -#: src/Model/Profile.php:739 -msgid "Gender:" -msgstr "" - -#: mod/directory.php:152 src/Model/Profile.php:417 src/Model/Profile.php:763 -msgid "Status:" -msgstr "" - -#: mod/directory.php:153 src/Model/Profile.php:418 src/Model/Profile.php:780 -msgid "Homepage:" -msgstr "" - -#: mod/directory.php:202 view/theme/vier/theme.php:208 -#: src/Content/Widget.php:68 -msgid "Global Directory" -msgstr "" - -#: mod/directory.php:204 -msgid "Find on this site" -msgstr "" - -#: mod/directory.php:206 -msgid "Results for:" -msgstr "" - -#: mod/directory.php:208 -msgid "Site Directory" -msgstr "" - -#: mod/directory.php:213 -msgid "No entries (some entries may be hidden)." -msgstr "" - #: mod/dirfind.php:48 #, php-format msgid "People Search - %s" @@ -6611,41 +6535,6 @@ msgstr "" msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: mod/item.php:114 -msgid "Unable to locate original post." -msgstr "" - -#: mod/item.php:274 -msgid "Empty post discarded." -msgstr "" - -#: mod/item.php:471 mod/wall_upload.php:231 src/Object/Image.php:953 -#: src/Object/Image.php:969 src/Object/Image.php:977 src/Object/Image.php:1002 -msgid "Wall Photos" -msgstr "" - -#: mod/item.php:804 -#, php-format -msgid "" -"This message was sent to you by %s, a member of the Friendica social network." -msgstr "" - -#: mod/item.php:806 -#, php-format -msgid "You may visit them online at %s" -msgstr "" - -#: mod/item.php:807 -msgid "" -"Please contact the sender by replying to this post if you do not wish to " -"receive these messages." -msgstr "" - -#: mod/item.php:811 -#, php-format -msgid "%s posted an update." -msgstr "" - #: mod/match.php:48 msgid "No keywords to match. Please add keywords to your default profile." msgstr "" @@ -6658,174 +6547,6 @@ msgstr "" msgid "Profile Match" msgstr "" -#: mod/message.php:30 src/Content/Nav.php:199 -msgid "New Message" -msgstr "" - -#: mod/message.php:77 -msgid "Unable to locate contact information." -msgstr "" - -#: mod/message.php:112 view/theme/frio/theme.php:268 src/Content/Nav.php:196 -msgid "Messages" -msgstr "" - -#: mod/message.php:136 -msgid "Do you really want to delete this message?" -msgstr "" - -#: mod/message.php:152 -msgid "Message deleted." -msgstr "" - -#: mod/message.php:166 -msgid "Conversation removed." -msgstr "" - -#: mod/message.php:272 -msgid "No messages." -msgstr "" - -#: mod/message.php:311 -msgid "Message not available." -msgstr "" - -#: mod/message.php:375 -msgid "Delete message" -msgstr "" - -#: mod/message.php:377 mod/message.php:478 -msgid "D, d M Y - g:i A" -msgstr "" - -#: mod/message.php:392 mod/message.php:475 -msgid "Delete conversation" -msgstr "" - -#: mod/message.php:394 -msgid "" -"No secure communications available. You may be able to " -"respond from the sender's profile page." -msgstr "" - -#: mod/message.php:398 -msgid "Send Reply" -msgstr "" - -#: mod/message.php:449 -#, php-format -msgid "Unknown sender - %s" -msgstr "" - -#: mod/message.php:451 -#, php-format -msgid "You and %s" -msgstr "" - -#: mod/message.php:453 -#, php-format -msgid "%s and You" -msgstr "" - -#: mod/message.php:481 -#, php-format -msgid "%d message" -msgid_plural "%d messages" -msgstr[0] "" -msgstr[1] "" - -#: mod/network.php:192 mod/search.php:38 -msgid "Remove term" -msgstr "" - -#: mod/network.php:199 mod/search.php:47 src/Content/Feature.php:100 -msgid "Saved Searches" -msgstr "" - -#: mod/network.php:200 src/Model/Group.php:413 -msgid "add" -msgstr "" - -#: mod/network.php:544 -#, php-format -msgid "" -"Warning: This group contains %s member from a network that doesn't allow non " -"public messages." -msgid_plural "" -"Warning: This group contains %s members from a network that doesn't allow " -"non public messages." -msgstr[0] "" -msgstr[1] "" - -#: mod/network.php:547 -msgid "Messages in this group won't be send to these receivers." -msgstr "" - -#: mod/network.php:615 -msgid "No such group" -msgstr "" - -#: mod/network.php:640 -#, php-format -msgid "Group: %s" -msgstr "" - -#: mod/network.php:666 -msgid "Private messages to this person are at risk of public disclosure." -msgstr "" - -#: mod/network.php:669 -msgid "Invalid contact." -msgstr "" - -#: mod/network.php:940 -msgid "Commented Order" -msgstr "" - -#: mod/network.php:943 -msgid "Sort by Comment Date" -msgstr "" - -#: mod/network.php:948 -msgid "Posted Order" -msgstr "" - -#: mod/network.php:951 -msgid "Sort by Post Date" -msgstr "" - -#: mod/network.php:962 -msgid "Posts that mention or involve you" -msgstr "" - -#: mod/network.php:970 -msgid "New" -msgstr "" - -#: mod/network.php:973 -msgid "Activity Stream - by date" -msgstr "" - -#: mod/network.php:981 -msgid "Shared Links" -msgstr "" - -#: mod/network.php:984 -msgid "Interesting Links" -msgstr "" - -#: mod/network.php:992 -msgid "Starred" -msgstr "" - -#: mod/network.php:995 -msgid "Favourite Posts" -msgstr "" - -#: mod/notes.php:41 src/Model/Profile.php:940 -msgid "Personal Notes" -msgstr "" - #: mod/notifications.php:33 msgid "Invalid request identifier." msgstr "" @@ -6915,6 +6636,11 @@ msgstr "" msgid "Subscriber" msgstr "" +#: mod/notifications.php:248 mod/directory.php:152 src/Model/Profile.php:417 +#: src/Model/Profile.php:740 +msgid "Gender:" +msgstr "" + #: mod/notifications.php:269 msgid "No introductions." msgstr "" @@ -6932,198 +6658,6 @@ msgstr "" msgid "No more %s notifications." msgstr "" -#: mod/photos.php:109 src/Model/Profile.php:901 -msgid "Photo Albums" -msgstr "" - -#: mod/photos.php:110 mod/photos.php:1699 -msgid "Recent Photos" -msgstr "" - -#: mod/photos.php:113 mod/photos.php:1191 mod/photos.php:1701 -msgid "Upload New Photos" -msgstr "" - -#: mod/photos.php:182 -msgid "Contact information unavailable" -msgstr "" - -#: mod/photos.php:200 -msgid "Album not found." -msgstr "" - -#: mod/photos.php:230 mod/photos.php:241 mod/photos.php:1142 -msgid "Delete Album" -msgstr "" - -#: mod/photos.php:239 -msgid "Do you really want to delete this photo album and all its photos?" -msgstr "" - -#: mod/photos.php:299 mod/photos.php:310 mod/photos.php:1435 -msgid "Delete Photo" -msgstr "" - -#: mod/photos.php:308 -msgid "Do you really want to delete this photo?" -msgstr "" - -#: mod/photos.php:648 -msgid "a photo" -msgstr "" - -#: mod/photos.php:648 -#, php-format -msgid "%1$s was tagged in %2$s by %3$s" -msgstr "" - -#: mod/photos.php:750 -msgid "Image upload didn't complete, please try again" -msgstr "" - -#: mod/photos.php:753 -msgid "Image file is missing" -msgstr "" - -#: mod/photos.php:758 -msgid "" -"Server can't accept new file upload at this time, please contact your " -"administrator" -msgstr "" - -#: mod/photos.php:784 -msgid "Image file is empty." -msgstr "" - -#: mod/photos.php:921 -msgid "No photos selected" -msgstr "" - -#: mod/photos.php:1071 -msgid "Upload Photos" -msgstr "" - -#: mod/photos.php:1075 mod/photos.php:1137 -msgid "New album name: " -msgstr "" - -#: mod/photos.php:1076 -msgid "or existing album name: " -msgstr "" - -#: mod/photos.php:1077 -msgid "Do not show a status post for this upload" -msgstr "" - -#: mod/photos.php:1148 -msgid "Edit Album" -msgstr "" - -#: mod/photos.php:1153 -msgid "Show Newest First" -msgstr "" - -#: mod/photos.php:1155 -msgid "Show Oldest First" -msgstr "" - -#: mod/photos.php:1176 mod/photos.php:1684 -msgid "View Photo" -msgstr "" - -#: mod/photos.php:1217 -msgid "Permission denied. Access to this item may be restricted." -msgstr "" - -#: mod/photos.php:1219 -msgid "Photo not available" -msgstr "" - -#: mod/photos.php:1287 -msgid "View photo" -msgstr "" - -#: mod/photos.php:1287 -msgid "Edit photo" -msgstr "" - -#: mod/photos.php:1288 -msgid "Use as profile photo" -msgstr "" - -#: mod/photos.php:1294 src/Object/Post.php:148 -msgid "Private Message" -msgstr "" - -#: mod/photos.php:1314 -msgid "View Full Size" -msgstr "" - -#: mod/photos.php:1403 -msgid "Tags: " -msgstr "" - -#: mod/photos.php:1406 -msgid "[Remove any tag]" -msgstr "" - -#: mod/photos.php:1421 -msgid "New album name" -msgstr "" - -#: mod/photos.php:1422 -msgid "Caption" -msgstr "" - -#: mod/photos.php:1423 -msgid "Add a Tag" -msgstr "" - -#: mod/photos.php:1423 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "" - -#: mod/photos.php:1424 -msgid "Do not rotate" -msgstr "" - -#: mod/photos.php:1425 -msgid "Rotate CW (right)" -msgstr "" - -#: mod/photos.php:1426 -msgid "Rotate CCW (left)" -msgstr "" - -#: mod/photos.php:1460 src/Object/Post.php:295 -msgid "I like this (toggle)" -msgstr "" - -#: mod/photos.php:1461 src/Object/Post.php:296 -msgid "I don't like this (toggle)" -msgstr "" - -#: mod/photos.php:1479 mod/photos.php:1518 mod/photos.php:1587 -#: src/Object/Post.php:398 src/Object/Post.php:794 -msgid "Comment" -msgstr "" - -#: mod/photos.php:1619 -msgid "Map" -msgstr "" - -#: mod/ping.php:287 -msgid "{0} wants to be your friend" -msgstr "" - -#: mod/ping.php:302 -msgid "{0} sent you a message" -msgstr "" - -#: mod/ping.php:317 -msgid "{0} requested registration" -msgstr "" - #: mod/poke.php:189 msgid "Poke/Prod" msgstr "" @@ -7144,29 +6678,6 @@ msgstr "" msgid "Make this post private" msgstr "" -#: mod/profile.php:37 src/Model/Profile.php:118 -msgid "Requested profile is not available." -msgstr "" - -#: mod/profile.php:78 mod/profile.php:81 src/Protocol/OStatus.php:1251 -#, php-format -msgid "%s's timeline" -msgstr "" - -#: mod/profile.php:79 src/Protocol/OStatus.php:1252 -#, php-format -msgid "%s's posts" -msgstr "" - -#: mod/profile.php:80 src/Protocol/OStatus.php:1253 -#, php-format -msgid "%s's comments" -msgstr "" - -#: mod/profile.php:195 -msgid "Tips for New Members" -msgstr "" - #: mod/register.php:100 msgid "" "Registration successful. Please check your email for further instructions." @@ -7260,28 +6771,6 @@ msgstr "" msgid "Import your profile to this friendica instance" msgstr "" -#: mod/search.php:106 -msgid "Only logged in users are permitted to perform a search." -msgstr "" - -#: mod/search.php:130 -msgid "Too Many Requests" -msgstr "" - -#: mod/search.php:131 -msgid "Only one search per minute is permitted for not logged in users." -msgstr "" - -#: mod/search.php:235 -#, php-format -msgid "Items tagged with: %s" -msgstr "" - -#: mod/subthread.php:113 -#, php-format -msgid "%1$s is following %2$s's %3$s" -msgstr "" - #: mod/suggest.php:36 msgid "Do you really want to delete this suggestion?" msgstr "" @@ -7337,6 +6826,518 @@ msgstr "" msgid "No contacts." msgstr "" +#: mod/viewsrc.php:13 mod/community.php:34 +msgid "Access denied." +msgstr "" + +#: mod/wall_upload.php:231 mod/item.php:471 src/Object/Image.php:953 +#: src/Object/Image.php:969 src/Object/Image.php:977 src/Object/Image.php:1002 +msgid "Wall Photos" +msgstr "" + +#: mod/community.php:51 +msgid "Community option not available." +msgstr "" + +#: mod/community.php:68 +msgid "Not available." +msgstr "" + +#: mod/community.php:81 +msgid "Local Community" +msgstr "" + +#: mod/community.php:84 +msgid "Posts from local users on this server" +msgstr "" + +#: mod/community.php:92 +msgid "Global Community" +msgstr "" + +#: mod/community.php:95 +msgid "Posts from users of the whole federated network" +msgstr "" + +#: mod/community.php:141 mod/search.php:234 +msgid "No results." +msgstr "" + +#: mod/community.php:185 +msgid "" +"This community stream shows all public posts received by this node. They may " +"not reflect the opinions of this node’s users." +msgstr "" + +#: mod/dfrn_poll.php:124 mod/dfrn_poll.php:541 +#, php-format +msgid "%1$s welcomes %2$s" +msgstr "" + +#: mod/directory.php:153 src/Model/Profile.php:418 src/Model/Profile.php:764 +msgid "Status:" +msgstr "" + +#: mod/directory.php:154 src/Model/Profile.php:419 src/Model/Profile.php:781 +msgid "Homepage:" +msgstr "" + +#: mod/directory.php:203 view/theme/vier/theme.php:208 +#: src/Content/Widget.php:68 +msgid "Global Directory" +msgstr "" + +#: mod/directory.php:205 +msgid "Find on this site" +msgstr "" + +#: mod/directory.php:207 +msgid "Results for:" +msgstr "" + +#: mod/directory.php:209 +msgid "Site Directory" +msgstr "" + +#: mod/directory.php:214 +msgid "No entries (some entries may be hidden)." +msgstr "" + +#: mod/item.php:114 +msgid "Unable to locate original post." +msgstr "" + +#: mod/item.php:274 +msgid "Empty post discarded." +msgstr "" + +#: mod/item.php:804 +#, php-format +msgid "" +"This message was sent to you by %s, a member of the Friendica social network." +msgstr "" + +#: mod/item.php:806 +#, php-format +msgid "You may visit them online at %s" +msgstr "" + +#: mod/item.php:807 +msgid "" +"Please contact the sender by replying to this post if you do not wish to " +"receive these messages." +msgstr "" + +#: mod/item.php:811 +#, php-format +msgid "%s posted an update." +msgstr "" + +#: mod/message.php:30 src/Content/Nav.php:199 +msgid "New Message" +msgstr "" + +#: mod/message.php:77 +msgid "Unable to locate contact information." +msgstr "" + +#: mod/message.php:112 view/theme/frio/theme.php:268 src/Content/Nav.php:196 +msgid "Messages" +msgstr "" + +#: mod/message.php:136 +msgid "Do you really want to delete this message?" +msgstr "" + +#: mod/message.php:153 +msgid "Message deleted." +msgstr "" + +#: mod/message.php:168 +msgid "Conversation removed." +msgstr "" + +#: mod/message.php:274 +msgid "No messages." +msgstr "" + +#: mod/message.php:313 +msgid "Message not available." +msgstr "" + +#: mod/message.php:377 +msgid "Delete message" +msgstr "" + +#: mod/message.php:379 mod/message.php:480 +msgid "D, d M Y - g:i A" +msgstr "" + +#: mod/message.php:394 mod/message.php:477 +msgid "Delete conversation" +msgstr "" + +#: mod/message.php:396 +msgid "" +"No secure communications available. You may be able to " +"respond from the sender's profile page." +msgstr "" + +#: mod/message.php:400 +msgid "Send Reply" +msgstr "" + +#: mod/message.php:451 +#, php-format +msgid "Unknown sender - %s" +msgstr "" + +#: mod/message.php:453 +#, php-format +msgid "You and %s" +msgstr "" + +#: mod/message.php:455 +#, php-format +msgid "%s and You" +msgstr "" + +#: mod/message.php:483 +#, php-format +msgid "%d message" +msgid_plural "%d messages" +msgstr[0] "" +msgstr[1] "" + +#: mod/network.php:192 mod/search.php:38 +msgid "Remove term" +msgstr "" + +#: mod/network.php:199 mod/search.php:47 src/Content/Feature.php:100 +msgid "Saved Searches" +msgstr "" + +#: mod/network.php:200 src/Model/Group.php:413 +msgid "add" +msgstr "" + +#: mod/network.php:544 +#, php-format +msgid "" +"Warning: This group contains %s member from a network that doesn't allow non " +"public messages." +msgid_plural "" +"Warning: This group contains %s members from a network that doesn't allow " +"non public messages." +msgstr[0] "" +msgstr[1] "" + +#: mod/network.php:547 +msgid "Messages in this group won't be send to these receivers." +msgstr "" + +#: mod/network.php:615 +msgid "No such group" +msgstr "" + +#: mod/network.php:640 +#, php-format +msgid "Group: %s" +msgstr "" + +#: mod/network.php:666 +msgid "Private messages to this person are at risk of public disclosure." +msgstr "" + +#: mod/network.php:669 +msgid "Invalid contact." +msgstr "" + +#: mod/network.php:940 +msgid "Commented Order" +msgstr "" + +#: mod/network.php:943 +msgid "Sort by Comment Date" +msgstr "" + +#: mod/network.php:948 +msgid "Posted Order" +msgstr "" + +#: mod/network.php:951 +msgid "Sort by Post Date" +msgstr "" + +#: mod/network.php:962 +msgid "Posts that mention or involve you" +msgstr "" + +#: mod/network.php:970 +msgid "New" +msgstr "" + +#: mod/network.php:973 +msgid "Activity Stream - by date" +msgstr "" + +#: mod/network.php:981 +msgid "Shared Links" +msgstr "" + +#: mod/network.php:984 +msgid "Interesting Links" +msgstr "" + +#: mod/network.php:992 +msgid "Starred" +msgstr "" + +#: mod/network.php:995 +msgid "Favourite Posts" +msgstr "" + +#: mod/notes.php:41 src/Model/Profile.php:941 +msgid "Personal Notes" +msgstr "" + +#: mod/photos.php:109 src/Model/Profile.php:902 +msgid "Photo Albums" +msgstr "" + +#: mod/photos.php:110 mod/photos.php:1665 +msgid "Recent Photos" +msgstr "" + +#: mod/photos.php:113 mod/photos.php:1192 mod/photos.php:1667 +msgid "Upload New Photos" +msgstr "" + +#: mod/photos.php:182 +msgid "Contact information unavailable" +msgstr "" + +#: mod/photos.php:200 +msgid "Album not found." +msgstr "" + +#: mod/photos.php:230 mod/photos.php:241 mod/photos.php:1143 +msgid "Delete Album" +msgstr "" + +#: mod/photos.php:239 +msgid "Do you really want to delete this photo album and all its photos?" +msgstr "" + +#: mod/photos.php:299 mod/photos.php:310 mod/photos.php:1409 +msgid "Delete Photo" +msgstr "" + +#: mod/photos.php:308 +msgid "Do you really want to delete this photo?" +msgstr "" + +#: mod/photos.php:649 +msgid "a photo" +msgstr "" + +#: mod/photos.php:649 +#, php-format +msgid "%1$s was tagged in %2$s by %3$s" +msgstr "" + +#: mod/photos.php:751 +msgid "Image upload didn't complete, please try again" +msgstr "" + +#: mod/photos.php:754 +msgid "Image file is missing" +msgstr "" + +#: mod/photos.php:759 +msgid "" +"Server can't accept new file upload at this time, please contact your " +"administrator" +msgstr "" + +#: mod/photos.php:785 +msgid "Image file is empty." +msgstr "" + +#: mod/photos.php:922 +msgid "No photos selected" +msgstr "" + +#: mod/photos.php:1072 +msgid "Upload Photos" +msgstr "" + +#: mod/photos.php:1076 mod/photos.php:1138 +msgid "New album name: " +msgstr "" + +#: mod/photos.php:1077 +msgid "or existing album name: " +msgstr "" + +#: mod/photos.php:1078 +msgid "Do not show a status post for this upload" +msgstr "" + +#: mod/photos.php:1149 +msgid "Edit Album" +msgstr "" + +#: mod/photos.php:1154 +msgid "Show Newest First" +msgstr "" + +#: mod/photos.php:1156 +msgid "Show Oldest First" +msgstr "" + +#: mod/photos.php:1177 mod/photos.php:1650 +msgid "View Photo" +msgstr "" + +#: mod/photos.php:1218 +msgid "Permission denied. Access to this item may be restricted." +msgstr "" + +#: mod/photos.php:1220 +msgid "Photo not available" +msgstr "" + +#: mod/photos.php:1289 +msgid "View photo" +msgstr "" + +#: mod/photos.php:1289 +msgid "Edit photo" +msgstr "" + +#: mod/photos.php:1290 +msgid "Use as profile photo" +msgstr "" + +#: mod/photos.php:1296 src/Object/Post.php:148 +msgid "Private Message" +msgstr "" + +#: mod/photos.php:1316 +msgid "View Full Size" +msgstr "" + +#: mod/photos.php:1377 +msgid "Tags: " +msgstr "" + +#: mod/photos.php:1380 +msgid "[Remove any tag]" +msgstr "" + +#: mod/photos.php:1395 +msgid "New album name" +msgstr "" + +#: mod/photos.php:1396 +msgid "Caption" +msgstr "" + +#: mod/photos.php:1397 +msgid "Add a Tag" +msgstr "" + +#: mod/photos.php:1397 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "" + +#: mod/photos.php:1398 +msgid "Do not rotate" +msgstr "" + +#: mod/photos.php:1399 +msgid "Rotate CW (right)" +msgstr "" + +#: mod/photos.php:1400 +msgid "Rotate CCW (left)" +msgstr "" + +#: mod/photos.php:1434 src/Object/Post.php:287 +msgid "I like this (toggle)" +msgstr "" + +#: mod/photos.php:1435 src/Object/Post.php:288 +msgid "I don't like this (toggle)" +msgstr "" + +#: mod/photos.php:1453 mod/photos.php:1492 mod/photos.php:1553 +#: src/Object/Post.php:390 src/Object/Post.php:786 +msgid "Comment" +msgstr "" + +#: mod/photos.php:1585 +msgid "Map" +msgstr "" + +#: mod/ping.php:287 +msgid "{0} wants to be your friend" +msgstr "" + +#: mod/ping.php:302 +msgid "{0} sent you a message" +msgstr "" + +#: mod/ping.php:317 +msgid "{0} requested registration" +msgstr "" + +#: mod/profile.php:37 src/Model/Profile.php:119 +msgid "Requested profile is not available." +msgstr "" + +#: mod/profile.php:78 mod/profile.php:81 src/Protocol/OStatus.php:1251 +#, php-format +msgid "%s's timeline" +msgstr "" + +#: mod/profile.php:79 src/Protocol/OStatus.php:1252 +#, php-format +msgid "%s's posts" +msgstr "" + +#: mod/profile.php:80 src/Protocol/OStatus.php:1253 +#, php-format +msgid "%s's comments" +msgstr "" + +#: mod/profile.php:195 +msgid "Tips for New Members" +msgstr "" + +#: mod/search.php:106 +msgid "Only logged in users are permitted to perform a search." +msgstr "" + +#: mod/search.php:130 +msgid "Too Many Requests" +msgstr "" + +#: mod/search.php:131 +msgid "Only one search per minute is permitted for not logged in users." +msgstr "" + +#: mod/search.php:240 +#, php-format +msgid "Items tagged with: %s" +msgstr "" + +#: mod/subthread.php:113 +#, php-format +msgid "%1$s is following %2$s's %3$s" +msgstr "" + #: view/theme/duepuntozero/config.php:54 src/Model/User.php:512 msgid "default" msgstr "" @@ -7492,7 +7493,7 @@ msgid "Your photos" msgstr "" #: view/theme/frio/theme.php:262 src/Content/Nav.php:103 -#: src/Model/Profile.php:906 src/Model/Profile.php:909 +#: src/Model/Profile.php:907 src/Model/Profile.php:910 msgid "Videos" msgstr "" @@ -7509,7 +7510,7 @@ msgid "Conversations from your friends" msgstr "" #: view/theme/frio/theme.php:267 src/Content/Nav.php:170 -#: src/Model/Profile.php:921 src/Model/Profile.php:932 +#: src/Model/Profile.php:922 src/Model/Profile.php:933 msgid "Events and Calendar" msgstr "" @@ -7988,7 +7989,7 @@ msgstr "" msgid "New Follower" msgstr "" -#: src/Util/Temporal.php:147 src/Model/Profile.php:752 +#: src/Util/Temporal.php:147 src/Model/Profile.php:753 msgid "Birthday:" msgstr "" @@ -8764,7 +8765,7 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: src/Content/Nav.php:210 src/Model/Profile.php:368 +#: src/Content/Nav.php:210 src/Model/Profile.php:369 msgid "Profiles" msgstr "" @@ -8868,89 +8869,6 @@ msgstr "" msgid "Edit groups" msgstr "" -#: src/Model/Contact.php:667 -msgid "Drop Contact" -msgstr "" - -#: src/Model/Contact.php:1118 -msgid "Organisation" -msgstr "" - -#: src/Model/Contact.php:1121 -msgid "News" -msgstr "" - -#: src/Model/Contact.php:1124 -msgid "Forum" -msgstr "" - -#: src/Model/Contact.php:1303 -msgid "Connect URL missing." -msgstr "" - -#: src/Model/Contact.php:1312 -msgid "" -"The contact could not be added. Please check the relevant network " -"credentials in your Settings -> Social Networks page." -msgstr "" - -#: src/Model/Contact.php:1359 -msgid "" -"This site is not configured to allow communications with other networks." -msgstr "" - -#: src/Model/Contact.php:1360 src/Model/Contact.php:1374 -msgid "No compatible communication protocols or feeds were discovered." -msgstr "" - -#: src/Model/Contact.php:1372 -msgid "The profile address specified does not provide adequate information." -msgstr "" - -#: src/Model/Contact.php:1377 -msgid "An author or name was not found." -msgstr "" - -#: src/Model/Contact.php:1380 -msgid "No browser URL could be matched to this address." -msgstr "" - -#: src/Model/Contact.php:1383 -msgid "" -"Unable to match @-style Identity Address with a known protocol or email " -"contact." -msgstr "" - -#: src/Model/Contact.php:1384 -msgid "Use mailto: in front of address to force email check." -msgstr "" - -#: src/Model/Contact.php:1390 -msgid "" -"The profile address specified belongs to a network which has been disabled " -"on this site." -msgstr "" - -#: src/Model/Contact.php:1395 -msgid "" -"Limited profile. This person will be unable to receive direct/personal " -"notifications from you." -msgstr "" - -#: src/Model/Contact.php:1446 -msgid "Unable to retrieve contact information." -msgstr "" - -#: src/Model/Contact.php:1663 src/Protocol/DFRN.php:1503 -#, php-format -msgid "%s's birthday" -msgstr "" - -#: src/Model/Contact.php:1664 src/Protocol/DFRN.php:1504 -#, php-format -msgid "Happy Birthday %s" -msgstr "" - #: src/Model/Event.php:53 src/Model/Event.php:70 src/Model/Event.php:419 #: src/Model/Event.php:877 msgid "Starts:" @@ -9009,139 +8927,6 @@ msgstr "" msgid "Hide map" msgstr "" -#: src/Model/Item.php:2330 -#, php-format -msgid "%1$s is attending %2$s's %3$s" -msgstr "" - -#: src/Model/Item.php:2335 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" -msgstr "" - -#: src/Model/Item.php:2340 -#, php-format -msgid "%1$s may attend %2$s's %3$s" -msgstr "" - -#: src/Model/Profile.php:97 -msgid "Requested account is not available." -msgstr "" - -#: src/Model/Profile.php:164 src/Model/Profile.php:395 -#: src/Model/Profile.php:853 -msgid "Edit profile" -msgstr "" - -#: src/Model/Profile.php:332 -msgid "Atom feed" -msgstr "" - -#: src/Model/Profile.php:368 -msgid "Manage/edit profiles" -msgstr "" - -#: src/Model/Profile.php:546 src/Model/Profile.php:635 -msgid "g A l F d" -msgstr "" - -#: src/Model/Profile.php:547 -msgid "F d" -msgstr "" - -#: src/Model/Profile.php:600 src/Model/Profile.php:697 -msgid "[today]" -msgstr "" - -#: src/Model/Profile.php:611 -msgid "Birthday Reminders" -msgstr "" - -#: src/Model/Profile.php:612 -msgid "Birthdays this week:" -msgstr "" - -#: src/Model/Profile.php:684 -msgid "[No description]" -msgstr "" - -#: src/Model/Profile.php:711 -msgid "Event Reminders" -msgstr "" - -#: src/Model/Profile.php:712 -msgid "Events this week:" -msgstr "" - -#: src/Model/Profile.php:735 -msgid "Member since:" -msgstr "" - -#: src/Model/Profile.php:743 -msgid "j F, Y" -msgstr "" - -#: src/Model/Profile.php:744 -msgid "j F" -msgstr "" - -#: src/Model/Profile.php:759 -msgid "Age:" -msgstr "" - -#: src/Model/Profile.php:772 -#, php-format -msgid "for %1$d %2$s" -msgstr "" - -#: src/Model/Profile.php:796 -msgid "Religion:" -msgstr "" - -#: src/Model/Profile.php:804 -msgid "Hobbies/Interests:" -msgstr "" - -#: src/Model/Profile.php:816 -msgid "Contact information and Social Networks:" -msgstr "" - -#: src/Model/Profile.php:820 -msgid "Musical interests:" -msgstr "" - -#: src/Model/Profile.php:824 -msgid "Books, literature:" -msgstr "" - -#: src/Model/Profile.php:828 -msgid "Television:" -msgstr "" - -#: src/Model/Profile.php:832 -msgid "Film/dance/culture/entertainment:" -msgstr "" - -#: src/Model/Profile.php:836 -msgid "Love/Romance:" -msgstr "" - -#: src/Model/Profile.php:840 -msgid "Work/employment:" -msgstr "" - -#: src/Model/Profile.php:844 -msgid "School/education:" -msgstr "" - -#: src/Model/Profile.php:849 -msgid "Forums:" -msgstr "" - -#: src/Model/Profile.php:943 -msgid "Only You Can See This" -msgstr "" - #: src/Model/User.php:169 msgid "Login failed" msgstr "" @@ -9292,6 +9077,227 @@ msgid "" "\t\t\tThank you and welcome to %2$s." msgstr "" +#: src/Model/Contact.php:667 +msgid "Drop Contact" +msgstr "" + +#: src/Model/Contact.php:1118 +msgid "Organisation" +msgstr "" + +#: src/Model/Contact.php:1121 +msgid "News" +msgstr "" + +#: src/Model/Contact.php:1124 +msgid "Forum" +msgstr "" + +#: src/Model/Contact.php:1303 +msgid "Connect URL missing." +msgstr "" + +#: src/Model/Contact.php:1312 +msgid "" +"The contact could not be added. Please check the relevant network " +"credentials in your Settings -> Social Networks page." +msgstr "" + +#: src/Model/Contact.php:1359 +msgid "" +"This site is not configured to allow communications with other networks." +msgstr "" + +#: src/Model/Contact.php:1360 src/Model/Contact.php:1374 +msgid "No compatible communication protocols or feeds were discovered." +msgstr "" + +#: src/Model/Contact.php:1372 +msgid "The profile address specified does not provide adequate information." +msgstr "" + +#: src/Model/Contact.php:1377 +msgid "An author or name was not found." +msgstr "" + +#: src/Model/Contact.php:1380 +msgid "No browser URL could be matched to this address." +msgstr "" + +#: src/Model/Contact.php:1383 +msgid "" +"Unable to match @-style Identity Address with a known protocol or email " +"contact." +msgstr "" + +#: src/Model/Contact.php:1384 +msgid "Use mailto: in front of address to force email check." +msgstr "" + +#: src/Model/Contact.php:1390 +msgid "" +"The profile address specified belongs to a network which has been disabled " +"on this site." +msgstr "" + +#: src/Model/Contact.php:1395 +msgid "" +"Limited profile. This person will be unable to receive direct/personal " +"notifications from you." +msgstr "" + +#: src/Model/Contact.php:1446 +msgid "Unable to retrieve contact information." +msgstr "" + +#: src/Model/Contact.php:1663 src/Protocol/DFRN.php:1503 +#, php-format +msgid "%s's birthday" +msgstr "" + +#: src/Model/Contact.php:1664 src/Protocol/DFRN.php:1504 +#, php-format +msgid "Happy Birthday %s" +msgstr "" + +#: src/Model/Item.php:2540 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "" + +#: src/Model/Item.php:2545 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" +msgstr "" + +#: src/Model/Item.php:2550 +#, php-format +msgid "%1$s may attend %2$s's %3$s" +msgstr "" + +#: src/Model/Profile.php:98 +msgid "Requested account is not available." +msgstr "" + +#: src/Model/Profile.php:165 src/Model/Profile.php:396 +#: src/Model/Profile.php:854 +msgid "Edit profile" +msgstr "" + +#: src/Model/Profile.php:333 +msgid "Atom feed" +msgstr "" + +#: src/Model/Profile.php:369 +msgid "Manage/edit profiles" +msgstr "" + +#: src/Model/Profile.php:547 src/Model/Profile.php:636 +msgid "g A l F d" +msgstr "" + +#: src/Model/Profile.php:548 +msgid "F d" +msgstr "" + +#: src/Model/Profile.php:601 src/Model/Profile.php:698 +msgid "[today]" +msgstr "" + +#: src/Model/Profile.php:612 +msgid "Birthday Reminders" +msgstr "" + +#: src/Model/Profile.php:613 +msgid "Birthdays this week:" +msgstr "" + +#: src/Model/Profile.php:685 +msgid "[No description]" +msgstr "" + +#: src/Model/Profile.php:712 +msgid "Event Reminders" +msgstr "" + +#: src/Model/Profile.php:713 +msgid "Upcoming events the next 7 days:" +msgstr "" + +#: src/Model/Profile.php:736 +msgid "Member since:" +msgstr "" + +#: src/Model/Profile.php:744 +msgid "j F, Y" +msgstr "" + +#: src/Model/Profile.php:745 +msgid "j F" +msgstr "" + +#: src/Model/Profile.php:760 +msgid "Age:" +msgstr "" + +#: src/Model/Profile.php:773 +#, php-format +msgid "for %1$d %2$s" +msgstr "" + +#: src/Model/Profile.php:797 +msgid "Religion:" +msgstr "" + +#: src/Model/Profile.php:805 +msgid "Hobbies/Interests:" +msgstr "" + +#: src/Model/Profile.php:817 +msgid "Contact information and Social Networks:" +msgstr "" + +#: src/Model/Profile.php:821 +msgid "Musical interests:" +msgstr "" + +#: src/Model/Profile.php:825 +msgid "Books, literature:" +msgstr "" + +#: src/Model/Profile.php:829 +msgid "Television:" +msgstr "" + +#: src/Model/Profile.php:833 +msgid "Film/dance/culture/entertainment:" +msgstr "" + +#: src/Model/Profile.php:837 +msgid "Love/Romance:" +msgstr "" + +#: src/Model/Profile.php:841 +msgid "Work/employment:" +msgstr "" + +#: src/Model/Profile.php:845 +msgid "School/education:" +msgstr "" + +#: src/Model/Profile.php:850 +msgid "Forums:" +msgstr "" + +#: src/Model/Profile.php:944 +msgid "Only You Can See This" +msgstr "" + +#: src/Model/Profile.php:1100 +#, php-format +msgid "OpenWebAuth: %1$s welcomes %2$s" +msgstr "" + #: src/Protocol/Diaspora.php:2511 msgid "Sharing notification from Diaspora network" msgstr "" @@ -9412,118 +9418,118 @@ msgstr "" msgid "save to folder" msgstr "" -#: src/Object/Post.php:234 +#: src/Object/Post.php:226 msgid "I will attend" msgstr "" -#: src/Object/Post.php:234 +#: src/Object/Post.php:226 msgid "I will not attend" msgstr "" -#: src/Object/Post.php:234 +#: src/Object/Post.php:226 msgid "I might attend" msgstr "" -#: src/Object/Post.php:262 +#: src/Object/Post.php:254 msgid "add star" msgstr "" -#: src/Object/Post.php:263 +#: src/Object/Post.php:255 msgid "remove star" msgstr "" -#: src/Object/Post.php:264 +#: src/Object/Post.php:256 msgid "toggle star status" msgstr "" -#: src/Object/Post.php:267 +#: src/Object/Post.php:259 msgid "starred" msgstr "" -#: src/Object/Post.php:273 +#: src/Object/Post.php:265 msgid "ignore thread" msgstr "" -#: src/Object/Post.php:274 +#: src/Object/Post.php:266 msgid "unignore thread" msgstr "" -#: src/Object/Post.php:275 +#: src/Object/Post.php:267 msgid "toggle ignore status" msgstr "" -#: src/Object/Post.php:284 +#: src/Object/Post.php:276 msgid "add tag" msgstr "" -#: src/Object/Post.php:295 +#: src/Object/Post.php:287 msgid "like" msgstr "" -#: src/Object/Post.php:296 +#: src/Object/Post.php:288 msgid "dislike" msgstr "" -#: src/Object/Post.php:299 +#: src/Object/Post.php:291 msgid "Share this" msgstr "" -#: src/Object/Post.php:299 +#: src/Object/Post.php:291 msgid "share" msgstr "" -#: src/Object/Post.php:364 +#: src/Object/Post.php:356 msgid "to" msgstr "" -#: src/Object/Post.php:365 +#: src/Object/Post.php:357 msgid "via" msgstr "" -#: src/Object/Post.php:366 +#: src/Object/Post.php:358 msgid "Wall-to-Wall" msgstr "" -#: src/Object/Post.php:367 +#: src/Object/Post.php:359 msgid "via Wall-To-Wall:" msgstr "" -#: src/Object/Post.php:426 +#: src/Object/Post.php:418 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: src/Object/Post.php:796 +#: src/Object/Post.php:788 msgid "Bold" msgstr "" -#: src/Object/Post.php:797 +#: src/Object/Post.php:789 msgid "Italic" msgstr "" -#: src/Object/Post.php:798 +#: src/Object/Post.php:790 msgid "Underline" msgstr "" -#: src/Object/Post.php:799 +#: src/Object/Post.php:791 msgid "Quote" msgstr "" -#: src/Object/Post.php:800 +#: src/Object/Post.php:792 msgid "Code" msgstr "" -#: src/Object/Post.php:801 +#: src/Object/Post.php:793 msgid "Image" msgstr "" -#: src/Object/Post.php:802 +#: src/Object/Post.php:794 msgid "Link" msgstr "" -#: src/Object/Post.php:803 +#: src/Object/Post.php:795 msgid "Video" msgstr "" @@ -9539,16 +9545,16 @@ msgstr "" msgid "No system theme config value set." msgstr "" -#: index.php:464 -msgid "toggle mobile" -msgstr "" - #: update.php:193 #, php-format msgid "%s: Updating author-id and owner-id in item and thread table. " msgstr "" -#: boot.php:796 +#: boot.php:797 #, php-format msgid "Update %s failed. See error logs." msgstr "" + +#: index.php:474 +msgid "toggle mobile" +msgstr "" From 8045fae706acea930df5960e360b7b6636a9e3d9 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 30 Jun 2018 18:17:28 +0200 Subject: [PATCH 11/25] added documentation of the groupedit_image_limit variable --- doc/htconfig.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/htconfig.md b/doc/htconfig.md index ef5738019..a2ce91d4d 100644 --- a/doc/htconfig.md +++ b/doc/htconfig.md @@ -45,6 +45,7 @@ Example: To set the automatic database cleanup process add this line to your .ht * **dlogfile** - location of the developer log file * **dlogip** - restricts develop log writes to requests originating from this IP address * **frontend_worker_timeout** - Value in minutes after we think that a frontend task was killed by the webserver. Default value is 10. +* **groupedit_image_limit** (Integer) - Number of contacts at which the group editor should switch from display the profile pictures of the contacts to only display the names. Default is 400. This can alternatively be set on a per account basis in the pconfig table. * **hsts** (Boolean) - Enables the sending of HTTP Strict Transport Security headers * **ignore_cache** (Boolean) - For development only. Disables the item cache. * **instances_social_key** - Key to the API of https://instances.social which retrieves data about mastodon servers. See https://instances.social/api/token to get an API key. From 60dcdd0b277f50d2400add4fb02803af2edca2a2 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 30 Jun 2018 21:15:24 +0000 Subject: [PATCH 12/25] Preparation for not storing the file field into the item table. --- src/Model/Item.php | 70 ++++++++++++++++++++++++++++++++-------------- src/Model/Term.php | 17 +++++++++-- 2 files changed, 64 insertions(+), 23 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 2cc9041bf..d1e3f6a66 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -122,6 +122,12 @@ class Item extends BaseObject $row['tag'] = Term::tagTextFromItemId($row['id']); } + /// @todo This is a preparation + // Build the file string out of the term entries + //if (isset($row['id']) && array_key_exists('file', $row)) { + // $row['file'] = Term::fileTextFromItemId($row['id']); + //} + // We can always comment on posts from these networks if (isset($row['writable']) && !empty($row['network']) && in_array($row['network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) { @@ -535,6 +541,12 @@ class Item extends BaseObject $selected[] = 'id'; } + /// @todo This is a preparation + // To be able to fetch the files we need the item id + //if (in_array('file', $selected) && !in_array('id', $selected)) { + // $selected[] = 'id'; + //} + $selection = []; foreach ($fields as $table => $table_fields) { foreach ($table_fields as $field => $select) { @@ -621,6 +633,14 @@ class Item extends BaseObject $tags = ''; } + if (array_key_exists('file', $fields)) { + $files = $fields['file']; + /// @todo This is a preparation + //unset($fields['file']); + } else { + $files = ''; + } + if (!empty($fields)) { $success = dba::update('item', $fields, $condition); @@ -644,8 +664,8 @@ class Item extends BaseObject Term::insertFromTagFieldByItemId($item['id'], $tags); } - if (array_key_exists('file', $fields)) { - Term::insertFromFileFieldByItemId($item['id']); + if (!empty($files)) { + Term::insertFromFileFieldByItemId($item['id'], $files); } self::updateThread($item['id']); @@ -717,7 +737,7 @@ class Item extends BaseObject $fields = ['id', 'uri', 'uid', 'parent', 'parent-uri', 'origin', 'deleted', 'file', 'resource-id', 'event-id', 'attach', 'verb', 'object-type', 'object', 'target', 'contact-id']; - $item = dba::selectFirst('item', $fields, ['id' => $item_id]); + $item = self::selectFirst($fields, ['id' => $item_id]); if (!DBM::is_result($item)) { logger('Item with ID ' . $item_id . " hasn't been found.", LOGGER_DEBUG); return false; @@ -728,7 +748,7 @@ class Item extends BaseObject return false; } - $parent = dba::selectFirst('item', ['origin'], ['id' => $item['parent']]); + $parent = self::selectFirst(['origin'], ['id' => $item['parent']]); if (!DBM::is_result($parent)) { $parent = ['origin' => false]; } @@ -785,7 +805,7 @@ class Item extends BaseObject dba::update('item', $item_fields, ['id' => $item['id']]); Term::insertFromTagFieldByItemId($item['id'], ''); - Term::insertFromFileFieldByItemId($item['id']); + Term::insertFromFileFieldByItemId($item['id'], ''); self::deleteThread($item['id'], $item['parent-uri']); if (!self::exists(["`uri` = ? AND `uid` != 0 AND NOT `deleted`", $item['uri']])) { @@ -808,7 +828,7 @@ class Item extends BaseObject } elseif ($item['uid'] != 0) { // When we delete just our local user copy of an item, we have to set a marker to hide it - $global_item = dba::selectFirst('item', ['id'], ['uri' => $item['uri'], 'uid' => 0, 'deleted' => false]); + $global_item = self::selectFirst(['id'], ['uri' => $item['uri'], 'uid' => 0, 'deleted' => false]); if (DBM::is_result($global_item)) { dba::update('user-item', ['hidden' => true], ['iid' => $global_item['id'], 'uid' => $item['uid']], true); } @@ -832,7 +852,7 @@ class Item extends BaseObject return; } - $i = dba::selectFirst('item', ['id', 'contact-id', 'tag'], ['uri' => $xt->id, 'uid' => $item['uid']]); + $i = self::selectFirst(['id', 'contact-id', 'tag'], ['uri' => $xt->id, 'uid' => $item['uid']]); if (!DBM::is_result($i)) { return; } @@ -1048,7 +1068,7 @@ class Item extends BaseObject $condition = ["`uri` = ? AND `uid` = ? AND `network` IN (?, ?, ?)", trim($item['uri']), $item['uid'], NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS]; - $existing = dba::selectFirst('item', ['id', 'network'], $condition); + $existing = self::selectFirst(['id', 'network'], $condition); if (DBM::is_result($existing)) { // We only log the entries with a different user id than 0. Otherwise we would have too many false positives if ($uid != 0) { @@ -1205,7 +1225,7 @@ class Item extends BaseObject 'wall', 'private', 'forum_mode', 'origin']; $condition = ['uri' => $item['parent-uri'], 'uid' => $item['uid']]; $params = ['order' => ['id' => false]]; - $parent = dba::selectFirst('item', $fields, $condition, $params); + $parent = self::selectFirst($fields, $condition, $params); if (DBM::is_result($parent)) { // is the new message multi-level threaded? @@ -1219,7 +1239,7 @@ class Item extends BaseObject 'parent-uri' => $item['parent-uri'], 'uid' => $item['uid']]; $params = ['order' => ['id' => false]]; - $toplevel_parent = dba::selectFirst('item', $fields, $condition, $params); + $toplevel_parent = self::selectFirst($fields, $condition, $params); if (DBM::is_result($toplevel_parent)) { $parent = $toplevel_parent; @@ -1371,6 +1391,14 @@ class Item extends BaseObject $tags = ''; } + if (array_key_exists('file', $item)) { + $files = $item['file']; + /// @todo This is a preparation + //unset($item['file']); + } else { + $files = ''; + } + // We are doing this outside of the transaction to avoid timing problems self::insertContent($item); @@ -1478,7 +1506,7 @@ class Item extends BaseObject * in it. */ if (!$deleted && !$dontcache) { - $posted_item = dba::selectFirst('item', [], ['id' => $current_post]); + $posted_item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $current_post]); if (DBM::is_result($posted_item)) { if ($notify) { Addon::callHooks('post_local_end', $posted_item); @@ -1506,8 +1534,8 @@ class Item extends BaseObject Term::insertFromTagFieldByItemId($current_post, $tags); } - if (array_key_exists('file', $item)) { - Term::insertFromFileFieldByItemId($current_post); + if (!empty($files)) { + Term::insertFromFileFieldByItemId($current_post, $files); } if ($item['parent-uri'] === $item['uri']) { @@ -1626,7 +1654,7 @@ class Item extends BaseObject public static function distribute($itemid, $signed_text = '') { $condition = ["`id` IN (SELECT `parent` FROM `item` WHERE `id` = ?)", $itemid]; - $parent = dba::selectFirst('item', ['owner-id'], $condition); + $parent = self::selectFirst(['owner-id'], $condition); if (!DBM::is_result($parent)) { return; } @@ -1659,7 +1687,7 @@ class Item extends BaseObject $origin_uid = 0; if ($item['uri'] != $item['parent-uri']) { - $parents = dba::select('item', ['uid', 'origin'], ["`uri` = ? AND `uid` != 0", $item['parent-uri']]); + $parents = self::select(['uid', 'origin'], ["`uri` = ? AND `uid` != 0", $item['parent-uri']]); while ($parent = dba::fetch($parents)) { $users[$parent['uid']] = $parent['uid']; if ($parent['origin'] && !$item['origin']) { @@ -1740,7 +1768,7 @@ class Item extends BaseObject { $fields = ['uid', 'private', 'moderated', 'visible', 'deleted', 'network']; $condition = ['id' => $itemid, 'parent' => [0, $itemid]]; - $item = dba::selectFirst('item', $fields, $condition); + $item = self::selectFirst($fields, $condition); if (!DBM::is_result($item)) { return; @@ -2046,7 +2074,7 @@ class Item extends BaseObject public static function getGuidById($id) { - $item = dba::selectFirst('item', ['guid'], ['id' => $id]); + $item = self::selectFirst(['guid'], ['id' => $id]); if (DBM::is_result($item)) { return $item['guid']; } else { @@ -2110,7 +2138,7 @@ class Item extends BaseObject $community_page = (($user['page-flags'] == PAGE_COMMUNITY) ? true : false); $prvgroup = (($user['page-flags'] == PAGE_PRVGROUP) ? true : false); - $item = dba::selectFirst('item', [], ['id' => $item_id]); + $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]); if (!DBM::is_result($item)) { return; } @@ -2596,7 +2624,7 @@ class Item extends BaseObject logger('like: verb ' . $verb . ' item ' . $item_id); - $item = dba::selectFirst('item', [], ['`id` = ? OR `uri` = ?', $item_id, $item_id]); + $item = self::selectFirst(self::ITEM_FIELDLIST, ['`id` = ? OR `uri` = ?', $item_id, $item_id]); if (!DBM::is_result($item)) { logger('like: unknown item ' . $item_id); return false; @@ -2773,7 +2801,7 @@ EOT; 'moderated', 'visible', 'starred', 'bookmark', 'contact-id', 'deleted', 'origin', 'forum_mode', 'mention', 'network', 'author-id', 'owner-id']; $condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid]; - $item = dba::selectFirst('item', $fields, $condition); + $item = self::selectFirst($fields, $condition); if (!DBM::is_result($item)) { return; @@ -2795,7 +2823,7 @@ EOT; 'deleted', 'origin', 'forum_mode', 'network', 'author-id', 'owner-id']; $condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid]; - $item = dba::selectFirst('item', $fields, $condition); + $item = self::selectFirst($fields, $condition); if (!DBM::is_result($item)) { return; } diff --git a/src/Model/Term.php b/src/Model/Term.php index 85b14174a..bed44d685 100644 --- a/src/Model/Term.php +++ b/src/Model/Term.php @@ -35,6 +35,17 @@ class Term return $tag_text; } + public static function fileTextFromItemId($itemid) + { + $file_text = ''; + $condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_FILE, TERM_CATEGORY]]; + $tags = dba::select('term', [], $condition); + while ($tag = dba::fetch($tags)) { + $file_text .= '[' . $tag['term'] . ']'; + } + return $file_text; + } + public static function insertFromTagFieldByItemId($itemid, $tags) { $profile_base = System::baseUrl(); @@ -150,9 +161,9 @@ class Term * @param integer $itemid item id * @return void */ - public static function insertFromFileFieldByItemId($itemid) + public static function insertFromFileFieldByItemId($itemid, $files) { - $message = Item::selectFirst(['uid', 'deleted', 'file'], ['id' => $itemid]); + $message = Item::selectFirst(['uid', 'deleted'], ['id' => $itemid]); if (!DBM::is_result($message)) { return; } @@ -164,6 +175,8 @@ class Term return; } + $message['file'] = $files; + if (preg_match_all("/\[(.*?)\]/ism", $message["file"], $files)) { foreach ($files[1] as $file) { dba::insert('term', [ From 1905242a16d4a2d61d20c18746581616fed779a0 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 30 Jun 2018 22:37:44 +0000 Subject: [PATCH 13/25] Added support for internal Diaspora links to accounts --- src/Content/Text/BBCode.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 35f4979d1..33b3503ec 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -1380,6 +1380,13 @@ class BBCode extends BaseObject }, $text ); + $text = preg_replace_callback( + "&\[url=/people\?q\=(.*)\](.*)\[\/url\]&Usi", + function ($match) { + return "[url=" . System::baseUrl() . "/search?search=%40" . $match[1] . "]" . $match[2] . "[/url]"; + }, $text + ); + // Server independent link to posts and comments // See issue: https://github.com/diaspora/diaspora_federation/issues/75 $expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism"; From bffdf96d8791db3f5c1aaede9b3f7416fb189f38 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 1 Jul 2018 07:57:59 +0000 Subject: [PATCH 14/25] The "file" variable isn't stored anymore in the item table --- boot.php | 2 +- database.sql | 5 +- mod/network.php | 10 +-- src/Database/DBStructure.php | 3 - src/Model/Item.php | 145 ++++++++++++++++------------------- src/Model/Term.php | 6 +- 6 files changed, 78 insertions(+), 93 deletions(-) diff --git a/boot.php b/boot.php index 786a846f3..a4588b3f7 100644 --- a/boot.php +++ b/boot.php @@ -41,7 +41,7 @@ define('FRIENDICA_PLATFORM', 'Friendica'); define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily'); define('FRIENDICA_VERSION', '2018.08-dev'); define('DFRN_PROTOCOL_VERSION', '2.23'); -define('DB_UPDATE_VERSION', 1273); +define('DB_UPDATE_VERSION', 1274); define('NEW_UPDATE_ROUTINE_VERSION', 1170); /** diff --git a/database.sql b/database.sql index 1ea6abfa0..b3d8f5dd0 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ -- Friendica 2018.08-dev (The Tazmans Flax-lily) --- DB_UPDATE_VERSION 1273 +-- DB_UPDATE_VERSION 1274 -- ------------------------------------------ @@ -536,9 +536,6 @@ CREATE TABLE IF NOT EXISTS `item` ( INDEX `ownerid` (`owner-id`), INDEX `uid_uri` (`uid`,`uri`(190)), INDEX `resource-id` (`resource-id`), - INDEX `contactid_allowcid_allowpid_denycid_denygid` (`contact-id`,`allow_cid`(10),`allow_gid`(10),`deny_cid`(10),`deny_gid`(10)), - INDEX `uid_type_changed` (`uid`,`type`,`changed`), - INDEX `contactid_verb` (`contact-id`,`verb`), INDEX `deleted_changed` (`deleted`,`changed`), INDEX `uid_wall_changed` (`uid`,`wall`,`changed`), INDEX `uid_eventid` (`uid`,`event-id`), diff --git a/mod/network.php b/mod/network.php index 442ae669b..7c1ff0afa 100644 --- a/mod/network.php +++ b/mod/network.php @@ -360,21 +360,21 @@ function network_content(App $a, $update = 0, $parent = 0) $arr = ['query' => $a->query_string]; Addon::callHooks('network_content_init', $arr); - $nouveau = false; + $flat_mode = false; if ($a->argc > 1) { for ($x = 1; $x < $a->argc; $x ++) { if ($a->argv[$x] === 'new') { - $nouveau = true; + $flat_mode = true; } } } if (x($_GET, 'file')) { - $nouveau = true; + $flat_mode = true; } - if ($nouveau) { + if ($flat_mode) { $o = networkFlatView($a, $update); } else { $o = networkThreadedView($a, $update, $parent); @@ -393,7 +393,7 @@ function network_content(App $a, $update = 0, $parent = 0) function networkFlatView(App $a, $update = 0) { // Rawmode is used for fetching new content at the end of the page - $rawmode = (isset($_GET['mode']) AND ( $_GET['mode'] == 'raw')); + $rawmode = (isset($_GET['mode']) && ($_GET['mode'] == 'raw')); if (isset($_GET['last_id'])) { $last_id = intval($_GET['last_id']); diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php index 8970241b2..db6997ec6 100644 --- a/src/Database/DBStructure.php +++ b/src/Database/DBStructure.php @@ -1242,9 +1242,6 @@ class DBStructure "ownerid" => ["owner-id"], "uid_uri" => ["uid", "uri(190)"], "resource-id" => ["resource-id"], - "contactid_allowcid_allowpid_denycid_denygid" => ["contact-id","allow_cid(10)","allow_gid(10)","deny_cid(10)","deny_gid(10)"], // - "uid_type_changed" => ["uid","type","changed"], - "contactid_verb" => ["contact-id","verb"], "deleted_changed" => ["deleted","changed"], "uid_wall_changed" => ["uid","wall","changed"], "uid_eventid" => ["uid","event-id"], diff --git a/src/Model/Item.php b/src/Model/Item.php index d1e3f6a66..3f80b11c3 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -122,11 +122,10 @@ class Item extends BaseObject $row['tag'] = Term::tagTextFromItemId($row['id']); } - /// @todo This is a preparation // Build the file string out of the term entries - //if (isset($row['id']) && array_key_exists('file', $row)) { - // $row['file'] = Term::fileTextFromItemId($row['id']); - //} + if (isset($row['id']) && array_key_exists('file', $row)) { + $row['file'] = Term::fileTextFromItemId($row['id']); + } // We can always comment on posts from these networks if (isset($row['writable']) && !empty($row['network']) && @@ -541,11 +540,10 @@ class Item extends BaseObject $selected[] = 'id'; } - /// @todo This is a preparation // To be able to fetch the files we need the item id - //if (in_array('file', $selected) && !in_array('id', $selected)) { - // $selected[] = 'id'; - //} + if (in_array('file', $selected) && !in_array('id', $selected)) { + $selected[] = 'id'; + } $selection = []; foreach ($fields as $table => $table_fields) { @@ -635,8 +633,7 @@ class Item extends BaseObject if (array_key_exists('file', $fields)) { $files = $fields['file']; - /// @todo This is a preparation - //unset($fields['file']); + unset($fields['file']); } else { $files = ''; } @@ -1393,8 +1390,7 @@ class Item extends BaseObject if (array_key_exists('file', $item)) { $files = $item['file']; - /// @todo This is a preparation - //unset($item['file']); + unset($item['file']); } else { $files = ''; } @@ -1766,7 +1762,7 @@ class Item extends BaseObject */ public static function addShadow($itemid) { - $fields = ['uid', 'private', 'moderated', 'visible', 'deleted', 'network']; + $fields = ['uid', 'private', 'moderated', 'visible', 'deleted', 'network', 'uri']; $condition = ['id' => $itemid, 'parent' => [0, $itemid]]; $item = self::selectFirst($fields, $condition); @@ -1789,36 +1785,36 @@ class Item extends BaseObject return; } + if (self::exists(['uri' => $item['uri'], 'uid' => 0])) { + return; + } + $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]); - if (DBM::is_result($item) && ($item["allow_cid"] == '') && ($item["allow_gid"] == '') && - ($item["deny_cid"] == '') && ($item["deny_gid"] == '')) { - - if (!self::exists(['uri' => $item['uri'], 'uid' => 0])) { - // Preparing public shadow (removing user specific data) - $item['uid'] = 0; - unset($item['id']); - unset($item['parent']); - unset($item['wall']); - unset($item['mention']); - unset($item['origin']); - unset($item['starred']); - if ($item['uri'] == $item['parent-uri']) { - $item['contact-id'] = $item['owner-id']; - } else { - $item['contact-id'] = $item['author-id']; - } - - if (in_array($item['type'], ["net-comment", "wall-comment"])) { - $item['type'] = 'remote-comment'; - } elseif ($item['type'] == 'wall') { - $item['type'] = 'remote'; - } - - $public_shadow = self::insert($item, false, false, true); - - logger("Stored public shadow for thread ".$itemid." under id ".$public_shadow, LOGGER_DEBUG); + if (DBM::is_result($item)) { + // Preparing public shadow (removing user specific data) + $item['uid'] = 0; + unset($item['id']); + unset($item['parent']); + unset($item['wall']); + unset($item['mention']); + unset($item['origin']); + unset($item['starred']); + if ($item['uri'] == $item['parent-uri']) { + $item['contact-id'] = $item['owner-id']; + } else { + $item['contact-id'] = $item['author-id']; } + + if (in_array($item['type'], ["net-comment", "wall-comment"])) { + $item['type'] = 'remote-comment'; + } elseif ($item['type'] == 'wall') { + $item['type'] = 'remote'; + } + + $public_shadow = self::insert($item, false, false, true); + + logger("Stored public shadow for thread ".$itemid." under id ".$public_shadow, LOGGER_DEBUG); } } @@ -2108,8 +2104,6 @@ class Item extends BaseObject $item = dba::fetch_first("SELECT `item`.`id`, `user`.`nickname` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` - AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' - AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND NOT `item`.`private` AND `item`.`wall` AND `item`.`guid` = ?", $guid); if (DBM::is_result($item)) { @@ -2411,17 +2405,8 @@ class Item extends BaseObject private static function hasPermissions($obj) { - return ( - ( - x($obj, 'allow_cid') - ) || ( - x($obj, 'allow_gid') - ) || ( - x($obj, 'deny_cid') - ) || ( - x($obj, 'deny_gid') - ) - ); + return !empty($obj['allow_cid']) || !empty($obj['allow_gid']) || + !empty($obj['deny_cid']) || !empty($obj['deny_gid']); } private static function samePermissions($obj1, $obj2) @@ -2487,74 +2472,76 @@ class Item extends BaseObject return; } + $condition = ["`uid` = ? AND NOT `deleted` AND `id` = `parent` AND `gravity` = ?", + $uid, GRAVITY_PARENT]; + /* * $expire_network_only = save your own wall posts * and just expire conversations started by others */ - $expire_network_only = PConfig::get($uid,'expire', 'network_only'); - $sql_extra = (intval($expire_network_only) ? " AND wall = 0 " : ""); + $expire_network_only = PConfig::get($uid, 'expire', 'network_only', false); + + if ($expire_network_only) { + $condition[0] .= " AND NOT `wall`"; + } if ($network != "") { - $sql_extra .= sprintf(" AND network = '%s' ", dbesc($network)); + $condition[0] .= " AND `network` = ?"; + $condition[] = $network; /* * There is an index "uid_network_received" but not "uid_network_created" * This avoids the creation of another index just for one purpose. * And it doesn't really matter wether to look at "received" or "created" */ - $range = "AND `received` < UTC_TIMESTAMP() - INTERVAL %d DAY "; + $condition[0] .= " AND `received` < UTC_TIMESTAMP() - INTERVAL ? DAY"; + $condition[] = $days; } else { - $range = "AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY "; + $condition[0] .= " AND `created` < UTC_TIMESTAMP() - INTERVAL ? DAY"; + $condition[] = $days; } - $r = q("SELECT `file`, `resource-id`, `starred`, `type`, `id` FROM `item` - WHERE `uid` = %d $range - AND `id` = `parent` - $sql_extra - AND `deleted` = 0", - intval($uid), - intval($days) - ); + $items = self::select(['file', 'resource-id', 'starred', 'type', 'id'], $condition); - if (!DBM::is_result($r)) { + if (!DBM::is_result($items)) { return; } - $expire_items = PConfig::get($uid, 'expire', 'items', 1); + $expire_items = PConfig::get($uid, 'expire', 'items', true); // Forcing expiring of items - but not notes and marked items if ($force) { $expire_items = true; } - $expire_notes = PConfig::get($uid, 'expire', 'notes', 1); - $expire_starred = PConfig::get($uid, 'expire', 'starred', 1); - $expire_photos = PConfig::get($uid, 'expire', 'photos', 0); + $expire_notes = PConfig::get($uid, 'expire', 'notes', true); + $expire_starred = PConfig::get($uid, 'expire', 'starred', true); + $expire_photos = PConfig::get($uid, 'expire', 'photos', false); - logger('User '.$uid.': expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); - - foreach ($r as $item) { + logger('User ' . $uid . ": expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); + while ($item = Item::fetch($items)) { // don't expire filed items - if (strpos($item['file'],'[') !== false) { + if (strpos($item['file'], '[') !== false) { continue; } // Only expire posts, not photos and photo comments - if ($expire_photos == 0 && strlen($item['resource-id'])) { + if (!$expire_photos && strlen($item['resource-id'])) { continue; - } elseif ($expire_starred == 0 && intval($item['starred'])) { + } elseif (!$expire_starred && intval($item['starred'])) { continue; - } elseif ($expire_notes == 0 && $item['type'] == 'note') { + } elseif (!$expire_notes && $item['type'] == 'note') { continue; - } elseif ($expire_items == 0 && $item['type'] != 'note') { + } elseif (!$expire_items && $item['type'] != 'note') { continue; } self::deleteById($item['id'], PRIORITY_LOW); } + dba::close($items); } public static function firstPostDate($uid, $wall = false) diff --git a/src/Model/Term.php b/src/Model/Term.php index bed44d685..cca470801 100644 --- a/src/Model/Term.php +++ b/src/Model/Term.php @@ -41,7 +41,11 @@ class Term $condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_FILE, TERM_CATEGORY]]; $tags = dba::select('term', [], $condition); while ($tag = dba::fetch($tags)) { - $file_text .= '[' . $tag['term'] . ']'; + if ($tag['type'] == TERM_CATEGORY) { + $file_text .= '<' . $tag['term'] . '>'; + } else { + $file_text .= '[' . $tag['term'] . ']'; + } } return $file_text; } From c2496ccc9df66f89af229e354d9b3b04c85e1f07 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 1 Jul 2018 11:08:12 +0200 Subject: [PATCH 15/25] update for DE translation --- view/lang/de/messages.po | 2058 +++++++++++++++++++------------------- view/lang/de/strings.php | 293 +++--- 2 files changed, 1179 insertions(+), 1172 deletions(-) diff --git a/view/lang/de/messages.po b/view/lang/de/messages.po index c13113cec..e9e068fcd 100644 --- a/view/lang/de/messages.po +++ b/view/lang/de/messages.po @@ -19,6 +19,7 @@ # Hauke , 2012,2018 # Herbert Thielen , 2017 # hoergen , 2018 +# hoergen , 2018 # Hauke , 2011-2012 # Johannes Schwab , 2015 # leberwurscht , 2012 @@ -41,8 +42,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-20 08:17+0200\n" -"PO-Revision-Date: 2018-06-20 13:20+0000\n" +"POT-Creation-Date: 2018-06-30 17:33+0200\n" +"PO-Revision-Date: 2018-07-01 09:05+0000\n" "Last-Translator: Tobias Diekershoff \n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -51,6 +52,87 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: include/items.php:342 mod/notice.php:22 mod/admin.php:277 +#: mod/admin.php:1888 mod/admin.php:2136 mod/viewsrc.php:22 mod/display.php:70 +#: mod/display.php:244 mod/display.php:341 +msgid "Item not found." +msgstr "Beitrag nicht gefunden." + +#: include/items.php:379 +msgid "Do you really want to delete this item?" +msgstr "Möchtest Du wirklich dieses Item löschen?" + +#: include/items.php:381 mod/api.php:110 mod/follow.php:150 +#: mod/profiles.php:543 mod/profiles.php:546 mod/profiles.php:568 +#: mod/settings.php:1094 mod/settings.php:1100 mod/settings.php:1107 +#: mod/settings.php:1111 mod/settings.php:1115 mod/settings.php:1119 +#: mod/settings.php:1123 mod/settings.php:1127 mod/settings.php:1147 +#: mod/settings.php:1148 mod/settings.php:1149 mod/settings.php:1150 +#: mod/settings.php:1151 mod/contacts.php:472 mod/dfrn_request.php:647 +#: mod/register.php:238 mod/suggest.php:38 mod/message.php:138 +msgid "Yes" +msgstr "Ja" + +#: include/items.php:384 include/conversation.php:1148 mod/fbrowser.php:103 +#: mod/fbrowser.php:134 mod/follow.php:161 mod/settings.php:670 +#: mod/settings.php:696 mod/videos.php:147 mod/contacts.php:475 +#: mod/dfrn_request.php:657 mod/editpost.php:135 mod/suggest.php:41 +#: mod/tagrm.php:19 mod/tagrm.php:91 mod/unfollow.php:117 mod/message.php:141 +#: mod/photos.php:244 mod/photos.php:313 +msgid "Cancel" +msgstr "Abbrechen" + +#: include/items.php:398 mod/api.php:35 mod/api.php:40 mod/attach.php:38 +#: mod/common.php:26 mod/nogroup.php:28 mod/repair_ostatus.php:13 +#: mod/uimport.php:28 mod/manage.php:131 mod/wall_attach.php:74 +#: mod/wall_attach.php:77 mod/regmod.php:108 mod/wallmessage.php:16 +#: mod/wallmessage.php:40 mod/wallmessage.php:79 mod/wallmessage.php:103 +#: mod/fsuggest.php:80 mod/cal.php:304 mod/delegate.php:25 mod/delegate.php:43 +#: mod/delegate.php:54 mod/ostatus_subscribe.php:16 mod/profile_photo.php:30 +#: mod/profile_photo.php:176 mod/profile_photo.php:187 +#: mod/profile_photo.php:200 mod/follow.php:17 mod/follow.php:54 +#: mod/follow.php:118 mod/invite.php:20 mod/invite.php:111 mod/crepair.php:98 +#: mod/dfrn_confirm.php:68 mod/events.php:194 mod/group.php:26 +#: mod/profiles.php:182 mod/profiles.php:513 mod/settings.php:43 +#: mod/settings.php:142 mod/settings.php:659 mod/allfriends.php:21 +#: mod/contacts.php:386 mod/dirfind.php:24 mod/editpost.php:19 +#: mod/notifications.php:65 mod/poke.php:146 mod/register.php:54 +#: mod/suggest.php:60 mod/unfollow.php:15 mod/unfollow.php:57 +#: mod/unfollow.php:90 mod/viewcontacts.php:57 mod/wall_upload.php:103 +#: mod/wall_upload.php:106 mod/item.php:160 mod/message.php:59 +#: mod/message.php:104 mod/network.php:32 mod/notes.php:31 mod/photos.php:175 +#: mod/photos.php:1033 index.php:446 +msgid "Permission denied." +msgstr "Zugriff verweigert." + +#: include/items.php:468 src/Content/Feature.php:96 +msgid "Archives" +msgstr "Archiv" + +#: include/items.php:474 view/theme/vier/theme.php:258 +#: src/Content/Widget.php:317 src/Content/ForumManager.php:131 +#: src/Object/Post.php:421 src/App.php:527 +msgid "show more" +msgstr "mehr anzeigen" + +#: include/security.php:81 +msgid "Welcome " +msgstr "Willkommen " + +#: include/security.php:82 +msgid "Please upload a profile photo." +msgstr "Bitte lade ein Profilbild hoch." + +#: include/security.php:84 +msgid "Welcome back " +msgstr "Willkommen zurück " + +#: include/security.php:447 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." +msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)." + #: include/api.php:1131 #, php-format msgid "Daily posting limit of %d post reached. The post was rejected." @@ -71,40 +153,40 @@ msgstr[1] "Das wöchentliche Limit von %d Beiträgen wurde erreicht. Der Beitrag msgid "Monthly posting limit of %d post reached. The post was rejected." msgstr "Das monatliche Limit von %d Beiträgen wurde erreicht. Der Beitrag wurde verworfen." -#: include/api.php:4217 mod/profile_photo.php:85 mod/profile_photo.php:93 +#: include/api.php:4218 mod/profile_photo.php:85 mod/profile_photo.php:93 #: mod/profile_photo.php:101 mod/profile_photo.php:211 #: mod/profile_photo.php:302 mod/profile_photo.php:312 mod/photos.php:89 -#: mod/photos.php:190 mod/photos.php:703 mod/photos.php:1130 -#: mod/photos.php:1147 mod/photos.php:1669 src/Model/User.php:563 +#: mod/photos.php:190 mod/photos.php:704 mod/photos.php:1131 +#: mod/photos.php:1148 mod/photos.php:1635 src/Model/User.php:563 #: src/Model/User.php:571 src/Model/User.php:579 msgid "Profile Photos" msgstr "Profilbilder" #: include/conversation.php:148 include/conversation.php:278 -#: include/text.php:1714 src/Model/Item.php:2449 +#: include/text.php:1714 src/Model/Item.php:2661 msgid "event" msgstr "Event" #: include/conversation.php:151 include/conversation.php:161 #: include/conversation.php:281 include/conversation.php:290 -#: mod/subthread.php:97 mod/tagger.php:70 src/Model/Item.php:2447 +#: mod/subthread.php:97 mod/tagger.php:70 src/Model/Item.php:2659 #: src/Protocol/Diaspora.php:1949 msgid "status" msgstr "Status" #: include/conversation.php:156 include/conversation.php:286 #: include/text.php:1716 mod/subthread.php:97 mod/tagger.php:70 -#: src/Model/Item.php:2447 +#: src/Model/Item.php:2659 msgid "photo" msgstr "Foto" -#: include/conversation.php:168 src/Model/Item.php:2320 +#: include/conversation.php:168 src/Model/Item.php:2530 #: src/Protocol/Diaspora.php:1945 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s" -#: include/conversation.php:170 src/Model/Item.php:2325 +#: include/conversation.php:170 src/Model/Item.php:2535 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s nicht" @@ -148,381 +230,372 @@ msgstr "Nachricht/Beitrag" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert" -#: include/conversation.php:504 mod/profiles.php:355 mod/photos.php:1490 +#: include/conversation.php:504 mod/profiles.php:355 mod/photos.php:1464 msgid "Likes" msgstr "Likes" -#: include/conversation.php:504 mod/profiles.php:359 mod/photos.php:1490 +#: include/conversation.php:504 mod/profiles.php:359 mod/photos.php:1464 msgid "Dislikes" msgstr "Dislikes" -#: include/conversation.php:505 include/conversation.php:1462 -#: mod/photos.php:1491 +#: include/conversation.php:505 include/conversation.php:1455 +#: mod/photos.php:1465 msgid "Attending" msgid_plural "Attending" msgstr[0] "Teilnehmend" msgstr[1] "Teilnehmend" -#: include/conversation.php:505 mod/photos.php:1491 +#: include/conversation.php:505 mod/photos.php:1465 msgid "Not attending" msgstr "Nicht teilnehmend" -#: include/conversation.php:505 mod/photos.php:1491 +#: include/conversation.php:505 mod/photos.php:1465 msgid "Might attend" msgstr "Eventuell teilnehmend" -#: include/conversation.php:600 mod/photos.php:1554 src/Object/Post.php:191 +#: include/conversation.php:593 mod/photos.php:1521 src/Object/Post.php:191 msgid "Select" msgstr "Auswählen" -#: include/conversation.php:601 mod/settings.php:730 mod/admin.php:1832 -#: mod/contacts.php:829 mod/contacts.php:1035 mod/photos.php:1555 +#: include/conversation.php:594 mod/settings.php:730 mod/admin.php:1832 +#: mod/contacts.php:829 mod/contacts.php:1035 mod/photos.php:1522 msgid "Delete" msgstr "Löschen" -#: include/conversation.php:635 src/Object/Post.php:362 -#: src/Object/Post.php:363 +#: include/conversation.php:628 src/Object/Post.php:354 +#: src/Object/Post.php:355 #, php-format msgid "View %s's profile @ %s" msgstr "Das Profil von %s auf %s betrachten." -#: include/conversation.php:647 src/Object/Post.php:350 +#: include/conversation.php:640 src/Object/Post.php:342 msgid "Categories:" msgstr "Kategorien:" -#: include/conversation.php:648 src/Object/Post.php:351 +#: include/conversation.php:641 src/Object/Post.php:343 msgid "Filed under:" msgstr "Abgelegt unter:" -#: include/conversation.php:655 src/Object/Post.php:376 +#: include/conversation.php:648 src/Object/Post.php:368 #, php-format msgid "%s from %s" msgstr "%s von %s" -#: include/conversation.php:670 +#: include/conversation.php:663 msgid "View in context" msgstr "Im Zusammenhang betrachten" -#: include/conversation.php:672 include/conversation.php:1137 -#: mod/wallmessage.php:145 mod/editpost.php:111 mod/message.php:245 -#: mod/message.php:411 mod/photos.php:1462 src/Object/Post.php:401 +#: include/conversation.php:665 include/conversation.php:1130 +#: mod/wallmessage.php:145 mod/editpost.php:111 mod/message.php:247 +#: mod/message.php:413 mod/photos.php:1436 src/Object/Post.php:393 msgid "Please wait" msgstr "Bitte warten" -#: include/conversation.php:743 +#: include/conversation.php:736 msgid "remove" msgstr "löschen" -#: include/conversation.php:747 +#: include/conversation.php:740 msgid "Delete Selected Items" msgstr "Lösche die markierten Beiträge" -#: include/conversation.php:845 view/theme/frio/theme.php:357 +#: include/conversation.php:838 view/theme/frio/theme.php:357 msgid "Follow Thread" msgstr "Folge der Unterhaltung" -#: include/conversation.php:846 src/Model/Contact.php:662 +#: include/conversation.php:839 src/Model/Contact.php:662 msgid "View Status" msgstr "Pinnwand anschauen" -#: include/conversation.php:847 include/conversation.php:863 -#: mod/allfriends.php:73 mod/directory.php:159 mod/dirfind.php:216 -#: mod/match.php:89 mod/suggest.php:82 src/Model/Contact.php:602 +#: include/conversation.php:840 include/conversation.php:856 +#: mod/allfriends.php:73 mod/dirfind.php:216 mod/match.php:89 +#: mod/suggest.php:82 mod/directory.php:160 src/Model/Contact.php:602 #: src/Model/Contact.php:615 src/Model/Contact.php:663 msgid "View Profile" msgstr "Profil anschauen" -#: include/conversation.php:848 src/Model/Contact.php:664 +#: include/conversation.php:841 src/Model/Contact.php:664 msgid "View Photos" msgstr "Bilder anschauen" -#: include/conversation.php:849 src/Model/Contact.php:665 +#: include/conversation.php:842 src/Model/Contact.php:665 msgid "Network Posts" msgstr "Netzwerkbeiträge" -#: include/conversation.php:850 src/Model/Contact.php:666 +#: include/conversation.php:843 src/Model/Contact.php:666 msgid "View Contact" msgstr "Kontakt anzeigen" -#: include/conversation.php:851 src/Model/Contact.php:668 +#: include/conversation.php:844 src/Model/Contact.php:668 msgid "Send PM" msgstr "Private Nachricht senden" -#: include/conversation.php:855 src/Model/Contact.php:669 +#: include/conversation.php:848 src/Model/Contact.php:669 msgid "Poke" msgstr "Anstupsen" -#: include/conversation.php:860 mod/follow.php:143 mod/allfriends.php:74 +#: include/conversation.php:853 mod/follow.php:143 mod/allfriends.php:74 #: mod/contacts.php:595 mod/dirfind.php:217 mod/match.php:90 #: mod/suggest.php:83 view/theme/vier/theme.php:201 src/Content/Widget.php:61 #: src/Model/Contact.php:616 msgid "Connect/Follow" msgstr "Verbinden/Folgen" -#: include/conversation.php:976 +#: include/conversation.php:969 #, php-format msgid "%s likes this." msgstr "%s mag das." -#: include/conversation.php:979 +#: include/conversation.php:972 #, php-format msgid "%s doesn't like this." msgstr "%s mag das nicht." -#: include/conversation.php:982 +#: include/conversation.php:975 #, php-format msgid "%s attends." msgstr "%s nimmt teil." -#: include/conversation.php:985 +#: include/conversation.php:978 #, php-format msgid "%s doesn't attend." msgstr "%s nimmt nicht teil." -#: include/conversation.php:988 +#: include/conversation.php:981 #, php-format msgid "%s attends maybe." msgstr "%s nimmt eventuell teil." -#: include/conversation.php:999 +#: include/conversation.php:992 msgid "and" msgstr "und" -#: include/conversation.php:1005 +#: include/conversation.php:998 #, php-format msgid "and %d other people" msgstr "und %dandere" -#: include/conversation.php:1014 +#: include/conversation.php:1007 #, php-format msgid "%2$d people like this" msgstr "%2$d Personen mögen das" -#: include/conversation.php:1015 +#: include/conversation.php:1008 #, php-format msgid "%s like this." msgstr "%s mögen das." -#: include/conversation.php:1018 +#: include/conversation.php:1011 #, php-format msgid "%2$d people don't like this" msgstr "%2$d Personen mögen das nicht" -#: include/conversation.php:1019 +#: include/conversation.php:1012 #, php-format msgid "%s don't like this." msgstr "%s mögen dies nicht." -#: include/conversation.php:1022 +#: include/conversation.php:1015 #, php-format msgid "%2$d people attend" msgstr "%2$d Personen nehmen teil" -#: include/conversation.php:1023 +#: include/conversation.php:1016 #, php-format msgid "%s attend." msgstr "%s nehmen teil." -#: include/conversation.php:1026 +#: include/conversation.php:1019 #, php-format msgid "%2$d people don't attend" msgstr "%2$d Personen nehmen nicht teil" -#: include/conversation.php:1027 +#: include/conversation.php:1020 #, php-format msgid "%s don't attend." msgstr "%s nehmen nicht teil." -#: include/conversation.php:1030 +#: include/conversation.php:1023 #, php-format msgid "%2$d people attend maybe" msgstr "%2$d Personen nehmen eventuell teil" -#: include/conversation.php:1031 +#: include/conversation.php:1024 #, php-format msgid "%s attend maybe." msgstr "%s nimmt eventuell teil." -#: include/conversation.php:1061 include/conversation.php:1077 +#: include/conversation.php:1054 include/conversation.php:1070 msgid "Visible to everybody" msgstr "Für jedermann sichtbar" -#: include/conversation.php:1062 include/conversation.php:1078 -#: mod/wallmessage.php:120 mod/wallmessage.php:127 mod/message.php:181 -#: mod/message.php:188 mod/message.php:324 mod/message.php:331 +#: include/conversation.php:1055 include/conversation.php:1071 +#: mod/wallmessage.php:120 mod/wallmessage.php:127 mod/message.php:183 +#: mod/message.php:190 mod/message.php:326 mod/message.php:333 msgid "Please enter a link URL:" msgstr "Bitte gib die URL des Links ein:" -#: include/conversation.php:1063 include/conversation.php:1079 +#: include/conversation.php:1056 include/conversation.php:1072 msgid "Please enter a video link/URL:" msgstr "Bitte Link/URL zum Video einfügen:" -#: include/conversation.php:1064 include/conversation.php:1080 +#: include/conversation.php:1057 include/conversation.php:1073 msgid "Please enter an audio link/URL:" msgstr "Bitte Link/URL zum Audio einfügen:" -#: include/conversation.php:1065 include/conversation.php:1081 +#: include/conversation.php:1058 include/conversation.php:1074 msgid "Tag term:" msgstr "Tag:" -#: include/conversation.php:1066 include/conversation.php:1082 +#: include/conversation.php:1059 include/conversation.php:1075 #: mod/filer.php:34 msgid "Save to Folder:" msgstr "In diesem Ordner speichern:" -#: include/conversation.php:1067 include/conversation.php:1083 +#: include/conversation.php:1060 include/conversation.php:1076 msgid "Where are you right now?" msgstr "Wo hältst Du Dich jetzt gerade auf?" -#: include/conversation.php:1068 +#: include/conversation.php:1061 msgid "Delete item(s)?" msgstr "Einträge löschen?" -#: include/conversation.php:1115 +#: include/conversation.php:1108 msgid "New Post" msgstr "Neuer Beitrag" -#: include/conversation.php:1118 +#: include/conversation.php:1111 msgid "Share" msgstr "Teilen" -#: include/conversation.php:1119 mod/wallmessage.php:143 mod/editpost.php:97 -#: mod/message.php:243 mod/message.php:408 +#: include/conversation.php:1112 mod/wallmessage.php:143 mod/editpost.php:97 +#: mod/message.php:245 mod/message.php:410 msgid "Upload photo" msgstr "Foto hochladen" -#: include/conversation.php:1120 mod/editpost.php:98 +#: include/conversation.php:1113 mod/editpost.php:98 msgid "upload photo" msgstr "Bild hochladen" -#: include/conversation.php:1121 mod/editpost.php:99 +#: include/conversation.php:1114 mod/editpost.php:99 msgid "Attach file" msgstr "Datei anhängen" -#: include/conversation.php:1122 mod/editpost.php:100 +#: include/conversation.php:1115 mod/editpost.php:100 msgid "attach file" msgstr "Datei anhängen" -#: include/conversation.php:1123 mod/wallmessage.php:144 mod/editpost.php:101 -#: mod/message.php:244 mod/message.php:409 +#: include/conversation.php:1116 mod/wallmessage.php:144 mod/editpost.php:101 +#: mod/message.php:246 mod/message.php:411 msgid "Insert web link" msgstr "Einen Link einfügen" -#: include/conversation.php:1124 mod/editpost.php:102 +#: include/conversation.php:1117 mod/editpost.php:102 msgid "web link" msgstr "Weblink" -#: include/conversation.php:1125 mod/editpost.php:103 +#: include/conversation.php:1118 mod/editpost.php:103 msgid "Insert video link" msgstr "Video-Adresse einfügen" -#: include/conversation.php:1126 mod/editpost.php:104 +#: include/conversation.php:1119 mod/editpost.php:104 msgid "video link" msgstr "Video-Link" -#: include/conversation.php:1127 mod/editpost.php:105 +#: include/conversation.php:1120 mod/editpost.php:105 msgid "Insert audio link" msgstr "Audio-Adresse einfügen" -#: include/conversation.php:1128 mod/editpost.php:106 +#: include/conversation.php:1121 mod/editpost.php:106 msgid "audio link" msgstr "Audio-Link" -#: include/conversation.php:1129 mod/editpost.php:107 +#: include/conversation.php:1122 mod/editpost.php:107 msgid "Set your location" msgstr "Deinen Standort festlegen" -#: include/conversation.php:1130 mod/editpost.php:108 +#: include/conversation.php:1123 mod/editpost.php:108 msgid "set location" msgstr "Ort setzen" -#: include/conversation.php:1131 mod/editpost.php:109 +#: include/conversation.php:1124 mod/editpost.php:109 msgid "Clear browser location" msgstr "Browser-Standort leeren" -#: include/conversation.php:1132 mod/editpost.php:110 +#: include/conversation.php:1125 mod/editpost.php:110 msgid "clear location" msgstr "Ort löschen" -#: include/conversation.php:1134 mod/editpost.php:124 +#: include/conversation.php:1127 mod/editpost.php:124 msgid "Set title" msgstr "Titel setzen" -#: include/conversation.php:1136 mod/editpost.php:126 +#: include/conversation.php:1129 mod/editpost.php:126 msgid "Categories (comma-separated list)" msgstr "Kategorien (kommasepariert)" -#: include/conversation.php:1138 mod/editpost.php:112 +#: include/conversation.php:1131 mod/editpost.php:112 msgid "Permission settings" msgstr "Berechtigungseinstellungen" -#: include/conversation.php:1139 mod/editpost.php:141 +#: include/conversation.php:1132 mod/editpost.php:141 msgid "permissions" msgstr "Zugriffsrechte" -#: include/conversation.php:1147 mod/editpost.php:121 +#: include/conversation.php:1140 mod/editpost.php:121 msgid "Public post" msgstr "Öffentlicher Beitrag" -#: include/conversation.php:1151 mod/events.php:529 mod/editpost.php:132 -#: mod/photos.php:1481 mod/photos.php:1520 mod/photos.php:1589 -#: src/Object/Post.php:804 +#: include/conversation.php:1144 mod/events.php:529 mod/editpost.php:132 +#: mod/photos.php:1455 mod/photos.php:1494 mod/photos.php:1555 +#: src/Object/Post.php:796 msgid "Preview" msgstr "Vorschau" -#: include/conversation.php:1155 include/items.php:384 mod/fbrowser.php:103 -#: mod/fbrowser.php:134 mod/follow.php:161 mod/settings.php:670 -#: mod/settings.php:696 mod/videos.php:147 mod/contacts.php:475 -#: mod/dfrn_request.php:657 mod/editpost.php:135 mod/message.php:141 -#: mod/photos.php:244 mod/photos.php:313 mod/suggest.php:41 mod/tagrm.php:19 -#: mod/tagrm.php:91 mod/unfollow.php:117 -msgid "Cancel" -msgstr "Abbrechen" - -#: include/conversation.php:1160 +#: include/conversation.php:1153 msgid "Post to Groups" msgstr "Poste an Gruppe" -#: include/conversation.php:1161 +#: include/conversation.php:1154 msgid "Post to Contacts" msgstr "Poste an Kontakte" -#: include/conversation.php:1162 +#: include/conversation.php:1155 msgid "Private post" msgstr "Privater Beitrag" -#: include/conversation.php:1167 mod/editpost.php:139 -#: src/Model/Profile.php:338 +#: include/conversation.php:1160 mod/editpost.php:139 +#: src/Model/Profile.php:339 msgid "Message" msgstr "Nachricht" -#: include/conversation.php:1168 mod/editpost.php:140 +#: include/conversation.php:1161 mod/editpost.php:140 msgid "Browser" msgstr "Browser" -#: include/conversation.php:1433 +#: include/conversation.php:1426 msgid "View all" msgstr "Zeige alle" -#: include/conversation.php:1456 +#: include/conversation.php:1449 msgid "Like" msgid_plural "Likes" msgstr[0] "mag ich" msgstr[1] "Mag ich" -#: include/conversation.php:1459 +#: include/conversation.php:1452 msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "mag ich nicht" msgstr[1] "Mag ich nicht" -#: include/conversation.php:1465 +#: include/conversation.php:1458 msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "Nicht teilnehmend " msgstr[1] "Nicht teilnehmend" -#: include/conversation.php:1468 src/Content/ContactSelector.php:125 +#: include/conversation.php:1461 src/Content/ContactSelector.php:125 msgid "Undecided" msgid_plural "Undecided" msgstr[0] "Unentschieden" @@ -823,78 +896,6 @@ msgstr "Kompletter Name: %s\nURL der Seite: %s\nLogin Name: %s(%s)" msgid "Please visit %s to approve or reject the request." msgstr "Bitte besuche %s um die Anfrage zu bearbeiten." -#: include/items.php:342 mod/notice.php:22 mod/admin.php:277 -#: mod/admin.php:1888 mod/admin.php:2136 mod/display.php:70 -#: mod/display.php:244 mod/display.php:341 mod/viewsrc.php:22 -msgid "Item not found." -msgstr "Beitrag nicht gefunden." - -#: include/items.php:379 -msgid "Do you really want to delete this item?" -msgstr "Möchtest Du wirklich dieses Item löschen?" - -#: include/items.php:381 mod/api.php:110 mod/follow.php:150 -#: mod/profiles.php:543 mod/profiles.php:546 mod/profiles.php:568 -#: mod/settings.php:1094 mod/settings.php:1100 mod/settings.php:1107 -#: mod/settings.php:1111 mod/settings.php:1115 mod/settings.php:1119 -#: mod/settings.php:1123 mod/settings.php:1127 mod/settings.php:1147 -#: mod/settings.php:1148 mod/settings.php:1149 mod/settings.php:1150 -#: mod/settings.php:1151 mod/contacts.php:472 mod/dfrn_request.php:647 -#: mod/message.php:138 mod/register.php:238 mod/suggest.php:38 -msgid "Yes" -msgstr "Ja" - -#: include/items.php:398 mod/api.php:35 mod/api.php:40 mod/attach.php:38 -#: mod/common.php:26 mod/nogroup.php:28 mod/repair_ostatus.php:13 -#: mod/uimport.php:28 mod/manage.php:131 mod/wall_attach.php:74 -#: mod/wall_attach.php:77 mod/regmod.php:108 mod/wallmessage.php:16 -#: mod/wallmessage.php:40 mod/wallmessage.php:79 mod/wallmessage.php:103 -#: mod/fsuggest.php:80 mod/cal.php:304 mod/delegate.php:25 mod/delegate.php:43 -#: mod/delegate.php:54 mod/ostatus_subscribe.php:16 mod/profile_photo.php:30 -#: mod/profile_photo.php:176 mod/profile_photo.php:187 -#: mod/profile_photo.php:200 mod/follow.php:17 mod/follow.php:54 -#: mod/follow.php:118 mod/invite.php:20 mod/invite.php:111 mod/crepair.php:98 -#: mod/dfrn_confirm.php:68 mod/events.php:194 mod/group.php:26 -#: mod/profiles.php:182 mod/profiles.php:513 mod/settings.php:43 -#: mod/settings.php:142 mod/settings.php:659 mod/allfriends.php:21 -#: mod/contacts.php:386 mod/dirfind.php:24 mod/editpost.php:19 -#: mod/item.php:160 mod/message.php:59 mod/message.php:104 mod/network.php:32 -#: mod/notes.php:31 mod/notifications.php:65 mod/photos.php:175 -#: mod/photos.php:1032 mod/poke.php:146 mod/register.php:54 mod/suggest.php:60 -#: mod/unfollow.php:15 mod/unfollow.php:57 mod/unfollow.php:90 -#: mod/viewcontacts.php:57 mod/wall_upload.php:103 mod/wall_upload.php:106 -#: index.php:436 -msgid "Permission denied." -msgstr "Zugriff verweigert." - -#: include/items.php:468 src/Content/Feature.php:96 -msgid "Archives" -msgstr "Archiv" - -#: include/items.php:474 view/theme/vier/theme.php:258 -#: src/Content/Widget.php:317 src/Content/ForumManager.php:131 -#: src/Object/Post.php:429 src/App.php:527 -msgid "show more" -msgstr "mehr anzeigen" - -#: include/security.php:81 -msgid "Welcome " -msgstr "Willkommen " - -#: include/security.php:82 -msgid "Please upload a profile photo." -msgstr "Bitte lade ein Profilbild hoch." - -#: include/security.php:84 -msgid "Welcome back " -msgstr "Willkommen zurück " - -#: include/security.php:447 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)." - #: include/text.php:302 msgid "newer" msgstr "neuer" @@ -969,8 +970,8 @@ msgstr "Tags" #: include/text.php:996 mod/contacts.php:813 mod/contacts.php:874 #: mod/viewcontacts.php:122 view/theme/frio/theme.php:270 -#: src/Content/Nav.php:147 src/Content/Nav.php:213 src/Model/Profile.php:951 -#: src/Model/Profile.php:954 +#: src/Content/Nav.php:147 src/Content/Nav.php:213 src/Model/Profile.php:952 +#: src/Model/Profile.php:955 msgid "Contacts" msgstr "Kontakte" @@ -1205,7 +1206,7 @@ msgstr "Link zum Originalbeitrag" msgid "activity" msgstr "Aktivität" -#: include/text.php:1720 src/Object/Post.php:428 src/Object/Post.php:440 +#: include/text.php:1720 src/Object/Post.php:420 src/Object/Post.php:432 msgid "comment" msgid_plural "comments" msgstr[0] "Kommentar" @@ -1215,7 +1216,7 @@ msgstr[1] "Kommentare" msgid "post" msgstr "Beitrag" -#: include/text.php:1881 +#: include/text.php:1878 msgid "Item filed" msgstr "Beitrag abgelegt" @@ -1247,7 +1248,7 @@ msgstr "Möchtest Du dieser Anwendung den Zugriff auf Deine Beiträge und Kontak msgid "No" msgstr "Nein" -#: mod/apps.php:14 index.php:265 +#: mod/apps.php:14 index.php:275 msgid "You must be logged in to use addons. " msgstr "Sie müssen angemeldet sein um Addons benutzen zu können." @@ -1287,13 +1288,13 @@ msgid "" msgstr "Friendica ist ein Gemeinschaftsprojekt, das nicht ohne die Hilfe vieler Personen möglich wäre. Hier ist eine Aufzählung der Personen, die zum Code oder der Übersetzung beigetragen haben. Dank an alle !" #: mod/fbrowser.php:34 view/theme/frio/theme.php:261 src/Content/Nav.php:102 -#: src/Model/Profile.php:898 +#: src/Model/Profile.php:899 msgid "Photos" msgstr "Bilder" #: mod/fbrowser.php:43 mod/fbrowser.php:68 mod/photos.php:190 -#: mod/photos.php:1043 mod/photos.php:1130 mod/photos.php:1147 -#: mod/photos.php:1644 mod/photos.php:1658 src/Model/Photo.php:244 +#: mod/photos.php:1044 mod/photos.php:1131 mod/photos.php:1148 +#: mod/photos.php:1610 mod/photos.php:1624 src/Model/Photo.php:244 #: src/Model/Photo.php:253 msgid "Contact Photos" msgstr "Kontaktbilder" @@ -1384,8 +1385,8 @@ msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen #: mod/newmember.php:24 mod/profperm.php:113 mod/contacts.php:670 #: mod/contacts.php:862 view/theme/frio/theme.php:260 src/Content/Nav.php:101 -#: src/Model/Profile.php:724 src/Model/Profile.php:857 -#: src/Model/Profile.php:890 +#: src/Model/Profile.php:725 src/Model/Profile.php:858 +#: src/Model/Profile.php:891 msgid "Profile" msgstr "Profil" @@ -1600,12 +1601,12 @@ msgstr "Wähle eine Identität zum Verwalten aus: " #: mod/manage.php:184 mod/localtime.php:56 mod/fsuggest.php:114 #: mod/invite.php:154 mod/crepair.php:148 mod/install.php:198 #: mod/install.php:237 mod/events.php:531 mod/profiles.php:579 -#: mod/contacts.php:609 mod/message.php:246 mod/message.php:410 -#: mod/photos.php:1061 mod/photos.php:1141 mod/photos.php:1434 -#: mod/photos.php:1480 mod/photos.php:1519 mod/photos.php:1588 -#: mod/poke.php:196 view/theme/duepuntozero/config.php:71 +#: mod/contacts.php:609 mod/poke.php:196 mod/message.php:248 +#: mod/message.php:412 mod/photos.php:1062 mod/photos.php:1142 +#: mod/photos.php:1408 mod/photos.php:1454 mod/photos.php:1493 +#: mod/photos.php:1554 view/theme/duepuntozero/config.php:71 #: view/theme/frio/config.php:118 view/theme/quattro/config.php:73 -#: view/theme/vier/config.php:119 src/Object/Post.php:795 +#: view/theme/vier/config.php:119 src/Object/Post.php:787 msgid "Submit" msgstr "Senden" @@ -1677,10 +1678,10 @@ msgstr "Keine weiteren Systembenachrichtigungen." msgid "System Notifications" msgstr "Systembenachrichtigungen" -#: mod/probe.php:13 mod/webfinger.php:16 mod/community.php:27 -#: mod/videos.php:199 mod/dfrn_request.php:601 mod/directory.php:42 -#: mod/display.php:194 mod/photos.php:913 mod/search.php:99 mod/search.php:105 -#: mod/viewcontacts.php:45 +#: mod/probe.php:13 mod/webfinger.php:16 mod/videos.php:199 +#: mod/dfrn_request.php:601 mod/viewcontacts.php:45 mod/community.php:27 +#: mod/directory.php:42 mod/display.php:194 mod/photos.php:914 +#: mod/search.php:99 mod/search.php:105 msgid "Public access denied." msgstr "Öffentlicher Zugriff verweigert." @@ -1688,7 +1689,7 @@ msgstr "Öffentlicher Zugriff verweigert." msgid "Only logged in users are permitted to perform a probing." msgstr "Nur eingeloggten Benutzern ist das Untersuchen von Adressen gestattet." -#: mod/profperm.php:28 mod/group.php:83 index.php:435 +#: mod/profperm.php:28 mod/group.php:83 index.php:445 msgid "Permission denied" msgstr "Zugriff verweigert" @@ -1779,7 +1780,7 @@ msgstr "Nachricht gesendet." msgid "No recipient." msgstr "Kein Empfänger." -#: mod/wallmessage.php:132 mod/message.php:231 +#: mod/wallmessage.php:132 mod/message.php:233 msgid "Send Private Message" msgstr "Private Nachricht senden" @@ -1790,16 +1791,16 @@ msgid "" "your site allow private mail from unknown senders." msgstr "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern." -#: mod/wallmessage.php:134 mod/message.php:232 mod/message.php:399 +#: mod/wallmessage.php:134 mod/message.php:234 mod/message.php:401 msgid "To:" msgstr "An:" -#: mod/wallmessage.php:135 mod/message.php:236 mod/message.php:401 +#: mod/wallmessage.php:135 mod/message.php:238 mod/message.php:403 msgid "Subject:" msgstr "Betreff:" -#: mod/wallmessage.php:141 mod/invite.php:149 mod/message.php:240 -#: mod/message.php:404 +#: mod/wallmessage.php:141 mod/invite.php:149 mod/message.php:242 +#: mod/message.php:406 msgid "Your message:" msgstr "Deine Nachricht:" @@ -1812,7 +1813,7 @@ msgid "The post was created" msgstr "Der Beitrag wurde angelegt" #: mod/fsuggest.php:30 mod/fsuggest.php:96 mod/crepair.php:110 -#: mod/dfrn_confirm.php:129 mod/redir.php:28 mod/redir.php:92 +#: mod/dfrn_confirm.php:129 mod/redir.php:28 mod/redir.php:126 msgid "Contact not found." msgstr "Kontakt nicht gefunden." @@ -1835,7 +1836,7 @@ msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt." #: mod/cal.php:274 mod/events.php:391 view/theme/frio/theme.php:263 #: view/theme/frio/theme.php:267 src/Content/Nav.php:104 -#: src/Content/Nav.php:170 src/Model/Profile.php:918 src/Model/Profile.php:929 +#: src/Content/Nav.php:170 src/Model/Profile.php:919 src/Model/Profile.php:930 msgid "Events" msgstr "Veranstaltungen" @@ -1995,7 +1996,7 @@ msgstr "Erfolg" msgid "failed" msgstr "Fehlgeschlagen" -#: mod/ostatus_subscribe.php:83 src/Object/Post.php:278 +#: mod/ostatus_subscribe.php:83 src/Object/Post.php:270 msgid "ignored" msgstr "Ignoriert" @@ -2019,13 +2020,13 @@ msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue msgid "Unable to process image" msgstr "Bild konnte nicht verarbeitet werden" -#: mod/profile_photo.php:153 mod/photos.php:744 mod/photos.php:747 -#: mod/photos.php:776 mod/wall_upload.php:186 +#: mod/profile_photo.php:153 mod/wall_upload.php:186 mod/photos.php:745 +#: mod/photos.php:748 mod/photos.php:777 #, php-format msgid "Image exceeds size limit of %s" msgstr "Bildgröße überschreitet das Limit von %s" -#: mod/profile_photo.php:162 mod/photos.php:799 mod/wall_upload.php:200 +#: mod/profile_photo.php:162 mod/wall_upload.php:200 mod/photos.php:800 msgid "Unable to process image." msgstr "Konnte das Bild nicht bearbeiten." @@ -2065,7 +2066,7 @@ msgstr "Bearbeitung abgeschlossen" msgid "Image uploaded successfully." msgstr "Bild erfolgreich hochgeladen." -#: mod/profile_photo.php:307 mod/photos.php:828 mod/wall_upload.php:239 +#: mod/profile_photo.php:307 mod/wall_upload.php:239 mod/photos.php:829 msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." @@ -2116,12 +2117,12 @@ msgid "Profile URL" msgstr "Profil URL" #: mod/follow.php:174 mod/contacts.php:665 mod/notifications.php:246 -#: src/Model/Profile.php:788 +#: src/Model/Profile.php:789 msgid "Tags:" msgstr "Tags:" #: mod/follow.php:186 mod/contacts.php:857 mod/unfollow.php:132 -#: src/Model/Profile.php:885 +#: src/Model/Profile.php:886 msgid "Status Messages and Posts" msgstr "Statusnachrichten und Beiträge" @@ -2579,11 +2580,6 @@ msgstr "Pull/Feed-URL" msgid "New photo from this URL" msgstr "Neues Foto von dieser URL" -#: mod/dfrn_poll.php:123 mod/dfrn_poll.php:539 -#, php-format -msgid "%1$s welcomes %2$s" -msgstr "%1$s heißt %2$s herzlich willkommen" - #: mod/help.php:48 msgid "Help:" msgstr "Hilfe:" @@ -2593,11 +2589,11 @@ msgid "Help" msgstr "Hilfe" #: mod/help.php:60 mod/fetch.php:19 mod/fetch.php:45 mod/fetch.php:52 -#: index.php:312 +#: index.php:322 msgid "Not Found" msgstr "Nicht gefunden" -#: mod/help.php:63 index.php:317 +#: mod/help.php:63 index.php:327 msgid "Page not found." msgstr "Seite nicht gefunden." @@ -2734,44 +2730,6 @@ msgid "" " administrator email. This will allow you to enter the site admin panel." msgstr "Du solltest nun die Seite zur Nutzerregistrierung deiner neuen Friendica Instanz besuchen und einen neuen Nutzer einrichten. Bitte denke daran die selbe E-Mail Adresse anzugeben, die du auch als Administrator E-Mail angegeben hast, damit du das Admin-Panel verwenden kannst." -#: mod/community.php:34 mod/viewsrc.php:13 -msgid "Access denied." -msgstr "Zugriff verweigert." - -#: mod/community.php:51 -msgid "Community option not available." -msgstr "Optionen für die Gemeinschaftsseite nicht verfügbar." - -#: mod/community.php:68 -msgid "Not available." -msgstr "Nicht verfügbar." - -#: mod/community.php:81 -msgid "Local Community" -msgstr "Lokale Gemeinschaft" - -#: mod/community.php:84 -msgid "Posts from local users on this server" -msgstr "Beiträge von Nutzern dieses Servers" - -#: mod/community.php:92 -msgid "Global Community" -msgstr "Globale Gemeinschaft" - -#: mod/community.php:95 -msgid "Posts from users of the whole federated network" -msgstr "Beiträge von Nutzern des gesamten föderalen Netzwerks" - -#: mod/community.php:141 mod/search.php:229 -msgid "No results." -msgstr "Keine Ergebnisse." - -#: mod/community.php:185 -msgid "" -"This community stream shows all public posts received by this node. They may" -" not reflect the opinions of this node’s users." -msgstr "Diese Gemeinschaftsseite zeigt alle öffentlichen Beiträge, die auf diesem Knoten eingegangen sind. Der Inhalt entspricht nicht zwingend der Meinung der Nutzer dieses Servers." - #: mod/dfrn_confirm.php:74 mod/profiles.php:39 mod/profiles.php:149 #: mod/profiles.php:196 mod/profiles.php:525 msgid "Profile not found." @@ -2896,9 +2854,9 @@ msgstr "An Zeitzone des Betrachters anpassen" msgid "Description:" msgstr "Beschreibung" -#: mod/events.php:519 mod/contacts.php:659 mod/directory.php:148 -#: mod/notifications.php:242 src/Model/Event.php:60 src/Model/Event.php:85 -#: src/Model/Event.php:421 src/Model/Event.php:895 src/Model/Profile.php:413 +#: mod/events.php:519 mod/contacts.php:659 mod/notifications.php:242 +#: mod/directory.php:149 src/Model/Event.php:60 src/Model/Event.php:85 +#: src/Model/Event.php:421 src/Model/Event.php:895 src/Model/Profile.php:414 msgid "Location:" msgstr "Ort:" @@ -2910,16 +2868,16 @@ msgstr "Titel:" msgid "Share this event" msgstr "Veranstaltung teilen" -#: mod/events.php:532 src/Model/Profile.php:858 +#: mod/events.php:532 src/Model/Profile.php:859 msgid "Basic" msgstr "Allgemein" #: mod/events.php:533 mod/admin.php:1362 mod/contacts.php:894 -#: src/Model/Profile.php:859 +#: src/Model/Profile.php:860 msgid "Advanced" msgstr "Erweitert" -#: mod/events.php:534 mod/photos.php:1079 mod/photos.php:1430 +#: mod/events.php:534 mod/photos.php:1080 mod/photos.php:1404 #: src/Core/ACL.php:318 msgid "Permissions" msgstr "Berechtigungen" @@ -3113,7 +3071,7 @@ msgstr "Profilbild ändern" msgid "View this profile" msgstr "Dieses Profil anzeigen" -#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:389 +#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:390 msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" @@ -3170,7 +3128,7 @@ msgstr "Dein Geschlecht:" msgid "♥ Marital Status:" msgstr "♥ Beziehungsstatus:" -#: mod/profiles.php:601 src/Model/Profile.php:776 +#: mod/profiles.php:601 src/Model/Profile.php:777 msgid "Sexual Preference:" msgstr "Sexuelle Vorlieben:" @@ -3250,11 +3208,11 @@ msgstr "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auc msgid "Homepage URL:" msgstr "Adresse der Homepage:" -#: mod/profiles.php:628 src/Model/Profile.php:784 +#: mod/profiles.php:628 src/Model/Profile.php:785 msgid "Hometown:" msgstr "Heimatort:" -#: mod/profiles.php:629 src/Model/Profile.php:792 +#: mod/profiles.php:629 src/Model/Profile.php:793 msgid "Political Views:" msgstr "Politische Ansichten:" @@ -3278,11 +3236,11 @@ msgstr "Private Schlüsselwörter:" msgid "(Used for searching profiles, never shown to others)" msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)" -#: mod/profiles.php:633 src/Model/Profile.php:808 +#: mod/profiles.php:633 src/Model/Profile.php:809 msgid "Likes:" msgstr "Likes:" -#: mod/profiles.php:634 src/Model/Profile.php:812 +#: mod/profiles.php:634 src/Model/Profile.php:813 msgid "Dislikes:" msgstr "Dislikes:" @@ -3322,11 +3280,11 @@ msgstr "Schule/Ausbildung" msgid "Contact information and Social Networks" msgstr "Kontaktinformationen und Soziale Netzwerke" -#: mod/profiles.php:674 src/Model/Profile.php:385 +#: mod/profiles.php:674 src/Model/Profile.php:386 msgid "Profile Image" msgstr "Profilbild" -#: mod/profiles.php:676 src/Model/Profile.php:388 +#: mod/profiles.php:676 src/Model/Profile.php:389 msgid "visible to everybody" msgstr "sichtbar für jeden" @@ -3334,11 +3292,11 @@ msgstr "sichtbar für jeden" msgid "Edit/Manage Profiles" msgstr "Bearbeite/Verwalte Profile" -#: mod/profiles.php:684 src/Model/Profile.php:375 src/Model/Profile.php:397 +#: mod/profiles.php:684 src/Model/Profile.php:376 src/Model/Profile.php:398 msgid "Change profile photo" msgstr "Profilbild ändern" -#: mod/profiles.php:685 src/Model/Profile.php:376 +#: mod/profiles.php:685 src/Model/Profile.php:377 msgid "Create New Profile" msgstr "Neues Profil anlegen" @@ -4090,7 +4048,7 @@ msgstr "Passwort:" msgid "Basic Settings" msgstr "Grundeinstellungen" -#: mod/settings.php:1198 src/Model/Profile.php:732 +#: mod/settings.php:1198 src/Model/Profile.php:733 msgid "Full Name:" msgstr "Kompletter Name:" @@ -4140,11 +4098,11 @@ msgstr "Standard-Zugriffsrechte für Beiträge" msgid "(click to open/close)" msgstr "(klicke zum öffnen/schließen)" -#: mod/settings.php:1218 mod/photos.php:1087 mod/photos.php:1438 +#: mod/settings.php:1218 mod/photos.php:1088 mod/photos.php:1412 msgid "Show to Groups" msgstr "Zeige den Gruppen" -#: mod/settings.php:1219 mod/photos.php:1088 mod/photos.php:1439 +#: mod/settings.php:1219 mod/photos.php:1089 mod/photos.php:1413 msgid "Show to Contacts" msgstr "Zeige den Kontakten" @@ -4264,11 +4222,11 @@ msgstr "Video Löschen" msgid "No videos selected" msgstr "Keine Videos ausgewählt" -#: mod/videos.php:309 mod/photos.php:1017 +#: mod/videos.php:309 mod/photos.php:1018 msgid "Access to this item is restricted." msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt." -#: mod/videos.php:387 mod/photos.php:1690 +#: mod/videos.php:387 mod/photos.php:1656 msgid "View Album" msgstr "Album betrachten" @@ -6037,11 +5995,11 @@ msgid "No friends to display." msgstr "Keine Kontakte zum Anzeigen." #: mod/allfriends.php:90 mod/dirfind.php:214 mod/match.php:105 -#: mod/suggest.php:101 src/Content/Widget.php:37 src/Model/Profile.php:293 +#: mod/suggest.php:101 src/Content/Widget.php:37 src/Model/Profile.php:294 msgid "Connect" msgstr "Verbinden" -#: mod/contacts.php:71 mod/notifications.php:255 src/Model/Profile.php:516 +#: mod/contacts.php:71 mod/notifications.php:255 src/Model/Profile.php:517 msgid "Network:" msgstr "Netzwerk:" @@ -6283,12 +6241,12 @@ msgid "" "when \"Fetch information and keywords\" is selected" msgstr "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde" -#: mod/contacts.php:661 src/Model/Profile.php:420 +#: mod/contacts.php:661 src/Model/Profile.php:421 msgid "XMPP:" msgstr "XMPP:" -#: mod/contacts.php:663 mod/directory.php:154 mod/notifications.php:244 -#: src/Model/Profile.php:419 src/Model/Profile.php:800 +#: mod/contacts.php:663 mod/notifications.php:244 mod/directory.php:155 +#: src/Model/Profile.php:420 src/Model/Profile.php:801 msgid "About:" msgstr "Über:" @@ -6297,7 +6255,7 @@ msgid "Actions" msgstr "Aktionen" #: mod/contacts.php:668 mod/contacts.php:854 view/theme/frio/theme.php:259 -#: src/Content/Nav.php:100 src/Model/Profile.php:882 +#: src/Content/Nav.php:100 src/Model/Profile.php:883 msgid "Status" msgstr "Status" @@ -6361,12 +6319,12 @@ msgstr "Nur verborgene Kontakte anzeigen" msgid "Search your contacts" msgstr "Suche in deinen Kontakten" -#: mod/contacts.php:818 mod/search.php:237 +#: mod/contacts.php:818 mod/search.php:242 #, php-format msgid "Results for: %s" msgstr "Ergebnisse für: %s" -#: mod/contacts.php:819 mod/directory.php:209 view/theme/vier/theme.php:203 +#: mod/contacts.php:819 mod/directory.php:210 view/theme/vier/theme.php:203 #: src/Content/Widget.php:63 msgid "Find" msgstr "Finde" @@ -6383,7 +6341,7 @@ msgstr "Aus Archiv zurückholen" msgid "Batch Actions" msgstr "Stapelverarbeitung" -#: mod/contacts.php:865 src/Model/Profile.php:893 +#: mod/contacts.php:865 src/Model/Profile.php:894 msgid "Profile Details" msgstr "Profildetails" @@ -6411,8 +6369,8 @@ msgstr "ist ein Fan von dir" msgid "you are a fan of" msgstr "Du bist Fan von" -#: mod/contacts.php:952 mod/photos.php:1477 mod/photos.php:1516 -#: mod/photos.php:1585 src/Object/Post.php:792 +#: mod/contacts.php:952 mod/photos.php:1451 mod/photos.php:1490 +#: mod/photos.php:1551 src/Object/Post.php:784 msgid "This is you" msgstr "Das bist Du" @@ -6581,40 +6539,6 @@ msgid "" " bar." msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste." -#: mod/directory.php:151 mod/notifications.php:248 src/Model/Profile.php:416 -#: src/Model/Profile.php:739 -msgid "Gender:" -msgstr "Geschlecht:" - -#: mod/directory.php:152 src/Model/Profile.php:417 src/Model/Profile.php:763 -msgid "Status:" -msgstr "Status:" - -#: mod/directory.php:153 src/Model/Profile.php:418 src/Model/Profile.php:780 -msgid "Homepage:" -msgstr "Homepage:" - -#: mod/directory.php:202 view/theme/vier/theme.php:208 -#: src/Content/Widget.php:68 -msgid "Global Directory" -msgstr "Weltweites Verzeichnis" - -#: mod/directory.php:204 -msgid "Find on this site" -msgstr "Auf diesem Server suchen" - -#: mod/directory.php:206 -msgid "Results for:" -msgstr "Ergebnisse für:" - -#: mod/directory.php:208 -msgid "Site Directory" -msgstr "Verzeichnis" - -#: mod/directory.php:213 -msgid "No entries (some entries may be hidden)." -msgstr "Keine Einträge (einige Einträge könnten versteckt sein)." - #: mod/dirfind.php:48 #, php-format msgid "People Search - %s" @@ -6645,42 +6569,6 @@ msgstr "Cc: E-Mail-Addressen" msgid "Example: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com" -#: mod/item.php:114 -msgid "Unable to locate original post." -msgstr "Konnte den Originalbeitrag nicht finden." - -#: mod/item.php:274 -msgid "Empty post discarded." -msgstr "Leerer Beitrag wurde verworfen." - -#: mod/item.php:471 mod/wall_upload.php:231 src/Object/Image.php:953 -#: src/Object/Image.php:969 src/Object/Image.php:977 src/Object/Image.php:1002 -msgid "Wall Photos" -msgstr "Pinnwand-Bilder" - -#: mod/item.php:804 -#, php-format -msgid "" -"This message was sent to you by %s, a member of the Friendica social " -"network." -msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica." - -#: mod/item.php:806 -#, php-format -msgid "You may visit them online at %s" -msgstr "Du kannst sie online unter %s besuchen" - -#: mod/item.php:807 -msgid "" -"Please contact the sender by replying to this post if you do not wish to " -"receive these messages." -msgstr "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest." - -#: mod/item.php:811 -#, php-format -msgid "%s posted an update." -msgstr "%s hat ein Update veröffentlicht." - #: mod/match.php:48 msgid "No keywords to match. Please add keywords to your default profile." msgstr "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu Deinem Standardprofil hinzu." @@ -6693,174 +6581,6 @@ msgstr "ist interessiert an:" msgid "Profile Match" msgstr "Profilübereinstimmungen" -#: mod/message.php:30 src/Content/Nav.php:199 -msgid "New Message" -msgstr "Neue Nachricht" - -#: mod/message.php:77 -msgid "Unable to locate contact information." -msgstr "Konnte die Kontaktinformationen nicht finden." - -#: mod/message.php:112 view/theme/frio/theme.php:268 src/Content/Nav.php:196 -msgid "Messages" -msgstr "Nachrichten" - -#: mod/message.php:136 -msgid "Do you really want to delete this message?" -msgstr "Möchtest Du wirklich diese Nachricht löschen?" - -#: mod/message.php:152 -msgid "Message deleted." -msgstr "Nachricht gelöscht." - -#: mod/message.php:166 -msgid "Conversation removed." -msgstr "Unterhaltung gelöscht." - -#: mod/message.php:272 -msgid "No messages." -msgstr "Keine Nachrichten." - -#: mod/message.php:311 -msgid "Message not available." -msgstr "Nachricht nicht verfügbar." - -#: mod/message.php:375 -msgid "Delete message" -msgstr "Nachricht löschen" - -#: mod/message.php:377 mod/message.php:478 -msgid "D, d M Y - g:i A" -msgstr "D, d. M Y - H:i" - -#: mod/message.php:392 mod/message.php:475 -msgid "Delete conversation" -msgstr "Unterhaltung löschen" - -#: mod/message.php:394 -msgid "" -"No secure communications available. You may be able to " -"respond from the sender's profile page." -msgstr "Sichere Kommunikation ist nicht verfügbar. Eventuell kannst Du auf der Profilseite des Absenders antworten." - -#: mod/message.php:398 -msgid "Send Reply" -msgstr "Antwort senden" - -#: mod/message.php:449 -#, php-format -msgid "Unknown sender - %s" -msgstr "'Unbekannter Absender - %s" - -#: mod/message.php:451 -#, php-format -msgid "You and %s" -msgstr "Du und %s" - -#: mod/message.php:453 -#, php-format -msgid "%s and You" -msgstr "%s und Du" - -#: mod/message.php:481 -#, php-format -msgid "%d message" -msgid_plural "%d messages" -msgstr[0] "%d Nachricht" -msgstr[1] "%d Nachrichten" - -#: mod/network.php:192 mod/search.php:38 -msgid "Remove term" -msgstr "Begriff entfernen" - -#: mod/network.php:199 mod/search.php:47 src/Content/Feature.php:100 -msgid "Saved Searches" -msgstr "Gespeicherte Suchen" - -#: mod/network.php:200 src/Model/Group.php:413 -msgid "add" -msgstr "hinzufügen" - -#: mod/network.php:544 -#, php-format -msgid "" -"Warning: This group contains %s member from a network that doesn't allow non" -" public messages." -msgid_plural "" -"Warning: This group contains %s members from a network that doesn't allow " -"non public messages." -msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem Netzwerk das keine nicht öffentlichen Beiträge empfangen kann." -msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken die keine nicht-öffentlichen Beiträge empfangen können." - -#: mod/network.php:547 -msgid "Messages in this group won't be send to these receivers." -msgstr "Beiträge in dieser Gruppe werden deshalb nicht an diese Personen zugestellt werden." - -#: mod/network.php:615 -msgid "No such group" -msgstr "Es gibt keine solche Gruppe" - -#: mod/network.php:640 -#, php-format -msgid "Group: %s" -msgstr "Gruppe: %s" - -#: mod/network.php:666 -msgid "Private messages to this person are at risk of public disclosure." -msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen." - -#: mod/network.php:669 -msgid "Invalid contact." -msgstr "Ungültiger Kontakt." - -#: mod/network.php:940 -msgid "Commented Order" -msgstr "Neueste Kommentare" - -#: mod/network.php:943 -msgid "Sort by Comment Date" -msgstr "Nach Kommentardatum sortieren" - -#: mod/network.php:948 -msgid "Posted Order" -msgstr "Neueste Beiträge" - -#: mod/network.php:951 -msgid "Sort by Post Date" -msgstr "Nach Beitragsdatum sortieren" - -#: mod/network.php:962 -msgid "Posts that mention or involve you" -msgstr "Beiträge, in denen es um Dich geht" - -#: mod/network.php:970 -msgid "New" -msgstr "Neue" - -#: mod/network.php:973 -msgid "Activity Stream - by date" -msgstr "Aktivitäten-Stream - nach Datum" - -#: mod/network.php:981 -msgid "Shared Links" -msgstr "Geteilte Links" - -#: mod/network.php:984 -msgid "Interesting Links" -msgstr "Interessante Links" - -#: mod/network.php:992 -msgid "Starred" -msgstr "Markierte" - -#: mod/network.php:995 -msgid "Favourite Posts" -msgstr "Favorisierte Beiträge" - -#: mod/notes.php:41 src/Model/Profile.php:940 -msgid "Personal Notes" -msgstr "Persönliche Notizen" - #: mod/notifications.php:33 msgid "Invalid request identifier." msgstr "Invalid request identifier." @@ -6951,6 +6671,11 @@ msgstr "Teilenden" msgid "Subscriber" msgstr "Abonnent" +#: mod/notifications.php:248 mod/directory.php:152 src/Model/Profile.php:417 +#: src/Model/Profile.php:740 +msgid "Gender:" +msgstr "Geschlecht:" + #: mod/notifications.php:269 msgid "No introductions." msgstr "Keine Kontaktanfragen." @@ -6968,199 +6693,6 @@ msgstr "Alle anzeigen" msgid "No more %s notifications." msgstr "Keine weiteren %s Benachrichtigungen" -#: mod/photos.php:109 src/Model/Profile.php:901 -msgid "Photo Albums" -msgstr "Fotoalben" - -#: mod/photos.php:110 mod/photos.php:1699 -msgid "Recent Photos" -msgstr "Neueste Fotos" - -#: mod/photos.php:113 mod/photos.php:1191 mod/photos.php:1701 -msgid "Upload New Photos" -msgstr "Neue Fotos hochladen" - -#: mod/photos.php:182 -msgid "Contact information unavailable" -msgstr "Kontaktinformationen nicht verfügbar" - -#: mod/photos.php:200 -msgid "Album not found." -msgstr "Album nicht gefunden." - -#: mod/photos.php:230 mod/photos.php:241 mod/photos.php:1142 -msgid "Delete Album" -msgstr "Album löschen" - -#: mod/photos.php:239 -msgid "Do you really want to delete this photo album and all its photos?" -msgstr "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?" - -#: mod/photos.php:299 mod/photos.php:310 mod/photos.php:1435 -msgid "Delete Photo" -msgstr "Foto löschen" - -#: mod/photos.php:308 -msgid "Do you really want to delete this photo?" -msgstr "Möchtest Du wirklich dieses Foto löschen?" - -#: mod/photos.php:648 -msgid "a photo" -msgstr "einem Foto" - -#: mod/photos.php:648 -#, php-format -msgid "%1$s was tagged in %2$s by %3$s" -msgstr "%1$s wurde von %3$s in %2$s getaggt" - -#: mod/photos.php:750 -msgid "Image upload didn't complete, please try again" -msgstr "Der Upload des Bildes war nicht vollständig. Bitte versuche es erneut." - -#: mod/photos.php:753 -msgid "Image file is missing" -msgstr "Bilddatei konnte nicht gefunden werden." - -#: mod/photos.php:758 -msgid "" -"Server can't accept new file upload at this time, please contact your " -"administrator" -msgstr "Der Server kann derzeit keine neuen Datei Uploads akzeptieren. Bitte kontaktiere deinen Administrator." - -#: mod/photos.php:784 -msgid "Image file is empty." -msgstr "Bilddatei ist leer." - -#: mod/photos.php:921 -msgid "No photos selected" -msgstr "Keine Bilder ausgewählt" - -#: mod/photos.php:1071 -msgid "Upload Photos" -msgstr "Bilder hochladen" - -#: mod/photos.php:1075 mod/photos.php:1137 -msgid "New album name: " -msgstr "Name des neuen Albums: " - -#: mod/photos.php:1076 -msgid "or existing album name: " -msgstr "oder existierender Albumname: " - -#: mod/photos.php:1077 -msgid "Do not show a status post for this upload" -msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" - -#: mod/photos.php:1148 -msgid "Edit Album" -msgstr "Album bearbeiten" - -#: mod/photos.php:1153 -msgid "Show Newest First" -msgstr "Zeige neueste zuerst" - -#: mod/photos.php:1155 -msgid "Show Oldest First" -msgstr "Zeige älteste zuerst" - -#: mod/photos.php:1176 mod/photos.php:1684 -msgid "View Photo" -msgstr "Foto betrachten" - -#: mod/photos.php:1217 -msgid "Permission denied. Access to this item may be restricted." -msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein." - -#: mod/photos.php:1219 -msgid "Photo not available" -msgstr "Foto nicht verfügbar" - -#: mod/photos.php:1287 -msgid "View photo" -msgstr "Fotos ansehen" - -#: mod/photos.php:1287 -msgid "Edit photo" -msgstr "Foto bearbeiten" - -#: mod/photos.php:1288 -msgid "Use as profile photo" -msgstr "Als Profilbild verwenden" - -#: mod/photos.php:1294 src/Object/Post.php:148 -msgid "Private Message" -msgstr "Private Nachricht" - -#: mod/photos.php:1314 -msgid "View Full Size" -msgstr "Betrachte Originalgröße" - -#: mod/photos.php:1403 -msgid "Tags: " -msgstr "Tags: " - -#: mod/photos.php:1406 -msgid "[Remove any tag]" -msgstr "[Tag entfernen]" - -#: mod/photos.php:1421 -msgid "New album name" -msgstr "Name des neuen Albums" - -#: mod/photos.php:1422 -msgid "Caption" -msgstr "Bildunterschrift" - -#: mod/photos.php:1423 -msgid "Add a Tag" -msgstr "Tag hinzufügen" - -#: mod/photos.php:1423 -msgid "" -"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" - -#: mod/photos.php:1424 -msgid "Do not rotate" -msgstr "Nicht rotieren" - -#: mod/photos.php:1425 -msgid "Rotate CW (right)" -msgstr "Drehen US (rechts)" - -#: mod/photos.php:1426 -msgid "Rotate CCW (left)" -msgstr "Drehen EUS (links)" - -#: mod/photos.php:1460 src/Object/Post.php:295 -msgid "I like this (toggle)" -msgstr "Ich mag das (toggle)" - -#: mod/photos.php:1461 src/Object/Post.php:296 -msgid "I don't like this (toggle)" -msgstr "Ich mag das nicht (toggle)" - -#: mod/photos.php:1479 mod/photos.php:1518 mod/photos.php:1587 -#: src/Object/Post.php:398 src/Object/Post.php:794 -msgid "Comment" -msgstr "Kommentar" - -#: mod/photos.php:1619 -msgid "Map" -msgstr "Karte" - -#: mod/ping.php:287 -msgid "{0} wants to be your friend" -msgstr "{0} möchte mit Dir in Kontakt treten" - -#: mod/ping.php:302 -msgid "{0} sent you a message" -msgstr "{0} schickte Dir eine Nachricht" - -#: mod/ping.php:317 -msgid "{0} requested registration" -msgstr "{0} möchte sich registrieren" - #: mod/poke.php:189 msgid "Poke/Prod" msgstr "Anstupsen" @@ -7181,29 +6713,6 @@ msgstr "Was willst Du mit dem Empfänger machen:" msgid "Make this post private" msgstr "Diesen Beitrag privat machen" -#: mod/profile.php:37 src/Model/Profile.php:118 -msgid "Requested profile is not available." -msgstr "Das angefragte Profil ist nicht vorhanden." - -#: mod/profile.php:78 mod/profile.php:81 src/Protocol/OStatus.php:1251 -#, php-format -msgid "%s's timeline" -msgstr "Timeline von %s" - -#: mod/profile.php:79 src/Protocol/OStatus.php:1252 -#, php-format -msgid "%s's posts" -msgstr "Beiträge von %s" - -#: mod/profile.php:80 src/Protocol/OStatus.php:1253 -#, php-format -msgid "%s's comments" -msgstr "Kommentare von %s" - -#: mod/profile.php:195 -msgid "Tips for New Members" -msgstr "Tipps für neue Nutzer" - #: mod/register.php:100 msgid "" "Registration successful. Please check your email for further instructions." @@ -7297,28 +6806,6 @@ msgstr "Registrieren" msgid "Import your profile to this friendica instance" msgstr "Importiere Dein Profil auf diese Friendica Instanz" -#: mod/search.php:106 -msgid "Only logged in users are permitted to perform a search." -msgstr "Nur eingeloggten Benutzern ist das Suchen gestattet." - -#: mod/search.php:130 -msgid "Too Many Requests" -msgstr "Zu viele Abfragen" - -#: mod/search.php:131 -msgid "Only one search per minute is permitted for not logged in users." -msgstr "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet." - -#: mod/search.php:235 -#, php-format -msgid "Items tagged with: %s" -msgstr "Beiträge die mit %s getaggt sind" - -#: mod/subthread.php:113 -#, php-format -msgid "%1$s is following %2$s's %3$s" -msgstr "%1$s folgt %2$s %3$s" - #: mod/suggest.php:36 msgid "Do you really want to delete this suggestion?" msgstr "Möchtest Du wirklich diese Empfehlung löschen?" @@ -7374,6 +6861,520 @@ msgstr "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]" msgid "No contacts." msgstr "Keine Kontakte." +#: mod/viewsrc.php:13 mod/community.php:34 +msgid "Access denied." +msgstr "Zugriff verweigert." + +#: mod/wall_upload.php:231 mod/item.php:471 src/Object/Image.php:953 +#: src/Object/Image.php:969 src/Object/Image.php:977 src/Object/Image.php:1002 +msgid "Wall Photos" +msgstr "Pinnwand-Bilder" + +#: mod/community.php:51 +msgid "Community option not available." +msgstr "Optionen für die Gemeinschaftsseite nicht verfügbar." + +#: mod/community.php:68 +msgid "Not available." +msgstr "Nicht verfügbar." + +#: mod/community.php:81 +msgid "Local Community" +msgstr "Lokale Gemeinschaft" + +#: mod/community.php:84 +msgid "Posts from local users on this server" +msgstr "Beiträge von Nutzern dieses Servers" + +#: mod/community.php:92 +msgid "Global Community" +msgstr "Globale Gemeinschaft" + +#: mod/community.php:95 +msgid "Posts from users of the whole federated network" +msgstr "Beiträge von Nutzern des gesamten föderalen Netzwerks" + +#: mod/community.php:141 mod/search.php:234 +msgid "No results." +msgstr "Keine Ergebnisse." + +#: mod/community.php:185 +msgid "" +"This community stream shows all public posts received by this node. They may" +" not reflect the opinions of this node’s users." +msgstr "Diese Gemeinschaftsseite zeigt alle öffentlichen Beiträge, die auf diesem Knoten eingegangen sind. Der Inhalt entspricht nicht zwingend der Meinung der Nutzer dieses Servers." + +#: mod/dfrn_poll.php:124 mod/dfrn_poll.php:541 +#, php-format +msgid "%1$s welcomes %2$s" +msgstr "%1$s heißt %2$s herzlich willkommen" + +#: mod/directory.php:153 src/Model/Profile.php:418 src/Model/Profile.php:764 +msgid "Status:" +msgstr "Status:" + +#: mod/directory.php:154 src/Model/Profile.php:419 src/Model/Profile.php:781 +msgid "Homepage:" +msgstr "Homepage:" + +#: mod/directory.php:203 view/theme/vier/theme.php:208 +#: src/Content/Widget.php:68 +msgid "Global Directory" +msgstr "Weltweites Verzeichnis" + +#: mod/directory.php:205 +msgid "Find on this site" +msgstr "Auf diesem Server suchen" + +#: mod/directory.php:207 +msgid "Results for:" +msgstr "Ergebnisse für:" + +#: mod/directory.php:209 +msgid "Site Directory" +msgstr "Verzeichnis" + +#: mod/directory.php:214 +msgid "No entries (some entries may be hidden)." +msgstr "Keine Einträge (einige Einträge könnten versteckt sein)." + +#: mod/item.php:114 +msgid "Unable to locate original post." +msgstr "Konnte den Originalbeitrag nicht finden." + +#: mod/item.php:274 +msgid "Empty post discarded." +msgstr "Leerer Beitrag wurde verworfen." + +#: mod/item.php:804 +#, php-format +msgid "" +"This message was sent to you by %s, a member of the Friendica social " +"network." +msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica." + +#: mod/item.php:806 +#, php-format +msgid "You may visit them online at %s" +msgstr "Du kannst sie online unter %s besuchen" + +#: mod/item.php:807 +msgid "" +"Please contact the sender by replying to this post if you do not wish to " +"receive these messages." +msgstr "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest." + +#: mod/item.php:811 +#, php-format +msgid "%s posted an update." +msgstr "%s hat ein Update veröffentlicht." + +#: mod/message.php:30 src/Content/Nav.php:199 +msgid "New Message" +msgstr "Neue Nachricht" + +#: mod/message.php:77 +msgid "Unable to locate contact information." +msgstr "Konnte die Kontaktinformationen nicht finden." + +#: mod/message.php:112 view/theme/frio/theme.php:268 src/Content/Nav.php:196 +msgid "Messages" +msgstr "Nachrichten" + +#: mod/message.php:136 +msgid "Do you really want to delete this message?" +msgstr "Möchtest Du wirklich diese Nachricht löschen?" + +#: mod/message.php:153 +msgid "Message deleted." +msgstr "Nachricht gelöscht." + +#: mod/message.php:168 +msgid "Conversation removed." +msgstr "Unterhaltung gelöscht." + +#: mod/message.php:274 +msgid "No messages." +msgstr "Keine Nachrichten." + +#: mod/message.php:313 +msgid "Message not available." +msgstr "Nachricht nicht verfügbar." + +#: mod/message.php:377 +msgid "Delete message" +msgstr "Nachricht löschen" + +#: mod/message.php:379 mod/message.php:480 +msgid "D, d M Y - g:i A" +msgstr "D, d. M Y - H:i" + +#: mod/message.php:394 mod/message.php:477 +msgid "Delete conversation" +msgstr "Unterhaltung löschen" + +#: mod/message.php:396 +msgid "" +"No secure communications available. You may be able to " +"respond from the sender's profile page." +msgstr "Sichere Kommunikation ist nicht verfügbar. Eventuell kannst Du auf der Profilseite des Absenders antworten." + +#: mod/message.php:400 +msgid "Send Reply" +msgstr "Antwort senden" + +#: mod/message.php:451 +#, php-format +msgid "Unknown sender - %s" +msgstr "'Unbekannter Absender - %s" + +#: mod/message.php:453 +#, php-format +msgid "You and %s" +msgstr "Du und %s" + +#: mod/message.php:455 +#, php-format +msgid "%s and You" +msgstr "%s und Du" + +#: mod/message.php:483 +#, php-format +msgid "%d message" +msgid_plural "%d messages" +msgstr[0] "%d Nachricht" +msgstr[1] "%d Nachrichten" + +#: mod/network.php:192 mod/search.php:38 +msgid "Remove term" +msgstr "Begriff entfernen" + +#: mod/network.php:199 mod/search.php:47 src/Content/Feature.php:100 +msgid "Saved Searches" +msgstr "Gespeicherte Suchen" + +#: mod/network.php:200 src/Model/Group.php:413 +msgid "add" +msgstr "hinzufügen" + +#: mod/network.php:544 +#, php-format +msgid "" +"Warning: This group contains %s member from a network that doesn't allow non" +" public messages." +msgid_plural "" +"Warning: This group contains %s members from a network that doesn't allow " +"non public messages." +msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem Netzwerk das keine nicht öffentlichen Beiträge empfangen kann." +msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken die keine nicht-öffentlichen Beiträge empfangen können." + +#: mod/network.php:547 +msgid "Messages in this group won't be send to these receivers." +msgstr "Beiträge in dieser Gruppe werden deshalb nicht an diese Personen zugestellt werden." + +#: mod/network.php:615 +msgid "No such group" +msgstr "Es gibt keine solche Gruppe" + +#: mod/network.php:640 +#, php-format +msgid "Group: %s" +msgstr "Gruppe: %s" + +#: mod/network.php:666 +msgid "Private messages to this person are at risk of public disclosure." +msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen." + +#: mod/network.php:669 +msgid "Invalid contact." +msgstr "Ungültiger Kontakt." + +#: mod/network.php:940 +msgid "Commented Order" +msgstr "Neueste Kommentare" + +#: mod/network.php:943 +msgid "Sort by Comment Date" +msgstr "Nach Kommentardatum sortieren" + +#: mod/network.php:948 +msgid "Posted Order" +msgstr "Neueste Beiträge" + +#: mod/network.php:951 +msgid "Sort by Post Date" +msgstr "Nach Beitragsdatum sortieren" + +#: mod/network.php:962 +msgid "Posts that mention or involve you" +msgstr "Beiträge, in denen es um Dich geht" + +#: mod/network.php:970 +msgid "New" +msgstr "Neue" + +#: mod/network.php:973 +msgid "Activity Stream - by date" +msgstr "Aktivitäten-Stream - nach Datum" + +#: mod/network.php:981 +msgid "Shared Links" +msgstr "Geteilte Links" + +#: mod/network.php:984 +msgid "Interesting Links" +msgstr "Interessante Links" + +#: mod/network.php:992 +msgid "Starred" +msgstr "Markierte" + +#: mod/network.php:995 +msgid "Favourite Posts" +msgstr "Favorisierte Beiträge" + +#: mod/notes.php:41 src/Model/Profile.php:941 +msgid "Personal Notes" +msgstr "Persönliche Notizen" + +#: mod/photos.php:109 src/Model/Profile.php:902 +msgid "Photo Albums" +msgstr "Fotoalben" + +#: mod/photos.php:110 mod/photos.php:1665 +msgid "Recent Photos" +msgstr "Neueste Fotos" + +#: mod/photos.php:113 mod/photos.php:1192 mod/photos.php:1667 +msgid "Upload New Photos" +msgstr "Neue Fotos hochladen" + +#: mod/photos.php:182 +msgid "Contact information unavailable" +msgstr "Kontaktinformationen nicht verfügbar" + +#: mod/photos.php:200 +msgid "Album not found." +msgstr "Album nicht gefunden." + +#: mod/photos.php:230 mod/photos.php:241 mod/photos.php:1143 +msgid "Delete Album" +msgstr "Album löschen" + +#: mod/photos.php:239 +msgid "Do you really want to delete this photo album and all its photos?" +msgstr "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?" + +#: mod/photos.php:299 mod/photos.php:310 mod/photos.php:1409 +msgid "Delete Photo" +msgstr "Foto löschen" + +#: mod/photos.php:308 +msgid "Do you really want to delete this photo?" +msgstr "Möchtest Du wirklich dieses Foto löschen?" + +#: mod/photos.php:649 +msgid "a photo" +msgstr "einem Foto" + +#: mod/photos.php:649 +#, php-format +msgid "%1$s was tagged in %2$s by %3$s" +msgstr "%1$s wurde von %3$s in %2$s getaggt" + +#: mod/photos.php:751 +msgid "Image upload didn't complete, please try again" +msgstr "Der Upload des Bildes war nicht vollständig. Bitte versuche es erneut." + +#: mod/photos.php:754 +msgid "Image file is missing" +msgstr "Bilddatei konnte nicht gefunden werden." + +#: mod/photos.php:759 +msgid "" +"Server can't accept new file upload at this time, please contact your " +"administrator" +msgstr "Der Server kann derzeit keine neuen Datei Uploads akzeptieren. Bitte kontaktiere deinen Administrator." + +#: mod/photos.php:785 +msgid "Image file is empty." +msgstr "Bilddatei ist leer." + +#: mod/photos.php:922 +msgid "No photos selected" +msgstr "Keine Bilder ausgewählt" + +#: mod/photos.php:1072 +msgid "Upload Photos" +msgstr "Bilder hochladen" + +#: mod/photos.php:1076 mod/photos.php:1138 +msgid "New album name: " +msgstr "Name des neuen Albums: " + +#: mod/photos.php:1077 +msgid "or existing album name: " +msgstr "oder existierender Albumname: " + +#: mod/photos.php:1078 +msgid "Do not show a status post for this upload" +msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" + +#: mod/photos.php:1149 +msgid "Edit Album" +msgstr "Album bearbeiten" + +#: mod/photos.php:1154 +msgid "Show Newest First" +msgstr "Zeige neueste zuerst" + +#: mod/photos.php:1156 +msgid "Show Oldest First" +msgstr "Zeige älteste zuerst" + +#: mod/photos.php:1177 mod/photos.php:1650 +msgid "View Photo" +msgstr "Foto betrachten" + +#: mod/photos.php:1218 +msgid "Permission denied. Access to this item may be restricted." +msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein." + +#: mod/photos.php:1220 +msgid "Photo not available" +msgstr "Foto nicht verfügbar" + +#: mod/photos.php:1289 +msgid "View photo" +msgstr "Fotos ansehen" + +#: mod/photos.php:1289 +msgid "Edit photo" +msgstr "Foto bearbeiten" + +#: mod/photos.php:1290 +msgid "Use as profile photo" +msgstr "Als Profilbild verwenden" + +#: mod/photos.php:1296 src/Object/Post.php:148 +msgid "Private Message" +msgstr "Private Nachricht" + +#: mod/photos.php:1316 +msgid "View Full Size" +msgstr "Betrachte Originalgröße" + +#: mod/photos.php:1377 +msgid "Tags: " +msgstr "Tags: " + +#: mod/photos.php:1380 +msgid "[Remove any tag]" +msgstr "[Tag entfernen]" + +#: mod/photos.php:1395 +msgid "New album name" +msgstr "Name des neuen Albums" + +#: mod/photos.php:1396 +msgid "Caption" +msgstr "Bildunterschrift" + +#: mod/photos.php:1397 +msgid "Add a Tag" +msgstr "Tag hinzufügen" + +#: mod/photos.php:1397 +msgid "" +"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" + +#: mod/photos.php:1398 +msgid "Do not rotate" +msgstr "Nicht rotieren" + +#: mod/photos.php:1399 +msgid "Rotate CW (right)" +msgstr "Drehen US (rechts)" + +#: mod/photos.php:1400 +msgid "Rotate CCW (left)" +msgstr "Drehen EUS (links)" + +#: mod/photos.php:1434 src/Object/Post.php:287 +msgid "I like this (toggle)" +msgstr "Ich mag das (toggle)" + +#: mod/photos.php:1435 src/Object/Post.php:288 +msgid "I don't like this (toggle)" +msgstr "Ich mag das nicht (toggle)" + +#: mod/photos.php:1453 mod/photos.php:1492 mod/photos.php:1553 +#: src/Object/Post.php:390 src/Object/Post.php:786 +msgid "Comment" +msgstr "Kommentar" + +#: mod/photos.php:1585 +msgid "Map" +msgstr "Karte" + +#: mod/ping.php:287 +msgid "{0} wants to be your friend" +msgstr "{0} möchte mit Dir in Kontakt treten" + +#: mod/ping.php:302 +msgid "{0} sent you a message" +msgstr "{0} schickte Dir eine Nachricht" + +#: mod/ping.php:317 +msgid "{0} requested registration" +msgstr "{0} möchte sich registrieren" + +#: mod/profile.php:37 src/Model/Profile.php:119 +msgid "Requested profile is not available." +msgstr "Das angefragte Profil ist nicht vorhanden." + +#: mod/profile.php:78 mod/profile.php:81 src/Protocol/OStatus.php:1251 +#, php-format +msgid "%s's timeline" +msgstr "Timeline von %s" + +#: mod/profile.php:79 src/Protocol/OStatus.php:1252 +#, php-format +msgid "%s's posts" +msgstr "Beiträge von %s" + +#: mod/profile.php:80 src/Protocol/OStatus.php:1253 +#, php-format +msgid "%s's comments" +msgstr "Kommentare von %s" + +#: mod/profile.php:195 +msgid "Tips for New Members" +msgstr "Tipps für neue Nutzer" + +#: mod/search.php:106 +msgid "Only logged in users are permitted to perform a search." +msgstr "Nur eingeloggten Benutzern ist das Suchen gestattet." + +#: mod/search.php:130 +msgid "Too Many Requests" +msgstr "Zu viele Abfragen" + +#: mod/search.php:131 +msgid "Only one search per minute is permitted for not logged in users." +msgstr "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet." + +#: mod/search.php:240 +#, php-format +msgid "Items tagged with: %s" +msgstr "Beiträge die mit %s getaggt sind" + +#: mod/subthread.php:113 +#, php-format +msgid "%1$s is following %2$s's %3$s" +msgstr "%1$s folgt %2$s %3$s" + #: view/theme/duepuntozero/config.php:54 src/Model/User.php:512 msgid "default" msgstr "Standard" @@ -7529,7 +7530,7 @@ msgid "Your photos" msgstr "Deine Fotos" #: view/theme/frio/theme.php:262 src/Content/Nav.php:103 -#: src/Model/Profile.php:906 src/Model/Profile.php:909 +#: src/Model/Profile.php:907 src/Model/Profile.php:910 msgid "Videos" msgstr "Videos" @@ -7546,7 +7547,7 @@ msgid "Conversations from your friends" msgstr "Unterhaltungen Deiner Kontakte" #: view/theme/frio/theme.php:267 src/Content/Nav.php:170 -#: src/Model/Profile.php:921 src/Model/Profile.php:932 +#: src/Model/Profile.php:922 src/Model/Profile.php:933 msgid "Events and Calendar" msgstr "Ereignisse und Kalender" @@ -8025,7 +8026,7 @@ msgstr "Kontakt-/Freundschaftsanfrage" msgid "New Follower" msgstr "Neuer Bewunderer" -#: src/Util/Temporal.php:147 src/Model/Profile.php:752 +#: src/Util/Temporal.php:147 src/Model/Profile.php:753 msgid "Birthday:" msgstr "Geburtstag:" @@ -8801,7 +8802,7 @@ msgstr "Verwalten" msgid "Manage other pages" msgstr "Andere Seiten verwalten" -#: src/Content/Nav.php:210 src/Model/Profile.php:368 +#: src/Content/Nav.php:210 src/Model/Profile.php:369 msgid "Profiles" msgstr "Profile" @@ -8903,89 +8904,6 @@ msgstr "Neue Gruppe erstellen" msgid "Edit groups" msgstr "Gruppen bearbeiten" -#: src/Model/Contact.php:667 -msgid "Drop Contact" -msgstr "Kontakt löschen" - -#: src/Model/Contact.php:1118 -msgid "Organisation" -msgstr "Organisation" - -#: src/Model/Contact.php:1121 -msgid "News" -msgstr "Nachrichten" - -#: src/Model/Contact.php:1124 -msgid "Forum" -msgstr "Forum" - -#: src/Model/Contact.php:1303 -msgid "Connect URL missing." -msgstr "Connect-URL fehlt" - -#: src/Model/Contact.php:1312 -msgid "" -"The contact could not be added. Please check the relevant network " -"credentials in your Settings -> Social Networks page." -msgstr "Der Kontakt konnte nicht hinzugefügt werden. Bitte überprüfe die Einstellungen unter Einstellungen -> Soziale Netzwerke" - -#: src/Model/Contact.php:1359 -msgid "" -"This site is not configured to allow communications with other networks." -msgstr "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann." - -#: src/Model/Contact.php:1360 src/Model/Contact.php:1374 -msgid "No compatible communication protocols or feeds were discovered." -msgstr "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden." - -#: src/Model/Contact.php:1372 -msgid "The profile address specified does not provide adequate information." -msgstr "Die angegebene Profiladresse liefert unzureichende Informationen." - -#: src/Model/Contact.php:1377 -msgid "An author or name was not found." -msgstr "Es wurde kein Autor oder Name gefunden." - -#: src/Model/Contact.php:1380 -msgid "No browser URL could be matched to this address." -msgstr "Zu dieser Adresse konnte keine passende Browser URL gefunden werden." - -#: src/Model/Contact.php:1383 -msgid "" -"Unable to match @-style Identity Address with a known protocol or email " -"contact." -msgstr "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen." - -#: src/Model/Contact.php:1384 -msgid "Use mailto: in front of address to force email check." -msgstr "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen." - -#: src/Model/Contact.php:1390 -msgid "" -"The profile address specified belongs to a network which has been disabled " -"on this site." -msgstr "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde." - -#: src/Model/Contact.php:1395 -msgid "" -"Limited profile. This person will be unable to receive direct/personal " -"notifications from you." -msgstr "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können." - -#: src/Model/Contact.php:1446 -msgid "Unable to retrieve contact information." -msgstr "Konnte die Kontaktinformationen nicht empfangen." - -#: src/Model/Contact.php:1663 src/Protocol/DFRN.php:1503 -#, php-format -msgid "%s's birthday" -msgstr "%ss Geburtstag" - -#: src/Model/Contact.php:1664 src/Protocol/DFRN.php:1504 -#, php-format -msgid "Happy Birthday %s" -msgstr "Herzlichen Glückwunsch %s" - #: src/Model/Event.php:53 src/Model/Event.php:70 src/Model/Event.php:419 #: src/Model/Event.php:877 msgid "Starts:" @@ -9044,139 +8962,6 @@ msgstr "Karte anzeigen" msgid "Hide map" msgstr "Karte verbergen" -#: src/Model/Item.php:2330 -#, php-format -msgid "%1$s is attending %2$s's %3$s" -msgstr "%1$s nimmt an %2$ss %3$s teil." - -#: src/Model/Item.php:2335 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" -msgstr "%1$s nimmt nicht an %2$ss %3$s teil." - -#: src/Model/Item.php:2340 -#, php-format -msgid "%1$s may attend %2$s's %3$s" -msgstr "%1$s nimmt eventuell an %2$ss %3$s teil." - -#: src/Model/Profile.php:97 -msgid "Requested account is not available." -msgstr "Das angefragte Profil ist nicht vorhanden." - -#: src/Model/Profile.php:164 src/Model/Profile.php:395 -#: src/Model/Profile.php:853 -msgid "Edit profile" -msgstr "Profil bearbeiten" - -#: src/Model/Profile.php:332 -msgid "Atom feed" -msgstr "Atom-Feed" - -#: src/Model/Profile.php:368 -msgid "Manage/edit profiles" -msgstr "Profile verwalten/editieren" - -#: src/Model/Profile.php:546 src/Model/Profile.php:635 -msgid "g A l F d" -msgstr "l, d. F G \\U\\h\\r" - -#: src/Model/Profile.php:547 -msgid "F d" -msgstr "d. F" - -#: src/Model/Profile.php:600 src/Model/Profile.php:697 -msgid "[today]" -msgstr "[heute]" - -#: src/Model/Profile.php:611 -msgid "Birthday Reminders" -msgstr "Geburtstagserinnerungen" - -#: src/Model/Profile.php:612 -msgid "Birthdays this week:" -msgstr "Geburtstage diese Woche:" - -#: src/Model/Profile.php:684 -msgid "[No description]" -msgstr "[keine Beschreibung]" - -#: src/Model/Profile.php:711 -msgid "Event Reminders" -msgstr "Veranstaltungserinnerungen" - -#: src/Model/Profile.php:712 -msgid "Events this week:" -msgstr "Veranstaltungen diese Woche" - -#: src/Model/Profile.php:735 -msgid "Member since:" -msgstr "Mitglied seit:" - -#: src/Model/Profile.php:743 -msgid "j F, Y" -msgstr "j F, Y" - -#: src/Model/Profile.php:744 -msgid "j F" -msgstr "j F" - -#: src/Model/Profile.php:759 -msgid "Age:" -msgstr "Alter:" - -#: src/Model/Profile.php:772 -#, php-format -msgid "for %1$d %2$s" -msgstr "für %1$d %2$s" - -#: src/Model/Profile.php:796 -msgid "Religion:" -msgstr "Religion:" - -#: src/Model/Profile.php:804 -msgid "Hobbies/Interests:" -msgstr "Hobbies/Interessen:" - -#: src/Model/Profile.php:816 -msgid "Contact information and Social Networks:" -msgstr "Kontaktinformationen und Soziale Netzwerke:" - -#: src/Model/Profile.php:820 -msgid "Musical interests:" -msgstr "Musikalische Interessen:" - -#: src/Model/Profile.php:824 -msgid "Books, literature:" -msgstr "Literatur/Bücher:" - -#: src/Model/Profile.php:828 -msgid "Television:" -msgstr "Fernsehen:" - -#: src/Model/Profile.php:832 -msgid "Film/dance/culture/entertainment:" -msgstr "Filme/Tänze/Kultur/Unterhaltung:" - -#: src/Model/Profile.php:836 -msgid "Love/Romance:" -msgstr "Liebesleben:" - -#: src/Model/Profile.php:840 -msgid "Work/employment:" -msgstr "Arbeit/Beschäftigung:" - -#: src/Model/Profile.php:844 -msgid "School/education:" -msgstr "Schule/Ausbildung:" - -#: src/Model/Profile.php:849 -msgid "Forums:" -msgstr "Foren:" - -#: src/Model/Profile.php:943 -msgid "Only You Can See This" -msgstr "Nur Du kannst das sehen" - #: src/Model/User.php:169 msgid "Login failed" msgstr "Anmeldung fehlgeschlagen" @@ -9319,6 +9104,227 @@ msgid "" "\t\t\tThank you and welcome to %2$s." msgstr "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3$s/removeme jederzeit tun.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2$s." +#: src/Model/Contact.php:667 +msgid "Drop Contact" +msgstr "Kontakt löschen" + +#: src/Model/Contact.php:1118 +msgid "Organisation" +msgstr "Organisation" + +#: src/Model/Contact.php:1121 +msgid "News" +msgstr "Nachrichten" + +#: src/Model/Contact.php:1124 +msgid "Forum" +msgstr "Forum" + +#: src/Model/Contact.php:1303 +msgid "Connect URL missing." +msgstr "Connect-URL fehlt" + +#: src/Model/Contact.php:1312 +msgid "" +"The contact could not be added. Please check the relevant network " +"credentials in your Settings -> Social Networks page." +msgstr "Der Kontakt konnte nicht hinzugefügt werden. Bitte überprüfe die Einstellungen unter Einstellungen -> Soziale Netzwerke" + +#: src/Model/Contact.php:1359 +msgid "" +"This site is not configured to allow communications with other networks." +msgstr "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann." + +#: src/Model/Contact.php:1360 src/Model/Contact.php:1374 +msgid "No compatible communication protocols or feeds were discovered." +msgstr "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden." + +#: src/Model/Contact.php:1372 +msgid "The profile address specified does not provide adequate information." +msgstr "Die angegebene Profiladresse liefert unzureichende Informationen." + +#: src/Model/Contact.php:1377 +msgid "An author or name was not found." +msgstr "Es wurde kein Autor oder Name gefunden." + +#: src/Model/Contact.php:1380 +msgid "No browser URL could be matched to this address." +msgstr "Zu dieser Adresse konnte keine passende Browser URL gefunden werden." + +#: src/Model/Contact.php:1383 +msgid "" +"Unable to match @-style Identity Address with a known protocol or email " +"contact." +msgstr "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen." + +#: src/Model/Contact.php:1384 +msgid "Use mailto: in front of address to force email check." +msgstr "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen." + +#: src/Model/Contact.php:1390 +msgid "" +"The profile address specified belongs to a network which has been disabled " +"on this site." +msgstr "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde." + +#: src/Model/Contact.php:1395 +msgid "" +"Limited profile. This person will be unable to receive direct/personal " +"notifications from you." +msgstr "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können." + +#: src/Model/Contact.php:1446 +msgid "Unable to retrieve contact information." +msgstr "Konnte die Kontaktinformationen nicht empfangen." + +#: src/Model/Contact.php:1663 src/Protocol/DFRN.php:1503 +#, php-format +msgid "%s's birthday" +msgstr "%ss Geburtstag" + +#: src/Model/Contact.php:1664 src/Protocol/DFRN.php:1504 +#, php-format +msgid "Happy Birthday %s" +msgstr "Herzlichen Glückwunsch %s" + +#: src/Model/Item.php:2540 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "%1$s nimmt an %2$ss %3$s teil." + +#: src/Model/Item.php:2545 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" +msgstr "%1$s nimmt nicht an %2$ss %3$s teil." + +#: src/Model/Item.php:2550 +#, php-format +msgid "%1$s may attend %2$s's %3$s" +msgstr "%1$s nimmt eventuell an %2$ss %3$s teil." + +#: src/Model/Profile.php:98 +msgid "Requested account is not available." +msgstr "Das angefragte Profil ist nicht vorhanden." + +#: src/Model/Profile.php:165 src/Model/Profile.php:396 +#: src/Model/Profile.php:854 +msgid "Edit profile" +msgstr "Profil bearbeiten" + +#: src/Model/Profile.php:333 +msgid "Atom feed" +msgstr "Atom-Feed" + +#: src/Model/Profile.php:369 +msgid "Manage/edit profiles" +msgstr "Profile verwalten/editieren" + +#: src/Model/Profile.php:547 src/Model/Profile.php:636 +msgid "g A l F d" +msgstr "l, d. F G \\U\\h\\r" + +#: src/Model/Profile.php:548 +msgid "F d" +msgstr "d. F" + +#: src/Model/Profile.php:601 src/Model/Profile.php:698 +msgid "[today]" +msgstr "[heute]" + +#: src/Model/Profile.php:612 +msgid "Birthday Reminders" +msgstr "Geburtstagserinnerungen" + +#: src/Model/Profile.php:613 +msgid "Birthdays this week:" +msgstr "Geburtstage diese Woche:" + +#: src/Model/Profile.php:685 +msgid "[No description]" +msgstr "[keine Beschreibung]" + +#: src/Model/Profile.php:712 +msgid "Event Reminders" +msgstr "Veranstaltungserinnerungen" + +#: src/Model/Profile.php:713 +msgid "Upcoming events the next 7 days:" +msgstr "Veranstaltungen der nächsten 7 Tage:" + +#: src/Model/Profile.php:736 +msgid "Member since:" +msgstr "Mitglied seit:" + +#: src/Model/Profile.php:744 +msgid "j F, Y" +msgstr "j F, Y" + +#: src/Model/Profile.php:745 +msgid "j F" +msgstr "j F" + +#: src/Model/Profile.php:760 +msgid "Age:" +msgstr "Alter:" + +#: src/Model/Profile.php:773 +#, php-format +msgid "for %1$d %2$s" +msgstr "für %1$d %2$s" + +#: src/Model/Profile.php:797 +msgid "Religion:" +msgstr "Religion:" + +#: src/Model/Profile.php:805 +msgid "Hobbies/Interests:" +msgstr "Hobbies/Interessen:" + +#: src/Model/Profile.php:817 +msgid "Contact information and Social Networks:" +msgstr "Kontaktinformationen und Soziale Netzwerke:" + +#: src/Model/Profile.php:821 +msgid "Musical interests:" +msgstr "Musikalische Interessen:" + +#: src/Model/Profile.php:825 +msgid "Books, literature:" +msgstr "Literatur/Bücher:" + +#: src/Model/Profile.php:829 +msgid "Television:" +msgstr "Fernsehen:" + +#: src/Model/Profile.php:833 +msgid "Film/dance/culture/entertainment:" +msgstr "Filme/Tänze/Kultur/Unterhaltung:" + +#: src/Model/Profile.php:837 +msgid "Love/Romance:" +msgstr "Liebesleben:" + +#: src/Model/Profile.php:841 +msgid "Work/employment:" +msgstr "Arbeit/Beschäftigung:" + +#: src/Model/Profile.php:845 +msgid "School/education:" +msgstr "Schule/Ausbildung:" + +#: src/Model/Profile.php:850 +msgid "Forums:" +msgstr "Foren:" + +#: src/Model/Profile.php:944 +msgid "Only You Can See This" +msgstr "Nur Du kannst das sehen" + +#: src/Model/Profile.php:1100 +#, php-format +msgid "OpenWebAuth: %1$s welcomes %2$s" +msgstr "OpenWebAuth: %1$s heißt %2$sherzlich willkommen" + #: src/Protocol/Diaspora.php:2511 msgid "Sharing notification from Diaspora network" msgstr "Freigabe-Benachrichtigung von Diaspora" @@ -9440,118 +9446,118 @@ msgstr "Lokal entfernen" msgid "save to folder" msgstr "In Ordner speichern" -#: src/Object/Post.php:234 +#: src/Object/Post.php:226 msgid "I will attend" msgstr "Ich werde teilnehmen" -#: src/Object/Post.php:234 +#: src/Object/Post.php:226 msgid "I will not attend" msgstr "Ich werde nicht teilnehmen" -#: src/Object/Post.php:234 +#: src/Object/Post.php:226 msgid "I might attend" msgstr "Ich werde eventuell teilnehmen" -#: src/Object/Post.php:262 +#: src/Object/Post.php:254 msgid "add star" msgstr "markieren" -#: src/Object/Post.php:263 +#: src/Object/Post.php:255 msgid "remove star" msgstr "Markierung entfernen" -#: src/Object/Post.php:264 +#: src/Object/Post.php:256 msgid "toggle star status" msgstr "Markierung umschalten" -#: src/Object/Post.php:267 +#: src/Object/Post.php:259 msgid "starred" msgstr "markiert" -#: src/Object/Post.php:273 +#: src/Object/Post.php:265 msgid "ignore thread" msgstr "Thread ignorieren" -#: src/Object/Post.php:274 +#: src/Object/Post.php:266 msgid "unignore thread" msgstr "Thread nicht mehr ignorieren" -#: src/Object/Post.php:275 +#: src/Object/Post.php:267 msgid "toggle ignore status" msgstr "Ignoriert-Status ein-/ausschalten" -#: src/Object/Post.php:284 +#: src/Object/Post.php:276 msgid "add tag" msgstr "Tag hinzufügen" -#: src/Object/Post.php:295 +#: src/Object/Post.php:287 msgid "like" msgstr "mag ich" -#: src/Object/Post.php:296 +#: src/Object/Post.php:288 msgid "dislike" msgstr "mag ich nicht" -#: src/Object/Post.php:299 +#: src/Object/Post.php:291 msgid "Share this" msgstr "Weitersagen" -#: src/Object/Post.php:299 +#: src/Object/Post.php:291 msgid "share" msgstr "Teilen" -#: src/Object/Post.php:364 +#: src/Object/Post.php:356 msgid "to" msgstr "zu" -#: src/Object/Post.php:365 +#: src/Object/Post.php:357 msgid "via" msgstr "via" -#: src/Object/Post.php:366 +#: src/Object/Post.php:358 msgid "Wall-to-Wall" msgstr "Wall-to-Wall" -#: src/Object/Post.php:367 +#: src/Object/Post.php:359 msgid "via Wall-To-Wall:" msgstr "via Wall-To-Wall:" -#: src/Object/Post.php:426 +#: src/Object/Post.php:418 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d Kommentar" msgstr[1] "%d Kommentare" -#: src/Object/Post.php:796 +#: src/Object/Post.php:788 msgid "Bold" msgstr "Fett" -#: src/Object/Post.php:797 +#: src/Object/Post.php:789 msgid "Italic" msgstr "Kursiv" -#: src/Object/Post.php:798 +#: src/Object/Post.php:790 msgid "Underline" msgstr "Unterstrichen" -#: src/Object/Post.php:799 +#: src/Object/Post.php:791 msgid "Quote" msgstr "Zitat" -#: src/Object/Post.php:800 +#: src/Object/Post.php:792 msgid "Code" msgstr "Code" -#: src/Object/Post.php:801 +#: src/Object/Post.php:793 msgid "Image" msgstr "Bild" -#: src/Object/Post.php:802 +#: src/Object/Post.php:794 msgid "Link" msgstr "Link" -#: src/Object/Post.php:803 +#: src/Object/Post.php:795 msgid "Video" msgstr "Video" @@ -9567,16 +9573,16 @@ msgstr "weniger anzeigen" msgid "No system theme config value set." msgstr "Es wurde kein Konfigurationswert für das Systemweite Theme gesetzt." -#: index.php:464 -msgid "toggle mobile" -msgstr "auf/von Mobile Ansicht wechseln" - #: update.php:193 #, php-format msgid "%s: Updating author-id and owner-id in item and thread table. " msgstr "%s: Aktualisiere die author-id und owner-id in der Thread Tabelle" -#: boot.php:796 +#: boot.php:797 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen." + +#: index.php:474 +msgid "toggle mobile" +msgstr "auf/von Mobile Ansicht wechseln" diff --git a/view/lang/de/strings.php b/view/lang/de/strings.php index 84ad3dacb..05e35012f 100644 --- a/view/lang/de/strings.php +++ b/view/lang/de/strings.php @@ -6,6 +6,17 @@ function string_plural_select_de($n){ return ($n != 1);; }} ; +$a->strings["Item not found."] = "Beitrag nicht gefunden."; +$a->strings["Do you really want to delete this item?"] = "Möchtest Du wirklich dieses Item löschen?"; +$a->strings["Yes"] = "Ja"; +$a->strings["Cancel"] = "Abbrechen"; +$a->strings["Permission denied."] = "Zugriff verweigert."; +$a->strings["Archives"] = "Archiv"; +$a->strings["show more"] = "mehr anzeigen"; +$a->strings["Welcome "] = "Willkommen "; +$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; +$a->strings["Welcome back "] = "Willkommen zurück "; +$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."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."; $a->strings["Daily posting limit of %d post reached. The post was rejected."] = [ 0 => "Das tägliche Limit von %d Beitrag wurde erreicht. Die Nachricht wurde verworfen.", 1 => "Das tägliche Limit von %d Beiträgen wurde erreicht. Der Beitrag wurde verworfen.", @@ -103,7 +114,6 @@ $a->strings["Permission settings"] = "Berechtigungseinstellungen"; $a->strings["permissions"] = "Zugriffsrechte"; $a->strings["Public post"] = "Öffentlicher Beitrag"; $a->strings["Preview"] = "Vorschau"; -$a->strings["Cancel"] = "Abbrechen"; $a->strings["Post to Groups"] = "Poste an Gruppe"; $a->strings["Post to Contacts"] = "Poste an Kontakte"; $a->strings["Private post"] = "Privater Beitrag"; @@ -185,16 +195,6 @@ $a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "D $a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Du hast eine [url=%1\$s]Registrierungsanfrage[/url] von %2\$s erhalten."; $a->strings["Full Name:\t%s\nSite Location:\t%s\nLogin Name:\t%s (%s)"] = "Kompletter Name: %s\nURL der Seite: %s\nLogin Name: %s(%s)"; $a->strings["Please visit %s to approve or reject the request."] = "Bitte besuche %s um die Anfrage zu bearbeiten."; -$a->strings["Item not found."] = "Beitrag nicht gefunden."; -$a->strings["Do you really want to delete this item?"] = "Möchtest Du wirklich dieses Item löschen?"; -$a->strings["Yes"] = "Ja"; -$a->strings["Permission denied."] = "Zugriff verweigert."; -$a->strings["Archives"] = "Archiv"; -$a->strings["show more"] = "mehr anzeigen"; -$a->strings["Welcome "] = "Willkommen "; -$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; -$a->strings["Welcome back "] = "Willkommen zurück "; -$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."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."; $a->strings["newer"] = "neuer"; $a->strings["older"] = "älter"; $a->strings["first"] = "erste"; @@ -566,7 +566,6 @@ $a->strings["Friend Confirm URL"] = "URL für Bestätigungen von Kontaktanfragen $a->strings["Notification Endpoint URL"] = "URL-Endpunkt für Benachrichtigungen"; $a->strings["Poll/Feed URL"] = "Pull/Feed-URL"; $a->strings["New photo from this URL"] = "Neues Foto von dieser URL"; -$a->strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s herzlich willkommen"; $a->strings["Help:"] = "Hilfe:"; $a->strings["Help"] = "Hilfe"; $a->strings["Not Found"] = "Nicht gefunden"; @@ -599,15 +598,6 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ $a->strings["

What next

"] = "

Wie geht es weiter?

"; $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the worker."] = "Wichtig: Du musst [manuell] einen Cronjob (o.ä.) für den Worker einrichten."; $a->strings["Go to your new Friendica 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."] = "Du solltest nun die Seite zur Nutzerregistrierung deiner neuen Friendica Instanz besuchen und einen neuen Nutzer einrichten. Bitte denke daran die selbe E-Mail Adresse anzugeben, die du auch als Administrator E-Mail angegeben hast, damit du das Admin-Panel verwenden kannst."; -$a->strings["Access denied."] = "Zugriff verweigert."; -$a->strings["Community option not available."] = "Optionen für die Gemeinschaftsseite nicht verfügbar."; -$a->strings["Not available."] = "Nicht verfügbar."; -$a->strings["Local Community"] = "Lokale Gemeinschaft"; -$a->strings["Posts from local users on this server"] = "Beiträge von Nutzern dieses Servers"; -$a->strings["Global Community"] = "Globale Gemeinschaft"; -$a->strings["Posts from users of the whole federated network"] = "Beiträge von Nutzern des gesamten föderalen Netzwerks"; -$a->strings["No results."] = "Keine Ergebnisse."; -$a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "Diese Gemeinschaftsseite zeigt alle öffentlichen Beiträge, die auf diesem Knoten eingegangen sind. Der Inhalt entspricht nicht zwingend der Meinung der Nutzer dieses Servers."; $a->strings["Profile not found."] = "Profil nicht gefunden."; $a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde."; $a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich."; @@ -1475,14 +1465,6 @@ $a->strings["Friendica"] = "Friendica"; $a->strings["GNU Social (Pleroma, Mastodon)"] = "GNU Social (Pleroma, Mastodon)"; $a->strings["Diaspora (Socialhome, Hubzilla)"] = "Diaspora (Socialhome, Hubzilla)"; $a->strings[" - please do not use this form. Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste."; -$a->strings["Gender:"] = "Geschlecht:"; -$a->strings["Status:"] = "Status:"; -$a->strings["Homepage:"] = "Homepage:"; -$a->strings["Global Directory"] = "Weltweites Verzeichnis"; -$a->strings["Find on this site"] = "Auf diesem Server suchen"; -$a->strings["Results for:"] = "Ergebnisse für:"; -$a->strings["Site Directory"] = "Verzeichnis"; -$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein)."; $a->strings["People Search - %s"] = "Personensuche - %s"; $a->strings["Forum Search - %s"] = "Forensuche - %s"; $a->strings["No matches"] = "Keine Übereinstimmungen"; @@ -1490,16 +1472,96 @@ $a->strings["Item not found"] = "Beitrag nicht gefunden"; $a->strings["Edit post"] = "Beitrag bearbeiten"; $a->strings["CC: email addresses"] = "Cc: E-Mail-Addressen"; $a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com"; +$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu Deinem Standardprofil hinzu."; +$a->strings["is interested in:"] = "ist interessiert an:"; +$a->strings["Profile Match"] = "Profilübereinstimmungen"; +$a->strings["Invalid request identifier."] = "Invalid request identifier."; +$a->strings["Discard"] = "Verwerfen"; +$a->strings["Notifications"] = "Benachrichtigungen"; +$a->strings["Network Notifications"] = "Netzwerk Benachrichtigungen"; +$a->strings["Personal Notifications"] = "Persönliche Benachrichtigungen"; +$a->strings["Home Notifications"] = "Pinnwand Benachrichtigungen"; +$a->strings["Show Ignored Requests"] = "Zeige ignorierte Anfragen"; +$a->strings["Hide Ignored Requests"] = "Verberge ignorierte Anfragen"; +$a->strings["Notification type:"] = "Art der Benachrichtigung:"; +$a->strings["Suggested by:"] = "Vorgeschlagen von:"; +$a->strings["Claims to be known to you: "] = "Behauptet Dich zu kennen: "; +$a->strings["yes"] = "ja"; +$a->strings["no"] = "nein"; +$a->strings["Shall your connection be bidirectional or not?"] = "Soll die Verbindung beidseitig sein oder nicht?"; +$a->strings["Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed."] = "Akzeptierst du %s als Kontakt, erlaubst du damit das Lesen deiner Beiträge und abonnierst selbst auch die Beiträge von %s."; +$a->strings["Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "Wenn du %s als Abonnent akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten."; +$a->strings["Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "Wenn du %s als Teilenden akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten."; +$a->strings["Friend"] = "Kontakt"; +$a->strings["Sharer"] = "Teilenden"; +$a->strings["Subscriber"] = "Abonnent"; +$a->strings["Gender:"] = "Geschlecht:"; +$a->strings["No introductions."] = "Keine Kontaktanfragen."; +$a->strings["Show unread"] = "Ungelesene anzeigen"; +$a->strings["Show all"] = "Alle anzeigen"; +$a->strings["No more %s notifications."] = "Keine weiteren %s Benachrichtigungen"; +$a->strings["Poke/Prod"] = "Anstupsen"; +$a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen"; +$a->strings["Recipient"] = "Empfänger"; +$a->strings["Choose what you wish to do to recipient"] = "Was willst Du mit dem Empfänger machen:"; +$a->strings["Make this post private"] = "Diesen Beitrag privat machen"; +$a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."; +$a->strings["Failed to send email message. Here your accout details:
login: %s
password: %s

You can change your password after login."] = "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern."; +$a->strings["Registration successful."] = "Registrierung erfolgreich."; +$a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden."; +$a->strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."; +$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Du kannst dieses Formular auch (optional) mit Deiner OpenID ausfüllen, indem Du Deine OpenID angibst und 'Registrieren' klickst."; +$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."; +$a->strings["Your OpenID (optional): "] = "Deine OpenID (optional): "; +$a->strings["Include your profile in member directory?"] = "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?"; +$a->strings["Note for the admin"] = "Hinweis für den Admin"; +$a->strings["Leave a message for the admin, why you want to join this node"] = "Hinterlasse eine Nachricht an den Admin, warum du einen Account auf dieser Instanz haben möchtest."; +$a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."; +$a->strings["Your invitation code: "] = "Dein Ein­la­dungs­code"; +$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):"; +$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Deine E-Mail Adresse (Informationen zur Registrierung werden an diese Adresse gesendet, darum muss sie existieren.)"; +$a->strings["Leave empty for an auto generated password."] = "Leer lassen um das Passwort automatisch zu generieren."; +$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be 'nickname@%s'."] = "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird 'spitzname@%s' sein."; +$a->strings["Choose a nickname: "] = "Spitznamen wählen: "; +$a->strings["Register"] = "Registrieren"; +$a->strings["Import your profile to this friendica instance"] = "Importiere Dein Profil auf diese Friendica Instanz"; +$a->strings["Do you really want to delete this suggestion?"] = "Möchtest Du wirklich diese Empfehlung löschen?"; +$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."; +$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen"; +$a->strings["Friend Suggestions"] = "Kontaktvorschläge"; +$a->strings["Tag removed"] = "Tag entfernt"; +$a->strings["Remove Item Tag"] = "Gegenstands-Tag entfernen"; +$a->strings["Select a tag to remove: "] = "Wähle ein Tag zum Entfernen aus: "; +$a->strings["Contact wasn't found or can't be unfollowed."] = "Der Kontakt konnte nicht gefunden oder nicht entfolgt werden."; +$a->strings["Contact unfollowed"] = "Kontakt wird nicht mehr gefolgt"; +$a->strings["You aren't a friend of this contact."] = "Du hast keine beidseitige Freundschaft mit diesem Kontakt."; +$a->strings["Unfollowing is currently not supported by your network."] = "Bei diesem Netzwerk wird das Entfolgen derzeit nicht unterstützt."; +$a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"; +$a->strings["No contacts."] = "Keine Kontakte."; +$a->strings["Access denied."] = "Zugriff verweigert."; +$a->strings["Wall Photos"] = "Pinnwand-Bilder"; +$a->strings["Community option not available."] = "Optionen für die Gemeinschaftsseite nicht verfügbar."; +$a->strings["Not available."] = "Nicht verfügbar."; +$a->strings["Local Community"] = "Lokale Gemeinschaft"; +$a->strings["Posts from local users on this server"] = "Beiträge von Nutzern dieses Servers"; +$a->strings["Global Community"] = "Globale Gemeinschaft"; +$a->strings["Posts from users of the whole federated network"] = "Beiträge von Nutzern des gesamten föderalen Netzwerks"; +$a->strings["No results."] = "Keine Ergebnisse."; +$a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "Diese Gemeinschaftsseite zeigt alle öffentlichen Beiträge, die auf diesem Knoten eingegangen sind. Der Inhalt entspricht nicht zwingend der Meinung der Nutzer dieses Servers."; +$a->strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s herzlich willkommen"; +$a->strings["Status:"] = "Status:"; +$a->strings["Homepage:"] = "Homepage:"; +$a->strings["Global Directory"] = "Weltweites Verzeichnis"; +$a->strings["Find on this site"] = "Auf diesem Server suchen"; +$a->strings["Results for:"] = "Ergebnisse für:"; +$a->strings["Site Directory"] = "Verzeichnis"; +$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein)."; $a->strings["Unable to locate original post."] = "Konnte den Originalbeitrag nicht finden."; $a->strings["Empty post discarded."] = "Leerer Beitrag wurde verworfen."; -$a->strings["Wall Photos"] = "Pinnwand-Bilder"; $a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica."; $a->strings["You may visit them online at %s"] = "Du kannst sie online unter %s besuchen"; $a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest."; $a->strings["%s posted an update."] = "%s hat ein Update veröffentlicht."; -$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu Deinem Standardprofil hinzu."; -$a->strings["is interested in:"] = "ist interessiert an:"; -$a->strings["Profile Match"] = "Profilübereinstimmungen"; $a->strings["New Message"] = "Neue Nachricht"; $a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden."; $a->strings["Messages"] = "Nachrichten"; @@ -1544,30 +1606,6 @@ $a->strings["Interesting Links"] = "Interessante Links"; $a->strings["Starred"] = "Markierte"; $a->strings["Favourite Posts"] = "Favorisierte Beiträge"; $a->strings["Personal Notes"] = "Persönliche Notizen"; -$a->strings["Invalid request identifier."] = "Invalid request identifier."; -$a->strings["Discard"] = "Verwerfen"; -$a->strings["Notifications"] = "Benachrichtigungen"; -$a->strings["Network Notifications"] = "Netzwerk Benachrichtigungen"; -$a->strings["Personal Notifications"] = "Persönliche Benachrichtigungen"; -$a->strings["Home Notifications"] = "Pinnwand Benachrichtigungen"; -$a->strings["Show Ignored Requests"] = "Zeige ignorierte Anfragen"; -$a->strings["Hide Ignored Requests"] = "Verberge ignorierte Anfragen"; -$a->strings["Notification type:"] = "Art der Benachrichtigung:"; -$a->strings["Suggested by:"] = "Vorgeschlagen von:"; -$a->strings["Claims to be known to you: "] = "Behauptet Dich zu kennen: "; -$a->strings["yes"] = "ja"; -$a->strings["no"] = "nein"; -$a->strings["Shall your connection be bidirectional or not?"] = "Soll die Verbindung beidseitig sein oder nicht?"; -$a->strings["Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed."] = "Akzeptierst du %s als Kontakt, erlaubst du damit das Lesen deiner Beiträge und abonnierst selbst auch die Beiträge von %s."; -$a->strings["Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "Wenn du %s als Abonnent akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten."; -$a->strings["Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "Wenn du %s als Teilenden akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten."; -$a->strings["Friend"] = "Kontakt"; -$a->strings["Sharer"] = "Teilenden"; -$a->strings["Subscriber"] = "Abonnent"; -$a->strings["No introductions."] = "Keine Kontaktanfragen."; -$a->strings["Show unread"] = "Ungelesene anzeigen"; -$a->strings["Show all"] = "Alle anzeigen"; -$a->strings["No more %s notifications."] = "Keine weiteren %s Benachrichtigungen"; $a->strings["Photo Albums"] = "Fotoalben"; $a->strings["Recent Photos"] = "Neueste Fotos"; $a->strings["Upload New Photos"] = "Neue Fotos hochladen"; @@ -1615,54 +1653,16 @@ $a->strings["Map"] = "Karte"; $a->strings["{0} wants to be your friend"] = "{0} möchte mit Dir in Kontakt treten"; $a->strings["{0} sent you a message"] = "{0} schickte Dir eine Nachricht"; $a->strings["{0} requested registration"] = "{0} möchte sich registrieren"; -$a->strings["Poke/Prod"] = "Anstupsen"; -$a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen"; -$a->strings["Recipient"] = "Empfänger"; -$a->strings["Choose what you wish to do to recipient"] = "Was willst Du mit dem Empfänger machen:"; -$a->strings["Make this post private"] = "Diesen Beitrag privat machen"; $a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden."; $a->strings["%s's timeline"] = "Timeline von %s"; $a->strings["%s's posts"] = "Beiträge von %s"; $a->strings["%s's comments"] = "Kommentare von %s"; $a->strings["Tips for New Members"] = "Tipps für neue Nutzer"; -$a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."; -$a->strings["Failed to send email message. Here your accout details:
login: %s
password: %s

You can change your password after login."] = "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern."; -$a->strings["Registration successful."] = "Registrierung erfolgreich."; -$a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden."; -$a->strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."; -$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Du kannst dieses Formular auch (optional) mit Deiner OpenID ausfüllen, indem Du Deine OpenID angibst und 'Registrieren' klickst."; -$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."; -$a->strings["Your OpenID (optional): "] = "Deine OpenID (optional): "; -$a->strings["Include your profile in member directory?"] = "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?"; -$a->strings["Note for the admin"] = "Hinweis für den Admin"; -$a->strings["Leave a message for the admin, why you want to join this node"] = "Hinterlasse eine Nachricht an den Admin, warum du einen Account auf dieser Instanz haben möchtest."; -$a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."; -$a->strings["Your invitation code: "] = "Dein Ein­la­dungs­code"; -$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):"; -$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Deine E-Mail Adresse (Informationen zur Registrierung werden an diese Adresse gesendet, darum muss sie existieren.)"; -$a->strings["Leave empty for an auto generated password."] = "Leer lassen um das Passwort automatisch zu generieren."; -$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be 'nickname@%s'."] = "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird 'spitzname@%s' sein."; -$a->strings["Choose a nickname: "] = "Spitznamen wählen: "; -$a->strings["Register"] = "Registrieren"; -$a->strings["Import your profile to this friendica instance"] = "Importiere Dein Profil auf diese Friendica Instanz"; $a->strings["Only logged in users are permitted to perform a search."] = "Nur eingeloggten Benutzern ist das Suchen gestattet."; $a->strings["Too Many Requests"] = "Zu viele Abfragen"; $a->strings["Only one search per minute is permitted for not logged in users."] = "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet."; $a->strings["Items tagged with: %s"] = "Beiträge die mit %s getaggt sind"; $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt %2\$s %3\$s"; -$a->strings["Do you really want to delete this suggestion?"] = "Möchtest Du wirklich diese Empfehlung löschen?"; -$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."; -$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen"; -$a->strings["Friend Suggestions"] = "Kontaktvorschläge"; -$a->strings["Tag removed"] = "Tag entfernt"; -$a->strings["Remove Item Tag"] = "Gegenstands-Tag entfernen"; -$a->strings["Select a tag to remove: "] = "Wähle ein Tag zum Entfernen aus: "; -$a->strings["Contact wasn't found or can't be unfollowed."] = "Der Kontakt konnte nicht gefunden oder nicht entfolgt werden."; -$a->strings["Contact unfollowed"] = "Kontakt wird nicht mehr gefolgt"; -$a->strings["You aren't a friend of this contact."] = "Du hast keine beidseitige Freundschaft mit diesem Kontakt."; -$a->strings["Unfollowing is currently not supported by your network."] = "Bei diesem Netzwerk wird das Entfolgen derzeit nicht unterstützt."; -$a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"; -$a->strings["No contacts."] = "Keine Kontakte."; $a->strings["default"] = "Standard"; $a->strings["greenzero"] = "greenzero"; $a->strings["purplezero"] = "purplezero"; @@ -2033,24 +2033,6 @@ $a->strings["Edit group"] = "Gruppe bearbeiten"; $a->strings["Contacts not in any group"] = "Kontakte in keiner Gruppe"; $a->strings["Create a new group"] = "Neue Gruppe erstellen"; $a->strings["Edit groups"] = "Gruppen bearbeiten"; -$a->strings["Drop Contact"] = "Kontakt löschen"; -$a->strings["Organisation"] = "Organisation"; -$a->strings["News"] = "Nachrichten"; -$a->strings["Forum"] = "Forum"; -$a->strings["Connect URL missing."] = "Connect-URL fehlt"; -$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "Der Kontakt konnte nicht hinzugefügt werden. Bitte überprüfe die Einstellungen unter Einstellungen -> Soziale Netzwerke"; -$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."; -$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."; -$a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen."; -$a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden."; -$a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."; -$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen."; -$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen."; -$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."; -$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können."; -$a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen."; -$a->strings["%s's birthday"] = "%ss Geburtstag"; -$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s"; $a->strings["Starts:"] = "Beginnt:"; $a->strings["Finishes:"] = "Endet:"; $a->strings["all-day"] = "ganztägig"; @@ -2065,38 +2047,6 @@ $a->strings["D g:i A"] = "D H:i"; $a->strings["g:i A"] = "H:i"; $a->strings["Show map"] = "Karte anzeigen"; $a->strings["Hide map"] = "Karte verbergen"; -$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil."; -$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil."; -$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil."; -$a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden."; -$a->strings["Edit profile"] = "Profil bearbeiten"; -$a->strings["Atom feed"] = "Atom-Feed"; -$a->strings["Manage/edit profiles"] = "Profile verwalten/editieren"; -$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r"; -$a->strings["F d"] = "d. F"; -$a->strings["[today]"] = "[heute]"; -$a->strings["Birthday Reminders"] = "Geburtstagserinnerungen"; -$a->strings["Birthdays this week:"] = "Geburtstage diese Woche:"; -$a->strings["[No description]"] = "[keine Beschreibung]"; -$a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; -$a->strings["Events this week:"] = "Veranstaltungen diese Woche"; -$a->strings["Member since:"] = "Mitglied seit:"; -$a->strings["j F, Y"] = "j F, Y"; -$a->strings["j F"] = "j F"; -$a->strings["Age:"] = "Alter:"; -$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s"; -$a->strings["Religion:"] = "Religion:"; -$a->strings["Hobbies/Interests:"] = "Hobbies/Interessen:"; -$a->strings["Contact information and Social Networks:"] = "Kontaktinformationen und Soziale Netzwerke:"; -$a->strings["Musical interests:"] = "Musikalische Interessen:"; -$a->strings["Books, literature:"] = "Literatur/Bücher:"; -$a->strings["Television:"] = "Fernsehen:"; -$a->strings["Film/dance/culture/entertainment:"] = "Filme/Tänze/Kultur/Unterhaltung:"; -$a->strings["Love/Romance:"] = "Liebesleben:"; -$a->strings["Work/employment:"] = "Arbeit/Beschäftigung:"; -$a->strings["School/education:"] = "Schule/Ausbildung:"; -$a->strings["Forums:"] = "Foren:"; -$a->strings["Only You Can See This"] = "Nur Du kannst das sehen"; $a->strings["Login failed"] = "Anmeldung fehlgeschlagen"; $a->strings["Not enough information to authenticate"] = "Nicht genügend Informationen für die Authentifizierung"; $a->strings["An invitation is required."] = "Du benötigst eine Einladung."; @@ -2122,6 +2072,57 @@ $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Yo $a->strings["Registration at %s"] = "Registrierung als %s"; $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde eingerichtet."; $a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3\$s/removeme jederzeit tun.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s."; +$a->strings["Drop Contact"] = "Kontakt löschen"; +$a->strings["Organisation"] = "Organisation"; +$a->strings["News"] = "Nachrichten"; +$a->strings["Forum"] = "Forum"; +$a->strings["Connect URL missing."] = "Connect-URL fehlt"; +$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "Der Kontakt konnte nicht hinzugefügt werden. Bitte überprüfe die Einstellungen unter Einstellungen -> Soziale Netzwerke"; +$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."; +$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."; +$a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen."; +$a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden."; +$a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."; +$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen."; +$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen."; +$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."; +$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können."; +$a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen."; +$a->strings["%s's birthday"] = "%ss Geburtstag"; +$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s"; +$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil."; +$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil."; +$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil."; +$a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden."; +$a->strings["Edit profile"] = "Profil bearbeiten"; +$a->strings["Atom feed"] = "Atom-Feed"; +$a->strings["Manage/edit profiles"] = "Profile verwalten/editieren"; +$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r"; +$a->strings["F d"] = "d. F"; +$a->strings["[today]"] = "[heute]"; +$a->strings["Birthday Reminders"] = "Geburtstagserinnerungen"; +$a->strings["Birthdays this week:"] = "Geburtstage diese Woche:"; +$a->strings["[No description]"] = "[keine Beschreibung]"; +$a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; +$a->strings["Upcoming events the next 7 days:"] = "Veranstaltungen der nächsten 7 Tage:"; +$a->strings["Member since:"] = "Mitglied seit:"; +$a->strings["j F, Y"] = "j F, Y"; +$a->strings["j F"] = "j F"; +$a->strings["Age:"] = "Alter:"; +$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s"; +$a->strings["Religion:"] = "Religion:"; +$a->strings["Hobbies/Interests:"] = "Hobbies/Interessen:"; +$a->strings["Contact information and Social Networks:"] = "Kontaktinformationen und Soziale Netzwerke:"; +$a->strings["Musical interests:"] = "Musikalische Interessen:"; +$a->strings["Books, literature:"] = "Literatur/Bücher:"; +$a->strings["Television:"] = "Fernsehen:"; +$a->strings["Film/dance/culture/entertainment:"] = "Filme/Tänze/Kultur/Unterhaltung:"; +$a->strings["Love/Romance:"] = "Liebesleben:"; +$a->strings["Work/employment:"] = "Arbeit/Beschäftigung:"; +$a->strings["School/education:"] = "Schule/Ausbildung:"; +$a->strings["Forums:"] = "Foren:"; +$a->strings["Only You Can See This"] = "Nur Du kannst das sehen"; +$a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s heißt %2\$sherzlich willkommen"; $a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora"; $a->strings["Attachments:"] = "Anhänge:"; $a->strings["%s is now following %s."] = "%s folgt nun %s"; @@ -2181,6 +2182,6 @@ $a->strings["Video"] = "Video"; $a->strings["Delete this item?"] = "Diesen Beitrag löschen?"; $a->strings["show fewer"] = "weniger anzeigen"; $a->strings["No system theme config value set."] = "Es wurde kein Konfigurationswert für das Systemweite Theme gesetzt."; -$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln"; $a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "%s: Aktualisiere die author-id und owner-id in der Thread Tabelle"; $a->strings["Update %s failed. See error logs."] = "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."; +$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln"; From 32a639891f447ed0c4c67fbbff5f96e7739c3169 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 1 Jul 2018 09:08:58 +0000 Subject: [PATCH 16/25] Improved logging for expired items --- src/Model/Item.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 3f80b11c3..71faa3f26 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -2518,7 +2518,7 @@ class Item extends BaseObject $expire_starred = PConfig::get($uid, 'expire', 'starred', true); $expire_photos = PConfig::get($uid, 'expire', 'photos', false); - logger('User ' . $uid . ": expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); + $expired = 0; while ($item = Item::fetch($items)) { // don't expire filed items @@ -2540,8 +2540,11 @@ class Item extends BaseObject } self::deleteById($item['id'], PRIORITY_LOW); + + ++$expired; } dba::close($items); + logger('User ' . $uid . ": expired $expired items; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); } public static function firstPostDate($uid, $wall = false) From 38160a48b0226a3ece01d5a28d59d2c02e8bb8e5 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 1 Jul 2018 19:02:29 +0000 Subject: [PATCH 17/25] Post update script to move old content from the item table --- src/Database/PostUpdate.php | 44 +++++++++++++++++++++++++++++++++++++ src/Model/Item.php | 16 +++++++++++++- src/Protocol/DFRN.php | 7 ------ src/Protocol/Diaspora.php | 7 ------ 4 files changed, 59 insertions(+), 15 deletions(-) diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php index 13da43779..4f186ecbe 100644 --- a/src/Database/PostUpdate.php +++ b/src/Database/PostUpdate.php @@ -7,6 +7,7 @@ namespace Friendica\Database; use Friendica\Core\Config; use Friendica\Database\DBM; use Friendica\Model\Contact; +use Friendica\Model\Item; use dba; require_once 'include/dba.php'; @@ -30,6 +31,9 @@ class PostUpdate if (!self::update1206()) { return; } + if (!self::update1274()) { + return; + } } /** @@ -217,4 +221,44 @@ class PostUpdate logger("Done", LOGGER_DEBUG); return true; } + + /** + * @brief update the "item-content" table + * + * @return bool "true" when the job is done + */ + private static function update1274() + { + // Was the script completed? + if (Config::get("system", "post_update_version") >= 1274) { + return true; + } + + logger("Start", LOGGER_DEBUG); + + $fields = ['id', 'title', 'content-warning', 'body', 'location', 'tag', 'file', + 'coord', 'app', 'rendered-hash', 'rendered-html', 'verb', + 'object-type', 'object', 'target-type', 'target', 'plink']; + + $condition = ["`icid` IS NULL"]; + $params = ['limit' => 10000]; + $items = Item::select($fields, $condition, $params); + + if (!DBM::is_result($items)) { + Config::set("system", "post_update_version", 1274); + logger("Done", LOGGER_DEBUG); + return true; + } + + $rows = 0; + + while ($item = Item::fetch($items)) { + Item::update($item, ['id' => $item['id']]); + ++$rows; + } + dba::close($items); + + logger("Processed rows: " . $rows, LOGGER_DEBUG); + return true; + } } diff --git a/src/Model/Item.php b/src/Model/Item.php index 71faa3f26..57090da4c 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -614,7 +614,7 @@ class Item extends BaseObject // We cannot simply expand the condition to check for origin entries // The condition needn't to be a simple array but could be a complex condition. // And we have to execute this query before the update to ensure to fetch the same data. - $items = dba::select('item', ['id', 'origin', 'uri', 'plink'], $condition); + $items = dba::select('item', ['id', 'origin', 'uri', 'plink', 'icid'], $condition); $content_fields = []; foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) { @@ -657,6 +657,20 @@ class Item extends BaseObject } self::updateContent($content_fields, ['uri' => $item['uri']]); + if (empty($item['icid'])) { + $item_content = dba::selectFirst('item-content', [], ['uri' => $item['uri']]); + if (DBM::is_result($item_content)) { + $item_fields = ['icid' => $item_content['id']]; + // Clear all fields in the item table that have a content in the item-content table + foreach ($item_content as $field => $content) { + if (in_array($field, self::MIXED_CONTENT_FIELDLIST) && !empty($item_content[$field])) { + $item_fields[$field] = ''; + } + } + dba::update('item', $item_fields, ['id' => $item['id']]); + } + } + if (!empty($tags)) { Term::insertFromTagFieldByItemId($item['id'], $tags); } diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index c1e116f2f..f979d6b00 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -2087,13 +2087,6 @@ class DFRN logger('Contacts are updated.'); - // update items - // This is an extreme performance killer - Item::update(['owner-link' => $relocate["url"]], ['owner-link' => $old["url"], 'uid' => $importer["importer_uid"]]); - Item::update(['author-link' => $relocate["url"]], ['author-link' => $old["url"], 'uid' => $importer["importer_uid"]]); - - logger('Items are updated.'); - /// @TODO /// merge with current record, current contents have priority /// update record, set url-updated diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 6ef529b7f..47101d5ad 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -1543,13 +1543,6 @@ class Diaspora logger('Contacts are updated.'); - // update items - // This is an extreme performance killer - Item::update(['owner-link' => $data["url"]], ['owner-link' => $contact["url"], 'uid' => $importer["uid"]]); - Item::update(['author-link' => $data["url"]], ['author-link' => $contact["url"], 'uid' => $importer["uid"]]); - - logger('Items are updated.'); - return true; } From 37bc19673de98842c75ec180e6d4ec4d33fe22f4 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 1 Jul 2018 19:33:42 +0000 Subject: [PATCH 18/25] Empty owner and author data --- src/Database/PostUpdate.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php index 4f186ecbe..e50250ff5 100644 --- a/src/Database/PostUpdate.php +++ b/src/Database/PostUpdate.php @@ -238,7 +238,8 @@ class PostUpdate $fields = ['id', 'title', 'content-warning', 'body', 'location', 'tag', 'file', 'coord', 'app', 'rendered-hash', 'rendered-html', 'verb', - 'object-type', 'object', 'target-type', 'target', 'plink']; + 'object-type', 'object', 'target-type', 'target', 'plink', + 'author-id', 'owner-id']; $condition = ["`icid` IS NULL"]; $params = ['limit' => 10000]; @@ -253,6 +254,19 @@ class PostUpdate $rows = 0; while ($item = Item::fetch($items)) { + // Clearing the author and owner data if there is an id. + if ($item['author-id'] > 0) { + $item['author-name'] = ''; + $item['author-link'] = ''; + $item['author-avatar'] = ''; + } + + if ($item['owner-id'] > 0) { + $item['owner-name'] = ''; + $item['owner-link'] = ''; + $item['owner-avatar'] = ''; + } + Item::update($item, ['id' => $item['id']]); ++$rows; } From fef252736be9d2ba5abe73aa0ccabe6c0baf78a5 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 2 Jul 2018 07:04:43 +0200 Subject: [PATCH 19/25] CS translation update THX Aditoo --- view/lang/cs/messages.po | 1871 +++++++++++++++++++------------------- view/lang/cs/strings.php | 293 +++--- 2 files changed, 1085 insertions(+), 1079 deletions(-) diff --git a/view/lang/cs/messages.po b/view/lang/cs/messages.po index d221ab84d..7984a34e6 100644 --- a/view/lang/cs/messages.po +++ b/view/lang/cs/messages.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-20 08:17+0200\n" -"PO-Revision-Date: 2018-06-24 17:15+0000\n" +"POT-Creation-Date: 2018-06-30 17:33+0200\n" +"PO-Revision-Date: 2018-07-01 23:15+0000\n" "Last-Translator: Aditoo\n" "Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n" "MIME-Version: 1.0\n" @@ -22,6 +22,87 @@ msgstr "" "Language: cs\n" "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n" +#: include/items.php:342 mod/notice.php:22 mod/admin.php:277 +#: mod/admin.php:1888 mod/admin.php:2136 mod/viewsrc.php:22 mod/display.php:70 +#: mod/display.php:244 mod/display.php:341 +msgid "Item not found." +msgstr "Položka nenalezena." + +#: include/items.php:379 +msgid "Do you really want to delete this item?" +msgstr "Opravdu chcete smazat tuto položku?" + +#: include/items.php:381 mod/api.php:110 mod/follow.php:150 +#: mod/profiles.php:543 mod/profiles.php:546 mod/profiles.php:568 +#: mod/settings.php:1094 mod/settings.php:1100 mod/settings.php:1107 +#: mod/settings.php:1111 mod/settings.php:1115 mod/settings.php:1119 +#: mod/settings.php:1123 mod/settings.php:1127 mod/settings.php:1147 +#: mod/settings.php:1148 mod/settings.php:1149 mod/settings.php:1150 +#: mod/settings.php:1151 mod/contacts.php:472 mod/dfrn_request.php:647 +#: mod/register.php:238 mod/suggest.php:38 mod/message.php:138 +msgid "Yes" +msgstr "Ano" + +#: include/items.php:384 include/conversation.php:1148 mod/fbrowser.php:103 +#: mod/fbrowser.php:134 mod/follow.php:161 mod/settings.php:670 +#: mod/settings.php:696 mod/videos.php:147 mod/contacts.php:475 +#: mod/dfrn_request.php:657 mod/editpost.php:135 mod/suggest.php:41 +#: mod/tagrm.php:19 mod/tagrm.php:91 mod/unfollow.php:117 mod/message.php:141 +#: mod/photos.php:244 mod/photos.php:313 +msgid "Cancel" +msgstr "Zrušit" + +#: include/items.php:398 mod/api.php:35 mod/api.php:40 mod/attach.php:38 +#: mod/common.php:26 mod/nogroup.php:28 mod/repair_ostatus.php:13 +#: mod/uimport.php:28 mod/manage.php:131 mod/wall_attach.php:74 +#: mod/wall_attach.php:77 mod/regmod.php:108 mod/wallmessage.php:16 +#: mod/wallmessage.php:40 mod/wallmessage.php:79 mod/wallmessage.php:103 +#: mod/fsuggest.php:80 mod/cal.php:304 mod/delegate.php:25 mod/delegate.php:43 +#: mod/delegate.php:54 mod/ostatus_subscribe.php:16 mod/profile_photo.php:30 +#: mod/profile_photo.php:176 mod/profile_photo.php:187 +#: mod/profile_photo.php:200 mod/follow.php:17 mod/follow.php:54 +#: mod/follow.php:118 mod/invite.php:20 mod/invite.php:111 mod/crepair.php:98 +#: mod/dfrn_confirm.php:68 mod/events.php:194 mod/group.php:26 +#: mod/profiles.php:182 mod/profiles.php:513 mod/settings.php:43 +#: mod/settings.php:142 mod/settings.php:659 mod/allfriends.php:21 +#: mod/contacts.php:386 mod/dirfind.php:24 mod/editpost.php:19 +#: mod/notifications.php:65 mod/poke.php:146 mod/register.php:54 +#: mod/suggest.php:60 mod/unfollow.php:15 mod/unfollow.php:57 +#: mod/unfollow.php:90 mod/viewcontacts.php:57 mod/wall_upload.php:103 +#: mod/wall_upload.php:106 mod/item.php:160 mod/message.php:59 +#: mod/message.php:104 mod/network.php:32 mod/notes.php:31 mod/photos.php:175 +#: mod/photos.php:1033 index.php:446 +msgid "Permission denied." +msgstr "Přístup odmítnut." + +#: include/items.php:468 src/Content/Feature.php:96 +msgid "Archives" +msgstr "Archív" + +#: include/items.php:474 view/theme/vier/theme.php:258 +#: src/Content/Widget.php:317 src/Content/ForumManager.php:131 +#: src/Object/Post.php:421 src/App.php:527 +msgid "show more" +msgstr "zobrazit více" + +#: include/security.php:81 +msgid "Welcome " +msgstr "Vítejte " + +#: include/security.php:82 +msgid "Please upload a profile photo." +msgstr "Prosím nahrejte profilovou fotografii" + +#: include/security.php:84 +msgid "Welcome back " +msgstr "Vítejte zpět " + +#: include/security.php:447 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." +msgstr "Formulářový bezpečnostní token nebyl správný. To pravděpodobně nastalo kvůli tom, že formulář byl otevřen příliš dlouho (>3 hodiny) před jeho odesláním." + #: include/api.php:1131 #, php-format msgid "Daily posting limit of %d post reached. The post was rejected." @@ -46,40 +127,40 @@ msgstr[3] "Byl dosažen týdenní limit %d příspěvků. Příspěvek byl odmí msgid "Monthly posting limit of %d post reached. The post was rejected." msgstr "Byl dosažen měsíční limit %d příspěvků. Příspěvek byl odmítnut." -#: include/api.php:4217 mod/profile_photo.php:85 mod/profile_photo.php:93 +#: include/api.php:4218 mod/profile_photo.php:85 mod/profile_photo.php:93 #: mod/profile_photo.php:101 mod/profile_photo.php:211 #: mod/profile_photo.php:302 mod/profile_photo.php:312 mod/photos.php:89 -#: mod/photos.php:190 mod/photos.php:703 mod/photos.php:1130 -#: mod/photos.php:1147 mod/photos.php:1669 src/Model/User.php:563 +#: mod/photos.php:190 mod/photos.php:704 mod/photos.php:1131 +#: mod/photos.php:1148 mod/photos.php:1635 src/Model/User.php:563 #: src/Model/User.php:571 src/Model/User.php:579 msgid "Profile Photos" msgstr "Profilové fotky" #: include/conversation.php:148 include/conversation.php:278 -#: include/text.php:1714 src/Model/Item.php:2449 +#: include/text.php:1714 src/Model/Item.php:2661 msgid "event" msgstr "událost" #: include/conversation.php:151 include/conversation.php:161 #: include/conversation.php:281 include/conversation.php:290 -#: mod/subthread.php:97 mod/tagger.php:70 src/Model/Item.php:2447 +#: mod/subthread.php:97 mod/tagger.php:70 src/Model/Item.php:2659 #: src/Protocol/Diaspora.php:1949 msgid "status" msgstr "stav" #: include/conversation.php:156 include/conversation.php:286 #: include/text.php:1716 mod/subthread.php:97 mod/tagger.php:70 -#: src/Model/Item.php:2447 +#: src/Model/Item.php:2659 msgid "photo" msgstr "fotka" -#: include/conversation.php:168 src/Model/Item.php:2320 +#: include/conversation.php:168 src/Model/Item.php:2530 #: src/Protocol/Diaspora.php:1945 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s se líbí %3$s %2$s" -#: include/conversation.php:170 src/Model/Item.php:2325 +#: include/conversation.php:170 src/Model/Item.php:2535 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s se nelíbí %3$s %2$s" @@ -123,16 +204,16 @@ msgstr "příspěvek/položka" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "uživatel %1$s označil %3$s %2$s jako oblíbené" -#: include/conversation.php:504 mod/profiles.php:355 mod/photos.php:1490 +#: include/conversation.php:504 mod/profiles.php:355 mod/photos.php:1464 msgid "Likes" msgstr "Libí se mi" -#: include/conversation.php:504 mod/profiles.php:359 mod/photos.php:1490 +#: include/conversation.php:504 mod/profiles.php:359 mod/photos.php:1464 msgid "Dislikes" msgstr "Nelibí se mi" -#: include/conversation.php:505 include/conversation.php:1462 -#: mod/photos.php:1491 +#: include/conversation.php:505 include/conversation.php:1455 +#: mod/photos.php:1465 msgid "Attending" msgid_plural "Attending" msgstr[0] "Účastní se" @@ -140,348 +221,339 @@ msgstr[1] "Účastní se" msgstr[2] "Účastní se" msgstr[3] "Účastní se" -#: include/conversation.php:505 mod/photos.php:1491 +#: include/conversation.php:505 mod/photos.php:1465 msgid "Not attending" msgstr "Neúčastní se" -#: include/conversation.php:505 mod/photos.php:1491 +#: include/conversation.php:505 mod/photos.php:1465 msgid "Might attend" msgstr "Mohl/a by se zúčastnit" -#: include/conversation.php:600 mod/photos.php:1554 src/Object/Post.php:191 +#: include/conversation.php:593 mod/photos.php:1521 src/Object/Post.php:191 msgid "Select" msgstr "Vybrat" -#: include/conversation.php:601 mod/settings.php:730 mod/admin.php:1832 -#: mod/contacts.php:829 mod/contacts.php:1035 mod/photos.php:1555 +#: include/conversation.php:594 mod/settings.php:730 mod/admin.php:1832 +#: mod/contacts.php:829 mod/contacts.php:1035 mod/photos.php:1522 msgid "Delete" msgstr "Odstranit" -#: include/conversation.php:635 src/Object/Post.php:362 -#: src/Object/Post.php:363 +#: include/conversation.php:628 src/Object/Post.php:354 +#: src/Object/Post.php:355 #, php-format msgid "View %s's profile @ %s" msgstr "Zobrazit profil uživatele %s na %s" -#: include/conversation.php:647 src/Object/Post.php:350 +#: include/conversation.php:640 src/Object/Post.php:342 msgid "Categories:" msgstr "Kategorie:" -#: include/conversation.php:648 src/Object/Post.php:351 +#: include/conversation.php:641 src/Object/Post.php:343 msgid "Filed under:" msgstr "Vyplněn pod:" -#: include/conversation.php:655 src/Object/Post.php:376 +#: include/conversation.php:648 src/Object/Post.php:368 #, php-format msgid "%s from %s" msgstr "%s od %s" -#: include/conversation.php:670 +#: include/conversation.php:663 msgid "View in context" msgstr "Zobrazit v kontextu" -#: include/conversation.php:672 include/conversation.php:1137 -#: mod/wallmessage.php:145 mod/editpost.php:111 mod/message.php:245 -#: mod/message.php:411 mod/photos.php:1462 src/Object/Post.php:401 +#: include/conversation.php:665 include/conversation.php:1130 +#: mod/wallmessage.php:145 mod/editpost.php:111 mod/message.php:247 +#: mod/message.php:413 mod/photos.php:1436 src/Object/Post.php:393 msgid "Please wait" msgstr "Čekejte prosím" -#: include/conversation.php:743 +#: include/conversation.php:736 msgid "remove" msgstr "odstranit" -#: include/conversation.php:747 +#: include/conversation.php:740 msgid "Delete Selected Items" msgstr "Smazat vybrané položky" -#: include/conversation.php:845 view/theme/frio/theme.php:357 +#: include/conversation.php:838 view/theme/frio/theme.php:357 msgid "Follow Thread" msgstr "Následovat vlákno" -#: include/conversation.php:846 src/Model/Contact.php:662 +#: include/conversation.php:839 src/Model/Contact.php:662 msgid "View Status" msgstr "Zobrazit stav" -#: include/conversation.php:847 include/conversation.php:863 -#: mod/allfriends.php:73 mod/directory.php:159 mod/dirfind.php:216 -#: mod/match.php:89 mod/suggest.php:82 src/Model/Contact.php:602 +#: include/conversation.php:840 include/conversation.php:856 +#: mod/allfriends.php:73 mod/dirfind.php:216 mod/match.php:89 +#: mod/suggest.php:82 mod/directory.php:160 src/Model/Contact.php:602 #: src/Model/Contact.php:615 src/Model/Contact.php:663 msgid "View Profile" msgstr "Zobrazit profil" -#: include/conversation.php:848 src/Model/Contact.php:664 +#: include/conversation.php:841 src/Model/Contact.php:664 msgid "View Photos" msgstr "Zobrazit fotky" -#: include/conversation.php:849 src/Model/Contact.php:665 +#: include/conversation.php:842 src/Model/Contact.php:665 msgid "Network Posts" msgstr "Zobrazit Příspěvky sítě" -#: include/conversation.php:850 src/Model/Contact.php:666 +#: include/conversation.php:843 src/Model/Contact.php:666 msgid "View Contact" msgstr "Zobrazit kontakt" -#: include/conversation.php:851 src/Model/Contact.php:668 +#: include/conversation.php:844 src/Model/Contact.php:668 msgid "Send PM" msgstr "Poslat soukromou zprávu" -#: include/conversation.php:855 src/Model/Contact.php:669 +#: include/conversation.php:848 src/Model/Contact.php:669 msgid "Poke" msgstr "Šťouchnout" -#: include/conversation.php:860 mod/follow.php:143 mod/allfriends.php:74 +#: include/conversation.php:853 mod/follow.php:143 mod/allfriends.php:74 #: mod/contacts.php:595 mod/dirfind.php:217 mod/match.php:90 #: mod/suggest.php:83 view/theme/vier/theme.php:201 src/Content/Widget.php:61 #: src/Model/Contact.php:616 msgid "Connect/Follow" msgstr "Připojit / Následovat" -#: include/conversation.php:976 +#: include/conversation.php:969 #, php-format msgid "%s likes this." msgstr "%s se to líbí." -#: include/conversation.php:979 +#: include/conversation.php:972 #, php-format msgid "%s doesn't like this." msgstr "%s se to nelíbí." -#: include/conversation.php:982 +#: include/conversation.php:975 #, php-format msgid "%s attends." msgstr "%s se účastní." -#: include/conversation.php:985 +#: include/conversation.php:978 #, php-format msgid "%s doesn't attend." msgstr "%s se neúčastní." -#: include/conversation.php:988 +#: include/conversation.php:981 #, php-format msgid "%s attends maybe." msgstr "%s se možná účastní." -#: include/conversation.php:999 +#: include/conversation.php:992 msgid "and" msgstr "a" -#: include/conversation.php:1005 +#: include/conversation.php:998 #, php-format msgid "and %d other people" msgstr "a dalších %d lidí" -#: include/conversation.php:1014 +#: include/conversation.php:1007 #, php-format msgid "%2$d people like this" msgstr "%2$d lidem se to líbí" -#: include/conversation.php:1015 +#: include/conversation.php:1008 #, php-format msgid "%s like this." msgstr "%s se tohle líbí." -#: include/conversation.php:1018 +#: include/conversation.php:1011 #, php-format msgid "%2$d people don't like this" msgstr "%2$d lidem se to nelíbí" -#: include/conversation.php:1019 +#: include/conversation.php:1012 #, php-format msgid "%s don't like this." msgstr "%s se tohle nelíbí." -#: include/conversation.php:1022 +#: include/conversation.php:1015 #, php-format msgid "%2$d people attend" msgstr "%2$d lidí se účastní" -#: include/conversation.php:1023 +#: include/conversation.php:1016 #, php-format msgid "%s attend." msgstr "%s se účastní." -#: include/conversation.php:1026 +#: include/conversation.php:1019 #, php-format msgid "%2$d people don't attend" msgstr "%2$d lidí se neúčastní" -#: include/conversation.php:1027 +#: include/conversation.php:1020 #, php-format msgid "%s don't attend." msgstr "%s se neúčastní" -#: include/conversation.php:1030 +#: include/conversation.php:1023 #, php-format msgid "%2$d people attend maybe" msgstr "%2$d lidí se možná účastní" -#: include/conversation.php:1031 +#: include/conversation.php:1024 #, php-format msgid "%s attend maybe." msgstr "%s se možná účastní" -#: include/conversation.php:1061 include/conversation.php:1077 +#: include/conversation.php:1054 include/conversation.php:1070 msgid "Visible to everybody" msgstr "Viditelné pro všechny" -#: include/conversation.php:1062 include/conversation.php:1078 -#: mod/wallmessage.php:120 mod/wallmessage.php:127 mod/message.php:181 -#: mod/message.php:188 mod/message.php:324 mod/message.php:331 +#: include/conversation.php:1055 include/conversation.php:1071 +#: mod/wallmessage.php:120 mod/wallmessage.php:127 mod/message.php:183 +#: mod/message.php:190 mod/message.php:326 mod/message.php:333 msgid "Please enter a link URL:" msgstr "Zadejte prosím URL odkaz:" -#: include/conversation.php:1063 include/conversation.php:1079 +#: include/conversation.php:1056 include/conversation.php:1072 msgid "Please enter a video link/URL:" msgstr "Prosím zadejte URL adresu videa:" -#: include/conversation.php:1064 include/conversation.php:1080 +#: include/conversation.php:1057 include/conversation.php:1073 msgid "Please enter an audio link/URL:" msgstr "Prosím zadejte URL adresu zvukového záznamu:" -#: include/conversation.php:1065 include/conversation.php:1081 +#: include/conversation.php:1058 include/conversation.php:1074 msgid "Tag term:" msgstr "Štítek:" -#: include/conversation.php:1066 include/conversation.php:1082 +#: include/conversation.php:1059 include/conversation.php:1075 #: mod/filer.php:34 msgid "Save to Folder:" msgstr "Uložit do složky:" -#: include/conversation.php:1067 include/conversation.php:1083 +#: include/conversation.php:1060 include/conversation.php:1076 msgid "Where are you right now?" msgstr "Kde právě jste?" -#: include/conversation.php:1068 +#: include/conversation.php:1061 msgid "Delete item(s)?" msgstr "Smazat položku(y)?" -#: include/conversation.php:1115 +#: include/conversation.php:1108 msgid "New Post" msgstr "Nový příspěvek" -#: include/conversation.php:1118 +#: include/conversation.php:1111 msgid "Share" msgstr "Sdílet" -#: include/conversation.php:1119 mod/wallmessage.php:143 mod/editpost.php:97 -#: mod/message.php:243 mod/message.php:408 +#: include/conversation.php:1112 mod/wallmessage.php:143 mod/editpost.php:97 +#: mod/message.php:245 mod/message.php:410 msgid "Upload photo" msgstr "Nahrát fotografii" -#: include/conversation.php:1120 mod/editpost.php:98 +#: include/conversation.php:1113 mod/editpost.php:98 msgid "upload photo" msgstr "nahrát fotky" -#: include/conversation.php:1121 mod/editpost.php:99 +#: include/conversation.php:1114 mod/editpost.php:99 msgid "Attach file" msgstr "Přiložit soubor" -#: include/conversation.php:1122 mod/editpost.php:100 +#: include/conversation.php:1115 mod/editpost.php:100 msgid "attach file" msgstr "přidat soubor" -#: include/conversation.php:1123 mod/wallmessage.php:144 mod/editpost.php:101 -#: mod/message.php:244 mod/message.php:409 +#: include/conversation.php:1116 mod/wallmessage.php:144 mod/editpost.php:101 +#: mod/message.php:246 mod/message.php:411 msgid "Insert web link" msgstr "Vložit webový odkaz" -#: include/conversation.php:1124 mod/editpost.php:102 +#: include/conversation.php:1117 mod/editpost.php:102 msgid "web link" msgstr "webový odkaz" -#: include/conversation.php:1125 mod/editpost.php:103 +#: include/conversation.php:1118 mod/editpost.php:103 msgid "Insert video link" msgstr "Zadejte odkaz na video" -#: include/conversation.php:1126 mod/editpost.php:104 +#: include/conversation.php:1119 mod/editpost.php:104 msgid "video link" msgstr "odkaz na video" -#: include/conversation.php:1127 mod/editpost.php:105 +#: include/conversation.php:1120 mod/editpost.php:105 msgid "Insert audio link" msgstr "Zadejte odkaz na zvukový záznam" -#: include/conversation.php:1128 mod/editpost.php:106 +#: include/conversation.php:1121 mod/editpost.php:106 msgid "audio link" msgstr "odkaz na audio" -#: include/conversation.php:1129 mod/editpost.php:107 +#: include/conversation.php:1122 mod/editpost.php:107 msgid "Set your location" msgstr "Nastavte vaši polohu" -#: include/conversation.php:1130 mod/editpost.php:108 +#: include/conversation.php:1123 mod/editpost.php:108 msgid "set location" msgstr "nastavit místo" -#: include/conversation.php:1131 mod/editpost.php:109 +#: include/conversation.php:1124 mod/editpost.php:109 msgid "Clear browser location" msgstr "Odstranit adresu v prohlížeči" -#: include/conversation.php:1132 mod/editpost.php:110 +#: include/conversation.php:1125 mod/editpost.php:110 msgid "clear location" msgstr "vymazat místo" -#: include/conversation.php:1134 mod/editpost.php:124 +#: include/conversation.php:1127 mod/editpost.php:124 msgid "Set title" msgstr "Nastavit titulek" -#: include/conversation.php:1136 mod/editpost.php:126 +#: include/conversation.php:1129 mod/editpost.php:126 msgid "Categories (comma-separated list)" msgstr "Kategorie (čárkou oddělený seznam)" -#: include/conversation.php:1138 mod/editpost.php:112 +#: include/conversation.php:1131 mod/editpost.php:112 msgid "Permission settings" msgstr "Nastavení oprávnění" -#: include/conversation.php:1139 mod/editpost.php:141 +#: include/conversation.php:1132 mod/editpost.php:141 msgid "permissions" msgstr "oprávnění" -#: include/conversation.php:1147 mod/editpost.php:121 +#: include/conversation.php:1140 mod/editpost.php:121 msgid "Public post" msgstr "Veřejný příspěvek" -#: include/conversation.php:1151 mod/events.php:529 mod/editpost.php:132 -#: mod/photos.php:1481 mod/photos.php:1520 mod/photos.php:1589 -#: src/Object/Post.php:804 +#: include/conversation.php:1144 mod/events.php:529 mod/editpost.php:132 +#: mod/photos.php:1455 mod/photos.php:1494 mod/photos.php:1555 +#: src/Object/Post.php:796 msgid "Preview" msgstr "Náhled" -#: include/conversation.php:1155 include/items.php:384 mod/fbrowser.php:103 -#: mod/fbrowser.php:134 mod/follow.php:161 mod/settings.php:670 -#: mod/settings.php:696 mod/videos.php:147 mod/contacts.php:475 -#: mod/dfrn_request.php:657 mod/editpost.php:135 mod/message.php:141 -#: mod/photos.php:244 mod/photos.php:313 mod/suggest.php:41 mod/tagrm.php:19 -#: mod/tagrm.php:91 mod/unfollow.php:117 -msgid "Cancel" -msgstr "Zrušit" - -#: include/conversation.php:1160 +#: include/conversation.php:1153 msgid "Post to Groups" msgstr "Zveřejnit na Groups" -#: include/conversation.php:1161 +#: include/conversation.php:1154 msgid "Post to Contacts" msgstr "Zveřejnit na Groups" -#: include/conversation.php:1162 +#: include/conversation.php:1155 msgid "Private post" msgstr "Soukromý příspěvek" -#: include/conversation.php:1167 mod/editpost.php:139 -#: src/Model/Profile.php:338 +#: include/conversation.php:1160 mod/editpost.php:139 +#: src/Model/Profile.php:339 msgid "Message" msgstr "Zpráva" -#: include/conversation.php:1168 mod/editpost.php:140 +#: include/conversation.php:1161 mod/editpost.php:140 msgid "Browser" msgstr "Prohlížeč" -#: include/conversation.php:1433 +#: include/conversation.php:1426 msgid "View all" msgstr "Zobrazit vše" -#: include/conversation.php:1456 +#: include/conversation.php:1449 msgid "Like" msgid_plural "Likes" msgstr[0] "Líbí se" @@ -489,7 +561,7 @@ msgstr[1] "Líbí se" msgstr[2] "Líbí se" msgstr[3] "Líbí se" -#: include/conversation.php:1459 +#: include/conversation.php:1452 msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "Nelíbí se" @@ -497,7 +569,7 @@ msgstr[1] "Nelíbí se" msgstr[2] "Nelíbí se" msgstr[3] "Nelíbí se" -#: include/conversation.php:1465 +#: include/conversation.php:1458 msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "Neúčastní se" @@ -505,7 +577,7 @@ msgstr[1] "Neúčastní se" msgstr[2] "Neúčastní se" msgstr[3] "Neúčastní se" -#: include/conversation.php:1468 src/Content/ContactSelector.php:125 +#: include/conversation.php:1461 src/Content/ContactSelector.php:125 msgid "Undecided" msgid_plural "Undecided" msgstr[0] "Nerozhotnut" @@ -808,78 +880,6 @@ msgstr "Celé jméno:\t\t%s\nAdresa stránky:\t\t%s\nPřihlašovací jméno:\t%s msgid "Please visit %s to approve or reject the request." msgstr "Prosím navštivte %s k odsouhlasení nebo k zamítnutí požadavku." -#: include/items.php:342 mod/notice.php:22 mod/admin.php:277 -#: mod/admin.php:1888 mod/admin.php:2136 mod/display.php:70 -#: mod/display.php:244 mod/display.php:341 mod/viewsrc.php:22 -msgid "Item not found." -msgstr "Položka nenalezena." - -#: include/items.php:379 -msgid "Do you really want to delete this item?" -msgstr "Opravdu chcete smazat tuto položku?" - -#: include/items.php:381 mod/api.php:110 mod/follow.php:150 -#: mod/profiles.php:543 mod/profiles.php:546 mod/profiles.php:568 -#: mod/settings.php:1094 mod/settings.php:1100 mod/settings.php:1107 -#: mod/settings.php:1111 mod/settings.php:1115 mod/settings.php:1119 -#: mod/settings.php:1123 mod/settings.php:1127 mod/settings.php:1147 -#: mod/settings.php:1148 mod/settings.php:1149 mod/settings.php:1150 -#: mod/settings.php:1151 mod/contacts.php:472 mod/dfrn_request.php:647 -#: mod/message.php:138 mod/register.php:238 mod/suggest.php:38 -msgid "Yes" -msgstr "Ano" - -#: include/items.php:398 mod/api.php:35 mod/api.php:40 mod/attach.php:38 -#: mod/common.php:26 mod/nogroup.php:28 mod/repair_ostatus.php:13 -#: mod/uimport.php:28 mod/manage.php:131 mod/wall_attach.php:74 -#: mod/wall_attach.php:77 mod/regmod.php:108 mod/wallmessage.php:16 -#: mod/wallmessage.php:40 mod/wallmessage.php:79 mod/wallmessage.php:103 -#: mod/fsuggest.php:80 mod/cal.php:304 mod/delegate.php:25 mod/delegate.php:43 -#: mod/delegate.php:54 mod/ostatus_subscribe.php:16 mod/profile_photo.php:30 -#: mod/profile_photo.php:176 mod/profile_photo.php:187 -#: mod/profile_photo.php:200 mod/follow.php:17 mod/follow.php:54 -#: mod/follow.php:118 mod/invite.php:20 mod/invite.php:111 mod/crepair.php:98 -#: mod/dfrn_confirm.php:68 mod/events.php:194 mod/group.php:26 -#: mod/profiles.php:182 mod/profiles.php:513 mod/settings.php:43 -#: mod/settings.php:142 mod/settings.php:659 mod/allfriends.php:21 -#: mod/contacts.php:386 mod/dirfind.php:24 mod/editpost.php:19 -#: mod/item.php:160 mod/message.php:59 mod/message.php:104 mod/network.php:32 -#: mod/notes.php:31 mod/notifications.php:65 mod/photos.php:175 -#: mod/photos.php:1032 mod/poke.php:146 mod/register.php:54 mod/suggest.php:60 -#: mod/unfollow.php:15 mod/unfollow.php:57 mod/unfollow.php:90 -#: mod/viewcontacts.php:57 mod/wall_upload.php:103 mod/wall_upload.php:106 -#: index.php:436 -msgid "Permission denied." -msgstr "Přístup odmítnut." - -#: include/items.php:468 src/Content/Feature.php:96 -msgid "Archives" -msgstr "Archív" - -#: include/items.php:474 view/theme/vier/theme.php:258 -#: src/Content/Widget.php:317 src/Content/ForumManager.php:131 -#: src/Object/Post.php:429 src/App.php:527 -msgid "show more" -msgstr "zobrazit více" - -#: include/security.php:81 -msgid "Welcome " -msgstr "Vítejte " - -#: include/security.php:82 -msgid "Please upload a profile photo." -msgstr "Prosím nahrejte profilovou fotografii" - -#: include/security.php:84 -msgid "Welcome back " -msgstr "Vítejte zpět " - -#: include/security.php:447 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "Formulářový bezpečnostní token nebyl správný. To pravděpodobně nastalo kvůli tom, že formulář byl otevřen příliš dlouho (>3 hodiny) před jeho odesláním." - #: include/text.php:302 msgid "newer" msgstr "novější" @@ -956,8 +956,8 @@ msgstr "Štítky:" #: include/text.php:996 mod/contacts.php:813 mod/contacts.php:874 #: mod/viewcontacts.php:122 view/theme/frio/theme.php:270 -#: src/Content/Nav.php:147 src/Content/Nav.php:213 src/Model/Profile.php:951 -#: src/Model/Profile.php:954 +#: src/Content/Nav.php:147 src/Content/Nav.php:213 src/Model/Profile.php:952 +#: src/Model/Profile.php:955 msgid "Contacts" msgstr "Kontakty" @@ -1192,7 +1192,7 @@ msgstr "odkaz na zdroj" msgid "activity" msgstr "aktivita" -#: include/text.php:1720 src/Object/Post.php:428 src/Object/Post.php:440 +#: include/text.php:1720 src/Object/Post.php:420 src/Object/Post.php:432 msgid "comment" msgid_plural "comments" msgstr[0] "" @@ -1204,7 +1204,7 @@ msgstr[3] "komentář" msgid "post" msgstr "příspěvek" -#: include/text.php:1881 +#: include/text.php:1878 msgid "Item filed" msgstr "Položka vyplněna" @@ -1236,7 +1236,7 @@ msgstr "Chcete umožnit této aplikaci přístup k vašim příspěvkům a konta msgid "No" msgstr "Ne" -#: mod/apps.php:14 index.php:265 +#: mod/apps.php:14 index.php:275 msgid "You must be logged in to use addons. " msgstr "Musíte být přihlášeni pro použití rozšíření." @@ -1276,13 +1276,13 @@ msgid "" msgstr "Friendica je komunitní projekt, který by nebyl možný bez pomoci mnoha lidí. Zde je seznam těch, kteří přispěli ke kódu nebo k překladu Friendica. Děkujeme všem!" #: mod/fbrowser.php:34 view/theme/frio/theme.php:261 src/Content/Nav.php:102 -#: src/Model/Profile.php:898 +#: src/Model/Profile.php:899 msgid "Photos" msgstr "Fotografie" #: mod/fbrowser.php:43 mod/fbrowser.php:68 mod/photos.php:190 -#: mod/photos.php:1043 mod/photos.php:1130 mod/photos.php:1147 -#: mod/photos.php:1644 mod/photos.php:1658 src/Model/Photo.php:244 +#: mod/photos.php:1044 mod/photos.php:1131 mod/photos.php:1148 +#: mod/photos.php:1610 mod/photos.php:1624 src/Model/Photo.php:244 #: src/Model/Photo.php:253 msgid "Contact Photos" msgstr "Fotogalerie kontaktu" @@ -1373,8 +1373,8 @@ msgstr "Prohlédněte si další nastavení, a to zejména nastavení soukromí. #: mod/newmember.php:24 mod/profperm.php:113 mod/contacts.php:670 #: mod/contacts.php:862 view/theme/frio/theme.php:260 src/Content/Nav.php:101 -#: src/Model/Profile.php:724 src/Model/Profile.php:857 -#: src/Model/Profile.php:890 +#: src/Model/Profile.php:725 src/Model/Profile.php:858 +#: src/Model/Profile.php:891 msgid "Profile" msgstr "Profil" @@ -1589,12 +1589,12 @@ msgstr "Vyberte identitu pro správu: " #: mod/manage.php:184 mod/localtime.php:56 mod/fsuggest.php:114 #: mod/invite.php:154 mod/crepair.php:148 mod/install.php:198 #: mod/install.php:237 mod/events.php:531 mod/profiles.php:579 -#: mod/contacts.php:609 mod/message.php:246 mod/message.php:410 -#: mod/photos.php:1061 mod/photos.php:1141 mod/photos.php:1434 -#: mod/photos.php:1480 mod/photos.php:1519 mod/photos.php:1588 -#: mod/poke.php:196 view/theme/duepuntozero/config.php:71 +#: mod/contacts.php:609 mod/poke.php:196 mod/message.php:248 +#: mod/message.php:412 mod/photos.php:1062 mod/photos.php:1142 +#: mod/photos.php:1408 mod/photos.php:1454 mod/photos.php:1493 +#: mod/photos.php:1554 view/theme/duepuntozero/config.php:71 #: view/theme/frio/config.php:118 view/theme/quattro/config.php:73 -#: view/theme/vier/config.php:119 src/Object/Post.php:795 +#: view/theme/vier/config.php:119 src/Object/Post.php:787 msgid "Submit" msgstr "Odeslat" @@ -1666,10 +1666,10 @@ msgstr "Žádné další systémová upozornění." msgid "System Notifications" msgstr "Systémová upozornění" -#: mod/probe.php:13 mod/webfinger.php:16 mod/community.php:27 -#: mod/videos.php:199 mod/dfrn_request.php:601 mod/directory.php:42 -#: mod/display.php:194 mod/photos.php:913 mod/search.php:99 mod/search.php:105 -#: mod/viewcontacts.php:45 +#: mod/probe.php:13 mod/webfinger.php:16 mod/videos.php:199 +#: mod/dfrn_request.php:601 mod/viewcontacts.php:45 mod/community.php:27 +#: mod/directory.php:42 mod/display.php:194 mod/photos.php:914 +#: mod/search.php:99 mod/search.php:105 msgid "Public access denied." msgstr "Veřejný přístup odepřen." @@ -1677,7 +1677,7 @@ msgstr "Veřejný přístup odepřen." msgid "Only logged in users are permitted to perform a probing." msgstr "Pouze přihlášení uživatelé mohou zkoušet adresy." -#: mod/profperm.php:28 mod/group.php:83 index.php:435 +#: mod/profperm.php:28 mod/group.php:83 index.php:445 msgid "Permission denied" msgstr "Nedostatečné oprávnění" @@ -1768,7 +1768,7 @@ msgstr "Zpráva odeslána." msgid "No recipient." msgstr "Žádný příjemce." -#: mod/wallmessage.php:132 mod/message.php:231 +#: mod/wallmessage.php:132 mod/message.php:233 msgid "Send Private Message" msgstr "Odeslat soukromou zprávu" @@ -1779,16 +1779,16 @@ msgid "" "your site allow private mail from unknown senders." msgstr "Pokud si přejete, aby uživatel %s mohl odpovědět, ověřte si zda-li máte povoleno na svém serveru zasílání soukromých zpráv od neznámých odesilatelů." -#: mod/wallmessage.php:134 mod/message.php:232 mod/message.php:399 +#: mod/wallmessage.php:134 mod/message.php:234 mod/message.php:401 msgid "To:" msgstr "Adresát:" -#: mod/wallmessage.php:135 mod/message.php:236 mod/message.php:401 +#: mod/wallmessage.php:135 mod/message.php:238 mod/message.php:403 msgid "Subject:" msgstr "Předmět:" -#: mod/wallmessage.php:141 mod/invite.php:149 mod/message.php:240 -#: mod/message.php:404 +#: mod/wallmessage.php:141 mod/invite.php:149 mod/message.php:242 +#: mod/message.php:406 msgid "Your message:" msgstr "Vaše zpráva:" @@ -1801,7 +1801,7 @@ msgid "The post was created" msgstr "Příspěvek byl vytvořen" #: mod/fsuggest.php:30 mod/fsuggest.php:96 mod/crepair.php:110 -#: mod/dfrn_confirm.php:129 mod/redir.php:28 mod/redir.php:92 +#: mod/dfrn_confirm.php:129 mod/redir.php:28 mod/redir.php:126 msgid "Contact not found." msgstr "Kontakt nenalezen." @@ -1824,7 +1824,7 @@ msgstr "Přístup na tento profil byl omezen." #: mod/cal.php:274 mod/events.php:391 view/theme/frio/theme.php:263 #: view/theme/frio/theme.php:267 src/Content/Nav.php:104 -#: src/Content/Nav.php:170 src/Model/Profile.php:918 src/Model/Profile.php:929 +#: src/Content/Nav.php:170 src/Model/Profile.php:919 src/Model/Profile.php:930 msgid "Events" msgstr "Události" @@ -1984,7 +1984,7 @@ msgstr "úspěch" msgid "failed" msgstr "selhalo" -#: mod/ostatus_subscribe.php:83 src/Object/Post.php:278 +#: mod/ostatus_subscribe.php:83 src/Object/Post.php:270 msgid "ignored" msgstr "ignorován" @@ -2008,13 +2008,13 @@ msgstr "Znovu načtěte stránku (Shift+F5) nebo vymažte cache prohlížeče, p msgid "Unable to process image" msgstr "Obrázek nelze zpracovat " -#: mod/profile_photo.php:153 mod/photos.php:744 mod/photos.php:747 -#: mod/photos.php:776 mod/wall_upload.php:186 +#: mod/profile_photo.php:153 mod/wall_upload.php:186 mod/photos.php:745 +#: mod/photos.php:748 mod/photos.php:777 #, php-format msgid "Image exceeds size limit of %s" msgstr "Velikost obrázku překročila limit %s" -#: mod/profile_photo.php:162 mod/photos.php:799 mod/wall_upload.php:200 +#: mod/profile_photo.php:162 mod/wall_upload.php:200 mod/photos.php:800 msgid "Unable to process image." msgstr "Obrázek není možné zprocesovat" @@ -2054,7 +2054,7 @@ msgstr "Editace dokončena" msgid "Image uploaded successfully." msgstr "Obrázek byl úspěšně nahrán." -#: mod/profile_photo.php:307 mod/photos.php:828 mod/wall_upload.php:239 +#: mod/profile_photo.php:307 mod/wall_upload.php:239 mod/photos.php:829 msgid "Image upload failed." msgstr "Nahrání obrázku selhalo." @@ -2105,12 +2105,12 @@ msgid "Profile URL" msgstr "URL profilu" #: mod/follow.php:174 mod/contacts.php:665 mod/notifications.php:246 -#: src/Model/Profile.php:788 +#: src/Model/Profile.php:789 msgid "Tags:" msgstr "Štítky:" #: mod/follow.php:186 mod/contacts.php:857 mod/unfollow.php:132 -#: src/Model/Profile.php:885 +#: src/Model/Profile.php:886 msgid "Status Messages and Posts" msgstr "Statusové zprávy a příspěvky " @@ -2570,11 +2570,6 @@ msgstr "Poll/Feed URL adresa" msgid "New photo from this URL" msgstr "Nové foto z této URL adresy" -#: mod/dfrn_poll.php:123 mod/dfrn_poll.php:539 -#, php-format -msgid "%1$s welcomes %2$s" -msgstr "%1$s vítá %2$s" - #: mod/help.php:48 msgid "Help:" msgstr "Nápověda:" @@ -2584,11 +2579,11 @@ msgid "Help" msgstr "Nápověda" #: mod/help.php:60 mod/fetch.php:19 mod/fetch.php:45 mod/fetch.php:52 -#: index.php:312 +#: index.php:322 msgid "Not Found" msgstr "Nenalezen" -#: mod/help.php:63 index.php:317 +#: mod/help.php:63 index.php:327 msgid "Page not found." msgstr "Stránka nenalezena" @@ -2725,44 +2720,6 @@ msgid "" " administrator email. This will allow you to enter the site admin panel." msgstr "Přejděte k registrační stránce Vašeho nového serveru Friendica a zaregistrujte se jako nový uživatel. Nezapomeňte použít stejný e-mail, který jste zadal/a jako administrátorský e-mail. To Vám umožní navštívit panel pro administraci stránky." -#: mod/community.php:34 mod/viewsrc.php:13 -msgid "Access denied." -msgstr "Přístup odmítnut" - -#: mod/community.php:51 -msgid "Community option not available." -msgstr "Možnost komunity není dostupná." - -#: mod/community.php:68 -msgid "Not available." -msgstr "Není k dispozici." - -#: mod/community.php:81 -msgid "Local Community" -msgstr "Lokální komunita" - -#: mod/community.php:84 -msgid "Posts from local users on this server" -msgstr "Příspěvky od lokálních uživatelů na tomto serveru" - -#: mod/community.php:92 -msgid "Global Community" -msgstr "Globální komunita" - -#: mod/community.php:95 -msgid "Posts from users of the whole federated network" -msgstr "Příspěvky od uživatelů z celé federované sítě" - -#: mod/community.php:141 mod/search.php:229 -msgid "No results." -msgstr "Žádné výsledky." - -#: mod/community.php:185 -msgid "" -"This community stream shows all public posts received by this node. They may" -" not reflect the opinions of this node’s users." -msgstr "Tento komunitní proud ukazuje všechny veřejné příspěvky, které tento server přijme. Nemusí odrážet názory uživatelů serveru." - #: mod/dfrn_confirm.php:74 mod/profiles.php:39 mod/profiles.php:149 #: mod/profiles.php:196 mod/profiles.php:525 msgid "Profile not found." @@ -2887,9 +2844,9 @@ msgstr "Nastavit časové pásmo pro uživatele s právem pro čtení" msgid "Description:" msgstr "Popis:" -#: mod/events.php:519 mod/contacts.php:659 mod/directory.php:148 -#: mod/notifications.php:242 src/Model/Event.php:60 src/Model/Event.php:85 -#: src/Model/Event.php:421 src/Model/Event.php:895 src/Model/Profile.php:413 +#: mod/events.php:519 mod/contacts.php:659 mod/notifications.php:242 +#: mod/directory.php:149 src/Model/Event.php:60 src/Model/Event.php:85 +#: src/Model/Event.php:421 src/Model/Event.php:895 src/Model/Profile.php:414 msgid "Location:" msgstr "Místo:" @@ -2901,16 +2858,16 @@ msgstr "Název:" msgid "Share this event" msgstr "Sdílet tuto událost" -#: mod/events.php:532 src/Model/Profile.php:858 +#: mod/events.php:532 src/Model/Profile.php:859 msgid "Basic" msgstr "Základní" #: mod/events.php:533 mod/admin.php:1362 mod/contacts.php:894 -#: src/Model/Profile.php:859 +#: src/Model/Profile.php:860 msgid "Advanced" msgstr "Pokročilé" -#: mod/events.php:534 mod/photos.php:1079 mod/photos.php:1430 +#: mod/events.php:534 mod/photos.php:1080 mod/photos.php:1404 #: src/Core/ACL.php:318 msgid "Permissions" msgstr "Oprávnění:" @@ -3104,7 +3061,7 @@ msgstr "Změna Profilové fotky" msgid "View this profile" msgstr "Zobrazit tento profil" -#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:389 +#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:390 msgid "Edit visibility" msgstr "Upravit viditelnost" @@ -3161,7 +3118,7 @@ msgstr "Vaše pohlaví:" msgid "♥ Marital Status:" msgstr "♥ Rodinný stav:" -#: mod/profiles.php:601 src/Model/Profile.php:776 +#: mod/profiles.php:601 src/Model/Profile.php:777 msgid "Sexual Preference:" msgstr "Sexuální preference:" @@ -3241,11 +3198,11 @@ msgstr "Adresa XMPP bude rozšířena mezi Vašimi kontakty, aby vás mohly sled msgid "Homepage URL:" msgstr "Odkaz na domovskou stránku:" -#: mod/profiles.php:628 src/Model/Profile.php:784 +#: mod/profiles.php:628 src/Model/Profile.php:785 msgid "Hometown:" msgstr "Rodné město" -#: mod/profiles.php:629 src/Model/Profile.php:792 +#: mod/profiles.php:629 src/Model/Profile.php:793 msgid "Political Views:" msgstr "Politické přesvědčení:" @@ -3269,11 +3226,11 @@ msgstr "Soukromá klíčová slova:" msgid "(Used for searching profiles, never shown to others)" msgstr "(Používá se pro vyhledávání profilů, není nikdy zobrazeno ostatním)" -#: mod/profiles.php:633 src/Model/Profile.php:808 +#: mod/profiles.php:633 src/Model/Profile.php:809 msgid "Likes:" msgstr "Líbí se:" -#: mod/profiles.php:634 src/Model/Profile.php:812 +#: mod/profiles.php:634 src/Model/Profile.php:813 msgid "Dislikes:" msgstr "Nelibí se:" @@ -3313,11 +3270,11 @@ msgstr "Škola/vzdělání" msgid "Contact information and Social Networks" msgstr "Kontaktní informace a sociální sítě" -#: mod/profiles.php:674 src/Model/Profile.php:385 +#: mod/profiles.php:674 src/Model/Profile.php:386 msgid "Profile Image" msgstr "Profilový obrázek" -#: mod/profiles.php:676 src/Model/Profile.php:388 +#: mod/profiles.php:676 src/Model/Profile.php:389 msgid "visible to everybody" msgstr "viditelné pro všechny" @@ -3325,11 +3282,11 @@ msgstr "viditelné pro všechny" msgid "Edit/Manage Profiles" msgstr "Upravit/Spravovat profily" -#: mod/profiles.php:684 src/Model/Profile.php:375 src/Model/Profile.php:397 +#: mod/profiles.php:684 src/Model/Profile.php:376 src/Model/Profile.php:398 msgid "Change profile photo" msgstr "Změnit profilovou fotografii" -#: mod/profiles.php:685 src/Model/Profile.php:376 +#: mod/profiles.php:685 src/Model/Profile.php:377 msgid "Create New Profile" msgstr "Vytvořit nový profil" @@ -4081,7 +4038,7 @@ msgstr "Heslo: " msgid "Basic Settings" msgstr "Základní nastavení" -#: mod/settings.php:1198 src/Model/Profile.php:732 +#: mod/settings.php:1198 src/Model/Profile.php:733 msgid "Full Name:" msgstr "Celé jméno:" @@ -4131,11 +4088,11 @@ msgstr "Výchozí oprávnění pro příspěvek" msgid "(click to open/close)" msgstr "(Klikněte pro otevření/zavření)" -#: mod/settings.php:1218 mod/photos.php:1087 mod/photos.php:1438 +#: mod/settings.php:1218 mod/photos.php:1088 mod/photos.php:1412 msgid "Show to Groups" msgstr "Zobrazit ve Skupinách" -#: mod/settings.php:1219 mod/photos.php:1088 mod/photos.php:1439 +#: mod/settings.php:1219 mod/photos.php:1089 mod/photos.php:1413 msgid "Show to Contacts" msgstr "Zobrazit v Kontaktech" @@ -4255,11 +4212,11 @@ msgstr "Odstranit video" msgid "No videos selected" msgstr "Není vybráno žádné video" -#: mod/videos.php:309 mod/photos.php:1017 +#: mod/videos.php:309 mod/photos.php:1018 msgid "Access to this item is restricted." msgstr "Přístup k této položce je omezen." -#: mod/videos.php:387 mod/photos.php:1690 +#: mod/videos.php:387 mod/photos.php:1656 msgid "View Album" msgstr "Zobrazit album" @@ -6036,11 +5993,11 @@ msgid "No friends to display." msgstr "Žádní přátelé k zobrazení" #: mod/allfriends.php:90 mod/dirfind.php:214 mod/match.php:105 -#: mod/suggest.php:101 src/Content/Widget.php:37 src/Model/Profile.php:293 +#: mod/suggest.php:101 src/Content/Widget.php:37 src/Model/Profile.php:294 msgid "Connect" msgstr "Spojit" -#: mod/contacts.php:71 mod/notifications.php:255 src/Model/Profile.php:516 +#: mod/contacts.php:71 mod/notifications.php:255 src/Model/Profile.php:517 msgid "Network:" msgstr "Síť:" @@ -6284,12 +6241,12 @@ msgid "" "when \"Fetch information and keywords\" is selected" msgstr "Čárkou oddělený seznam klíčových slov, které by neměly být převáděna na hashtagy, když je zvoleno \"Načíst informace a klíčová slova\"" -#: mod/contacts.php:661 src/Model/Profile.php:420 +#: mod/contacts.php:661 src/Model/Profile.php:421 msgid "XMPP:" msgstr "XMPP:" -#: mod/contacts.php:663 mod/directory.php:154 mod/notifications.php:244 -#: src/Model/Profile.php:419 src/Model/Profile.php:800 +#: mod/contacts.php:663 mod/notifications.php:244 mod/directory.php:155 +#: src/Model/Profile.php:420 src/Model/Profile.php:801 msgid "About:" msgstr "O mě:" @@ -6298,7 +6255,7 @@ msgid "Actions" msgstr "Akce" #: mod/contacts.php:668 mod/contacts.php:854 view/theme/frio/theme.php:259 -#: src/Content/Nav.php:100 src/Model/Profile.php:882 +#: src/Content/Nav.php:100 src/Model/Profile.php:883 msgid "Status" msgstr "Stav" @@ -6362,12 +6319,12 @@ msgstr "Zobrazit pouze skryté kontakty" msgid "Search your contacts" msgstr "Prohledat Vaše kontakty" -#: mod/contacts.php:818 mod/search.php:237 +#: mod/contacts.php:818 mod/search.php:242 #, php-format msgid "Results for: %s" msgstr "Výsledky pro: %s" -#: mod/contacts.php:819 mod/directory.php:209 view/theme/vier/theme.php:203 +#: mod/contacts.php:819 mod/directory.php:210 view/theme/vier/theme.php:203 #: src/Content/Widget.php:63 msgid "Find" msgstr "Najít" @@ -6384,7 +6341,7 @@ msgstr "Vrátit z archívu" msgid "Batch Actions" msgstr "Dávkové (batch) akce" -#: mod/contacts.php:865 src/Model/Profile.php:893 +#: mod/contacts.php:865 src/Model/Profile.php:894 msgid "Profile Details" msgstr "Detaily profilu" @@ -6412,8 +6369,8 @@ msgstr "je Váš fanoušek" msgid "you are a fan of" msgstr "jste fanouškem" -#: mod/contacts.php:952 mod/photos.php:1477 mod/photos.php:1516 -#: mod/photos.php:1585 src/Object/Post.php:792 +#: mod/contacts.php:952 mod/photos.php:1451 mod/photos.php:1490 +#: mod/photos.php:1551 src/Object/Post.php:784 msgid "This is you" msgstr "Nastavte Vaši polohu" @@ -6584,40 +6541,6 @@ msgid "" " bar." msgstr " - prosím nepoužívejte tento formulář. Místo toho zadejte %s do Vašeho Diaspora vyhledávacího pole." -#: mod/directory.php:151 mod/notifications.php:248 src/Model/Profile.php:416 -#: src/Model/Profile.php:739 -msgid "Gender:" -msgstr "Pohlaví:" - -#: mod/directory.php:152 src/Model/Profile.php:417 src/Model/Profile.php:763 -msgid "Status:" -msgstr "Status:" - -#: mod/directory.php:153 src/Model/Profile.php:418 src/Model/Profile.php:780 -msgid "Homepage:" -msgstr "Domácí stránka:" - -#: mod/directory.php:202 view/theme/vier/theme.php:208 -#: src/Content/Widget.php:68 -msgid "Global Directory" -msgstr "Globální adresář" - -#: mod/directory.php:204 -msgid "Find on this site" -msgstr "Nalézt na tomto webu" - -#: mod/directory.php:206 -msgid "Results for:" -msgstr "Výsledky pro:" - -#: mod/directory.php:208 -msgid "Site Directory" -msgstr "Adresář serveru" - -#: mod/directory.php:213 -msgid "No entries (some entries may be hidden)." -msgstr "Žádné záznamy (některé položky mohou být skryty)." - #: mod/dirfind.php:48 #, php-format msgid "People Search - %s" @@ -6648,6 +6571,375 @@ msgstr "skrytá kopie: e-mailové adresy" msgid "Example: bob@example.com, mary@example.com" msgstr "Příklad: bob@example.com, mary@example.com" +#: mod/match.php:48 +msgid "No keywords to match. Please add keywords to your default profile." +msgstr "Žádná klíčová slova k porovnání. Prosím, přidejte klíčová slova do Vašeho výchozího profilu." + +#: mod/match.php:104 +msgid "is interested in:" +msgstr "se zajímá o:" + +#: mod/match.php:120 +msgid "Profile Match" +msgstr "Shoda profilu" + +#: mod/notifications.php:33 +msgid "Invalid request identifier." +msgstr "Neplatný identifikátor požadavku." + +#: mod/notifications.php:42 mod/notifications.php:176 +#: mod/notifications.php:224 +msgid "Discard" +msgstr "Odstranit" + +#: mod/notifications.php:90 src/Content/Nav.php:191 +msgid "Notifications" +msgstr "Upozornění" + +#: mod/notifications.php:98 +msgid "Network Notifications" +msgstr "Upozornění Sítě" + +#: mod/notifications.php:108 +msgid "Personal Notifications" +msgstr "Osobní upozornění" + +#: mod/notifications.php:113 +msgid "Home Notifications" +msgstr "Upozornění na vstupní straně" + +#: mod/notifications.php:141 +msgid "Show Ignored Requests" +msgstr "Zobrazit ignorované žádosti" + +#: mod/notifications.php:141 +msgid "Hide Ignored Requests" +msgstr "Skrýt ignorované žádosti" + +#: mod/notifications.php:154 mod/notifications.php:232 +msgid "Notification type:" +msgstr "Typ oznámení:" + +#: mod/notifications.php:157 +msgid "Suggested by:" +msgstr "Navrženo:" + +#: mod/notifications.php:191 +msgid "Claims to be known to you: " +msgstr "Vaši údajní známí: " + +#: mod/notifications.php:192 +msgid "yes" +msgstr "ano" + +#: mod/notifications.php:192 +msgid "no" +msgstr "ne" + +#: mod/notifications.php:193 mod/notifications.php:198 +msgid "Shall your connection be bidirectional or not?" +msgstr "Má Vaše spojení být obousměrné, nebo ne?" + +#: mod/notifications.php:194 mod/notifications.php:199 +#, php-format +msgid "" +"Accepting %s as a friend allows %s to subscribe to your posts, and you will " +"also receive updates from them in your news feed." +msgstr "Přijetí %s jako přítele dovolí %s odebírat Vaše příspěvky a Vy budete také přijímat aktualizace od nich ve Vašem kanále." + +#: mod/notifications.php:195 +#, php-format +msgid "" +"Accepting %s as a subscriber allows them to subscribe to your posts, but you" +" will not receive updates from them in your news feed." +msgstr "Přijetí %s jako odběratele jim dovolí odebírat Vaše příspěvky, ale nebudete od nich přijímat aktualizace ve Vašem kanále." + +#: mod/notifications.php:200 +#, php-format +msgid "" +"Accepting %s as a sharer allows them to subscribe to your posts, but you " +"will not receive updates from them in your news feed." +msgstr "Přijetí %s jako sdílejícího jim dovolí odebírat Vaše příspěvky, ale nebudete od nich přijímat aktualizace ve Vašem kanále." + +#: mod/notifications.php:211 +msgid "Friend" +msgstr "Přítel" + +#: mod/notifications.php:212 +msgid "Sharer" +msgstr "Sdílející" + +#: mod/notifications.php:212 +msgid "Subscriber" +msgstr "Odběratel" + +#: mod/notifications.php:248 mod/directory.php:152 src/Model/Profile.php:417 +#: src/Model/Profile.php:740 +msgid "Gender:" +msgstr "Pohlaví:" + +#: mod/notifications.php:269 +msgid "No introductions." +msgstr "Žádné představení." + +#: mod/notifications.php:307 +msgid "Show unread" +msgstr "Zobrazit nepřečtené" + +#: mod/notifications.php:307 +msgid "Show all" +msgstr "Zobrazit vše" + +#: mod/notifications.php:312 +#, php-format +msgid "No more %s notifications." +msgstr "Žádná další %s oznámení" + +#: mod/poke.php:189 +msgid "Poke/Prod" +msgstr "Šťouchnout/dloubnout" + +#: mod/poke.php:190 +msgid "poke, prod or do other things to somebody" +msgstr "někoho šťouchnout, dloubnout, nebo mu provést jinou věc" + +#: mod/poke.php:191 +msgid "Recipient" +msgstr "Příjemce" + +#: mod/poke.php:192 +msgid "Choose what you wish to do to recipient" +msgstr "Vyberte, co si přejete příjemci udělat" + +#: mod/poke.php:195 +msgid "Make this post private" +msgstr "Změnit tento příspěvek na soukromý" + +#: mod/register.php:100 +msgid "" +"Registration successful. Please check your email for further instructions." +msgstr "Registrace úspěšná. Zkontrolujte prosím svůj e-mail pro další instrukce." + +#: mod/register.php:104 +#, php-format +msgid "" +"Failed to send email message. Here your accout details:
login: %s
" +"password: %s

You can change your password after login." +msgstr "Nepovedlo se odeslat emailovou zprávu. Zde jsou detaily Vašeho účtu:
přihlášení: %s
heslo: %s

Své heslo si můžete změnit po přihlášení." + +#: mod/register.php:111 +msgid "Registration successful." +msgstr "Registrace byla úspěšná." + +#: mod/register.php:116 +msgid "Your registration can not be processed." +msgstr "Vaši registraci nelze zpracovat." + +#: mod/register.php:163 +msgid "Your registration is pending approval by the site owner." +msgstr "Vaše registrace čeká na schválení vlastníkem serveru." + +#: mod/register.php:221 +msgid "" +"You may (optionally) fill in this form via OpenID by supplying your OpenID " +"and clicking 'Register'." +msgstr "Tento formulář můžete (volitelně) vyplnit s pomocí OpenID tím, že vyplníte své OpenID a kliknutete na tlačítko \"Zaregistrovat\"." + +#: mod/register.php:222 +msgid "" +"If you are not familiar with OpenID, please leave that field blank and fill " +"in the rest of the items." +msgstr "Pokud nepoužíváte OpenID, nechte prosím toto pole prázdné a vyplňte zbylé položky." + +#: mod/register.php:223 +msgid "Your OpenID (optional): " +msgstr "Vaše OpenID (nepovinné): " + +#: mod/register.php:235 +msgid "Include your profile in member directory?" +msgstr "Chcete zahrnout Váš profil v adresáři členů?" + +#: mod/register.php:262 +msgid "Note for the admin" +msgstr "Poznámka pro administrátora" + +#: mod/register.php:262 +msgid "Leave a message for the admin, why you want to join this node" +msgstr "Zanechejte administrátorovi zprávu, proč se k tomuto serveru chcete připojit" + +#: mod/register.php:263 +msgid "Membership on this site is by invitation only." +msgstr "Členství na tomto webu je pouze na pozvání." + +#: mod/register.php:264 +msgid "Your invitation code: " +msgstr "Váš kód pozvánky: " + +#: mod/register.php:273 +msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " +msgstr "Celé jméno (např. Joe Smith, skutečné či skutečně vypadající):" + +#: mod/register.php:274 +msgid "" +"Your Email Address: (Initial information will be send there, so this has to " +"be an existing address.)" +msgstr "Vaše e-mailová adresa: (Budou zde poslány počáteční informace, musí to proto být existující adresa.)" + +#: mod/register.php:276 +msgid "Leave empty for an auto generated password." +msgstr "Ponechte prázdné pro automatické vygenerovaní hesla." + +#: mod/register.php:278 +#, php-format +msgid "" +"Choose a profile nickname. This must begin with a text character. Your " +"profile address on this site will then be 'nickname@%s'." +msgstr "Vyberte si přezdívku pro Váš profil. Musí začínat textovým znakem. Vaše profilová adresa na této stránce bude mít tvar \"přezdívka@%s\"." + +#: mod/register.php:279 +msgid "Choose a nickname: " +msgstr "Vyberte přezdívku:" + +#: mod/register.php:282 src/Content/Nav.php:128 src/Module/Login.php:284 +msgid "Register" +msgstr "Registrovat" + +#: mod/register.php:289 +msgid "Import your profile to this friendica instance" +msgstr "Import Vašeho profilu do této friendica instance" + +#: mod/suggest.php:36 +msgid "Do you really want to delete this suggestion?" +msgstr "Opravdu chcete smazat tento návrh?" + +#: mod/suggest.php:73 +msgid "" +"No suggestions available. If this is a new site, please try again in 24 " +"hours." +msgstr "Nejsou dostupné žádné návrhy. Pokud je toto nový server, zkuste to znovu za 24 hodin." + +#: mod/suggest.php:84 mod/suggest.php:104 +msgid "Ignore/Hide" +msgstr "Ignorovat/skrýt" + +#: mod/suggest.php:114 view/theme/vier/theme.php:204 src/Content/Widget.php:64 +msgid "Friend Suggestions" +msgstr "Návrhy přátel" + +#: mod/tagrm.php:43 +msgid "Tag removed" +msgstr "Štítek odstraněn" + +#: mod/tagrm.php:77 +msgid "Remove Item Tag" +msgstr "Odebrat štítek položky" + +#: mod/tagrm.php:79 +msgid "Select a tag to remove: " +msgstr "Vyberte štítek k odebrání: " + +#: mod/unfollow.php:34 +msgid "Contact wasn't found or can't be unfollowed." +msgstr "Kontakt nebyl nalezen, nebo u něj nemůže být zrušeno sledování." + +#: mod/unfollow.php:47 +msgid "Contact unfollowed" +msgstr "Zrušeno sledování kontaktu" + +#: mod/unfollow.php:73 +msgid "You aren't a friend of this contact." +msgstr "nejste přítelem tohoto kontaktu" + +#: mod/unfollow.php:79 +msgid "Unfollowing is currently not supported by your network." +msgstr "Zrušení sledování není aktuálně na Vaši síti podporováno." + +#: mod/update_community.php:23 mod/update_display.php:24 +#: mod/update_network.php:29 mod/update_notes.php:36 mod/update_profile.php:35 +msgid "[Embedded content - reload page to view]" +msgstr "[Vložený obsah - obnovte stránku pro zobrazení]" + +#: mod/viewcontacts.php:87 +msgid "No contacts." +msgstr "Žádné kontakty." + +#: mod/viewsrc.php:13 mod/community.php:34 +msgid "Access denied." +msgstr "Přístup odmítnut" + +#: mod/wall_upload.php:231 mod/item.php:471 src/Object/Image.php:953 +#: src/Object/Image.php:969 src/Object/Image.php:977 src/Object/Image.php:1002 +msgid "Wall Photos" +msgstr "Fotografie na zdi" + +#: mod/community.php:51 +msgid "Community option not available." +msgstr "Možnost komunity není dostupná." + +#: mod/community.php:68 +msgid "Not available." +msgstr "Není k dispozici." + +#: mod/community.php:81 +msgid "Local Community" +msgstr "Lokální komunita" + +#: mod/community.php:84 +msgid "Posts from local users on this server" +msgstr "Příspěvky od lokálních uživatelů na tomto serveru" + +#: mod/community.php:92 +msgid "Global Community" +msgstr "Globální komunita" + +#: mod/community.php:95 +msgid "Posts from users of the whole federated network" +msgstr "Příspěvky od uživatelů z celé federované sítě" + +#: mod/community.php:141 mod/search.php:234 +msgid "No results." +msgstr "Žádné výsledky." + +#: mod/community.php:185 +msgid "" +"This community stream shows all public posts received by this node. They may" +" not reflect the opinions of this node’s users." +msgstr "Tento komunitní proud ukazuje všechny veřejné příspěvky, které tento server přijme. Nemusí odrážet názory uživatelů serveru." + +#: mod/dfrn_poll.php:124 mod/dfrn_poll.php:541 +#, php-format +msgid "%1$s welcomes %2$s" +msgstr "%1$s vítá %2$s" + +#: mod/directory.php:153 src/Model/Profile.php:418 src/Model/Profile.php:764 +msgid "Status:" +msgstr "Status:" + +#: mod/directory.php:154 src/Model/Profile.php:419 src/Model/Profile.php:781 +msgid "Homepage:" +msgstr "Domácí stránka:" + +#: mod/directory.php:203 view/theme/vier/theme.php:208 +#: src/Content/Widget.php:68 +msgid "Global Directory" +msgstr "Globální adresář" + +#: mod/directory.php:205 +msgid "Find on this site" +msgstr "Nalézt na tomto webu" + +#: mod/directory.php:207 +msgid "Results for:" +msgstr "Výsledky pro:" + +#: mod/directory.php:209 +msgid "Site Directory" +msgstr "Adresář serveru" + +#: mod/directory.php:214 +msgid "No entries (some entries may be hidden)." +msgstr "Žádné záznamy (některé položky mohou být skryty)." + #: mod/item.php:114 msgid "Unable to locate original post." msgstr "Nelze nalézt původní příspěvek." @@ -6656,11 +6948,6 @@ msgstr "Nelze nalézt původní příspěvek." msgid "Empty post discarded." msgstr "Prázdný příspěvek odstraněn." -#: mod/item.php:471 mod/wall_upload.php:231 src/Object/Image.php:953 -#: src/Object/Image.php:969 src/Object/Image.php:977 src/Object/Image.php:1002 -msgid "Wall Photos" -msgstr "Fotografie na zdi" - #: mod/item.php:804 #, php-format msgid "" @@ -6684,18 +6971,6 @@ msgstr "Pokud nechcete dostávat tyto zprávy, kontaktujte prosím odesilatele o msgid "%s posted an update." msgstr "%s poslal aktualizaci." -#: mod/match.php:48 -msgid "No keywords to match. Please add keywords to your default profile." -msgstr "Žádná klíčová slova k porovnání. Prosím, přidejte klíčová slova do Vašeho výchozího profilu." - -#: mod/match.php:104 -msgid "is interested in:" -msgstr "se zajímá o:" - -#: mod/match.php:120 -msgid "Profile Match" -msgstr "Shoda profilu" - #: mod/message.php:30 src/Content/Nav.php:199 msgid "New Message" msgstr "Nová zpráva" @@ -6712,60 +6987,60 @@ msgstr "Zprávy" msgid "Do you really want to delete this message?" msgstr "Opravdu chcete smazat tuto zprávu?" -#: mod/message.php:152 +#: mod/message.php:153 msgid "Message deleted." msgstr "Zpráva odstraněna." -#: mod/message.php:166 +#: mod/message.php:168 msgid "Conversation removed." msgstr "Konverzace odstraněna." -#: mod/message.php:272 +#: mod/message.php:274 msgid "No messages." msgstr "Žádné zprávy." -#: mod/message.php:311 +#: mod/message.php:313 msgid "Message not available." msgstr "Zpráva není k dispozici." -#: mod/message.php:375 +#: mod/message.php:377 msgid "Delete message" msgstr "Smazat zprávu" -#: mod/message.php:377 mod/message.php:478 +#: mod/message.php:379 mod/message.php:480 msgid "D, d M Y - g:i A" msgstr "D M R - g:i A" -#: mod/message.php:392 mod/message.php:475 +#: mod/message.php:394 mod/message.php:477 msgid "Delete conversation" msgstr "Odstranit konverzaci" -#: mod/message.php:394 +#: mod/message.php:396 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "Není k dispozici zabezpečená komunikace. Možná budete schopni reagovat z odesilatelovy profilové stránky." -#: mod/message.php:398 +#: mod/message.php:400 msgid "Send Reply" msgstr "Poslat odpověď" -#: mod/message.php:449 +#: mod/message.php:451 #, php-format msgid "Unknown sender - %s" msgstr "Neznámý odesilatel - %s" -#: mod/message.php:451 +#: mod/message.php:453 #, php-format msgid "You and %s" msgstr "Vy a %s" -#: mod/message.php:453 +#: mod/message.php:455 #, php-format msgid "%s and You" msgstr "%s a Vy" -#: mod/message.php:481 +#: mod/message.php:483 #, php-format msgid "%d message" msgid_plural "%d messages" @@ -6864,126 +7139,19 @@ msgstr "S hvězdičkou" msgid "Favourite Posts" msgstr "Oblíbené přízpěvky" -#: mod/notes.php:41 src/Model/Profile.php:940 +#: mod/notes.php:41 src/Model/Profile.php:941 msgid "Personal Notes" msgstr "Osobní poznámky" -#: mod/notifications.php:33 -msgid "Invalid request identifier." -msgstr "Neplatný identifikátor požadavku." - -#: mod/notifications.php:42 mod/notifications.php:176 -#: mod/notifications.php:224 -msgid "Discard" -msgstr "Odstranit" - -#: mod/notifications.php:90 src/Content/Nav.php:191 -msgid "Notifications" -msgstr "Upozornění" - -#: mod/notifications.php:98 -msgid "Network Notifications" -msgstr "Upozornění Sítě" - -#: mod/notifications.php:108 -msgid "Personal Notifications" -msgstr "Osobní upozornění" - -#: mod/notifications.php:113 -msgid "Home Notifications" -msgstr "Upozornění na vstupní straně" - -#: mod/notifications.php:141 -msgid "Show Ignored Requests" -msgstr "Zobrazit ignorované žádosti" - -#: mod/notifications.php:141 -msgid "Hide Ignored Requests" -msgstr "Skrýt ignorované žádosti" - -#: mod/notifications.php:154 mod/notifications.php:232 -msgid "Notification type:" -msgstr "Typ oznámení:" - -#: mod/notifications.php:157 -msgid "Suggested by:" -msgstr "Navrženo:" - -#: mod/notifications.php:191 -msgid "Claims to be known to you: " -msgstr "Vaši údajní známí: " - -#: mod/notifications.php:192 -msgid "yes" -msgstr "ano" - -#: mod/notifications.php:192 -msgid "no" -msgstr "ne" - -#: mod/notifications.php:193 mod/notifications.php:198 -msgid "Shall your connection be bidirectional or not?" -msgstr "Má Vaše spojení být obousměrné, nebo ne?" - -#: mod/notifications.php:194 mod/notifications.php:199 -#, php-format -msgid "" -"Accepting %s as a friend allows %s to subscribe to your posts, and you will " -"also receive updates from them in your news feed." -msgstr "Přijetí %s jako přítele dovolí %s odebírat Vaše příspěvky a Vy budete také přijímat aktualizace od nich ve Vašem kanále." - -#: mod/notifications.php:195 -#, php-format -msgid "" -"Accepting %s as a subscriber allows them to subscribe to your posts, but you" -" will not receive updates from them in your news feed." -msgstr "Přijetí %s jako odběratele jim dovolí odebírat Vaše příspěvky, ale nebudete od nich přijímat aktualizace ve Vašem kanále." - -#: mod/notifications.php:200 -#, php-format -msgid "" -"Accepting %s as a sharer allows them to subscribe to your posts, but you " -"will not receive updates from them in your news feed." -msgstr "Přijetí %s jako sdílejícího jim dovolí odebírat Vaše příspěvky, ale nebudete od nich přijímat aktualizace ve Vašem kanále." - -#: mod/notifications.php:211 -msgid "Friend" -msgstr "Přítel" - -#: mod/notifications.php:212 -msgid "Sharer" -msgstr "Sdílející" - -#: mod/notifications.php:212 -msgid "Subscriber" -msgstr "Odběratel" - -#: mod/notifications.php:269 -msgid "No introductions." -msgstr "Žádné představení." - -#: mod/notifications.php:307 -msgid "Show unread" -msgstr "Zobrazit nepřečtené" - -#: mod/notifications.php:307 -msgid "Show all" -msgstr "Zobrazit vše" - -#: mod/notifications.php:312 -#, php-format -msgid "No more %s notifications." -msgstr "Žádná další %s oznámení" - -#: mod/photos.php:109 src/Model/Profile.php:901 +#: mod/photos.php:109 src/Model/Profile.php:902 msgid "Photo Albums" msgstr "Fotoalba" -#: mod/photos.php:110 mod/photos.php:1699 +#: mod/photos.php:110 mod/photos.php:1665 msgid "Recent Photos" msgstr "Aktuální fotografie" -#: mod/photos.php:113 mod/photos.php:1191 mod/photos.php:1701 +#: mod/photos.php:113 mod/photos.php:1192 mod/photos.php:1667 msgid "Upload New Photos" msgstr "Nahrát nové fotografie" @@ -6995,7 +7163,7 @@ msgstr "Kontakt byl zablokován" msgid "Album not found." msgstr "Album nenalezeno." -#: mod/photos.php:230 mod/photos.php:241 mod/photos.php:1142 +#: mod/photos.php:230 mod/photos.php:241 mod/photos.php:1143 msgid "Delete Album" msgstr "Smazat album" @@ -7003,7 +7171,7 @@ msgstr "Smazat album" msgid "Do you really want to delete this photo album and all its photos?" msgstr "Opravdu chcete smazat toto foto album a všechny jeho fotografie?" -#: mod/photos.php:299 mod/photos.php:310 mod/photos.php:1435 +#: mod/photos.php:299 mod/photos.php:310 mod/photos.php:1409 msgid "Delete Photo" msgstr "Smazat fotografii" @@ -7011,148 +7179,148 @@ msgstr "Smazat fotografii" msgid "Do you really want to delete this photo?" msgstr "Opravdu chcete smazat tuto fotografii?" -#: mod/photos.php:648 +#: mod/photos.php:649 msgid "a photo" msgstr "fotografie" -#: mod/photos.php:648 +#: mod/photos.php:649 #, php-format msgid "%1$s was tagged in %2$s by %3$s" msgstr "%1$s byl označen v %2$s uživatelem %3$s" -#: mod/photos.php:750 +#: mod/photos.php:751 msgid "Image upload didn't complete, please try again" msgstr "Nahrávání obrázku nebylo dokončeno, zkuste to prosím znovu" -#: mod/photos.php:753 +#: mod/photos.php:754 msgid "Image file is missing" msgstr "Chybí soubor obrázku" -#: mod/photos.php:758 +#: mod/photos.php:759 msgid "" "Server can't accept new file upload at this time, please contact your " "administrator" msgstr "Server v tuto chvíli nemůže akceptovat nové nahrané soubory, prosím kontaktujte Vašeho administrátora" -#: mod/photos.php:784 +#: mod/photos.php:785 msgid "Image file is empty." msgstr "Soubor obrázku je prázdný." -#: mod/photos.php:921 +#: mod/photos.php:922 msgid "No photos selected" msgstr "Není vybrána žádná fotografie" -#: mod/photos.php:1071 +#: mod/photos.php:1072 msgid "Upload Photos" msgstr "Nahrání fotografií " -#: mod/photos.php:1075 mod/photos.php:1137 +#: mod/photos.php:1076 mod/photos.php:1138 msgid "New album name: " msgstr "Název nového alba: " -#: mod/photos.php:1076 +#: mod/photos.php:1077 msgid "or existing album name: " msgstr "nebo stávající název alba: " -#: mod/photos.php:1077 +#: mod/photos.php:1078 msgid "Do not show a status post for this upload" msgstr "Nezobrazovat stav pro tento upload" -#: mod/photos.php:1148 +#: mod/photos.php:1149 msgid "Edit Album" msgstr "Edituj album" -#: mod/photos.php:1153 +#: mod/photos.php:1154 msgid "Show Newest First" msgstr "Zobrazit nejprve nejnovější:" -#: mod/photos.php:1155 +#: mod/photos.php:1156 msgid "Show Oldest First" msgstr "Zobrazit nejprve nejstarší:" -#: mod/photos.php:1176 mod/photos.php:1684 +#: mod/photos.php:1177 mod/photos.php:1650 msgid "View Photo" msgstr "Zobraz fotografii" -#: mod/photos.php:1217 +#: mod/photos.php:1218 msgid "Permission denied. Access to this item may be restricted." msgstr "Oprávnění bylo zamítnuto. Přístup k této položce může být omezen." -#: mod/photos.php:1219 +#: mod/photos.php:1220 msgid "Photo not available" msgstr "Fotografie není k dispozici" -#: mod/photos.php:1287 +#: mod/photos.php:1289 msgid "View photo" msgstr "Zobrazit obrázek" -#: mod/photos.php:1287 +#: mod/photos.php:1289 msgid "Edit photo" msgstr "Editovat fotografii" -#: mod/photos.php:1288 +#: mod/photos.php:1290 msgid "Use as profile photo" msgstr "Použít jako profilovou fotografii" -#: mod/photos.php:1294 src/Object/Post.php:148 +#: mod/photos.php:1296 src/Object/Post.php:148 msgid "Private Message" msgstr "Soukromá zpráva" -#: mod/photos.php:1314 +#: mod/photos.php:1316 msgid "View Full Size" msgstr "Zobrazit v plné velikosti" -#: mod/photos.php:1403 +#: mod/photos.php:1377 msgid "Tags: " msgstr "Štítky: " -#: mod/photos.php:1406 +#: mod/photos.php:1380 msgid "[Remove any tag]" msgstr "[Odstranit všechny štítky]" -#: mod/photos.php:1421 +#: mod/photos.php:1395 msgid "New album name" msgstr "Nové jméno alba" -#: mod/photos.php:1422 +#: mod/photos.php:1396 msgid "Caption" msgstr "Titulek" -#: mod/photos.php:1423 +#: mod/photos.php:1397 msgid "Add a Tag" msgstr "Přidat štítek" -#: mod/photos.php:1423 +#: mod/photos.php:1397 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Příklad: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: mod/photos.php:1424 +#: mod/photos.php:1398 msgid "Do not rotate" msgstr "Neotáčet" -#: mod/photos.php:1425 +#: mod/photos.php:1399 msgid "Rotate CW (right)" msgstr "Rotovat po směru hodinových ručiček (doprava)" -#: mod/photos.php:1426 +#: mod/photos.php:1400 msgid "Rotate CCW (left)" msgstr "Rotovat proti směru hodinových ručiček (doleva)" -#: mod/photos.php:1460 src/Object/Post.php:295 +#: mod/photos.php:1434 src/Object/Post.php:287 msgid "I like this (toggle)" msgstr "Líbí se mi to (přepínač)" -#: mod/photos.php:1461 src/Object/Post.php:296 +#: mod/photos.php:1435 src/Object/Post.php:288 msgid "I don't like this (toggle)" msgstr "Nelíbí se mi to (přepínač)" -#: mod/photos.php:1479 mod/photos.php:1518 mod/photos.php:1587 -#: src/Object/Post.php:398 src/Object/Post.php:794 +#: mod/photos.php:1453 mod/photos.php:1492 mod/photos.php:1553 +#: src/Object/Post.php:390 src/Object/Post.php:786 msgid "Comment" msgstr "Okomentovat" -#: mod/photos.php:1619 +#: mod/photos.php:1585 msgid "Map" msgstr "Mapa" @@ -7168,27 +7336,7 @@ msgstr "{0} vám poslal zprávu" msgid "{0} requested registration" msgstr "{0} požaduje registraci" -#: mod/poke.php:189 -msgid "Poke/Prod" -msgstr "Šťouchnout/dloubnout" - -#: mod/poke.php:190 -msgid "poke, prod or do other things to somebody" -msgstr "někoho šťouchnout, dloubnout, nebo mu provést jinou věc" - -#: mod/poke.php:191 -msgid "Recipient" -msgstr "Příjemce" - -#: mod/poke.php:192 -msgid "Choose what you wish to do to recipient" -msgstr "Vyberte, co si přejete příjemci udělat" - -#: mod/poke.php:195 -msgid "Make this post private" -msgstr "Změnit tento příspěvek na soukromý" - -#: mod/profile.php:37 src/Model/Profile.php:118 +#: mod/profile.php:37 src/Model/Profile.php:119 msgid "Requested profile is not available." msgstr "Požadovaný profil není k dispozici." @@ -7211,99 +7359,6 @@ msgstr "Komentáře %s" msgid "Tips for New Members" msgstr "Tipy pro nové členy" -#: mod/register.php:100 -msgid "" -"Registration successful. Please check your email for further instructions." -msgstr "Registrace úspěšná. Zkontrolujte prosím svůj e-mail pro další instrukce." - -#: mod/register.php:104 -#, php-format -msgid "" -"Failed to send email message. Here your accout details:
login: %s
" -"password: %s

You can change your password after login." -msgstr "Nepovedlo se odeslat emailovou zprávu. Zde jsou detaily Vašeho účtu:
přihlášení: %s
heslo: %s

Své heslo si můžete změnit po přihlášení." - -#: mod/register.php:111 -msgid "Registration successful." -msgstr "Registrace byla úspěšná." - -#: mod/register.php:116 -msgid "Your registration can not be processed." -msgstr "Vaši registraci nelze zpracovat." - -#: mod/register.php:163 -msgid "Your registration is pending approval by the site owner." -msgstr "Vaše registrace čeká na schválení vlastníkem serveru." - -#: mod/register.php:221 -msgid "" -"You may (optionally) fill in this form via OpenID by supplying your OpenID " -"and clicking 'Register'." -msgstr "Tento formulář můžete (volitelně) vyplnit s pomocí OpenID tím, že vyplníte své OpenID a kliknutete na tlačítko \"Zaregistrovat\"." - -#: mod/register.php:222 -msgid "" -"If you are not familiar with OpenID, please leave that field blank and fill " -"in the rest of the items." -msgstr "Pokud nepoužíváte OpenID, nechte prosím toto pole prázdné a vyplňte zbylé položky." - -#: mod/register.php:223 -msgid "Your OpenID (optional): " -msgstr "Vaše OpenID (nepovinné): " - -#: mod/register.php:235 -msgid "Include your profile in member directory?" -msgstr "Chcete zahrnout Váš profil v adresáři členů?" - -#: mod/register.php:262 -msgid "Note for the admin" -msgstr "Poznámka pro administrátora" - -#: mod/register.php:262 -msgid "Leave a message for the admin, why you want to join this node" -msgstr "Zanechejte administrátorovi zprávu, proč se k tomuto serveru chcete připojit" - -#: mod/register.php:263 -msgid "Membership on this site is by invitation only." -msgstr "Členství na tomto webu je pouze na pozvání." - -#: mod/register.php:264 -msgid "Your invitation code: " -msgstr "Váš kód pozvánky: " - -#: mod/register.php:273 -msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " -msgstr "Celé jméno (např. Joe Smith, skutečné či skutečně vypadající):" - -#: mod/register.php:274 -msgid "" -"Your Email Address: (Initial information will be send there, so this has to " -"be an existing address.)" -msgstr "Vaše e-mailová adresa: (Budou zde poslány počáteční informace, musí to proto být existující adresa.)" - -#: mod/register.php:276 -msgid "Leave empty for an auto generated password." -msgstr "Ponechte prázdné pro automatické vygenerovaní hesla." - -#: mod/register.php:278 -#, php-format -msgid "" -"Choose a profile nickname. This must begin with a text character. Your " -"profile address on this site will then be 'nickname@%s'." -msgstr "Vyberte si přezdívku pro Váš profil. Musí začínat textovým znakem. Vaše profilová adresa na této stránce bude mít tvar \"přezdívka@%s\"." - -#: mod/register.php:279 -msgid "Choose a nickname: " -msgstr "Vyberte přezdívku:" - -#: mod/register.php:282 src/Content/Nav.php:128 src/Module/Login.php:284 -msgid "Register" -msgstr "Registrovat" - -#: mod/register.php:289 -msgid "Import your profile to this friendica instance" -msgstr "Import Vašeho profilu do této friendica instance" - #: mod/search.php:106 msgid "Only logged in users are permitted to perform a search." msgstr "Pouze přihlášení uživatelé mohou prohledávat tento server." @@ -7316,7 +7371,7 @@ msgstr "Příliš mnoho požadavků" msgid "Only one search per minute is permitted for not logged in users." msgstr "Nepřihlášení uživatelé mohou vyhledávat pouze jednou za minutu." -#: mod/search.php:235 +#: mod/search.php:240 #, php-format msgid "Items tagged with: %s" msgstr "Položky označené jako: %s" @@ -7326,61 +7381,6 @@ msgstr "Položky označené jako: %s" msgid "%1$s is following %2$s's %3$s" msgstr "%1$s následuje %3$s uživatele %2$s" -#: mod/suggest.php:36 -msgid "Do you really want to delete this suggestion?" -msgstr "Opravdu chcete smazat tento návrh?" - -#: mod/suggest.php:73 -msgid "" -"No suggestions available. If this is a new site, please try again in 24 " -"hours." -msgstr "Nejsou dostupné žádné návrhy. Pokud je toto nový server, zkuste to znovu za 24 hodin." - -#: mod/suggest.php:84 mod/suggest.php:104 -msgid "Ignore/Hide" -msgstr "Ignorovat/skrýt" - -#: mod/suggest.php:114 view/theme/vier/theme.php:204 src/Content/Widget.php:64 -msgid "Friend Suggestions" -msgstr "Návrhy přátel" - -#: mod/tagrm.php:43 -msgid "Tag removed" -msgstr "Štítek odstraněn" - -#: mod/tagrm.php:77 -msgid "Remove Item Tag" -msgstr "Odebrat štítek položky" - -#: mod/tagrm.php:79 -msgid "Select a tag to remove: " -msgstr "Vyberte štítek k odebrání: " - -#: mod/unfollow.php:34 -msgid "Contact wasn't found or can't be unfollowed." -msgstr "Kontakt nebyl nalezen, nebo u něj nemůže být zrušeno sledování." - -#: mod/unfollow.php:47 -msgid "Contact unfollowed" -msgstr "Zrušeno sledování kontaktu" - -#: mod/unfollow.php:73 -msgid "You aren't a friend of this contact." -msgstr "nejste přítelem tohoto kontaktu" - -#: mod/unfollow.php:79 -msgid "Unfollowing is currently not supported by your network." -msgstr "Zrušení sledování není aktuálně na Vaši síti podporováno." - -#: mod/update_community.php:23 mod/update_display.php:24 -#: mod/update_network.php:29 mod/update_notes.php:36 mod/update_profile.php:35 -msgid "[Embedded content - reload page to view]" -msgstr "[Vložený obsah - obnovte stránku pro zobrazení]" - -#: mod/viewcontacts.php:87 -msgid "No contacts." -msgstr "Žádné kontakty." - #: view/theme/duepuntozero/config.php:54 src/Model/User.php:512 msgid "default" msgstr "standardní" @@ -7536,7 +7536,7 @@ msgid "Your photos" msgstr "Vaše fotky" #: view/theme/frio/theme.php:262 src/Content/Nav.php:103 -#: src/Model/Profile.php:906 src/Model/Profile.php:909 +#: src/Model/Profile.php:907 src/Model/Profile.php:910 msgid "Videos" msgstr "Videa" @@ -7553,7 +7553,7 @@ msgid "Conversations from your friends" msgstr "Konverzace od Vašich přátel" #: view/theme/frio/theme.php:267 src/Content/Nav.php:170 -#: src/Model/Profile.php:921 src/Model/Profile.php:932 +#: src/Model/Profile.php:922 src/Model/Profile.php:933 msgid "Events and Calendar" msgstr "Události a kalendář" @@ -8034,7 +8034,7 @@ msgstr "Přítel / žádost o připojení" msgid "New Follower" msgstr "Nový sledovatel" -#: src/Util/Temporal.php:147 src/Model/Profile.php:752 +#: src/Util/Temporal.php:147 src/Model/Profile.php:753 msgid "Birthday:" msgstr "Narozeniny:" @@ -8814,7 +8814,7 @@ msgstr "Spravovat" msgid "Manage other pages" msgstr "Spravovat jiné stránky" -#: src/Content/Nav.php:210 src/Model/Profile.php:368 +#: src/Content/Nav.php:210 src/Model/Profile.php:369 msgid "Profiles" msgstr "Profily" @@ -8916,89 +8916,6 @@ msgstr "Vytvořit novou skupinu" msgid "Edit groups" msgstr "Upravit skupiny" -#: src/Model/Contact.php:667 -msgid "Drop Contact" -msgstr "Odstranit kontakt" - -#: src/Model/Contact.php:1118 -msgid "Organisation" -msgstr "Organizace" - -#: src/Model/Contact.php:1121 -msgid "News" -msgstr "Zprávy" - -#: src/Model/Contact.php:1124 -msgid "Forum" -msgstr "Fórum" - -#: src/Model/Contact.php:1303 -msgid "Connect URL missing." -msgstr "Chybí URL adresa pro připojení." - -#: src/Model/Contact.php:1312 -msgid "" -"The contact could not be added. Please check the relevant network " -"credentials in your Settings -> Social Networks page." -msgstr "Kontakt nemohl být přidán. Prosím zkontrolujte relevantní přihlašovací údaje sítě na stránce Nastavení -> Sociální sítě." - -#: src/Model/Contact.php:1359 -msgid "" -"This site is not configured to allow communications with other networks." -msgstr "Tento web není nakonfigurován tak, aby umožňoval komunikaci s ostatními sítěmi." - -#: src/Model/Contact.php:1360 src/Model/Contact.php:1374 -msgid "No compatible communication protocols or feeds were discovered." -msgstr "Nenalezen žádný kompatibilní komunikační protokol nebo kanál." - -#: src/Model/Contact.php:1372 -msgid "The profile address specified does not provide adequate information." -msgstr "Uvedená adresa profilu neposkytuje dostatečné informace." - -#: src/Model/Contact.php:1377 -msgid "An author or name was not found." -msgstr "Autor nebo jméno nenalezeno" - -#: src/Model/Contact.php:1380 -msgid "No browser URL could be matched to this address." -msgstr "Této adrese neodpovídá žádné URL prohlížeče." - -#: src/Model/Contact.php:1383 -msgid "" -"Unable to match @-style Identity Address with a known protocol or email " -"contact." -msgstr "Není možné namapovat adresu Identity ve stylu @ s žádným možným protokolem ani emailovým kontaktem." - -#: src/Model/Contact.php:1384 -msgid "Use mailto: in front of address to force email check." -msgstr "Použite mailo: před adresou k vynucení emailové kontroly." - -#: src/Model/Contact.php:1390 -msgid "" -"The profile address specified belongs to a network which has been disabled " -"on this site." -msgstr "Zadaná adresa profilu patří do sítě, která byla na tomto serveru zakázána." - -#: src/Model/Contact.php:1395 -msgid "" -"Limited profile. This person will be unable to receive direct/personal " -"notifications from you." -msgstr "Omezený profil. Tato osoba nebude schopna od Vás přijímat přímé/osobní sdělení." - -#: src/Model/Contact.php:1446 -msgid "Unable to retrieve contact information." -msgstr "Nepodařilo se získat kontaktní informace." - -#: src/Model/Contact.php:1663 src/Protocol/DFRN.php:1503 -#, php-format -msgid "%s's birthday" -msgstr "%s má narozeniny" - -#: src/Model/Contact.php:1664 src/Protocol/DFRN.php:1504 -#, php-format -msgid "Happy Birthday %s" -msgstr "Veselé narozeniny, %s" - #: src/Model/Event.php:53 src/Model/Event.php:70 src/Model/Event.php:419 #: src/Model/Event.php:877 msgid "Starts:" @@ -9057,139 +8974,6 @@ msgstr "Ukázat mapu" msgid "Hide map" msgstr "Skrýt mapu" -#: src/Model/Item.php:2330 -#, php-format -msgid "%1$s is attending %2$s's %3$s" -msgstr "%1$s se zúčactní %3$s %2$s" - -#: src/Model/Item.php:2335 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" -msgstr "%1$s se nezúčastní %3$s %2$s" - -#: src/Model/Item.php:2340 -#, php-format -msgid "%1$s may attend %2$s's %3$s" -msgstr "%1$s by se mohl/a zúčastnit %3$s %2$s" - -#: src/Model/Profile.php:97 -msgid "Requested account is not available." -msgstr "Požadovaný účet není dostupný." - -#: src/Model/Profile.php:164 src/Model/Profile.php:395 -#: src/Model/Profile.php:853 -msgid "Edit profile" -msgstr "Upravit profil" - -#: src/Model/Profile.php:332 -msgid "Atom feed" -msgstr "Kanál Atom" - -#: src/Model/Profile.php:368 -msgid "Manage/edit profiles" -msgstr "Spravovat/upravit profily" - -#: src/Model/Profile.php:546 src/Model/Profile.php:635 -msgid "g A l F d" -msgstr "g A l F d" - -#: src/Model/Profile.php:547 -msgid "F d" -msgstr "F d" - -#: src/Model/Profile.php:600 src/Model/Profile.php:697 -msgid "[today]" -msgstr "[dnes]" - -#: src/Model/Profile.php:611 -msgid "Birthday Reminders" -msgstr "Připomínka narozenin" - -#: src/Model/Profile.php:612 -msgid "Birthdays this week:" -msgstr "Narozeniny tento týden:" - -#: src/Model/Profile.php:684 -msgid "[No description]" -msgstr "[Žádný popis]" - -#: src/Model/Profile.php:711 -msgid "Event Reminders" -msgstr "Připomenutí událostí" - -#: src/Model/Profile.php:712 -msgid "Events this week:" -msgstr "Události tohoto týdne:" - -#: src/Model/Profile.php:735 -msgid "Member since:" -msgstr "Členem od:" - -#: src/Model/Profile.php:743 -msgid "j F, Y" -msgstr "j F, Y" - -#: src/Model/Profile.php:744 -msgid "j F" -msgstr "j F" - -#: src/Model/Profile.php:759 -msgid "Age:" -msgstr "Věk:" - -#: src/Model/Profile.php:772 -#, php-format -msgid "for %1$d %2$s" -msgstr "pro %1$d %2$s" - -#: src/Model/Profile.php:796 -msgid "Religion:" -msgstr "Náboženství:" - -#: src/Model/Profile.php:804 -msgid "Hobbies/Interests:" -msgstr "Koníčky/zájmy:" - -#: src/Model/Profile.php:816 -msgid "Contact information and Social Networks:" -msgstr "Kontaktní informace a sociální sítě:" - -#: src/Model/Profile.php:820 -msgid "Musical interests:" -msgstr "Hudební vkus:" - -#: src/Model/Profile.php:824 -msgid "Books, literature:" -msgstr "Knihy, literatura:" - -#: src/Model/Profile.php:828 -msgid "Television:" -msgstr "Televize:" - -#: src/Model/Profile.php:832 -msgid "Film/dance/culture/entertainment:" -msgstr "Film/tanec/kultura/zábava:" - -#: src/Model/Profile.php:836 -msgid "Love/Romance:" -msgstr "Láska/romantika" - -#: src/Model/Profile.php:840 -msgid "Work/employment:" -msgstr "Práce/zaměstnání:" - -#: src/Model/Profile.php:844 -msgid "School/education:" -msgstr "Škola/vzdělávání:" - -#: src/Model/Profile.php:849 -msgid "Forums:" -msgstr "Fóra" - -#: src/Model/Profile.php:943 -msgid "Only You Can See This" -msgstr "Toto můžete vidět jen Vy" - #: src/Model/User.php:169 msgid "Login failed" msgstr "Přihlášení selhalo" @@ -9332,6 +9116,227 @@ msgid "" "\t\t\tThank you and welcome to %2$s." msgstr "\n\t\t\tZde jsou vaše přihlašovací detaily:\n\n\t\t\tAdresa stránky:\t\t%3$s\n\t\t\tPřihlašovací jméno:\t%1$s\n\t\t\tHeslo:\t\t\t%5$s\n\n\t\t\tSvé heslo si po přihlášení můžete změnit na stránce \"Nastavení\" vašeho\n\t\t\túčtu.\n\n\t\t\tProsím, prohlédněte si na chvilku ostatní nastavení účtu na té stránce.\n\n\t\t\tMožná byste si také přáli přidat pár základních informací na svůj výchozí\n\t\t\tprofil (na stránce \"Profily\") aby vás další lidé mohli snadno najít.\n\n\t\t\tDoporučujeme nastavit si vaše celé jméno, přidat profilovou fotku,\n\t\t\tpřidat pár \"klíčových slov\" k profilu (velmi užitečné při získávání nových\n\t\t\tpřátel) - a možná v jaké zemi žijete; pokud nechcete být konkrétnější.\n\n\t\t\tZcela respektujeme vaše právo na soukromí a žádnou z těchto položek\n\t\t\tnení potřeba vyplňovat. Pokud jste zde nový/á a nikoho zde neznáte, mohou vám\n\t\t\tpomoci si získat nové a zajímavé přátele.\n\n\t\t\tPokud byste si někdy přál/a smazat účet, může tak učinit na stránce\n\t\t\t%3$s/removeme.\n\n\t\t\tDěkujeme vám a vítáme vás na %2$s." +#: src/Model/Contact.php:667 +msgid "Drop Contact" +msgstr "Odstranit kontakt" + +#: src/Model/Contact.php:1118 +msgid "Organisation" +msgstr "Organizace" + +#: src/Model/Contact.php:1121 +msgid "News" +msgstr "Zprávy" + +#: src/Model/Contact.php:1124 +msgid "Forum" +msgstr "Fórum" + +#: src/Model/Contact.php:1303 +msgid "Connect URL missing." +msgstr "Chybí URL adresa pro připojení." + +#: src/Model/Contact.php:1312 +msgid "" +"The contact could not be added. Please check the relevant network " +"credentials in your Settings -> Social Networks page." +msgstr "Kontakt nemohl být přidán. Prosím zkontrolujte relevantní přihlašovací údaje sítě na stránce Nastavení -> Sociální sítě." + +#: src/Model/Contact.php:1359 +msgid "" +"This site is not configured to allow communications with other networks." +msgstr "Tento web není nakonfigurován tak, aby umožňoval komunikaci s ostatními sítěmi." + +#: src/Model/Contact.php:1360 src/Model/Contact.php:1374 +msgid "No compatible communication protocols or feeds were discovered." +msgstr "Nenalezen žádný kompatibilní komunikační protokol nebo kanál." + +#: src/Model/Contact.php:1372 +msgid "The profile address specified does not provide adequate information." +msgstr "Uvedená adresa profilu neposkytuje dostatečné informace." + +#: src/Model/Contact.php:1377 +msgid "An author or name was not found." +msgstr "Autor nebo jméno nenalezeno" + +#: src/Model/Contact.php:1380 +msgid "No browser URL could be matched to this address." +msgstr "Této adrese neodpovídá žádné URL prohlížeče." + +#: src/Model/Contact.php:1383 +msgid "" +"Unable to match @-style Identity Address with a known protocol or email " +"contact." +msgstr "Není možné namapovat adresu Identity ve stylu @ s žádným možným protokolem ani emailovým kontaktem." + +#: src/Model/Contact.php:1384 +msgid "Use mailto: in front of address to force email check." +msgstr "Použite mailo: před adresou k vynucení emailové kontroly." + +#: src/Model/Contact.php:1390 +msgid "" +"The profile address specified belongs to a network which has been disabled " +"on this site." +msgstr "Zadaná adresa profilu patří do sítě, která byla na tomto serveru zakázána." + +#: src/Model/Contact.php:1395 +msgid "" +"Limited profile. This person will be unable to receive direct/personal " +"notifications from you." +msgstr "Omezený profil. Tato osoba nebude schopna od Vás přijímat přímé/osobní sdělení." + +#: src/Model/Contact.php:1446 +msgid "Unable to retrieve contact information." +msgstr "Nepodařilo se získat kontaktní informace." + +#: src/Model/Contact.php:1663 src/Protocol/DFRN.php:1503 +#, php-format +msgid "%s's birthday" +msgstr "%s má narozeniny" + +#: src/Model/Contact.php:1664 src/Protocol/DFRN.php:1504 +#, php-format +msgid "Happy Birthday %s" +msgstr "Veselé narozeniny, %s" + +#: src/Model/Item.php:2540 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "%1$s se zúčactní %3$s %2$s" + +#: src/Model/Item.php:2545 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" +msgstr "%1$s se nezúčastní %3$s %2$s" + +#: src/Model/Item.php:2550 +#, php-format +msgid "%1$s may attend %2$s's %3$s" +msgstr "%1$s by se mohl/a zúčastnit %3$s %2$s" + +#: src/Model/Profile.php:98 +msgid "Requested account is not available." +msgstr "Požadovaný účet není dostupný." + +#: src/Model/Profile.php:165 src/Model/Profile.php:396 +#: src/Model/Profile.php:854 +msgid "Edit profile" +msgstr "Upravit profil" + +#: src/Model/Profile.php:333 +msgid "Atom feed" +msgstr "Kanál Atom" + +#: src/Model/Profile.php:369 +msgid "Manage/edit profiles" +msgstr "Spravovat/upravit profily" + +#: src/Model/Profile.php:547 src/Model/Profile.php:636 +msgid "g A l F d" +msgstr "g A l F d" + +#: src/Model/Profile.php:548 +msgid "F d" +msgstr "F d" + +#: src/Model/Profile.php:601 src/Model/Profile.php:698 +msgid "[today]" +msgstr "[dnes]" + +#: src/Model/Profile.php:612 +msgid "Birthday Reminders" +msgstr "Připomínka narozenin" + +#: src/Model/Profile.php:613 +msgid "Birthdays this week:" +msgstr "Narozeniny tento týden:" + +#: src/Model/Profile.php:685 +msgid "[No description]" +msgstr "[Žádný popis]" + +#: src/Model/Profile.php:712 +msgid "Event Reminders" +msgstr "Připomenutí událostí" + +#: src/Model/Profile.php:713 +msgid "Upcoming events the next 7 days:" +msgstr "Nadcházející události v příštích 7 dnech:" + +#: src/Model/Profile.php:736 +msgid "Member since:" +msgstr "Členem od:" + +#: src/Model/Profile.php:744 +msgid "j F, Y" +msgstr "j F, Y" + +#: src/Model/Profile.php:745 +msgid "j F" +msgstr "j F" + +#: src/Model/Profile.php:760 +msgid "Age:" +msgstr "Věk:" + +#: src/Model/Profile.php:773 +#, php-format +msgid "for %1$d %2$s" +msgstr "pro %1$d %2$s" + +#: src/Model/Profile.php:797 +msgid "Religion:" +msgstr "Náboženství:" + +#: src/Model/Profile.php:805 +msgid "Hobbies/Interests:" +msgstr "Koníčky/zájmy:" + +#: src/Model/Profile.php:817 +msgid "Contact information and Social Networks:" +msgstr "Kontaktní informace a sociální sítě:" + +#: src/Model/Profile.php:821 +msgid "Musical interests:" +msgstr "Hudební vkus:" + +#: src/Model/Profile.php:825 +msgid "Books, literature:" +msgstr "Knihy, literatura:" + +#: src/Model/Profile.php:829 +msgid "Television:" +msgstr "Televize:" + +#: src/Model/Profile.php:833 +msgid "Film/dance/culture/entertainment:" +msgstr "Film/tanec/kultura/zábava:" + +#: src/Model/Profile.php:837 +msgid "Love/Romance:" +msgstr "Láska/romantika" + +#: src/Model/Profile.php:841 +msgid "Work/employment:" +msgstr "Práce/zaměstnání:" + +#: src/Model/Profile.php:845 +msgid "School/education:" +msgstr "Škola/vzdělávání:" + +#: src/Model/Profile.php:850 +msgid "Forums:" +msgstr "Fóra" + +#: src/Model/Profile.php:944 +msgid "Only You Can See This" +msgstr "Toto můžete vidět jen Vy" + +#: src/Model/Profile.php:1100 +#, php-format +msgid "OpenWebAuth: %1$s welcomes %2$s" +msgstr "OpenWebAuth: %1$s vítá %2$s" + #: src/Protocol/Diaspora.php:2511 msgid "Sharing notification from Diaspora network" msgstr "Oznámení o sdílení ze sítě Diaspora" @@ -9453,83 +9458,83 @@ msgstr "Odstranit lokálně" msgid "save to folder" msgstr "uložit do složky" -#: src/Object/Post.php:234 +#: src/Object/Post.php:226 msgid "I will attend" msgstr "Zúčastním se" -#: src/Object/Post.php:234 +#: src/Object/Post.php:226 msgid "I will not attend" msgstr "Nezúčastním se" -#: src/Object/Post.php:234 +#: src/Object/Post.php:226 msgid "I might attend" msgstr "Mohl bych se zúčastnit" -#: src/Object/Post.php:262 +#: src/Object/Post.php:254 msgid "add star" msgstr "přidat hvězdu" -#: src/Object/Post.php:263 +#: src/Object/Post.php:255 msgid "remove star" msgstr "odebrat hvězdu" -#: src/Object/Post.php:264 +#: src/Object/Post.php:256 msgid "toggle star status" msgstr "přepínat hvězdu" -#: src/Object/Post.php:267 +#: src/Object/Post.php:259 msgid "starred" msgstr "označeno hvězdou" -#: src/Object/Post.php:273 +#: src/Object/Post.php:265 msgid "ignore thread" msgstr "ignorovat vlákno" -#: src/Object/Post.php:274 +#: src/Object/Post.php:266 msgid "unignore thread" msgstr "přestat ignorovat vlákno" -#: src/Object/Post.php:275 +#: src/Object/Post.php:267 msgid "toggle ignore status" msgstr "přepínat stav ignorování" -#: src/Object/Post.php:284 +#: src/Object/Post.php:276 msgid "add tag" msgstr "přidat štítek" -#: src/Object/Post.php:295 +#: src/Object/Post.php:287 msgid "like" msgstr "má rád" -#: src/Object/Post.php:296 +#: src/Object/Post.php:288 msgid "dislike" msgstr "nemá rád" -#: src/Object/Post.php:299 +#: src/Object/Post.php:291 msgid "Share this" msgstr "Sdílet toto" -#: src/Object/Post.php:299 +#: src/Object/Post.php:291 msgid "share" msgstr "sdílí" -#: src/Object/Post.php:364 +#: src/Object/Post.php:356 msgid "to" msgstr "pro" -#: src/Object/Post.php:365 +#: src/Object/Post.php:357 msgid "via" msgstr "přes" -#: src/Object/Post.php:366 +#: src/Object/Post.php:358 msgid "Wall-to-Wall" msgstr "Ze zdi na zeď" -#: src/Object/Post.php:367 +#: src/Object/Post.php:359 msgid "via Wall-To-Wall:" msgstr "ze zdi na zeď" -#: src/Object/Post.php:426 +#: src/Object/Post.php:418 #, php-format msgid "%d comment" msgid_plural "%d comments" @@ -9538,35 +9543,35 @@ msgstr[1] "%d komentáře" msgstr[2] "%d komentářů" msgstr[3] "%d komentářů" -#: src/Object/Post.php:796 +#: src/Object/Post.php:788 msgid "Bold" msgstr "Tučné" -#: src/Object/Post.php:797 +#: src/Object/Post.php:789 msgid "Italic" msgstr "Kurzíva" -#: src/Object/Post.php:798 +#: src/Object/Post.php:790 msgid "Underline" msgstr "Podrtžené" -#: src/Object/Post.php:799 +#: src/Object/Post.php:791 msgid "Quote" msgstr "Citovat" -#: src/Object/Post.php:800 +#: src/Object/Post.php:792 msgid "Code" msgstr "Kód" -#: src/Object/Post.php:801 +#: src/Object/Post.php:793 msgid "Image" msgstr "Obrázek" -#: src/Object/Post.php:802 +#: src/Object/Post.php:794 msgid "Link" msgstr "Odkaz" -#: src/Object/Post.php:803 +#: src/Object/Post.php:795 msgid "Video" msgstr "Video" @@ -9582,16 +9587,16 @@ msgstr "zobrazit méně" msgid "No system theme config value set." msgstr "Není nastavena konfigurační hodnota systémového motivu." -#: index.php:464 -msgid "toggle mobile" -msgstr "přepínat mobilní zobrazení" - #: update.php:193 #, php-format msgid "%s: Updating author-id and owner-id in item and thread table. " msgstr "%s: Aktualizuji author-id a owner-id v tabulce položek a vláken." -#: boot.php:796 +#: boot.php:797 #, php-format msgid "Update %s failed. See error logs." msgstr "Aktualizace %s selhala. Zkontrolujte protokol chyb." + +#: index.php:474 +msgid "toggle mobile" +msgstr "přepínat mobilní zobrazení" diff --git a/view/lang/cs/strings.php b/view/lang/cs/strings.php index 5a40fdd57..fc89a8a57 100644 --- a/view/lang/cs/strings.php +++ b/view/lang/cs/strings.php @@ -6,6 +6,17 @@ function string_plural_select_cs($n){ return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;; }} ; +$a->strings["Item not found."] = "Položka nenalezena."; +$a->strings["Do you really want to delete this item?"] = "Opravdu chcete smazat tuto položku?"; +$a->strings["Yes"] = "Ano"; +$a->strings["Cancel"] = "Zrušit"; +$a->strings["Permission denied."] = "Přístup odmítnut."; +$a->strings["Archives"] = "Archív"; +$a->strings["show more"] = "zobrazit více"; +$a->strings["Welcome "] = "Vítejte "; +$a->strings["Please upload a profile photo."] = "Prosím nahrejte profilovou fotografii"; +$a->strings["Welcome back "] = "Vítejte zpět "; +$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."] = "Formulářový bezpečnostní token nebyl správný. To pravděpodobně nastalo kvůli tom, že formulář byl otevřen příliš dlouho (>3 hodiny) před jeho odesláním."; $a->strings["Daily posting limit of %d post reached. The post was rejected."] = [ 0 => "Byl dosažen denní limit %d příspěvku. Příspěvek byl odmítnut.", 1 => "Byl dosažen denní limit %d příspěvků. Příspěvek byl odmítnut.", @@ -109,7 +120,6 @@ $a->strings["Permission settings"] = "Nastavení oprávnění"; $a->strings["permissions"] = "oprávnění"; $a->strings["Public post"] = "Veřejný příspěvek"; $a->strings["Preview"] = "Náhled"; -$a->strings["Cancel"] = "Zrušit"; $a->strings["Post to Groups"] = "Zveřejnit na Groups"; $a->strings["Post to Contacts"] = "Zveřejnit na Groups"; $a->strings["Private post"] = "Soukromý příspěvek"; @@ -199,16 +209,6 @@ $a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "O $a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Obdržel jste [url=%1\$s]žádost o registraci[/url] od '%2\$s'."; $a->strings["Full Name:\t%s\nSite Location:\t%s\nLogin Name:\t%s (%s)"] = "Celé jméno:\t\t%s\nAdresa stránky:\t\t%s\nPřihlašovací jméno:\t%s (%s)"; $a->strings["Please visit %s to approve or reject the request."] = "Prosím navštivte %s k odsouhlasení nebo k zamítnutí požadavku."; -$a->strings["Item not found."] = "Položka nenalezena."; -$a->strings["Do you really want to delete this item?"] = "Opravdu chcete smazat tuto položku?"; -$a->strings["Yes"] = "Ano"; -$a->strings["Permission denied."] = "Přístup odmítnut."; -$a->strings["Archives"] = "Archív"; -$a->strings["show more"] = "zobrazit více"; -$a->strings["Welcome "] = "Vítejte "; -$a->strings["Please upload a profile photo."] = "Prosím nahrejte profilovou fotografii"; -$a->strings["Welcome back "] = "Vítejte zpět "; -$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."] = "Formulářový bezpečnostní token nebyl správný. To pravděpodobně nastalo kvůli tom, že formulář byl otevřen příliš dlouho (>3 hodiny) před jeho odesláním."; $a->strings["newer"] = "novější"; $a->strings["older"] = "starší"; $a->strings["first"] = "první"; @@ -586,7 +586,6 @@ $a->strings["Friend Confirm URL"] = "URL adresa potvrzení přátelství"; $a->strings["Notification Endpoint URL"] = "Notifikační URL adresa"; $a->strings["Poll/Feed URL"] = "Poll/Feed URL adresa"; $a->strings["New photo from this URL"] = "Nové foto z této URL adresy"; -$a->strings["%1\$s welcomes %2\$s"] = "%1\$s vítá %2\$s"; $a->strings["Help:"] = "Nápověda:"; $a->strings["Help"] = "Nápověda"; $a->strings["Not Found"] = "Nenalezen"; @@ -619,15 +618,6 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ $a->strings["

What next

"] = "

Co dál

"; $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the worker."] = "DŮLEŽITÉ: Budete si muset [manuálně] nastavit naplánovaný úkol pro pracovníka."; $a->strings["Go to your new Friendica 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."] = "Přejděte k registrační stránce Vašeho nového serveru Friendica a zaregistrujte se jako nový uživatel. Nezapomeňte použít stejný e-mail, který jste zadal/a jako administrátorský e-mail. To Vám umožní navštívit panel pro administraci stránky."; -$a->strings["Access denied."] = "Přístup odmítnut"; -$a->strings["Community option not available."] = "Možnost komunity není dostupná."; -$a->strings["Not available."] = "Není k dispozici."; -$a->strings["Local Community"] = "Lokální komunita"; -$a->strings["Posts from local users on this server"] = "Příspěvky od lokálních uživatelů na tomto serveru"; -$a->strings["Global Community"] = "Globální komunita"; -$a->strings["Posts from users of the whole federated network"] = "Příspěvky od uživatelů z celé federované sítě"; -$a->strings["No results."] = "Žádné výsledky."; -$a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "Tento komunitní proud ukazuje všechny veřejné příspěvky, které tento server přijme. Nemusí odrážet názory uživatelů serveru."; $a->strings["Profile not found."] = "Profil nenalezen."; $a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "To se může občas stát pokud kontakt byl zažádán oběma osobami a již byl schválen."; $a->strings["Response from remote site was not understood."] = "Odpověď ze vzdáleného serveru nebyla srozumitelná."; @@ -1507,14 +1497,6 @@ $a->strings["Friendica"] = "Friendica"; $a->strings["GNU Social (Pleroma, Mastodon)"] = "GNU social (Pleroma, Mastodon)"; $a->strings["Diaspora (Socialhome, Hubzilla)"] = "Diaspora (Socialhome, Hubzilla)"; $a->strings[" - please do not use this form. Instead, enter %s into your Diaspora search bar."] = " - prosím nepoužívejte tento formulář. Místo toho zadejte %s do Vašeho Diaspora vyhledávacího pole."; -$a->strings["Gender:"] = "Pohlaví:"; -$a->strings["Status:"] = "Status:"; -$a->strings["Homepage:"] = "Domácí stránka:"; -$a->strings["Global Directory"] = "Globální adresář"; -$a->strings["Find on this site"] = "Nalézt na tomto webu"; -$a->strings["Results for:"] = "Výsledky pro:"; -$a->strings["Site Directory"] = "Adresář serveru"; -$a->strings["No entries (some entries may be hidden)."] = "Žádné záznamy (některé položky mohou být skryty)."; $a->strings["People Search - %s"] = "Vyhledávání lidí - %s"; $a->strings["Forum Search - %s"] = "Vyhledávání ve fóru - %s"; $a->strings["No matches"] = "Žádné shody"; @@ -1522,16 +1504,96 @@ $a->strings["Item not found"] = "Položka nenalezena"; $a->strings["Edit post"] = "Upravit příspěvek"; $a->strings["CC: email addresses"] = "skrytá kopie: e-mailové adresy"; $a->strings["Example: bob@example.com, mary@example.com"] = "Příklad: bob@example.com, mary@example.com"; +$a->strings["No keywords to match. Please add keywords to your default profile."] = "Žádná klíčová slova k porovnání. Prosím, přidejte klíčová slova do Vašeho výchozího profilu."; +$a->strings["is interested in:"] = "se zajímá o:"; +$a->strings["Profile Match"] = "Shoda profilu"; +$a->strings["Invalid request identifier."] = "Neplatný identifikátor požadavku."; +$a->strings["Discard"] = "Odstranit"; +$a->strings["Notifications"] = "Upozornění"; +$a->strings["Network Notifications"] = "Upozornění Sítě"; +$a->strings["Personal Notifications"] = "Osobní upozornění"; +$a->strings["Home Notifications"] = "Upozornění na vstupní straně"; +$a->strings["Show Ignored Requests"] = "Zobrazit ignorované žádosti"; +$a->strings["Hide Ignored Requests"] = "Skrýt ignorované žádosti"; +$a->strings["Notification type:"] = "Typ oznámení:"; +$a->strings["Suggested by:"] = "Navrženo:"; +$a->strings["Claims to be known to you: "] = "Vaši údajní známí: "; +$a->strings["yes"] = "ano"; +$a->strings["no"] = "ne"; +$a->strings["Shall your connection be bidirectional or not?"] = "Má Vaše spojení být obousměrné, nebo ne?"; +$a->strings["Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed."] = "Přijetí %s jako přítele dovolí %s odebírat Vaše příspěvky a Vy budete také přijímat aktualizace od nich ve Vašem kanále."; +$a->strings["Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "Přijetí %s jako odběratele jim dovolí odebírat Vaše příspěvky, ale nebudete od nich přijímat aktualizace ve Vašem kanále."; +$a->strings["Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "Přijetí %s jako sdílejícího jim dovolí odebírat Vaše příspěvky, ale nebudete od nich přijímat aktualizace ve Vašem kanále."; +$a->strings["Friend"] = "Přítel"; +$a->strings["Sharer"] = "Sdílející"; +$a->strings["Subscriber"] = "Odběratel"; +$a->strings["Gender:"] = "Pohlaví:"; +$a->strings["No introductions."] = "Žádné představení."; +$a->strings["Show unread"] = "Zobrazit nepřečtené"; +$a->strings["Show all"] = "Zobrazit vše"; +$a->strings["No more %s notifications."] = "Žádná další %s oznámení"; +$a->strings["Poke/Prod"] = "Šťouchnout/dloubnout"; +$a->strings["poke, prod or do other things to somebody"] = "někoho šťouchnout, dloubnout, nebo mu provést jinou věc"; +$a->strings["Recipient"] = "Příjemce"; +$a->strings["Choose what you wish to do to recipient"] = "Vyberte, co si přejete příjemci udělat"; +$a->strings["Make this post private"] = "Změnit tento příspěvek na soukromý"; +$a->strings["Registration successful. Please check your email for further instructions."] = "Registrace úspěšná. Zkontrolujte prosím svůj e-mail pro další instrukce."; +$a->strings["Failed to send email message. Here your accout details:
login: %s
password: %s

You can change your password after login."] = "Nepovedlo se odeslat emailovou zprávu. Zde jsou detaily Vašeho účtu:
přihlášení: %s
heslo: %s

Své heslo si můžete změnit po přihlášení."; +$a->strings["Registration successful."] = "Registrace byla úspěšná."; +$a->strings["Your registration can not be processed."] = "Vaši registraci nelze zpracovat."; +$a->strings["Your registration is pending approval by the site owner."] = "Vaše registrace čeká na schválení vlastníkem serveru."; +$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Tento formulář můžete (volitelně) vyplnit s pomocí OpenID tím, že vyplníte své OpenID a kliknutete na tlačítko \"Zaregistrovat\"."; +$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Pokud nepoužíváte OpenID, nechte prosím toto pole prázdné a vyplňte zbylé položky."; +$a->strings["Your OpenID (optional): "] = "Vaše OpenID (nepovinné): "; +$a->strings["Include your profile in member directory?"] = "Chcete zahrnout Váš profil v adresáři členů?"; +$a->strings["Note for the admin"] = "Poznámka pro administrátora"; +$a->strings["Leave a message for the admin, why you want to join this node"] = "Zanechejte administrátorovi zprávu, proč se k tomuto serveru chcete připojit"; +$a->strings["Membership on this site is by invitation only."] = "Členství na tomto webu je pouze na pozvání."; +$a->strings["Your invitation code: "] = "Váš kód pozvánky: "; +$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Celé jméno (např. Joe Smith, skutečné či skutečně vypadající):"; +$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Vaše e-mailová adresa: (Budou zde poslány počáteční informace, musí to proto být existující adresa.)"; +$a->strings["Leave empty for an auto generated password."] = "Ponechte prázdné pro automatické vygenerovaní hesla."; +$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be 'nickname@%s'."] = "Vyberte si přezdívku pro Váš profil. Musí začínat textovým znakem. Vaše profilová adresa na této stránce bude mít tvar \"přezdívka@%s\"."; +$a->strings["Choose a nickname: "] = "Vyberte přezdívku:"; +$a->strings["Register"] = "Registrovat"; +$a->strings["Import your profile to this friendica instance"] = "Import Vašeho profilu do této friendica instance"; +$a->strings["Do you really want to delete this suggestion?"] = "Opravdu chcete smazat tento návrh?"; +$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Nejsou dostupné žádné návrhy. Pokud je toto nový server, zkuste to znovu za 24 hodin."; +$a->strings["Ignore/Hide"] = "Ignorovat/skrýt"; +$a->strings["Friend Suggestions"] = "Návrhy přátel"; +$a->strings["Tag removed"] = "Štítek odstraněn"; +$a->strings["Remove Item Tag"] = "Odebrat štítek položky"; +$a->strings["Select a tag to remove: "] = "Vyberte štítek k odebrání: "; +$a->strings["Contact wasn't found or can't be unfollowed."] = "Kontakt nebyl nalezen, nebo u něj nemůže být zrušeno sledování."; +$a->strings["Contact unfollowed"] = "Zrušeno sledování kontaktu"; +$a->strings["You aren't a friend of this contact."] = "nejste přítelem tohoto kontaktu"; +$a->strings["Unfollowing is currently not supported by your network."] = "Zrušení sledování není aktuálně na Vaši síti podporováno."; +$a->strings["[Embedded content - reload page to view]"] = "[Vložený obsah - obnovte stránku pro zobrazení]"; +$a->strings["No contacts."] = "Žádné kontakty."; +$a->strings["Access denied."] = "Přístup odmítnut"; +$a->strings["Wall Photos"] = "Fotografie na zdi"; +$a->strings["Community option not available."] = "Možnost komunity není dostupná."; +$a->strings["Not available."] = "Není k dispozici."; +$a->strings["Local Community"] = "Lokální komunita"; +$a->strings["Posts from local users on this server"] = "Příspěvky od lokálních uživatelů na tomto serveru"; +$a->strings["Global Community"] = "Globální komunita"; +$a->strings["Posts from users of the whole federated network"] = "Příspěvky od uživatelů z celé federované sítě"; +$a->strings["No results."] = "Žádné výsledky."; +$a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "Tento komunitní proud ukazuje všechny veřejné příspěvky, které tento server přijme. Nemusí odrážet názory uživatelů serveru."; +$a->strings["%1\$s welcomes %2\$s"] = "%1\$s vítá %2\$s"; +$a->strings["Status:"] = "Status:"; +$a->strings["Homepage:"] = "Domácí stránka:"; +$a->strings["Global Directory"] = "Globální adresář"; +$a->strings["Find on this site"] = "Nalézt na tomto webu"; +$a->strings["Results for:"] = "Výsledky pro:"; +$a->strings["Site Directory"] = "Adresář serveru"; +$a->strings["No entries (some entries may be hidden)."] = "Žádné záznamy (některé položky mohou být skryty)."; $a->strings["Unable to locate original post."] = "Nelze nalézt původní příspěvek."; $a->strings["Empty post discarded."] = "Prázdný příspěvek odstraněn."; -$a->strings["Wall Photos"] = "Fotografie na zdi"; $a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Tato zpráva vám byla zaslána od %s, člena sociální sítě Friendica."; $a->strings["You may visit them online at %s"] = "Můžete je navštívit online na adrese %s"; $a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Pokud nechcete dostávat tyto zprávy, kontaktujte prosím odesilatele odpovědí na tento záznam."; $a->strings["%s posted an update."] = "%s poslal aktualizaci."; -$a->strings["No keywords to match. Please add keywords to your default profile."] = "Žádná klíčová slova k porovnání. Prosím, přidejte klíčová slova do Vašeho výchozího profilu."; -$a->strings["is interested in:"] = "se zajímá o:"; -$a->strings["Profile Match"] = "Shoda profilu"; $a->strings["New Message"] = "Nová zpráva"; $a->strings["Unable to locate contact information."] = "Nepodařilo se najít kontaktní informace."; $a->strings["Messages"] = "Zprávy"; @@ -1580,30 +1642,6 @@ $a->strings["Interesting Links"] = "Zajímavé odkazy"; $a->strings["Starred"] = "S hvězdičkou"; $a->strings["Favourite Posts"] = "Oblíbené přízpěvky"; $a->strings["Personal Notes"] = "Osobní poznámky"; -$a->strings["Invalid request identifier."] = "Neplatný identifikátor požadavku."; -$a->strings["Discard"] = "Odstranit"; -$a->strings["Notifications"] = "Upozornění"; -$a->strings["Network Notifications"] = "Upozornění Sítě"; -$a->strings["Personal Notifications"] = "Osobní upozornění"; -$a->strings["Home Notifications"] = "Upozornění na vstupní straně"; -$a->strings["Show Ignored Requests"] = "Zobrazit ignorované žádosti"; -$a->strings["Hide Ignored Requests"] = "Skrýt ignorované žádosti"; -$a->strings["Notification type:"] = "Typ oznámení:"; -$a->strings["Suggested by:"] = "Navrženo:"; -$a->strings["Claims to be known to you: "] = "Vaši údajní známí: "; -$a->strings["yes"] = "ano"; -$a->strings["no"] = "ne"; -$a->strings["Shall your connection be bidirectional or not?"] = "Má Vaše spojení být obousměrné, nebo ne?"; -$a->strings["Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed."] = "Přijetí %s jako přítele dovolí %s odebírat Vaše příspěvky a Vy budete také přijímat aktualizace od nich ve Vašem kanále."; -$a->strings["Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "Přijetí %s jako odběratele jim dovolí odebírat Vaše příspěvky, ale nebudete od nich přijímat aktualizace ve Vašem kanále."; -$a->strings["Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "Přijetí %s jako sdílejícího jim dovolí odebírat Vaše příspěvky, ale nebudete od nich přijímat aktualizace ve Vašem kanále."; -$a->strings["Friend"] = "Přítel"; -$a->strings["Sharer"] = "Sdílející"; -$a->strings["Subscriber"] = "Odběratel"; -$a->strings["No introductions."] = "Žádné představení."; -$a->strings["Show unread"] = "Zobrazit nepřečtené"; -$a->strings["Show all"] = "Zobrazit vše"; -$a->strings["No more %s notifications."] = "Žádná další %s oznámení"; $a->strings["Photo Albums"] = "Fotoalba"; $a->strings["Recent Photos"] = "Aktuální fotografie"; $a->strings["Upload New Photos"] = "Nahrát nové fotografie"; @@ -1651,54 +1689,16 @@ $a->strings["Map"] = "Mapa"; $a->strings["{0} wants to be your friend"] = "{0} chce být Vaším přítelem"; $a->strings["{0} sent you a message"] = "{0} vám poslal zprávu"; $a->strings["{0} requested registration"] = "{0} požaduje registraci"; -$a->strings["Poke/Prod"] = "Šťouchnout/dloubnout"; -$a->strings["poke, prod or do other things to somebody"] = "někoho šťouchnout, dloubnout, nebo mu provést jinou věc"; -$a->strings["Recipient"] = "Příjemce"; -$a->strings["Choose what you wish to do to recipient"] = "Vyberte, co si přejete příjemci udělat"; -$a->strings["Make this post private"] = "Změnit tento příspěvek na soukromý"; $a->strings["Requested profile is not available."] = "Požadovaný profil není k dispozici."; $a->strings["%s's timeline"] = "Časová osa %s"; $a->strings["%s's posts"] = "Příspěvky %s"; $a->strings["%s's comments"] = "Komentáře %s"; $a->strings["Tips for New Members"] = "Tipy pro nové členy"; -$a->strings["Registration successful. Please check your email for further instructions."] = "Registrace úspěšná. Zkontrolujte prosím svůj e-mail pro další instrukce."; -$a->strings["Failed to send email message. Here your accout details:
login: %s
password: %s

You can change your password after login."] = "Nepovedlo se odeslat emailovou zprávu. Zde jsou detaily Vašeho účtu:
přihlášení: %s
heslo: %s

Své heslo si můžete změnit po přihlášení."; -$a->strings["Registration successful."] = "Registrace byla úspěšná."; -$a->strings["Your registration can not be processed."] = "Vaši registraci nelze zpracovat."; -$a->strings["Your registration is pending approval by the site owner."] = "Vaše registrace čeká na schválení vlastníkem serveru."; -$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Tento formulář můžete (volitelně) vyplnit s pomocí OpenID tím, že vyplníte své OpenID a kliknutete na tlačítko \"Zaregistrovat\"."; -$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Pokud nepoužíváte OpenID, nechte prosím toto pole prázdné a vyplňte zbylé položky."; -$a->strings["Your OpenID (optional): "] = "Vaše OpenID (nepovinné): "; -$a->strings["Include your profile in member directory?"] = "Chcete zahrnout Váš profil v adresáři členů?"; -$a->strings["Note for the admin"] = "Poznámka pro administrátora"; -$a->strings["Leave a message for the admin, why you want to join this node"] = "Zanechejte administrátorovi zprávu, proč se k tomuto serveru chcete připojit"; -$a->strings["Membership on this site is by invitation only."] = "Členství na tomto webu je pouze na pozvání."; -$a->strings["Your invitation code: "] = "Váš kód pozvánky: "; -$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Celé jméno (např. Joe Smith, skutečné či skutečně vypadající):"; -$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Vaše e-mailová adresa: (Budou zde poslány počáteční informace, musí to proto být existující adresa.)"; -$a->strings["Leave empty for an auto generated password."] = "Ponechte prázdné pro automatické vygenerovaní hesla."; -$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be 'nickname@%s'."] = "Vyberte si přezdívku pro Váš profil. Musí začínat textovým znakem. Vaše profilová adresa na této stránce bude mít tvar \"přezdívka@%s\"."; -$a->strings["Choose a nickname: "] = "Vyberte přezdívku:"; -$a->strings["Register"] = "Registrovat"; -$a->strings["Import your profile to this friendica instance"] = "Import Vašeho profilu do této friendica instance"; $a->strings["Only logged in users are permitted to perform a search."] = "Pouze přihlášení uživatelé mohou prohledávat tento server."; $a->strings["Too Many Requests"] = "Příliš mnoho požadavků"; $a->strings["Only one search per minute is permitted for not logged in users."] = "Nepřihlášení uživatelé mohou vyhledávat pouze jednou za minutu."; $a->strings["Items tagged with: %s"] = "Položky označené jako: %s"; $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s následuje %3\$s uživatele %2\$s"; -$a->strings["Do you really want to delete this suggestion?"] = "Opravdu chcete smazat tento návrh?"; -$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Nejsou dostupné žádné návrhy. Pokud je toto nový server, zkuste to znovu za 24 hodin."; -$a->strings["Ignore/Hide"] = "Ignorovat/skrýt"; -$a->strings["Friend Suggestions"] = "Návrhy přátel"; -$a->strings["Tag removed"] = "Štítek odstraněn"; -$a->strings["Remove Item Tag"] = "Odebrat štítek položky"; -$a->strings["Select a tag to remove: "] = "Vyberte štítek k odebrání: "; -$a->strings["Contact wasn't found or can't be unfollowed."] = "Kontakt nebyl nalezen, nebo u něj nemůže být zrušeno sledování."; -$a->strings["Contact unfollowed"] = "Zrušeno sledování kontaktu"; -$a->strings["You aren't a friend of this contact."] = "nejste přítelem tohoto kontaktu"; -$a->strings["Unfollowing is currently not supported by your network."] = "Zrušení sledování není aktuálně na Vaši síti podporováno."; -$a->strings["[Embedded content - reload page to view]"] = "[Vložený obsah - obnovte stránku pro zobrazení]"; -$a->strings["No contacts."] = "Žádné kontakty."; $a->strings["default"] = "standardní"; $a->strings["greenzero"] = "zelená nula"; $a->strings["purplezero"] = "fialová nula"; @@ -2075,24 +2075,6 @@ $a->strings["Edit group"] = "Editovat skupinu"; $a->strings["Contacts not in any group"] = "Kontakty, které nejsou v žádné skupině"; $a->strings["Create a new group"] = "Vytvořit novou skupinu"; $a->strings["Edit groups"] = "Upravit skupiny"; -$a->strings["Drop Contact"] = "Odstranit kontakt"; -$a->strings["Organisation"] = "Organizace"; -$a->strings["News"] = "Zprávy"; -$a->strings["Forum"] = "Fórum"; -$a->strings["Connect URL missing."] = "Chybí URL adresa pro připojení."; -$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "Kontakt nemohl být přidán. Prosím zkontrolujte relevantní přihlašovací údaje sítě na stránce Nastavení -> Sociální sítě."; -$a->strings["This site is not configured to allow communications with other networks."] = "Tento web není nakonfigurován tak, aby umožňoval komunikaci s ostatními sítěmi."; -$a->strings["No compatible communication protocols or feeds were discovered."] = "Nenalezen žádný kompatibilní komunikační protokol nebo kanál."; -$a->strings["The profile address specified does not provide adequate information."] = "Uvedená adresa profilu neposkytuje dostatečné informace."; -$a->strings["An author or name was not found."] = "Autor nebo jméno nenalezeno"; -$a->strings["No browser URL could be matched to this address."] = "Této adrese neodpovídá žádné URL prohlížeče."; -$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Není možné namapovat adresu Identity ve stylu @ s žádným možným protokolem ani emailovým kontaktem."; -$a->strings["Use mailto: in front of address to force email check."] = "Použite mailo: před adresou k vynucení emailové kontroly."; -$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Zadaná adresa profilu patří do sítě, která byla na tomto serveru zakázána."; -$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Omezený profil. Tato osoba nebude schopna od Vás přijímat přímé/osobní sdělení."; -$a->strings["Unable to retrieve contact information."] = "Nepodařilo se získat kontaktní informace."; -$a->strings["%s's birthday"] = "%s má narozeniny"; -$a->strings["Happy Birthday %s"] = "Veselé narozeniny, %s"; $a->strings["Starts:"] = "Začíná:"; $a->strings["Finishes:"] = "Končí:"; $a->strings["all-day"] = "celodenní"; @@ -2107,38 +2089,6 @@ $a->strings["D g:i A"] = "D g:i A"; $a->strings["g:i A"] = "g:i A"; $a->strings["Show map"] = "Ukázat mapu"; $a->strings["Hide map"] = "Skrýt mapu"; -$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s se zúčactní %3\$s %2\$s"; -$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s se nezúčastní %3\$s %2\$s"; -$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s by se mohl/a zúčastnit %3\$s %2\$s"; -$a->strings["Requested account is not available."] = "Požadovaný účet není dostupný."; -$a->strings["Edit profile"] = "Upravit profil"; -$a->strings["Atom feed"] = "Kanál Atom"; -$a->strings["Manage/edit profiles"] = "Spravovat/upravit profily"; -$a->strings["g A l F d"] = "g A l F d"; -$a->strings["F d"] = "F d"; -$a->strings["[today]"] = "[dnes]"; -$a->strings["Birthday Reminders"] = "Připomínka narozenin"; -$a->strings["Birthdays this week:"] = "Narozeniny tento týden:"; -$a->strings["[No description]"] = "[Žádný popis]"; -$a->strings["Event Reminders"] = "Připomenutí událostí"; -$a->strings["Events this week:"] = "Události tohoto týdne:"; -$a->strings["Member since:"] = "Členem od:"; -$a->strings["j F, Y"] = "j F, Y"; -$a->strings["j F"] = "j F"; -$a->strings["Age:"] = "Věk:"; -$a->strings["for %1\$d %2\$s"] = "pro %1\$d %2\$s"; -$a->strings["Religion:"] = "Náboženství:"; -$a->strings["Hobbies/Interests:"] = "Koníčky/zájmy:"; -$a->strings["Contact information and Social Networks:"] = "Kontaktní informace a sociální sítě:"; -$a->strings["Musical interests:"] = "Hudební vkus:"; -$a->strings["Books, literature:"] = "Knihy, literatura:"; -$a->strings["Television:"] = "Televize:"; -$a->strings["Film/dance/culture/entertainment:"] = "Film/tanec/kultura/zábava:"; -$a->strings["Love/Romance:"] = "Láska/romantika"; -$a->strings["Work/employment:"] = "Práce/zaměstnání:"; -$a->strings["School/education:"] = "Škola/vzdělávání:"; -$a->strings["Forums:"] = "Fóra"; -$a->strings["Only You Can See This"] = "Toto můžete vidět jen Vy"; $a->strings["Login failed"] = "Přihlášení selhalo"; $a->strings["Not enough information to authenticate"] = "Není dost informací pro autentikaci"; $a->strings["An invitation is required."] = "Pozvánka je vyžadována."; @@ -2164,6 +2114,57 @@ $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Yo $a->strings["Registration at %s"] = "Registrace na %s"; $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\n\t\t\tVážený/á %1\$s,\n\t\t\t\tDěkujeme, že jste se registroval/a na %2\$s. Váš účet byl vytvořen.\n\t\t"; $a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\n\t\t\tZde jsou vaše přihlašovací detaily:\n\n\t\t\tAdresa stránky:\t\t%3\$s\n\t\t\tPřihlašovací jméno:\t%1\$s\n\t\t\tHeslo:\t\t\t%5\$s\n\n\t\t\tSvé heslo si po přihlášení můžete změnit na stránce \"Nastavení\" vašeho\n\t\t\túčtu.\n\n\t\t\tProsím, prohlédněte si na chvilku ostatní nastavení účtu na té stránce.\n\n\t\t\tMožná byste si také přáli přidat pár základních informací na svůj výchozí\n\t\t\tprofil (na stránce \"Profily\") aby vás další lidé mohli snadno najít.\n\n\t\t\tDoporučujeme nastavit si vaše celé jméno, přidat profilovou fotku,\n\t\t\tpřidat pár \"klíčových slov\" k profilu (velmi užitečné při získávání nových\n\t\t\tpřátel) - a možná v jaké zemi žijete; pokud nechcete být konkrétnější.\n\n\t\t\tZcela respektujeme vaše právo na soukromí a žádnou z těchto položek\n\t\t\tnení potřeba vyplňovat. Pokud jste zde nový/á a nikoho zde neznáte, mohou vám\n\t\t\tpomoci si získat nové a zajímavé přátele.\n\n\t\t\tPokud byste si někdy přál/a smazat účet, může tak učinit na stránce\n\t\t\t%3\$s/removeme.\n\n\t\t\tDěkujeme vám a vítáme vás na %2\$s."; +$a->strings["Drop Contact"] = "Odstranit kontakt"; +$a->strings["Organisation"] = "Organizace"; +$a->strings["News"] = "Zprávy"; +$a->strings["Forum"] = "Fórum"; +$a->strings["Connect URL missing."] = "Chybí URL adresa pro připojení."; +$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "Kontakt nemohl být přidán. Prosím zkontrolujte relevantní přihlašovací údaje sítě na stránce Nastavení -> Sociální sítě."; +$a->strings["This site is not configured to allow communications with other networks."] = "Tento web není nakonfigurován tak, aby umožňoval komunikaci s ostatními sítěmi."; +$a->strings["No compatible communication protocols or feeds were discovered."] = "Nenalezen žádný kompatibilní komunikační protokol nebo kanál."; +$a->strings["The profile address specified does not provide adequate information."] = "Uvedená adresa profilu neposkytuje dostatečné informace."; +$a->strings["An author or name was not found."] = "Autor nebo jméno nenalezeno"; +$a->strings["No browser URL could be matched to this address."] = "Této adrese neodpovídá žádné URL prohlížeče."; +$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Není možné namapovat adresu Identity ve stylu @ s žádným možným protokolem ani emailovým kontaktem."; +$a->strings["Use mailto: in front of address to force email check."] = "Použite mailo: před adresou k vynucení emailové kontroly."; +$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Zadaná adresa profilu patří do sítě, která byla na tomto serveru zakázána."; +$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Omezený profil. Tato osoba nebude schopna od Vás přijímat přímé/osobní sdělení."; +$a->strings["Unable to retrieve contact information."] = "Nepodařilo se získat kontaktní informace."; +$a->strings["%s's birthday"] = "%s má narozeniny"; +$a->strings["Happy Birthday %s"] = "Veselé narozeniny, %s"; +$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s se zúčactní %3\$s %2\$s"; +$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s se nezúčastní %3\$s %2\$s"; +$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s by se mohl/a zúčastnit %3\$s %2\$s"; +$a->strings["Requested account is not available."] = "Požadovaný účet není dostupný."; +$a->strings["Edit profile"] = "Upravit profil"; +$a->strings["Atom feed"] = "Kanál Atom"; +$a->strings["Manage/edit profiles"] = "Spravovat/upravit profily"; +$a->strings["g A l F d"] = "g A l F d"; +$a->strings["F d"] = "F d"; +$a->strings["[today]"] = "[dnes]"; +$a->strings["Birthday Reminders"] = "Připomínka narozenin"; +$a->strings["Birthdays this week:"] = "Narozeniny tento týden:"; +$a->strings["[No description]"] = "[Žádný popis]"; +$a->strings["Event Reminders"] = "Připomenutí událostí"; +$a->strings["Upcoming events the next 7 days:"] = "Nadcházející události v příštích 7 dnech:"; +$a->strings["Member since:"] = "Členem od:"; +$a->strings["j F, Y"] = "j F, Y"; +$a->strings["j F"] = "j F"; +$a->strings["Age:"] = "Věk:"; +$a->strings["for %1\$d %2\$s"] = "pro %1\$d %2\$s"; +$a->strings["Religion:"] = "Náboženství:"; +$a->strings["Hobbies/Interests:"] = "Koníčky/zájmy:"; +$a->strings["Contact information and Social Networks:"] = "Kontaktní informace a sociální sítě:"; +$a->strings["Musical interests:"] = "Hudební vkus:"; +$a->strings["Books, literature:"] = "Knihy, literatura:"; +$a->strings["Television:"] = "Televize:"; +$a->strings["Film/dance/culture/entertainment:"] = "Film/tanec/kultura/zábava:"; +$a->strings["Love/Romance:"] = "Láska/romantika"; +$a->strings["Work/employment:"] = "Práce/zaměstnání:"; +$a->strings["School/education:"] = "Škola/vzdělávání:"; +$a->strings["Forums:"] = "Fóra"; +$a->strings["Only You Can See This"] = "Toto můžete vidět jen Vy"; +$a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s vítá %2\$s"; $a->strings["Sharing notification from Diaspora network"] = "Oznámení o sdílení ze sítě Diaspora"; $a->strings["Attachments:"] = "Přílohy:"; $a->strings["%s is now following %s."] = "%s nyní sleduje %s."; @@ -2225,6 +2226,6 @@ $a->strings["Video"] = "Video"; $a->strings["Delete this item?"] = "Odstranit tuto položku?"; $a->strings["show fewer"] = "zobrazit méně"; $a->strings["No system theme config value set."] = "Není nastavena konfigurační hodnota systémového motivu."; -$a->strings["toggle mobile"] = "přepínat mobilní zobrazení"; $a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "%s: Aktualizuji author-id a owner-id v tabulce položek a vláken."; $a->strings["Update %s failed. See error logs."] = "Aktualizace %s selhala. Zkontrolujte protokol chyb."; +$a->strings["toggle mobile"] = "přepínat mobilní zobrazení"; From 717ca0b7ebd935b4aedbbf00f91df387a7687e01 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 2 Jul 2018 05:41:55 +0000 Subject: [PATCH 20/25] Use already fetched data for magiclink --- include/conversation.php | 28 +++++++++++++++++++++------- src/Model/Contact.php | 17 +++++++++++++++-- src/Model/Item.php | 8 ++++---- src/Model/Term.php | 4 +++- src/Object/Post.php | 18 +++++++++++++----- 5 files changed, 56 insertions(+), 19 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 1112447d5..438019fd0 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -262,14 +262,20 @@ function localize_item(&$item) } if (activity_match($item['verb'], ACTIVITY_TAG)) { - $fields = ['author-link', 'author-name', 'verb', 'object-type', 'resource-id', 'body', 'plink']; + $fields = ['author-id', 'author-link', 'author-name', 'author-network', + 'verb', 'object-type', 'resource-id', 'body', 'plink']; $obj = Item::selectFirst($fields, ['uri' => $item['parent-uri']]); if (!DBM::is_result($obj)) { return; } - $author = '[url=' . Contact::magicLinkById($item['author-id']) . ']' . $item['author-name'] . '[/url]'; - $objauthor = '[url=' . Contact::magicLinkById($obj['author-id']) . ']' . $obj['author-name'] . '[/url]'; + $author_arr = ['uid' => 0, 'id' => $item['author-id'], + 'network' => $item['author-network'], 'url' => $item['author-link']]; + $author = '[url=' . Contact::magicLinkByContact($author_arr) . ']' . $item['author-name'] . '[/url]'; + + $author_arr = ['uid' => 0, 'id' => $obj['author-id'], + 'network' => $obj['author-network'], 'url' => $obj['author-link']]; + $objauthor = '[url=' . Contact::magicLinkByContact($author_arr) . ']' . $obj['author-name'] . '[/url]'; switch ($obj['verb']) { case ACTIVITY_POST: @@ -341,7 +347,9 @@ function localize_item(&$item) } // add sparkle links to appropriate permalinks - $item['plink'] = Contact::magicLinkById($item['author-id'], $item['plink']); + $author = ['uid' => 0, 'id' => $item['author-id'], + 'network' => $item['author-network'], 'url' => $item['author-link']]; + $item['plink'] = Contact::magicLinkbyContact($author, $item['plink']); } /** @@ -569,7 +577,9 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order = $tags = \Friendica\Model\Term::populateTagsFromItem($item); - $profile_link = Contact::magicLinkbyId($item['author-id']); + $author = ['uid' => 0, 'id' => $item['author-id'], + 'network' => $item['author-network'], 'url' => $item['author-link']]; + $profile_link = Contact::magicLinkbyContact($author); if (strpos($profile_link, 'redir/') === 0) { $sparkle = ' sparkle'; @@ -803,7 +813,9 @@ function item_photo_menu($item) { $sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;'; } - $profile_link = Contact::magicLinkById($item['author-id']); + $author = ['uid' => 0, 'id' => $item['author-id'], + 'network' => $item['author-network'], 'url' => $item['author-link']]; + $profile_link = Contact::magicLinkbyContact($author); $sparkle = (strpos($profile_link, 'redir/') === 0); $cid = 0; @@ -908,7 +920,9 @@ function builtin_activity_puller($item, &$conv_responses) { } if (activity_match($item['verb'], $verb) && ($item['id'] != $item['parent'])) { - $url = Contact::MagicLinkbyId($item['author-id']); + $author = ['uid' => 0, 'id' => $item['author-id'], + 'network' => $item['author-network'], 'url' => $item['author-link']]; + $url = Contact::magicLinkbyContact($author); if (strpos($url, 'redir/') === 0) { $sparkle = ' class="sparkle" '; } diff --git a/src/Model/Contact.php b/src/Model/Contact.php index fe9869c6f..2fd451d6a 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1732,8 +1732,21 @@ class Contact extends BaseObject */ public static function magicLinkbyId($cid, $url = '') { - $contact = dba::selectFirst('contact', ['network', 'url', 'uid'], ['id' => $cid]); + $contact = dba::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]); + return self::magicLinkbyContact($contact, $url); + } + + /** + * @brief Returns a magic link to authenticate remote visitors + * + * @param array $contact The contact array with "uid", "network" and "url" + * @param integer $url An url that we will be redirected to after the authentication + * + * @return string with "redir" link + */ + public static function magicLinkbyContact($contact, $url = '') + { if ($contact['network'] != NETWORK_DFRN) { return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url']; } @@ -1747,7 +1760,7 @@ class Contact extends BaseObject return self::magicLink($contact['url'], $url); } - $redirect = 'redir/' . $cid; + $redirect = 'redir/' . $contact['id']; if ($url != '') { $redirect .= '?url=' . $url; diff --git a/src/Model/Item.php b/src/Model/Item.php index 57090da4c..9fbe973ee 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -40,8 +40,8 @@ class Item extends BaseObject 'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach', 'language', 'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id', - 'author-id', 'author-link', 'author-name', 'author-avatar', - 'owner-id', 'owner-link', 'owner-name', 'owner-avatar', + 'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network', + 'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network', 'contact-id', 'contact-link', 'contact-name', 'contact-avatar', 'writable', 'self', 'cid', 'alias', 'event-id', 'event-created', 'event-edited', 'event-start', 'event-finish', @@ -422,10 +422,10 @@ class Item extends BaseObject $fields['item-content'] = array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST); $fields['author'] = ['url' => 'author-link', 'name' => 'author-name', - 'thumb' => 'author-avatar', 'nick' => 'author-nick']; + 'thumb' => 'author-avatar', 'nick' => 'author-nick', 'network' => 'author-network']; $fields['owner'] = ['url' => 'owner-link', 'name' => 'owner-name', - 'thumb' => 'owner-avatar', 'nick' => 'owner-nick']; + 'thumb' => 'owner-avatar', 'nick' => 'owner-nick', 'network' => 'owner-network']; $fields['contact'] = ['url' => 'contact-link', 'name' => 'contact-name', 'thumb' => 'contact-avatar', 'writable', 'self', 'id' => 'cid', 'alias', 'uid' => 'contact-uid', diff --git a/src/Model/Term.php b/src/Model/Term.php index cca470801..e9918c23b 100644 --- a/src/Model/Term.php +++ b/src/Model/Term.php @@ -237,7 +237,9 @@ class Term $orig_tag = $tag["url"]; - $tag["url"] = Contact::magicLinkById($item['author-id'], $tag['url']); + $author = ['uid' => 0, 'id' => $item['author-id'], + 'network' => $item['author-network'], 'url' => $item['author-link']]; + $tag["url"] = Contact::magicLinkByContact($author, $tag['url']); if ($tag["type"] == TERM_HASHTAG) { if ($orig_tag != $tag["url"]) { diff --git a/src/Object/Post.php b/src/Object/Post.php index 594b18af8..7a65c8afc 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -70,8 +70,10 @@ class Post extends BaseObject } $this->writable = $this->getDataValue('writable') || $this->getDataValue('self'); - $this->redirect_url = Contact::magicLinkById($this->getDataValue('cid')); - + $author = ['uid' => 0, 'id' => $this->getDataValue('author-id'), + 'network' => $this->getDataValue('author-network'), + 'url' => $this->getDataValue('author-link')]; + $this->redirect_url = Contact::magicLinkbyContact($author); if (!$this->isToplevel()) { $this->threaded = true; } @@ -203,7 +205,9 @@ class Post extends BaseObject $profile_name = $item['author-link']; } - $profile_link = Contact::magicLinkById($item['author-id']); + $author = ['uid' => 0, 'id' => $item['author-id'], + 'network' => $item['author-network'], 'url' => $item['author-link']]; + $profile_link = Contact::magicLinkbyContact($author); if (strpos($profile_link, 'redir/') === 0) { $sparkle = ' sparkle'; } @@ -839,7 +843,7 @@ class Post extends BaseObject $alias_linkmatch = (($this->getDataValue('alias')) && link_compare($this->getDataValue('alias'), $this->getDataValue('author-link'))); $owner_namematch = (($this->getDataValue('owner-name')) && $this->getDataValue('owner-name') == $this->getDataValue('author-name')); - if ((!$owner_linkmatch) && (!$alias_linkmatch) && (!$owner_namematch)) { + if (!$owner_linkmatch && !$alias_linkmatch && !$owner_namematch) { // The author url doesn't match the owner (typically the contact) // and also doesn't match the contact alias. // The name match is a hack to catch several weird cases where URLs are @@ -852,7 +856,11 @@ class Post extends BaseObject $this->owner_photo = $this->getDataValue('owner-avatar'); $this->owner_name = $this->getDataValue('owner-name'); $this->wall_to_wall = true; - $this->owner_url = Contact::magicLinkById($this->getDataValue('owner-id')); + + $owner = ['uid' => 0, 'id' => $this->getDataValue('owner-id'), + 'network' => $this->getDataValue('owner-network'), + 'url' => $this->getDataValue('ownerr-link')]; + $this->owner_url = Contact::magicLinkbyContact($owner); } } } From 4b3ae6a862f3e5a554dd92da3ccd6ca0b59f36ac Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 2 Jul 2018 18:22:27 +0000 Subject: [PATCH 21/25] Only use query conditions in user mode --- src/Model/Item.php | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 9fbe973ee..04374088d 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -279,7 +279,7 @@ class Item extends BaseObject $param_string = self::addTablesToFields(dba::buildParameter($params), $fields); - $table = "`item` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, false); + $table = "`item` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, false, $usermode); $sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string; @@ -394,7 +394,7 @@ class Item extends BaseObject $param_string = self::addTablesToFields($param_string, $threadfields); $param_string = self::addTablesToFields($param_string, $fields); - $table = "`thread` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, true); + $table = "`thread` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, true, $usermode); $sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string; @@ -473,7 +473,7 @@ class Item extends BaseObject * * @return string The SQL joins for the "select" functions */ - private static function constructJoins($uid, $sql_commands, $thread_mode) + private static function constructJoins($uid, $sql_commands, $thread_mode, $user_mode) { if ($thread_mode) { $master_table = "`thread`"; @@ -485,14 +485,26 @@ class Item extends BaseObject $joins = ''; } - $joins .= sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = $master_table.`contact-id` - AND NOT `contact`.`blocked` - AND ((NOT `contact`.`readonly` AND NOT `contact`.`pending` AND (`contact`.`rel` IN (%s, %s))) - OR `contact`.`self` OR (`item`.`id` != `item`.`parent`) OR `contact`.`uid` = 0) - STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id` AND NOT `author`.`blocked` - STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id` AND NOT `owner`.`blocked` - LEFT JOIN `user-item` ON `user-item`.`iid` = $master_table_key AND `user-item`.`uid` = %d", - CONTACT_IS_SHARING, CONTACT_IS_FRIEND, intval($uid)); + if ($user_mode) { + $joins .= sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = $master_table.`contact-id` + AND NOT `contact`.`blocked` + AND ((NOT `contact`.`readonly` AND NOT `contact`.`pending` AND (`contact`.`rel` IN (%s, %s))) + OR `contact`.`self` OR (`item`.`id` != `item`.`parent`) OR `contact`.`uid` = 0) + STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id` AND NOT `author`.`blocked` + STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id` AND NOT `owner`.`blocked` + LEFT JOIN `user-item` ON `user-item`.`iid` = $master_table_key AND `user-item`.`uid` = %d", + CONTACT_IS_SHARING, CONTACT_IS_FRIEND, intval($uid)); + } else { + if (strpos($sql_commands, "`contact`.") !== false) { + $joins .= "STRAIGHT_JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`"; + } + if (strpos($sql_commands, "`author`.") !== false) { + $joins .= " STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id`"; + } + if (strpos($sql_commands, "`owner`.") !== false) { + $joins .= " STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id`"; + } + } if (strpos($sql_commands, "`group_member`.") !== false) { $joins .= " STRAIGHT_JOIN `group_member` ON `group_member`.`contact-id` = $master_table.`contact-id`"; From 80f9a45cba06ca3c5563711c0d818770d01ebf38 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 2 Jul 2018 21:15:54 +0000 Subject: [PATCH 22/25] Fix: Twitter reshares hadn't been shown as this --- src/Object/Post.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Object/Post.php b/src/Object/Post.php index 7a65c8afc..b131246fd 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -859,7 +859,7 @@ class Post extends BaseObject $owner = ['uid' => 0, 'id' => $this->getDataValue('owner-id'), 'network' => $this->getDataValue('owner-network'), - 'url' => $this->getDataValue('ownerr-link')]; + 'url' => $this->getDataValue('owner-link')]; $this->owner_url = Contact::magicLinkbyContact($owner); } } From 9a9541809be275134429287e1e7262c29f4565a2 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 3 Jul 2018 04:58:34 +0000 Subject: [PATCH 23/25] Fix: Likes from OStatus got the gravity of comments --- src/Protocol/OStatus.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 4538d36df..5a30bfd2c 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -341,7 +341,7 @@ class OStatus $header["type"] = "remote"; $header["wall"] = 0; $header["origin"] = 0; - $header["gravity"] = GRAVITY_PARENT; + $header["gravity"] = GRAVITY_COMMENT; $first_child = $doc->firstChild->tagName; @@ -683,9 +683,9 @@ class OStatus } $item["type"] = 'remote-comment'; - $item["gravity"] = GRAVITY_COMMENT; } else { $item["parent-uri"] = $item["uri"]; + $item["gravity"] = GRAVITY_PARENT; } if (($item['author-link'] != '') && !empty($item['protocol'])) { From f60da34357b93a0dfa18bd49856f56eb9bdfd160 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 4 Jul 2018 19:07:53 +0000 Subject: [PATCH 24/25] Fix unliking liked --- src/Model/Item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 04374088d..ac53bb022 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -2695,7 +2695,7 @@ class Item extends BaseObject } $base_condition = ['verb' => $verbs, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY, - 'author-id' => $author_contact['id'], 'uid' => item['uid']]; + 'author-id' => $author_contact['id'], 'uid' => $item['uid']]; $condition = array_merge($base_condition, ['parent' => $item_id]); $like_item = self::selectFirst(['id', 'guid', 'verb'], $condition); From 176ab7130f4b85fff37fdfea1c35651177a34f60 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 4 Jul 2018 19:53:02 +0000 Subject: [PATCH 25/25] Fixes issue 5322 - events now again are having a plink --- src/Model/Event.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/Model/Event.php b/src/Model/Event.php index 9b258960e..49d759585 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -268,9 +268,9 @@ class Event extends BaseObject if ($event['id']) { // has the event actually changed? $existing_event = dba::selectFirst('event', ['edited'], ['id' => $event['id'], 'uid' => $event['uid']]); - if ((! DBM::is_result($existing_event)) || ($existing_event['edited'] === $event['edited'])) { + if (!DBM::is_result($existing_event) || ($existing_event['edited'] === $event['edited'])) { - $item = dba::selectFirst('item', [], ['event-id' => $event['id'], 'uid' => $event['uid']]); + $item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]); return DBM::is_result($item) ? $item['id'] : 0; } @@ -289,7 +289,7 @@ class Event extends BaseObject dba::update('event', $updated_fields, ['id' => $event['id'], 'uid' => $event['uid']]); - $item = dba::selectFirst('item', ['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]); + $item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]); if (DBM::is_result($item)) { $object = '' . xmlify(ACTIVITY_OBJ_EVENT) . '' . xmlify($event['uri']) . ''; $object .= '' . xmlify(self::getBBCode($event)) . ''; @@ -464,8 +464,7 @@ class Event extends BaseObject } // Query for the event by event id - $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`, - `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` + $r = q("SELECT `event`.*, `item`.`id` AS `itemid` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid` WHERE `event`.`uid` = %d AND `event`.`id` = %d $sql_extra", intval($owner_uid), @@ -505,8 +504,7 @@ class Event extends BaseObject // Query for the event by date. // @todo Slow query (518 seconds to run), to be optimzed - $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`, - `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` + $r = q("SELECT `event`.*, `item`.`id` AS `itemid` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid` WHERE `event`.`uid` = %d AND event.ignore = %d AND ((`adjust` = 0 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s') @@ -542,6 +540,11 @@ class Event extends BaseObject $last_date = ''; $fmt = L10n::t('l, F j'); foreach ($event_result as $event) { + $item = Item::selectFirst(['plink', 'author-name', 'author-avatar', 'author-link'], ['id' => $event['itemid']]); + if (DBM::is_result($item)) { + $event = array_merge($event, $item); + } + $start = $event['adjust'] ? DateTimeFormat::local($event['start'], 'c') : DateTimeFormat::utc($event['start'], 'c'); $j = $event['adjust'] ? DateTimeFormat::local($event['start'], 'j') : DateTimeFormat::utc($event['start'], 'j'); $day = $event['adjust'] ? DateTimeFormat::local($event['start'], $fmt) : DateTimeFormat::utc($event['start'], $fmt);