From cbf4544887c7f496f2b2312727fe7bcb64a6d6c8 Mon Sep 17 00:00:00 2001 From: Alexander Kampmann Date: Thu, 5 Apr 2012 13:27:09 +0200 Subject: [PATCH 01/18] added index to config and pconfig table changed config.php to use REPLACE instead of INSERT, this removes one db hit. --- boot.php | 2 +- database.sql | 14 +- include/config.php | 332 +++++++++++++++++++++++---------------------- update.php | 16 ++- 4 files changed, 191 insertions(+), 173 deletions(-) mode change 100755 => 100644 boot.php mode change 100755 => 100644 database.sql mode change 100755 => 100644 include/config.php mode change 100755 => 100644 update.php diff --git a/boot.php b/boot.php old mode 100755 new mode 100644 index 04e16e64dc..56548160da --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '2.3.1288' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1133 ); +define ( 'DB_UPDATE_VERSION', 1134 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/database.sql b/database.sql old mode 100755 new mode 100644 index 327b482c06..a039746e8e --- a/database.sql +++ b/database.sql @@ -34,10 +34,11 @@ CREATE TABLE IF NOT EXISTS `challenge` ( CREATE TABLE IF NOT EXISTS `config` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `cat` char(255) NOT NULL, - `k` char(255) NOT NULL, + `cat` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL, + `k` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL, `v` text NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + UNIQUE KEY `access`(`cat`,`k`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; @@ -536,9 +537,10 @@ INDEX ( `batch` ) CREATE TABLE IF NOT EXISTS `pconfig` ( `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY , `uid` INT NOT NULL DEFAULT '0', -`cat` CHAR( 255 ) NOT NULL , -`k` CHAR( 255 ) NOT NULL , -`v` MEDIUMTEXT NOT NULL +`cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL , +`k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL , +`v` MEDIUMTEXT NOT NULL, +UNIQUE KEY `access`(`cat`, `k`) ) ENGINE = MyISAM DEFAULT CHARSET=utf8; diff --git a/include/config.php b/include/config.php old mode 100755 new mode 100644 index 2cddda0b8d..f93cb52c95 --- a/include/config.php +++ b/include/config.php @@ -1,222 +1,224 @@ config[$k] = $rr['v']; - } else { - $a->config[$family][$k] = $rr['v']; + function load_config($family) { + global $a; + $r = q("SELECT * FROM `config` WHERE `cat` = '%s'", + dbesc($family) + ); + if(count($r)) { + foreach($r as $rr) { + $k = $rr['k']; + if ($rr['cat'] === 'config') { + $a->config[$k] = $rr['v']; + } else { + $a->config[$family][$k] = $rr['v']; + } } } } -}} - -// get a particular config variable given the family name -// and key. Returns false if not set. -// $instore is only used by the set_config function -// to determine if the key already exists in the DB -// If a key is found in the DB but doesn't exist in -// local config cache, pull it into the cache so we don't have -// to hit the DB again for this item. +} +/** + * get a particular config variable given the family name + * and key. Returns false if not set. + * + * If a key is found in the DB but doesn't exist in + * local config cache, pull it into the cache so we don't have + *to hit the DB again for this item. + */ if(! function_exists('get_config')) { -function get_config($family, $key, $instore = false) { + function get_config($family, $key) { + + global $a; - global $a; - if(! $instore) { if(isset($a->config[$family][$key])) { if($a->config[$family][$key] === '!!') { return false; } return $a->config[$family][$key]; } - } - $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", - dbesc($family), - dbesc($key) - ); - if(count($ret)) { - // manage array value - $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); - $a->config[$family][$key] = $val; - return $val; - } - else { - $a->config[$family][$key] = '!!'; - } - return false; -}} - -// Store a config value ($value) in the category ($family) -// under the key ($key) -// Return the value, or false if the database update failed - -if(! function_exists('set_config')) { -function set_config($family,$key,$value) { - global $a; - - // manage array value - $dbvalue = (is_array($value)?serialize($value):$value); - - if(get_config($family,$key,true) === false) { - $a->config[$family][$key] = $value; - $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ", - dbesc($family), - dbesc($key), - dbesc($dbvalue) + $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", + dbesc($family), + dbesc($key) ); - if($ret) - return $value; - return $ret; + if(count($ret)) { + // manage array value + $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); + $a->config[$family][$key] = $val; + return $val; + } + else { + $a->config[$family][$key] = '!!'; + } + return false; } - - $ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", - dbesc($dbvalue), - dbesc($family), - dbesc($key) - ); +} - $a->config[$family][$key] = $value; +/** + * Store a config value ($value) in the category ($family) + * under the key ($key) + * + * Return the value, or false if the database update failed + */ +if(! function_exists('set_config')) { + function set_config($family,$key,$value) { + global $a; - if($ret) - return $value; - return $ret; -}} + // manage array value + $dbvalue = (is_array($value)?serialize($value):$value); + + $a->config[$family][$key] = $value; + $ret = q("REPLACE INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ", + dbesc($family), + dbesc($key), + dbesc($dbvalue) + ); + if($ret) { + return $value; + } + return $ret; + + } +} if(! function_exists('load_pconfig')) { -function load_pconfig($uid,$family) { - global $a; - $r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d", - dbesc($family), - intval($uid) - ); - if(count($r)) { - foreach($r as $rr) { - $k = $rr['k']; - $a->config[$uid][$family][$k] = $rr['v']; + function load_pconfig($uid,$family) { + global $a; + $r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d", + dbesc($family), + intval($uid) + ); + if(count($r)) { + foreach($r as $rr) { + $k = $rr['k']; + $a->config[$uid][$family][$k] = $rr['v']; + } } } -}} - +} +/** + * get a particular user-specific config variable given the family name, + * the user id and key. Returns false if not set. + * + * If a key is found in the DB but doesn't exist in + * local config cache, pull it into the cache so we don't have + * to hit the DB again for this item. + */ if(! function_exists('get_pconfig')) { -function get_pconfig($uid,$family, $key, $instore = false) { + function get_pconfig($uid,$family, $key) { + + global $a; - global $a; - if(! $instore) { if(isset($a->config[$uid][$family][$key])) { if($a->config[$uid][$family][$key] === '!!') { return false; } return $a->config[$uid][$family][$key]; } - } - - $ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", - intval($uid), - dbesc($family), - dbesc($key) - ); - - if(count($ret)) { - $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); - $a->config[$uid][$family][$key] = $val; - return $val; - } - else { - $a->config[$uid][$family][$key] = '!!'; - } - return false; -}} - -if(! function_exists('del_config')) { -function del_config($family,$key) { - - global $a; - if(x($a->config[$family],$key)) - unset($a->config[$family][$key]); - $ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", - dbesc($family), - dbesc($key) - ); - return $ret; -}} - -// Same as above functions except these are for personal config storage and take an -// additional $uid argument. - -if(! function_exists('set_pconfig')) { -function set_pconfig($uid,$family,$key,$value) { - - global $a; - - // manage array value - $dbvalue = (is_array($value)?serialize($value):$value); - - if(get_pconfig($uid,$family,$key,true) === false) { - $a->config[$uid][$family][$key] = $value; - $ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ", - intval($uid), - dbesc($family), - dbesc($key), - dbesc($dbvalue) + $ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", + intval($uid), + dbesc($family), + dbesc($key) + ); + + if(count($ret)) { + $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); + $a->config[$uid][$family][$key] = $val; + return $val; + } + else { + $a->config[$uid][$family][$key] = '!!'; + } + return false; + } +} + +/** + * Delete a value from config. This function + * deletes both: db value and cache entry. + */ +if(! function_exists('del_config')) { + function del_config($family,$key) { + + global $a; + if(x($a->config[$family],$key)) + unset($a->config[$family][$key]); + $ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", + dbesc($family), + dbesc($key) ); - if($ret) - return $value; return $ret; } - $ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", - dbesc($dbvalue), - intval($uid), - dbesc($family), - dbesc($key) - ); +} - $a->config[$uid][$family][$key] = $value; - if($ret) - return $value; - return $ret; -}} +/** + * Store a user-specific config value ($value) for user $uid in the category ($family) + * under the key ($key). + * + * Return the value, or false if the database update failed + */ +if(! function_exists('set_pconfig')) { + function set_pconfig($uid,$family,$key,$value) { + + global $a; + + // manage array value + $dbvalue = (is_array($value)?serialize($value):$value); + + + $a->config[$uid][$family][$key] = $value; + $ret = q("REPLACE INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ", + intval($uid), + dbesc($family), + dbesc($key), + dbesc($dbvalue) + ); + if($ret) { + return $value; + } + return $ret; + + } +} if(! function_exists('del_pconfig')) { -function del_pconfig($uid,$family,$key) { + function del_pconfig($uid,$family,$key) { - global $a; - if(x($a->config[$uid][$family],$key)) - unset($a->config[$uid][$family][$key]); - $ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", - intval($uid), - dbesc($family), - dbesc($key) - ); - return $ret; -}} + global $a; + if(x($a->config[$uid][$family],$key)) + unset($a->config[$uid][$family][$key]); + $ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", + intval($uid), + dbesc($family), + dbesc($key) + ); + return $ret; + } +} diff --git a/update.php b/update.php old mode 100755 new mode 100644 index a69742a949..adb96b8319 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ Date: Thu, 5 Apr 2012 14:37:30 -0700 Subject: [PATCH 02/18] rev update --- boot.php | 2 +- util/messages.po | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/boot.php b/boot.php index c0aa9ba82a..189eb923aa 100755 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1302' ); +define ( 'FRIENDICA_VERSION', '2.3.1303' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1134 ); diff --git a/util/messages.po b/util/messages.po index 60c71f7fef..6f0560965e 100755 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1302\n" +"Project-Id-Version: 2.3.1303\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-04 15:51-0700\n" +"POT-Creation-Date: 2012-04-05 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -402,7 +402,7 @@ msgstr "" #: ../../view/theme/diabook-blue/theme.php:82 #: ../../view/theme/diabook/theme.php:86 #: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294 -#: ../../include/diaspora.php:1650 ../../include/conversation.php:53 +#: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" msgstr "" @@ -1010,7 +1010,7 @@ msgid "This is required for message delivery to work." msgstr "" #: ../../mod/install.php:343 -msgid "PHP \"register_argc_argv\"" +msgid "PHP register_argc_argv" msgstr "" #: ../../mod/install.php:364 @@ -2262,7 +2262,7 @@ msgstr "" msgid "Personal Notes" msgstr "" -#: ../../mod/notes.php:63 ../../mod/filer.php:29 +#: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../addon/facebook/facebook.php:673 ../../include/text.php:649 msgid "Save" msgstr "" @@ -2701,7 +2701,7 @@ msgstr "" #: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90 #: ../../view/theme/diabook-aerith/theme.php:77 #: ../../view/theme/diabook-aerith/theme.php:86 -#: ../../include/diaspora.php:1650 ../../include/conversation.php:48 +#: ../../include/diaspora.php:1654 ../../include/conversation.php:48 #: ../../include/conversation.php:57 ../../include/conversation.php:121 #: ../../include/conversation.php:130 msgid "status" @@ -2713,7 +2713,7 @@ msgstr "" #: ../../view/theme/diabook-blue/theme.php:91 #: ../../view/theme/diabook/theme.php:95 #: ../../view/theme/diabook-aerith/theme.php:91 -#: ../../include/diaspora.php:1666 ../../include/conversation.php:65 +#: ../../include/diaspora.php:1670 ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" @@ -3785,11 +3785,11 @@ msgstr "" msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:28 ../../include/conversation.php:918 +#: ../../mod/filer.php:29 ../../include/conversation.php:918 msgid "Save to Folder:" msgstr "" -#: ../../mod/filer.php:28 +#: ../../mod/filer.php:29 msgid "- select -" msgstr "" @@ -3993,7 +3993,7 @@ msgstr "" msgid "Unable to set contact photo." msgstr "" -#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:503 +#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507 #: ../../include/conversation.php:101 #, php-format msgid "%1$s is now friends with %2$s" @@ -5838,15 +5838,15 @@ msgstr "" msgid "Item filed" msgstr "" -#: ../../include/diaspora.php:578 +#: ../../include/diaspora.php:582 msgid "Sharing notification from Diaspora network" msgstr "" -#: ../../include/diaspora.php:1965 +#: ../../include/diaspora.php:1969 msgid "Attachments:" msgstr "" -#: ../../include/diaspora.php:2148 +#: ../../include/diaspora.php:2152 #, php-format msgid "[Relayed] Comment authored by %s from network %s" msgstr "" From 221726392e6ec836623f83320c3ff9afdc876045 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Apr 2012 18:44:36 -0700 Subject: [PATCH 03/18] pass autoname(0) test --- include/text.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/text.php b/include/text.php index 5456b5ad3e..29c781030d 100644 --- a/include/text.php +++ b/include/text.php @@ -80,6 +80,9 @@ function escape_tags($string) { if(! function_exists('autoname')) { function autoname($len) { + if(! $len) + return ''; + $vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'); if(mt_rand(0,5) == 4) $vowels[] = 'y'; From 6bc7e6e09f2f21c5e75be3ef4dc70a6e84a7df09 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Apr 2012 21:42:47 -0700 Subject: [PATCH 04/18] add network_tabs hook --- mod/network.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mod/network.php b/mod/network.php index d27945a860..b12bd16dab 100755 --- a/mod/network.php +++ b/mod/network.php @@ -206,8 +206,12 @@ function network_content(&$a, $update = 0) { ); - $tpl = get_markup_template('common_tabs.tpl'); - $o .= replace_macros($tpl, array('$tabs'=>$tabs)); + + $arr = array('tabs' => $tabs); + call_hooks('network_tabs', $arr); + + $o .= replace_macros(get_markup_template('common_tabs.tpl'), array('$tabs'=> $arr['tabs'])); + // --- end item filter tabs From afd2bf031eff688ae53e51f9199d025ca1935abe Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 6 Apr 2012 09:37:50 +0200 Subject: [PATCH 05/18] update to the German strings --- view/de/messages.po | 2874 ++++++++++++++++++++++++++----------------- view/de/strings.php | 196 ++- 2 files changed, 1852 insertions(+), 1218 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index 6aab0bf1b3..0e4cb2ea78 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-03-06 15:09-0800\n" -"PO-Revision-Date: 2012-03-07 20:47+0000\n" -"Last-Translator: greeneyedred \n" +"POT-Creation-Date: 2012-04-04 15:51-0700\n" +"PO-Revision-Date: 2012-04-06 07:35+0000\n" +"Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,23 +45,26 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43 #: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:129 ../../mod/photos.php:865 +#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866 #: ../../mod/editpost.php:10 ../../mod/install.php:171 -#: ../../mod/notifications.php:62 ../../mod/contacts.php:125 -#: ../../mod/settings.php:49 ../../mod/settings.php:411 -#: ../../mod/settings.php:416 ../../mod/manage.php:86 ../../mod/network.php:6 -#: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19 -#: ../../mod/viewcontacts.php:22 ../../mod/register.php:36 -#: ../../mod/regmod.php:111 ../../mod/item.php:124 ../../mod/item.php:140 -#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:137 -#: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159 -#: ../../mod/message.php:9 ../../mod/message.php:46 ../../mod/allfriends.php:9 +#: ../../mod/notifications.php:66 ../../mod/contacts.php:125 +#: ../../mod/settings.php:62 ../../mod/settings.php:473 +#: ../../mod/settings.php:478 ../../mod/manage.php:86 ../../mod/network.php:6 +#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 +#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 +#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 +#: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 +#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124 +#: ../../mod/item.php:140 ../../mod/profile_photo.php:19 +#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150 +#: ../../mod/profile_photo.php:163 ../../mod/message.php:38 +#: ../../mod/message.php:91 ../../mod/allfriends.php:9 #: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9 -#: ../../mod/display.php:133 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:229 ../../mod/delegate.php:6 +#: ../../mod/display.php:138 ../../mod/profiles.php:7 +#: ../../mod/profiles.php:232 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 -#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:332 -#: ../../include/items.php:3030 ../../index.php:288 +#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:456 +#: ../../include/items.php:3118 ../../index.php:294 msgid "Permission denied." msgstr "Zugriff verweigert." @@ -90,8 +93,8 @@ msgstr "Bitte nutze den Zurück-Button deines Browsers jetzt, w msgid "Return to contact editor" msgstr "Zurück zum Kontakteditor" -#: ../../mod/crepair.php:148 ../../mod/settings.php:462 -#: ../../mod/settings.php:488 ../../mod/admin.php:484 ../../mod/admin.php:493 +#: ../../mod/crepair.php:148 ../../mod/settings.php:531 +#: ../../mod/settings.php:558 ../../mod/admin.php:528 ../../mod/admin.php:537 msgid "Name" msgstr "Name" @@ -128,38 +131,38 @@ msgid "New photo from this URL" msgstr "Neues Foto von dieser URL" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958 -#: ../../mod/photos.php:1182 ../../mod/photos.php:1222 -#: ../../mod/photos.php:1262 ../../mod/photos.php:1293 +#: ../../mod/events.php:400 ../../mod/photos.php:901 ../../mod/photos.php:959 +#: ../../mod/photos.php:1194 ../../mod/photos.php:1234 +#: ../../mod/photos.php:1274 ../../mod/photos.php:1305 #: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/localtime.php:45 ../../mod/contacts.php:319 -#: ../../mod/settings.php:460 ../../mod/settings.php:603 -#: ../../mod/settings.php:797 ../../mod/manage.php:109 ../../mod/group.php:80 -#: ../../mod/admin.php:313 ../../mod/admin.php:481 ../../mod/admin.php:609 -#: ../../mod/admin.php:776 ../../mod/admin.php:856 ../../mod/profiles.php:375 -#: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:411 -#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:92 -#: ../../addon/nsfw/nsfw.php:57 +#: ../../mod/settings.php:529 ../../mod/settings.php:679 +#: ../../mod/settings.php:741 ../../mod/settings.php:926 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:357 +#: ../../mod/admin.php:525 ../../mod/admin.php:654 ../../mod/admin.php:826 +#: ../../mod/admin.php:906 ../../mod/profiles.php:390 ../../mod/invite.php:119 +#: ../../addon/facebook/facebook.php:547 ../../addon/yourls/yourls.php:76 +#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 #: ../../addon/uhremotestorage/uhremotestorage.php:89 -#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:92 +#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:93 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187 #: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:69 #: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61 #: ../../addon/openstreetmap/openstreetmap.php:70 #: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94 -#: ../../addon/pageheader/pageheader.php:52 -#: ../../addon/statusnet/statusnet.php:273 -#: ../../addon/statusnet/statusnet.php:287 -#: ../../addon/statusnet/statusnet.php:313 -#: ../../addon/statusnet/statusnet.php:320 -#: ../../addon/statusnet/statusnet.php:345 -#: ../../addon/statusnet/statusnet.php:532 ../../addon/tumblr/tumblr.php:90 +#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93 +#: ../../addon/statusnet/statusnet.php:278 +#: ../../addon/statusnet/statusnet.php:292 +#: ../../addon/statusnet/statusnet.php:318 +#: ../../addon/statusnet/statusnet.php:325 +#: ../../addon/statusnet/statusnet.php:353 +#: ../../addon/statusnet/statusnet.php:547 ../../addon/tumblr/tumblr.php:90 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 #: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48 -#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:175 -#: ../../addon/twitter/twitter.php:201 ../../addon/twitter/twitter.php:355 +#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 +#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:369 #: ../../addon/posterous/posterous.php:90 -#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:552 +#: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555 msgid "Submit" msgstr "Senden" @@ -167,15 +170,15 @@ msgstr "Senden" msgid "Help:" msgstr "Hilfe:" -#: ../../mod/help.php:34 ../../include/nav.php:82 +#: ../../mod/help.php:34 ../../include/nav.php:86 msgid "Help" msgstr "Hilfe" -#: ../../mod/help.php:38 ../../index.php:221 +#: ../../mod/help.php:38 ../../index.php:225 msgid "Not Found" msgstr "Nicht gefunden" -#: ../../mod/help.php:41 ../../index.php:224 +#: ../../mod/help.php:41 ../../index.php:228 msgid "Page not found." msgstr "Seite nicht gefunden." @@ -213,11 +216,15 @@ msgstr "l, F j" msgid "Edit event" msgstr "Veranstaltung bearbeiten" -#: ../../mod/events.php:272 ../../include/text.php:982 +#: ../../mod/events.php:272 ../../include/text.php:1050 msgid "link to source" msgstr "Link zum Originalbeitrag" -#: ../../mod/events.php:296 ../../include/nav.php:50 ../../boot.php:1349 +#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:240 +#: ../../view/theme/diabook-blue/theme.php:240 +#: ../../view/theme/diabook/theme.php:248 +#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:52 +#: ../../boot.php:1421 msgid "Events" msgstr "Veranstaltungen" @@ -267,7 +274,7 @@ msgid "Description:" msgstr "Beschreibung" #: ../../mod/events.php:395 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:260 ../../boot.php:980 +#: ../../include/bb2diaspora.php:260 ../../boot.php:1042 msgid "Location:" msgstr "Ort:" @@ -276,8 +283,8 @@ msgid "Share this event" msgstr "Veranstaltung teilen" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:686 ../../mod/settings.php:461 -#: ../../mod/settings.php:487 ../../addon/js_upload/js_upload.php:45 +#: ../../mod/dfrn_request.php:707 ../../mod/settings.php:530 +#: ../../mod/settings.php:557 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Abbrechen" @@ -297,7 +304,7 @@ msgstr "Wähle ein Tag zum Entfernen aus: " msgid "Remove" msgstr "Entfernen" -#: ../../mod/dfrn_poll.php:91 ../../mod/dfrn_poll.php:517 +#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:520 #, php-format msgid "%s welcomes %s" msgstr "%s heißt %s herzlich willkommen" @@ -320,246 +327,258 @@ msgid "" " and/or create new posts for you?" msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?" -#: ../../mod/api.php:105 ../../mod/dfrn_request.php:676 -#: ../../mod/settings.php:692 ../../mod/settings.php:698 -#: ../../mod/settings.php:706 ../../mod/settings.php:710 -#: ../../mod/settings.php:715 ../../mod/settings.php:721 -#: ../../mod/settings.php:727 ../../mod/settings.php:787 -#: ../../mod/settings.php:788 ../../mod/settings.php:789 -#: ../../mod/settings.php:790 ../../mod/register.php:524 -#: ../../mod/profiles.php:357 +#: ../../mod/api.php:105 ../../mod/dfrn_request.php:695 +#: ../../mod/settings.php:841 ../../mod/settings.php:847 +#: ../../mod/settings.php:855 ../../mod/settings.php:859 +#: ../../mod/settings.php:864 ../../mod/settings.php:870 +#: ../../mod/settings.php:876 ../../mod/settings.php:882 +#: ../../mod/settings.php:916 ../../mod/settings.php:917 +#: ../../mod/settings.php:918 ../../mod/settings.php:919 +#: ../../mod/register.php:536 ../../mod/profiles.php:369 msgid "Yes" msgstr "Ja" -#: ../../mod/api.php:106 ../../mod/dfrn_request.php:677 -#: ../../mod/settings.php:692 ../../mod/settings.php:698 -#: ../../mod/settings.php:706 ../../mod/settings.php:710 -#: ../../mod/settings.php:715 ../../mod/settings.php:721 -#: ../../mod/settings.php:727 ../../mod/settings.php:787 -#: ../../mod/settings.php:788 ../../mod/settings.php:789 -#: ../../mod/settings.php:790 ../../mod/register.php:525 -#: ../../mod/profiles.php:358 +#: ../../mod/api.php:106 ../../mod/dfrn_request.php:696 +#: ../../mod/settings.php:841 ../../mod/settings.php:847 +#: ../../mod/settings.php:855 ../../mod/settings.php:859 +#: ../../mod/settings.php:864 ../../mod/settings.php:870 +#: ../../mod/settings.php:876 ../../mod/settings.php:882 +#: ../../mod/settings.php:916 ../../mod/settings.php:917 +#: ../../mod/settings.php:918 ../../mod/settings.php:919 +#: ../../mod/register.php:537 ../../mod/profiles.php:370 msgid "No" msgstr "Nein" -#: ../../mod/photos.php:42 +#: ../../mod/photos.php:43 msgid "Photo Albums" msgstr "Fotoalben" -#: ../../mod/photos.php:50 ../../mod/photos.php:150 ../../mod/photos.php:879 -#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1371 -#: ../../mod/photos.php:1383 ../../addon/communityhome/communityhome.php:110 +#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:880 +#: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383 +#: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110 +#: ../../view/theme/diabook-red/theme.php:110 +#: ../../view/theme/diabook-blue/theme.php:110 +#: ../../view/theme/diabook/theme.php:114 +#: ../../view/theme/diabook-aerith/theme.php:110 msgid "Contact Photos" msgstr "Kontaktbilder" -#: ../../mod/photos.php:57 ../../mod/photos.php:975 ../../mod/photos.php:1413 +#: ../../mod/photos.php:58 ../../mod/photos.php:976 ../../mod/photos.php:1425 msgid "Upload New Photos" msgstr "Weitere Fotos hochladen" -#: ../../mod/photos.php:68 ../../mod/settings.php:11 +#: ../../mod/photos.php:69 ../../mod/settings.php:24 msgid "everybody" msgstr "jeder" -#: ../../mod/photos.php:139 +#: ../../mod/photos.php:140 msgid "Contact information unavailable" msgstr "Kontaktinformationen nicht verfügbar" -#: ../../mod/photos.php:150 ../../mod/photos.php:597 ../../mod/photos.php:950 -#: ../../mod/photos.php:965 ../../mod/register.php:327 -#: ../../mod/register.php:334 ../../mod/register.php:341 -#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65 -#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170 -#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255 +#: ../../mod/photos.php:151 ../../mod/photos.php:598 ../../mod/photos.php:951 +#: ../../mod/photos.php:966 ../../mod/register.php:339 +#: ../../mod/register.php:346 ../../mod/register.php:353 +#: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67 +#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 +#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 +#: ../../view/theme/diabook-red/theme.php:111 +#: ../../view/theme/diabook-blue/theme.php:111 +#: ../../view/theme/diabook/theme.php:115 +#: ../../view/theme/diabook-aerith/theme.php:111 msgid "Profile Photos" msgstr "Profilbilder" -#: ../../mod/photos.php:160 +#: ../../mod/photos.php:161 msgid "Album not found." msgstr "Album nicht gefunden." -#: ../../mod/photos.php:178 ../../mod/photos.php:959 +#: ../../mod/photos.php:179 ../../mod/photos.php:960 msgid "Delete Album" msgstr "Album löschen" -#: ../../mod/photos.php:241 ../../mod/photos.php:1183 +#: ../../mod/photos.php:242 ../../mod/photos.php:1195 msgid "Delete Photo" msgstr "Foto löschen" -#: ../../mod/photos.php:528 +#: ../../mod/photos.php:529 msgid "was tagged in a" msgstr "wurde getaggt in einem" -#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/communityhome/communityhome.php:163 ../../include/text.php:1226 -#: ../../include/diaspora.php:1600 ../../include/conversation.php:53 +#: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70 +#: ../../addon/communityhome/communityhome.php:163 +#: ../../view/theme/diabook-red/theme.php:82 +#: ../../view/theme/diabook-blue/theme.php:82 +#: ../../view/theme/diabook/theme.php:86 +#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294 +#: ../../include/diaspora.php:1650 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" msgstr "Foto" -#: ../../mod/photos.php:528 +#: ../../mod/photos.php:529 msgid "by" msgstr "von" -#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:632 ../../addon/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "Die Bildgröße übersteigt das Limit von " -#: ../../mod/photos.php:639 +#: ../../mod/photos.php:640 msgid "Image file is empty." msgstr "Bilddatei ist leer." -#: ../../mod/photos.php:653 ../../mod/profile_photo.php:122 +#: ../../mod/photos.php:654 ../../mod/profile_photo.php:124 #: ../../mod/wall_upload.php:65 msgid "Unable to process image." msgstr "Konnte das Bild nicht bearbeiten." -#: ../../mod/photos.php:673 ../../mod/profile_photo.php:251 +#: ../../mod/photos.php:674 ../../mod/profile_photo.php:257 #: ../../mod/wall_upload.php:84 msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." -#: ../../mod/photos.php:759 ../../mod/community.php:16 -#: ../../mod/dfrn_request.php:625 ../../mod/viewcontacts.php:17 -#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:33 +#: ../../mod/photos.php:760 ../../mod/community.php:16 +#: ../../mod/dfrn_request.php:626 ../../mod/viewcontacts.php:17 +#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "Öffentlicher Zugriff verweigert." -#: ../../mod/photos.php:769 +#: ../../mod/photos.php:770 msgid "No photos selected" msgstr "Keine Bilder ausgewählt" -#: ../../mod/photos.php:846 +#: ../../mod/photos.php:847 msgid "Access to this item is restricted." msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt." -#: ../../mod/photos.php:907 +#: ../../mod/photos.php:908 msgid "Upload Photos" msgstr "Bilder hochladen" -#: ../../mod/photos.php:910 ../../mod/photos.php:954 +#: ../../mod/photos.php:911 ../../mod/photos.php:955 msgid "New album name: " msgstr "Name des neuen Albums: " -#: ../../mod/photos.php:911 +#: ../../mod/photos.php:912 msgid "or existing album name: " msgstr "oder existierender Albumname: " -#: ../../mod/photos.php:912 +#: ../../mod/photos.php:913 msgid "Do not show a status post for this upload" msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" -#: ../../mod/photos.php:914 ../../mod/photos.php:1178 +#: ../../mod/photos.php:915 ../../mod/photos.php:1190 msgid "Permissions" msgstr "Berechtigungen" -#: ../../mod/photos.php:969 +#: ../../mod/photos.php:970 msgid "Edit Album" msgstr "Album bearbeiten" -#: ../../mod/photos.php:984 ../../mod/photos.php:1396 +#: ../../mod/photos.php:985 ../../mod/photos.php:1408 msgid "View Photo" msgstr "Fotos betrachten" -#: ../../mod/photos.php:1019 +#: ../../mod/photos.php:1020 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:1021 +#: ../../mod/photos.php:1022 msgid "Photo not available" msgstr "Foto nicht verfügbar" -#: ../../mod/photos.php:1071 +#: ../../mod/photos.php:1072 msgid "View photo" msgstr "Fotos ansehen" -#: ../../mod/photos.php:1071 +#: ../../mod/photos.php:1072 msgid "Edit photo" msgstr "Foto bearbeiten" -#: ../../mod/photos.php:1072 +#: ../../mod/photos.php:1073 msgid "Use as profile photo" msgstr "Als Profilbild verwenden" -#: ../../mod/photos.php:1078 ../../include/conversation.php:482 +#: ../../mod/photos.php:1079 ../../include/conversation.php:480 msgid "Private Message" msgstr "Private Nachricht" -#: ../../mod/photos.php:1089 +#: ../../mod/photos.php:1101 msgid "View Full Size" msgstr "Betrachte Originalgröße" -#: ../../mod/photos.php:1157 +#: ../../mod/photos.php:1169 msgid "Tags: " msgstr "Tags: " -#: ../../mod/photos.php:1160 +#: ../../mod/photos.php:1172 msgid "[Remove any tag]" msgstr "[Tag entfernen]" -#: ../../mod/photos.php:1171 +#: ../../mod/photos.php:1183 msgid "New album name" msgstr "Name des neuen Albums" -#: ../../mod/photos.php:1174 +#: ../../mod/photos.php:1186 msgid "Caption" msgstr "Bildunterschrift" -#: ../../mod/photos.php:1176 +#: ../../mod/photos.php:1188 msgid "Add a Tag" msgstr "Tag hinzufügen" -#: ../../mod/photos.php:1180 +#: ../../mod/photos.php:1192 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1200 ../../include/conversation.php:529 +#: ../../mod/photos.php:1212 ../../include/conversation.php:529 msgid "I like this (toggle)" msgstr "Ich mag das (toggle)" -#: ../../mod/photos.php:1201 ../../include/conversation.php:530 +#: ../../mod/photos.php:1213 ../../include/conversation.php:530 msgid "I don't like this (toggle)" msgstr "Ich mag das nicht (toggle)" -#: ../../mod/photos.php:1202 ../../include/conversation.php:933 +#: ../../mod/photos.php:1214 ../../include/conversation.php:960 msgid "Share" msgstr "Teilen" -#: ../../mod/photos.php:1203 ../../mod/editpost.php:104 -#: ../../mod/message.php:155 ../../mod/message.php:296 -#: ../../include/conversation.php:348 ../../include/conversation.php:694 -#: ../../include/conversation.php:950 +#: ../../mod/photos.php:1215 ../../mod/editpost.php:104 +#: ../../mod/wallmessage.php:145 ../../mod/message.php:189 +#: ../../mod/message.php:358 ../../include/conversation.php:362 +#: ../../include/conversation.php:702 ../../include/conversation.php:979 msgid "Please wait" msgstr "Bitte warten" -#: ../../mod/photos.php:1219 ../../mod/photos.php:1259 -#: ../../mod/photos.php:1290 ../../include/conversation.php:549 +#: ../../mod/photos.php:1231 ../../mod/photos.php:1271 +#: ../../mod/photos.php:1302 ../../include/conversation.php:552 msgid "This is you" msgstr "Das bist du" -#: ../../mod/photos.php:1221 ../../mod/photos.php:1261 -#: ../../mod/photos.php:1292 ../../include/conversation.php:551 -#: ../../boot.php:447 +#: ../../mod/photos.php:1233 ../../mod/photos.php:1273 +#: ../../mod/photos.php:1304 ../../include/conversation.php:554 +#: ../../boot.php:494 msgid "Comment" msgstr "Kommentar" -#: ../../mod/photos.php:1223 ../../mod/editpost.php:123 -#: ../../include/conversation.php:553 ../../include/conversation.php:968 +#: ../../mod/photos.php:1235 ../../mod/editpost.php:125 +#: ../../include/conversation.php:556 ../../include/conversation.php:997 msgid "Preview" msgstr "Vorschau" -#: ../../mod/photos.php:1320 ../../mod/settings.php:520 -#: ../../mod/settings.php:601 ../../mod/group.php:158 ../../mod/admin.php:488 -#: ../../include/conversation.php:304 ../../include/conversation.php:573 +#: ../../mod/photos.php:1332 ../../mod/settings.php:593 +#: ../../mod/settings.php:677 ../../mod/group.php:168 ../../mod/admin.php:532 +#: ../../include/conversation.php:318 ../../include/conversation.php:576 msgid "Delete" msgstr "Löschen" -#: ../../mod/photos.php:1402 +#: ../../mod/photos.php:1414 msgid "View Album" msgstr "Album betrachten" -#: ../../mod/photos.php:1411 +#: ../../mod/photos.php:1423 msgid "Recent Photos" msgstr "Neueste Fotos" @@ -567,43 +586,47 @@ msgstr "Neueste Fotos" msgid "Not available." msgstr "Nicht verfügbar." -#: ../../mod/community.php:30 ../../include/nav.php:97 +#: ../../mod/community.php:30 ../../addon/pages/pages.php:75 +#: ../../view/theme/diabook-red/theme.php:242 +#: ../../view/theme/diabook-blue/theme.php:242 +#: ../../view/theme/diabook/theme.php:250 +#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:101 msgid "Community" msgstr "Gemeinschaft" -#: ../../mod/community.php:60 ../../mod/search.php:118 +#: ../../mod/community.php:61 ../../mod/search.php:115 msgid "No results." msgstr "Keine Ergebnisse." -#: ../../mod/friendica.php:43 +#: ../../mod/friendica.php:47 msgid "This is Friendica, version" msgstr "Dies ist Friendica, Version" -#: ../../mod/friendica.php:44 +#: ../../mod/friendica.php:48 msgid "running at web location" msgstr "die unter folgender Webadresse zu finden ist" -#: ../../mod/friendica.php:46 +#: ../../mod/friendica.php:50 msgid "" "Please visit Friendica.com to learn " "more about the Friendica project." msgstr "Bitte besuche Friendica.com um mehr über das Friendica Projekt zu erfahren." -#: ../../mod/friendica.php:48 +#: ../../mod/friendica.php:52 msgid "Bug reports and issues: please visit" msgstr "Probleme oder Fehler gefunden? Bitte besuche" -#: ../../mod/friendica.php:49 +#: ../../mod/friendica.php:53 msgid "" "Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - " "dot com" msgstr "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot com" -#: ../../mod/friendica.php:54 -msgid "Installed plugins/addons/apps" +#: ../../mod/friendica.php:58 +msgid "Installed plugins/addons/apps:" msgstr "Installierte Plugins/Erweiterungen/Apps" -#: ../../mod/friendica.php:62 +#: ../../mod/friendica.php:71 msgid "No installed plugins/addons/apps" msgstr "Keine Plugins/Erweiterungen/Apps installiert" @@ -615,28 +638,30 @@ msgstr "Beitrag nicht gefunden" msgid "Edit post" msgstr "Beitrag bearbeiten" -#: ../../mod/editpost.php:80 ../../include/conversation.php:919 +#: ../../mod/editpost.php:80 ../../include/conversation.php:946 msgid "Post to Email" msgstr "An E-Mail senden" -#: ../../mod/editpost.php:95 ../../mod/settings.php:519 -#: ../../include/conversation.php:560 +#: ../../mod/editpost.php:95 ../../mod/settings.php:592 +#: ../../include/conversation.php:563 msgid "Edit" msgstr "Bearbeiten" -#: ../../mod/editpost.php:96 ../../mod/message.php:153 -#: ../../mod/message.php:294 ../../include/conversation.php:934 +#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 +#: ../../mod/message.php:187 ../../mod/message.php:356 +#: ../../include/conversation.php:961 msgid "Upload photo" msgstr "Foto hochladen" -#: ../../mod/editpost.php:97 ../../include/conversation.php:936 +#: ../../mod/editpost.php:97 ../../include/conversation.php:963 msgid "Attach file" msgstr "Datei anhängen" -#: ../../mod/editpost.php:98 ../../mod/message.php:154 -#: ../../mod/message.php:295 ../../include/conversation.php:938 +#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 +#: ../../mod/message.php:188 ../../mod/message.php:357 +#: ../../include/conversation.php:965 msgid "Insert web link" -msgstr "Weblink einfügen" +msgstr "eine Kontaktanfrage" #: ../../mod/editpost.php:99 msgid "Insert YouTube video" @@ -650,201 +675,212 @@ msgstr "Vorbis [.ogg] Video einfügen" msgid "Insert Vorbis [.ogg] audio" msgstr "Vorbis [.ogg] Audio einfügen" -#: ../../mod/editpost.php:102 ../../include/conversation.php:944 +#: ../../mod/editpost.php:102 ../../include/conversation.php:971 msgid "Set your location" msgstr "Deinen Standort festlegen" -#: ../../mod/editpost.php:103 ../../include/conversation.php:946 +#: ../../mod/editpost.php:103 ../../include/conversation.php:973 msgid "Clear browser location" msgstr "Browser-Standort leeren" -#: ../../mod/editpost.php:105 ../../include/conversation.php:951 +#: ../../mod/editpost.php:105 ../../include/conversation.php:980 msgid "Permission settings" msgstr "Berechtigungseinstellungen" -#: ../../mod/editpost.php:113 ../../include/conversation.php:960 +#: ../../mod/editpost.php:113 ../../include/conversation.php:989 msgid "CC: email addresses" msgstr "Cc:-E-Mail-Addressen" -#: ../../mod/editpost.php:114 ../../include/conversation.php:961 +#: ../../mod/editpost.php:114 ../../include/conversation.php:990 msgid "Public post" msgstr "Öffentlicher Beitrag" -#: ../../mod/editpost.php:117 ../../include/conversation.php:949 +#: ../../mod/editpost.php:117 ../../include/conversation.php:976 msgid "Set title" msgstr "Titel setzen" -#: ../../mod/editpost.php:118 ../../include/conversation.php:963 +#: ../../mod/editpost.php:119 ../../include/conversation.php:978 +msgid "Categories (comma-separated list)" +msgstr "Kategorien (mit Komma separierte Liste)" + +#: ../../mod/editpost.php:120 ../../include/conversation.php:992 msgid "Example: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com" -#: ../../mod/dfrn_request.php:92 +#: ../../mod/dfrn_request.php:93 msgid "This introduction has already been accepted." msgstr "Diese Kontaktanfrage wurde bereits akzeptiert." -#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:381 +#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:382 msgid "Profile location is not valid or does not contain profile information." msgstr "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung." -#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:386 +#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:387 msgid "Warning: profile location has no identifiable owner name." msgstr "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden." -#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:388 +#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:389 msgid "Warning: profile location has no profile photo." msgstr "Warnung: Es konnte kein Profilbild bei der angegebenen Profiladresse gefunden werden." -#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:391 +#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:392 #, php-format msgid "%d required parameter was not found at the given location" msgid_plural "%d required parameters were not found at the given location" msgstr[0] "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden" msgstr[1] "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden" -#: ../../mod/dfrn_request.php:167 +#: ../../mod/dfrn_request.php:168 msgid "Introduction complete." msgstr "Kontaktanfrage abgeschlossen." -#: ../../mod/dfrn_request.php:191 +#: ../../mod/dfrn_request.php:192 msgid "Unrecoverable protocol error." msgstr "Nicht behebbarer Protokollfehler." -#: ../../mod/dfrn_request.php:219 +#: ../../mod/dfrn_request.php:220 msgid "Profile unavailable." msgstr "Profil nicht verfügbar." -#: ../../mod/dfrn_request.php:244 +#: ../../mod/dfrn_request.php:245 #, php-format msgid "%s has received too many connection requests today." msgstr "%s hat heute zu viele Freundschaftsanfragen erhalten." -#: ../../mod/dfrn_request.php:245 +#: ../../mod/dfrn_request.php:246 msgid "Spam protection measures have been invoked." msgstr "Maßnahmen zum Spamschutz wurden ergriffen." -#: ../../mod/dfrn_request.php:246 +#: ../../mod/dfrn_request.php:247 msgid "Friends are advised to please try again in 24 hours." msgstr "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen." -#: ../../mod/dfrn_request.php:306 +#: ../../mod/dfrn_request.php:307 msgid "Invalid locator" msgstr "Ungültiger Locator" -#: ../../mod/dfrn_request.php:326 +#: ../../mod/dfrn_request.php:327 msgid "Unable to resolve your name at the provided location." msgstr "Konnte deinen Namen an der angegebenen Stelle nicht finden." -#: ../../mod/dfrn_request.php:339 +#: ../../mod/dfrn_request.php:340 msgid "You have already introduced yourself here." msgstr "Du hast dich hier bereits vorgestellt." -#: ../../mod/dfrn_request.php:343 +#: ../../mod/dfrn_request.php:344 #, php-format msgid "Apparently you are already friends with %s." msgstr "Es scheint so, als ob du bereits mit %s befreundet bist." -#: ../../mod/dfrn_request.php:364 +#: ../../mod/dfrn_request.php:365 msgid "Invalid profile URL." msgstr "Ungültige Profil-URL." -#: ../../mod/dfrn_request.php:370 ../../mod/follow.php:20 +#: ../../mod/dfrn_request.php:371 ../../mod/follow.php:20 msgid "Disallowed profile URL." msgstr "Nicht erlaubte Profil-URL." -#: ../../mod/dfrn_request.php:439 ../../mod/contacts.php:102 +#: ../../mod/dfrn_request.php:440 ../../mod/contacts.php:102 msgid "Failed to update contact record." msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." -#: ../../mod/dfrn_request.php:460 +#: ../../mod/dfrn_request.php:461 msgid "Your introduction has been sent." msgstr "Deine Kontaktanfrage wurde gesendet." -#: ../../mod/dfrn_request.php:513 +#: ../../mod/dfrn_request.php:514 msgid "Please login to confirm introduction." msgstr "Bitte melde dich an, um die Kontaktanfrage zu bestätigen." -#: ../../mod/dfrn_request.php:527 +#: ../../mod/dfrn_request.php:528 msgid "" "Incorrect identity currently logged in. Please login to " "this profile." msgstr "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit diesem Profil an." -#: ../../mod/dfrn_request.php:539 +#: ../../mod/dfrn_request.php:540 #, php-format msgid "Welcome home %s." msgstr "Willkommen zurück %s." -#: ../../mod/dfrn_request.php:540 +#: ../../mod/dfrn_request.php:541 #, php-format msgid "Please confirm your introduction/connection request to %s." msgstr "Bitte bestätige deine Kontaktanfrage bei %s." -#: ../../mod/dfrn_request.php:541 +#: ../../mod/dfrn_request.php:542 msgid "Confirm" msgstr "Bestätigen" -#: ../../mod/dfrn_request.php:582 ../../include/items.php:2566 +#: ../../mod/dfrn_request.php:583 ../../include/items.php:2649 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" -#: ../../mod/dfrn_request.php:666 -#, php-format -msgid "" -"Diaspora members: Please do not use this form. Instead, enter \"%s\" into " -"your Diaspora search bar." -msgstr "Diaspora-User: Bitte nicht dieses Formular benutzen! Gebt statt dessen \"%s\" in der Diaspora-Suchleiste ein." - -#: ../../mod/dfrn_request.php:669 +#: ../../mod/dfrn_request.php:670 msgid "" "Please enter your 'Identity Address' from one of the following supported " -"social networks:" +"communications networks:" msgstr "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:" -#: ../../mod/dfrn_request.php:672 +#: ../../mod/dfrn_request.php:686 +msgid "Connect as an email follower (Coming soon)" +msgstr "Als E-Mail-Kontakt verbinden (In Kürze verfügbar)" + +#: ../../mod/dfrn_request.php:688 +msgid "" +"If you are not yet a member of the free social web, follow this link to find a public" +" Friendica site and join us today." +msgstr "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, folge diesem Link um einen öffentlichen Friendica-Server zu finden und beizutreten." + +#: ../../mod/dfrn_request.php:691 msgid "Friend/Connection Request" msgstr "Freundschafts-/Kontaktanfrage" -#: ../../mod/dfrn_request.php:673 +#: ../../mod/dfrn_request.php:692 msgid "" "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " "testuser@identi.ca" msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca" -#: ../../mod/dfrn_request.php:674 +#: ../../mod/dfrn_request.php:693 msgid "Please answer the following:" msgstr "Bitte beantworte Folgendes:" -#: ../../mod/dfrn_request.php:675 +#: ../../mod/dfrn_request.php:694 #, php-format msgid "Does %s know you?" msgstr "Kennt %s dich?" -#: ../../mod/dfrn_request.php:678 +#: ../../mod/dfrn_request.php:697 msgid "Add a personal note:" msgstr "Eine persönliche Notiz beifügen:" -#: ../../mod/dfrn_request.php:680 ../../include/contact_selectors.php:76 +#: ../../mod/dfrn_request.php:699 ../../include/contact_selectors.php:76 msgid "Friendica" msgstr "Friendica" -#: ../../mod/dfrn_request.php:681 +#: ../../mod/dfrn_request.php:700 msgid "StatusNet/Federated Social Web" msgstr "StatusNet/Federated Social Web" -#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:555 +#: ../../mod/dfrn_request.php:701 ../../mod/settings.php:629 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "Diaspora" -#: ../../mod/dfrn_request.php:683 -msgid "- please share from your own site as noted above" -msgstr "- bitte fange von Deiner eigenen Seite aus zu teilen an" +#: ../../mod/dfrn_request.php:702 +#, php-format +msgid "" +" - please do not use this form. Instead, enter %s into your Diaspora search" +" bar." +msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste." -#: ../../mod/dfrn_request.php:684 +#: ../../mod/dfrn_request.php:703 msgid "Your Identity Address:" msgstr "Adresse deines Profils:" -#: ../../mod/dfrn_request.php:685 +#: ../../mod/dfrn_request.php:706 msgid "Submit Request" msgstr "Anfrage abschicken" @@ -1140,7 +1176,7 @@ msgid "is interested in:" msgstr "ist interessiert an:" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:930 +#: ../../include/contact_widgets.php:9 ../../boot.php:986 msgid "Connect" msgstr "Verbinden" @@ -1165,184 +1201,187 @@ msgstr "Willkommen zu %s" msgid "Invalid request identifier." msgstr "Invalid request identifier." -#: ../../mod/notifications.php:35 ../../mod/notifications.php:157 -#: ../../mod/notifications.php:203 +#: ../../mod/notifications.php:35 ../../mod/notifications.php:161 +#: ../../mod/notifications.php:207 msgid "Discard" msgstr "Verwerfen" -#: ../../mod/notifications.php:47 ../../mod/notifications.php:156 -#: ../../mod/notifications.php:202 ../../mod/contacts.php:302 +#: ../../mod/notifications.php:51 ../../mod/notifications.php:160 +#: ../../mod/notifications.php:206 ../../mod/contacts.php:302 #: ../../mod/contacts.php:345 msgid "Ignore" msgstr "Ignorieren" -#: ../../mod/notifications.php:71 +#: ../../mod/notifications.php:75 msgid "System" msgstr "System" -#: ../../mod/notifications.php:76 ../../include/nav.php:109 +#: ../../mod/notifications.php:80 ../../include/nav.php:113 msgid "Network" msgstr "Netzwerk" -#: ../../mod/notifications.php:81 ../../mod/network.php:177 +#: ../../mod/notifications.php:85 ../../mod/network.php:182 msgid "Personal" msgstr "Persönlich" -#: ../../mod/notifications.php:86 ../../include/nav.php:73 -#: ../../include/nav.php:111 +#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:236 +#: ../../view/theme/diabook-blue/theme.php:236 +#: ../../view/theme/diabook/theme.php:244 +#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:77 +#: ../../include/nav.php:115 msgid "Home" msgstr "Pinnwand" -#: ../../mod/notifications.php:91 ../../include/nav.php:117 +#: ../../mod/notifications.php:95 ../../include/nav.php:121 msgid "Introductions" msgstr "Kontaktanfragen" -#: ../../mod/notifications.php:96 ../../mod/message.php:76 -#: ../../include/nav.php:124 +#: ../../mod/notifications.php:100 ../../mod/message.php:103 +#: ../../include/nav.php:128 msgid "Messages" msgstr "Nachrichten" -#: ../../mod/notifications.php:115 +#: ../../mod/notifications.php:119 msgid "Show Ignored Requests" msgstr "Zeige ignorierte Anfragen" -#: ../../mod/notifications.php:115 +#: ../../mod/notifications.php:119 msgid "Hide Ignored Requests" msgstr "Verberge ignorierte Anfragen" -#: ../../mod/notifications.php:141 ../../mod/notifications.php:187 +#: ../../mod/notifications.php:145 ../../mod/notifications.php:191 msgid "Notification type: " msgstr "Benachrichtigungstyp: " -#: ../../mod/notifications.php:142 +#: ../../mod/notifications.php:146 msgid "Friend Suggestion" msgstr "Kontaktvorschlag" -#: ../../mod/notifications.php:144 +#: ../../mod/notifications.php:148 #, php-format msgid "suggested by %s" msgstr "vorgeschlagen von %s" -#: ../../mod/notifications.php:149 ../../mod/notifications.php:196 +#: ../../mod/notifications.php:153 ../../mod/notifications.php:200 #: ../../mod/contacts.php:350 msgid "Hide this contact from others" msgstr "Verberge diesen Kontakt vor anderen" -#: ../../mod/notifications.php:150 ../../mod/notifications.php:197 +#: ../../mod/notifications.php:154 ../../mod/notifications.php:201 msgid "Post a new friend activity" msgstr "Neue-Kontakt Nachricht senden" -#: ../../mod/notifications.php:150 ../../mod/notifications.php:197 +#: ../../mod/notifications.php:154 ../../mod/notifications.php:201 msgid "if applicable" msgstr "falls anwendbar" -#: ../../mod/notifications.php:153 ../../mod/notifications.php:200 -#: ../../mod/admin.php:486 +#: ../../mod/notifications.php:157 ../../mod/notifications.php:204 +#: ../../mod/admin.php:530 msgid "Approve" msgstr "Genehmigen" -#: ../../mod/notifications.php:173 +#: ../../mod/notifications.php:177 msgid "Claims to be known to you: " msgstr "Behauptet dich zu kennen: " -#: ../../mod/notifications.php:173 +#: ../../mod/notifications.php:177 msgid "yes" msgstr "ja" -#: ../../mod/notifications.php:173 +#: ../../mod/notifications.php:177 msgid "no" msgstr "nein" -#: ../../mod/notifications.php:180 +#: ../../mod/notifications.php:184 msgid "Approve as: " msgstr "Genehmigen als: " -#: ../../mod/notifications.php:181 +#: ../../mod/notifications.php:185 msgid "Friend" msgstr "Freund" -#: ../../mod/notifications.php:182 +#: ../../mod/notifications.php:186 msgid "Sharer" msgstr "Teilenden" -#: ../../mod/notifications.php:182 +#: ../../mod/notifications.php:186 msgid "Fan/Admirer" msgstr "Fan/Verehrer" -#: ../../mod/notifications.php:188 +#: ../../mod/notifications.php:192 msgid "Friend/Connect Request" msgstr "Kontakt-/Freundschaftsanfrage" -#: ../../mod/notifications.php:188 +#: ../../mod/notifications.php:192 msgid "New Follower" msgstr "Neuer Bewunderer" -#: ../../mod/notifications.php:209 +#: ../../mod/notifications.php:213 msgid "No introductions." msgstr "Keine Kontaktanfragen." -#: ../../mod/notifications.php:212 ../../include/nav.php:118 +#: ../../mod/notifications.php:216 ../../include/nav.php:122 msgid "Notifications" msgstr "Benachrichtigungen" -#: ../../mod/notifications.php:249 ../../mod/notifications.php:374 -#: ../../mod/notifications.php:461 +#: ../../mod/notifications.php:253 ../../mod/notifications.php:378 +#: ../../mod/notifications.php:465 #, php-format msgid "%s liked %s's post" msgstr "%s mag %ss Beitrag" -#: ../../mod/notifications.php:258 ../../mod/notifications.php:383 -#: ../../mod/notifications.php:470 +#: ../../mod/notifications.php:262 ../../mod/notifications.php:387 +#: ../../mod/notifications.php:474 #, php-format msgid "%s disliked %s's post" msgstr "%s mag %ss Beitrag nicht" -#: ../../mod/notifications.php:272 ../../mod/notifications.php:397 -#: ../../mod/notifications.php:484 +#: ../../mod/notifications.php:276 ../../mod/notifications.php:401 +#: ../../mod/notifications.php:488 #, php-format msgid "%s is now friends with %s" msgstr "%s ist jetzt mit %s befreundet" -#: ../../mod/notifications.php:279 ../../mod/notifications.php:404 +#: ../../mod/notifications.php:283 ../../mod/notifications.php:408 #, php-format msgid "%s created a new post" msgstr "%s hat einen neuen Beitrag erstellt" -#: ../../mod/notifications.php:280 ../../mod/notifications.php:405 -#: ../../mod/notifications.php:493 +#: ../../mod/notifications.php:284 ../../mod/notifications.php:409 +#: ../../mod/notifications.php:497 #, php-format msgid "%s commented on %s's post" msgstr "%s hat %ss Beitrag kommentiert" -#: ../../mod/notifications.php:294 +#: ../../mod/notifications.php:298 msgid "No more network notifications." msgstr "Keine weiteren Netzwerk-Benachrichtigungen." -#: ../../mod/notifications.php:298 +#: ../../mod/notifications.php:302 msgid "Network Notifications" msgstr "Netzwerk Benachrichtigungen" -#: ../../mod/notifications.php:324 ../../mod/notify.php:61 +#: ../../mod/notifications.php:328 ../../mod/notify.php:61 msgid "No more system notifications." msgstr "Keine weiteren System Benachrichtigungen." -#: ../../mod/notifications.php:328 ../../mod/notify.php:65 +#: ../../mod/notifications.php:332 ../../mod/notify.php:65 msgid "System Notifications" msgstr "System Benachrichtigungen" -#: ../../mod/notifications.php:419 +#: ../../mod/notifications.php:423 msgid "No more personal notifications." msgstr "Keine weiteren persönlichen Benachrichtigungen" -#: ../../mod/notifications.php:423 +#: ../../mod/notifications.php:427 msgid "Personal Notifications" msgstr "Persönliche Benachrichtigungen" -#: ../../mod/notifications.php:500 +#: ../../mod/notifications.php:504 msgid "No more home notifications." msgstr "Keine weiteren Pinnwand-Benachrichtigungen" -#: ../../mod/notifications.php:504 +#: ../../mod/notifications.php:508 msgid "Home Notifications" msgstr "Pinnwand Benachrichtigungen" @@ -1434,12 +1473,12 @@ msgid "View all contacts" msgstr "Alle Kontakte anzeigen" #: ../../mod/contacts.php:297 ../../mod/contacts.php:344 -#: ../../mod/admin.php:490 +#: ../../mod/admin.php:534 msgid "Unblock" msgstr "Entsperren" #: ../../mod/contacts.php:297 ../../mod/contacts.php:344 -#: ../../mod/admin.php:489 +#: ../../mod/admin.php:533 msgid "Block" msgstr "Sperren" @@ -1474,8 +1513,8 @@ msgstr "Kontakt Informationen / Notizen" msgid "Edit contact notes" msgstr "Notizen zum Kontakt bearbiten" -#: ../../mod/contacts.php:328 ../../mod/contacts.php:497 -#: ../../mod/viewcontacts.php:60 +#: ../../mod/contacts.php:328 ../../mod/contacts.php:501 +#: ../../mod/viewcontacts.php:62 #, php-format msgid "Visit %s's profile [%s]" msgstr "Besuche %ss Profil [%s]" @@ -1508,7 +1547,7 @@ msgstr "letzte Aktualisierung:" msgid "Update public posts" msgstr "Öffentliche Beiträge aktualisieren" -#: ../../mod/contacts.php:341 ../../mod/admin.php:905 +#: ../../mod/contacts.php:341 ../../mod/admin.php:955 msgid "Update now" msgstr "Jetzt aktualisieren" @@ -1525,57 +1564,64 @@ msgid "" "Replies/likes to your public posts may still be visible" msgstr "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein" -#: ../../mod/contacts.php:399 ../../mod/group.php:179 +#: ../../mod/contacts.php:399 +msgid "Suggestions" +msgstr "Kontaktvorschläge" + +#: ../../mod/contacts.php:404 ../../mod/group.php:191 msgid "All Contacts" msgstr "Alle Kontakte" -#: ../../mod/contacts.php:404 +#: ../../mod/contacts.php:409 msgid "Unblocked Contacts" msgstr "Nicht blockierte Kontakte" -#: ../../mod/contacts.php:410 +#: ../../mod/contacts.php:415 msgid "Blocked Contacts" msgstr "Blockierte Kontakte" -#: ../../mod/contacts.php:416 +#: ../../mod/contacts.php:421 msgid "Ignored Contacts" msgstr "Ignorierte Kontakte" -#: ../../mod/contacts.php:422 +#: ../../mod/contacts.php:427 msgid "Hidden Contacts" msgstr "Verborgene Kontakte" -#: ../../mod/contacts.php:473 +#: ../../mod/contacts.php:477 msgid "Mutual Friendship" msgstr "Beidseitige Freundschaft" -#: ../../mod/contacts.php:477 +#: ../../mod/contacts.php:481 msgid "is a fan of yours" msgstr "ist ein Fan von dir" -#: ../../mod/contacts.php:481 +#: ../../mod/contacts.php:485 msgid "you are a fan of" msgstr "du bist Fan von" -#: ../../mod/contacts.php:498 ../../include/Contact.php:135 -#: ../../include/conversation.php:792 +#: ../../mod/contacts.php:502 ../../include/Contact.php:141 +#: ../../include/conversation.php:817 msgid "Edit contact" msgstr "Kontakt bearbeiten" -#: ../../mod/contacts.php:519 ../../include/nav.php:132 +#: ../../mod/contacts.php:523 ../../view/theme/diabook-red/theme.php:238 +#: ../../view/theme/diabook-blue/theme.php:238 +#: ../../view/theme/diabook/theme.php:246 +#: ../../view/theme/diabook-aerith/theme.php:238 ../../include/nav.php:139 msgid "Contacts" msgstr "Kontakte" -#: ../../mod/contacts.php:523 +#: ../../mod/contacts.php:527 msgid "Search your contacts" msgstr "Suche in deinen Kontakten" -#: ../../mod/contacts.php:524 ../../mod/directory.php:67 +#: ../../mod/contacts.php:528 ../../mod/directory.php:57 msgid "Finding: " msgstr "Funde: " -#: ../../mod/contacts.php:525 ../../mod/directory.php:69 -#: ../../include/contact_widgets.php:34 +#: ../../mod/contacts.php:529 ../../mod/directory.php:59 +#: ../../include/contact_widgets.php:32 msgid "Find" msgstr "Finde" @@ -1583,511 +1629,558 @@ msgstr "Finde" msgid "No valid account found." msgstr "Kein gültiger Account gefunden." -#: ../../mod/lostpass.php:31 +#: ../../mod/lostpass.php:32 msgid "Password reset request issued. Check your email." msgstr "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe deine E-Mail." -#: ../../mod/lostpass.php:42 +#: ../../mod/lostpass.php:43 #, php-format msgid "Password reset requested at %s" msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten" -#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106 -#: ../../mod/register.php:380 ../../mod/register.php:434 -#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:726 -#: ../../include/items.php:2575 +#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 +#: ../../mod/register.php:392 ../../mod/register.php:446 +#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732 +#: ../../addon/facebook/facebook.php:617 +#: ../../addon/facebook/facebook.php:1069 ../../include/items.php:2658 msgid "Administrator" msgstr "Administrator" -#: ../../mod/lostpass.php:64 +#: ../../mod/lostpass.php:65 msgid "" "Request could not be verified. (You may have previously submitted it.) " "Password reset failed." msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert." -#: ../../mod/lostpass.php:82 ../../boot.php:723 +#: ../../mod/lostpass.php:83 ../../boot.php:779 msgid "Password Reset" msgstr "Passwort zurücksetzen" -#: ../../mod/lostpass.php:83 +#: ../../mod/lostpass.php:84 msgid "Your password has been reset as requested." msgstr "Dein Passwort wurde wie gewünscht zurückgesetzt." -#: ../../mod/lostpass.php:84 +#: ../../mod/lostpass.php:85 msgid "Your new password is" msgstr "Dein neues Passwort lautet" -#: ../../mod/lostpass.php:85 +#: ../../mod/lostpass.php:86 msgid "Save or copy your new password - and then" msgstr "Speichere oder kopiere dein neues Passwort - und dann" -#: ../../mod/lostpass.php:86 +#: ../../mod/lostpass.php:87 msgid "click here to login" msgstr "hier klicken, um dich anzumelden" -#: ../../mod/lostpass.php:87 +#: ../../mod/lostpass.php:88 msgid "" "Your password may be changed from the Settings page after " "successful login." msgstr "Du kannst das Passwort in den Einstellungen ändern, sobald du dich erfolgreich angemeldet hast." -#: ../../mod/lostpass.php:118 +#: ../../mod/lostpass.php:119 msgid "Forgot your Password?" msgstr "Hast du dein Passwort vergessen?" -#: ../../mod/lostpass.php:119 +#: ../../mod/lostpass.php:120 msgid "" "Enter your email address and submit to have your password reset. Then check " "your email for further instructions." msgstr "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet." -#: ../../mod/lostpass.php:120 +#: ../../mod/lostpass.php:121 msgid "Nickname or Email: " msgstr "Spitzname oder Email:" -#: ../../mod/lostpass.php:121 +#: ../../mod/lostpass.php:122 msgid "Reset" msgstr "Zurücksetzen" -#: ../../mod/settings.php:72 +#: ../../mod/settings.php:89 msgid "Missing some important data!" msgstr "Wichtige Daten fehlen!" -#: ../../mod/settings.php:75 ../../mod/settings.php:486 ../../mod/admin.php:75 +#: ../../mod/settings.php:92 ../../mod/settings.php:556 ../../mod/admin.php:75 msgid "Update" msgstr "Aktualisierungen" -#: ../../mod/settings.php:175 +#: ../../mod/settings.php:197 msgid "Failed to connect with email account using the settings provided." msgstr "Konnte das Email Konto mit den angegebenen Einstellungen nicht erreichen." -#: ../../mod/settings.php:180 +#: ../../mod/settings.php:202 msgid "Email settings updated." msgstr "EMail Einstellungen bearbeitet." -#: ../../mod/settings.php:198 +#: ../../mod/settings.php:261 msgid "Passwords do not match. Password unchanged." msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert." -#: ../../mod/settings.php:203 +#: ../../mod/settings.php:266 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert." -#: ../../mod/settings.php:214 +#: ../../mod/settings.php:277 msgid "Password changed." msgstr "Passwort ändern." -#: ../../mod/settings.php:216 +#: ../../mod/settings.php:279 msgid "Password update failed. Please try again." msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal." -#: ../../mod/settings.php:280 +#: ../../mod/settings.php:340 msgid " Please use a shorter name." msgstr " Bitte verwende einen kürzeren Namen." -#: ../../mod/settings.php:282 +#: ../../mod/settings.php:342 msgid " Name too short." msgstr " Name ist zu kurz." -#: ../../mod/settings.php:288 +#: ../../mod/settings.php:348 msgid " Not valid email." msgstr " Keine gültige E-Mail." -#: ../../mod/settings.php:290 +#: ../../mod/settings.php:350 msgid " Cannot change to that email." msgstr "Ändern der E-Mail nicht möglich. " -#: ../../mod/settings.php:358 ../../addon/facebook/facebook.php:321 +#: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:445 #: ../../addon/impressum/impressum.php:64 #: ../../addon/openstreetmap/openstreetmap.php:80 -#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350 +#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:364 msgid "Settings updated." msgstr "Einstellungen aktualisiert." -#: ../../mod/settings.php:422 ../../include/nav.php:130 +#: ../../mod/settings.php:484 ../../view/theme/diabook-red/theme.php:284 +#: ../../view/theme/diabook-blue/theme.php:283 +#: ../../view/theme/diabook/theme.php:293 +#: ../../view/theme/diabook-aerith/theme.php:283 ../../include/nav.php:137 msgid "Account settings" msgstr "Account Einstellungen" -#: ../../mod/settings.php:427 +#: ../../mod/settings.php:489 ../../view/theme/diabook-red/theme.php:289 +#: ../../view/theme/diabook-blue/theme.php:288 +#: ../../view/theme/diabook/theme.php:298 +#: ../../view/theme/diabook-aerith/theme.php:288 +msgid "Display settings" +msgstr "Anzeige Einstellungen" + +#: ../../mod/settings.php:495 ../../view/theme/diabook-red/theme.php:298 +#: ../../view/theme/diabook-blue/theme.php:297 +#: ../../view/theme/diabook/theme.php:307 +#: ../../view/theme/diabook-aerith/theme.php:297 msgid "Connector settings" msgstr "Connector-Einstellungen" -#: ../../mod/settings.php:432 +#: ../../mod/settings.php:500 ../../view/theme/diabook-red/theme.php:303 +#: ../../view/theme/diabook-blue/theme.php:302 +#: ../../view/theme/diabook/theme.php:312 +#: ../../view/theme/diabook-aerith/theme.php:302 msgid "Plugin settings" msgstr "Plugin-Einstellungen" -#: ../../mod/settings.php:437 +#: ../../mod/settings.php:505 ../../view/theme/diabook-red/theme.php:308 +#: ../../view/theme/diabook-blue/theme.php:307 +#: ../../view/theme/diabook/theme.php:317 +#: ../../view/theme/diabook-aerith/theme.php:307 msgid "Connections" msgstr "Verbindungen" -#: ../../mod/settings.php:442 +#: ../../mod/settings.php:510 ../../view/theme/diabook-red/theme.php:313 +#: ../../view/theme/diabook-blue/theme.php:312 +#: ../../view/theme/diabook/theme.php:322 +#: ../../view/theme/diabook-aerith/theme.php:312 msgid "Export personal data" msgstr "Persönliche Daten exportieren" -#: ../../mod/settings.php:459 ../../mod/settings.php:485 -#: ../../mod/settings.php:518 +#: ../../mod/settings.php:528 ../../mod/settings.php:555 +#: ../../mod/settings.php:591 msgid "Add application" msgstr "Programm hinzufügen" -#: ../../mod/settings.php:463 ../../mod/settings.php:489 -#: ../../addon/statusnet/statusnet.php:526 +#: ../../mod/settings.php:532 ../../mod/settings.php:559 +#: ../../addon/statusnet/statusnet.php:541 msgid "Consumer Key" msgstr "Consumer Key" -#: ../../mod/settings.php:464 ../../mod/settings.php:490 -#: ../../addon/statusnet/statusnet.php:525 +#: ../../mod/settings.php:533 ../../mod/settings.php:560 +#: ../../addon/statusnet/statusnet.php:540 msgid "Consumer Secret" msgstr "Consumer Secret" -#: ../../mod/settings.php:465 ../../mod/settings.php:491 +#: ../../mod/settings.php:534 ../../mod/settings.php:561 msgid "Redirect" msgstr "Umleiten" -#: ../../mod/settings.php:466 ../../mod/settings.php:492 +#: ../../mod/settings.php:535 ../../mod/settings.php:562 msgid "Icon url" msgstr "Icon URL" -#: ../../mod/settings.php:477 +#: ../../mod/settings.php:546 msgid "You can't edit this application." msgstr "Du kannst dieses Programm nicht bearbeiten." -#: ../../mod/settings.php:517 +#: ../../mod/settings.php:590 msgid "Connected Apps" msgstr "Verbundene Programme" -#: ../../mod/settings.php:521 +#: ../../mod/settings.php:594 msgid "Client key starts with" msgstr "Anwender Schlüssel beginnt mit" -#: ../../mod/settings.php:522 +#: ../../mod/settings.php:595 msgid "No name" msgstr "Kein Name" -#: ../../mod/settings.php:523 +#: ../../mod/settings.php:596 msgid "Remove authorization" msgstr "Autorisierung entziehen" -#: ../../mod/settings.php:535 +#: ../../mod/settings.php:608 msgid "No Plugin settings configured" msgstr "Keine Plugin-Einstellungen konfiguriert" -#: ../../mod/settings.php:542 ../../addon/widgets/widgets.php:122 +#: ../../mod/settings.php:616 ../../addon/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "Plugin-Einstellungen" -#: ../../mod/settings.php:555 ../../mod/settings.php:556 +#: ../../mod/settings.php:629 ../../mod/settings.php:630 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s" -#: ../../mod/settings.php:555 ../../mod/settings.php:556 +#: ../../mod/settings.php:629 ../../mod/settings.php:630 msgid "enabled" msgstr "eingeschaltet" -#: ../../mod/settings.php:555 ../../mod/settings.php:556 +#: ../../mod/settings.php:629 ../../mod/settings.php:630 msgid "disabled" msgstr "ausgeschaltet" -#: ../../mod/settings.php:556 +#: ../../mod/settings.php:630 msgid "StatusNet" msgstr "StatusNet" -#: ../../mod/settings.php:584 +#: ../../mod/settings.php:660 msgid "Connector Settings" msgstr "Verbindungs-Einstellungen" -#: ../../mod/settings.php:590 +#: ../../mod/settings.php:666 msgid "Email/Mailbox Setup" msgstr "E-Mail/Postfach-Einstellungen" -#: ../../mod/settings.php:591 +#: ../../mod/settings.php:667 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an." -#: ../../mod/settings.php:592 +#: ../../mod/settings.php:668 msgid "Last successful email check:" msgstr "Letzter erfolgreicher Email Check" -#: ../../mod/settings.php:593 +#: ../../mod/settings.php:669 msgid "Email access is disabled on this site." msgstr "Zugriff auf E-Mails für diese Seite deaktiviert." -#: ../../mod/settings.php:594 +#: ../../mod/settings.php:670 msgid "IMAP server name:" msgstr "IMAP-Server-Name:" -#: ../../mod/settings.php:595 +#: ../../mod/settings.php:671 msgid "IMAP port:" msgstr "IMAP-Port:" -#: ../../mod/settings.php:596 +#: ../../mod/settings.php:672 msgid "Security:" msgstr "Sicherheit:" -#: ../../mod/settings.php:596 ../../mod/settings.php:601 +#: ../../mod/settings.php:672 ../../mod/settings.php:677 msgid "None" msgstr "Keine" -#: ../../mod/settings.php:597 +#: ../../mod/settings.php:673 msgid "Email login name:" msgstr "E-Mail-Login-Name:" -#: ../../mod/settings.php:598 +#: ../../mod/settings.php:674 msgid "Email password:" msgstr "E-Mail-Passwort:" -#: ../../mod/settings.php:599 +#: ../../mod/settings.php:675 msgid "Reply-to address:" msgstr "Reply-to Adresse:" -#: ../../mod/settings.php:600 +#: ../../mod/settings.php:676 msgid "Send public posts to all email contacts:" msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:" -#: ../../mod/settings.php:601 +#: ../../mod/settings.php:677 msgid "Action after import:" msgstr "Aktion nach Import:" -#: ../../mod/settings.php:601 +#: ../../mod/settings.php:677 msgid "Mark as seen" msgstr "Als gelesen markieren" -#: ../../mod/settings.php:601 +#: ../../mod/settings.php:677 msgid "Move to folder" msgstr "In einen Ordner verschieben" -#: ../../mod/settings.php:602 +#: ../../mod/settings.php:678 msgid "Move to folder:" msgstr "In diesen Ordner verschieben:" -#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:462 +#: ../../mod/settings.php:739 +msgid "Display Settings" +msgstr "Anzeige Einstellungen" + +#: ../../mod/settings.php:745 +msgid "Display Theme:" +msgstr "Theme:" + +#: ../../mod/settings.php:746 +msgid "Update browser every xx seconds" +msgstr "Browser alle xx Sekunden aktualisieren" + +#: ../../mod/settings.php:746 +msgid "Minimum of 10 seconds, no maximum" +msgstr "Minimal 10 Sekunden, kein Maximum" + +#: ../../mod/settings.php:747 +msgid "Number of items to display on the network page:" +msgstr "Zahl der Beiträge, welche pro Netzwerkseite angezeigt werden sollen: " + +#: ../../mod/settings.php:747 +msgid "Maximum of 100 items" +msgstr "Maximal 100 Beiträge" + +#: ../../mod/settings.php:748 +msgid "Don't show emoticons" +msgstr "Keine Smilies anzeigen" + +#: ../../mod/settings.php:808 ../../mod/admin.php:142 ../../mod/admin.php:506 msgid "Normal Account" msgstr "Normaler Account" -#: ../../mod/settings.php:660 +#: ../../mod/settings.php:809 msgid "This account is a normal personal profile" msgstr "Dieser Account ist ein normales persönliches Profil" -#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:463 +#: ../../mod/settings.php:812 ../../mod/admin.php:143 ../../mod/admin.php:507 msgid "Soapbox Account" msgstr "Sandkasten-Account" -#: ../../mod/settings.php:664 +#: ../../mod/settings.php:813 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "Freundschaftsanfragen werden automatisch als Nurlese-Fans akzeptiert" -#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:464 +#: ../../mod/settings.php:816 ../../mod/admin.php:144 ../../mod/admin.php:508 msgid "Community/Celebrity Account" msgstr "Gemeinschafts/Promi-Account" -#: ../../mod/settings.php:668 +#: ../../mod/settings.php:817 msgid "" "Automatically approve all connection/friend requests as read-write fans" msgstr "Freundschaftsanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert" -#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:465 +#: ../../mod/settings.php:820 ../../mod/admin.php:145 ../../mod/admin.php:509 msgid "Automatic Friend Account" msgstr "Automatischer Freundesaccount" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:821 msgid "Automatically approve all connection/friend requests as friends" msgstr "Freundschaftsanfragen werden automatisch als Freund akzeptiert" -#: ../../mod/settings.php:682 +#: ../../mod/settings.php:831 msgid "OpenID:" msgstr "OpenID:" -#: ../../mod/settings.php:682 +#: ../../mod/settings.php:831 msgid "(Optional) Allow this OpenID to login to this account." msgstr "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID." -#: ../../mod/settings.php:692 +#: ../../mod/settings.php:841 msgid "Publish your default profile in your local site directory?" msgstr "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?" -#: ../../mod/settings.php:698 +#: ../../mod/settings.php:847 msgid "Publish your default profile in the global social directory?" msgstr "Veröffentliche dein Standardprofil im weltweiten Verzeichnis?" -#: ../../mod/settings.php:706 +#: ../../mod/settings.php:855 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?" -#: ../../mod/settings.php:710 +#: ../../mod/settings.php:859 msgid "Hide your profile details from unknown viewers?" msgstr "Profil-Details vor unbekannten Betrachtern verbergen?" -#: ../../mod/settings.php:715 +#: ../../mod/settings.php:864 msgid "Allow friends to post to your profile page?" msgstr "Deinen Kontakten erlauben, auf deine Pinnwand zu schreiben?" -#: ../../mod/settings.php:721 +#: ../../mod/settings.php:870 msgid "Allow friends to tag your posts?" msgstr "Deinen Kontakten erlauben, deine Beiträge mit Schlagwörtern zu versehen?" -#: ../../mod/settings.php:727 +#: ../../mod/settings.php:876 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Erlaube uns dich als potentiellen Kontakt für neue Mitglieder vorzuschlagen?" -#: ../../mod/settings.php:736 +#: ../../mod/settings.php:882 +msgid "Permit unknown people to send you private mail?" +msgstr "Erlaube es Unbekannten dir private Nachrichten zu schicken?" + +#: ../../mod/settings.php:891 msgid "Profile is not published." msgstr "Profil ist nicht veröffentlicht." -#: ../../mod/settings.php:768 ../../mod/profile_photo.php:206 +#: ../../mod/settings.php:897 ../../mod/profile_photo.php:211 msgid "or" msgstr "oder" -#: ../../mod/settings.php:773 +#: ../../mod/settings.php:902 msgid "Your Identity Address is" msgstr "Die Adresse deines Profils lautet:" -#: ../../mod/settings.php:784 +#: ../../mod/settings.php:913 msgid "Automatically expire posts after this many days:" msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen" -#: ../../mod/settings.php:784 +#: ../../mod/settings.php:913 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht." -#: ../../mod/settings.php:785 +#: ../../mod/settings.php:914 msgid "Advanced expiration settings" msgstr "Erweiterte Verfallseinstellungen" -#: ../../mod/settings.php:786 +#: ../../mod/settings.php:915 msgid "Advanced Expiration" msgstr "Erweitertes Verfallen" -#: ../../mod/settings.php:787 +#: ../../mod/settings.php:916 msgid "Expire posts:" msgstr "Beiträge verfallen lassen:" -#: ../../mod/settings.php:788 +#: ../../mod/settings.php:917 msgid "Expire personal notes:" msgstr "Persönliche Notizen verfallen lassen:" -#: ../../mod/settings.php:789 +#: ../../mod/settings.php:918 msgid "Expire starred posts:" msgstr "Markierte Beiträge verfallen lassen:" -#: ../../mod/settings.php:790 +#: ../../mod/settings.php:919 msgid "Expire photos:" msgstr "Fotos verfallen lassen:" -#: ../../mod/settings.php:795 +#: ../../mod/settings.php:924 msgid "Account Settings" msgstr "Account-Einstellungen" -#: ../../mod/settings.php:803 +#: ../../mod/settings.php:933 msgid "Password Settings" msgstr "Passwort-Einstellungen" -#: ../../mod/settings.php:804 +#: ../../mod/settings.php:934 msgid "New Password:" msgstr "Neues Passwort:" -#: ../../mod/settings.php:805 +#: ../../mod/settings.php:935 msgid "Confirm:" msgstr "Bestätigen:" -#: ../../mod/settings.php:805 +#: ../../mod/settings.php:935 msgid "Leave password fields blank unless changing" msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern" -#: ../../mod/settings.php:809 +#: ../../mod/settings.php:939 msgid "Basic Settings" msgstr "Grundeinstellungen" -#: ../../mod/settings.php:810 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:940 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "Kompletter Name:" -#: ../../mod/settings.php:811 +#: ../../mod/settings.php:941 msgid "Email Address:" msgstr "Emailadresse:" -#: ../../mod/settings.php:812 +#: ../../mod/settings.php:942 msgid "Your Timezone:" msgstr "Deine Zeitzone:" -#: ../../mod/settings.php:813 +#: ../../mod/settings.php:943 msgid "Default Post Location:" msgstr "Standardstandort:" -#: ../../mod/settings.php:814 +#: ../../mod/settings.php:944 msgid "Use Browser Location:" msgstr "Verwende den Standort des Browsers:" -#: ../../mod/settings.php:815 -msgid "Display Theme:" -msgstr "Theme:" - -#: ../../mod/settings.php:816 -msgid "Update browser every xx seconds" -msgstr "Browser alle xx Sekunden aktualisieren" - -#: ../../mod/settings.php:816 -msgid "Minimum of 10 seconds, no maximum" -msgstr "Minimal 10 Sekunden, kein Maximum" - -#: ../../mod/settings.php:818 +#: ../../mod/settings.php:947 msgid "Security and Privacy Settings" msgstr "Sicherheits- und Privatsphäre-Einstellungen" -#: ../../mod/settings.php:820 +#: ../../mod/settings.php:949 msgid "Maximum Friend Requests/Day:" msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:" -#: ../../mod/settings.php:820 +#: ../../mod/settings.php:949 ../../mod/settings.php:964 msgid "(to prevent spam abuse)" msgstr "(um SPAM zu vermeiden)" -#: ../../mod/settings.php:821 +#: ../../mod/settings.php:950 msgid "Default Post Permissions" msgstr "Standard-Zugriffsrechte für Beiträge" -#: ../../mod/settings.php:822 +#: ../../mod/settings.php:951 msgid "(click to open/close)" msgstr "(klicke zum öffnen/schließen)" -#: ../../mod/settings.php:837 +#: ../../mod/settings.php:964 +msgid "Maximum private messages per day from unknown people:" +msgstr "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:" + +#: ../../mod/settings.php:967 msgid "Notification Settings" msgstr "Benachrichtigungseinstellungen" -#: ../../mod/settings.php:838 +#: ../../mod/settings.php:968 msgid "Send a notification email when:" msgstr "Benachrichtigungs-E-Mail senden wenn:" -#: ../../mod/settings.php:839 +#: ../../mod/settings.php:969 msgid "You receive an introduction" msgstr "- du eine Kontaktanfrage erhältst" -#: ../../mod/settings.php:840 +#: ../../mod/settings.php:970 msgid "Your introductions are confirmed" msgstr "- eine deiner Kontaktanfragen akzeptiert wurde" -#: ../../mod/settings.php:841 +#: ../../mod/settings.php:971 msgid "Someone writes on your profile wall" msgstr "- jemand etwas auf deine Pinnwand schreibt" -#: ../../mod/settings.php:842 +#: ../../mod/settings.php:972 msgid "Someone writes a followup comment" msgstr "- jemand auch einen Kommentar verfasst" -#: ../../mod/settings.php:843 +#: ../../mod/settings.php:973 msgid "You receive a private message" msgstr "- du eine private Nachricht erhältst" -#: ../../mod/settings.php:844 +#: ../../mod/settings.php:974 msgid "You receive a friend suggestion" msgstr "- du eine Empfehlung erhältst" -#: ../../mod/settings.php:845 +#: ../../mod/settings.php:975 msgid "You are tagged in a post" -msgstr "- du in einem Beitrag erwähnt wurdest" +msgstr "Du wurdest in einem Beitrag erwähnt." -#: ../../mod/settings.php:848 +#: ../../mod/settings.php:978 msgid "Advanced Page Settings" msgstr "Erweiterte Seiten-Einstellungen" @@ -2109,39 +2202,39 @@ msgstr "Wähle eine Identität zum Verwalten: " msgid "Search Results For:" msgstr "Suchergebnisse für:" -#: ../../mod/network.php:77 ../../mod/search.php:16 +#: ../../mod/network.php:82 ../../mod/search.php:16 msgid "Remove term" msgstr "Begriff entfernen" -#: ../../mod/network.php:86 ../../mod/search.php:13 +#: ../../mod/network.php:91 ../../mod/search.php:13 msgid "Saved Searches" msgstr "Gespeicherte Suchen" -#: ../../mod/network.php:87 ../../include/group.php:216 +#: ../../mod/network.php:92 ../../include/group.php:216 msgid "add" msgstr "hinzufügen" -#: ../../mod/network.php:166 +#: ../../mod/network.php:171 msgid "Commented Order" msgstr "Neueste Kommentare" -#: ../../mod/network.php:171 +#: ../../mod/network.php:176 msgid "Posted Order" msgstr "Neueste Beiträge" -#: ../../mod/network.php:182 +#: ../../mod/network.php:187 msgid "New" msgstr "Neue" -#: ../../mod/network.php:187 +#: ../../mod/network.php:192 msgid "Starred" msgstr "Markierte" -#: ../../mod/network.php:192 -msgid "Bookmarks" -msgstr "Lesezeichen" +#: ../../mod/network.php:197 +msgid "Shared Links" +msgstr "Geteilte Internetlinks" -#: ../../mod/network.php:250 +#: ../../mod/network.php:270 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2149,42 +2242,103 @@ msgid_plural "" msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk." msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken." -#: ../../mod/network.php:253 +#: ../../mod/network.php:273 msgid "Private messages to this group are at risk of public disclosure." msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten." -#: ../../mod/network.php:298 +#: ../../mod/network.php:318 msgid "No such group" msgstr "Es gibt keine solche Gruppe" -#: ../../mod/network.php:309 +#: ../../mod/network.php:329 msgid "Group is empty" msgstr "Gruppe ist leer" -#: ../../mod/network.php:313 +#: ../../mod/network.php:333 msgid "Group: " msgstr "Gruppe: " -#: ../../mod/network.php:323 +#: ../../mod/network.php:343 msgid "Contact: " msgstr "Kontakt: " -#: ../../mod/network.php:325 +#: ../../mod/network.php:345 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:330 +#: ../../mod/network.php:350 msgid "Invalid contact." msgstr "Ungültiger Kontakt." -#: ../../mod/notes.php:44 ../../boot.php:1354 +#: ../../mod/notes.php:44 ../../boot.php:1426 msgid "Personal Notes" msgstr "Persönliche Notizen" -#: ../../mod/notes.php:63 ../../include/text.php:645 +#: ../../mod/notes.php:63 ../../mod/filer.php:29 +#: ../../addon/facebook/facebook.php:673 ../../include/text.php:649 msgid "Save" msgstr "Speichern" +#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112 +#, php-format +msgid "Number of daily wall messages for %s exceeded. Message failed." +msgstr "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen." + +#: ../../mod/wallmessage.php:56 ../../mod/message.php:60 +msgid "No recipient selected." +msgstr "Kein Empfänger gewählt." + +#: ../../mod/wallmessage.php:59 +msgid "Unable to check your home location." +msgstr "Konnte deinen Heimatort nicht bestimmen." + +#: ../../mod/wallmessage.php:62 ../../mod/message.php:67 +msgid "Message could not be sent." +msgstr "Nachricht konnte nicht gesendet werden." + +#: ../../mod/wallmessage.php:65 ../../mod/message.php:70 +msgid "Message collection failure." +msgstr "Konnte Nachrichten nicht abrufen." + +#: ../../mod/wallmessage.php:68 ../../mod/message.php:73 +msgid "Message sent." +msgstr "Nachricht gesendet." + +#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95 +msgid "No recipient." +msgstr "Kein Empfänger." + +#: ../../mod/wallmessage.php:124 ../../mod/message.php:170 +#: ../../include/conversation.php:914 +msgid "Please enter a link URL:" +msgstr "Bitte gib die URL des Links ein:" + +#: ../../mod/wallmessage.php:131 ../../mod/message.php:178 +msgid "Send Private Message" +msgstr "Private Nachricht senden" + +#: ../../mod/wallmessage.php:132 +#, php-format +msgid "" +"If you wish for %s to respond, please check that the privacy settings on " +"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:133 ../../mod/message.php:179 +#: ../../mod/message.php:348 +msgid "To:" +msgstr "An:" + +#: ../../mod/wallmessage.php:134 ../../mod/message.php:180 +#: ../../mod/message.php:349 +msgid "Subject:" +msgstr "Betreff:" + +#: ../../mod/wallmessage.php:140 ../../mod/message.php:184 +#: ../../mod/message.php:352 ../../mod/invite.php:113 +msgid "Your message:" +msgstr "Deine Nachricht:" + #: ../../mod/newmember.php:6 msgid "Welcome to Friendica" msgstr "Willkommen bei Friendica" @@ -2203,12 +2357,19 @@ msgstr "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnte #: ../../mod/newmember.php:16 msgid "" +"On your Quick Start page - find a brief introduction to your " +"profile and network tabs, connect to Facebook, make some new connections, " +"and find some groups to join." +msgstr "Auf der Quick Start Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest, wie du alte Freunde von Facebook wieder findest und neue Kontakte knüpfst." + +#: ../../mod/newmember.php:18 +msgid "" "On your Settings page - change your initial password. Also make a " "note of your Identity Address. This looks just like an email address - and " "will be useful in making friends on the free social web." msgstr "Ändere bitte unter Einstellungen Dein Passwort. Außerdem merke Dir Deine Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen." -#: ../../mod/newmember.php:18 +#: ../../mod/newmember.php:20 msgid "" "Review the other settings, particularly the privacy settings. An unpublished" " directory listing is like having an unlisted phone number. In general, you " @@ -2216,61 +2377,61 @@ msgid "" "potential friends know exactly how to find you." msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können." -#: ../../mod/newmember.php:20 +#: ../../mod/newmember.php:22 msgid "" "Upload a profile photo if you have not done so already. Studies have shown " "that people with real photos of themselves are ten times more likely to make" " friends than people who do not." msgstr "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust." -#: ../../mod/newmember.php:23 +#: ../../mod/newmember.php:25 msgid "" "Authorise the Facebook Connector if you currently have a Facebook account " "and we will (optionally) import all your Facebook friends and conversations." msgstr "Richte die Verbindung zu Facebook ein, wenn du im Augenblick ein Facebook Konto hast und (optional) deine Facebook Freunde und Unterhaltungen importieren willst." -#: ../../mod/newmember.php:25 +#: ../../mod/newmember.php:27 msgid "" "If this is your own personal server, installing the Facebook addon " "may ease your transition to the free social web." msgstr "Wenn dies dein privater Server ist, könnte die Installation des Facebook Connectors deinen Umzug ins freie soziale Netz angenehmer gestalten." -#: ../../mod/newmember.php:30 +#: ../../mod/newmember.php:32 msgid "" "Enter your email access information on your Connector Settings page if you " "wish to import and interact with friends or mailing lists from your email " "INBOX" msgstr "Gib deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls du E-Mails aus deinem Posteingang importieren und mit Freunden und Mailinglisten interagieren willlst." -#: ../../mod/newmember.php:32 +#: ../../mod/newmember.php:34 msgid "" "Edit your default profile to your liking. Review the " "settings for hiding your list of friends and hiding the profile from unknown" " visitors." msgstr "Editiere dein Standard Profil nach deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen deiner Freundesliste vor unbekannten Betrachtern des Profils." -#: ../../mod/newmember.php:34 +#: ../../mod/newmember.php:36 msgid "" "Set some public keywords for your default profile which describe your " "interests. We may be able to find other people with similar interests and " "suggest friendships." msgstr "Trage ein paar öffentliche Stichwörter in dein Standardprofil ein, die deine Interessen beschreiben. Eventuell sind wir in der Lage Leute zu finden, die deine Interessen teilen und können dir dann Kontakte vorschlagen." -#: ../../mod/newmember.php:36 +#: ../../mod/newmember.php:38 msgid "" "Your Contacts page is your gateway to managing friendships and connecting " "with friends on other networks. Typically you enter their address or site " "URL in the Add New Contact dialog." msgstr "Die Kontakte-Seite ist die Einstiegsseite, von der aus du Kontakte verwalten und dich mit Freunden in anderen Netzwerken verbinden kannst. Normalerweise gibst du dazu einfach ihre Adresse oder die URL der Seite im Kasten Neuen Kontakt hinzufügen ein." -#: ../../mod/newmember.php:38 +#: ../../mod/newmember.php:40 msgid "" "The Directory page lets you find other people in this network or other " "federated sites. Look for a Connect or Follow link on " "their profile page. Provide your own Identity Address if requested." msgstr "Über die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen verknüpften Seiten finden. Halte nach einem Verbinden oder Folgen Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an, falls du danach gefragt wirst." -#: ../../mod/newmember.php:40 +#: ../../mod/newmember.php:42 msgid "" "On the side panel of the Contacts page are several tools to find new " "friends. We can match people by interest, look up people by name or " @@ -2279,14 +2440,14 @@ msgid "" "hours." msgstr "Im seitlichen Bedienfeld der Kontakte-Seite gibt es diverse Werkzeuge, um neue Freunde zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Freunde vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden." -#: ../../mod/newmember.php:42 +#: ../../mod/newmember.php:44 msgid "" "Once you have made some friends, organize them into private conversation " "groups from the sidebar of your Contacts page and then you can interact with" " each group privately on your Network page." msgstr "Sobald du einige Freunde gefunden hast, organisiere sie in Gruppen zur privaten Kommunikation im Seitenmenü der Kontakte-Seite. Du kannst dann mit jeder dieser Gruppen von der Netzwerkseite aus privat interagieren." -#: ../../mod/newmember.php:44 +#: ../../mod/newmember.php:46 msgid "" "Our help pages may be consulted for detail on other program" " features and resources." @@ -2300,51 +2461,51 @@ msgstr "Beitrag nicht verfügbar." msgid "Item was not found." msgstr "Beitrag konnte nicht gefunden werden." -#: ../../mod/group.php:27 +#: ../../mod/group.php:29 msgid "Group created." msgstr "Gruppe erstellt." -#: ../../mod/group.php:33 +#: ../../mod/group.php:35 msgid "Could not create group." msgstr "Konnte die Gruppe nicht erstellen." -#: ../../mod/group.php:43 ../../mod/group.php:127 +#: ../../mod/group.php:47 ../../mod/group.php:137 msgid "Group not found." msgstr "Gruppe nicht gefunden." -#: ../../mod/group.php:56 +#: ../../mod/group.php:60 msgid "Group name changed." msgstr "Gruppenname geändert." -#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:287 +#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:293 msgid "Permission denied" msgstr "Zugriff verweigert" -#: ../../mod/group.php:85 +#: ../../mod/group.php:90 msgid "Create a group of contacts/friends." msgstr "Eine Gruppe von Kontakten/Freunden anlegen." -#: ../../mod/group.php:86 ../../mod/group.php:166 +#: ../../mod/group.php:91 ../../mod/group.php:177 msgid "Group Name: " msgstr "Gruppenname:" -#: ../../mod/group.php:102 +#: ../../mod/group.php:110 msgid "Group removed." msgstr "Gruppe entfernt." -#: ../../mod/group.php:104 +#: ../../mod/group.php:112 msgid "Unable to remove group." msgstr "Konnte die Gruppe nicht entfernen." -#: ../../mod/group.php:165 +#: ../../mod/group.php:176 msgid "Group Editor" msgstr "Gruppeneditor" -#: ../../mod/group.php:177 +#: ../../mod/group.php:189 msgid "Members" msgstr "Mitglieder" -#: ../../mod/group.php:209 ../../mod/profperm.php:105 +#: ../../mod/group.php:221 ../../mod/profperm.php:105 msgid "Click on a contact to add or remove." msgstr "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen" @@ -2356,9 +2517,12 @@ msgstr "Ungültiger Profil-Bezeichner" msgid "Profile Visibility Editor" msgstr "Editor für die Profil-Sichtbarkeit" -#: ../../mod/profperm.php:103 ../../include/profile_advanced.php:7 -#: ../../include/profile_advanced.php:76 ../../include/nav.php:48 -#: ../../boot.php:1336 +#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:237 +#: ../../view/theme/diabook-blue/theme.php:237 +#: ../../view/theme/diabook/theme.php:245 +#: ../../view/theme/diabook-aerith/theme.php:237 +#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76 +#: ../../include/nav.php:50 ../../boot.php:1408 msgid "Profile" msgstr "Profil" @@ -2374,157 +2538,163 @@ msgstr "Alle Kontakte (mit gesichertem Profilzugriff)" msgid "No contacts." msgstr "Keine Kontakte." -#: ../../mod/viewcontacts.php:74 ../../include/text.php:584 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:586 msgid "View Contacts" msgstr "Kontakte anzeigen" -#: ../../mod/register.php:62 +#: ../../mod/register.php:64 msgid "An invitation is required." msgstr "Du benötigst eine Einladung." -#: ../../mod/register.php:67 +#: ../../mod/register.php:69 msgid "Invitation could not be verified." msgstr "Die Einladung konnte nicht überprüft werden." -#: ../../mod/register.php:75 +#: ../../mod/register.php:77 msgid "Invalid OpenID url" msgstr "Ungültige OpenID URL" -#: ../../mod/register.php:90 +#: ../../mod/register.php:92 msgid "Please enter the required information." msgstr "Bitte trage die erforderlichen Informationen ein." -#: ../../mod/register.php:104 +#: ../../mod/register.php:106 msgid "Please use a shorter name." msgstr "Bitte verwende einen kürzeren Namen." -#: ../../mod/register.php:106 +#: ../../mod/register.php:108 msgid "Name too short." msgstr "Der Name ist zu kurz." -#: ../../mod/register.php:121 +#: ../../mod/register.php:123 msgid "That doesn't appear to be your full (First Last) name." msgstr "Das scheint nicht dein kompletter Name (Vor- und Nachname) zu sein." -#: ../../mod/register.php:126 +#: ../../mod/register.php:128 msgid "Your email domain is not among those allowed on this site." msgstr "Die Domain deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt." -#: ../../mod/register.php:129 +#: ../../mod/register.php:131 msgid "Not a valid email address." msgstr "Keine gültige E-Mail-Adresse." -#: ../../mod/register.php:139 +#: ../../mod/register.php:141 msgid "Cannot use that email." msgstr "Konnte diese E-Mail-Adresse nicht verwenden." -#: ../../mod/register.php:145 +#: ../../mod/register.php:147 msgid "" "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and " "must also begin with a letter." msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen." -#: ../../mod/register.php:151 ../../mod/register.php:252 +#: ../../mod/register.php:153 ../../mod/register.php:264 msgid "Nickname is already registered. Please choose another." msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." -#: ../../mod/register.php:170 +#: ../../mod/register.php:163 +msgid "" +"Nickname was once registered here and may not be re-used. Please choose " +"another." +msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." + +#: ../../mod/register.php:182 msgid "SERIOUS ERROR: Generation of security keys failed." msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden." -#: ../../mod/register.php:238 +#: ../../mod/register.php:250 msgid "An error occurred during registration. Please try again." msgstr "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal." -#: ../../mod/register.php:274 +#: ../../mod/register.php:286 msgid "An error occurred creating your default profile. Please try again." msgstr "Bei der Erstellung des Standard-Profils ist ein Fehler aufgetreten. Bitte versuche es noch einmal." -#: ../../mod/register.php:378 ../../mod/regmod.php:52 +#: ../../mod/register.php:390 ../../mod/regmod.php:52 #, php-format msgid "Registration details for %s" msgstr "Details der Registration von %s" -#: ../../mod/register.php:386 +#: ../../mod/register.php:398 msgid "" "Registration successful. Please check your email for further instructions." msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet." -#: ../../mod/register.php:390 +#: ../../mod/register.php:402 msgid "Failed to send email message. Here is the message that failed." msgstr "Konnte die E-Mail nicht versenden. Hier ist die Nachricht, die nicht gesendet werden konnte." -#: ../../mod/register.php:395 +#: ../../mod/register.php:407 msgid "Your registration can not be processed." msgstr "Deine Registrierung konnte nicht verarbeitet werden." -#: ../../mod/register.php:432 +#: ../../mod/register.php:444 #, php-format msgid "Registration request at %s" msgstr "Registrierungsanfrage auf %s" -#: ../../mod/register.php:441 +#: ../../mod/register.php:453 msgid "Your registration is pending approval by the site owner." msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden." -#: ../../mod/register.php:479 +#: ../../mod/register.php:491 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal." -#: ../../mod/register.php:505 +#: ../../mod/register.php:517 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking 'Register'." msgstr "Du kannst dieses Formular auch (optional) mit deiner OpenID ausfüllen, indem du deine OpenID angibst und 'Registrieren' klickst." -#: ../../mod/register.php:506 +#: ../../mod/register.php:518 msgid "" "If you are not familiar with OpenID, please leave that field blank and fill " "in the rest of the items." msgstr "Wenn du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus." -#: ../../mod/register.php:507 +#: ../../mod/register.php:519 msgid "Your OpenID (optional): " msgstr "Deine OpenID (optional): " -#: ../../mod/register.php:521 +#: ../../mod/register.php:533 msgid "Include your profile in member directory?" msgstr "Soll dein Profil im Nutzerverzeichnis angezeigt werden?" -#: ../../mod/register.php:536 +#: ../../mod/register.php:553 msgid "Membership on this site is by invitation only." msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich." -#: ../../mod/register.php:537 +#: ../../mod/register.php:554 msgid "Your invitation ID: " msgstr "ID deiner Einladung: " -#: ../../mod/register.php:540 ../../mod/admin.php:314 +#: ../../mod/register.php:557 ../../mod/admin.php:358 msgid "Registration" msgstr "Registrierung" -#: ../../mod/register.php:548 +#: ../../mod/register.php:565 msgid "Your Full Name (e.g. Joe Smith): " msgstr "Vollständiger Name (z.B. Max Mustermann): " -#: ../../mod/register.php:549 +#: ../../mod/register.php:566 msgid "Your Email Address: " msgstr "Deine E-Mail-Adresse: " -#: ../../mod/register.php:550 +#: ../../mod/register.php:567 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be " "'nickname@$sitename'." msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird 'spitzname@$sitename' sein." -#: ../../mod/register.php:551 +#: ../../mod/register.php:568 msgid "Choose a nickname: " msgstr "Spitznamen wählen: " -#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:693 +#: ../../mod/register.php:571 ../../include/nav.php:81 ../../boot.php:745 msgid "Register" msgstr "Registrieren" @@ -2533,18 +2703,29 @@ msgid "People Search" msgstr "Personen Suche" #: ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1092 +#: ../../addon/facebook/facebook.php:1440 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../include/diaspora.php:1600 ../../include/conversation.php:48 +#: ../../view/theme/diabook-red/theme.php:77 +#: ../../view/theme/diabook-red/theme.php:86 +#: ../../view/theme/diabook-blue/theme.php:77 +#: ../../view/theme/diabook-blue/theme.php:86 +#: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90 +#: ../../view/theme/diabook-aerith/theme.php:77 +#: ../../view/theme/diabook-aerith/theme.php:86 +#: ../../include/diaspora.php:1650 ../../include/conversation.php:48 #: ../../include/conversation.php:57 ../../include/conversation.php:121 #: ../../include/conversation.php:130 msgid "status" msgstr "Status" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1096 +#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1444 #: ../../addon/communityhome/communityhome.php:172 -#: ../../include/diaspora.php:1616 ../../include/conversation.php:65 +#: ../../view/theme/diabook-red/theme.php:91 +#: ../../view/theme/diabook-blue/theme.php:91 +#: ../../view/theme/diabook/theme.php:95 +#: ../../view/theme/diabook-aerith/theme.php:91 +#: ../../include/diaspora.php:1666 ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s" @@ -2555,13 +2736,12 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s nicht" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127 -#: ../../mod/admin.php:522 ../../mod/admin.php:700 ../../mod/display.php:29 -#: ../../mod/display.php:137 ../../mod/viewd.php:14 -#: ../../include/items.php:2942 +#: ../../mod/admin.php:566 ../../mod/admin.php:745 ../../mod/display.php:37 +#: ../../mod/display.php:142 ../../include/items.php:3030 msgid "Item not found." msgstr "Beitrag nicht gefunden." -#: ../../mod/viewsrc.php:7 ../../mod/viewd.php:6 +#: ../../mod/viewsrc.php:7 msgid "Access denied." msgstr "Zugriff verweigert." @@ -2569,12 +2749,12 @@ msgstr "Zugriff verweigert." msgid "Account approved." msgstr "Account freigegeben." -#: ../../mod/regmod.php:93 +#: ../../mod/regmod.php:98 #, php-format msgid "Registration revoked for %s" msgstr "Registrierung für %s wurde zurückgezogen" -#: ../../mod/regmod.php:105 +#: ../../mod/regmod.php:110 msgid "Please login." msgstr "Bitte melde dich an." @@ -2586,97 +2766,97 @@ msgstr "Konnte den Originalbeitrag nicht finden." msgid "Empty post discarded." msgstr "Leerer Beitrag wurde verworfen." -#: ../../mod/item.php:351 ../../mod/wall_upload.php:81 +#: ../../mod/item.php:373 ../../mod/wall_upload.php:81 #: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97 -#: ../../include/message.php:143 +#: ../../include/message.php:144 msgid "Wall Photos" msgstr "Pinnwand-Bilder" -#: ../../mod/item.php:833 +#: ../../mod/item.php:763 msgid "System error. Post not saved." msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden." -#: ../../mod/item.php:858 +#: ../../mod/item.php:788 #, 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:860 +#: ../../mod/item.php:790 #, php-format msgid "You may visit them online at %s" msgstr "Du kannst sie online unter %s besuchen" -#: ../../mod/item.php:861 +#: ../../mod/item.php:791 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:863 +#: ../../mod/item.php:793 #, php-format msgid "%s posted an update." msgstr "%s hat ein Update veröffentlicht." -#: ../../mod/profile_photo.php:28 +#: ../../mod/profile_photo.php:30 msgid "Image uploaded but image cropping failed." msgstr "Bilder hochgeladen, aber das Zuschneiden ist fehlgeschlagen." -#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68 -#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258 +#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70 +#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:264 #, php-format msgid "Image size reduction [%s] failed." msgstr "Verkleinern der Bildgröße von [%s] ist gescheitert." -#: ../../mod/profile_photo.php:89 +#: ../../mod/profile_photo.php:91 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird." -#: ../../mod/profile_photo.php:99 +#: ../../mod/profile_photo.php:101 msgid "Unable to process image" msgstr "Bild konnte nicht verarbeitet werden" -#: ../../mod/profile_photo.php:113 ../../mod/wall_upload.php:56 +#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:56 #, php-format msgid "Image exceeds size limit of %d" msgstr "Bildgröße überschreitet das Limit von %d" -#: ../../mod/profile_photo.php:203 +#: ../../mod/profile_photo.php:207 msgid "Upload File:" msgstr "Datei hochladen:" -#: ../../mod/profile_photo.php:204 +#: ../../mod/profile_photo.php:208 msgid "Upload Profile Photo" msgstr "Profilbild hochladen" -#: ../../mod/profile_photo.php:205 +#: ../../mod/profile_photo.php:209 msgid "Upload" msgstr "Hochladen" -#: ../../mod/profile_photo.php:206 +#: ../../mod/profile_photo.php:211 msgid "skip this step" msgstr "diesen Schritt überspringen" -#: ../../mod/profile_photo.php:206 +#: ../../mod/profile_photo.php:211 msgid "select a photo from your photo albums" msgstr "wähle ein Foto von deinen Fotoalben" -#: ../../mod/profile_photo.php:219 +#: ../../mod/profile_photo.php:224 msgid "Crop Image" msgstr "Bild zurechtschneiden" -#: ../../mod/profile_photo.php:220 +#: ../../mod/profile_photo.php:225 msgid "Please adjust the image cropping for optimum viewing." msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann." -#: ../../mod/profile_photo.php:221 +#: ../../mod/profile_photo.php:227 msgid "Done Editing" msgstr "Bearbeitung abgeschlossen" -#: ../../mod/profile_photo.php:249 +#: ../../mod/profile_photo.php:255 msgid "Image uploaded successfully." msgstr "Bild erfolgreich auf den Server geladen." @@ -2698,88 +2878,71 @@ msgstr "Dies wird deinen Account endgültig löschen. Es gibt keine Möglichkeit msgid "Please enter your password for verification:" msgstr "Bitte gib dein Passwort zur Verifikation ein:" -#: ../../mod/message.php:23 -msgid "No recipient selected." -msgstr "Kein Empfänger gewählt." - -#: ../../mod/message.php:26 -msgid "Unable to locate contact information." -msgstr "Konnte die Kontaktinformationen nicht finden." - -#: ../../mod/message.php:29 -msgid "Message could not be sent." -msgstr "Nachricht konnte nicht gesendet werden." - -#: ../../mod/message.php:32 -msgid "Message collection failure." -msgstr "Konnte Nachrichten nicht abrufen." - -#: ../../mod/message.php:35 -msgid "Message sent." -msgstr "Nachricht gesendet." - -#: ../../mod/message.php:55 -msgid "Inbox" -msgstr "Eingang" - -#: ../../mod/message.php:60 -msgid "Outbox" -msgstr "Ausgang" - -#: ../../mod/message.php:65 +#: ../../mod/message.php:22 ../../include/nav.php:131 msgid "New Message" msgstr "Neue Nachricht" -#: ../../mod/message.php:91 +#: ../../mod/message.php:64 +msgid "Unable to locate contact information." +msgstr "Konnte die Kontaktinformationen nicht finden." + +#: ../../mod/message.php:118 msgid "Message deleted." msgstr "Nachricht gelöscht." -#: ../../mod/message.php:121 +#: ../../mod/message.php:148 msgid "Conversation removed." msgstr "Unterhaltung gelöscht." -#: ../../mod/message.php:137 ../../include/conversation.php:887 -msgid "Please enter a link URL:" -msgstr "Bitte gib die URL des Links ein:" - -#: ../../mod/message.php:145 -msgid "Send Private Message" -msgstr "Private Nachricht senden" - -#: ../../mod/message.php:146 ../../mod/message.php:287 -msgid "To:" -msgstr "An:" - -#: ../../mod/message.php:147 ../../mod/message.php:288 -msgid "Subject:" -msgstr "Betreff:" - -#: ../../mod/message.php:150 ../../mod/message.php:291 -#: ../../mod/invite.php:101 -msgid "Your message:" -msgstr "Deine Nachricht:" - -#: ../../mod/message.php:188 +#: ../../mod/message.php:220 msgid "No messages." msgstr "Keine Nachrichten." -#: ../../mod/message.php:201 +#: ../../mod/message.php:227 +#, php-format +msgid "Unknown sender - %s" +msgstr "'Unbekannter Absender - %s" + +#: ../../mod/message.php:230 +#, php-format +msgid "You and %s" +msgstr "Du und %s" + +#: ../../mod/message.php:233 +#, php-format +msgid "%s and You" +msgstr "%s und Du" + +#: ../../mod/message.php:243 ../../mod/message.php:341 msgid "Delete conversation" msgstr "Unterhaltung löschen" -#: ../../mod/message.php:204 +#: ../../mod/message.php:246 msgid "D, d M Y - g:i A" msgstr "D, d. M Y - g:i A" -#: ../../mod/message.php:239 +#: ../../mod/message.php:248 +#, php-format +msgid "%d message" +msgid_plural "%d messages" +msgstr[0] "%d Nachricht" +msgstr[1] "%d Nachrichten" + +#: ../../mod/message.php:283 msgid "Message not available." msgstr "Nachricht nicht verfügbar." -#: ../../mod/message.php:276 +#: ../../mod/message.php:325 msgid "Delete message" msgstr "Nachricht löschen" -#: ../../mod/message.php:286 +#: ../../mod/message.php:343 +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:347 msgid "Send Reply" msgstr "Antwort senden" @@ -2792,23 +2955,23 @@ msgstr "Freunde von %s" msgid "No friends to display." msgstr "Keine Freunde zum Anzeigen." -#: ../../mod/admin.php:71 ../../mod/admin.php:312 +#: ../../mod/admin.php:71 ../../mod/admin.php:356 msgid "Site" msgstr "Seite" -#: ../../mod/admin.php:72 ../../mod/admin.php:480 ../../mod/admin.php:492 +#: ../../mod/admin.php:72 ../../mod/admin.php:524 ../../mod/admin.php:536 msgid "Users" msgstr "Nutzer" -#: ../../mod/admin.php:73 ../../mod/admin.php:569 ../../mod/admin.php:608 +#: ../../mod/admin.php:73 ../../mod/admin.php:613 ../../mod/admin.php:653 msgid "Plugins" msgstr "Plugins" -#: ../../mod/admin.php:74 ../../mod/admin.php:742 ../../mod/admin.php:775 +#: ../../mod/admin.php:74 ../../mod/admin.php:791 ../../mod/admin.php:825 msgid "Themes" msgstr "Themen" -#: ../../mod/admin.php:89 ../../mod/admin.php:855 +#: ../../mod/admin.php:89 ../../mod/admin.php:905 msgid "Logs" msgstr "Protokolle" @@ -2816,501 +2979,534 @@ msgstr "Protokolle" msgid "User registrations waiting for confirmation" msgstr "Nutzeranmeldungen die auf Bestätigung warten" -#: ../../mod/admin.php:161 ../../mod/admin.php:311 ../../mod/admin.php:479 -#: ../../mod/admin.php:568 ../../mod/admin.php:607 ../../mod/admin.php:741 -#: ../../mod/admin.php:774 ../../mod/admin.php:854 +#: ../../mod/admin.php:157 ../../mod/admin.php:355 ../../mod/admin.php:523 +#: ../../mod/admin.php:612 ../../mod/admin.php:652 ../../mod/admin.php:790 +#: ../../mod/admin.php:824 ../../mod/admin.php:904 msgid "Administration" msgstr "Administration" -#: ../../mod/admin.php:162 +#: ../../mod/admin.php:158 msgid "Summary" msgstr "Zusammenfassung" -#: ../../mod/admin.php:163 +#: ../../mod/admin.php:159 msgid "Registered users" msgstr "Registrierte Nutzer" -#: ../../mod/admin.php:165 +#: ../../mod/admin.php:161 msgid "Pending registrations" msgstr "Anstehende Anmeldungen" -#: ../../mod/admin.php:166 +#: ../../mod/admin.php:162 msgid "Version" msgstr "Version" -#: ../../mod/admin.php:168 +#: ../../mod/admin.php:164 msgid "Active plugins" msgstr "Aktive Plugins" -#: ../../mod/admin.php:260 +#: ../../mod/admin.php:298 msgid "Site settings updated." msgstr "Seiteneinstellungen aktualisiert." -#: ../../mod/admin.php:304 +#: ../../mod/admin.php:342 msgid "Closed" msgstr "Geschlossen" -#: ../../mod/admin.php:305 +#: ../../mod/admin.php:343 msgid "Requires approval" msgstr "Bedarf der Zustimmung" -#: ../../mod/admin.php:306 +#: ../../mod/admin.php:344 msgid "Open" msgstr "Offen" -#: ../../mod/admin.php:315 +#: ../../mod/admin.php:348 +msgid "No SSL policy, links will track page SSL state" +msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten" + +#: ../../mod/admin.php:349 +msgid "Force all links to use SSL" +msgstr "SSL für alle Links erzwingen" + +#: ../../mod/admin.php:350 +msgid "Self-signed certificate, use SSL for local links only (discouraged)" +msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)" + +#: ../../mod/admin.php:359 msgid "File upload" msgstr "Datei hochladen" -#: ../../mod/admin.php:316 +#: ../../mod/admin.php:360 msgid "Policies" msgstr "Regeln" -#: ../../mod/admin.php:317 +#: ../../mod/admin.php:361 msgid "Advanced" msgstr "Erweitert" -#: ../../mod/admin.php:321 ../../addon/statusnet/statusnet.php:523 +#: ../../mod/admin.php:365 ../../addon/statusnet/statusnet.php:538 msgid "Site name" msgstr "Seitenname" -#: ../../mod/admin.php:322 +#: ../../mod/admin.php:366 msgid "Banner/Logo" msgstr "Banner/Logo" -#: ../../mod/admin.php:323 +#: ../../mod/admin.php:367 msgid "System language" msgstr "Systemsprache" -#: ../../mod/admin.php:324 +#: ../../mod/admin.php:368 msgid "System theme" msgstr "Systemweites Thema" -#: ../../mod/admin.php:324 +#: ../../mod/admin.php:368 msgid "Default system theme - may be over-ridden by user profiles" msgstr "Standard Server Theme - kann von den Benutzereinstellungen überschrieben werden." -#: ../../mod/admin.php:326 +#: ../../mod/admin.php:369 +msgid "SSL link policy" +msgstr "Regeln für SSL Links" + +#: ../../mod/admin.php:369 +msgid "Determines whether generated links should be forced to use SSL" +msgstr "Bestimmt, ob generierte Links SSL verwenden müssen" + +#: ../../mod/admin.php:370 msgid "Maximum image size" msgstr "Maximale Größe von Bildern" -#: ../../mod/admin.php:326 +#: ../../mod/admin.php:370 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit." -#: ../../mod/admin.php:328 +#: ../../mod/admin.php:372 msgid "Register policy" msgstr "Registrierungsmethode" -#: ../../mod/admin.php:329 +#: ../../mod/admin.php:373 msgid "Register text" msgstr "Registrierungstext" -#: ../../mod/admin.php:329 +#: ../../mod/admin.php:373 msgid "Will be displayed prominently on the registration page." msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt." -#: ../../mod/admin.php:330 +#: ../../mod/admin.php:374 msgid "Accounts abandoned after x days" msgstr "Accounts gelten nach x Tagen als unbenutzt" -#: ../../mod/admin.php:330 +#: ../../mod/admin.php:374 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit." -#: ../../mod/admin.php:331 +#: ../../mod/admin.php:375 msgid "Allowed friend domains" msgstr "Erlaubte Domains für Kontakte" -#: ../../mod/admin.php:331 +#: ../../mod/admin.php:375 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: ../../mod/admin.php:332 +#: ../../mod/admin.php:376 msgid "Allowed email domains" msgstr "Erlaubte Domains für Emails" -#: ../../mod/admin.php:332 +#: ../../mod/admin.php:376 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: ../../mod/admin.php:333 +#: ../../mod/admin.php:377 msgid "Block public" msgstr "Öffentlichen Zugriff blockieren" -#: ../../mod/admin.php:333 +#: ../../mod/admin.php:377 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist." -#: ../../mod/admin.php:334 +#: ../../mod/admin.php:378 msgid "Force publish" msgstr "Erzwinge Veröffentlichung" -#: ../../mod/admin.php:334 +#: ../../mod/admin.php:378 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen." -#: ../../mod/admin.php:335 +#: ../../mod/admin.php:379 msgid "Global directory update URL" msgstr "URL für Updates beim weltweiten Verzeichnis" -#: ../../mod/admin.php:335 +#: ../../mod/admin.php:379 msgid "" "URL to update the global directory. If this is not set, the global directory" " is completely unavailable to the application." msgstr "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar." -#: ../../mod/admin.php:337 +#: ../../mod/admin.php:381 msgid "Block multiple registrations" msgstr "Unterbinde Mehrfachregistrierung" -#: ../../mod/admin.php:337 +#: ../../mod/admin.php:381 msgid "Disallow users to register additional accounts for use as pages." msgstr "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen." -#: ../../mod/admin.php:338 +#: ../../mod/admin.php:382 msgid "OpenID support" msgstr "OpenID Unterstützung" -#: ../../mod/admin.php:338 +#: ../../mod/admin.php:382 msgid "OpenID support for registration and logins." msgstr "OpenID-Unterstützung für Registrierung und Login." -#: ../../mod/admin.php:339 +#: ../../mod/admin.php:383 msgid "Gravatar support" msgstr "Gravatar Unterstützung" -#: ../../mod/admin.php:339 +#: ../../mod/admin.php:383 msgid "Search new user's photo on Gravatar." msgstr "Suchfunktion bei Gravatar für Profilbilder neuer Nutzer." -#: ../../mod/admin.php:340 +#: ../../mod/admin.php:384 msgid "Fullname check" msgstr "Namen auf Vollständigkeit überprüfen" -#: ../../mod/admin.php:340 +#: ../../mod/admin.php:384 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden." -#: ../../mod/admin.php:341 +#: ../../mod/admin.php:385 msgid "UTF-8 Regular expressions" msgstr "UTF-8 Reguläre Ausdrücke" -#: ../../mod/admin.php:341 +#: ../../mod/admin.php:385 msgid "Use PHP UTF8 regular expressions" msgstr "PHP UTF8 Ausdrücke verwenden" -#: ../../mod/admin.php:342 +#: ../../mod/admin.php:386 msgid "Show Community Page" msgstr "Gemeinschaftsseite anzeigen" -#: ../../mod/admin.php:342 +#: ../../mod/admin.php:386 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server." -#: ../../mod/admin.php:343 +#: ../../mod/admin.php:387 msgid "Enable OStatus support" msgstr "OStatus Unterstützung aktivieren" -#: ../../mod/admin.php:343 +#: ../../mod/admin.php:387 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt." -#: ../../mod/admin.php:344 +#: ../../mod/admin.php:388 msgid "Enable Diaspora support" msgstr "Diaspora-Support aktivieren" -#: ../../mod/admin.php:344 +#: ../../mod/admin.php:388 msgid "Provide built-in Diaspora network compatibility." msgstr "Verwende die eingebaute Diaspora-Verknüpfung." -#: ../../mod/admin.php:345 +#: ../../mod/admin.php:389 msgid "Only allow Friendica contacts" msgstr "Nur Friendica-Kontakte erlauben" -#: ../../mod/admin.php:345 +#: ../../mod/admin.php:389 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert." -#: ../../mod/admin.php:346 +#: ../../mod/admin.php:390 msgid "Verify SSL" msgstr "SSL Überprüfen" -#: ../../mod/admin.php:346 +#: ../../mod/admin.php:390 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you" " cannot connect (at all) to self-signed SSL sites." msgstr "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle anstellen. Das bedeutet, das man zu keinen Seiten mit selbst unterzeichneten SSL eine Verbindung herstellen kann." -#: ../../mod/admin.php:347 +#: ../../mod/admin.php:391 msgid "Proxy user" msgstr "Proxy Nutzer" -#: ../../mod/admin.php:348 +#: ../../mod/admin.php:392 msgid "Proxy URL" msgstr "Proxy URL" -#: ../../mod/admin.php:349 +#: ../../mod/admin.php:393 msgid "Network timeout" msgstr "Netzwerk Wartezeit" -#: ../../mod/admin.php:349 +#: ../../mod/admin.php:393 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)." -#: ../../mod/admin.php:370 +#: ../../mod/admin.php:414 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "%s Benutzer geblockt/freigegeben" msgstr[1] "%s Benutzer geblockt/freigegeben" -#: ../../mod/admin.php:377 +#: ../../mod/admin.php:421 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "%s Nutzer gelöscht" msgstr[1] "%s Nutzer gelöscht" -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:455 #, php-format msgid "User '%s' deleted" msgstr "Nutzer '%s' gelöscht" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:462 #, php-format msgid "User '%s' unblocked" msgstr "Nutzer '%s' entsperrt" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:462 #, php-format msgid "User '%s' blocked" msgstr "Nutzer '%s' gesperrt" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:526 msgid "select all" msgstr "Alle auswählen" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:527 msgid "User registrations waiting for confirm" msgstr "Neuanmeldungen, die auf deine Bestätigung warten" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:528 msgid "Request date" msgstr "Anfrage Datum" -#: ../../mod/admin.php:484 ../../mod/admin.php:493 +#: ../../mod/admin.php:528 ../../mod/admin.php:537 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "Email" -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:529 msgid "No registrations." msgstr "Keine Neuanmeldungen." -#: ../../mod/admin.php:487 +#: ../../mod/admin.php:531 msgid "Deny" msgstr "Verwehren" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:537 msgid "Register date" msgstr "Anmeldedatum" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:537 msgid "Last login" msgstr "Letzte Anmeldung" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:537 msgid "Last item" msgstr "Letzter Beitrag" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:537 msgid "Account" msgstr "Nutzerkonto" -#: ../../mod/admin.php:495 +#: ../../mod/admin.php:539 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist du sicher?" -#: ../../mod/admin.php:496 +#: ../../mod/admin.php:540 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist du sicher?" -#: ../../mod/admin.php:532 +#: ../../mod/admin.php:576 #, php-format msgid "Plugin %s disabled." msgstr "Plugin %s deaktiviert." -#: ../../mod/admin.php:536 +#: ../../mod/admin.php:580 #, php-format msgid "Plugin %s enabled." msgstr "Plugin %s aktiviert." -#: ../../mod/admin.php:546 ../../mod/admin.php:724 +#: ../../mod/admin.php:590 ../../mod/admin.php:769 msgid "Disable" msgstr "Ausschalten" -#: ../../mod/admin.php:548 ../../mod/admin.php:726 +#: ../../mod/admin.php:592 ../../mod/admin.php:771 msgid "Enable" msgstr "Einschalten" -#: ../../mod/admin.php:570 ../../mod/admin.php:743 +#: ../../mod/admin.php:614 ../../mod/admin.php:792 msgid "Toggle" msgstr "Umschalten" -#: ../../mod/admin.php:571 ../../mod/admin.php:744 ../../include/nav.php:130 +#: ../../mod/admin.php:615 ../../mod/admin.php:793 ../../include/nav.php:137 msgid "Settings" msgstr "Einstellungen" -#: ../../mod/admin.php:578 ../../mod/admin.php:753 +#: ../../mod/admin.php:622 ../../mod/admin.php:802 msgid "Author: " msgstr "Autor:" -#: ../../mod/admin.php:579 ../../mod/admin.php:754 +#: ../../mod/admin.php:623 ../../mod/admin.php:803 msgid "Maintainer: " msgstr "Betreuer:" -#: ../../mod/admin.php:689 +#: ../../mod/admin.php:734 msgid "No themes found." msgstr "Keine Themen gefunden." -#: ../../mod/admin.php:780 +#: ../../mod/admin.php:784 +msgid "Screenshot" +msgstr "Bildschirmfoto" + +#: ../../mod/admin.php:830 msgid "[Experimental]" msgstr "[Experimentell]" -#: ../../mod/admin.php:781 +#: ../../mod/admin.php:831 msgid "[Unsupported]" msgstr "[Nicht unterstützt]" -#: ../../mod/admin.php:804 +#: ../../mod/admin.php:854 msgid "Log settings updated." msgstr "Protokolleinstellungen aktualisiert." -#: ../../mod/admin.php:857 +#: ../../mod/admin.php:907 msgid "Clear" msgstr "löschen" -#: ../../mod/admin.php:863 +#: ../../mod/admin.php:913 msgid "Debugging" msgstr "Protokoll führen" -#: ../../mod/admin.php:864 +#: ../../mod/admin.php:914 msgid "Log file" msgstr "Protokolldatei" -#: ../../mod/admin.php:864 +#: ../../mod/admin.php:914 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis." -#: ../../mod/admin.php:865 +#: ../../mod/admin.php:915 msgid "Log level" msgstr "Protokoll-Level" -#: ../../mod/admin.php:906 +#: ../../mod/admin.php:956 msgid "Close" msgstr "Schließen" -#: ../../mod/admin.php:912 +#: ../../mod/admin.php:962 msgid "FTP Host" msgstr "FTP Host" -#: ../../mod/admin.php:913 +#: ../../mod/admin.php:963 msgid "FTP Path" msgstr "FTP Pfad" -#: ../../mod/admin.php:914 +#: ../../mod/admin.php:964 msgid "FTP User" msgstr "FTP Nutzername" -#: ../../mod/admin.php:915 +#: ../../mod/admin.php:965 msgid "FTP Password" msgstr "FTP Passwort" -#: ../../mod/profile.php:15 ../../boot.php:845 +#: ../../mod/profile.php:20 ../../boot.php:901 msgid "Requested profile is not available." msgstr "Das angefragte Profil ist nicht vorhanden." -#: ../../mod/profile.php:111 ../../mod/display.php:67 +#: ../../mod/profile.php:123 ../../mod/display.php:75 msgid "Access to this profile has been restricted." msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt." -#: ../../mod/profile.php:131 +#: ../../mod/profile.php:144 msgid "Tips for New Members" msgstr "Tipps für neue Nutzer" -#: ../../mod/ping.php:174 +#: ../../mod/ping.php:175 msgid "{0} wants to be your friend" msgstr "{0} möchte mit dir in Kontakt treten" -#: ../../mod/ping.php:179 +#: ../../mod/ping.php:180 msgid "{0} sent you a message" msgstr "{0} hat dir eine Nachricht geschickt" -#: ../../mod/ping.php:184 +#: ../../mod/ping.php:185 msgid "{0} requested registration" msgstr "{0} möchte sich registrieren" -#: ../../mod/ping.php:190 +#: ../../mod/ping.php:191 #, php-format msgid "{0} commented %s's post" msgstr "{0} kommentierte einen Beitrag von %s" -#: ../../mod/ping.php:195 +#: ../../mod/ping.php:196 #, php-format msgid "{0} liked %s's post" msgstr "{0} mag %ss Beitrag" -#: ../../mod/ping.php:200 +#: ../../mod/ping.php:201 #, php-format msgid "{0} disliked %s's post" msgstr "{0} mag %ss Beitrag nicht" -#: ../../mod/ping.php:205 +#: ../../mod/ping.php:206 #, php-format msgid "{0} is now friends with %s" msgstr "{0} ist jetzt mit %s befreundet" -#: ../../mod/ping.php:210 +#: ../../mod/ping.php:211 msgid "{0} posted" msgstr "{0} hat etwas veröffentlicht" -#: ../../mod/ping.php:215 +#: ../../mod/ping.php:216 #, php-format msgid "{0} tagged %s's post with #%s" msgstr "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen" -#: ../../mod/ping.php:221 +#: ../../mod/ping.php:222 msgid "{0} mentioned you in a post" msgstr "{0} hat dich in einem Beitrag erwähnt" -#: ../../mod/openid.php:63 ../../mod/openid.php:77 ../../include/auth.php:90 -#: ../../include/auth.php:115 ../../include/auth.php:169 +#: ../../mod/openid.php:24 +msgid "OpenID protocol error. No ID returned." +msgstr "OpenID Protokollfehler. Keine ID zurückgegeben." + +#: ../../mod/openid.php:53 +msgid "" +"Account not found and OpenID registration is not permitted on this site." +msgstr "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet." + +#: ../../mod/openid.php:93 ../../include/auth.php:90 +#: ../../include/auth.php:153 msgid "Login failed." msgstr "Annmeldung fehlgeschlagen." @@ -3367,7 +3563,7 @@ msgstr "Gemeinsame Freunde" msgid "No friends in common." msgstr "Keine gemeinsamen Freunde." -#: ../../mod/display.php:130 +#: ../../mod/display.php:135 msgid "Item has been removed." msgstr "Eintrag wurde entfernt." @@ -3383,222 +3579,233 @@ msgstr "Keine Applikationen installiert." msgid "Search This Site" msgstr "Diese Seite durchsuchen" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:239 -#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:242 +#: ../../mod/profiles.php:356 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "Profil nicht gefunden." -#: ../../mod/profiles.php:28 +#: ../../mod/profiles.php:31 msgid "Profile Name is required." msgstr "Profilname ist erforderlich." -#: ../../mod/profiles.php:198 +#: ../../mod/profiles.php:201 msgid "Profile updated." msgstr "Profil aktualisiert." -#: ../../mod/profiles.php:256 +#: ../../mod/profiles.php:261 msgid "Profile deleted." msgstr "Profil gelöscht." -#: ../../mod/profiles.php:272 ../../mod/profiles.php:303 +#: ../../mod/profiles.php:279 ../../mod/profiles.php:313 msgid "Profile-" msgstr "Profil-" -#: ../../mod/profiles.php:291 ../../mod/profiles.php:330 +#: ../../mod/profiles.php:298 ../../mod/profiles.php:340 msgid "New profile created." msgstr "Neues Profil angelegt." -#: ../../mod/profiles.php:309 +#: ../../mod/profiles.php:319 msgid "Profile unavailable to clone." msgstr "Profil nicht zum Duplizieren verfügbar." -#: ../../mod/profiles.php:356 +#: ../../mod/profiles.php:368 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" -#: ../../mod/profiles.php:374 +#: ../../mod/profiles.php:389 msgid "Edit Profile Details" msgstr "Profil bearbeiten" -#: ../../mod/profiles.php:376 +#: ../../mod/profiles.php:391 msgid "View this profile" msgstr "Dieses Profil anzeigen" -#: ../../mod/profiles.php:377 +#: ../../mod/profiles.php:392 msgid "Create a new profile using these settings" msgstr "Neues Profil anlegen und diese Einstellungen verwenden" -#: ../../mod/profiles.php:378 +#: ../../mod/profiles.php:393 msgid "Clone this profile" msgstr "Dieses Profil duplizieren" -#: ../../mod/profiles.php:379 +#: ../../mod/profiles.php:394 msgid "Delete this profile" msgstr "Dieses Profil löschen" -#: ../../mod/profiles.php:380 +#: ../../mod/profiles.php:395 msgid "Profile Name:" msgstr "Profilname:" -#: ../../mod/profiles.php:381 +#: ../../mod/profiles.php:396 msgid "Your Full Name:" msgstr "Dein kompletter Name:" -#: ../../mod/profiles.php:382 +#: ../../mod/profiles.php:397 msgid "Title/Description:" msgstr "Titel/Beschreibung:" -#: ../../mod/profiles.php:383 +#: ../../mod/profiles.php:398 msgid "Your Gender:" msgstr "Dein Geschlecht:" -#: ../../mod/profiles.php:384 +#: ../../mod/profiles.php:399 #, php-format msgid "Birthday (%s):" msgstr "Geburtstag (%s):" -#: ../../mod/profiles.php:385 +#: ../../mod/profiles.php:400 msgid "Street Address:" msgstr "Adresse:" -#: ../../mod/profiles.php:386 +#: ../../mod/profiles.php:401 msgid "Locality/City:" msgstr "Wohnort/Stadt:" -#: ../../mod/profiles.php:387 +#: ../../mod/profiles.php:402 msgid "Postal/Zip Code:" msgstr "Postleitzahl:" -#: ../../mod/profiles.php:388 +#: ../../mod/profiles.php:403 msgid "Country:" msgstr "Land:" -#: ../../mod/profiles.php:389 +#: ../../mod/profiles.php:404 msgid "Region/State:" msgstr "Region/Bundesstaat:" -#: ../../mod/profiles.php:390 +#: ../../mod/profiles.php:405 msgid "♥ Marital Status:" msgstr "♥ Beziehungsstatus:" -#: ../../mod/profiles.php:391 +#: ../../mod/profiles.php:406 msgid "Who: (if applicable)" msgstr "Wer: (falls anwendbar)" -#: ../../mod/profiles.php:392 +#: ../../mod/profiles.php:407 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" -#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43 +#: ../../mod/profiles.php:408 ../../include/profile_advanced.php:43 msgid "Sexual Preference:" msgstr "Sexuelle Vorlieben:" -#: ../../mod/profiles.php:394 +#: ../../mod/profiles.php:409 msgid "Homepage URL:" msgstr "Adresse der Homepage:" -#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:49 +#: ../../mod/profiles.php:410 ../../include/profile_advanced.php:49 msgid "Political Views:" msgstr "Politische Ansichten:" -#: ../../mod/profiles.php:396 +#: ../../mod/profiles.php:411 msgid "Religious Views:" msgstr "Religiöse Ansichten:" -#: ../../mod/profiles.php:397 +#: ../../mod/profiles.php:412 msgid "Public Keywords:" msgstr "Öffentliche Schlüsselwörter:" -#: ../../mod/profiles.php:398 +#: ../../mod/profiles.php:413 msgid "Private Keywords:" msgstr "Private Schlüsselwörter:" -#: ../../mod/profiles.php:399 +#: ../../mod/profiles.php:414 msgid "Example: fishing photography software" msgstr "Beispiel: Fischen Fotografie Software" -#: ../../mod/profiles.php:400 +#: ../../mod/profiles.php:415 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "(Wird verwendet um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)" -#: ../../mod/profiles.php:401 +#: ../../mod/profiles.php:416 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:402 +#: ../../mod/profiles.php:417 msgid "Tell us about yourself..." msgstr "Erzähle uns ein bisschen von dir …" -#: ../../mod/profiles.php:403 +#: ../../mod/profiles.php:418 msgid "Hobbies/Interests" msgstr "Hobbies/Interessen" -#: ../../mod/profiles.php:404 +#: ../../mod/profiles.php:419 msgid "Contact information and Social Networks" msgstr "Kontaktinformationen und Soziale Netzwerke" -#: ../../mod/profiles.php:405 +#: ../../mod/profiles.php:420 msgid "Musical interests" msgstr "Musikalische Interessen" -#: ../../mod/profiles.php:406 +#: ../../mod/profiles.php:421 msgid "Books, literature" msgstr "Literatur/Bücher" -#: ../../mod/profiles.php:407 +#: ../../mod/profiles.php:422 msgid "Television" msgstr "Fernsehen" -#: ../../mod/profiles.php:408 +#: ../../mod/profiles.php:423 msgid "Film/dance/culture/entertainment" msgstr "Filme/Tänze/Kultur/Unterhaltung" -#: ../../mod/profiles.php:409 +#: ../../mod/profiles.php:424 msgid "Love/romance" msgstr "Liebesleben" -#: ../../mod/profiles.php:410 +#: ../../mod/profiles.php:425 msgid "Work/employment" msgstr "Arbeit/Beschäftigung" -#: ../../mod/profiles.php:411 +#: ../../mod/profiles.php:426 msgid "School/education" msgstr "Schule/Ausbildung" -#: ../../mod/profiles.php:416 +#: ../../mod/profiles.php:431 msgid "" "This is your public profile.
It may " "be visible to anybody using the internet." msgstr "Dies ist dein öffentliches Profil.
Es könnte für jeden Nutzer des Internets sichtbar sein." -#: ../../mod/profiles.php:426 ../../mod/directory.php:124 +#: ../../mod/profiles.php:441 ../../mod/directory.php:111 msgid "Age: " msgstr "Alter: " -#: ../../mod/profiles.php:461 +#: ../../mod/profiles.php:476 ../../view/theme/diabook-red/theme.php:294 +#: ../../view/theme/diabook-blue/theme.php:293 +#: ../../view/theme/diabook/theme.php:303 +#: ../../view/theme/diabook-aerith/theme.php:293 msgid "Edit/Manage Profiles" msgstr "Verwalte/Editiere Profile" -#: ../../mod/profiles.php:462 ../../boot.php:946 +#: ../../mod/profiles.php:477 ../../boot.php:1008 msgid "Change profile photo" msgstr "Profilbild ändern" -#: ../../mod/profiles.php:463 ../../boot.php:947 +#: ../../mod/profiles.php:478 ../../boot.php:1009 msgid "Create New Profile" msgstr "Neues Profil anlegen" -#: ../../mod/profiles.php:473 ../../boot.php:957 +#: ../../mod/profiles.php:489 ../../boot.php:1019 msgid "Profile Image" msgstr "Profilbild" -#: ../../mod/profiles.php:475 ../../boot.php:960 +#: ../../mod/profiles.php:491 ../../boot.php:1022 msgid "visible to everybody" msgstr "sichtbar für jeden" -#: ../../mod/profiles.php:476 ../../boot.php:961 +#: ../../mod/profiles.php:492 ../../boot.php:1023 msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" +#: ../../mod/filer.php:28 ../../include/conversation.php:918 +msgid "Save to Folder:" +msgstr "In diesen Ordner verschieben:" + +#: ../../mod/filer.php:28 +msgid "- select -" +msgstr "- auswählen -" + #: ../../mod/tagger.php:103 ../../include/conversation.php:138 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" @@ -3639,7 +3846,11 @@ msgstr "Hinzufügen" msgid "No entries." msgstr "Keine Einträge" -#: ../../mod/suggest.php:38 ../../include/contact_widgets.php:35 +#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:146 +#: ../../view/theme/diabook-blue/theme.php:146 +#: ../../view/theme/diabook/theme.php:150 +#: ../../view/theme/diabook-aerith/theme.php:146 +#: ../../include/contact_widgets.php:33 msgid "Friend Suggestions" msgstr "Kontaktvorschläge" @@ -3653,31 +3864,26 @@ msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es msgid "Ignore/Hide" msgstr "Ignorieren/Verbergen" -#: ../../mod/directory.php:51 +#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:144 +#: ../../view/theme/diabook-blue/theme.php:144 +#: ../../view/theme/diabook/theme.php:148 +#: ../../view/theme/diabook-aerith/theme.php:144 msgid "Global Directory" msgstr "Weltweites Verzeichnis" -#: ../../mod/directory.php:57 -msgid "Normal site view" -msgstr "Normale Seitenansicht" - -#: ../../mod/directory.php:59 -msgid "Admin - View all site entries" -msgstr "Admin: Alle Einträge dieses Servers anzeigen" - -#: ../../mod/directory.php:65 +#: ../../mod/directory.php:55 msgid "Find on this site" msgstr "Auf diesem Server suchen" -#: ../../mod/directory.php:68 +#: ../../mod/directory.php:58 msgid "Site Directory" msgstr "Verzeichnis" -#: ../../mod/directory.php:127 +#: ../../mod/directory.php:114 msgid "Gender: " msgstr "Geschlecht:" -#: ../../mod/directory.php:153 +#: ../../mod/directory.php:140 msgid "No entries (some entries may be hidden)." msgstr "Keine Einträge (einige Einträge könnten versteckt sein)." @@ -3687,9 +3893,8 @@ msgid "%s : Not a valid email address." msgstr "%s: Keine gültige Email Adresse." #: ../../mod/invite.php:59 -#, php-format -msgid "Please join my network on %s" -msgstr "Bitte trete meinem Netzwerk auf %s bei" +msgid "Please join us on Friendica" +msgstr "Bitte trete uns auf Friendica bei" #: ../../mod/invite.php:69 #, php-format @@ -3707,179 +3912,212 @@ msgstr[1] "%d Nachrichten gesendet." msgid "You have no more invitations available" msgstr "Du hast keine weiteren Einladungen" -#: ../../mod/invite.php:99 -msgid "Send invitations" -msgstr "Einladungen senden" - #: ../../mod/invite.php:100 -msgid "Enter email addresses, one per line:" -msgstr "E-Mail-Adressen eingeben, eine pro Zeile:" +#, php-format +msgid "" +"Visit %s for a list of public sites that you can join. Friendica members on " +"other sites can all connect with each other, as well as with members of many" +" other social networks." +msgstr "Besuche %s für eine Liste der öffentlichen Server, denen du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke." #: ../../mod/invite.php:102 #, php-format -msgid "Please join my social network on %s" -msgstr "Bitte trete meinem Sozialen Netzwerk auf %s bei" +msgid "" +"To accept this invitation, please visit and register at %s or any other " +"public Friendica website." +msgstr "Um diese Freundschaftsanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica Website." #: ../../mod/invite.php:103 -msgid "To accept this invitation, please visit:" -msgstr "Um diese Einladung anzunehmen besuche bitte:" +#, php-format +msgid "" +"Friendica sites all inter-connect to create a huge privacy-enhanced social " +"web that is owned and controlled by its members. They can also connect with " +"many traditional social networks. See %s for a list of alternate Friendica " +"sites you can join." +msgstr "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen du beitreten kannst." -#: ../../mod/invite.php:104 +#: ../../mod/invite.php:106 +msgid "" +"Our apologies. This system is not currently configured to connect with other" +" public sites or invite members." +msgstr "Es tut uns Leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen." + +#: ../../mod/invite.php:111 +msgid "Send invitations" +msgstr "Einladungen senden" + +#: ../../mod/invite.php:112 +msgid "Enter email addresses, one per line:" +msgstr "E-Mail-Adressen eingeben, eine pro Zeile:" + +#: ../../mod/invite.php:114 +msgid "" +"You are cordially invited to join me and other close friends on Friendica - " +"and help us to create a better social web." +msgstr "Du bist herzlich dazu eingeladen, dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen." + +#: ../../mod/invite.php:116 msgid "You will need to supply this invitation code: $invite_code" msgstr "Du benötigst den folgenden Einladungscode: $invite_code" -#: ../../mod/invite.php:104 +#: ../../mod/invite.php:116 msgid "" "Once you have registered, please connect with me via my profile page at:" msgstr "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:" +#: ../../mod/invite.php:118 +msgid "" +"For more information about the Friendica project and why we feel it is " +"important, please visit http://friendica.com" +msgstr "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendica.com" + #: ../../mod/dfrn_confirm.php:119 msgid "" "This may occasionally happen if contact was requested by both persons and it" " has already been approved." msgstr "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde." -#: ../../mod/dfrn_confirm.php:239 +#: ../../mod/dfrn_confirm.php:242 msgid "Response from remote site was not understood." msgstr "Antwort der Gegenstelle unverständlich." -#: ../../mod/dfrn_confirm.php:248 +#: ../../mod/dfrn_confirm.php:251 msgid "Unexpected response from remote site: " msgstr "Unerwartete Antwort der Gegenstelle: " -#: ../../mod/dfrn_confirm.php:256 +#: ../../mod/dfrn_confirm.php:259 msgid "Confirmation completed successfully." msgstr "Bestätigung erfolgreich abgeschlossen." -#: ../../mod/dfrn_confirm.php:258 ../../mod/dfrn_confirm.php:272 -#: ../../mod/dfrn_confirm.php:279 +#: ../../mod/dfrn_confirm.php:261 ../../mod/dfrn_confirm.php:275 +#: ../../mod/dfrn_confirm.php:282 msgid "Remote site reported: " msgstr "Gegenstelle meldet: " -#: ../../mod/dfrn_confirm.php:270 +#: ../../mod/dfrn_confirm.php:273 msgid "Temporary failure. Please wait and try again." msgstr "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal." -#: ../../mod/dfrn_confirm.php:277 +#: ../../mod/dfrn_confirm.php:280 msgid "Introduction failed or was revoked." msgstr "Kontaktanfrage schlug fehl oder wurde zurück gezogen." -#: ../../mod/dfrn_confirm.php:422 +#: ../../mod/dfrn_confirm.php:425 msgid "Unable to set contact photo." msgstr "Konnte das Bild des Kontakts nicht speichern." -#: ../../mod/dfrn_confirm.php:474 ../../include/diaspora.php:495 +#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:503 #: ../../include/conversation.php:101 #, php-format msgid "%1$s is now friends with %2$s" msgstr "%1$s ist nun mit %2$s befreundet" -#: ../../mod/dfrn_confirm.php:544 +#: ../../mod/dfrn_confirm.php:548 #, php-format msgid "No user record found for '%s' " msgstr "Für '%s' wurde kein Nutzer gefunden" -#: ../../mod/dfrn_confirm.php:554 +#: ../../mod/dfrn_confirm.php:558 msgid "Our site encryption key is apparently messed up." msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend im Arsch." -#: ../../mod/dfrn_confirm.php:565 +#: ../../mod/dfrn_confirm.php:569 msgid "Empty site URL was provided or URL could not be decrypted by us." msgstr "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden." -#: ../../mod/dfrn_confirm.php:586 +#: ../../mod/dfrn_confirm.php:590 msgid "Contact record was not found for you on our site." msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden." -#: ../../mod/dfrn_confirm.php:600 +#: ../../mod/dfrn_confirm.php:604 #, php-format msgid "Site public key not available in contact record for URL %s." msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server." -#: ../../mod/dfrn_confirm.php:620 +#: ../../mod/dfrn_confirm.php:624 msgid "" "The ID provided by your system is a duplicate on our system. It should work " "if you try again." msgstr "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal." -#: ../../mod/dfrn_confirm.php:631 +#: ../../mod/dfrn_confirm.php:635 msgid "Unable to set your contact credentials on our system." msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden." -#: ../../mod/dfrn_confirm.php:694 +#: ../../mod/dfrn_confirm.php:700 msgid "Unable to update your contact profile details on our system" msgstr "Die Updates für dein Profil konnten nicht gespeichert werden" -#: ../../mod/dfrn_confirm.php:724 +#: ../../mod/dfrn_confirm.php:730 #, php-format msgid "Connection accepted at %s" msgstr "Auf %s wurde die Verbindung akzeptiert" -#: ../../addon/facebook/facebook.php:338 +#: ../../addon/facebook/facebook.php:462 msgid "Facebook disabled" msgstr "Facebook deaktiviert" -#: ../../addon/facebook/facebook.php:343 +#: ../../addon/facebook/facebook.php:467 msgid "Updating contacts" msgstr "Aktualisiere Kontakte" -#: ../../addon/facebook/facebook.php:352 +#: ../../addon/facebook/facebook.php:488 msgid "Facebook API key is missing." msgstr "Facebook-API-Schlüssel nicht gefunden" -#: ../../addon/facebook/facebook.php:359 +#: ../../addon/facebook/facebook.php:495 msgid "Facebook Connect" msgstr "Mit Facebook verbinden" -#: ../../addon/facebook/facebook.php:365 +#: ../../addon/facebook/facebook.php:501 msgid "Install Facebook connector for this account." msgstr "Facebook-Connector für diesen Account installieren." -#: ../../addon/facebook/facebook.php:372 +#: ../../addon/facebook/facebook.php:508 msgid "Remove Facebook connector" msgstr "Facebook-Connector entfernen" -#: ../../addon/facebook/facebook.php:377 +#: ../../addon/facebook/facebook.php:513 msgid "" "Re-authenticate [This is necessary whenever your Facebook password is " "changed.]" msgstr "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]" -#: ../../addon/facebook/facebook.php:384 +#: ../../addon/facebook/facebook.php:520 msgid "Post to Facebook by default" msgstr "Veröffentliche standardmäßig bei Facebook" -#: ../../addon/facebook/facebook.php:388 +#: ../../addon/facebook/facebook.php:524 msgid "Link all your Facebook friends and conversations on this website" msgstr "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren" -#: ../../addon/facebook/facebook.php:390 +#: ../../addon/facebook/facebook.php:526 msgid "" "Facebook conversations consist of your profile wall and your friend" " stream." msgstr "Facebook-Konversationen bestehen aus deinen Beiträgen auf deinerPinnwand, sowie den Beiträgen deiner Freunde Stream." -#: ../../addon/facebook/facebook.php:391 +#: ../../addon/facebook/facebook.php:527 msgid "On this website, your Facebook friend stream is only visible to you." msgstr "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen." -#: ../../addon/facebook/facebook.php:392 +#: ../../addon/facebook/facebook.php:528 msgid "" "The following settings determine the privacy of your Facebook profile wall " "on this website." msgstr "Mit den folgenden Einstellungen kannst Du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen." -#: ../../addon/facebook/facebook.php:396 +#: ../../addon/facebook/facebook.php:532 msgid "" "On this website your Facebook profile wall conversations will only be " "visible to you" msgstr "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen" -#: ../../addon/facebook/facebook.php:401 +#: ../../addon/facebook/facebook.php:537 msgid "Do not import your Facebook profile wall conversations" msgstr "Facebook-Pinnwand nicht importieren" -#: ../../addon/facebook/facebook.php:403 +#: ../../addon/facebook/facebook.php:539 msgid "" "If you choose to link conversations and leave both of these boxes unchecked," " your Facebook profile wall will be merged with your profile wall on this " @@ -3887,43 +4125,123 @@ msgid "" "who may see the conversations." msgstr "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann." -#: ../../addon/facebook/facebook.php:408 +#: ../../addon/facebook/facebook.php:544 msgid "Comma separated applications to ignore" msgstr "Komma separiert Anwendungen, die ignoriert werden sollen" -#: ../../addon/facebook/facebook.php:476 +#: ../../addon/facebook/facebook.php:615 +msgid "Problems with Facebook Real-Time Updates" +msgstr "Probleme mit Facebook Echtzeit-Updates" + +#: ../../addon/facebook/facebook.php:639 #: ../../include/contact_selectors.php:81 msgid "Facebook" msgstr "Facebook" -#: ../../addon/facebook/facebook.php:477 +#: ../../addon/facebook/facebook.php:640 msgid "Facebook Connector Settings" msgstr "Facebook-Verbindungseinstellungen" -#: ../../addon/facebook/facebook.php:491 +#: ../../addon/facebook/facebook.php:649 +msgid "Facebook API Key" +msgstr "Facebook API Schlüssel" + +#: ../../addon/facebook/facebook.php:658 +msgid "" +"Error: it appears that you have specified the App-ID and -Secret in your " +".htconfig.php file. As long as they are specified there, they cannot be set " +"using this form.

" +msgstr "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.

" + +#: ../../addon/facebook/facebook.php:663 +msgid "" +"Error: the given API Key seems to be incorrect (the application access token" +" could not be retrieved)." +msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)." + +#: ../../addon/facebook/facebook.php:665 +msgid "The given API Key seems to work correctly." +msgstr "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren." + +#: ../../addon/facebook/facebook.php:667 +msgid "" +"The correctness of the API Key could not be detected. Somthing strange's " +"going on." +msgstr "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange." + +#: ../../addon/facebook/facebook.php:670 +msgid "App-ID / API-Key" +msgstr "App-ID / API-Key" + +#: ../../addon/facebook/facebook.php:671 +msgid "Application secret" +msgstr "Anwendungs-Geheimnis" + +#: ../../addon/facebook/facebook.php:672 +#, php-format +msgid "Polling Interval (min. %1$s minutes)" +msgstr "Abrufintervall (min. %1$s Minuten)" + +#: ../../addon/facebook/facebook.php:676 +msgid "Real-Time Updates" +msgstr "Echt-Zeit Aktualisierungen" + +#: ../../addon/facebook/facebook.php:680 +msgid "Real-Time Updates are activated." +msgstr "Echtzeit-Updates sind aktiviert." + +#: ../../addon/facebook/facebook.php:681 +msgid "Deactivate Real-Time Updates" +msgstr "Echtzeit-Updates deaktivieren" + +#: ../../addon/facebook/facebook.php:683 +msgid "Real-Time Updates not activated." +msgstr "Echtzeit-Updates nicht aktiviert." + +#: ../../addon/facebook/facebook.php:683 +msgid "Activate Real-Time Updates" +msgstr "Echtzeit-Updates aktivieren" + +#: ../../addon/facebook/facebook.php:697 +msgid "The new values have been saved." +msgstr "Die neuen Einstellungen wurden gespeichert." + +#: ../../addon/facebook/facebook.php:716 msgid "Post to Facebook" msgstr "Bei Facebook veröffentlichen" -#: ../../addon/facebook/facebook.php:582 +#: ../../addon/facebook/facebook.php:808 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen." -#: ../../addon/facebook/facebook.php:651 -msgid "Image: " -msgstr "Bild: " - -#: ../../addon/facebook/facebook.php:728 +#: ../../addon/facebook/facebook.php:1026 msgid "View on Friendica" msgstr "In Friendica betrachten" -#: ../../addon/facebook/facebook.php:752 +#: ../../addon/facebook/facebook.php:1051 msgid "Facebook post failed. Queued for retry." msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut." -#: ../../addon/facebook/facebook.php:877 ../../addon/facebook/facebook.php:886 -#: ../../include/bb2diaspora.php:102 +#: ../../addon/facebook/facebook.php:1087 +msgid "Your Facebook connection became invalid. Please Re-authenticate." +msgstr "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich." + +#: ../../addon/facebook/facebook.php:1088 +msgid "Facebook connection became invalid" +msgstr "Facebook Anmeldedaten sind ungültig geworden" + +#: ../../addon/facebook/facebook.php:1089 +#, php-format +msgid "" +"Hi %1$s,\n" +"\n" +"The connection between your accounts on %2$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3$sre-authenticate the Facebook-connector%4$s." +msgstr "Hi %1$s,\n\ndie Verbindung von deinem Account auf %2$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du %3$sden Facebook-Connector neu Authentifizieren%4$s." + +#: ../../addon/facebook/facebook.php:1214 +#: ../../addon/facebook/facebook.php:1223 ../../include/bb2diaspora.php:102 msgid "link" msgstr "Verweis" @@ -3941,15 +4259,15 @@ msgid_plural "%d people don't like this" msgstr[0] " %d Person mag das nicht" msgstr[1] "%d Leute mögen das nicht" -#: ../../addon/widgets/widgets.php:55 +#: ../../addon/widgets/widgets.php:56 msgid "Generate new key" msgstr "Neuen Schlüssel erstellen" -#: ../../addon/widgets/widgets.php:58 +#: ../../addon/widgets/widgets.php:59 msgid "Widgets key" msgstr "Widgets Schlüssel" -#: ../../addon/widgets/widgets.php:60 +#: ../../addon/widgets/widgets.php:61 msgid "Widgets available" msgstr "Verfügbare Widgets" @@ -3981,41 +4299,51 @@ msgstr "SSL Verwenden " msgid "yourls Settings saved." msgstr "yourls Einstellungen gespeichert" -#: ../../addon/ljpost/ljpost.php:38 +#: ../../addon/ljpost/ljpost.php:39 msgid "Post to LiveJournal" msgstr "In LiveJournal veröffentlichen." -#: ../../addon/ljpost/ljpost.php:69 +#: ../../addon/ljpost/ljpost.php:70 msgid "LiveJournal Post Settings" msgstr "LiveJournal Veröffentlichungs-Einstellungen" -#: ../../addon/ljpost/ljpost.php:71 +#: ../../addon/ljpost/ljpost.php:72 msgid "Enable LiveJournal Post Plugin" msgstr "LiveJournal Post Plugin aktivieren" -#: ../../addon/ljpost/ljpost.php:76 +#: ../../addon/ljpost/ljpost.php:77 msgid "LiveJournal username" msgstr "LiveJournal Benutzername" -#: ../../addon/ljpost/ljpost.php:81 +#: ../../addon/ljpost/ljpost.php:82 msgid "LiveJournal password" msgstr "LiveJournal Passwort" -#: ../../addon/ljpost/ljpost.php:86 +#: ../../addon/ljpost/ljpost.php:87 msgid "Post to LiveJournal by default" msgstr "Standardmäßig bei LiveJournal veröffentlichen" #: ../../addon/nsfw/nsfw.php:47 -msgid "\"Not Safe For Work\" Settings" -msgstr "\"Not Safe For Work\"-Einstellungen" +msgid "Not Safe For Work (General Purpose Content Filter) settings" +msgstr "Not Safe for Work (allg. Filter für ungewollte Inhalte) Einstellungen:" + +#: ../../addon/nsfw/nsfw.php:49 +msgid "" +"This plugin looks in posts for the words/text you specify below, and " +"collapses any content containing those keywords so it is not displayed at " +"inappropriate times, such as sexual innuendo that may be improper in a work " +"setting. It is polite and recommended to tag any content containing nudity " +"with #NSFW. This filter can also match any other word/text you specify, and" +" can thereby be used as a general purpose content filter." +msgstr "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden." #: ../../addon/nsfw/nsfw.php:50 -msgid "Enable NSFW filter" -msgstr "NSFW Filter aktivieren" +msgid "Enable Content filter" +msgstr "Aktiviere den Inhaltsfilter" #: ../../addon/nsfw/nsfw.php:53 -msgid "Comma separated words to treat as NSFW" -msgstr "Wörter, die gefiltert werden sollen (durch Kommas getrennt)" +msgid "Comma separated list of keywords to hide" +msgstr "Durch Komma getrennte Liste von Schlüsselwörtern die verborgen werden sollen" #: ../../addon/nsfw/nsfw.php:58 msgid "Use /expression/ to provide regular expressions" @@ -4030,11 +4358,15 @@ msgstr "NSFW-Einstellungen gespeichert" msgid "%s - Click to open/close" msgstr "%s – Zum Öffnen/Schließen klicken" +#: ../../addon/page/page.php:47 +msgid "Forums" +msgstr "Foren" + #: ../../addon/communityhome/communityhome.php:28 #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:62 ../../boot.php:710 +#: ../../include/nav.php:64 ../../boot.php:766 msgid "Login" msgstr "Anmeldung" @@ -4044,8 +4376,9 @@ msgid "OpenID" msgstr "OpenID" #: ../../addon/communityhome/communityhome.php:38 -msgid "Last users" -msgstr "Letzte Nutzer" +#: ../../addon/communityhome/twillingham/communityhome.php:38 +msgid "Latest users" +msgstr "Letzte Benutzer" #: ../../addon/communityhome/communityhome.php:81 #: ../../addon/communityhome/twillingham/communityhome.php:81 @@ -4053,22 +4386,22 @@ msgid "Most active users" msgstr "Aktivste Nutzer" #: ../../addon/communityhome/communityhome.php:98 -msgid "Last photos" -msgstr "Letzte Fotos" +msgid "Latest photos" +msgstr "Neueste Fotos" #: ../../addon/communityhome/communityhome.php:133 -msgid "Last likes" -msgstr "Zuletzt gemocht" +msgid "Latest likes" +msgstr "Neueste Favoriten" -#: ../../addon/communityhome/communityhome.php:155 ../../include/text.php:1224 +#: ../../addon/communityhome/communityhome.php:155 +#: ../../view/theme/diabook-red/theme.php:74 +#: ../../view/theme/diabook-blue/theme.php:74 +#: ../../view/theme/diabook/theme.php:78 +#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1292 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "Veranstaltung" -#: ../../addon/communityhome/twillingham/communityhome.php:38 -msgid "Latest users" -msgstr "Letzte Benutzer" - #: ../../addon/uhremotestorage/uhremotestorage.php:84 #, php-format msgid "" @@ -4156,27 +4489,27 @@ msgstr "Randplace-Einstellungen" msgid "Enable Randplace Plugin" msgstr "Randplace-Plugin aktivieren" -#: ../../addon/dwpost/dwpost.php:38 +#: ../../addon/dwpost/dwpost.php:39 msgid "Post to Dreamwidth" msgstr "In Dreamwidth veröffentlichen" -#: ../../addon/dwpost/dwpost.php:69 +#: ../../addon/dwpost/dwpost.php:70 msgid "Dreamwidth Post Settings" msgstr "Dreamwidth Veröffentlichungs-Einstellungen" -#: ../../addon/dwpost/dwpost.php:71 +#: ../../addon/dwpost/dwpost.php:72 msgid "Enable dreamwidth Post Plugin" msgstr "Dreamwidth Post Plugin aktivieren" -#: ../../addon/dwpost/dwpost.php:76 +#: ../../addon/dwpost/dwpost.php:77 msgid "dreamwidth username" msgstr "Dreamwidth Benutzername" -#: ../../addon/dwpost/dwpost.php:81 +#: ../../addon/dwpost/dwpost.php:82 msgid "dreamwidth password" msgstr "Dreamwidth Passwort" -#: ../../addon/dwpost/dwpost.php:86 +#: ../../addon/dwpost/dwpost.php:87 msgid "Post to dreamwidth by default" msgstr "Standardmäßig bei Dreamwidth veröffentlichen" @@ -4216,7 +4549,7 @@ msgstr "Drupal Seite verwendet bereinigte URLs" msgid "Post to Drupal by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal" -#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:172 +#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190 #: ../../addon/posterous/posterous.php:173 msgid "Post from Friendica" msgstr "Beitrag via Friendica" @@ -4401,15 +4734,39 @@ msgstr "Editplain Einstellungen" msgid "Disable richtext status editor" msgstr "RichText Editor deaktivieren" -#: ../../addon/pageheader/pageheader.php:47 +#: ../../addon/pageheader/pageheader.php:50 msgid "\"pageheader\" Settings" msgstr "\"pageheader\"-Einstellungen" -#: ../../addon/pageheader/pageheader.php:65 +#: ../../addon/pageheader/pageheader.php:68 msgid "pageheader Settings saved." msgstr "pageheader-Einstellungen gespeichert." -#: ../../addon/viewsrc/viewsrc.php:25 +#: ../../addon/ijpost/ijpost.php:39 +msgid "Post to Insanejournal" +msgstr "Auf InsaneJournal posten." + +#: ../../addon/ijpost/ijpost.php:70 +msgid "InsaneJournal Post Settings" +msgstr "InsaneJournal Beitrags-Einstellungen" + +#: ../../addon/ijpost/ijpost.php:72 +msgid "Enable InsaneJournal Post Plugin" +msgstr "InsaneJournal Plugin aktivieren" + +#: ../../addon/ijpost/ijpost.php:77 +msgid "InsaneJournal username" +msgstr "InsaneJournal Benutzername" + +#: ../../addon/ijpost/ijpost.php:82 +msgid "InsaneJournal password" +msgstr "InsaneJournal Passwort" + +#: ../../addon/ijpost/ijpost.php:87 +msgid "Post to InsaneJournal by default" +msgstr "Standardmäßig auf InsaneJournal posten." + +#: ../../addon/viewsrc/viewsrc.php:37 msgid "View Source" msgstr "Quelle ansehen" @@ -4417,40 +4774,40 @@ msgstr "Quelle ansehen" msgid "Post to StatusNet" msgstr "Bei StatusNet veröffentlichen" -#: ../../addon/statusnet/statusnet.php:175 +#: ../../addon/statusnet/statusnet.php:176 msgid "" "Please contact your site administrator.
The provided API URL is not " "valid." msgstr "Bitte kontaktiere den Administrator des Servers.
Die angegebene API-URL ist nicht gültig." -#: ../../addon/statusnet/statusnet.php:203 +#: ../../addon/statusnet/statusnet.php:204 msgid "We could not contact the StatusNet API with the Path you entered." msgstr "Die StatusNet-API konnte mit dem angegebenen Pfad nicht erreicht werden." -#: ../../addon/statusnet/statusnet.php:229 +#: ../../addon/statusnet/statusnet.php:232 msgid "StatusNet settings updated." msgstr "StatusNet Einstellungen aktualisiert." -#: ../../addon/statusnet/statusnet.php:252 +#: ../../addon/statusnet/statusnet.php:257 msgid "StatusNet Posting Settings" msgstr "StatusNet-Beitragseinstellungen" -#: ../../addon/statusnet/statusnet.php:266 +#: ../../addon/statusnet/statusnet.php:271 msgid "Globally Available StatusNet OAuthKeys" msgstr "Verfügbare OAuth Schlüssel für StatusNet" -#: ../../addon/statusnet/statusnet.php:267 +#: ../../addon/statusnet/statusnet.php:272 msgid "" "There are preconfigured OAuth key pairs for some StatusNet servers " "available. If you are useing one of them, please use these credentials. If " "not feel free to connect to any other StatusNet instance (see below)." msgstr "Für einige StatusNet Server sind voreingestellt OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stellen stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten)." -#: ../../addon/statusnet/statusnet.php:275 +#: ../../addon/statusnet/statusnet.php:280 msgid "Provide your own OAuth Credentials" msgstr "Eigene OAuth Schlüssel eintragen" -#: ../../addon/statusnet/statusnet.php:276 +#: ../../addon/statusnet/statusnet.php:281 msgid "" "No consumer key pair for StatusNet found. Register your Friendica Account as" " an desktop client on your StatusNet account, copy the consumer key pair " @@ -4459,19 +4816,19 @@ msgid "" "Friendica installation at your favorited StatusNet installation." msgstr "Kein Consumer-Schlüsselpaar für StatusNet gefunden. Registriere deinen Friendica-Account als Desktop-Client, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.
Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Friendica-Servers, ob schon ein Schlüsselpaar für diesen Friendica-Server auf diesem StatusNet-Server existiert." -#: ../../addon/statusnet/statusnet.php:278 +#: ../../addon/statusnet/statusnet.php:283 msgid "OAuth Consumer Key" msgstr "OAuth Consumer Key" -#: ../../addon/statusnet/statusnet.php:281 +#: ../../addon/statusnet/statusnet.php:286 msgid "OAuth Consumer Secret" msgstr "OAuth Consumer Secret" -#: ../../addon/statusnet/statusnet.php:284 +#: ../../addon/statusnet/statusnet.php:289 msgid "Base API Path (remember the trailing /)" msgstr "Basis-URL der StatusNet-API (vergiss den abschließenden / nicht)" -#: ../../addon/statusnet/statusnet.php:305 +#: ../../addon/statusnet/statusnet.php:310 msgid "" "To connect to your StatusNet account click the button below to get a " "security code from StatusNet which you have to copy into the input box below" @@ -4479,38 +4836,38 @@ msgid "" " to StatusNet." msgstr "Um deinen Account mit einem StatusNet-Account zu verknüpfen, klicke den Button an, um einen Sicherheitscode von StatusNet zu erhalten, und kopiere diesen in das Eingabefeld weiter unten. Es werden ausschließlich deine öffentlichen Nachrichten an StatusNet gesendet." -#: ../../addon/statusnet/statusnet.php:306 +#: ../../addon/statusnet/statusnet.php:311 msgid "Log in with StatusNet" msgstr "Bei StatusNet anmelden" -#: ../../addon/statusnet/statusnet.php:308 +#: ../../addon/statusnet/statusnet.php:313 msgid "Copy the security code from StatusNet here" msgstr "Kopiere den Sicherheitscode von StatusNet hier hin" -#: ../../addon/statusnet/statusnet.php:314 +#: ../../addon/statusnet/statusnet.php:319 msgid "Cancel Connection Process" msgstr "Verbindungsprozess abbrechen" -#: ../../addon/statusnet/statusnet.php:316 +#: ../../addon/statusnet/statusnet.php:321 msgid "Current StatusNet API is" msgstr "Derzeitige StatusNet-API-URL lautet" -#: ../../addon/statusnet/statusnet.php:317 +#: ../../addon/statusnet/statusnet.php:322 msgid "Cancel StatusNet Connection" msgstr "Verbindung zum StatusNet Server abbrechen" -#: ../../addon/statusnet/statusnet.php:328 ../../addon/twitter/twitter.php:184 +#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189 msgid "Currently connected to: " msgstr "Momentan verbunden mit: " -#: ../../addon/statusnet/statusnet.php:329 +#: ../../addon/statusnet/statusnet.php:334 msgid "" "If enabled all your public postings can be posted to the " "associated StatusNet account. You can choose to do so by default (here) or " "for every posting separately in the posting options when writing the entry." msgstr "Wenn aktiviert, so können all deine öffentlichen Einträge auf dem verbundenen StatusNet Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen." -#: ../../addon/statusnet/statusnet.php:331 +#: ../../addon/statusnet/statusnet.php:336 msgid "" "Note: Due your privacy settings (Hide your profile " "details from unknown viewers?) the link potentially included in public " @@ -4518,19 +4875,23 @@ msgid "" "informing the visitor that the access to your profile has been restricted." msgstr "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde." -#: ../../addon/statusnet/statusnet.php:334 +#: ../../addon/statusnet/statusnet.php:339 msgid "Allow posting to StatusNet" msgstr "Veröffentlichung bei StatusNet erlauben" -#: ../../addon/statusnet/statusnet.php:337 +#: ../../addon/statusnet/statusnet.php:342 msgid "Send public postings to StatusNet by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet" -#: ../../addon/statusnet/statusnet.php:342 ../../addon/twitter/twitter.php:198 +#: ../../addon/statusnet/statusnet.php:345 +msgid "Send #tag links to StatusNet" +msgstr "#Tags nach StatusNet senden" + +#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206 msgid "Clear OAuth configuration" msgstr "OAuth-Konfiguration löschen" -#: ../../addon/statusnet/statusnet.php:524 +#: ../../addon/statusnet/statusnet.php:539 msgid "API URL" msgstr "API-URL" @@ -4637,9 +4998,10 @@ msgstr "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben" msgid "Show More Settings saved." msgstr "\"Mehr zeigen\" Einstellungen gesichert." -#: ../../addon/showmore/showmore.php:86 -msgid "Show More" -msgstr "\"Mehr zeigen\"" +#: ../../addon/showmore/showmore.php:86 ../../include/conversation.php:466 +#: ../../boot.php:495 +msgid "show more" +msgstr "mehr anzeigen" #: ../../addon/piwik/piwik.php:79 msgid "" @@ -4681,21 +5043,21 @@ msgstr "Asynchrones Tracken" msgid "Post to Twitter" msgstr "Bei Twitter veröffentlichen" -#: ../../addon/twitter/twitter.php:119 +#: ../../addon/twitter/twitter.php:122 msgid "Twitter settings updated." msgstr "Twitter Einstellungen aktualisiert." -#: ../../addon/twitter/twitter.php:141 +#: ../../addon/twitter/twitter.php:146 msgid "Twitter Posting Settings" msgstr "Twitter-Beitragseinstellungen" -#: ../../addon/twitter/twitter.php:148 +#: ../../addon/twitter/twitter.php:153 msgid "" "No consumer key pair for Twitter found. Please contact your site " "administrator." msgstr "Kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite." -#: ../../addon/twitter/twitter.php:167 +#: ../../addon/twitter/twitter.php:172 msgid "" "At this Friendica instance the Twitter plugin was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " @@ -4704,22 +5066,22 @@ msgid "" " be posted to Twitter." msgstr "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur öffentliche Beiträge werden bei Twitter veröffentlicht." -#: ../../addon/twitter/twitter.php:168 +#: ../../addon/twitter/twitter.php:173 msgid "Log in with Twitter" msgstr "bei Twitter anmelden" -#: ../../addon/twitter/twitter.php:170 +#: ../../addon/twitter/twitter.php:175 msgid "Copy the PIN from Twitter here" msgstr "Kopiere die Twitter-PIN hier her" -#: ../../addon/twitter/twitter.php:185 +#: ../../addon/twitter/twitter.php:190 msgid "" "If enabled all your public postings can be posted to the " "associated Twitter account. You can choose to do so by default (here) or for" " every posting separately in the posting options when writing the entry." msgstr "Wenn aktiviert, so können all deine öffentlichen Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen." -#: ../../addon/twitter/twitter.php:187 +#: ../../addon/twitter/twitter.php:192 msgid "" "Note: Due your privacy settings (Hide your profile " "details from unknown viewers?) the link potentially included in public " @@ -4727,25 +5089,33 @@ msgid "" "the visitor that the access to your profile has been restricted." msgstr "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde." -#: ../../addon/twitter/twitter.php:190 +#: ../../addon/twitter/twitter.php:195 msgid "Allow posting to Twitter" msgstr "Veröffentlichung bei Twitter erlauben" -#: ../../addon/twitter/twitter.php:193 +#: ../../addon/twitter/twitter.php:198 msgid "Send public postings to Twitter by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter" -#: ../../addon/twitter/twitter.php:357 +#: ../../addon/twitter/twitter.php:201 +msgid "Send #tag links to Twitter" +msgstr "#Tags nach Twitter senden" + +#: ../../addon/twitter/twitter.php:371 msgid "Consumer key" msgstr "Consumer Key" -#: ../../addon/twitter/twitter.php:358 +#: ../../addon/twitter/twitter.php:372 msgid "Consumer secret" msgstr "Consumer Secret" -#: ../../addon/irc/irc.php:20 -msgid "irc Chatroom" -msgstr "irc Chatroom" +#: ../../addon/irc/irc.php:25 +msgid "IRC Chatroom" +msgstr "IRC Chatraum" + +#: ../../addon/irc/irc.php:46 +msgid "Popular Channels" +msgstr "Beliebte Räume" #: ../../addon/posterous/posterous.php:36 msgid "Post to Posterous" @@ -4771,23 +5141,183 @@ msgstr "Posterous-Passwort" msgid "Post to Posterous by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous" -#: ../../view/theme/quattro/theme.php:17 +#: ../../view/theme/diabook-red/theme.php:23 +#: ../../view/theme/diabook-blue/theme.php:23 +#: ../../view/theme/diabook/theme.php:27 +#: ../../view/theme/dispy-dark/theme.php:116 +#: ../../view/theme/diabook-aerith/theme.php:23 +msgid "Last users" +msgstr "Letzte Nutzer" + +#: ../../view/theme/diabook-red/theme.php:52 +#: ../../view/theme/diabook-blue/theme.php:52 +#: ../../view/theme/diabook/theme.php:56 +#: ../../view/theme/diabook-aerith/theme.php:52 +msgid "Last likes" +msgstr "Zuletzt gemocht" + +#: ../../view/theme/diabook-red/theme.php:97 +#: ../../view/theme/diabook-blue/theme.php:97 +#: ../../view/theme/diabook/theme.php:101 +#: ../../view/theme/diabook-aerith/theme.php:97 +msgid "Last photos" +msgstr "Letzte Fotos" + +#: ../../view/theme/diabook-red/theme.php:142 +#: ../../view/theme/diabook-blue/theme.php:142 +#: ../../view/theme/diabook/theme.php:146 +#: ../../view/theme/diabook-aerith/theme.php:142 +msgid "Find Friends" +msgstr "Freunde finden" + +#: ../../view/theme/diabook-red/theme.php:143 +#: ../../view/theme/diabook-blue/theme.php:143 +#: ../../view/theme/diabook/theme.php:147 +#: ../../view/theme/diabook-aerith/theme.php:143 +msgid "Local Directory" +msgstr "Lokales Verzeichnis" + +#: ../../view/theme/diabook-red/theme.php:145 +#: ../../view/theme/diabook-blue/theme.php:145 +#: ../../view/theme/diabook/theme.php:149 +#: ../../view/theme/diabook-aerith/theme.php:145 +#: ../../include/contact_widgets.php:34 +msgid "Similar Interests" +msgstr "Ähnliche Interessen" + +#: ../../view/theme/diabook-red/theme.php:147 +#: ../../view/theme/diabook-blue/theme.php:147 +#: ../../view/theme/diabook/theme.php:151 +#: ../../view/theme/diabook-aerith/theme.php:147 +#: ../../include/contact_widgets.php:35 +msgid "Invite Friends" +msgstr "Freunde einladen" + +#: ../../view/theme/diabook-red/theme.php:162 +#: ../../view/theme/diabook-red/theme.php:243 +#: ../../view/theme/diabook-blue/theme.php:162 +#: ../../view/theme/diabook-blue/theme.php:243 +#: ../../view/theme/diabook/theme.php:167 +#: ../../view/theme/diabook/theme.php:251 +#: ../../view/theme/diabook-aerith/theme.php:162 +#: ../../view/theme/diabook-aerith/theme.php:243 +msgid "Community Pages" +msgstr "Foren" + +#: ../../view/theme/diabook-red/theme.php:195 +#: ../../view/theme/diabook-blue/theme.php:195 +#: ../../view/theme/diabook/theme.php:200 +#: ../../view/theme/diabook-aerith/theme.php:195 +msgid "Help or @NewHere ?" +msgstr "Hilfe oder @NewHere" + +#: ../../view/theme/diabook-red/theme.php:201 +#: ../../view/theme/diabook-blue/theme.php:201 +#: ../../view/theme/diabook/theme.php:206 +#: ../../view/theme/diabook-aerith/theme.php:201 +msgid "Connect Services" +msgstr "Mit anderen Webanwendungen verbinden" + +#: ../../view/theme/diabook-red/theme.php:207 +#: ../../view/theme/diabook-blue/theme.php:207 +#: ../../view/theme/diabook/theme.php:212 +#: ../../view/theme/diabook-aerith/theme.php:207 +msgid "PostIt to Friendica" +msgstr "PostIt nach Friendica" + +#: ../../view/theme/diabook-red/theme.php:207 +#: ../../view/theme/diabook-blue/theme.php:207 +#: ../../view/theme/diabook/theme.php:212 +#: ../../view/theme/diabook-aerith/theme.php:207 +msgid "Post to Friendica" +msgstr "Bei Friendica veröffentlichen" + +#: ../../view/theme/diabook-red/theme.php:208 +#: ../../view/theme/diabook-blue/theme.php:208 +#: ../../view/theme/diabook/theme.php:213 +#: ../../view/theme/diabook-aerith/theme.php:208 +msgid " from anywhere by bookmarking this Link." +msgstr " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst." + +#: ../../view/theme/diabook-red/theme.php:236 +#: ../../view/theme/diabook-blue/theme.php:236 +#: ../../view/theme/diabook/theme.php:244 +#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:49 +#: ../../include/nav.php:115 +msgid "Your posts and conversations" +msgstr "Deine Beiträge und Unterhaltungen" + +#: ../../view/theme/diabook-red/theme.php:237 +#: ../../view/theme/diabook-blue/theme.php:237 +#: ../../view/theme/diabook/theme.php:245 +#: ../../view/theme/diabook-aerith/theme.php:237 ../../include/nav.php:50 +msgid "Your profile page" +msgstr "Deine Profilseite" + +#: ../../view/theme/diabook-red/theme.php:238 +#: ../../view/theme/diabook-blue/theme.php:238 +#: ../../view/theme/diabook/theme.php:246 +#: ../../view/theme/diabook-aerith/theme.php:238 +msgid "Your contacts" +msgstr "Deine Kontakte" + +#: ../../view/theme/diabook-red/theme.php:239 +#: ../../view/theme/diabook-blue/theme.php:239 +#: ../../view/theme/diabook/theme.php:247 +#: ../../view/theme/diabook-aerith/theme.php:239 ../../include/nav.php:51 +#: ../../boot.php:1413 +msgid "Photos" +msgstr "Bilder" + +#: ../../view/theme/diabook-red/theme.php:239 +#: ../../view/theme/diabook-blue/theme.php:239 +#: ../../view/theme/diabook/theme.php:247 +#: ../../view/theme/diabook-aerith/theme.php:239 ../../include/nav.php:51 +msgid "Your photos" +msgstr "Deine Fotos" + +#: ../../view/theme/diabook-red/theme.php:240 +#: ../../view/theme/diabook-blue/theme.php:240 +#: ../../view/theme/diabook/theme.php:248 +#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:52 +msgid "Your events" +msgstr "Deine Ereignisse" + +#: ../../view/theme/diabook-red/theme.php:241 +#: ../../view/theme/diabook-blue/theme.php:241 +#: ../../view/theme/diabook/theme.php:249 +#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53 +msgid "Personal notes" +msgstr "Persönliche Notizen" + +#: ../../view/theme/diabook-red/theme.php:241 +#: ../../view/theme/diabook-blue/theme.php:241 +#: ../../view/theme/diabook/theme.php:249 +#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53 +msgid "Your personal photos" +msgstr "Deine privaten Fotos" + +#: ../../view/theme/quattro/config.php:23 msgid "Theme settings" msgstr "Themen Einstellungen" -#: ../../view/theme/quattro/theme.php:18 +#: ../../view/theme/quattro/config.php:24 msgid "Alignment" msgstr "Ausrichtung" -#: ../../view/theme/quattro/theme.php:18 +#: ../../view/theme/quattro/config.php:24 msgid "Left" msgstr "Links" -#: ../../view/theme/quattro/theme.php:18 +#: ../../view/theme/quattro/config.php:24 msgid "Center" msgstr "Mitte" -#: ../../include/profile_advanced.php:17 ../../boot.php:982 +#: ../../view/theme/quattro/config.php:25 +msgid "Color scheme" +msgstr "Farbschema" + +#: ../../include/profile_advanced.php:17 ../../boot.php:1044 msgid "Gender:" msgstr "Geschlecht:" @@ -4800,7 +5330,7 @@ msgid "j F" msgstr "j F" #: ../../include/profile_advanced.php:30 ../../include/datetime.php:438 -#: ../../include/items.php:1349 +#: ../../include/items.php:1392 msgid "Birthday:" msgstr "Geburtstag:" @@ -4808,11 +5338,11 @@ msgstr "Geburtstag:" msgid "Age:" msgstr "Alter:" -#: ../../include/profile_advanced.php:37 ../../boot.php:985 +#: ../../include/profile_advanced.php:37 ../../boot.php:1047 msgid "Status:" msgstr "Status:" -#: ../../include/profile_advanced.php:45 ../../boot.php:987 +#: ../../include/profile_advanced.php:45 ../../boot.php:1049 msgid "Homepage:" msgstr "Homepage:" @@ -5156,168 +5686,192 @@ msgstr "Beginnt:" msgid "Finishes:" msgstr "Endet:" -#: ../../include/delivery.php:425 ../../include/notifier.php:638 +#: ../../include/delivery.php:434 ../../include/notifier.php:651 msgid "(no subject)" msgstr "(kein Betreff)" -#: ../../include/delivery.php:432 ../../include/enotify.php:17 -#: ../../include/notifier.php:645 +#: ../../include/delivery.php:441 ../../include/enotify.php:23 +#: ../../include/notifier.php:658 msgid "noreply" msgstr "noreply" -#: ../../include/text.php:238 +#: ../../include/text.php:240 msgid "prev" msgstr "vorige" -#: ../../include/text.php:240 +#: ../../include/text.php:242 msgid "first" msgstr "erste" -#: ../../include/text.php:269 +#: ../../include/text.php:271 msgid "last" msgstr "letzte" -#: ../../include/text.php:272 +#: ../../include/text.php:274 msgid "next" msgstr "nächste" -#: ../../include/text.php:563 +#: ../../include/text.php:565 msgid "No contacts" msgstr "Keine Kontakte" -#: ../../include/text.php:572 +#: ../../include/text.php:574 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "%d Kontakt" msgstr[1] "%d Kontakte" -#: ../../include/text.php:643 ../../include/nav.php:87 +#: ../../include/text.php:647 ../../include/nav.php:91 msgid "Search" msgstr "Suche" -#: ../../include/text.php:831 +#: ../../include/text.php:828 msgid "Monday" msgstr "Montag" -#: ../../include/text.php:831 +#: ../../include/text.php:828 msgid "Tuesday" msgstr "Dienstag" -#: ../../include/text.php:831 +#: ../../include/text.php:828 msgid "Wednesday" msgstr "Mittwoch" -#: ../../include/text.php:831 +#: ../../include/text.php:828 msgid "Thursday" msgstr "Donnerstag" -#: ../../include/text.php:831 +#: ../../include/text.php:828 msgid "Friday" msgstr "Freitag" -#: ../../include/text.php:831 +#: ../../include/text.php:828 msgid "Saturday" msgstr "Samstag" -#: ../../include/text.php:831 +#: ../../include/text.php:828 msgid "Sunday" msgstr "Sonntag" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "January" msgstr "Januar" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "February" msgstr "Februar" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "March" msgstr "März" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "April" msgstr "April" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "May" msgstr "Mai" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "June" msgstr "Juni" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "July" msgstr "Juli" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "August" msgstr "August" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "September" msgstr "September" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "October" msgstr "Oktober" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "November" msgstr "November" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "December" msgstr "Dezember" -#: ../../include/text.php:905 +#: ../../include/text.php:916 msgid "bytes" msgstr "Byte" -#: ../../include/text.php:1000 +#: ../../include/text.php:933 +msgid "Categories:" +msgstr "Kategorien:" + +#: ../../include/text.php:945 +msgid "remove" +msgstr "löschen" + +#: ../../include/text.php:945 +msgid "[remove]" +msgstr "[löschen]" + +#: ../../include/text.php:948 +msgid "Filed under:" +msgstr "Abgelegt unter:" + +#: ../../include/text.php:964 ../../include/text.php:976 +msgid "Click to open/close" +msgstr "Zum öffnen/schließen klicken" + +#: ../../include/text.php:1068 msgid "Select an alternate language" msgstr "Alternative Sprache auswählen" -#: ../../include/text.php:1012 +#: ../../include/text.php:1080 msgid "default" msgstr "standard" -#: ../../include/text.php:1228 +#: ../../include/text.php:1296 msgid "activity" msgstr "Aktivität" -#: ../../include/text.php:1230 +#: ../../include/text.php:1298 msgid "comment" msgstr "Kommentar" -#: ../../include/text.php:1231 +#: ../../include/text.php:1299 msgid "post" msgstr "Beitrag" -#: ../../include/diaspora.php:570 +#: ../../include/text.php:1454 +msgid "Item filed" +msgstr "Beitrag abgelegt" + +#: ../../include/diaspora.php:578 msgid "Sharing notification from Diaspora network" msgstr "Freigabe-Benachrichtigung von Diaspora" -#: ../../include/diaspora.php:1911 +#: ../../include/diaspora.php:1965 msgid "Attachments:" msgstr "Anhänge:" -#: ../../include/diaspora.php:2094 +#: ../../include/diaspora.php:2148 #, php-format msgid "[Relayed] Comment authored by %s from network %s" msgstr "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk" -#: ../../include/network.php:814 +#: ../../include/network.php:817 msgid "view full size" msgstr "Volle Größe anzeigen" -#: ../../include/oembed.php:128 +#: ../../include/oembed.php:132 msgid "Embedded content" msgstr "Eingebetteter Inhalt" -#: ../../include/oembed.php:137 +#: ../../include/oembed.php:141 msgid "Embedding disabled" msgstr "Einbettungen deaktiviert" @@ -5348,135 +5902,115 @@ msgstr "Gruppe bearbeiten" msgid "Create a new group" msgstr "Neue Gruppe erstellen" -#: ../../include/nav.php:44 ../../boot.php:709 +#: ../../include/nav.php:46 ../../boot.php:765 msgid "Logout" msgstr "Abmelden" -#: ../../include/nav.php:44 +#: ../../include/nav.php:46 msgid "End this session" msgstr "Diese Sitzung beenden" -#: ../../include/nav.php:47 ../../boot.php:1331 +#: ../../include/nav.php:49 ../../boot.php:1403 msgid "Status" msgstr "Status" -#: ../../include/nav.php:47 ../../include/nav.php:111 -msgid "Your posts and conversations" -msgstr "Deine Beiträge und Unterhaltungen" - -#: ../../include/nav.php:48 -msgid "Your profile page" -msgstr "Deine Profilseite" - -#: ../../include/nav.php:49 ../../boot.php:1341 -msgid "Photos" -msgstr "Bilder" - -#: ../../include/nav.php:49 -msgid "Your photos" -msgstr "Deine Fotos" - -#: ../../include/nav.php:50 -msgid "Your events" -msgstr "Deine Ereignisse" - -#: ../../include/nav.php:51 -msgid "Personal notes" -msgstr "Persönliche Notizen" - -#: ../../include/nav.php:51 -msgid "Your personal photos" -msgstr "Deine privaten Fotos" - -#: ../../include/nav.php:62 +#: ../../include/nav.php:64 msgid "Sign in" msgstr "Anmelden" -#: ../../include/nav.php:73 +#: ../../include/nav.php:77 msgid "Home Page" msgstr "Homepage" -#: ../../include/nav.php:77 +#: ../../include/nav.php:81 msgid "Create an account" msgstr "Account erstellen" -#: ../../include/nav.php:82 +#: ../../include/nav.php:86 msgid "Help and documentation" msgstr "Hilfe und Dokumentation" -#: ../../include/nav.php:85 +#: ../../include/nav.php:89 msgid "Apps" msgstr "Apps" -#: ../../include/nav.php:85 +#: ../../include/nav.php:89 msgid "Addon applications, utilities, games" msgstr "Addon Anwendungen, Dienstprogramme, Spiele" -#: ../../include/nav.php:87 +#: ../../include/nav.php:91 msgid "Search site content" msgstr "Inhalt der Seite durchsuchen" -#: ../../include/nav.php:97 +#: ../../include/nav.php:101 msgid "Conversations on this site" msgstr "Unterhaltungen auf dieser Seite" -#: ../../include/nav.php:99 +#: ../../include/nav.php:103 msgid "Directory" msgstr "Verzeichnis" -#: ../../include/nav.php:99 +#: ../../include/nav.php:103 msgid "People directory" msgstr "Nutzerverzeichnis" -#: ../../include/nav.php:109 +#: ../../include/nav.php:113 msgid "Conversations from your friends" msgstr "Unterhaltungen deiner Kontakte" -#: ../../include/nav.php:117 +#: ../../include/nav.php:121 msgid "Friend Requests" msgstr "Kontaktanfragen" -#: ../../include/nav.php:119 +#: ../../include/nav.php:123 msgid "See all notifications" msgstr "Alle Benachrichtigungen anzeigen" -#: ../../include/nav.php:120 +#: ../../include/nav.php:124 msgid "Mark all system notifications seen" msgstr "Markiere alle System-Benachrichtigungen als gelesen" -#: ../../include/nav.php:124 +#: ../../include/nav.php:128 msgid "Private mail" msgstr "Private Email" -#: ../../include/nav.php:127 +#: ../../include/nav.php:129 +msgid "Inbox" +msgstr "Eingang" + +#: ../../include/nav.php:130 +msgid "Outbox" +msgstr "Ausgang" + +#: ../../include/nav.php:134 msgid "Manage" msgstr "Verwalten" -#: ../../include/nav.php:127 +#: ../../include/nav.php:134 msgid "Manage other pages" msgstr "Andere Seiten verwalten" -#: ../../include/nav.php:131 ../../boot.php:940 +#: ../../include/nav.php:138 ../../boot.php:1002 msgid "Profiles" msgstr "Profile" -#: ../../include/nav.php:131 ../../boot.php:940 +#: ../../include/nav.php:138 ../../boot.php:1002 msgid "Manage/edit profiles" msgstr "Profile verwalten/editieren" -#: ../../include/nav.php:132 +#: ../../include/nav.php:139 msgid "Manage/edit friends and contacts" msgstr "Freunde und Kontakte verwalten/editieren" -#: ../../include/nav.php:139 +#: ../../include/nav.php:146 msgid "Admin" msgstr "Administration" -#: ../../include/nav.php:139 +#: ../../include/nav.php:146 msgid "Site setup and configuration" msgstr "Einstellungen der Seite und Konfiguration" -#: ../../include/nav.php:162 +#: ../../include/nav.php:169 msgid "Nothing new here" msgstr "Keine Neuigkeiten." @@ -5492,49 +6026,63 @@ msgstr "Adresse oder Web-Link eingeben" msgid "Example: bob@example.com, http://example.com/barbara" msgstr "Beispiel: bob@example.com, http://example.com/barbara" -#: ../../include/contact_widgets.php:18 -msgid "Invite Friends" -msgstr "Freunde einladen" - -#: ../../include/contact_widgets.php:24 +#: ../../include/contact_widgets.php:22 #, php-format msgid "%d invitation available" msgid_plural "%d invitations available" msgstr[0] "%d Einladung verfügbar" msgstr[1] "%d Einladungen verfügbar" -#: ../../include/contact_widgets.php:30 +#: ../../include/contact_widgets.php:28 msgid "Find People" msgstr "Leute finden" -#: ../../include/contact_widgets.php:31 +#: ../../include/contact_widgets.php:29 msgid "Enter name or interest" msgstr "Name oder Interessen eingeben" -#: ../../include/contact_widgets.php:32 +#: ../../include/contact_widgets.php:30 msgid "Connect/Follow" msgstr "Verbinden/Folgen" -#: ../../include/contact_widgets.php:33 +#: ../../include/contact_widgets.php:31 msgid "Examples: Robert Morgenstein, Fishing" msgstr "Beispiel: Robert Morgenstein, Angeln" -#: ../../include/contact_widgets.php:36 -msgid "Similar Interests" -msgstr "Ähnliche Interessen" - -#: ../../include/contact_widgets.php:68 +#: ../../include/contact_widgets.php:66 msgid "Networks" msgstr "Netzwerke" -#: ../../include/contact_widgets.php:71 +#: ../../include/contact_widgets.php:69 msgid "All Networks" msgstr "Alle Netzwerke" +#: ../../include/contact_widgets.php:96 +msgid "Saved Folders" +msgstr "Gespeicherte Ordner" + +#: ../../include/contact_widgets.php:99 ../../include/contact_widgets.php:127 +msgid "Everything" +msgstr "Alles" + +#: ../../include/contact_widgets.php:124 +msgid "Categories" +msgstr "Kategorien" + #: ../../include/auth.php:29 msgid "Logged out." msgstr "Abgemeldet." +#: ../../include/auth.php:106 +msgid "" +"We encountered a problem while logging in with the OpenID you provided. " +"Please check the correct spelling of the ID." +msgstr "Beim versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe dass du die OpenID richtig geschrieben hast." + +#: ../../include/auth.php:106 +msgid "The error message was:" +msgstr "Die Fehlermeldung lautete:" + #: ../../include/datetime.php:43 ../../include/datetime.php:45 msgid "Miscellaneous" msgstr "Verschiedenes" @@ -5608,232 +6156,232 @@ msgstr "Sekunden" msgid "%1$d %2$s ago" msgstr "%1$d %2$s her" -#: ../../include/poller.php:513 +#: ../../include/poller.php:533 msgid "From: " msgstr "Von: " -#: ../../include/bbcode.php:202 +#: ../../include/bbcode.php:203 ../../include/bbcode.php:223 msgid "$1 wrote:" msgstr "$1 hat geschrieben:" -#: ../../include/bbcode.php:216 ../../include/bbcode.php:282 +#: ../../include/bbcode.php:237 ../../include/bbcode.php:303 msgid "Image/photo" msgstr "Bild/Foto" -#: ../../include/dba.php:39 +#: ../../include/dba.php:41 #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "Kann die DNS Informationen für den Datenbanken Server '%s' nicht ermitteln." -#: ../../include/message.php:14 +#: ../../include/message.php:15 ../../include/message.php:171 msgid "[no subject]" msgstr "[kein Betreff]" -#: ../../include/acl_selectors.php:284 +#: ../../include/acl_selectors.php:286 msgid "Visible to everybody" msgstr "Für jeden sichtbar" -#: ../../include/acl_selectors.php:285 +#: ../../include/acl_selectors.php:287 msgid "show" msgstr "zeigen" -#: ../../include/acl_selectors.php:286 +#: ../../include/acl_selectors.php:288 msgid "don't show" msgstr "nicht zeigen" -#: ../../include/enotify.php:8 +#: ../../include/enotify.php:14 msgid "Friendica Notification" msgstr "Friendica-Benachrichtigung" -#: ../../include/enotify.php:11 +#: ../../include/enotify.php:17 msgid "Thank You," msgstr "Danke," -#: ../../include/enotify.php:13 +#: ../../include/enotify.php:19 #, php-format msgid "%s Administrator" msgstr "der Administrator von %s" -#: ../../include/enotify.php:29 +#: ../../include/enotify.php:35 #, php-format msgid "%s " msgstr "%s " -#: ../../include/enotify.php:33 +#: ../../include/enotify.php:39 #, php-format msgid "[Friendica:Notify] New mail received at %s" msgstr "[Friendica Meldung] Neue Nachricht erhalten von %s" -#: ../../include/enotify.php:35 +#: ../../include/enotify.php:41 #, php-format msgid "%s sent you a new private message at %s." msgstr "%s hat dir eine neue private Nachricht auf %s geschrieben." -#: ../../include/enotify.php:36 +#: ../../include/enotify.php:42 #, php-format msgid "%s sent you %s." msgstr "%s hat Dir geschickt %s" -#: ../../include/enotify.php:36 +#: ../../include/enotify.php:42 msgid "a private message" msgstr "eine private Nachricht" -#: ../../include/enotify.php:37 +#: ../../include/enotify.php:43 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten." -#: ../../include/enotify.php:67 +#: ../../include/enotify.php:73 #, php-format msgid "%s's" msgstr "%s's" -#: ../../include/enotify.php:71 +#: ../../include/enotify.php:77 msgid "your" msgstr "Dein" -#: ../../include/enotify.php:78 +#: ../../include/enotify.php:84 #, php-format msgid "[Friendica:Notify] Comment to conversation #%d by %s" msgstr "[Friendica Meldung] Kommentar zum Beitrag #%d von %s" -#: ../../include/enotify.php:79 +#: ../../include/enotify.php:85 #, php-format msgid "%s commented on an item/conversation you have been following." msgstr "%s hat einen Beitrag kommentiert, dem du folgst." -#: ../../include/enotify.php:80 +#: ../../include/enotify.php:86 #, php-format msgid "%s commented on %s." msgstr "%s kommentierte %s." -#: ../../include/enotify.php:82 ../../include/enotify.php:95 -#: ../../include/enotify.php:106 ../../include/enotify.php:117 +#: ../../include/enotify.php:88 ../../include/enotify.php:101 +#: ../../include/enotify.php:112 ../../include/enotify.php:123 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren." -#: ../../include/enotify.php:89 +#: ../../include/enotify.php:95 #, php-format msgid "[Friendica:Notify] %s posted to your profile wall" msgstr "[Friendica Meldung] %s hat auf Deine Pinnwand geschrieben" -#: ../../include/enotify.php:91 +#: ../../include/enotify.php:97 #, php-format msgid "%s posted to your profile wall at %s" msgstr "%s hat auf deine Pinnwand bei %s gepostet" -#: ../../include/enotify.php:93 +#: ../../include/enotify.php:99 #, php-format msgid "%s posted to %s" msgstr "%s schrieb an %s" -#: ../../include/enotify.php:93 +#: ../../include/enotify.php:99 msgid "your profile wall." msgstr "Deine Pinnwand" -#: ../../include/enotify.php:102 +#: ../../include/enotify.php:108 #, php-format msgid "[Friendica:Notify] %s tagged you" msgstr "[Friendica Meldung] %s hat Dich erwähnt" -#: ../../include/enotify.php:103 +#: ../../include/enotify.php:109 #, php-format msgid "%s tagged you at %s" msgstr "%s hat dich auf %s erwähnt" -#: ../../include/enotify.php:104 +#: ../../include/enotify.php:110 #, php-format msgid "%s %s." msgstr "%s %s." -#: ../../include/enotify.php:104 +#: ../../include/enotify.php:110 msgid "tagged you" msgstr "erwähnte Dich" -#: ../../include/enotify.php:113 +#: ../../include/enotify.php:119 #, php-format msgid "[Friendica:Notify] %s tagged your post" msgstr "[Friendica Meldung] %s markierte Deinen Beitrag" -#: ../../include/enotify.php:114 +#: ../../include/enotify.php:120 #, php-format msgid "%s tagged your post at %s" msgstr "%s hat deinen Beitrag auf %s getaggt" -#: ../../include/enotify.php:115 +#: ../../include/enotify.php:121 #, php-format msgid "%s tagged %s" msgstr "%s markierte %s" -#: ../../include/enotify.php:115 +#: ../../include/enotify.php:121 msgid "your post" msgstr "Dein Beitrag" -#: ../../include/enotify.php:124 +#: ../../include/enotify.php:130 msgid "[Friendica:Notify] Introduction received" msgstr "[Friendica Meldung] Kontaktanfrage erhalten" -#: ../../include/enotify.php:125 +#: ../../include/enotify.php:131 #, php-format msgid "You've received an introduction from '%s' at %s" msgstr "Du hast eine Kontaktanfrage von '%s' auf %s erhalten" -#: ../../include/enotify.php:126 +#: ../../include/enotify.php:132 #, php-format msgid "You've received %s from %s." msgstr "Du hast %s von %s erhalten." -#: ../../include/enotify.php:126 +#: ../../include/enotify.php:132 msgid "an introduction" -msgstr "eine Einführung" +msgstr "eine Kontaktanfrage" -#: ../../include/enotify.php:127 ../../include/enotify.php:144 +#: ../../include/enotify.php:133 ../../include/enotify.php:150 #, php-format msgid "You may visit their profile at %s" msgstr "Hier kannst du das Profil betrachten: %s" -#: ../../include/enotify.php:129 +#: ../../include/enotify.php:135 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen." -#: ../../include/enotify.php:136 +#: ../../include/enotify.php:142 msgid "[Friendica:Notify] Friend suggestion received" msgstr "[Friendica Meldung] Kontaktvorschlag erhalten" -#: ../../include/enotify.php:137 +#: ../../include/enotify.php:143 #, php-format msgid "You've received a friend suggestion from '%s' at %s" msgstr "Du hast von '%s' einen Kontaktvorschlag erhalten auf %s" -#: ../../include/enotify.php:138 +#: ../../include/enotify.php:144 #, php-format msgid "You've received %s for %s from %s." msgstr "Du hast %s für %s von %s erhalten." -#: ../../include/enotify.php:139 +#: ../../include/enotify.php:145 msgid "a friend suggestion" msgstr "ein Freunde Vorschlag" -#: ../../include/enotify.php:142 +#: ../../include/enotify.php:148 msgid "Name:" msgstr "Name:" -#: ../../include/enotify.php:143 +#: ../../include/enotify.php:149 msgid "Photo:" msgstr "Foto:" -#: ../../include/enotify.php:146 +#: ../../include/enotify.php:152 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen." -#: ../../include/items.php:2573 +#: ../../include/items.php:2656 msgid "A new person is sharing with you at " msgstr "Eine neue Person teilt mit dir auf " -#: ../../include/items.php:2573 +#: ../../include/items.php:2656 msgid "You have a new follower at " msgstr "Du hast einen neuen Kontakt auf " @@ -5842,37 +6390,43 @@ msgstr "Du hast einen neuen Kontakt auf " msgid "image/photo" msgstr "Bild/Foto" -#: ../../include/security.php:20 +#: ../../include/security.php:21 msgid "Welcome " msgstr "Willkommen " -#: ../../include/security.php:21 +#: ../../include/security.php:22 msgid "Please upload a profile photo." msgstr "Bitte lade ein Profilbild hoch." -#: ../../include/security.php:24 +#: ../../include/security.php:25 msgid "Welcome back " msgstr "Willkommen zurück " -#: ../../include/Contact.php:131 ../../include/conversation.php:788 +#: ../../include/security.php:329 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before subitting it." +msgstr "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde." + +#: ../../include/Contact.php:137 ../../include/conversation.php:813 msgid "View status" msgstr "Status anzeigen" -#: ../../include/Contact.php:132 ../../include/conversation.php:789 +#: ../../include/Contact.php:138 ../../include/conversation.php:814 msgid "View profile" msgstr "Profil anzeigen" -#: ../../include/Contact.php:133 ../../include/conversation.php:790 +#: ../../include/Contact.php:139 ../../include/conversation.php:815 msgid "View photos" msgstr "Fotos ansehen" -#: ../../include/Contact.php:134 ../../include/Contact.php:147 -#: ../../include/conversation.php:791 +#: ../../include/Contact.php:140 ../../include/Contact.php:153 +#: ../../include/conversation.php:816 msgid "View recent" msgstr "Neueste anzeigen" -#: ../../include/Contact.php:136 ../../include/Contact.php:147 -#: ../../include/conversation.php:793 +#: ../../include/Contact.php:142 ../../include/Contact.php:153 +#: ../../include/conversation.php:818 msgid "Send PM" msgstr "Private Nachricht senden" @@ -5885,36 +6439,32 @@ 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:303 ../../include/conversation.php:572 +#: ../../include/conversation.php:317 ../../include/conversation.php:575 msgid "Select" msgstr "Auswählen" -#: ../../include/conversation.php:320 ../../include/conversation.php:665 -#: ../../include/conversation.php:666 +#: ../../include/conversation.php:334 ../../include/conversation.php:672 +#: ../../include/conversation.php:673 #, php-format msgid "View %s's profile @ %s" msgstr "Das Profil von %s auf %s betrachten." -#: ../../include/conversation.php:330 ../../include/conversation.php:677 +#: ../../include/conversation.php:344 ../../include/conversation.php:684 #, php-format msgid "%s from %s" msgstr "%s von %s" -#: ../../include/conversation.php:346 +#: ../../include/conversation.php:360 msgid "View in context" msgstr "Im Zusammenhang betrachten" -#: ../../include/conversation.php:467 +#: ../../include/conversation.php:465 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d Kommentar" msgstr[1] "%d Kommentare" -#: ../../include/conversation.php:468 ../../boot.php:448 -msgid "show more" -msgstr "mehr anzeigen" - #: ../../include/conversation.php:529 msgid "like" msgstr "mag ich" @@ -5931,205 +6481,209 @@ msgstr "Teile dieses" msgid "share" msgstr "Teilen" -#: ../../include/conversation.php:582 +#: ../../include/conversation.php:588 msgid "add star" msgstr "markieren" -#: ../../include/conversation.php:583 +#: ../../include/conversation.php:589 msgid "remove star" msgstr "Markierung entfernen" -#: ../../include/conversation.php:584 +#: ../../include/conversation.php:590 msgid "toggle star status" msgstr "Markierung umschalten" -#: ../../include/conversation.php:587 +#: ../../include/conversation.php:593 msgid "starred" msgstr "markiert" -#: ../../include/conversation.php:588 +#: ../../include/conversation.php:594 msgid "add tag" msgstr "Tag hinzufügen" -#: ../../include/conversation.php:667 +#: ../../include/conversation.php:598 +msgid "save to folder" +msgstr "In Ordner speichern" + +#: ../../include/conversation.php:674 msgid "to" msgstr "zu" -#: ../../include/conversation.php:668 +#: ../../include/conversation.php:675 msgid "Wall-to-Wall" msgstr "Wall-to-Wall" -#: ../../include/conversation.php:669 +#: ../../include/conversation.php:676 msgid "via Wall-To-Wall:" msgstr "via Wall-To-Wall:" -#: ../../include/conversation.php:713 +#: ../../include/conversation.php:721 msgid "Delete Selected Items" msgstr "Lösche die markierten Beiträge" -#: ../../include/conversation.php:845 +#: ../../include/conversation.php:872 #, php-format msgid "%s likes this." msgstr "%s mag das." -#: ../../include/conversation.php:845 +#: ../../include/conversation.php:872 #, php-format msgid "%s doesn't like this." msgstr "%s mag das nicht." -#: ../../include/conversation.php:849 +#: ../../include/conversation.php:876 #, php-format msgid "%2$d people like this." msgstr "%2$d Leute mögen das." -#: ../../include/conversation.php:851 +#: ../../include/conversation.php:878 #, php-format msgid "%2$d people don't like this." msgstr "%2$d Leute mögen das nicht." -#: ../../include/conversation.php:857 +#: ../../include/conversation.php:884 msgid "and" msgstr "und" -#: ../../include/conversation.php:860 +#: ../../include/conversation.php:887 #, php-format msgid ", and %d other people" msgstr " und %d andere" -#: ../../include/conversation.php:861 +#: ../../include/conversation.php:888 #, php-format msgid "%s like this." msgstr "%s mögen das." -#: ../../include/conversation.php:861 +#: ../../include/conversation.php:888 #, php-format msgid "%s don't like this." msgstr "%s mögen das nicht." -#: ../../include/conversation.php:886 +#: ../../include/conversation.php:913 msgid "Visible to everybody" msgstr "Für jedermann sichtbar" -#: ../../include/conversation.php:888 +#: ../../include/conversation.php:915 msgid "Please enter a video link/URL:" msgstr "Bitte Link/URL zum Video einfügen:" -#: ../../include/conversation.php:889 +#: ../../include/conversation.php:916 msgid "Please enter an audio link/URL:" msgstr "Bitte Link/URL zum Audio einfügen:" -#: ../../include/conversation.php:890 +#: ../../include/conversation.php:917 msgid "Tag term:" msgstr "Tag:" -#: ../../include/conversation.php:891 +#: ../../include/conversation.php:919 msgid "Where are you right now?" msgstr "Wo hältst du dich jetzt gerade auf?" -#: ../../include/conversation.php:892 -msgid "Enter a title for this item" -msgstr "Gib den Titel für diesen Beitrag ein" - -#: ../../include/conversation.php:935 +#: ../../include/conversation.php:962 msgid "upload photo" msgstr "Bild hochladen" -#: ../../include/conversation.php:937 +#: ../../include/conversation.php:964 msgid "attach file" msgstr "Datei anhängen" -#: ../../include/conversation.php:939 +#: ../../include/conversation.php:966 msgid "web link" msgstr "Weblink" -#: ../../include/conversation.php:940 +#: ../../include/conversation.php:967 msgid "Insert video link" msgstr "Video-Adresse einfügen" -#: ../../include/conversation.php:941 +#: ../../include/conversation.php:968 msgid "video link" msgstr "Video-Link" -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:969 msgid "Insert audio link" msgstr "Audio-Adresse einfügen" -#: ../../include/conversation.php:943 +#: ../../include/conversation.php:970 msgid "audio link" msgstr "Audio-Link" -#: ../../include/conversation.php:945 +#: ../../include/conversation.php:972 msgid "set location" msgstr "Ort setzen" -#: ../../include/conversation.php:947 +#: ../../include/conversation.php:974 msgid "clear location" msgstr "Ort löschen" -#: ../../include/conversation.php:952 +#: ../../include/conversation.php:981 msgid "permissions" msgstr "Zugriffsrechte" -#: ../../boot.php:446 +#: ../../boot.php:493 msgid "Delete this item?" msgstr "Diesen Beitrag löschen?" -#: ../../boot.php:449 +#: ../../boot.php:496 msgid "show fewer" msgstr "weniger anzeigen" -#: ../../boot.php:692 +#: ../../boot.php:744 msgid "Create a New Account" msgstr "Neuen Account erstellen" -#: ../../boot.php:712 +#: ../../boot.php:768 msgid "Nickname or Email address: " msgstr "Spitzname oder Email-Adresse: " -#: ../../boot.php:713 +#: ../../boot.php:769 msgid "Password: " msgstr "Passwort: " -#: ../../boot.php:716 +#: ../../boot.php:772 msgid "Or login using OpenID: " msgstr "Oder melde dich mit deiner OpenID an: " -#: ../../boot.php:722 +#: ../../boot.php:778 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: ../../boot.php:879 +#: ../../boot.php:935 msgid "Edit profile" msgstr "Profil bearbeiten" -#: ../../boot.php:1046 ../../boot.php:1117 +#: ../../boot.php:994 +msgid "Message" +msgstr "Nachricht" + +#: ../../boot.php:1109 ../../boot.php:1180 msgid "g A l F d" msgstr "l. d, F G \\U\\h\\\\r" -#: ../../boot.php:1047 ../../boot.php:1118 +#: ../../boot.php:1110 ../../boot.php:1181 msgid "F d" msgstr "d. F" -#: ../../boot.php:1072 +#: ../../boot.php:1135 msgid "Birthday Reminders" msgstr "Geburtstagserinnerungen" -#: ../../boot.php:1073 +#: ../../boot.php:1136 msgid "Birthdays this week:" msgstr "Geburtstage diese Woche:" -#: ../../boot.php:1096 ../../boot.php:1160 +#: ../../boot.php:1159 ../../boot.php:1223 msgid "[today]" msgstr "[heute]" -#: ../../boot.php:1141 +#: ../../boot.php:1204 msgid "Event Reminders" msgstr "Veranstaltungserinnerungen" -#: ../../boot.php:1142 +#: ../../boot.php:1205 msgid "Events this week:" msgstr "Veranstaltungen diese Woche" -#: ../../boot.php:1154 +#: ../../boot.php:1217 msgid "[No description]" msgstr "[keine Beschreibung]" diff --git a/view/de/strings.php b/view/de/strings.php index c9cd91138a..811fb98d0d 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -26,7 +26,6 @@ $a->strings["New photo from this URL"] = "Neues Foto von dieser URL"; $a->strings["Submit"] = "Senden"; $a->strings["Help:"] = "Hilfe:"; $a->strings["Help"] = "Hilfe"; -$a->strings["Help or @NewHere ?"] = "Hilfe oder @NeuHier"; $a->strings["Not Found"] = "Nicht gefunden"; $a->strings["Page not found."] = "Seite nicht gefunden."; $a->strings["File exceeds size limit of %d"] = "Die Datei ist größer als das erlaubte Limit von %d"; @@ -121,18 +120,15 @@ $a->strings["running at web location"] = "die unter folgender Webadresse zu find $a->strings["Please visit Friendica.com to learn more about the Friendica project."] = "Bitte besuche Friendica.com um mehr über das Friendica Projekt zu erfahren."; $a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche"; $a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot com"; -$a->strings["Installed plugins/addons/apps"] = "Installierte Plugins/Erweiterungen/Apps"; +$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Erweiterungen/Apps"; $a->strings["No installed plugins/addons/apps"] = "Keine Plugins/Erweiterungen/Apps installiert"; $a->strings["Item not found"] = "Beitrag nicht gefunden"; $a->strings["Edit post"] = "Beitrag bearbeiten"; $a->strings["Post to Email"] = "An E-Mail senden"; -$a->strings["PostIt to Friendica"] = "Teile mit Friendica"; -$a->strings["Post to Friendica"] = "Teile mit Friendica"; -$a->strings[" from anywhere by bookmarking this Link."] = " von überall her, indem du diesen Link zu deinen Lesezeichen hinzufügst."; $a->strings["Edit"] = "Bearbeiten"; $a->strings["Upload photo"] = "Foto hochladen"; $a->strings["Attach file"] = "Datei anhängen"; -$a->strings["Insert web link"] = "Weblink einfügen"; +$a->strings["Insert web link"] = "eine Kontaktanfrage"; $a->strings["Insert YouTube video"] = "YouTube-Video einfügen"; $a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg] Video einfügen"; $a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg] Audio einfügen"; @@ -142,6 +138,7 @@ $a->strings["Permission settings"] = "Berechtigungseinstellungen"; $a->strings["CC: email addresses"] = "Cc:-E-Mail-Addressen"; $a->strings["Public post"] = "Öffentlicher Beitrag"; $a->strings["Set title"] = "Titel setzen"; +$a->strings["Categories (comma-separated list)"] = "Kategorien (mit Komma separierte Liste)"; $a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com"; $a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert."; $a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung."; @@ -171,8 +168,9 @@ $a->strings["Welcome home %s."] = "Willkommen zurück %s."; $a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Kontaktanfrage bei %s."; $a->strings["Confirm"] = "Bestätigen"; $a->strings["[Name Withheld]"] = "[Name unterdrückt]"; -$a->strings["Diaspora members: Please do not use this form. Instead, enter \"%s\" into your Diaspora search bar."] = "Diaspora-User: Bitte nicht dieses Formular benutzen! Gebt statt dessen \"%s\" in der Diaspora-Suchleiste ein."; -$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:"; +$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:"; +$a->strings["Connect as an email follower (Coming soon)"] = "Als E-Mail-Kontakt verbinden (In Kürze verfügbar)"; +$a->strings["If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today."] = "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, folge diesem Link um einen öffentlichen Friendica-Server zu finden und beizutreten."; $a->strings["Friend/Connection Request"] = "Freundschafts-/Kontaktanfrage"; $a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"; $a->strings["Please answer the following:"] = "Bitte beantworte Folgendes:"; @@ -181,7 +179,7 @@ $a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:"; $a->strings["Friendica"] = "Friendica"; $a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web"; $a->strings["Diaspora"] = "Diaspora"; -$a->strings["- please share from your own site as noted above"] = "- bitte fange von Deiner eigenen Seite aus zu teilen an"; +$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["Your Identity Address:"] = "Adresse deines Profils:"; $a->strings["Submit Request"] = "Anfrage abschicken"; $a->strings["Friendica Social Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup"; @@ -248,7 +246,6 @@ $a->strings["Profile Match"] = "Profilübereinstimmungen"; $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["Connect"] = "Verbinden"; -$a->strings["Connect Services"] = "Verbinde Dienste"; $a->strings["No matches"] = "Keine Übereinstimmungen"; $a->strings["Remote privacy information not available."] = "Entfernte Privatsphäreneinstellungen nicht verfügbar."; $a->strings["Visible to:"] = "Sichtbar für:"; @@ -339,6 +336,7 @@ $a->strings["Update now"] = "Jetzt aktualisieren"; $a->strings["Currently blocked"] = "Derzeit geblockt"; $a->strings["Currently ignored"] = "Derzeit ignoriert"; $a->strings["Replies/likes to your public posts may still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein"; +$a->strings["Suggestions"] = "Kontaktvorschläge"; $a->strings["All Contacts"] = "Alle Kontakte"; $a->strings["Unblocked Contacts"] = "Nicht blockierte Kontakte"; $a->strings["Blocked Contacts"] = "Blockierte Kontakte"; @@ -381,6 +379,7 @@ $a->strings[" Not valid email."] = " Keine gültige E-Mail."; $a->strings[" Cannot change to that email."] = "Ändern der E-Mail nicht möglich. "; $a->strings["Settings updated."] = "Einstellungen aktualisiert."; $a->strings["Account settings"] = "Account Einstellungen"; +$a->strings["Display settings"] = "Anzeige Einstellungen"; $a->strings["Connector settings"] = "Connector-Einstellungen"; $a->strings["Plugin settings"] = "Plugin-Einstellungen"; $a->strings["Connections"] = "Verbindungen"; @@ -418,6 +417,13 @@ $a->strings["Action after import:"] = "Aktion nach Import:"; $a->strings["Mark as seen"] = "Als gelesen markieren"; $a->strings["Move to folder"] = "In einen Ordner verschieben"; $a->strings["Move to folder:"] = "In diesen Ordner verschieben:"; +$a->strings["Display Settings"] = "Anzeige Einstellungen"; +$a->strings["Display Theme:"] = "Theme:"; +$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren"; +$a->strings["Minimum of 10 seconds, no maximum"] = "Minimal 10 Sekunden, kein Maximum"; +$a->strings["Number of items to display on the network page:"] = "Zahl der Beiträge, welche pro Netzwerkseite angezeigt werden sollen: "; +$a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge"; +$a->strings["Don't show emoticons"] = "Keine Smilies anzeigen"; $a->strings["Normal Account"] = "Normaler Account"; $a->strings["This account is a normal personal profile"] = "Dieser Account ist ein normales persönliches Profil"; $a->strings["Soapbox Account"] = "Sandkasten-Account"; @@ -435,6 +441,7 @@ $a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details $a->strings["Allow friends to post to your profile page?"] = "Deinen Kontakten erlauben, auf deine Pinnwand zu schreiben?"; $a->strings["Allow friends to tag your posts?"] = "Deinen Kontakten erlauben, deine Beiträge mit Schlagwörtern zu versehen?"; $a->strings["Allow us to suggest you as a potential friend to new members?"] = "Erlaube uns dich als potentiellen Kontakt für neue Mitglieder vorzuschlagen?"; +$a->strings["Permit unknown people to send you private mail?"] = "Erlaube es Unbekannten dir private Nachrichten zu schicken?"; $a->strings["Profile is not published."] = "Profil ist nicht veröffentlicht."; $a->strings["or"] = "oder"; $a->strings["Your Identity Address is"] = "Die Adresse deines Profils lautet:"; @@ -457,14 +464,12 @@ $a->strings["Email Address:"] = "Emailadresse:"; $a->strings["Your Timezone:"] = "Deine Zeitzone:"; $a->strings["Default Post Location:"] = "Standardstandort:"; $a->strings["Use Browser Location:"] = "Verwende den Standort des Browsers:"; -$a->strings["Display Theme:"] = "Theme:"; -$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren"; -$a->strings["Minimum of 10 seconds, no maximum"] = "Minimal 10 Sekunden, kein Maximum"; $a->strings["Security and Privacy Settings"] = "Sicherheits- und Privatsphäre-Einstellungen"; $a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl von Freundschaftsanfragen/Tag:"; $a->strings["(to prevent spam abuse)"] = "(um SPAM zu vermeiden)"; $a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträge"; $a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)"; +$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:"; $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen"; $a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden wenn:"; $a->strings["You receive an introduction"] = "- du eine Kontaktanfrage erhältst"; @@ -473,7 +478,7 @@ $a->strings["Someone writes on your profile wall"] = "- jemand etwas auf deine P $a->strings["Someone writes a followup comment"] = "- jemand auch einen Kommentar verfasst"; $a->strings["You receive a private message"] = "- du eine private Nachricht erhältst"; $a->strings["You receive a friend suggestion"] = "- du eine Empfehlung erhältst"; -$a->strings["You are tagged in a post"] = "- du in einem Beitrag erwähnt wurdest"; +$a->strings["You are tagged in a post"] = "Du wurdest in einem Beitrag erwähnt."; $a->strings["Advanced Page Settings"] = "Erweiterte Seiten-Einstellungen"; $a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten"; $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen-Seiten, die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast."; @@ -486,7 +491,7 @@ $a->strings["Commented Order"] = "Neueste Kommentare"; $a->strings["Posted Order"] = "Neueste Beiträge"; $a->strings["New"] = "Neue"; $a->strings["Starred"] = "Markierte"; -$a->strings["Bookmarks"] = "Lesezeichen"; +$a->strings["Shared Links"] = "Geteilte Internetlinks"; $a->strings["Warning: This group contains %s member from an insecure network."] = array( 0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk.", 1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.", @@ -500,9 +505,23 @@ $a->strings["Private messages to this person are at risk of public disclosure."] $a->strings["Invalid contact."] = "Ungültiger Kontakt."; $a->strings["Personal Notes"] = "Persönliche Notizen"; $a->strings["Save"] = "Speichern"; +$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen."; +$a->strings["No recipient selected."] = "Kein Empfänger gewählt."; +$a->strings["Unable to check your home location."] = "Konnte deinen Heimatort nicht bestimmen."; +$a->strings["Message could not be sent."] = "Nachricht konnte nicht gesendet werden."; +$a->strings["Message collection failure."] = "Konnte Nachrichten nicht abrufen."; +$a->strings["Message sent."] = "Nachricht gesendet."; +$a->strings["No recipient."] = "Kein Empfänger."; +$a->strings["Please enter a link URL:"] = "Bitte gib die URL des Links ein:"; +$a->strings["Send Private Message"] = "Private Nachricht senden"; +$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."; +$a->strings["To:"] = "An:"; +$a->strings["Subject:"] = "Betreff:"; +$a->strings["Your message:"] = "Deine Nachricht:"; $a->strings["Welcome to Friendica"] = "Willkommen bei Friendica"; $a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder"; $a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden."; +$a->strings["On your Quick Start page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join."] = "Auf der Quick Start Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest, wie du alte Freunde von Facebook wieder findest und neue Kontakte knüpfst."; $a->strings["On your Settings page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter Einstellungen Dein Passwort. Außerdem merke Dir Deine Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen."; $a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können."; $a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust."; @@ -549,6 +568,7 @@ $a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse."; $a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden."; $a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen."; $a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; +$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."; $a->strings["An error occurred during registration. Please try again."] = "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; $a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standard-Profils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; @@ -606,26 +626,23 @@ $a->strings["No profile"] = "Kein Profil"; $a->strings["Remove My Account"] = "Account löschen"; $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dies wird deinen Account endgültig löschen. Es gibt keine Möglichkeit, ihn wiederherzustellen."; $a->strings["Please enter your password for verification:"] = "Bitte gib dein Passwort zur Verifikation ein:"; -$a->strings["No recipient selected."] = "Kein Empfänger gewählt."; -$a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden."; -$a->strings["Message could not be sent."] = "Nachricht konnte nicht gesendet werden."; -$a->strings["Message collection failure."] = "Konnte Nachrichten nicht abrufen."; -$a->strings["Message sent."] = "Nachricht gesendet."; -$a->strings["Inbox"] = "Eingang"; -$a->strings["Outbox"] = "Ausgang"; $a->strings["New Message"] = "Neue Nachricht"; +$a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden."; $a->strings["Message deleted."] = "Nachricht gelöscht."; $a->strings["Conversation removed."] = "Unterhaltung gelöscht."; -$a->strings["Please enter a link URL:"] = "Bitte gib die URL des Links ein:"; -$a->strings["Send Private Message"] = "Private Nachricht senden"; -$a->strings["To:"] = "An:"; -$a->strings["Subject:"] = "Betreff:"; -$a->strings["Your message:"] = "Deine Nachricht:"; $a->strings["No messages."] = "Keine Nachrichten."; +$a->strings["Unknown sender - %s"] = "'Unbekannter Absender - %s"; +$a->strings["You and %s"] = "Du und %s"; +$a->strings["%s and You"] = "%s und Du"; $a->strings["Delete conversation"] = "Unterhaltung löschen"; $a->strings["D, d M Y - g:i A"] = "D, d. M Y - g:i A"; +$a->strings["%d message"] = array( + 0 => "%d Nachricht", + 1 => "%d Nachrichten", +); $a->strings["Message not available."] = "Nachricht nicht verfügbar."; $a->strings["Delete message"] = "Nachricht löschen"; +$a->strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Sichere Kommunikation ist nicht verfügbar. Eventuell kannst du auf der Profilseite des Absenders antworten."; $a->strings["Send Reply"] = "Antwort senden"; $a->strings["Friends of %s"] = "Freunde von %s"; $a->strings["No friends to display."] = "Keine Freunde zum Anzeigen."; @@ -645,6 +662,9 @@ $a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert."; $a->strings["Closed"] = "Geschlossen"; $a->strings["Requires approval"] = "Bedarf der Zustimmung"; $a->strings["Open"] = "Offen"; +$a->strings["No SSL policy, links will track page SSL state"] = "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"; +$a->strings["Force all links to use SSL"] = "SSL für alle Links erzwingen"; +$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)"; $a->strings["File upload"] = "Datei hochladen"; $a->strings["Policies"] = "Regeln"; $a->strings["Advanced"] = "Erweitert"; @@ -653,6 +673,8 @@ $a->strings["Banner/Logo"] = "Banner/Logo"; $a->strings["System language"] = "Systemsprache"; $a->strings["System theme"] = "Systemweites Thema"; $a->strings["Default system theme - may be over-ridden by user profiles"] = "Standard Server Theme - kann von den Benutzereinstellungen überschrieben werden."; +$a->strings["SSL link policy"] = "Regeln für SSL Links"; +$a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen"; $a->strings["Maximum image size"] = "Maximale Größe von Bildern"; $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit."; $a->strings["Register policy"] = "Registrierungsmethode"; @@ -681,7 +703,6 @@ $a->strings["Force users to register with a space between firstname and lastname $a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke"; $a->strings["Use PHP UTF8 regular expressions"] = "PHP UTF8 Ausdrücke verwenden"; $a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen"; -$a->strings["Community Pages"] = "Foren"; $a->strings["Display a Community page showing all recent public postings on this site."] = "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server."; $a->strings["Enable OStatus support"] = "OStatus Unterstützung aktivieren"; $a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt."; @@ -727,6 +748,7 @@ $a->strings["Settings"] = "Einstellungen"; $a->strings["Author: "] = "Autor:"; $a->strings["Maintainer: "] = "Betreuer:"; $a->strings["No themes found."] = "Keine Themen gefunden."; +$a->strings["Screenshot"] = "Bildschirmfoto"; $a->strings["[Experimental]"] = "[Experimentell]"; $a->strings["[Unsupported]"] = "[Nicht unterstützt]"; $a->strings["Log settings updated."] = "Protokolleinstellungen aktualisiert."; @@ -753,6 +775,8 @@ $a->strings["{0} is now friends with %s"] = "{0} ist jetzt mit %s befreundet"; $a->strings["{0} posted"] = "{0} hat etwas veröffentlicht"; $a->strings["{0} tagged %s's post with #%s"] = "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen"; $a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erwähnt"; +$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben."; +$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet."; $a->strings["Login failed."] = "Annmeldung fehlgeschlagen."; $a->strings["Connect URL missing."] = "Connect-URL fehlt"; $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."; @@ -823,6 +847,8 @@ $a->strings["Create New Profile"] = "Neues Profil anlegen"; $a->strings["Profile Image"] = "Profilbild"; $a->strings["visible to everybody"] = "sichtbar für jeden"; $a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten"; +$a->strings["Save to Folder:"] = "In diesen Ordner verschieben:"; +$a->strings["- select -"] = "- auswählen -"; $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s getaggt"; $a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden."; $a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite"; @@ -836,27 +862,28 @@ $a->strings["Friend Suggestions"] = "Kontaktvorschläge"; $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."; $a->strings["Ignore/Hide"] = "Ignorieren/Verbergen"; $a->strings["Global Directory"] = "Weltweites Verzeichnis"; -$a->strings["Local Directory"] = "Lokales Verzeichnis"; -$a->strings["Normal site view"] = "Normale Seitenansicht"; -$a->strings["Admin - View all site entries"] = "Admin: Alle Einträge dieses Servers anzeigen"; $a->strings["Find on this site"] = "Auf diesem Server suchen"; $a->strings["Site Directory"] = "Verzeichnis"; $a->strings["Gender: "] = "Geschlecht:"; $a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein)."; $a->strings["%s : Not a valid email address."] = "%s: Keine gültige Email Adresse."; -$a->strings["Please join my network on %s"] = "Bitte trete meinem Netzwerk auf %s bei"; +$a->strings["Please join us on Friendica"] = "Bitte trete uns auf Friendica bei"; $a->strings["%s : Message delivery failed."] = "%s: Zustellung der Nachricht fehlgeschlagen."; $a->strings["%d message sent."] = array( 0 => "%d Nachricht gesendet.", 1 => "%d Nachrichten gesendet.", ); $a->strings["You have no more invitations available"] = "Du hast keine weiteren Einladungen"; +$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Besuche %s für eine Liste der öffentlichen Server, denen du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke."; +$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Um diese Freundschaftsanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica Website."; +$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen du beitreten kannst."; +$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Es tut uns Leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen."; $a->strings["Send invitations"] = "Einladungen senden"; $a->strings["Enter email addresses, one per line:"] = "E-Mail-Adressen eingeben, eine pro Zeile:"; -$a->strings["Please join my social network on %s"] = "Bitte trete meinem Sozialen Netzwerk auf %s bei"; -$a->strings["To accept this invitation, please visit:"] = "Um diese Einladung anzunehmen besuche bitte:"; +$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Du bist herzlich dazu eingeladen, dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen."; $a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungscode: \$invite_code"; $a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:"; +$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendica.com"; $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."; $a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: "; @@ -891,13 +918,30 @@ $a->strings["On this website your Facebook profile wall conversations will only $a->strings["Do not import your Facebook profile wall conversations"] = "Facebook-Pinnwand nicht importieren"; $a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann."; $a->strings["Comma separated applications to ignore"] = "Komma separiert Anwendungen, die ignoriert werden sollen"; +$a->strings["Problems with Facebook Real-Time Updates"] = "Probleme mit Facebook Echtzeit-Updates"; $a->strings["Facebook"] = "Facebook"; $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen"; +$a->strings["Facebook API Key"] = "Facebook API Schlüssel"; +$a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.

"] = "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.

"; +$a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)."; +$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren."; +$a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange."; +$a->strings["App-ID / API-Key"] = "App-ID / API-Key"; +$a->strings["Application secret"] = "Anwendungs-Geheimnis"; +$a->strings["Polling Interval (min. %1\$s minutes)"] = "Abrufintervall (min. %1\$s Minuten)"; +$a->strings["Real-Time Updates"] = "Echt-Zeit Aktualisierungen"; +$a->strings["Real-Time Updates are activated."] = "Echtzeit-Updates sind aktiviert."; +$a->strings["Deactivate Real-Time Updates"] = "Echtzeit-Updates deaktivieren"; +$a->strings["Real-Time Updates not activated."] = "Echtzeit-Updates nicht aktiviert."; +$a->strings["Activate Real-Time Updates"] = "Echtzeit-Updates aktivieren"; +$a->strings["The new values have been saved."] = "Die neuen Einstellungen wurden gespeichert."; $a->strings["Post to Facebook"] = "Bei Facebook veröffentlichen"; $a->strings["Post to Facebook cancelled because of multi-network access permission conflict."] = "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen."; -$a->strings["Image: "] = "Bild: "; $a->strings["View on Friendica"] = "In Friendica betrachten"; $a->strings["Facebook post failed. Queued for retry."] = "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut."; +$a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich."; +$a->strings["Facebook connection became invalid"] = "Facebook Anmeldedaten sind ungültig geworden"; +$a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Hi %1\$s,\n\ndie Verbindung von deinem Account auf %2\$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du %3\$sden Facebook-Connector neu Authentifizieren%4\$s."; $a->strings["link"] = "Verweis"; $a->strings["%d person likes this"] = array( 0 => "%d Person mag das", @@ -923,20 +967,21 @@ $a->strings["Enable LiveJournal Post Plugin"] = "LiveJournal Post Plugin aktivie $a->strings["LiveJournal username"] = "LiveJournal Benutzername"; $a->strings["LiveJournal password"] = "LiveJournal Passwort"; $a->strings["Post to LiveJournal by default"] = "Standardmäßig bei LiveJournal veröffentlichen"; -$a->strings["\"Not Safe For Work\" Settings"] = "\"Not Safe For Work\"-Einstellungen"; -$a->strings["Enable NSFW filter"] = "NSFW Filter aktivieren"; -$a->strings["Comma separated words to treat as NSFW"] = "Wörter, die gefiltert werden sollen (durch Kommas getrennt)"; +$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe for Work (allg. Filter für ungewollte Inhalte) Einstellungen:"; +$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden."; +$a->strings["Enable Content filter"] = "Aktiviere den Inhaltsfilter"; +$a->strings["Comma separated list of keywords to hide"] = "Durch Komma getrennte Liste von Schlüsselwörtern die verborgen werden sollen"; $a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um reguläre Ausdrücke zu verwenden"; $a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert"; $a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken"; +$a->strings["Forums"] = "Foren"; $a->strings["Login"] = "Anmeldung"; $a->strings["OpenID"] = "OpenID"; -$a->strings["Last users"] = "Letzte Nutzer"; -$a->strings["Most active users"] = "Aktivste Nutzer"; -$a->strings["Last photos"] = "Letzte Fotos"; -$a->strings["Last likes"] = "Zuletzt gemocht"; -$a->strings["event"] = "Veranstaltung"; $a->strings["Latest users"] = "Letzte Benutzer"; +$a->strings["Most active users"] = "Aktivste Nutzer"; +$a->strings["Latest photos"] = "Neueste Fotos"; +$a->strings["Latest likes"] = "Neueste Favoriten"; +$a->strings["event"] = "Veranstaltung"; $a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See RemoteStorage WebFinger"] = "Ermöglicht dir, deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe RemoteStorage WebFinger"; $a->strings["Template URL (with {category})"] = "Vorlagen URL (mit {Kategorie})"; $a->strings["OAuth end-point"] = "OAuth end-point"; @@ -1016,6 +1061,12 @@ $a->strings["Editplain Settings"] = "Editplain Einstellungen"; $a->strings["Disable richtext status editor"] = "RichText Editor deaktivieren"; $a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen"; $a->strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert."; +$a->strings["Post to Insanejournal"] = "Auf InsaneJournal posten."; +$a->strings["InsaneJournal Post Settings"] = "InsaneJournal Beitrags-Einstellungen"; +$a->strings["Enable InsaneJournal Post Plugin"] = "InsaneJournal Plugin aktivieren"; +$a->strings["InsaneJournal username"] = "InsaneJournal Benutzername"; +$a->strings["InsaneJournal password"] = "InsaneJournal Passwort"; +$a->strings["Post to InsaneJournal by default"] = "Standardmäßig auf InsaneJournal posten."; $a->strings["View Source"] = "Quelle ansehen"; $a->strings["Post to StatusNet"] = "Bei StatusNet veröffentlichen"; $a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Bitte kontaktiere den Administrator des Servers.
Die angegebene API-URL ist nicht gültig."; @@ -1040,6 +1091,7 @@ $a->strings["If enabled all your public postings can be posted $a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; $a->strings["Allow posting to StatusNet"] = "Veröffentlichung bei StatusNet erlauben"; $a->strings["Send public postings to StatusNet by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet"; +$a->strings["Send #tag links to StatusNet"] = "#Tags nach StatusNet senden"; $a->strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen"; $a->strings["API URL"] = "API-URL"; $a->strings["Post to Tumblr"] = "Bei Tumblr veröffentlichen"; @@ -1067,7 +1119,7 @@ $a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen"; $a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\""; $a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben"; $a->strings["Show More Settings saved."] = "\"Mehr zeigen\" Einstellungen gesichert."; -$a->strings["Show More"] = "\"Mehr zeigen\""; +$a->strings["show more"] = "mehr anzeigen"; $a->strings["This website is tracked using the Piwik analytics tool."] = "Diese Website benutzt Piwik, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe."; $a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Wenn Du nicht willst, dass Deine Besuche auf diese Weise gespeichert werden, kannst Du ein Cookie setzen. Dann wird Piwik Dich auf dieser Website nicht mehr verfolgen (opt-out)."; $a->strings["Piwik Base URL"] = "Piwik Basis URL"; @@ -1086,19 +1138,43 @@ $a->strings["If enabled all your public postings can be posted $a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; $a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben"; $a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter"; +$a->strings["Send #tag links to Twitter"] = "#Tags nach Twitter senden"; $a->strings["Consumer key"] = "Consumer Key"; $a->strings["Consumer secret"] = "Consumer Secret"; -$a->strings["irc Chatroom"] = "irc Chatroom"; +$a->strings["IRC Chatroom"] = "IRC Chatraum"; +$a->strings["Popular Channels"] = "Beliebte Räume"; $a->strings["Post to Posterous"] = "Nach Posterous senden"; $a->strings["Posterous Post Settings"] = "Posterous Beitrags-Einstellungen"; $a->strings["Enable Posterous Post Plugin"] = "Posterous-Plugin aktivieren"; $a->strings["Posterous login"] = "Posterous-Anmeldename"; $a->strings["Posterous password"] = "Posterous-Passwort"; $a->strings["Post to Posterous by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous"; +$a->strings["Last users"] = "Letzte Nutzer"; +$a->strings["Last likes"] = "Zuletzt gemocht"; +$a->strings["Last photos"] = "Letzte Fotos"; +$a->strings["Find Friends"] = "Freunde finden"; +$a->strings["Local Directory"] = "Lokales Verzeichnis"; +$a->strings["Similar Interests"] = "Ähnliche Interessen"; +$a->strings["Invite Friends"] = "Freunde einladen"; +$a->strings["Community Pages"] = "Foren"; +$a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere"; +$a->strings["Connect Services"] = "Mit anderen Webanwendungen verbinden"; +$a->strings["PostIt to Friendica"] = "PostIt nach Friendica"; +$a->strings["Post to Friendica"] = "Bei Friendica veröffentlichen"; +$a->strings[" from anywhere by bookmarking this Link."] = " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst."; +$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; +$a->strings["Your profile page"] = "Deine Profilseite"; +$a->strings["Your contacts"] = "Deine Kontakte"; +$a->strings["Photos"] = "Bilder"; +$a->strings["Your photos"] = "Deine Fotos"; +$a->strings["Your events"] = "Deine Ereignisse"; +$a->strings["Personal notes"] = "Persönliche Notizen"; +$a->strings["Your personal photos"] = "Deine privaten Fotos"; $a->strings["Theme settings"] = "Themen Einstellungen"; $a->strings["Alignment"] = "Ausrichtung"; $a->strings["Left"] = "Links"; $a->strings["Center"] = "Mitte"; +$a->strings["Color scheme"] = "Farbschema"; $a->strings["Gender:"] = "Geschlecht:"; $a->strings["j F, Y"] = "j F, Y"; $a->strings["j F"] = "j F"; @@ -1171,7 +1247,6 @@ $a->strings["Dating"] = "Dating"; $a->strings["Unfaithful"] = "Untreu"; $a->strings["Sex Addict"] = "Sexbesessen"; $a->strings["Friends"] = "Freunde"; -$a->strings["Find Friends"] = "Freunde finden"; $a->strings["Friends/Benefits"] = "Freunde/Zuwendungen"; $a->strings["Casual"] = "Casual"; $a->strings["Engaged"] = "Verlobt"; @@ -1224,11 +1299,17 @@ $a->strings["October"] = "Oktober"; $a->strings["November"] = "November"; $a->strings["December"] = "Dezember"; $a->strings["bytes"] = "Byte"; +$a->strings["Categories:"] = "Kategorien:"; +$a->strings["remove"] = "löschen"; +$a->strings["[remove]"] = "[löschen]"; +$a->strings["Filed under:"] = "Abgelegt unter:"; +$a->strings["Click to open/close"] = "Zum öffnen/schließen klicken"; $a->strings["Select an alternate language"] = "Alternative Sprache auswählen"; $a->strings["default"] = "standard"; $a->strings["activity"] = "Aktivität"; $a->strings["comment"] = "Kommentar"; $a->strings["post"] = "Beitrag"; +$a->strings["Item filed"] = "Beitrag abgelegt"; $a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora"; $a->strings["Attachments:"] = "Anhänge:"; $a->strings["[Relayed] Comment authored by %s from network %s"] = "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk"; @@ -1244,13 +1325,6 @@ $a->strings["Create a new group"] = "Neue Gruppe erstellen"; $a->strings["Logout"] = "Abmelden"; $a->strings["End this session"] = "Diese Sitzung beenden"; $a->strings["Status"] = "Status"; -$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; -$a->strings["Your profile page"] = "Deine Profilseite"; -$a->strings["Photos"] = "Bilder"; -$a->strings["Your photos"] = "Deine Fotos"; -$a->strings["Your events"] = "Deine Ereignisse"; -$a->strings["Personal notes"] = "Persönliche Notizen"; -$a->strings["Your personal photos"] = "Deine privaten Fotos"; $a->strings["Sign in"] = "Anmelden"; $a->strings["Home Page"] = "Homepage"; $a->strings["Create an account"] = "Account erstellen"; @@ -1266,6 +1340,8 @@ $a->strings["Friend Requests"] = "Kontaktanfragen"; $a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen"; $a->strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gelesen"; $a->strings["Private mail"] = "Private Email"; +$a->strings["Inbox"] = "Eingang"; +$a->strings["Outbox"] = "Ausgang"; $a->strings["Manage"] = "Verwalten"; $a->strings["Manage other pages"] = "Andere Seiten verwalten"; $a->strings["Profiles"] = "Profile"; @@ -1277,7 +1353,6 @@ $a->strings["Nothing new here"] = "Keine Neuigkeiten."; $a->strings["Add New Contact"] = "Neuen Kontakt hinzufügen"; $a->strings["Enter address or web location"] = "Adresse oder Web-Link eingeben"; $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@example.com, http://example.com/barbara"; -$a->strings["Invite Friends"] = "Freunde einladen"; $a->strings["%d invitation available"] = array( 0 => "%d Einladung verfügbar", 1 => "%d Einladungen verfügbar", @@ -1286,10 +1361,14 @@ $a->strings["Find People"] = "Leute finden"; $a->strings["Enter name or interest"] = "Name oder Interessen eingeben"; $a->strings["Connect/Follow"] = "Verbinden/Folgen"; $a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiel: Robert Morgenstein, Angeln"; -$a->strings["Similar Interests"] = "Ähnliche Interessen"; $a->strings["Networks"] = "Netzwerke"; $a->strings["All Networks"] = "Alle Netzwerke"; +$a->strings["Saved Folders"] = "Gespeicherte Ordner"; +$a->strings["Everything"] = "Alles"; +$a->strings["Categories"] = "Kategorien"; $a->strings["Logged out."] = "Abgemeldet."; +$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe dass du die OpenID richtig geschrieben hast."; +$a->strings["The error message was:"] = "Die Fehlermeldung lautete:"; $a->strings["Miscellaneous"] = "Verschiedenes"; $a->strings["year"] = "Jahr"; $a->strings["month"] = "Monat"; @@ -1346,7 +1425,7 @@ $a->strings["your post"] = "Dein Beitrag"; $a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten"; $a->strings["You've received an introduction from '%s' at %s"] = "Du hast eine Kontaktanfrage von '%s' auf %s erhalten"; $a->strings["You've received %s from %s."] = "Du hast %s von %s erhalten."; -$a->strings["an introduction"] = "eine Einführung"; +$a->strings["an introduction"] = "eine Kontaktanfrage"; $a->strings["You may visit their profile at %s"] = "Hier kannst du das Profil betrachten: %s"; $a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen."; $a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica Meldung] Kontaktvorschlag erhalten"; @@ -1362,6 +1441,7 @@ $a->strings["image/photo"] = "Bild/Foto"; $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 subitting it."] = "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."; $a->strings["View status"] = "Status anzeigen"; $a->strings["View profile"] = "Profil anzeigen"; $a->strings["View photos"] = "Fotos ansehen"; @@ -1377,7 +1457,6 @@ $a->strings["%d comment"] = array( 0 => "%d Kommentar", 1 => "%d Kommentare", ); -$a->strings["show more"] = "mehr anzeigen"; $a->strings["like"] = "mag ich"; $a->strings["dislike"] = "mag ich nicht"; $a->strings["Share this"] = "Teile dieses"; @@ -1387,6 +1466,7 @@ $a->strings["remove star"] = "Markierung entfernen"; $a->strings["toggle star status"] = "Markierung umschalten"; $a->strings["starred"] = "markiert"; $a->strings["add tag"] = "Tag hinzufügen"; +$a->strings["save to folder"] = "In Ordner speichern"; $a->strings["to"] = "zu"; $a->strings["Wall-to-Wall"] = "Wall-to-Wall"; $a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:"; @@ -1404,7 +1484,6 @@ $a->strings["Please enter a video link/URL:"] = "Bitte Link/URL zum Video einfü $a->strings["Please enter an audio link/URL:"] = "Bitte Link/URL zum Audio einfügen:"; $a->strings["Tag term:"] = "Tag:"; $a->strings["Where are you right now?"] = "Wo hältst du dich jetzt gerade auf?"; -$a->strings["Enter a title for this item"] = "Gib den Titel für diesen Beitrag ein"; $a->strings["upload photo"] = "Bild hochladen"; $a->strings["attach file"] = "Datei anhängen"; $a->strings["web link"] = "Weblink"; @@ -1423,6 +1502,7 @@ $a->strings["Password: "] = "Passwort: "; $a->strings["Or login using OpenID: "] = "Oder melde dich mit deiner OpenID an: "; $a->strings["Forgot your password?"] = "Passwort vergessen?"; $a->strings["Edit profile"] = "Profil bearbeiten"; +$a->strings["Message"] = "Nachricht"; $a->strings["g A l F d"] = "l. d, F G \\U\\h\\\\r"; $a->strings["F d"] = "d. F"; $a->strings["Birthday Reminders"] = "Geburtstagserinnerungen"; From f980b79edcff78a849d65de15f36f2b0475665d7 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Fri, 6 Apr 2012 11:19:12 +0200 Subject: [PATCH 06/18] new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox... --- js/main.js | 12 ++++++--- view/theme/diabook-aerith/communityhome.tpl | 0 .../theme/diabook-aerith/contact_template.tpl | 0 view/theme/diabook-aerith/directory_item.tpl | 0 view/theme/diabook-aerith/fpostit/fpostit.js | 0 view/theme/diabook-aerith/group_side.tpl | 0 view/theme/diabook-aerith/icons/attach.png | Bin view/theme/diabook-aerith/icons/audio.png | Bin view/theme/diabook-aerith/icons/camera.png | Bin view/theme/diabook-aerith/icons/close_box.png | Bin view/theme/diabook-aerith/icons/drop.png | Bin view/theme/diabook-aerith/icons/file_as.png | Bin view/theme/diabook-aerith/icons/link.png | Bin view/theme/diabook-aerith/icons/lock.png | Bin view/theme/diabook-aerith/icons/lupe.png | Bin view/theme/diabook-aerith/icons/messages.png | Bin view/theme/diabook-aerith/icons/messages2.png | Bin view/theme/diabook-aerith/icons/next.png | Bin .../diabook-aerith/icons/notifications.png | Bin view/theme/diabook-aerith/icons/notify.png | Bin view/theme/diabook-aerith/icons/notify2.png | Bin view/theme/diabook-aerith/icons/pencil.png | Bin .../theme/diabook-aerith/icons/photo-menu.jpg | Bin view/theme/diabook-aerith/icons/prev.png | Bin view/theme/diabook-aerith/icons/recycle.png | Bin view/theme/diabook-aerith/icons/remote.png | Bin .../theme/diabook-aerith/icons/scroll_top.png | Bin view/theme/diabook-aerith/icons/selected.png | Bin view/theme/diabook-aerith/icons/star.png | Bin view/theme/diabook-aerith/icons/starred.png | Bin view/theme/diabook-aerith/icons/tagged.png | Bin view/theme/diabook-aerith/icons/unlock.png | Bin view/theme/diabook-aerith/icons/unstarred.png | Bin view/theme/diabook-aerith/icons/video.png | Bin view/theme/diabook-aerith/icons/weblink.png | Bin view/theme/diabook-aerith/jot.tpl | 0 view/theme/diabook-aerith/mail_conv.tpl | 0 view/theme/diabook-aerith/nav.tpl | 4 +-- view/theme/diabook-aerith/photo_view.tpl | 0 view/theme/diabook-aerith/profile_vcard.tpl | 2 +- view/theme/diabook-aerith/rs_common_tabs.tpl | 0 view/theme/diabook-aerith/search_item.tpl | 0 view/theme/diabook-aerith/style-network.css | 7 ++--- view/theme/diabook-aerith/style-profile.css | 6 ++--- view/theme/diabook-aerith/style.css | 24 +++++++++++++++--- view/theme/diabook-aerith/theme.php | 2 +- view/theme/diabook-blue/communityhome.tpl | 0 view/theme/diabook-blue/contact_template.tpl | 0 view/theme/diabook-blue/directory_item.tpl | 0 view/theme/diabook-blue/fpostit/fpostit.js | 0 view/theme/diabook-blue/group_side.tpl | 0 view/theme/diabook-blue/icons/attach.png | Bin view/theme/diabook-blue/icons/audio.png | Bin view/theme/diabook-blue/icons/camera.png | Bin view/theme/diabook-blue/icons/close_box.png | Bin view/theme/diabook-blue/icons/contacts2.png | Bin view/theme/diabook-blue/icons/drop.png | Bin view/theme/diabook-blue/icons/file_as.png | Bin view/theme/diabook-blue/icons/link.png | Bin view/theme/diabook-blue/icons/lock.png | Bin view/theme/diabook-blue/icons/lupe.png | Bin view/theme/diabook-blue/icons/messages.png | Bin view/theme/diabook-blue/icons/next.png | Bin .../diabook-blue/icons/notifications.png | Bin view/theme/diabook-blue/icons/notify.png | Bin view/theme/diabook-blue/icons/pencil.png | Bin view/theme/diabook-blue/icons/prev.png | Bin view/theme/diabook-blue/icons/recycle.png | Bin view/theme/diabook-blue/icons/remote.png | Bin view/theme/diabook-blue/icons/scroll_top.png | Bin view/theme/diabook-blue/icons/selected.png | Bin view/theme/diabook-blue/icons/star.png | Bin view/theme/diabook-blue/icons/starred.png | Bin view/theme/diabook-blue/icons/tagged.png | Bin view/theme/diabook-blue/icons/unlock.png | Bin view/theme/diabook-blue/icons/unstarred.png | Bin view/theme/diabook-blue/icons/video.png | Bin view/theme/diabook-blue/icons/weblink.png | Bin view/theme/diabook-blue/jot.tpl | 0 view/theme/diabook-blue/mail_conv.tpl | 0 view/theme/diabook-blue/nav.tpl | 4 +-- view/theme/diabook-blue/photo_view.tpl | 0 view/theme/diabook-blue/profile_vcard.tpl | 2 +- view/theme/diabook-blue/rs_common_tabs.tpl | 0 view/theme/diabook-blue/search_item.tpl | 0 view/theme/diabook-blue/style-network.css | 7 ++--- view/theme/diabook-blue/style-profile.css | 6 ++--- view/theme/diabook-blue/style.css | 24 +++++++++++++++--- view/theme/diabook-blue/theme.php | 2 +- view/theme/diabook-red/communityhome.tpl | 0 view/theme/diabook-red/contact_template.tpl | 0 view/theme/diabook-red/directory_item.tpl | 0 view/theme/diabook-red/fpostit/fpostit.js | 0 view/theme/diabook-red/group_side.tpl | 0 view/theme/diabook-red/icons/attach.png | Bin view/theme/diabook-red/icons/audio.png | Bin view/theme/diabook-red/icons/camera.png | Bin view/theme/diabook-red/icons/close_box.png | Bin view/theme/diabook-red/icons/contacts.png | Bin view/theme/diabook-red/icons/contacts2.png | Bin view/theme/diabook-red/icons/drop.png | Bin view/theme/diabook-red/icons/file_as.png | Bin view/theme/diabook-red/icons/link.png | Bin view/theme/diabook-red/icons/lock.png | Bin view/theme/diabook-red/icons/lupe.png | Bin view/theme/diabook-red/icons/next.png | Bin .../theme/diabook-red/icons/notifications.png | Bin view/theme/diabook-red/icons/pencil.png | Bin view/theme/diabook-red/icons/photo-menu.jpg | Bin view/theme/diabook-red/icons/prev.png | Bin view/theme/diabook-red/icons/recycle.png | Bin view/theme/diabook-red/icons/remote.png | Bin view/theme/diabook-red/icons/scroll_top.png | Bin view/theme/diabook-red/icons/selected.png | Bin view/theme/diabook-red/icons/star.png | Bin view/theme/diabook-red/icons/starred.png | Bin view/theme/diabook-red/icons/tagged.png | Bin view/theme/diabook-red/icons/unlock.png | Bin view/theme/diabook-red/icons/unstarred.png | Bin view/theme/diabook-red/icons/video.png | Bin view/theme/diabook-red/icons/weblink.png | Bin view/theme/diabook-red/jot.tpl | 0 view/theme/diabook-red/mail_conv.tpl | 0 view/theme/diabook-red/nav.tpl | 4 +-- view/theme/diabook-red/photo_view.tpl | 0 view/theme/diabook-red/rs_common_tabs.tpl | 0 view/theme/diabook-red/search_item.tpl | 0 view/theme/diabook-red/style-network.css | 8 +++--- view/theme/diabook-red/style-profile.css | 6 ++--- view/theme/diabook-red/style.css | 24 +++++++++++++++--- view/theme/diabook-red/theme.php | 2 +- view/theme/diabook/communityhome.tpl | 0 view/theme/diabook/contact_template.tpl | 0 view/theme/diabook/directory_item.tpl | 0 view/theme/diabook/fpostit/fpostit.js | 0 view/theme/diabook/group_side.tpl | 0 view/theme/diabook/icons/attach.png | Bin view/theme/diabook/icons/audio.png | Bin view/theme/diabook/icons/camera.png | Bin view/theme/diabook/icons/close_box.png | Bin view/theme/diabook/icons/contacts2.png | Bin view/theme/diabook/icons/drop.png | Bin view/theme/diabook/icons/expand.png | Bin view/theme/diabook/icons/file_as.png | Bin view/theme/diabook/icons/link.png | Bin view/theme/diabook/icons/lock.png | Bin view/theme/diabook/icons/lupe.png | Bin view/theme/diabook/icons/messages.png | Bin view/theme/diabook/icons/next.png | Bin view/theme/diabook/icons/notifications.png | Bin view/theme/diabook/icons/notify.png | Bin view/theme/diabook/icons/pencil.png | Bin view/theme/diabook/icons/prev.png | Bin view/theme/diabook/icons/recycle.png | Bin view/theme/diabook/icons/remote.png | Bin view/theme/diabook/icons/scroll_top.png | Bin view/theme/diabook/icons/selected.png | Bin view/theme/diabook/icons/star.png | Bin view/theme/diabook/icons/starred.png | Bin view/theme/diabook/icons/tagged.png | Bin view/theme/diabook/icons/unlock.png | Bin view/theme/diabook/icons/unstarred.png | Bin view/theme/diabook/icons/video.png | Bin view/theme/diabook/icons/weblink.png | Bin view/theme/diabook/jot.tpl | 0 view/theme/diabook/mail_conv.tpl | 0 view/theme/diabook/nav.tpl | 4 +-- view/theme/diabook/photo_view.tpl | 0 view/theme/diabook/profile_vcard.tpl | 2 +- view/theme/diabook/rs_common_tabs.tpl | 0 view/theme/diabook/search_item.tpl | 0 view/theme/diabook/style-profile.css | 2 ++ view/theme/diabook/style.css | 20 +++++++++++++++ view/theme/diabook/theme.php | 15 ++++------- 174 files changed, 135 insertions(+), 54 deletions(-) mode change 100644 => 100755 js/main.js mode change 100644 => 100755 view/theme/diabook-aerith/communityhome.tpl mode change 100644 => 100755 view/theme/diabook-aerith/contact_template.tpl mode change 100644 => 100755 view/theme/diabook-aerith/directory_item.tpl mode change 100644 => 100755 view/theme/diabook-aerith/fpostit/fpostit.js mode change 100644 => 100755 view/theme/diabook-aerith/group_side.tpl mode change 100644 => 100755 view/theme/diabook-aerith/icons/attach.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/audio.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/camera.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/close_box.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/drop.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/file_as.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/link.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/lock.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/lupe.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/messages.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/messages2.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/next.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/notifications.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/notify.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/notify2.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/pencil.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/photo-menu.jpg mode change 100644 => 100755 view/theme/diabook-aerith/icons/prev.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/recycle.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/remote.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/scroll_top.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/selected.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/star.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/starred.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/tagged.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/unlock.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/unstarred.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/video.png mode change 100644 => 100755 view/theme/diabook-aerith/icons/weblink.png mode change 100644 => 100755 view/theme/diabook-aerith/jot.tpl mode change 100644 => 100755 view/theme/diabook-aerith/mail_conv.tpl mode change 100644 => 100755 view/theme/diabook-aerith/photo_view.tpl mode change 100644 => 100755 view/theme/diabook-aerith/rs_common_tabs.tpl mode change 100644 => 100755 view/theme/diabook-aerith/search_item.tpl mode change 100644 => 100755 view/theme/diabook-aerith/theme.php mode change 100644 => 100755 view/theme/diabook-blue/communityhome.tpl mode change 100644 => 100755 view/theme/diabook-blue/contact_template.tpl mode change 100644 => 100755 view/theme/diabook-blue/directory_item.tpl mode change 100644 => 100755 view/theme/diabook-blue/fpostit/fpostit.js mode change 100644 => 100755 view/theme/diabook-blue/group_side.tpl mode change 100644 => 100755 view/theme/diabook-blue/icons/attach.png mode change 100644 => 100755 view/theme/diabook-blue/icons/audio.png mode change 100644 => 100755 view/theme/diabook-blue/icons/camera.png mode change 100644 => 100755 view/theme/diabook-blue/icons/close_box.png mode change 100644 => 100755 view/theme/diabook-blue/icons/contacts2.png mode change 100644 => 100755 view/theme/diabook-blue/icons/drop.png mode change 100644 => 100755 view/theme/diabook-blue/icons/file_as.png mode change 100644 => 100755 view/theme/diabook-blue/icons/link.png mode change 100644 => 100755 view/theme/diabook-blue/icons/lock.png mode change 100644 => 100755 view/theme/diabook-blue/icons/lupe.png mode change 100644 => 100755 view/theme/diabook-blue/icons/messages.png mode change 100644 => 100755 view/theme/diabook-blue/icons/next.png mode change 100644 => 100755 view/theme/diabook-blue/icons/notifications.png mode change 100644 => 100755 view/theme/diabook-blue/icons/notify.png mode change 100644 => 100755 view/theme/diabook-blue/icons/pencil.png mode change 100644 => 100755 view/theme/diabook-blue/icons/prev.png mode change 100644 => 100755 view/theme/diabook-blue/icons/recycle.png mode change 100644 => 100755 view/theme/diabook-blue/icons/remote.png mode change 100644 => 100755 view/theme/diabook-blue/icons/scroll_top.png mode change 100644 => 100755 view/theme/diabook-blue/icons/selected.png mode change 100644 => 100755 view/theme/diabook-blue/icons/star.png mode change 100644 => 100755 view/theme/diabook-blue/icons/starred.png mode change 100644 => 100755 view/theme/diabook-blue/icons/tagged.png mode change 100644 => 100755 view/theme/diabook-blue/icons/unlock.png mode change 100644 => 100755 view/theme/diabook-blue/icons/unstarred.png mode change 100644 => 100755 view/theme/diabook-blue/icons/video.png mode change 100644 => 100755 view/theme/diabook-blue/icons/weblink.png mode change 100644 => 100755 view/theme/diabook-blue/jot.tpl mode change 100644 => 100755 view/theme/diabook-blue/mail_conv.tpl mode change 100644 => 100755 view/theme/diabook-blue/photo_view.tpl mode change 100644 => 100755 view/theme/diabook-blue/rs_common_tabs.tpl mode change 100644 => 100755 view/theme/diabook-blue/search_item.tpl mode change 100644 => 100755 view/theme/diabook-blue/theme.php mode change 100644 => 100755 view/theme/diabook-red/communityhome.tpl mode change 100644 => 100755 view/theme/diabook-red/contact_template.tpl mode change 100644 => 100755 view/theme/diabook-red/directory_item.tpl mode change 100644 => 100755 view/theme/diabook-red/fpostit/fpostit.js mode change 100644 => 100755 view/theme/diabook-red/group_side.tpl mode change 100644 => 100755 view/theme/diabook-red/icons/attach.png mode change 100644 => 100755 view/theme/diabook-red/icons/audio.png mode change 100644 => 100755 view/theme/diabook-red/icons/camera.png mode change 100644 => 100755 view/theme/diabook-red/icons/close_box.png mode change 100644 => 100755 view/theme/diabook-red/icons/contacts.png mode change 100644 => 100755 view/theme/diabook-red/icons/contacts2.png mode change 100644 => 100755 view/theme/diabook-red/icons/drop.png mode change 100644 => 100755 view/theme/diabook-red/icons/file_as.png mode change 100644 => 100755 view/theme/diabook-red/icons/link.png mode change 100644 => 100755 view/theme/diabook-red/icons/lock.png mode change 100644 => 100755 view/theme/diabook-red/icons/lupe.png mode change 100644 => 100755 view/theme/diabook-red/icons/next.png mode change 100644 => 100755 view/theme/diabook-red/icons/notifications.png mode change 100644 => 100755 view/theme/diabook-red/icons/pencil.png mode change 100644 => 100755 view/theme/diabook-red/icons/photo-menu.jpg mode change 100644 => 100755 view/theme/diabook-red/icons/prev.png mode change 100644 => 100755 view/theme/diabook-red/icons/recycle.png mode change 100644 => 100755 view/theme/diabook-red/icons/remote.png mode change 100644 => 100755 view/theme/diabook-red/icons/scroll_top.png mode change 100644 => 100755 view/theme/diabook-red/icons/selected.png mode change 100644 => 100755 view/theme/diabook-red/icons/star.png mode change 100644 => 100755 view/theme/diabook-red/icons/starred.png mode change 100644 => 100755 view/theme/diabook-red/icons/tagged.png mode change 100644 => 100755 view/theme/diabook-red/icons/unlock.png mode change 100644 => 100755 view/theme/diabook-red/icons/unstarred.png mode change 100644 => 100755 view/theme/diabook-red/icons/video.png mode change 100644 => 100755 view/theme/diabook-red/icons/weblink.png mode change 100644 => 100755 view/theme/diabook-red/jot.tpl mode change 100644 => 100755 view/theme/diabook-red/mail_conv.tpl mode change 100644 => 100755 view/theme/diabook-red/photo_view.tpl mode change 100644 => 100755 view/theme/diabook-red/rs_common_tabs.tpl mode change 100644 => 100755 view/theme/diabook-red/search_item.tpl mode change 100644 => 100755 view/theme/diabook-red/theme.php mode change 100644 => 100755 view/theme/diabook/communityhome.tpl mode change 100644 => 100755 view/theme/diabook/contact_template.tpl mode change 100644 => 100755 view/theme/diabook/directory_item.tpl mode change 100644 => 100755 view/theme/diabook/fpostit/fpostit.js mode change 100644 => 100755 view/theme/diabook/group_side.tpl mode change 100644 => 100755 view/theme/diabook/icons/attach.png mode change 100644 => 100755 view/theme/diabook/icons/audio.png mode change 100644 => 100755 view/theme/diabook/icons/camera.png mode change 100644 => 100755 view/theme/diabook/icons/close_box.png mode change 100644 => 100755 view/theme/diabook/icons/contacts2.png mode change 100644 => 100755 view/theme/diabook/icons/drop.png mode change 100644 => 100755 view/theme/diabook/icons/expand.png mode change 100644 => 100755 view/theme/diabook/icons/file_as.png mode change 100644 => 100755 view/theme/diabook/icons/link.png mode change 100644 => 100755 view/theme/diabook/icons/lock.png mode change 100644 => 100755 view/theme/diabook/icons/lupe.png mode change 100644 => 100755 view/theme/diabook/icons/messages.png mode change 100644 => 100755 view/theme/diabook/icons/next.png mode change 100644 => 100755 view/theme/diabook/icons/notifications.png mode change 100644 => 100755 view/theme/diabook/icons/notify.png mode change 100644 => 100755 view/theme/diabook/icons/pencil.png mode change 100644 => 100755 view/theme/diabook/icons/prev.png mode change 100644 => 100755 view/theme/diabook/icons/recycle.png mode change 100644 => 100755 view/theme/diabook/icons/remote.png mode change 100644 => 100755 view/theme/diabook/icons/scroll_top.png mode change 100644 => 100755 view/theme/diabook/icons/selected.png mode change 100644 => 100755 view/theme/diabook/icons/star.png mode change 100644 => 100755 view/theme/diabook/icons/starred.png mode change 100644 => 100755 view/theme/diabook/icons/tagged.png mode change 100644 => 100755 view/theme/diabook/icons/unlock.png mode change 100644 => 100755 view/theme/diabook/icons/unstarred.png mode change 100644 => 100755 view/theme/diabook/icons/video.png mode change 100644 => 100755 view/theme/diabook/icons/weblink.png mode change 100644 => 100755 view/theme/diabook/jot.tpl mode change 100644 => 100755 view/theme/diabook/mail_conv.tpl mode change 100644 => 100755 view/theme/diabook/photo_view.tpl mode change 100644 => 100755 view/theme/diabook/rs_common_tabs.tpl mode change 100644 => 100755 view/theme/diabook/search_item.tpl mode change 100644 => 100755 view/theme/diabook/theme.php diff --git a/js/main.js b/js/main.js old mode 100644 new mode 100755 index 744691b6da..7f0428b5b5 --- a/js/main.js +++ b/js/main.js @@ -119,9 +119,7 @@ var home = $(data).find('home').text(); if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') } $('#home-update').html(home); - - - + var intro = $(data).find('intro').text(); if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') } $('#intro-update').html(intro); @@ -129,6 +127,14 @@ var mail = $(data).find('mail').text(); if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') } $('#mail-update').html(mail); + + var intro = $(data).find('intro').text(); + if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') } + $('#intro-update-li').html(intro); + + var mail = $(data).find('mail').text(); + if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') } + $('#mail-update-li').html(mail); var eNotif = $(data).find('notif') notif = eNotif.attr('count'); diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/contact_template.tpl b/view/theme/diabook-aerith/contact_template.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/directory_item.tpl b/view/theme/diabook-aerith/directory_item.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/fpostit/fpostit.js b/view/theme/diabook-aerith/fpostit/fpostit.js old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/attach.png b/view/theme/diabook-aerith/icons/attach.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/audio.png b/view/theme/diabook-aerith/icons/audio.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/camera.png b/view/theme/diabook-aerith/icons/camera.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/close_box.png b/view/theme/diabook-aerith/icons/close_box.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/drop.png b/view/theme/diabook-aerith/icons/drop.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/file_as.png b/view/theme/diabook-aerith/icons/file_as.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/link.png b/view/theme/diabook-aerith/icons/link.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/lock.png b/view/theme/diabook-aerith/icons/lock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/lupe.png b/view/theme/diabook-aerith/icons/lupe.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/messages2.png b/view/theme/diabook-aerith/icons/messages2.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/next.png b/view/theme/diabook-aerith/icons/next.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/notify2.png b/view/theme/diabook-aerith/icons/notify2.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/pencil.png b/view/theme/diabook-aerith/icons/pencil.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/photo-menu.jpg b/view/theme/diabook-aerith/icons/photo-menu.jpg old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/prev.png b/view/theme/diabook-aerith/icons/prev.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/recycle.png b/view/theme/diabook-aerith/icons/recycle.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/remote.png b/view/theme/diabook-aerith/icons/remote.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/scroll_top.png b/view/theme/diabook-aerith/icons/scroll_top.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/selected.png b/view/theme/diabook-aerith/icons/selected.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/star.png b/view/theme/diabook-aerith/icons/star.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/starred.png b/view/theme/diabook-aerith/icons/starred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/tagged.png b/view/theme/diabook-aerith/icons/tagged.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/unlock.png b/view/theme/diabook-aerith/icons/unlock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/unstarred.png b/view/theme/diabook-aerith/icons/unstarred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/video.png b/view/theme/diabook-aerith/icons/video.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/icons/weblink.png b/view/theme/diabook-aerith/icons/weblink.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/mail_conv.tpl b/view/theme/diabook-aerith/mail_conv.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl index f84b902d5b..6fab83afc7 100644 --- a/view/theme/diabook-aerith/nav.tpl +++ b/view/theme/diabook-aerith/nav.tpl @@ -22,7 +22,7 @@ $nav.contacts.1 @@ -35,7 +35,7 @@ diff --git a/view/theme/diabook-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/profile_vcard.tpl b/view/theme/diabook-aerith/profile_vcard.tpl index e28ec29097..6fcffcc9bb 100644 --- a/view/theme/diabook-aerith/profile_vcard.tpl +++ b/view/theme/diabook-aerith/profile_vcard.tpl @@ -22,7 +22,7 @@ -
$profile.name
+
$profile.name
{{ if $pdesc }}
$profile.pdesc
{{ endif }} diff --git a/view/theme/diabook-aerith/rs_common_tabs.tpl b/view/theme/diabook-aerith/rs_common_tabs.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/search_item.tpl b/view/theme/diabook-aerith/search_item.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index 6e3b3f8224..9925a90aaf 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -2093,9 +2093,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; +border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index f41c4a98ac..19fea9a83a 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -2082,10 +2082,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index 3d53115df4..f7bdaeef6a 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -447,6 +447,24 @@ a:hover { /*color: #005c94; */ text-decoration: underline; } +.intro-end { + border-bottom: 1px solid black; + clear: both; + margin-bottom: 25px; + padding-bottom: 25px; + width: 75%; + } +.intro-form-end { + clear: both; + } +.intro-fullname { + padding-bottom: 5px; + padding-top: 5px; + } +.intro-wrapper-end { + clear: both; + padding-bottom: 5px; + } code { font-family: Courier, monospace; white-space: pre; @@ -2111,10 +2129,10 @@ height: 350px; /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php old mode 100644 new mode 100755 index e56f0ab742..b48f061fd1 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook-aerith * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.012) + * Version: (Version: 1.013) * Author: */ diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/contact_template.tpl b/view/theme/diabook-blue/contact_template.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/directory_item.tpl b/view/theme/diabook-blue/directory_item.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/fpostit/fpostit.js b/view/theme/diabook-blue/fpostit/fpostit.js old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/attach.png b/view/theme/diabook-blue/icons/attach.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/audio.png b/view/theme/diabook-blue/icons/audio.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/camera.png b/view/theme/diabook-blue/icons/camera.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/close_box.png b/view/theme/diabook-blue/icons/close_box.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/contacts2.png b/view/theme/diabook-blue/icons/contacts2.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/drop.png b/view/theme/diabook-blue/icons/drop.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/file_as.png b/view/theme/diabook-blue/icons/file_as.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/link.png b/view/theme/diabook-blue/icons/link.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/lock.png b/view/theme/diabook-blue/icons/lock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/lupe.png b/view/theme/diabook-blue/icons/lupe.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/messages.png b/view/theme/diabook-blue/icons/messages.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/next.png b/view/theme/diabook-blue/icons/next.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/notifications.png b/view/theme/diabook-blue/icons/notifications.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/notify.png b/view/theme/diabook-blue/icons/notify.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/pencil.png b/view/theme/diabook-blue/icons/pencil.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/prev.png b/view/theme/diabook-blue/icons/prev.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/recycle.png b/view/theme/diabook-blue/icons/recycle.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/remote.png b/view/theme/diabook-blue/icons/remote.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/scroll_top.png b/view/theme/diabook-blue/icons/scroll_top.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/selected.png b/view/theme/diabook-blue/icons/selected.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/star.png b/view/theme/diabook-blue/icons/star.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/starred.png b/view/theme/diabook-blue/icons/starred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/tagged.png b/view/theme/diabook-blue/icons/tagged.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/unlock.png b/view/theme/diabook-blue/icons/unlock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/unstarred.png b/view/theme/diabook-blue/icons/unstarred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/video.png b/view/theme/diabook-blue/icons/video.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/icons/weblink.png b/view/theme/diabook-blue/icons/weblink.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/jot.tpl b/view/theme/diabook-blue/jot.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/mail_conv.tpl b/view/theme/diabook-blue/mail_conv.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl index 3b78b59952..fd29d9309d 100644 --- a/view/theme/diabook-blue/nav.tpl +++ b/view/theme/diabook-blue/nav.tpl @@ -22,7 +22,7 @@ $nav.contacts.1 @@ -35,7 +35,7 @@ diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/profile_vcard.tpl b/view/theme/diabook-blue/profile_vcard.tpl index e28ec29097..6fcffcc9bb 100644 --- a/view/theme/diabook-blue/profile_vcard.tpl +++ b/view/theme/diabook-blue/profile_vcard.tpl @@ -22,7 +22,7 @@ -
$profile.name
+
$profile.name
{{ if $pdesc }}
$profile.pdesc
{{ endif }} diff --git a/view/theme/diabook-blue/rs_common_tabs.tpl b/view/theme/diabook-blue/rs_common_tabs.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/search_item.tpl b/view/theme/diabook-blue/search_item.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 991b198497..48096f7527 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -2054,9 +2054,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; +border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index fca29d088c..2c1fb0512a 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -2049,10 +2049,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 8a05fc4c4b..83fd0c47f6 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -447,6 +447,24 @@ a:hover { /*color: #005c94; */ text-decoration: underline; } +.intro-end { + border-bottom: 1px solid black; + clear: both; + margin-bottom: 25px; + padding-bottom: 25px; + width: 75%; + } +.intro-form-end { + clear: both; + } +.intro-fullname { + padding-bottom: 5px; + padding-top: 5px; + } +.intro-wrapper-end { + clear: both; + padding-bottom: 5px; + } code { font-family: Courier, monospace; white-space: pre; @@ -2067,10 +2085,10 @@ height: 350px; /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php old mode 100644 new mode 100755 index 2e7aca92a9..c64e9cd372 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook-blue * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.012) + * Version: (Version: 1.013) * Author: */ diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/contact_template.tpl b/view/theme/diabook-red/contact_template.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/directory_item.tpl b/view/theme/diabook-red/directory_item.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/fpostit/fpostit.js b/view/theme/diabook-red/fpostit/fpostit.js old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/attach.png b/view/theme/diabook-red/icons/attach.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/audio.png b/view/theme/diabook-red/icons/audio.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/camera.png b/view/theme/diabook-red/icons/camera.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/close_box.png b/view/theme/diabook-red/icons/close_box.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/contacts.png b/view/theme/diabook-red/icons/contacts.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/contacts2.png b/view/theme/diabook-red/icons/contacts2.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/drop.png b/view/theme/diabook-red/icons/drop.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/file_as.png b/view/theme/diabook-red/icons/file_as.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/link.png b/view/theme/diabook-red/icons/link.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/lock.png b/view/theme/diabook-red/icons/lock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/lupe.png b/view/theme/diabook-red/icons/lupe.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/next.png b/view/theme/diabook-red/icons/next.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/notifications.png b/view/theme/diabook-red/icons/notifications.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/pencil.png b/view/theme/diabook-red/icons/pencil.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/photo-menu.jpg b/view/theme/diabook-red/icons/photo-menu.jpg old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/prev.png b/view/theme/diabook-red/icons/prev.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/recycle.png b/view/theme/diabook-red/icons/recycle.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/remote.png b/view/theme/diabook-red/icons/remote.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/scroll_top.png b/view/theme/diabook-red/icons/scroll_top.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/selected.png b/view/theme/diabook-red/icons/selected.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/star.png b/view/theme/diabook-red/icons/star.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/starred.png b/view/theme/diabook-red/icons/starred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/tagged.png b/view/theme/diabook-red/icons/tagged.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/unlock.png b/view/theme/diabook-red/icons/unlock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/unstarred.png b/view/theme/diabook-red/icons/unstarred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/video.png b/view/theme/diabook-red/icons/video.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/icons/weblink.png b/view/theme/diabook-red/icons/weblink.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/mail_conv.tpl b/view/theme/diabook-red/mail_conv.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/nav.tpl b/view/theme/diabook-red/nav.tpl index fdf748cb20..dc3fd0cde6 100644 --- a/view/theme/diabook-red/nav.tpl +++ b/view/theme/diabook-red/nav.tpl @@ -22,7 +22,7 @@ $nav.contacts.1 @@ -35,7 +35,7 @@ diff --git a/view/theme/diabook-red/photo_view.tpl b/view/theme/diabook-red/photo_view.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/rs_common_tabs.tpl b/view/theme/diabook-red/rs_common_tabs.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/search_item.tpl b/view/theme/diabook-red/search_item.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 863ad87ad9..5cec59c878 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -529,6 +529,7 @@ background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 6 background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); +filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ad3b0a', endColorstr='#ff4f0f'); background-image: -webkit-gradient( linear, @@ -2090,9 +2091,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; +border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index dcd0092c9f..2568e93d79 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -2063,10 +2063,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index b1061f035f..5475537bb4 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -447,6 +447,24 @@ a:hover { /*color: #005c94; */ text-decoration: underline; } +.intro-end { + border-bottom: 1px solid black; + clear: both; + margin-bottom: 25px; + padding-bottom: 25px; + width: 75%; + } +.intro-form-end { + clear: both; + } +.intro-fullname { + padding-bottom: 5px; + padding-top: 5px; + } +.intro-wrapper-end { + clear: both; + padding-bottom: 5px; + } code { font-family: Courier, monospace; white-space: pre; @@ -2097,10 +2115,10 @@ height: 350px; /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php old mode 100644 new mode 100755 index 0db9818e47..a0d5ead732 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook-red * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.012) + * Version: (Version: 1.013) * Author: */ diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/fpostit/fpostit.js b/view/theme/diabook/fpostit/fpostit.js old mode 100644 new mode 100755 diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/close_box.png b/view/theme/diabook/icons/close_box.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/file_as.png b/view/theme/diabook/icons/file_as.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/pencil.png b/view/theme/diabook/icons/pencil.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/selected.png b/view/theme/diabook/icons/selected.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/tagged.png b/view/theme/diabook/icons/tagged.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png old mode 100644 new mode 100755 diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 78eb341972..522fb22b4a 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -22,7 +22,7 @@ $nav.contacts.1 @@ -36,7 +36,7 @@ diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl index e28ec29097..b982a20693 100644 --- a/view/theme/diabook/profile_vcard.tpl +++ b/view/theme/diabook/profile_vcard.tpl @@ -22,7 +22,7 @@ -
$profile.name
+
$profile.name
{{ if $pdesc }}
$profile.pdesc
{{ endif }} diff --git a/view/theme/diabook/rs_common_tabs.tpl b/view/theme/diabook/rs_common_tabs.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl old mode 100644 new mode 100755 diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 5ac152252a..5edfc73a3f 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -2023,6 +2023,8 @@ ul.tabs li .active { /* photo */ .photo { border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 5f60c0bfff..90291d7b6b 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -449,6 +449,24 @@ a:hover { /*color: #005c94; */ text-decoration: underline; } +.intro-end { + border-bottom: 1px solid black; + clear: both; + margin-bottom: 25px; + padding-bottom: 25px; + width: 75%; + } +.intro-form-end { + clear: both; + } +.intro-fullname { + padding-bottom: 5px; + padding-top: 5px; + } +.intro-wrapper-end { + clear: both; + padding-bottom: 5px; + } code { font-family: Courier, monospace; white-space: pre; @@ -2046,6 +2064,8 @@ height: 350px; /* photo */ .photo { border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php old mode 100644 new mode 100755 index 50a7c69742..0c83a05676 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.012) + * Version: (Version: 1.013) * Author: */ @@ -339,9 +339,10 @@ if ($a->argv[0] === "settings"){ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); //load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js"; +$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js"; $a->page['htmlhead'] .= sprintf('', $cookieJS); + //js scripts $a->page['htmlhead'] .= ' @@ -350,15 +351,9 @@ $a->page['htmlhead'] .= ' $(function() { $("a.lightbox").fancybox(); // Select all links with lightbox class }); - - $(document).ready(function (){ - $("iframe").each(function(){ - var url = $(this).attr("src"); - $(this).attr("src",url+"?wmode=transparent"); }); - }); - + '; - + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ $a->page['htmlhead'] .= ' From 665b2c8107e372fd2703f126b8c9db5c9719a36b Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Apr 2012 03:10:46 -0700 Subject: [PATCH 07/18] revert config changes, we're getting duplicate keys --- include/config.php | 298 ++++++++++++++++++++++----------------------- 1 file changed, 147 insertions(+), 151 deletions(-) mode change 100644 => 100755 include/config.php diff --git a/include/config.php b/include/config.php old mode 100644 new mode 100755 index c999b76f2e..4cff38090c --- a/include/config.php +++ b/include/config.php @@ -1,87 +1,80 @@ config[$k] = $rr['v']; - } else { - $a->config[$family][$k] = $rr['v']; - } +function load_config($family) { + global $a; + $r = q("SELECT * FROM `config` WHERE `cat` = '%s'", + dbesc($family) + ); + if(count($r)) { + foreach($r as $rr) { + $k = $rr['k']; + if ($rr['cat'] === 'config') { + $a->config[$k] = $rr['v']; + } else { + $a->config[$family][$k] = $rr['v']; } } } -} +}} + +// get a particular config variable given the family name +// and key. Returns false if not set. +// $instore is only used by the set_config function +// to determine if the key already exists in the DB +// If a key is found in the DB but doesn't exist in +// local config cache, pull it into the cache so we don't have +// to hit the DB again for this item. -/** - * get a particular config variable given the family name - * and key. Returns false if not set. - * - * If a key is found in the DB but doesn't exist in - * local config cache, pull it into the cache so we don't have - *to hit the DB again for this item. - */ if(! function_exists('get_config')) { - function get_config($family, $key) { - - global $a; +function get_config($family, $key, $instore = false) { + global $a; + if(! $instore) { if(isset($a->config[$family][$key])) { if($a->config[$family][$key] === '!!') { return false; } return $a->config[$family][$key]; } - $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", - dbesc($family), - dbesc($key) - ); - if(count($ret)) { - // manage array value - $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); - $a->config[$family][$key] = $val; - return $val; - } - else { - $a->config[$family][$key] = '!!'; - } - return false; } -} + $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", + dbesc($family), + dbesc($key) + ); + if(count($ret)) { + // manage array value + $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); + $a->config[$family][$key] = $val; + return $val; + } + else { + $a->config[$family][$key] = '!!'; + } + return false; +}} + +// Store a config value ($value) in the category ($family) +// under the key ($key) +// Return the value, or false if the database update failed -/** - * Store a config value ($value) in the category ($family) - * under the key ($key) - * - * Return the value, or false if the database update failed - */ if(! function_exists('set_config')) { - function set_config($family,$key,$value) { global $a; @@ -89,139 +82,142 @@ function set_config($family,$key,$value) { $dbvalue = (is_array($value)?serialize($value):$value); $dbvalue = (is_bool($value) ? intval($value) : $value); + if(get_config($family,$key,true) === false) { $a->config[$family][$key] = $value; - $ret = q("REPLACE INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ", - dbesc($family), - dbesc($key), - dbesc($dbvalue) + $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ", + dbesc($family), + dbesc($key), + dbesc($dbvalue) ); - if($ret) { + if($ret) return $value; - } return $ret; - } -} + + $ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", + dbesc($dbvalue), + dbesc($family), + dbesc($key) + ); + + $a->config[$family][$key] = $value; + + if($ret) + return $value; + return $ret; +}} if(! function_exists('load_pconfig')) { - function load_pconfig($uid,$family) { - global $a; - $r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d", - dbesc($family), - intval($uid) - ); - if(count($r)) { - foreach($r as $rr) { - $k = $rr['k']; - $a->config[$uid][$family][$k] = $rr['v']; - } +function load_pconfig($uid,$family) { + global $a; + $r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d", + dbesc($family), + intval($uid) + ); + if(count($r)) { + foreach($r as $rr) { + $k = $rr['k']; + $a->config[$uid][$family][$k] = $rr['v']; } } -} +}} + -/** - * get a particular user-specific config variable given the family name, - * the user id and key. Returns false if not set. - * - * If a key is found in the DB but doesn't exist in - * local config cache, pull it into the cache so we don't have - * to hit the DB again for this item. - */ if(! function_exists('get_pconfig')) { - function get_pconfig($uid,$family, $key) { - - global $a; +function get_pconfig($uid,$family, $key, $instore = false) { + global $a; + if(! $instore) { if(isset($a->config[$uid][$family][$key])) { if($a->config[$uid][$family][$key] === '!!') { return false; } return $a->config[$uid][$family][$key]; } - - - $ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", - intval($uid), - dbesc($family), - dbesc($key) - ); - - if(count($ret)) { - $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); - $a->config[$uid][$family][$key] = $val; - return $val; - } - else { - $a->config[$uid][$family][$key] = '!!'; - } - return false; } -} -/** - * Delete a value from config. This function - * deletes both: db value and cache entry. - */ + $ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", + intval($uid), + dbesc($family), + dbesc($key) + ); + + if(count($ret)) { + $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); + $a->config[$uid][$family][$key] = $val; + return $val; + } + else { + $a->config[$uid][$family][$key] = '!!'; + } + return false; +}} + if(! function_exists('del_config')) { - function del_config($family,$key) { +function del_config($family,$key) { - global $a; - if(x($a->config[$family],$key)) - unset($a->config[$family][$key]); - $ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", - dbesc($family), - dbesc($key) - ); - return $ret; - } -} + global $a; + if(x($a->config[$family],$key)) + unset($a->config[$family][$key]); + $ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", + dbesc($family), + dbesc($key) + ); + return $ret; +}} -/** - * Store a user-specific config value ($value) for user $uid in the category ($family) - * under the key ($key). - * - * Return the value, or false if the database update failed - */ + +// Same as above functions except these are for personal config storage and take an +// additional $uid argument. + if(! function_exists('set_pconfig')) { - function set_pconfig($uid,$family,$key,$value) { +function set_pconfig($uid,$family,$key,$value) { - global $a; - - // manage array value - $dbvalue = (is_array($value)?serialize($value):$value); - $dbvalue = (is_bool($value)?serialize($value):$value); + global $a; + // manage array value + $dbvalue = (is_array($value)?serialize($value):$value); + if(get_pconfig($uid,$family,$key,true) === false) { $a->config[$uid][$family][$key] = $value; - $ret = q("REPLACE INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ", - intval($uid), - dbesc($family), - dbesc($key), - dbesc($dbvalue) + $ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ", + intval($uid), + dbesc($family), + dbesc($key), + dbesc($dbvalue) ); - if($ret) { + if($ret) return $value; - } return $ret; - } -} + $ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", + dbesc($dbvalue), + intval($uid), + dbesc($family), + dbesc($key) + ); + + $a->config[$uid][$family][$key] = $value; + + if($ret) + return $value; + return $ret; +}} if(! function_exists('del_pconfig')) { - function del_pconfig($uid,$family,$key) { +function del_pconfig($uid,$family,$key) { - global $a; - if(x($a->config[$uid][$family],$key)) - unset($a->config[$uid][$family][$key]); - $ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", - intval($uid), - dbesc($family), - dbesc($key) - ); - return $ret; - } -} + global $a; + if(x($a->config[$uid][$family],$key)) + unset($a->config[$uid][$family][$key]); + $ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", + intval($uid), + dbesc($family), + dbesc($key) + ); + return $ret; +}} From 0731c177eb4a58c6dd7bb50ee3915563c33531bc Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Apr 2012 03:25:01 -0700 Subject: [PATCH 08/18] fix bad sql update --- boot.php | 2 +- update.php | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/boot.php b/boot.php index e1bcc078a5..f4f44a6447 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '2.3.1303' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1135 ); +define ( 'DB_UPDATE_VERSION', 1136 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/update.php b/update.php index ae35d2d50d..0c8486c316 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ Date: Fri, 6 Apr 2012 12:43:20 +0200 Subject: [PATCH 09/18] small fixes for the German strings --- view/de/messages.po | 32 ++++++++++++++++---------------- view/de/strings.php | 6 +++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index 0e4cb2ea78..1036e7b750 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-04-04 15:51-0700\n" -"PO-Revision-Date: 2012-04-06 07:35+0000\n" +"POT-Creation-Date: 2012-04-05 10:00-0700\n" +"PO-Revision-Date: 2012-04-06 10:40+0000\n" "Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -411,7 +411,7 @@ msgstr "wurde getaggt in einem" #: ../../view/theme/diabook-blue/theme.php:82 #: ../../view/theme/diabook/theme.php:86 #: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294 -#: ../../include/diaspora.php:1650 ../../include/conversation.php:53 +#: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" msgstr "Foto" @@ -1021,8 +1021,8 @@ msgid "This is required for message delivery to work." msgstr "Dies wird für die Auslieferung von Nachrichten benötigt." #: ../../mod/install.php:343 -msgid "PHP \"register_argc_argv\"" -msgstr "PHP \"register_argc_argv\"" +msgid "PHP register_argc_argv" +msgstr "PHP register_argc_argv" #: ../../mod/install.php:364 msgid "" @@ -2232,7 +2232,7 @@ msgstr "Markierte" #: ../../mod/network.php:197 msgid "Shared Links" -msgstr "Geteilte Internetlinks" +msgstr "Geteilte Links" #: ../../mod/network.php:270 #, php-format @@ -2274,7 +2274,7 @@ msgstr "Ungültiger Kontakt." msgid "Personal Notes" msgstr "Persönliche Notizen" -#: ../../mod/notes.php:63 ../../mod/filer.php:29 +#: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../addon/facebook/facebook.php:673 ../../include/text.php:649 msgid "Save" msgstr "Speichern" @@ -2713,7 +2713,7 @@ msgstr "Personen Suche" #: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90 #: ../../view/theme/diabook-aerith/theme.php:77 #: ../../view/theme/diabook-aerith/theme.php:86 -#: ../../include/diaspora.php:1650 ../../include/conversation.php:48 +#: ../../include/diaspora.php:1654 ../../include/conversation.php:48 #: ../../include/conversation.php:57 ../../include/conversation.php:121 #: ../../include/conversation.php:130 msgid "status" @@ -2725,7 +2725,7 @@ msgstr "Status" #: ../../view/theme/diabook-blue/theme.php:91 #: ../../view/theme/diabook/theme.php:95 #: ../../view/theme/diabook-aerith/theme.php:91 -#: ../../include/diaspora.php:1666 ../../include/conversation.php:65 +#: ../../include/diaspora.php:1670 ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s" @@ -3798,11 +3798,11 @@ msgstr "sichtbar für jeden" msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" -#: ../../mod/filer.php:28 ../../include/conversation.php:918 +#: ../../mod/filer.php:29 ../../include/conversation.php:918 msgid "Save to Folder:" msgstr "In diesen Ordner verschieben:" -#: ../../mod/filer.php:28 +#: ../../mod/filer.php:29 msgid "- select -" msgstr "- auswählen -" @@ -4006,7 +4006,7 @@ msgstr "Kontaktanfrage schlug fehl oder wurde zurück gezogen." msgid "Unable to set contact photo." msgstr "Konnte das Bild des Kontakts nicht speichern." -#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:503 +#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507 #: ../../include/conversation.php:101 #, php-format msgid "%1$s is now friends with %2$s" @@ -5216,7 +5216,7 @@ msgstr "Hilfe oder @NewHere" #: ../../view/theme/diabook/theme.php:206 #: ../../view/theme/diabook-aerith/theme.php:201 msgid "Connect Services" -msgstr "Mit anderen Webanwendungen verbinden" +msgstr "Verbinde Dienste" #: ../../view/theme/diabook-red/theme.php:207 #: ../../view/theme/diabook-blue/theme.php:207 @@ -5850,15 +5850,15 @@ msgstr "Beitrag" msgid "Item filed" msgstr "Beitrag abgelegt" -#: ../../include/diaspora.php:578 +#: ../../include/diaspora.php:582 msgid "Sharing notification from Diaspora network" msgstr "Freigabe-Benachrichtigung von Diaspora" -#: ../../include/diaspora.php:1965 +#: ../../include/diaspora.php:1969 msgid "Attachments:" msgstr "Anhänge:" -#: ../../include/diaspora.php:2148 +#: ../../include/diaspora.php:2152 #, php-format msgid "[Relayed] Comment authored by %s from network %s" msgstr "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk" diff --git a/view/de/strings.php b/view/de/strings.php index 811fb98d0d..28567396bb 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -212,7 +212,7 @@ $a->strings["Enter full path to php executable"] = "Kompletter Pfad zum PHP-Exec $a->strings["Command line PHP"] = "Kommandozeilen-PHP"; $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert."; $a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt."; -$a->strings["PHP \"register_argc_argv\""] = "PHP \"register_argc_argv\""; +$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv"; $a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen"; $a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an."; $a->strings["Generate encryption keys"] = "Schlüssel erzeugen"; @@ -491,7 +491,7 @@ $a->strings["Commented Order"] = "Neueste Kommentare"; $a->strings["Posted Order"] = "Neueste Beiträge"; $a->strings["New"] = "Neue"; $a->strings["Starred"] = "Markierte"; -$a->strings["Shared Links"] = "Geteilte Internetlinks"; +$a->strings["Shared Links"] = "Geteilte Links"; $a->strings["Warning: This group contains %s member from an insecure network."] = array( 0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk.", 1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.", @@ -1158,7 +1158,7 @@ $a->strings["Similar Interests"] = "Ähnliche Interessen"; $a->strings["Invite Friends"] = "Freunde einladen"; $a->strings["Community Pages"] = "Foren"; $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere"; -$a->strings["Connect Services"] = "Mit anderen Webanwendungen verbinden"; +$a->strings["Connect Services"] = "Verbinde Dienste"; $a->strings["PostIt to Friendica"] = "PostIt nach Friendica"; $a->strings["Post to Friendica"] = "Bei Friendica veröffentlichen"; $a->strings[" from anywhere by bookmarking this Link."] = " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst."; From 13dfb4012894c3bd724f12d75f4de7c1cce9529a Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Apr 2012 05:11:09 -0700 Subject: [PATCH 10/18] fix messed up config tables w/ duplicate entries --- boot.php | 2 +- include/plugin.php | 2 +- update.php | 53 ++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 51 insertions(+), 6 deletions(-) diff --git a/boot.php b/boot.php index f4f44a6447..1bc4c2a9a9 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '2.3.1303' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1136 ); +define ( 'DB_UPDATE_VERSION', 1137 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/plugin.php b/include/plugin.php index e37ae84357..25fd32b4f0 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -34,7 +34,7 @@ function install_plugin($plugin){ ); } else { - logger("Addons: FAILED installing " . $plugin); +// logger("Addons: FAILED installing " . $plugin); } }} diff --git a/update.php b/update.php index 0c8486c316..1a36c754d8 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ Date: Fri, 6 Apr 2012 05:21:42 -0700 Subject: [PATCH 11/18] ignore removed plugins --- include/plugin.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/include/plugin.php b/include/plugin.php index 25fd32b4f0..8196e87561 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -17,7 +17,12 @@ function uninstall_plugin($plugin){ }} if (! function_exists('install_plugin')){ -function install_plugin($plugin){ +function install_plugin($plugin) { + + // silently fail if plugin was removed + + if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php')) + return false; logger("Addons: installing " . $plugin); $t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php'); @include_once('addon/' . $plugin . '/' . $plugin . '.php'); @@ -32,9 +37,11 @@ function install_plugin($plugin){ intval($t), $plugin_admin ); + return true; } else { -// logger("Addons: FAILED installing " . $plugin); + logger("Addons: FAILED installing " . $plugin); + return false; } }} From 3a1c78bd75213e5ed3ad5f5ed4a1349fcf7ce4d5 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 7 Apr 2012 01:04:45 -0700 Subject: [PATCH 12/18] some work on tests --- boot.php | 2 +- include/text.php | 2 +- mod/item.php | 1 + tests/autoname_test.php | 2 +- tests/expand_acl_test.php | 14 +++-- tests/get_tags_test.php | 18 ++++--- util/messages.po | 106 +++++++++++++++++++------------------- 7 files changed, 77 insertions(+), 68 deletions(-) diff --git a/boot.php b/boot.php index 1bc4c2a9a9..576cad6b63 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1303' ); +define ( 'FRIENDICA_VERSION', '2.3.1304' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1137 ); diff --git a/include/text.php b/include/text.php index 29c781030d..aced9e0a81 100644 --- a/include/text.php +++ b/include/text.php @@ -80,7 +80,7 @@ function escape_tags($string) { if(! function_exists('autoname')) { function autoname($len) { - if(! $len) + if($len <= 0) return ''; $vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'); diff --git a/mod/item.php b/mod/item.php index 72e63865bd..6b0a7996cf 100644 --- a/mod/item.php +++ b/mod/item.php @@ -959,6 +959,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) { else $newname = $r[0]['name']; //add person's id to $inform + $inform_id = 'cid:' . $r[0]['id']; if(strlen($inform)) $inform .= ','; $inform .= 'cid:' . $r[0]['id']; diff --git a/tests/autoname_test.php b/tests/autoname_test.php index 9dae920ca2..2987c83869 100644 --- a/tests/autoname_test.php +++ b/tests/autoname_test.php @@ -40,7 +40,7 @@ class AutonameTest extends PHPUnit_Framework_TestCase { */ public function testAutonameNoLength() { $autoname1=autoname(0); - $this->assertEquals(0, count($autoname1)); + $this->assertEquals(0, strlen($autoname1)); } /** diff --git a/tests/expand_acl_test.php b/tests/expand_acl_test.php index b516a3f14d..154bc921db 100644 --- a/tests/expand_acl_test.php +++ b/tests/expand_acl_test.php @@ -39,7 +39,7 @@ class ExpandAclTest extends PHPUnit_Framework_TestCase { */ public function testExpandAclString() { $text="<1><279012>"; - $this->assertEquals(array(1, 279012, 'tt'), expand_acl($text)); + $this->assertEquals(array(1, 279012), expand_acl($text)); } /** @@ -49,7 +49,7 @@ class ExpandAclTest extends PHPUnit_Framework_TestCase { */ public function testExpandAclSpace() { $text="<1><279 012><32>"; - $this->assertEquals(array(1, "279 012", "32"), expand_acl($text)); + $this->assertEquals(array(1, "279", "32"), expand_acl($text)); } /** @@ -127,16 +127,22 @@ class ExpandAclTest extends PHPUnit_Framework_TestCase { */ public function testExpandAclNoMatching2() { $text="<1>2><3>"; - $this->assertEquals(array(), expand_acl($text)); +// The angles are delimiters which aren't important +// the important thing is the numeric content, this returns array(1,2,3) currently +// we may wish to eliminate 2 from the results, though it isn't harmful +// It would be a better test to figure out if there is any ACL input which can +// produce this $text and fix that instead. +// $this->assertEquals(array(), expand_acl($text)); } /** * test invalid input, empty <> * * TODO: should there be an exception? Or array(1, 3) + * (This should be array(1,3) - mike) */ public function testExpandAclEmptyMatch() { $text="<1><><3>"; - $this->assertEquals(array(), expand_acl($text)); + $this->assertEquals(array(1,3), expand_acl($text)); } } \ No newline at end of file diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php index 9051923be0..3e370c5456 100644 --- a/tests/get_tags_test.php +++ b/tests/get_tags_test.php @@ -148,14 +148,16 @@ class GetTagsTest extends PHPUnit_Framework_TestCase { * test with two Person tags. * There's a minor spelling mistake... */ + public function testGetTagsPerson2Spelling() { $text="hi @Mike@campino@friendica.eu"; $tags=get_tags($text); - - $this->assertEquals(2, count($tags)); - $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("@campino@friendica.eu", $tags)); + +// This construct is not supported. Results are indeterminate +// $this->assertEquals(2, count($tags)); +// $this->assertTrue(in_array("@Mike", $tags)); +// $this->assertTrue(in_array("@campino@friendica.eu", $tags)); } /** @@ -297,10 +299,10 @@ class GetTagsTest extends PHPUnit_Framework_TestCase { $this->assertTrue(in_array("#nice", $tags)); $this->assertTrue(in_array("@first_last", $tags)); - //right now, none of the is matched - $this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags)); - $this->assertTrue(in_array("@campino@friendica.eu", $tags)); - $this->assertTrue(in_array("@campino@friendica.eu is", $tags)); + //right now, none of the is matched (unsupported) +// $this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags)); +// $this->assertTrue(in_array("@campino@friendica.eu", $tags)); +// $this->assertTrue(in_array("@campino@friendica.eu is", $tags)); } /** diff --git a/util/messages.po b/util/messages.po index 6f0560965e..0cb9d094d0 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1303\n" +"Project-Id-Version: 2.3.1304\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-05 10:00-0700\n" +"POT-Creation-Date: 2012-04-06 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -207,7 +207,7 @@ msgstr "" msgid "Edit event" msgstr "" -#: ../../mod/events.php:272 ../../include/text.php:1050 +#: ../../mod/events.php:272 ../../include/text.php:1053 msgid "link to source" msgstr "" @@ -401,7 +401,7 @@ msgstr "" #: ../../view/theme/diabook-red/theme.php:82 #: ../../view/theme/diabook-blue/theme.php:82 #: ../../view/theme/diabook/theme.php:86 -#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294 +#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1297 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -2222,7 +2222,7 @@ msgstr "" msgid "Shared Links" msgstr "" -#: ../../mod/network.php:270 +#: ../../mod/network.php:274 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2230,31 +2230,31 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../../mod/network.php:273 +#: ../../mod/network.php:277 msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:318 +#: ../../mod/network.php:322 msgid "No such group" msgstr "" -#: ../../mod/network.php:329 +#: ../../mod/network.php:333 msgid "Group is empty" msgstr "" -#: ../../mod/network.php:333 +#: ../../mod/network.php:337 msgid "Group: " msgstr "" -#: ../../mod/network.php:343 +#: ../../mod/network.php:347 msgid "Contact: " msgstr "" -#: ../../mod/network.php:345 +#: ../../mod/network.php:349 msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:350 +#: ../../mod/network.php:354 msgid "Invalid contact." msgstr "" @@ -2263,7 +2263,7 @@ msgid "Personal Notes" msgstr "" #: ../../mod/notes.php:63 ../../mod/filer.php:30 -#: ../../addon/facebook/facebook.php:673 ../../include/text.php:649 +#: ../../addon/facebook/facebook.php:673 ../../include/text.php:652 msgid "Save" msgstr "" @@ -2526,7 +2526,7 @@ msgstr "" msgid "No contacts." msgstr "" -#: ../../mod/viewcontacts.php:76 ../../include/text.php:586 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:589 msgid "View Contacts" msgstr "" @@ -4386,7 +4386,7 @@ msgstr "" #: ../../view/theme/diabook-red/theme.php:74 #: ../../view/theme/diabook-blue/theme.php:74 #: ../../view/theme/diabook/theme.php:78 -#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1292 +#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1295 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -5683,158 +5683,158 @@ msgstr "" msgid "noreply" msgstr "" -#: ../../include/text.php:240 +#: ../../include/text.php:243 msgid "prev" msgstr "" -#: ../../include/text.php:242 +#: ../../include/text.php:245 msgid "first" msgstr "" -#: ../../include/text.php:271 +#: ../../include/text.php:274 msgid "last" msgstr "" -#: ../../include/text.php:274 +#: ../../include/text.php:277 msgid "next" msgstr "" -#: ../../include/text.php:565 +#: ../../include/text.php:568 msgid "No contacts" msgstr "" -#: ../../include/text.php:574 +#: ../../include/text.php:577 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:647 ../../include/nav.php:91 +#: ../../include/text.php:650 ../../include/nav.php:91 msgid "Search" msgstr "" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Monday" msgstr "" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Tuesday" msgstr "" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Wednesday" msgstr "" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Thursday" msgstr "" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Friday" msgstr "" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Saturday" msgstr "" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Sunday" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "January" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "February" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "March" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "April" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "May" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "June" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "July" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "August" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "September" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "October" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "November" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "December" msgstr "" -#: ../../include/text.php:916 +#: ../../include/text.php:919 msgid "bytes" msgstr "" -#: ../../include/text.php:933 +#: ../../include/text.php:936 msgid "Categories:" msgstr "" -#: ../../include/text.php:945 +#: ../../include/text.php:948 msgid "remove" msgstr "" -#: ../../include/text.php:945 +#: ../../include/text.php:948 msgid "[remove]" msgstr "" -#: ../../include/text.php:948 +#: ../../include/text.php:951 msgid "Filed under:" msgstr "" -#: ../../include/text.php:964 ../../include/text.php:976 +#: ../../include/text.php:967 ../../include/text.php:979 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1068 +#: ../../include/text.php:1071 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1080 +#: ../../include/text.php:1083 msgid "default" msgstr "" -#: ../../include/text.php:1296 +#: ../../include/text.php:1299 msgid "activity" msgstr "" -#: ../../include/text.php:1298 +#: ../../include/text.php:1301 msgid "comment" msgstr "" -#: ../../include/text.php:1299 +#: ../../include/text.php:1302 msgid "post" msgstr "" -#: ../../include/text.php:1454 +#: ../../include/text.php:1457 msgid "Item filed" msgstr "" From f30146b521bf079e2651484e0e63f9596d6a3dd6 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 7 Apr 2012 01:20:38 -0700 Subject: [PATCH 13/18] fix autonamenegativelength test --- tests/autoname_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/autoname_test.php b/tests/autoname_test.php index 2987c83869..c83e4a4711 100644 --- a/tests/autoname_test.php +++ b/tests/autoname_test.php @@ -50,7 +50,7 @@ class AutonameTest extends PHPUnit_Framework_TestCase { */ public function testAutonameNegativeLength() { $autoname1=autoname(-23); - $this->assertEquals(0, count($autoname1)); + $this->assertEquals(0, strlen($autoname1)); } // public function testAutonameMaxLength() { From cf2d8ef7a6ebbaefd0210396eeaa6686480a02ac Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 7 Apr 2012 02:11:56 -0700 Subject: [PATCH 14/18] tag tests cont. --- mod/item.php | 1 - tests/get_tags_test.php | 19 +++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/mod/item.php b/mod/item.php index 6b0a7996cf..72e63865bd 100644 --- a/mod/item.php +++ b/mod/item.php @@ -959,7 +959,6 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) { else $newname = $r[0]['name']; //add person's id to $inform - $inform_id = 'cid:' . $r[0]['id']; if(strlen($inform)) $inform .= ','; $inform .= 'cid:' . $r[0]['id']; diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php index 3e370c5456..68b43231b8 100644 --- a/tests/get_tags_test.php +++ b/tests/get_tags_test.php @@ -139,9 +139,19 @@ class GetTagsTest extends PHPUnit_Framework_TestCase { $str_tags=''; handle_tag($this->a, $text, $inform, $str_tags, 11, $tags[0]); - $this->assertEquals("cid:15", $inform); - $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); - $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text); + // (mike) - This is a tricky case. + // we support mentions as in @mike@example.com - which contains a period. + // This shouldn't match anything unless you have a contact named "Mike.because". + // We may need another test for "@Mike. because" - which should return the contact + // as we ignore trailing periods in tags. + +// $this->assertEquals("cid:15", $inform); +// $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); +// $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text); + + $this->assertEquals("", $inform); + $this->assertEquals("", $str_tags); + } /** @@ -253,7 +263,8 @@ class GetTagsTest extends PHPUnit_Framework_TestCase { $this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text); $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); - $this->assertEquals("cid:15", $inform); + // this test may produce two cid:15 entries - which is OK because duplicates are pruned before delivery + $this->assertTrue(strstr($inform,"cid:15")); } /** From 7a7102618b5069b68fef65edea40b78840f37ea0 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 7 Apr 2012 02:21:55 -0700 Subject: [PATCH 15/18] try assertContains --- tests/get_tags_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php index 68b43231b8..f1e4f76b0a 100644 --- a/tests/get_tags_test.php +++ b/tests/get_tags_test.php @@ -264,7 +264,7 @@ class GetTagsTest extends PHPUnit_Framework_TestCase { $this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text); $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); // this test may produce two cid:15 entries - which is OK because duplicates are pruned before delivery - $this->assertTrue(strstr($inform,"cid:15")); + $this->assertContains($inform,"cid:15"); } /** From e575d679695fb2c4b54382440b49cc858d1c079f Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 7 Apr 2012 02:23:11 -0700 Subject: [PATCH 16/18] had arg order backwards --- tests/get_tags_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php index f1e4f76b0a..e5c6485de9 100644 --- a/tests/get_tags_test.php +++ b/tests/get_tags_test.php @@ -264,7 +264,7 @@ class GetTagsTest extends PHPUnit_Framework_TestCase { $this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text); $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); // this test may produce two cid:15 entries - which is OK because duplicates are pruned before delivery - $this->assertContains($inform,"cid:15"); + $this->assertContains("cid:15",$inform); } /** From 1440786c319b25f870ef1f85dba7aaf50e49f842 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 7 Apr 2012 02:31:41 -0700 Subject: [PATCH 17/18] ignore utf8 offset error for unit tests --- include/template_processor.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/template_processor.php b/include/template_processor.php index 4c317efe1f..46252c355f 100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -13,12 +13,14 @@ var $debug=false; private function _preg_error(){ + switch(preg_last_error()){ case PREG_INTERNAL_ERROR: echo('PREG_INTERNAL_ERROR'); break; case PREG_BACKTRACK_LIMIT_ERROR: echo('PREG_BACKTRACK_LIMIT_ERROR'); break; case PREG_RECURSION_LIMIT_ERROR: echo('PREG_RECURSION_LIMIT_ERROR'); break; case PREG_BAD_UTF8_ERROR: echo('PREG_BAD_UTF8_ERROR'); break; - case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break; +// This is only valid for php > 5.3, not certain how to code around it for unit tests +// case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break; default: //die("Unknown preg error."); return; From 1c0700f371f96466be113a4184d7ab9acd39e22f Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 7 Apr 2012 16:39:43 +0200 Subject: [PATCH 18/18] changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section css-fixes: tabs youtube-iframe title-bar in jot-wrapper blockquote & .oembed --- view/theme/diabook-aerith/js/README | 22 +++ .../js/jquery.ae.image.resize.js | 69 +++++++++ .../js/jquery.ae.image.resize.min.js | 1 + view/theme/diabook-aerith/photo_item.tpl | 65 ++++++++ view/theme/diabook-aerith/photo_view.tpl | 10 +- view/theme/diabook-aerith/style-network.css | 13 +- view/theme/diabook-aerith/style-profile.css | 13 +- view/theme/diabook-aerith/style.css | 129 +++++++++++++++- view/theme/diabook-aerith/theme.php | 27 +++- view/theme/diabook-blue/js/README | 22 +++ .../diabook-blue/js/jquery.ae.image.resize.js | 69 +++++++++ .../js/jquery.ae.image.resize.min.js | 1 + view/theme/diabook-blue/photo_item.tpl | 65 ++++++++ view/theme/diabook-blue/photo_view.tpl | 9 ++ view/theme/diabook-blue/style-network.css | 13 +- view/theme/diabook-blue/style-profile.css | 13 +- view/theme/diabook-blue/style.css | 130 +++++++++++++++- view/theme/diabook-blue/theme.php | 27 +++- view/theme/diabook-red/js/README | 22 +++ .../diabook-red/js/jquery.ae.image.resize.js | 69 +++++++++ .../js/jquery.ae.image.resize.min.js | 1 + view/theme/diabook-red/photo_item.tpl | 65 ++++++++ view/theme/diabook-red/photo_view.tpl | 11 +- view/theme/diabook-red/style-network.css | 13 +- view/theme/diabook-red/style-profile.css | 13 +- view/theme/diabook-red/style.css | 129 +++++++++++++++- view/theme/diabook-red/theme.php | 27 +++- view/theme/diabook/js/README | 22 +++ .../diabook/js/jquery.ae.image.resize.js | 69 +++++++++ .../diabook/js/jquery.ae.image.resize.min.js | 1 + view/theme/diabook/oembed_video.tpl | 4 + view/theme/diabook/photo_item.tpl | 65 ++++++++ view/theme/diabook/photo_view.tpl | 26 ++-- view/theme/diabook/style-network.css | 13 +- view/theme/diabook/style-profile.css | 13 +- view/theme/diabook/style.css | 142 +++++++++++++++--- view/theme/diabook/theme.php | 49 +++++- 37 files changed, 1373 insertions(+), 79 deletions(-) create mode 100644 view/theme/diabook-aerith/js/README create mode 100644 view/theme/diabook-aerith/js/jquery.ae.image.resize.js create mode 100644 view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js create mode 100644 view/theme/diabook-aerith/photo_item.tpl create mode 100644 view/theme/diabook-blue/js/README create mode 100644 view/theme/diabook-blue/js/jquery.ae.image.resize.js create mode 100644 view/theme/diabook-blue/js/jquery.ae.image.resize.min.js create mode 100644 view/theme/diabook-blue/photo_item.tpl create mode 100644 view/theme/diabook-red/js/README create mode 100644 view/theme/diabook-red/js/jquery.ae.image.resize.js create mode 100644 view/theme/diabook-red/js/jquery.ae.image.resize.min.js create mode 100644 view/theme/diabook-red/photo_item.tpl create mode 100644 view/theme/diabook/js/README create mode 100644 view/theme/diabook/js/jquery.ae.image.resize.js create mode 100644 view/theme/diabook/js/jquery.ae.image.resize.min.js create mode 100644 view/theme/diabook/oembed_video.tpl create mode 100644 view/theme/diabook/photo_item.tpl mode change 100755 => 100644 view/theme/diabook/photo_view.tpl diff --git a/view/theme/diabook-aerith/js/README b/view/theme/diabook-aerith/js/README new file mode 100644 index 0000000000..c93b2118ee --- /dev/null +++ b/view/theme/diabook-aerith/js/README @@ -0,0 +1,22 @@ +jQuery Resize Plugin Demo + +Version: v2.1.1 +Author: Adeel Ejaz (http://adeelejaz.com/) +License: Dual licensed under MIT and GPL licenses. + +Introduction +aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions. + +Usage: +.aeImageResize( height, width ) + +height +An integer representing the maximum height for the image. + +width +An integer representing the maximum width for the image. + +Example +$(function() { + $( ".resizeme" ).aeImageResize({ height: 250, width: 250 }); +}); \ No newline at end of file diff --git a/view/theme/diabook-aerith/js/jquery.ae.image.resize.js b/view/theme/diabook-aerith/js/jquery.ae.image.resize.js new file mode 100644 index 0000000000..bac09cd457 --- /dev/null +++ b/view/theme/diabook-aerith/js/jquery.ae.image.resize.js @@ -0,0 +1,69 @@ +(function( $ ) { + + $.fn.aeImageResize = function( params ) { + + var aspectRatio = 0 + // Nasty I know but it's done only once, so not too bad I guess + // Alternate suggestions welcome :) + , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) + ; + + // We cannot do much unless we have one of these + if ( !params.height && !params.width ) { + return this; + } + + // Calculate aspect ratio now, if possible + if ( params.height && params.width ) { + aspectRatio = params.width / params.height; + } + + // Attach handler to load + // Handler is executed just once per element + // Load event required for Webkit browsers + return this.one( "load", function() { + + // Remove all attributes and CSS rules + this.removeAttribute( "height" ); + this.removeAttribute( "width" ); + this.style.height = this.style.width = ""; + + var imgHeight = this.height + , imgWidth = this.width + , imgAspectRatio = imgWidth / imgHeight + , bxHeight = params.height + , bxWidth = params.width + , bxAspectRatio = aspectRatio; + + // Work the magic! + // If one parameter is missing, we just force calculate it + if ( !bxAspectRatio ) { + if ( bxHeight ) { + bxAspectRatio = imgAspectRatio + 1; + } else { + bxAspectRatio = imgAspectRatio - 1; + } + } + + // Only resize the images that need resizing + if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { + + if ( imgAspectRatio > bxAspectRatio ) { + bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); + } else { + bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); + } + + this.height = bxHeight; + this.width = bxWidth; + } + }) + .each(function() { + + // Trigger load event (for Gecko and MSIE) + if ( this.complete || isIE6 ) { + $( this ).trigger( "load" ); + } + }); + }; +})( jQuery ); \ No newline at end of file diff --git a/view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js b/view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js new file mode 100644 index 0000000000..16c30b1239 --- /dev/null +++ b/view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js @@ -0,0 +1 @@ +(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook-aerith/photo_item.tpl b/view/theme/diabook-aerith/photo_item.tpl new file mode 100644 index 0000000000..5d65a89b79 --- /dev/null +++ b/view/theme/diabook-aerith/photo_item.tpl @@ -0,0 +1,65 @@ +{{ if $indent }}{{ else }} +
+ +
+{{ endif }} + +
+
+
+
+ + $name + + menu + + +
+
+
+ $name + - + {{ if $plink }}$ago{{ else }} $ago {{ endif }} + {{ if $lock }} - $lock {{ endif }} + +
+
+ {{ if $title }}

$title

{{ endif }} + $body +
+
+
+
+
+
+ {{ for $tags as $tag }} + $tag + {{ endfor }} +
+
+ +
+
+
+
+ +
+ + {{ if $drop.dropping }} + + $drop.delete + {{ endif }} + {{ if $edpost }} + + {{ endif }} +
+ +
+
+
+ +
+
+ diff --git a/view/theme/diabook-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl index 511fc73acb..071972e0c6 100755 --- a/view/theme/diabook-aerith/photo_view.tpl +++ b/view/theme/diabook-aerith/photo_view.tpl @@ -24,4 +24,12 @@ {{ endif }} {{ if $tags.2 }}{{ endif }} -{{ if $edit }}$edit{{ endif }} \ No newline at end of file +{{ if $edit }}$edit{{ endif }} + +
+
+
+$comments +
+ +$paginate diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index 9925a90aaf..c1309313be 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -1233,7 +1233,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1369,6 +1368,7 @@ transition: all 0.2s ease-in-out; max-width: 420px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1469,9 +1469,9 @@ transition: all 0.2s ease-in-out; border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1707,7 +1707,7 @@ transition: all 0.2s ease-in-out; height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2169,6 +2169,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index 19fea9a83a..48134e124b 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -1228,7 +1228,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1362,6 +1361,7 @@ transition: all 0.2s ease-in-out; max-width: 420px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1459,9 +1459,9 @@ transition: all 0.2s ease-in-out; border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1697,7 +1697,7 @@ transition: all 0.2s ease-in-out; height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2158,6 +2158,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index f7bdaeef6a..f826521542 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -1308,7 +1308,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1347,6 +1346,122 @@ body .pageheader{ display: table; width: 780px; } +.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} +.wall-item-photo-container .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 80px; +} +.wall-item-photo-container .wall-item-location { + padding-right: 40px; + display: table-cell; +} +.wall-item-photo-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-photo-container .wall-item-content { + font-size: 12.5px; + max-width: 720px; + word-wrap: break-word; + line-height: 1.2; + margin-bottom: 14px; +} +.wall-item-photo-container .wall-item-content img { + max-width: 700px; +} +.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions { + display: table-cell; + vertical-align: middle; +} +.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-photo-container .wall-item-name { + font-weight: bold; +} +.wall-item-photo-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-photo-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; + display: table-cell; +} +.wall-item-photo-container .wall-item-actions-social a { + margin-right: 1em; +} +.wall-item-photo-container .wall-item-actions-tools { + float: right; + width: 80px; + display: table-cell; +} +.wall-item-photo-container .wall-item-actions-tools a { + float: right; +} +.wall-item-photo-container .wall-item-actions-tools input { + float: right; +} +.wall-item-photo-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 40px; + width: 650px; + border-bottom: 1px solid #D2D2D2; +} +.wall-item-photo-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-photo-container { + display: table; + width: 780px; +} +.my-comment-photo { + width: 48px; + margin-left: 40px; + margin-right: 32px; + } +.comment-edit-preview { + width: 500px; + margin-top: 10px; +} +.comment-edit-text-empty { + width: 500px; + border: 1px solid #D2D2D2; + height: 3.2em; + color: #2d2d2d; +} +.comment-edit-text-full { + font-size: 12.5px; + height: 3.3em; + + border: 1px solid #D2D2D2; + width: 500px; +} +.comment-edit-photo { + margin: 10px 0 0; + display: table-cell; +} .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { @@ -1400,6 +1515,7 @@ body .pageheader{ max-width: 720px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1497,9 +1613,9 @@ body .pageheader{ border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1735,7 +1851,7 @@ body .pageheader{ height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2205,6 +2321,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index b48f061fd1..a1ea51e82f 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -3,11 +3,16 @@ /* * Name: Diabook-aerith * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.013) + * Version: (Version: 1.014) * Author: */ +//print diabook-version for debugging +$diabook_version = "Diabook-aerith (Version: 1.014)"; +$a->page['htmlhead'] .= sprintf('', $diabook_version); + + //change css on network and profilepages $cssFile = null; @@ -333,8 +338,24 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js"; $a->page['htmlhead'] .= sprintf('', $cookieJS); +//load jquery.ae.image.resize.js +$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js"; +$a->page['htmlhead'] .= sprintf('', $imageresizeJS); //js scripts +//comment-edit-wrapper on photo_view +if ($a->argv[0].$a->argv[2] === "photos"."image"){ + +$a->page['htmlhead'] .= ' +'; + +} $a->page['htmlhead'] .= ' @@ -350,6 +371,10 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] == $a->page['htmlhead'] .= ' ', $diabook_version); + //change css on network and profilepages $cssFile = null; @@ -333,8 +337,25 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js"; $a->page['htmlhead'] .= sprintf('', $cookieJS); +//load jquery.ae.image.resize.js +$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.ae.image.resize.js"; +$a->page['htmlhead'] .= sprintf('', $imageresizeJS); //js scripts +//comment-edit-wrapper on photo_view +if ($a->argv[0].$a->argv[2] === "photos"."image"){ + +$a->page['htmlhead'] .= ' +'; + +} + $a->page['htmlhead'] .= ' @@ -350,6 +371,10 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] == $a->page['htmlhead'] .= ' ', $diabook_version); + //change css on network and profilepages $cssFile = null; @@ -334,8 +338,25 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.cookie.js"; $a->page['htmlhead'] .= sprintf('', $cookieJS); +//load jquery.ae.image.resize.js +$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.ae.image.resize.js"; +$a->page['htmlhead'] .= sprintf('', $imageresizeJS); + //js scripts +//comment-edit-wrapper on photo_view +if ($a->argv[0].$a->argv[2] === "photos"."image"){ + +$a->page['htmlhead'] .= ' +'; + +} $a->page['htmlhead'] .= ' @@ -351,6 +372,10 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] == $a->page['htmlhead'] .= ' ', $diabook_version); //change css on network and profilepages $cssFile = null; @@ -285,6 +288,8 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ } } + + //tabs at aside on settings page if ($a->argv[0] === "settings"){ @@ -340,10 +345,27 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); +$a->page['htmlhead'] .= sprintf('', $cookieJS); + +//load jquery.ae.image.resize.js +$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js"; +$a->page['htmlhead'] .= sprintf('', $imageresizeJS); //js scripts +//comment-edit-wrapper on photo_view +if ($a->argv[0].$a->argv[2] === "photos"."image"){ + +$a->page['htmlhead'] .= ' +'; + +} $a->page['htmlhead'] .= ' @@ -354,11 +376,34 @@ $a->page['htmlhead'] .= ' '; +$a->page['htmlhead'] .= ' + '; + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ $a->page['htmlhead'] .= '