From 6a2bd8b29fa8e7e4e70fc392a6c073ea3b518625 Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Mon, 31 Dec 2012 00:01:15 +0100 Subject: [PATCH 01/59] Don't replace data-src with src in acl-template On pageload an empty acl-list-item as template is created and not yet replaced. Don't change the data-src for src attributes in those images. --- js/acl.js | 5 ++--- view/theme/frost-mobile/js/acl.js | 5 ++--- view/theme/frost/js/acl.js | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/js/acl.js b/js/acl.js index 36cf74970..35342a5c1 100644 --- a/js/acl.js +++ b/js/acl.js @@ -253,10 +253,9 @@ ACL.prototype.populate = function(data){ //console.log(html); that.list_content.append(html); }); - $(".acl-list-item img[data-src]").each(function(i, el){ - // Replace data-src attribute with src attribute for every image + $(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){ + // Add data-src attribute with src attribute for every image $(el).attr('src', $(el).data("src")); - $(el).removeAttr("data-src"); }); that.update_view(); } diff --git a/view/theme/frost-mobile/js/acl.js b/view/theme/frost-mobile/js/acl.js index 20f0d4618..c22991dd6 100644 --- a/view/theme/frost-mobile/js/acl.js +++ b/view/theme/frost-mobile/js/acl.js @@ -253,10 +253,9 @@ ACL.prototype.populate = function(data){ //console.log(html); that.list_content.append(html); }); - $(".acl-list-item img[data-src]").each(function(i, el){ - // Replace data-src attribute with src attribute for every image + $(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){ + // Add data-src attribute with src attribute for every image $(el).attr('src', $(el).data("src")); - $(el).removeAttr("data-src"); }); that.update_view(); } diff --git a/view/theme/frost/js/acl.js b/view/theme/frost/js/acl.js index 6b443b248..95067f174 100644 --- a/view/theme/frost/js/acl.js +++ b/view/theme/frost/js/acl.js @@ -253,10 +253,9 @@ ACL.prototype.populate = function(data){ //console.log(html); that.list_content.append(html); }); - $(".acl-list-item img[data-src]").each(function(i, el){ - // Replace data-src attribute with src attribute for every image + $(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){ + // Add data-src attribute with src attribute for every image $(el).attr('src', $(el).data("src")); - $(el).removeAttr("data-src"); }); that.update_view(); } From 1d1c8f47716868c30e689e4b38880417f6aab2da Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Sun, 30 Dec 2012 20:46:03 -0700 Subject: [PATCH 02/59] replace dashes with underscores in diabook --- view/theme/diabook/ch_directory_item.tpl | 4 ++-- view/theme/diabook/theme.php | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/view/theme/diabook/ch_directory_item.tpl b/view/theme/diabook/ch_directory_item.tpl index db1936e4b..f32f5a4f7 100644 --- a/view/theme/diabook/ch_directory_item.tpl +++ b/view/theme/diabook/ch_directory_item.tpl @@ -2,8 +2,8 @@
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 6a1109118..3bb7c44aa 100644 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -393,9 +393,9 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); $entry = replace_macros($tpl,array( '$id' => $rr['id'], - '$profile-link' => zrl($rr['url']), + '$profile_link' => zrl($rr['url']), '$photo' => $rr[$photo], - '$alt-text' => $rr['name'], + '$alt_text' => $rr['name'], )); $aside['$comunity_profiles_items'][] = $entry; } @@ -422,9 +422,9 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); $entry = replace_macros($tpl,array( '$id' => $rr['id'], - '$profile-link' => $profile_link, + '$profile_link' => $profile_link, '$photo' => $a->get_cached_avatar_image($rr[$photo]), - '$alt-text' => $rr['name'], + '$alt_text' => $rr['name'], )); $aside['$lastusers_items'][] = $entry; } @@ -501,9 +501,9 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $entry = replace_macros($tpl,array( '$id' => $rr['id'], - '$profile-link' => $photo_page, + '$profile_link' => $photo_page, '$photo' => $photo_url, - '$alt-text' => $rr['username']." : ".$rr['desc'], + '$alt_text' => $rr['username']." : ".$rr['desc'], )); $aside['$photos_items'][] = $entry; From 017042d5d45041561f0ab5e80c00000d948e6032 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 31 Dec 2012 14:54:04 -0800 Subject: [PATCH 03/59] rev update --- boot.php | 2 +- util/messages.po | 152 +++++++++++++++++++++++------------------------ 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/boot.php b/boot.php index a9e599805..864cdedd3 100644 --- a/boot.php +++ b/boot.php @@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.1.1572' ); +define ( 'FRIENDICA_VERSION', '3.1.1574' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1157 ); diff --git a/util/messages.po b/util/messages.po index a66a51973..73bd51ec6 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.1.1572\n" +"Project-Id-Version: 3.1.1574\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-29 10:00-0800\n" +"POT-Creation-Date: 2012-12-31 10:00-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -284,7 +284,7 @@ msgstr "" msgid "Edit event" msgstr "" -#: ../../mod/events.php:323 ../../include/text.php:1246 +#: ../../mod/events.php:323 ../../include/text.php:1247 msgid "link to source" msgstr "" @@ -1486,7 +1486,7 @@ msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../mod/content.php:605 ../../include/text.php:1502 +#: ../../mod/content.php:605 ../../include/text.php:1503 #: ../../object/Item.php:308 ../../object/Item.php:321 msgid "comment" msgid_plural "comments" @@ -2801,7 +2801,7 @@ msgstr "" #: ../../addon/privacy_image_cache/privacy_image_cache.php:346 #: ../../addon/fbpost/fbpost.php:314 #: ../../addon/dav/friendica/layout.fnk.php:441 -#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:741 +#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:742 #: ../../addon.old/facebook/facebook.php:770 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263 #: ../../addon.old/fbpost/fbpost.php:267 @@ -3189,7 +3189,7 @@ msgstr "" msgid "No contacts." msgstr "" -#: ../../mod/viewcontacts.php:76 ../../include/text.php:678 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:679 msgid "View Contacts" msgstr "" @@ -3281,7 +3281,7 @@ msgstr "" #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62 #: ../../addon/communityhome/communityhome.php:166 -#: ../../view/theme/diabook/theme.php:465 ../../include/text.php:1498 +#: ../../view/theme/diabook/theme.php:465 ../../include/text.php:1499 #: ../../include/diaspora.php:1851 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 @@ -4373,8 +4373,8 @@ msgstr "" msgid "No installed applications." msgstr "" -#: ../../mod/search.php:99 ../../include/text.php:738 -#: ../../include/text.php:739 ../../include/nav.php:91 +#: ../../mod/search.php:99 ../../include/text.php:739 +#: ../../include/text.php:740 ../../include/nav.php:91 msgid "Search" msgstr "" @@ -5762,7 +5762,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:158 -#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1496 +#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1497 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -5916,7 +5916,7 @@ msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:254 #: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:293 -#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:975 +#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:976 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270 @@ -5927,7 +5927,7 @@ msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:235 #: ../../addon/dav/common/wdcal_edit.inc.php:274 -#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:975 +#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:976 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308 @@ -5935,35 +5935,35 @@ msgid "Monday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:238 -#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:975 +#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:976 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277 msgid "Tuesday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:241 -#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:975 +#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:976 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280 msgid "Wednesday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:244 -#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:975 +#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:976 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283 msgid "Thursday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:247 -#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:975 +#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:976 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286 msgid "Friday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:250 -#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:975 +#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:976 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289 msgid "Saturday" @@ -8362,242 +8362,242 @@ msgstr "" msgid " on Last.fm" msgstr "" -#: ../../include/text.php:262 +#: ../../include/text.php:263 msgid "prev" msgstr "" -#: ../../include/text.php:264 +#: ../../include/text.php:265 msgid "first" msgstr "" -#: ../../include/text.php:293 +#: ../../include/text.php:294 msgid "last" msgstr "" -#: ../../include/text.php:296 +#: ../../include/text.php:297 msgid "next" msgstr "" -#: ../../include/text.php:314 +#: ../../include/text.php:315 msgid "newer" msgstr "" -#: ../../include/text.php:318 +#: ../../include/text.php:319 msgid "older" msgstr "" -#: ../../include/text.php:657 +#: ../../include/text.php:658 msgid "No contacts" msgstr "" -#: ../../include/text.php:666 +#: ../../include/text.php:667 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:779 +#: ../../include/text.php:780 msgid "poke" msgstr "" -#: ../../include/text.php:779 ../../include/conversation.php:210 +#: ../../include/text.php:780 ../../include/conversation.php:210 msgid "poked" msgstr "" -#: ../../include/text.php:780 +#: ../../include/text.php:781 msgid "ping" msgstr "" -#: ../../include/text.php:780 +#: ../../include/text.php:781 msgid "pinged" msgstr "" -#: ../../include/text.php:781 +#: ../../include/text.php:782 msgid "prod" msgstr "" -#: ../../include/text.php:781 +#: ../../include/text.php:782 msgid "prodded" msgstr "" -#: ../../include/text.php:782 +#: ../../include/text.php:783 msgid "slap" msgstr "" -#: ../../include/text.php:782 +#: ../../include/text.php:783 msgid "slapped" msgstr "" -#: ../../include/text.php:783 +#: ../../include/text.php:784 msgid "finger" msgstr "" -#: ../../include/text.php:783 +#: ../../include/text.php:784 msgid "fingered" msgstr "" -#: ../../include/text.php:784 +#: ../../include/text.php:785 msgid "rebuff" msgstr "" -#: ../../include/text.php:784 +#: ../../include/text.php:785 msgid "rebuffed" msgstr "" -#: ../../include/text.php:796 +#: ../../include/text.php:797 msgid "happy" msgstr "" -#: ../../include/text.php:797 +#: ../../include/text.php:798 msgid "sad" msgstr "" -#: ../../include/text.php:798 +#: ../../include/text.php:799 msgid "mellow" msgstr "" -#: ../../include/text.php:799 +#: ../../include/text.php:800 msgid "tired" msgstr "" -#: ../../include/text.php:800 +#: ../../include/text.php:801 msgid "perky" msgstr "" -#: ../../include/text.php:801 +#: ../../include/text.php:802 msgid "angry" msgstr "" -#: ../../include/text.php:802 +#: ../../include/text.php:803 msgid "stupified" msgstr "" -#: ../../include/text.php:803 +#: ../../include/text.php:804 msgid "puzzled" msgstr "" -#: ../../include/text.php:804 +#: ../../include/text.php:805 msgid "interested" msgstr "" -#: ../../include/text.php:805 +#: ../../include/text.php:806 msgid "bitter" msgstr "" -#: ../../include/text.php:806 +#: ../../include/text.php:807 msgid "cheerful" msgstr "" -#: ../../include/text.php:807 +#: ../../include/text.php:808 msgid "alive" msgstr "" -#: ../../include/text.php:808 +#: ../../include/text.php:809 msgid "annoyed" msgstr "" -#: ../../include/text.php:809 +#: ../../include/text.php:810 msgid "anxious" msgstr "" -#: ../../include/text.php:810 +#: ../../include/text.php:811 msgid "cranky" msgstr "" -#: ../../include/text.php:811 +#: ../../include/text.php:812 msgid "disturbed" msgstr "" -#: ../../include/text.php:812 +#: ../../include/text.php:813 msgid "frustrated" msgstr "" -#: ../../include/text.php:813 +#: ../../include/text.php:814 msgid "motivated" msgstr "" -#: ../../include/text.php:814 +#: ../../include/text.php:815 msgid "relaxed" msgstr "" -#: ../../include/text.php:815 +#: ../../include/text.php:816 msgid "surprised" msgstr "" -#: ../../include/text.php:979 +#: ../../include/text.php:980 msgid "January" msgstr "" -#: ../../include/text.php:979 +#: ../../include/text.php:980 msgid "February" msgstr "" -#: ../../include/text.php:979 +#: ../../include/text.php:980 msgid "March" msgstr "" -#: ../../include/text.php:979 +#: ../../include/text.php:980 msgid "April" msgstr "" -#: ../../include/text.php:979 +#: ../../include/text.php:980 msgid "May" msgstr "" -#: ../../include/text.php:979 +#: ../../include/text.php:980 msgid "June" msgstr "" -#: ../../include/text.php:979 +#: ../../include/text.php:980 msgid "July" msgstr "" -#: ../../include/text.php:979 +#: ../../include/text.php:980 msgid "August" msgstr "" -#: ../../include/text.php:979 +#: ../../include/text.php:980 msgid "September" msgstr "" -#: ../../include/text.php:979 +#: ../../include/text.php:980 msgid "October" msgstr "" -#: ../../include/text.php:979 +#: ../../include/text.php:980 msgid "November" msgstr "" -#: ../../include/text.php:979 +#: ../../include/text.php:980 msgid "December" msgstr "" -#: ../../include/text.php:1066 +#: ../../include/text.php:1067 msgid "bytes" msgstr "" -#: ../../include/text.php:1093 ../../include/text.php:1105 +#: ../../include/text.php:1094 ../../include/text.php:1106 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1278 ../../include/user.php:236 +#: ../../include/text.php:1279 ../../include/user.php:236 msgid "default" msgstr "" -#: ../../include/text.php:1290 +#: ../../include/text.php:1291 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1500 +#: ../../include/text.php:1501 msgid "activity" msgstr "" -#: ../../include/text.php:1503 +#: ../../include/text.php:1504 msgid "post" msgstr "" -#: ../../include/text.php:1658 +#: ../../include/text.php:1659 msgid "Item filed" msgstr "" From 966d78698239a731f323d9d4a9c6911c6340e842 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Tue, 1 Jan 2013 16:42:52 +0100 Subject: [PATCH 04/59] modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php --- view/theme/smoothly/style.css | 37 +++++++++++++++++++++++++---------- view/theme/smoothly/theme.php | 4 ++-- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index aa62d5994..c560dcc77 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -2,7 +2,7 @@ style.css Smoothly - Created by alex@friendica.pixelbits.de on 2012-11-14 + Created by alex@friendica.pixelbits.de on 2013-01-01 ** Colors ** Blue links - #1873a2 @@ -1946,9 +1946,10 @@ div[id$="wrapper"] br { clear:both; } -.profile-match-name a { - color: #999; - font-size: 1em; +.profile-match-name { + float: left; + text-align: left; + overflow: hidden; } .profile-match-name a:hover { @@ -1956,20 +1957,36 @@ div[id$="wrapper"] br { } .profile-match-wrapper { + position: relative; float:left; - height:120px; - padding:10px; - width:120px; - margin-bottom: 10px; - /*margin-left: 20px;*/ + height:80px; + padding:5px; + width:80px; + margin-bottom: 70px; + margin-right: 29px; background-color: #f6f6f6; border: 1px solid #dddddd; box-shadow: 3px 3px 4px #959494; -moz-box-shadow: 3px 3px 4px #959494; -webkit-box-shadow: 3px 3px 4px #959494; - clear: both; } +.profile-match-break, +.profile-match-end { + clear: both; +} + +.profile-match-connect { + text-align: left; + font-weight: bold; +} +.profile-match-ignore { + height: 0!important; +} + +#profile-match-wrapper-end { + clear: both; +} .profile-match-end { clear: both; } diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index 1f1ee7327..83e2c72df 100644 --- a/view/theme/smoothly/theme.php +++ b/view/theme/smoothly/theme.php @@ -2,8 +2,8 @@ /* * Name: Smoothly - * Description: Like coffee with milk. Theme works fine with iPad[2]. - * Version: Version 0.11.14-2 + * Description: Like coffee with milk. Theme optimized for iPad[2]. + * Version: Version 0.131 * Author: Alex * Maintainer: Alex * Screenshot: Screenshot From cde9b6370da1735fffab2fe5933334c2ac3320e9 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Tue, 1 Jan 2013 21:05:24 +0100 Subject: [PATCH 05/59] Fix registration form --- mod/register.php | 4 +++- view/register.tpl | 2 +- view/smarty3/register.tpl | 4 ++-- view/theme/frost-mobile/register.tpl | 2 +- view/theme/frost-mobile/smarty3/register.tpl | 4 ++-- view/theme/frost/register.tpl | 2 +- view/theme/frost/smarty3/register.tpl | 4 ++-- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/mod/register.php b/mod/register.php index 208f97bcb..faee66c26 100644 --- a/mod/register.php +++ b/mod/register.php @@ -214,7 +214,8 @@ function register_content(&$a) { $oidlabel = ''; } else { - $oidhtml = ''; + $oidhtml = ''; + $oidhtml_old = ''; $fillwith = t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."); $fillext = t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'); $oidlabel = t("Your OpenID \x28optional\x29: "); @@ -252,6 +253,7 @@ function register_content(&$a) { $o = replace_macros($o, array( '$oidhtml' => $oidhtml, + '$oidhtml_old' => $oidhtml_old, '$invitations' => get_config('system','invitation_only'), '$invite_desc' => t('Membership on this site is by invitation only.'), '$invite_label' => t('Your invitation ID: '), diff --git a/view/register.tpl b/view/register.tpl index 7cf11881a..ed96f969b 100644 --- a/view/register.tpl +++ b/view/register.tpl @@ -12,7 +12,7 @@

$fillext

- $oidhtml + $oidhtml_old
diff --git a/view/smarty3/register.tpl b/view/smarty3/register.tpl index bdec2ffb4..899a9a25a 100644 --- a/view/smarty3/register.tpl +++ b/view/smarty3/register.tpl @@ -12,7 +12,7 @@

{{$fillext}}

- {{$oidhtml}} + {{$oidhtml|sprintf:$oidlabel:$openid}}
@@ -41,7 +41,7 @@
-

{{$nickdesc}}

+

{{$nickdesc|replace:'$sitename':$sitename}}

diff --git a/view/theme/frost-mobile/register.tpl b/view/theme/frost-mobile/register.tpl index cbc58a784..9844049b1 100644 --- a/view/theme/frost-mobile/register.tpl +++ b/view/theme/frost-mobile/register.tpl @@ -12,7 +12,7 @@
- $oidhtml + $oidhtml_old
diff --git a/view/theme/frost-mobile/smarty3/register.tpl b/view/theme/frost-mobile/smarty3/register.tpl index 62b147a8e..f73cd258b 100644 --- a/view/theme/frost-mobile/smarty3/register.tpl +++ b/view/theme/frost-mobile/smarty3/register.tpl @@ -12,7 +12,7 @@
- {{$oidhtml}} + {{$oidhtml|sprintf:$oidlabel:$openid}}
@@ -54,7 +54,7 @@
-

{{$nickdesc}}

+

{{$nickdesc|replace:'$sitename':$sitename}}

{{$publish}} diff --git a/view/theme/frost/register.tpl b/view/theme/frost/register.tpl index 89dcffdf2..7df552e3f 100644 --- a/view/theme/frost/register.tpl +++ b/view/theme/frost/register.tpl @@ -12,7 +12,7 @@
- $oidhtml + $oidhtml_old
diff --git a/view/theme/frost/smarty3/register.tpl b/view/theme/frost/smarty3/register.tpl index 6b8e85a03..198223918 100644 --- a/view/theme/frost/smarty3/register.tpl +++ b/view/theme/frost/smarty3/register.tpl @@ -12,7 +12,7 @@
- {{$oidhtml}} + {{$oidhtml|sprintf:$oidlabel:$openid}}
@@ -55,7 +55,7 @@
-

{{$nickdesc}}

+

{{$nickdesc|replace:'$sitename':$sitename}}

{{$publish}} From 2a3f8f8ee2c08a34b3697604ce51ad62f5ebd1c7 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Tue, 1 Jan 2013 21:08:30 +0100 Subject: [PATCH 06/59] . --- mod/register.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/register.php b/mod/register.php index faee66c26..1712ee84f 100644 --- a/mod/register.php +++ b/mod/register.php @@ -253,7 +253,7 @@ function register_content(&$a) { $o = replace_macros($o, array( '$oidhtml' => $oidhtml, - '$oidhtml_old' => $oidhtml_old, + '$oidhtml_old' => $oidhtml_old, '$invitations' => get_config('system','invitation_only'), '$invite_desc' => t('Membership on this site is by invitation only.'), '$invite_label' => t('Your invitation ID: '), From 0472ab72823ac128bbae047589a220a43215adf3 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 1 Jan 2013 22:25:55 +0100 Subject: [PATCH 07/59] DE: update to the strings --- view/de/messages.po | 1595 +++++++++++++++++--------------- view/de/request_notify_eml.tpl | 2 +- view/de/strings.php | 33 +- 3 files changed, 881 insertions(+), 749 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index 95224e538..400dce439 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -15,6 +15,7 @@ # Martin Schmitt , 2012. # , 2012. # Oliver , 2012. +# , 2012. # , 2011-2012. # , 2011-2012. # , 2011. @@ -22,9 +23,9 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-12-22 10:00-0800\n" -"PO-Revision-Date: 2012-12-24 08:27+0000\n" -"Last-Translator: bavatar \n" +"POT-Creation-Date: 2012-12-31 10:00-0800\n" +"PO-Revision-Date: 2012-12-31 11:02+0000\n" +"Last-Translator: Sennewood \n" "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,7 +76,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:166 #: ../../addon/fbpost/fbpost.php:172 #: ../../addon/dav/friendica/layout.fnk.php:354 -#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3977 +#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3987 #: ../../index.php:333 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 @@ -109,7 +110,7 @@ msgid "Return to contact editor" msgstr "Zurück zum Kontakteditor" #: ../../mod/crepair.php:148 ../../mod/settings.php:562 -#: ../../mod/settings.php:588 ../../mod/admin.php:695 ../../mod/admin.php:705 +#: ../../mod/settings.php:588 ../../mod/admin.php:731 ../../mod/admin.php:741 msgid "Name" msgstr "Name" @@ -146,18 +147,18 @@ msgid "New photo from this URL" msgstr "Neues Foto von dieser URL" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:455 ../../mod/photos.php:1028 -#: ../../mod/photos.php:1100 ../../mod/photos.php:1363 -#: ../../mod/photos.php:1403 ../../mod/photos.php:1447 -#: ../../mod/photos.php:1519 ../../mod/install.php:246 -#: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 -#: ../../mod/content.php:693 ../../mod/contacts.php:352 +#: ../../mod/events.php:466 ../../mod/photos.php:1028 +#: ../../mod/photos.php:1118 ../../mod/photos.php:1402 +#: ../../mod/photos.php:1442 ../../mod/photos.php:1486 +#: ../../mod/photos.php:1569 ../../mod/install.php:248 +#: ../../mod/install.php:286 ../../mod/localtime.php:45 ../../mod/poke.php:199 +#: ../../mod/content.php:710 ../../mod/contacts.php:352 #: ../../mod/settings.php:560 ../../mod/settings.php:670 #: ../../mod/settings.php:739 ../../mod/settings.php:811 -#: ../../mod/settings.php:1018 ../../mod/group.php:85 ../../mod/mood.php:137 -#: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:445 -#: ../../mod/admin.php:692 ../../mod/admin.php:829 ../../mod/admin.php:1028 -#: ../../mod/admin.php:1115 ../../mod/profiles.php:604 +#: ../../mod/settings.php:1018 ../../mod/group.php:87 ../../mod/mood.php:137 +#: ../../mod/message.php:301 ../../mod/message.php:527 ../../mod/admin.php:461 +#: ../../mod/admin.php:728 ../../mod/admin.php:865 ../../mod/admin.php:1064 +#: ../../mod/admin.php:1151 ../../mod/profiles.php:604 #: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:44 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 @@ -166,8 +167,8 @@ msgstr "Neues Foto von dieser URL" #: ../../addon/page/page.php:211 ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 -#: ../../addon/remote_permissions/remote_permissions.php:47 -#: ../../addon/remote_permissions/remote_permissions.php:195 +#: ../../addon/remote_permissions/remote_permissions.php:48 +#: ../../addon/remote_permissions/remote_permissions.php:196 #: ../../addon/startpage/startpage.php:92 #: ../../addon/geonames/geonames.php:187 #: ../../addon/forumlist/forumlist.php:178 @@ -179,7 +180,7 @@ msgstr "Neues Foto von dieser URL" #: ../../addon/libravatar/libravatar.php:99 #: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:91 #: ../../addon/altpager/altpager.php:98 ../../addon/mathjax/mathjax.php:42 -#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98 +#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:99 #: ../../addon/gravatar/gravatar.php:95 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93 #: ../../addon/jappixmini/jappixmini.php:307 @@ -188,18 +189,18 @@ msgstr "Neues Foto von dieser URL" #: ../../addon/statusnet/statusnet.php:318 #: ../../addon/statusnet/statusnet.php:325 #: ../../addon/statusnet/statusnet.php:353 -#: ../../addon/statusnet/statusnet.php:700 ../../addon/tumblr/tumblr.php:233 +#: ../../addon/statusnet/statusnet.php:703 ../../addon/tumblr/tumblr.php:233 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 -#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:506 +#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:515 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:642 +#: ../../view/theme/diabook/theme.php:643 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 -#: ../../object/Item.php:577 ../../addon.old/fromgplus/fromgplus.php:40 +#: ../../object/Item.php:603 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../addon.old/facebook/facebook.php:619 #: ../../addon.old/snautofollow/snautofollow.php:64 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226 @@ -299,86 +300,87 @@ msgstr "l, F j" msgid "Edit event" msgstr "Veranstaltung bearbeiten" -#: ../../mod/events.php:323 ../../include/text.php:1190 +#: ../../mod/events.php:323 ../../include/text.php:1247 msgid "link to source" msgstr "Link zum Originalbeitrag" -#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 -#: ../../include/nav.php:52 ../../boot.php:1761 +#: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:92 +#: ../../include/nav.php:52 ../../boot.php:1791 msgid "Events" msgstr "Veranstaltungen" -#: ../../mod/events.php:348 +#: ../../mod/events.php:359 msgid "Create New Event" msgstr "Neue Veranstaltung erstellen" -#: ../../mod/events.php:349 ../../addon/dav/friendica/layout.fnk.php:263 +#: ../../mod/events.php:360 ../../addon/dav/friendica/layout.fnk.php:263 #: ../../addon.old/dav/friendica/layout.fnk.php:263 msgid "Previous" msgstr "Vorherige" -#: ../../mod/events.php:350 ../../mod/install.php:205 +#: ../../mod/events.php:361 ../../mod/install.php:207 #: ../../addon/dav/friendica/layout.fnk.php:266 #: ../../addon.old/dav/friendica/layout.fnk.php:266 msgid "Next" msgstr "Nächste" -#: ../../mod/events.php:423 +#: ../../mod/events.php:434 msgid "hour:minute" msgstr "Stunde:Minute" -#: ../../mod/events.php:433 +#: ../../mod/events.php:444 msgid "Event details" msgstr "Veranstaltungsdetails" -#: ../../mod/events.php:434 +#: ../../mod/events.php:445 #, php-format msgid "Format is %s %s. Starting date and Title are required." msgstr "Das Format ist %s %s. Beginnzeitpunkt und Titel werden benötigt." -#: ../../mod/events.php:436 +#: ../../mod/events.php:447 msgid "Event Starts:" msgstr "Veranstaltungsbeginn:" -#: ../../mod/events.php:436 ../../mod/events.php:450 +#: ../../mod/events.php:447 ../../mod/events.php:461 msgid "Required" msgstr "Benötigt" -#: ../../mod/events.php:439 +#: ../../mod/events.php:450 msgid "Finish date/time is not known or not relevant" msgstr "Enddatum/-zeit ist nicht bekannt oder nicht relevant" -#: ../../mod/events.php:441 +#: ../../mod/events.php:452 msgid "Event Finishes:" msgstr "Veranstaltungsende:" -#: ../../mod/events.php:444 +#: ../../mod/events.php:455 msgid "Adjust for viewer timezone" msgstr "An Zeitzone des Betrachters anpassen" -#: ../../mod/events.php:446 +#: ../../mod/events.php:457 msgid "Description:" msgstr "Beschreibung" -#: ../../mod/events.php:448 ../../mod/directory.php:134 +#: ../../mod/events.php:459 ../../mod/directory.php:134 #: ../../addon/forumdirectory/forumdirectory.php:156 #: ../../include/event.php:40 ../../include/bb2diaspora.php:415 -#: ../../boot.php:1291 +#: ../../boot.php:1312 msgid "Location:" msgstr "Ort:" -#: ../../mod/events.php:450 +#: ../../mod/events.php:461 msgid "Title:" msgstr "Titel:" -#: ../../mod/events.php:452 +#: ../../mod/events.php:463 msgid "Share this event" msgstr "Veranstaltung teilen" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145 -#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:561 -#: ../../mod/settings.php:587 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:1009 +#: ../../mod/dfrn_request.php:848 ../../mod/settings.php:561 +#: ../../mod/settings.php:587 ../../mod/fbrowser.php:81 +#: ../../mod/fbrowser.php:116 ../../addon/js_upload/js_upload.php:45 +#: ../../include/conversation.php:1045 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Abbrechen" @@ -424,7 +426,7 @@ 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:835 +#: ../../mod/api.php:105 ../../mod/dfrn_request.php:836 #: ../../mod/settings.php:934 ../../mod/settings.php:940 #: ../../mod/settings.php:948 ../../mod/settings.php:952 #: ../../mod/settings.php:957 ../../mod/settings.php:963 @@ -436,7 +438,7 @@ msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontak msgid "Yes" msgstr "Ja" -#: ../../mod/api.php:106 ../../mod/dfrn_request.php:836 +#: ../../mod/api.php:106 ../../mod/dfrn_request.php:837 #: ../../mod/settings.php:934 ../../mod/settings.php:940 #: ../../mod/settings.php:948 ../../mod/settings.php:952 #: ../../mod/settings.php:957 ../../mod/settings.php:963 @@ -448,20 +450,20 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: ../../mod/photos.php:51 ../../boot.php:1754 +#: ../../mod/photos.php:51 ../../boot.php:1784 msgid "Photo Albums" msgstr "Fotoalben" #: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009 -#: ../../mod/photos.php:1092 ../../mod/photos.php:1107 -#: ../../mod/photos.php:1562 ../../mod/photos.php:1574 -#: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:492 +#: ../../mod/photos.php:1102 ../../mod/photos.php:1125 +#: ../../mod/photos.php:1626 ../../mod/photos.php:1638 +#: ../../addon/communityhome/communityhome.php:112 +#: ../../view/theme/diabook/theme.php:493 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "Kontaktbilder" -#: ../../mod/photos.php:66 ../../mod/photos.php:1123 ../../mod/photos.php:1612 +#: ../../mod/photos.php:66 ../../mod/photos.php:1141 ../../mod/photos.php:1685 msgid "Upload New Photos" msgstr "Weitere Fotos hochladen" @@ -473,13 +475,13 @@ msgstr "jeder" msgid "Contact information unavailable" msgstr "Kontaktinformationen nicht verfügbar" -#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1092 -#: ../../mod/photos.php:1107 ../../mod/profile_photo.php:74 +#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1102 +#: ../../mod/photos.php:1125 ../../mod/profile_photo.php:74 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 -#: ../../addon/communityhome/communityhome.php:112 -#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324 +#: ../../addon/communityhome/communityhome.php:113 +#: ../../view/theme/diabook/theme.php:494 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" @@ -489,11 +491,11 @@ msgstr "Profilbilder" msgid "Album not found." msgstr "Album nicht gefunden." -#: ../../mod/photos.php:182 ../../mod/photos.php:1101 +#: ../../mod/photos.php:182 ../../mod/photos.php:1119 msgid "Delete Album" msgstr "Album löschen" -#: ../../mod/photos.php:245 ../../mod/photos.php:1364 +#: ../../mod/photos.php:245 ../../mod/photos.php:1403 msgid "Delete Photo" msgstr "Foto löschen" @@ -526,7 +528,7 @@ msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." #: ../../mod/photos.php:865 ../../mod/community.php:18 -#: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17 +#: ../../mod/dfrn_request.php:761 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31 #: ../../addon/forumdirectory/forumdirectory.php:53 msgid "Public access denied." @@ -545,157 +547,157 @@ msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt." msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers." -#: ../../mod/photos.php:1043 +#: ../../mod/photos.php:1053 msgid "Upload Photos" msgstr "Bilder hochladen" -#: ../../mod/photos.php:1047 ../../mod/photos.php:1096 +#: ../../mod/photos.php:1057 ../../mod/photos.php:1114 msgid "New album name: " msgstr "Name des neuen Albums: " -#: ../../mod/photos.php:1048 +#: ../../mod/photos.php:1058 msgid "or existing album name: " msgstr "oder existierender Albumname: " -#: ../../mod/photos.php:1049 +#: ../../mod/photos.php:1059 msgid "Do not show a status post for this upload" msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" -#: ../../mod/photos.php:1051 ../../mod/photos.php:1359 +#: ../../mod/photos.php:1061 ../../mod/photos.php:1398 msgid "Permissions" msgstr "Berechtigungen" -#: ../../mod/photos.php:1111 +#: ../../mod/photos.php:1129 msgid "Edit Album" msgstr "Album bearbeiten" -#: ../../mod/photos.php:1117 +#: ../../mod/photos.php:1135 msgid "Show Newest First" msgstr "Zeige neueste zuerst" -#: ../../mod/photos.php:1119 +#: ../../mod/photos.php:1137 msgid "Show Oldest First" msgstr "Zeige älteste zuerst" -#: ../../mod/photos.php:1143 ../../mod/photos.php:1595 +#: ../../mod/photos.php:1170 ../../mod/photos.php:1668 msgid "View Photo" msgstr "Fotos betrachten" -#: ../../mod/photos.php:1178 +#: ../../mod/photos.php:1205 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:1180 +#: ../../mod/photos.php:1207 msgid "Photo not available" msgstr "Foto nicht verfügbar" -#: ../../mod/photos.php:1236 +#: ../../mod/photos.php:1263 msgid "View photo" msgstr "Fotos ansehen" -#: ../../mod/photos.php:1236 +#: ../../mod/photos.php:1263 msgid "Edit photo" msgstr "Foto bearbeiten" -#: ../../mod/photos.php:1237 +#: ../../mod/photos.php:1264 msgid "Use as profile photo" msgstr "Als Profilbild verwenden" -#: ../../mod/photos.php:1243 ../../mod/content.php:603 +#: ../../mod/photos.php:1270 ../../mod/content.php:620 #: ../../object/Item.php:105 msgid "Private Message" msgstr "Private Nachricht" -#: ../../mod/photos.php:1262 +#: ../../mod/photos.php:1289 msgid "View Full Size" msgstr "Betrachte Originalgröße" -#: ../../mod/photos.php:1336 +#: ../../mod/photos.php:1363 msgid "Tags: " msgstr "Tags: " -#: ../../mod/photos.php:1339 +#: ../../mod/photos.php:1366 msgid "[Remove any tag]" msgstr "[Tag entfernen]" -#: ../../mod/photos.php:1349 +#: ../../mod/photos.php:1388 msgid "Rotate CW (right)" msgstr "Drehen US (rechts)" -#: ../../mod/photos.php:1350 +#: ../../mod/photos.php:1389 msgid "Rotate CCW (left)" msgstr "Drehen EUS (links)" -#: ../../mod/photos.php:1352 +#: ../../mod/photos.php:1391 msgid "New album name" msgstr "Name des neuen Albums" -#: ../../mod/photos.php:1355 +#: ../../mod/photos.php:1394 msgid "Caption" msgstr "Bildunterschrift" -#: ../../mod/photos.php:1357 +#: ../../mod/photos.php:1396 msgid "Add a Tag" msgstr "Tag hinzufügen" -#: ../../mod/photos.php:1361 +#: ../../mod/photos.php:1400 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1381 ../../mod/content.php:667 +#: ../../mod/photos.php:1420 ../../mod/content.php:684 #: ../../object/Item.php:203 msgid "I like this (toggle)" msgstr "Ich mag das (toggle)" -#: ../../mod/photos.php:1382 ../../mod/content.php:668 +#: ../../mod/photos.php:1421 ../../mod/content.php:685 #: ../../object/Item.php:204 msgid "I don't like this (toggle)" msgstr "Ich mag das nicht (toggle)" -#: ../../mod/photos.php:1383 ../../include/conversation.php:969 +#: ../../mod/photos.php:1422 ../../include/conversation.php:1005 msgid "Share" msgstr "Teilen" -#: ../../mod/photos.php:1384 ../../mod/editpost.php:121 -#: ../../mod/content.php:482 ../../mod/content.php:848 +#: ../../mod/photos.php:1423 ../../mod/editpost.php:121 +#: ../../mod/content.php:499 ../../mod/content.php:883 #: ../../mod/wallmessage.php:152 ../../mod/message.php:300 -#: ../../mod/message.php:488 ../../include/conversation.php:624 -#: ../../include/conversation.php:988 ../../object/Item.php:270 +#: ../../mod/message.php:528 ../../include/conversation.php:645 +#: ../../include/conversation.php:1024 ../../object/Item.php:287 msgid "Please wait" msgstr "Bitte warten" -#: ../../mod/photos.php:1400 ../../mod/photos.php:1444 -#: ../../mod/photos.php:1516 ../../mod/content.php:690 -#: ../../object/Item.php:574 +#: ../../mod/photos.php:1439 ../../mod/photos.php:1483 +#: ../../mod/photos.php:1566 ../../mod/content.php:707 +#: ../../object/Item.php:600 msgid "This is you" msgstr "Das bist du" -#: ../../mod/photos.php:1402 ../../mod/photos.php:1446 -#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:621 -#: ../../object/Item.php:267 ../../object/Item.php:576 +#: ../../mod/photos.php:1441 ../../mod/photos.php:1485 +#: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:635 +#: ../../object/Item.php:284 ../../object/Item.php:602 msgid "Comment" msgstr "Kommentar" -#: ../../mod/photos.php:1404 ../../mod/photos.php:1448 -#: ../../mod/photos.php:1520 ../../mod/editpost.php:142 -#: ../../mod/content.php:702 ../../include/conversation.php:1006 -#: ../../object/Item.php:586 +#: ../../mod/photos.php:1443 ../../mod/photos.php:1487 +#: ../../mod/photos.php:1570 ../../mod/editpost.php:142 +#: ../../mod/content.php:719 ../../include/conversation.php:1042 +#: ../../object/Item.php:612 msgid "Preview" msgstr "Vorschau" -#: ../../mod/photos.php:1488 ../../mod/content.php:439 -#: ../../mod/content.php:724 ../../mod/settings.php:623 -#: ../../mod/group.php:168 ../../mod/admin.php:699 +#: ../../mod/photos.php:1527 ../../mod/content.php:439 +#: ../../mod/content.php:741 ../../mod/settings.php:623 +#: ../../mod/group.php:171 ../../mod/admin.php:735 #: ../../include/conversation.php:569 ../../object/Item.php:119 msgid "Delete" msgstr "Löschen" -#: ../../mod/photos.php:1601 +#: ../../mod/photos.php:1674 msgid "View Album" msgstr "Album betrachten" -#: ../../mod/photos.php:1610 +#: ../../mod/photos.php:1683 msgid "Recent Photos" msgstr "Neueste Fotos" @@ -703,7 +705,7 @@ msgstr "Neueste Fotos" msgid "Not available." msgstr "Nicht verfügbar." -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:94 #: ../../include/nav.php:101 msgid "Community" msgstr "Gemeinschaft" @@ -753,96 +755,96 @@ msgstr "Beitrag nicht gefunden" msgid "Edit post" msgstr "Beitrag bearbeiten" -#: ../../mod/editpost.php:91 ../../include/conversation.php:955 +#: ../../mod/editpost.php:91 ../../include/conversation.php:991 msgid "Post to Email" msgstr "An E-Mail senden" -#: ../../mod/editpost.php:106 ../../mod/content.php:711 +#: ../../mod/editpost.php:106 ../../mod/content.php:728 #: ../../mod/settings.php:622 ../../object/Item.php:109 msgid "Edit" msgstr "Bearbeiten" #: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150 -#: ../../mod/message.php:298 ../../mod/message.php:485 -#: ../../include/conversation.php:970 +#: ../../mod/message.php:298 ../../mod/message.php:525 +#: ../../include/conversation.php:1006 msgid "Upload photo" msgstr "Foto hochladen" -#: ../../mod/editpost.php:108 ../../include/conversation.php:971 +#: ../../mod/editpost.php:108 ../../include/conversation.php:1007 msgid "upload photo" msgstr "Bild hochladen" -#: ../../mod/editpost.php:109 ../../include/conversation.php:972 +#: ../../mod/editpost.php:109 ../../include/conversation.php:1008 msgid "Attach file" msgstr "Datei anhängen" -#: ../../mod/editpost.php:110 ../../include/conversation.php:973 +#: ../../mod/editpost.php:110 ../../include/conversation.php:1009 msgid "attach file" msgstr "Datei anhängen" #: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151 -#: ../../mod/message.php:299 ../../mod/message.php:486 -#: ../../include/conversation.php:974 +#: ../../mod/message.php:299 ../../mod/message.php:526 +#: ../../include/conversation.php:1010 msgid "Insert web link" msgstr "einen Link einfügen" -#: ../../mod/editpost.php:112 ../../include/conversation.php:975 +#: ../../mod/editpost.php:112 ../../include/conversation.php:1011 msgid "web link" msgstr "Weblink" -#: ../../mod/editpost.php:113 ../../include/conversation.php:976 +#: ../../mod/editpost.php:113 ../../include/conversation.php:1012 msgid "Insert video link" msgstr "Video-Adresse einfügen" -#: ../../mod/editpost.php:114 ../../include/conversation.php:977 +#: ../../mod/editpost.php:114 ../../include/conversation.php:1013 msgid "video link" msgstr "Video-Link" -#: ../../mod/editpost.php:115 ../../include/conversation.php:978 +#: ../../mod/editpost.php:115 ../../include/conversation.php:1014 msgid "Insert audio link" msgstr "Audio-Adresse einfügen" -#: ../../mod/editpost.php:116 ../../include/conversation.php:979 +#: ../../mod/editpost.php:116 ../../include/conversation.php:1015 msgid "audio link" msgstr "Audio-Link" -#: ../../mod/editpost.php:117 ../../include/conversation.php:980 +#: ../../mod/editpost.php:117 ../../include/conversation.php:1016 msgid "Set your location" msgstr "Deinen Standort festlegen" -#: ../../mod/editpost.php:118 ../../include/conversation.php:981 +#: ../../mod/editpost.php:118 ../../include/conversation.php:1017 msgid "set location" msgstr "Ort setzen" -#: ../../mod/editpost.php:119 ../../include/conversation.php:982 +#: ../../mod/editpost.php:119 ../../include/conversation.php:1018 msgid "Clear browser location" msgstr "Browser-Standort leeren" -#: ../../mod/editpost.php:120 ../../include/conversation.php:983 +#: ../../mod/editpost.php:120 ../../include/conversation.php:1019 msgid "clear location" msgstr "Ort löschen" -#: ../../mod/editpost.php:122 ../../include/conversation.php:989 +#: ../../mod/editpost.php:122 ../../include/conversation.php:1025 msgid "Permission settings" msgstr "Berechtigungseinstellungen" -#: ../../mod/editpost.php:130 ../../include/conversation.php:998 +#: ../../mod/editpost.php:130 ../../include/conversation.php:1034 msgid "CC: email addresses" msgstr "Cc:-E-Mail-Addressen" -#: ../../mod/editpost.php:131 ../../include/conversation.php:999 +#: ../../mod/editpost.php:131 ../../include/conversation.php:1035 msgid "Public post" msgstr "Öffentlicher Beitrag" -#: ../../mod/editpost.php:134 ../../include/conversation.php:985 +#: ../../mod/editpost.php:134 ../../include/conversation.php:1021 msgid "Set title" msgstr "Titel setzen" -#: ../../mod/editpost.php:136 ../../include/conversation.php:987 +#: ../../mod/editpost.php:136 ../../include/conversation.php:1023 msgid "Categories (comma-separated list)" msgstr "Kategorien (kommasepariert)" -#: ../../mod/editpost.php:137 ../../include/conversation.php:1001 +#: ../../mod/editpost.php:137 ../../include/conversation.php:1037 msgid "Example: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com" @@ -850,19 +852,19 @@ msgstr "Z.B.: bob@example.com, mary@example.com" msgid "This introduction has already been accepted." msgstr "Diese Kontaktanfrage wurde bereits akzeptiert." -#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:512 +#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:513 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:123 ../../mod/dfrn_request.php:517 +#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:518 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:125 ../../mod/dfrn_request.php:519 +#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:520 msgid "Warning: profile location has no profile photo." msgstr "Warnung: Es konnte kein Profilbild bei der angegebenen Profiladresse gefunden werden." -#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:522 +#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:523 #, 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" @@ -902,136 +904,136 @@ msgstr "Ungültiger Locator" msgid "Invalid email address." msgstr "Ungültige E-Mail Adresse." -#: ../../mod/dfrn_request.php:361 +#: ../../mod/dfrn_request.php:362 msgid "This account has not been configured for email. Request failed." msgstr "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen." -#: ../../mod/dfrn_request.php:457 +#: ../../mod/dfrn_request.php:458 msgid "Unable to resolve your name at the provided location." msgstr "Konnte deinen Namen an der angegebenen Stelle nicht finden." -#: ../../mod/dfrn_request.php:470 +#: ../../mod/dfrn_request.php:471 msgid "You have already introduced yourself here." msgstr "Du hast dich hier bereits vorgestellt." -#: ../../mod/dfrn_request.php:474 +#: ../../mod/dfrn_request.php:475 #, 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:495 +#: ../../mod/dfrn_request.php:496 msgid "Invalid profile URL." msgstr "Ungültige Profil-URL." -#: ../../mod/dfrn_request.php:501 ../../include/follow.php:27 +#: ../../mod/dfrn_request.php:502 ../../include/follow.php:27 msgid "Disallowed profile URL." msgstr "Nicht erlaubte Profil-URL." -#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:124 +#: ../../mod/dfrn_request.php:571 ../../mod/contacts.php:124 msgid "Failed to update contact record." msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." -#: ../../mod/dfrn_request.php:591 +#: ../../mod/dfrn_request.php:592 msgid "Your introduction has been sent." msgstr "Deine Kontaktanfrage wurde gesendet." -#: ../../mod/dfrn_request.php:644 +#: ../../mod/dfrn_request.php:645 msgid "Please login to confirm introduction." msgstr "Bitte melde dich an, um die Kontaktanfrage zu bestätigen." -#: ../../mod/dfrn_request.php:658 +#: ../../mod/dfrn_request.php:659 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:669 +#: ../../mod/dfrn_request.php:670 msgid "Hide this contact" msgstr "Verberge diesen Kontakt" -#: ../../mod/dfrn_request.php:672 +#: ../../mod/dfrn_request.php:673 #, php-format msgid "Welcome home %s." msgstr "Willkommen zurück %s." -#: ../../mod/dfrn_request.php:673 +#: ../../mod/dfrn_request.php:674 #, php-format msgid "Please confirm your introduction/connection request to %s." msgstr "Bitte bestätige deine Kontaktanfrage bei %s." -#: ../../mod/dfrn_request.php:674 +#: ../../mod/dfrn_request.php:675 msgid "Confirm" msgstr "Bestätigen" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3356 +#: ../../mod/dfrn_request.php:716 ../../include/items.php:3366 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" -#: ../../mod/dfrn_request.php:810 +#: ../../mod/dfrn_request.php:811 msgid "" "Please enter your 'Identity Address' from one of the following supported " "communications networks:" msgstr "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:" -#: ../../mod/dfrn_request.php:826 +#: ../../mod/dfrn_request.php:827 msgid "Connect as an email follower (Coming soon)" msgstr "Als E-Mail-Kontakt verbinden (In Kürze verfügbar)" -#: ../../mod/dfrn_request.php:828 +#: ../../mod/dfrn_request.php:829 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:831 +#: ../../mod/dfrn_request.php:832 msgid "Friend/Connection Request" msgstr "Freundschafts-/Kontaktanfrage" -#: ../../mod/dfrn_request.php:832 +#: ../../mod/dfrn_request.php:833 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:833 +#: ../../mod/dfrn_request.php:834 msgid "Please answer the following:" msgstr "Bitte beantworte Folgendes:" -#: ../../mod/dfrn_request.php:834 +#: ../../mod/dfrn_request.php:835 #, php-format msgid "Does %s know you?" msgstr "Kennt %s dich?" -#: ../../mod/dfrn_request.php:837 +#: ../../mod/dfrn_request.php:838 msgid "Add a personal note:" msgstr "Eine persönliche Notiz beifügen:" -#: ../../mod/dfrn_request.php:839 ../../include/contact_selectors.php:76 +#: ../../mod/dfrn_request.php:840 ../../include/contact_selectors.php:76 msgid "Friendica" msgstr "Friendica" -#: ../../mod/dfrn_request.php:840 +#: ../../mod/dfrn_request.php:841 msgid "StatusNet/Federated Social Web" msgstr "StatusNet/Federated Social Web" -#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:682 +#: ../../mod/dfrn_request.php:842 ../../mod/settings.php:681 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "Diaspora" -#: ../../mod/dfrn_request.php:842 +#: ../../mod/dfrn_request.php:843 #, 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:843 +#: ../../mod/dfrn_request.php:844 msgid "Your Identity Address:" msgstr "Adresse deines Profils:" -#: ../../mod/dfrn_request.php:846 +#: ../../mod/dfrn_request.php:847 msgid "Submit Request" msgstr "Anfrage abschicken" @@ -1064,10 +1066,10 @@ msgid "Remove account" msgstr "Konto löschen" #: ../../mod/uexport.php:48 ../../mod/settings.php:74 -#: ../../mod/newmember.php:22 ../../mod/admin.php:788 ../../mod/admin.php:993 +#: ../../mod/newmember.php:22 ../../mod/admin.php:824 ../../mod/admin.php:1029 #: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:140 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:538 +#: ../../view/theme/diabook/theme.php:659 ../../include/nav.php:140 #: ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" @@ -1116,233 +1118,262 @@ msgid "" "or mysql." msgstr "Möglicherweise musst du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren." -#: ../../mod/install.php:139 ../../mod/install.php:204 -#: ../../mod/install.php:488 +#: ../../mod/install.php:139 ../../mod/install.php:206 +#: ../../mod/install.php:506 msgid "Please see the file \"INSTALL.txt\"." msgstr "Lies bitte die \"INSTALL.txt\"." -#: ../../mod/install.php:201 +#: ../../mod/install.php:203 msgid "System check" msgstr "Systemtest" -#: ../../mod/install.php:206 +#: ../../mod/install.php:208 msgid "Check again" msgstr "Noch einmal testen" -#: ../../mod/install.php:225 +#: ../../mod/install.php:227 msgid "Database connection" msgstr "Datenbankverbindung" -#: ../../mod/install.php:226 +#: ../../mod/install.php:228 msgid "" "In order to install Friendica we need to know how to connect to your " "database." msgstr "Um Friendica installieren zu können, müssen wir wissen, wie wir zu deiner Datenbank Kontakt aufnehmen können." -#: ../../mod/install.php:227 +#: ../../mod/install.php:229 msgid "" "Please contact your hosting provider or site administrator if you have " "questions about these settings." msgstr "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls du Fragen zu diesen Einstellungen haben solltest." -#: ../../mod/install.php:228 +#: ../../mod/install.php:230 msgid "" "The database you specify below should already exist. If it does not, please " "create it before continuing." msgstr "Die Datenbank, die du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor du mit der Installation fortfährst." -#: ../../mod/install.php:232 +#: ../../mod/install.php:234 msgid "Database Server Name" msgstr "Datenbank-Server" -#: ../../mod/install.php:233 +#: ../../mod/install.php:235 msgid "Database Login Name" msgstr "Datenbank-Nutzer" -#: ../../mod/install.php:234 +#: ../../mod/install.php:236 msgid "Database Login Password" msgstr "Datenbank-Passwort" -#: ../../mod/install.php:235 +#: ../../mod/install.php:237 msgid "Database Name" msgstr "Datenbank-Name" -#: ../../mod/install.php:236 ../../mod/install.php:275 +#: ../../mod/install.php:238 ../../mod/install.php:277 msgid "Site administrator email address" msgstr "E-Mail-Adresse des Administrators" -#: ../../mod/install.php:236 ../../mod/install.php:275 +#: ../../mod/install.php:238 ../../mod/install.php:277 msgid "" "Your account email address must match this in order to use the web admin " "panel." msgstr "Die E-Mail-Adresse, die in deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit du das Admin-Panel benutzen kannst." -#: ../../mod/install.php:240 ../../mod/install.php:278 +#: ../../mod/install.php:242 ../../mod/install.php:280 msgid "Please select a default timezone for your website" msgstr "Bitte wähle die Standardzeitzone deiner Webseite" -#: ../../mod/install.php:265 +#: ../../mod/install.php:267 msgid "Site settings" msgstr "Server-Einstellungen" -#: ../../mod/install.php:318 +#: ../../mod/install.php:320 msgid "Could not find a command line version of PHP in the web server PATH." msgstr "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden." -#: ../../mod/install.php:319 +#: ../../mod/install.php:321 msgid "" "If you don't have a command line version of PHP installed on server, you " "will not be able to run background polling via cron. See 'Activating scheduled tasks'" msgstr "Wenn du keine Kommandozeilen Version von PHP auf deinem Server installiert hast, kannst du keine Hintergrundprozesse via cron starten. Siehe 'Activating scheduled tasks'" -#: ../../mod/install.php:323 +#: ../../mod/install.php:325 msgid "PHP executable path" msgstr "Pfad zu PHP" -#: ../../mod/install.php:323 +#: ../../mod/install.php:325 msgid "" "Enter full path to php executable. You can leave this blank to continue the " "installation." msgstr "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren." -#: ../../mod/install.php:328 +#: ../../mod/install.php:330 msgid "Command line PHP" msgstr "Kommandozeilen-PHP" -#: ../../mod/install.php:337 +#: ../../mod/install.php:339 msgid "" "The command line version of PHP on your system does not have " "\"register_argc_argv\" enabled." msgstr "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert." -#: ../../mod/install.php:338 +#: ../../mod/install.php:340 msgid "This is required for message delivery to work." msgstr "Dies wird für die Auslieferung von Nachrichten benötigt." -#: ../../mod/install.php:340 +#: ../../mod/install.php:342 msgid "PHP register_argc_argv" msgstr "PHP register_argc_argv" -#: ../../mod/install.php:361 +#: ../../mod/install.php:363 msgid "" "Error: the \"openssl_pkey_new\" function on this system is not able to " "generate encryption keys" msgstr "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen" -#: ../../mod/install.php:362 +#: ../../mod/install.php:364 msgid "" "If running under Windows, please see " "\"http://www.php.net/manual/en/openssl.installation.php\"." msgstr "Wenn der Server unter Windows läuft, schau dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an." -#: ../../mod/install.php:364 +#: ../../mod/install.php:366 msgid "Generate encryption keys" msgstr "Schlüssel erzeugen" -#: ../../mod/install.php:371 +#: ../../mod/install.php:373 msgid "libCurl PHP module" msgstr "PHP: libCurl-Modul" -#: ../../mod/install.php:372 +#: ../../mod/install.php:374 msgid "GD graphics PHP module" msgstr "PHP: GD-Grafikmodul" -#: ../../mod/install.php:373 +#: ../../mod/install.php:375 msgid "OpenSSL PHP module" msgstr "PHP: OpenSSL-Modul" -#: ../../mod/install.php:374 +#: ../../mod/install.php:376 msgid "mysqli PHP module" msgstr "PHP: mysqli-Modul" -#: ../../mod/install.php:375 +#: ../../mod/install.php:377 msgid "mb_string PHP module" msgstr "PHP: mb_string-Modul" -#: ../../mod/install.php:380 ../../mod/install.php:382 +#: ../../mod/install.php:382 ../../mod/install.php:384 msgid "Apache mod_rewrite module" msgstr "Apache mod_rewrite module" -#: ../../mod/install.php:380 +#: ../../mod/install.php:382 msgid "" "Error: Apache webserver mod-rewrite module is required but not installed." msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert." -#: ../../mod/install.php:388 +#: ../../mod/install.php:390 msgid "Error: libCURL PHP module required but not installed." msgstr "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert." -#: ../../mod/install.php:392 +#: ../../mod/install.php:394 msgid "" "Error: GD graphics PHP module with JPEG support required but not installed." msgstr "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert." -#: ../../mod/install.php:396 +#: ../../mod/install.php:398 msgid "Error: openssl PHP module required but not installed." msgstr "Fehler: Das openssl-Modul von PHP ist nicht installiert." -#: ../../mod/install.php:400 +#: ../../mod/install.php:402 msgid "Error: mysqli PHP module required but not installed." msgstr "Fehler: Das mysqli-Modul von PHP ist nicht installiert." -#: ../../mod/install.php:404 +#: ../../mod/install.php:406 msgid "Error: mb_string PHP module required but not installed." msgstr "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert." -#: ../../mod/install.php:421 +#: ../../mod/install.php:423 msgid "" "The web installer needs to be able to create a file called \".htconfig.php\"" " in the top folder of your web server and it is unable to do so." msgstr "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun." -#: ../../mod/install.php:422 +#: ../../mod/install.php:424 msgid "" "This is most often a permission setting, as the web server may not be able " "to write files in your folder - even if you can." msgstr "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast." -#: ../../mod/install.php:423 +#: ../../mod/install.php:425 msgid "" "At the end of this procedure, we will give you a text to save in a file " "named .htconfig.php in your Friendica top folder." msgstr "Nachdem du alles ausgefüllt hast, erhältst du einen Text, den du in eine Datei namens .htconfig.php in deinem Friendica-Wurzelverzeichnis kopieren musst." -#: ../../mod/install.php:424 +#: ../../mod/install.php:426 msgid "" "You can alternatively skip this procedure and perform a manual installation." " Please see the file \"INSTALL.txt\" for instructions." msgstr "Alternativ kannst du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest du in der Datei INSTALL.txt." -#: ../../mod/install.php:427 +#: ../../mod/install.php:429 msgid ".htconfig.php is writable" msgstr "Schreibrechte auf .htconfig.php" #: ../../mod/install.php:439 msgid "" +"Friendica uses the Smarty3 template engine to render its web views. Smarty3 " +"compiles templates to PHP to speed up rendering." +msgstr "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen." + +#: ../../mod/install.php:440 +msgid "" +"In order to store these compiled templates, the web server needs to have " +"write access to the directory view/smarty3/ under the Friendica top level " +"folder." +msgstr "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica." + +#: ../../mod/install.php:441 +msgid "" +"Please ensure that the user that your web server runs as (e.g. www-data) has" +" write access to this folder." +msgstr "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat." + +#: ../../mod/install.php:442 +msgid "" +"Note: as a security measure, you should give the web server write access to " +"view/smarty3/ only--not the template files (.tpl) that it contains." +msgstr "Hinweis: aus Sicherheitsgründen solltest du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten." + +#: ../../mod/install.php:445 +msgid "view/smarty3 is writable" +msgstr "view/smarty3 ist schreibbar" + +#: ../../mod/install.php:457 +msgid "" "Url rewrite in .htaccess is not working. Check your server configuration." msgstr "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers." -#: ../../mod/install.php:441 +#: ../../mod/install.php:459 msgid "Url rewrite is working" msgstr "URL rewrite funktioniert" -#: ../../mod/install.php:451 +#: ../../mod/install.php:469 msgid "" "The database configuration file \".htconfig.php\" could not be written. " "Please use the enclosed text to create a configuration file in your web " "server root." msgstr "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis deiner Friendica-Installation zu erzeugen." -#: ../../mod/install.php:475 +#: ../../mod/install.php:493 msgid "Errors encountered creating database tables." msgstr "Fehler aufgetreten während der Erzeugung der Datenbanktabellen." -#: ../../mod/install.php:486 +#: ../../mod/install.php:504 msgid "

What next

" msgstr "

Wie geht es weiter?

" -#: ../../mod/install.php:487 +#: ../../mod/install.php:505 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the " "poller." @@ -1415,7 +1446,7 @@ msgid "is interested in:" msgstr "ist interessiert an:" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1229 +#: ../../include/contact_widgets.php:9 ../../boot.php:1250 msgid "Connect" msgstr "Verbinden" @@ -1428,7 +1459,7 @@ msgid "Remote privacy information not available." msgstr "Entfernte Privatsphäreneinstellungen nicht verfügbar." #: ../../mod/lockview.php:48 -#: ../../addon/remote_permissions/remote_permissions.php:123 +#: ../../addon/remote_permissions/remote_permissions.php:124 msgid "Visible to:" msgstr "Sichtbar für:" @@ -1444,135 +1475,135 @@ msgstr "Gruppe ist leer" msgid "Group: " msgstr "Gruppe: " -#: ../../mod/content.php:438 ../../mod/content.php:723 +#: ../../mod/content.php:438 ../../mod/content.php:740 #: ../../include/conversation.php:568 ../../object/Item.php:118 msgid "Select" msgstr "Auswählen" -#: ../../mod/content.php:455 ../../mod/content.php:817 -#: ../../mod/content.php:818 ../../include/conversation.php:587 -#: ../../object/Item.php:235 ../../object/Item.php:236 +#: ../../mod/content.php:472 ../../mod/content.php:852 +#: ../../mod/content.php:853 ../../include/conversation.php:608 +#: ../../object/Item.php:252 ../../object/Item.php:253 #, php-format msgid "View %s's profile @ %s" msgstr "Das Profil von %s auf %s betrachten." -#: ../../mod/content.php:465 ../../mod/content.php:829 -#: ../../include/conversation.php:607 ../../object/Item.php:249 +#: ../../mod/content.php:482 ../../mod/content.php:864 +#: ../../include/conversation.php:628 ../../object/Item.php:266 #, php-format msgid "%s from %s" msgstr "%s von %s" -#: ../../mod/content.php:480 ../../include/conversation.php:622 +#: ../../mod/content.php:497 ../../include/conversation.php:643 msgid "View in context" msgstr "Im Zusammenhang betrachten" -#: ../../mod/content.php:586 ../../object/Item.php:289 +#: ../../mod/content.php:603 ../../object/Item.php:306 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d Kommentar" msgstr[1] "%d Kommentare" -#: ../../mod/content.php:588 ../../include/text.php:1446 -#: ../../object/Item.php:291 ../../object/Item.php:304 +#: ../../mod/content.php:605 ../../include/text.php:1503 +#: ../../object/Item.php:308 ../../object/Item.php:321 msgid "comment" msgid_plural "comments" msgstr[0] "" msgstr[1] "Kommentar" -#: ../../mod/content.php:589 ../../addon/page/page.php:77 +#: ../../mod/content.php:606 ../../addon/page/page.php:77 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:204 ../../boot.php:622 -#: ../../object/Item.php:292 ../../addon.old/page/page.php:77 +#: ../../include/contact_widgets.php:204 ../../boot.php:636 +#: ../../object/Item.php:309 ../../addon.old/page/page.php:77 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119 msgid "show more" msgstr "mehr anzeigen" -#: ../../mod/content.php:667 ../../object/Item.php:203 +#: ../../mod/content.php:684 ../../object/Item.php:203 msgid "like" msgstr "mag ich" -#: ../../mod/content.php:668 ../../object/Item.php:204 +#: ../../mod/content.php:685 ../../object/Item.php:204 msgid "dislike" msgstr "mag ich nicht" -#: ../../mod/content.php:670 ../../object/Item.php:206 +#: ../../mod/content.php:687 ../../object/Item.php:206 msgid "Share this" msgstr "Weitersagen" -#: ../../mod/content.php:670 ../../object/Item.php:206 +#: ../../mod/content.php:687 ../../object/Item.php:206 msgid "share" msgstr "Teilen" -#: ../../mod/content.php:694 ../../object/Item.php:578 +#: ../../mod/content.php:711 ../../object/Item.php:604 msgid "Bold" msgstr "Fett" -#: ../../mod/content.php:695 ../../object/Item.php:579 +#: ../../mod/content.php:712 ../../object/Item.php:605 msgid "Italic" msgstr "Kursiv" -#: ../../mod/content.php:696 ../../object/Item.php:580 +#: ../../mod/content.php:713 ../../object/Item.php:606 msgid "Underline" msgstr "Unterstrichen" -#: ../../mod/content.php:697 ../../object/Item.php:581 +#: ../../mod/content.php:714 ../../object/Item.php:607 msgid "Quote" msgstr "Zitat" -#: ../../mod/content.php:698 ../../object/Item.php:582 +#: ../../mod/content.php:715 ../../object/Item.php:608 msgid "Code" msgstr "Code" -#: ../../mod/content.php:699 ../../object/Item.php:583 +#: ../../mod/content.php:716 ../../object/Item.php:609 msgid "Image" msgstr "Bild" -#: ../../mod/content.php:700 ../../object/Item.php:584 +#: ../../mod/content.php:717 ../../object/Item.php:610 msgid "Link" msgstr "Verweis" -#: ../../mod/content.php:701 ../../object/Item.php:585 +#: ../../mod/content.php:718 ../../object/Item.php:611 msgid "Video" msgstr "Video" -#: ../../mod/content.php:736 ../../object/Item.php:182 +#: ../../mod/content.php:753 ../../object/Item.php:182 msgid "add star" msgstr "markieren" -#: ../../mod/content.php:737 ../../object/Item.php:183 +#: ../../mod/content.php:754 ../../object/Item.php:183 msgid "remove star" msgstr "Markierung entfernen" -#: ../../mod/content.php:738 ../../object/Item.php:184 +#: ../../mod/content.php:755 ../../object/Item.php:184 msgid "toggle star status" msgstr "Markierung umschalten" -#: ../../mod/content.php:741 ../../object/Item.php:187 +#: ../../mod/content.php:758 ../../object/Item.php:187 msgid "starred" msgstr "markiert" -#: ../../mod/content.php:742 ../../object/Item.php:192 +#: ../../mod/content.php:759 ../../object/Item.php:192 msgid "add tag" msgstr "Tag hinzufügen" -#: ../../mod/content.php:746 ../../object/Item.php:122 +#: ../../mod/content.php:763 ../../object/Item.php:122 msgid "save to folder" msgstr "In Ordner speichern" -#: ../../mod/content.php:819 ../../object/Item.php:237 +#: ../../mod/content.php:854 ../../object/Item.php:254 msgid "to" msgstr "zu" -#: ../../mod/content.php:820 ../../object/Item.php:239 +#: ../../mod/content.php:855 ../../object/Item.php:256 msgid "Wall-to-Wall" msgstr "Wall-to-Wall" -#: ../../mod/content.php:821 ../../object/Item.php:240 +#: ../../mod/content.php:856 ../../object/Item.php:257 msgid "via Wall-To-Wall:" msgstr "via Wall-To-Wall:" -#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:180 +#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:183 #: ../../addon.old/communityhome/communityhome.php:179 #, php-format msgid "Welcome to %s" @@ -1582,13 +1613,13 @@ msgstr "Willkommen zu %s" msgid "Invalid request identifier." msgstr "Invalid request identifier." -#: ../../mod/notifications.php:35 ../../mod/notifications.php:164 -#: ../../mod/notifications.php:210 +#: ../../mod/notifications.php:35 ../../mod/notifications.php:165 +#: ../../mod/notifications.php:211 msgid "Discard" msgstr "Verwerfen" -#: ../../mod/notifications.php:51 ../../mod/notifications.php:163 -#: ../../mod/notifications.php:209 ../../mod/contacts.php:325 +#: ../../mod/notifications.php:51 ../../mod/notifications.php:164 +#: ../../mod/notifications.php:210 ../../mod/contacts.php:325 #: ../../mod/contacts.php:379 msgid "Ignore" msgstr "Ignorieren" @@ -1605,7 +1636,7 @@ msgstr "Netzwerk" msgid "Personal" msgstr "Persönlich" -#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:88 #: ../../include/nav.php:77 ../../include/nav.php:116 msgid "Home" msgstr "Pinnwand" @@ -1627,139 +1658,139 @@ msgstr "Zeige ignorierte Anfragen" msgid "Hide Ignored Requests" msgstr "Verberge ignorierte Anfragen" -#: ../../mod/notifications.php:148 ../../mod/notifications.php:194 +#: ../../mod/notifications.php:149 ../../mod/notifications.php:195 msgid "Notification type: " msgstr "Benachrichtigungstyp: " -#: ../../mod/notifications.php:149 +#: ../../mod/notifications.php:150 msgid "Friend Suggestion" msgstr "Kontaktvorschlag" -#: ../../mod/notifications.php:151 +#: ../../mod/notifications.php:152 #, php-format msgid "suggested by %s" msgstr "vorgeschlagen von %s" -#: ../../mod/notifications.php:156 ../../mod/notifications.php:203 +#: ../../mod/notifications.php:157 ../../mod/notifications.php:204 #: ../../mod/contacts.php:385 msgid "Hide this contact from others" msgstr "Verberge diesen Kontakt vor anderen" -#: ../../mod/notifications.php:157 ../../mod/notifications.php:204 +#: ../../mod/notifications.php:158 ../../mod/notifications.php:205 msgid "Post a new friend activity" msgstr "Neue-Kontakt Nachricht senden" -#: ../../mod/notifications.php:157 ../../mod/notifications.php:204 +#: ../../mod/notifications.php:158 ../../mod/notifications.php:205 msgid "if applicable" msgstr "falls anwendbar" -#: ../../mod/notifications.php:160 ../../mod/notifications.php:207 -#: ../../mod/admin.php:697 +#: ../../mod/notifications.php:161 ../../mod/notifications.php:208 +#: ../../mod/admin.php:733 msgid "Approve" msgstr "Genehmigen" -#: ../../mod/notifications.php:180 +#: ../../mod/notifications.php:181 msgid "Claims to be known to you: " msgstr "Behauptet dich zu kennen: " -#: ../../mod/notifications.php:180 +#: ../../mod/notifications.php:181 msgid "yes" msgstr "ja" -#: ../../mod/notifications.php:180 +#: ../../mod/notifications.php:181 msgid "no" msgstr "nein" -#: ../../mod/notifications.php:187 +#: ../../mod/notifications.php:188 msgid "Approve as: " msgstr "Genehmigen als: " -#: ../../mod/notifications.php:188 +#: ../../mod/notifications.php:189 msgid "Friend" msgstr "Freund" -#: ../../mod/notifications.php:189 +#: ../../mod/notifications.php:190 msgid "Sharer" msgstr "Teilenden" -#: ../../mod/notifications.php:189 +#: ../../mod/notifications.php:190 msgid "Fan/Admirer" msgstr "Fan/Verehrer" -#: ../../mod/notifications.php:195 +#: ../../mod/notifications.php:196 msgid "Friend/Connect Request" msgstr "Kontakt-/Freundschaftsanfrage" -#: ../../mod/notifications.php:195 +#: ../../mod/notifications.php:196 msgid "New Follower" msgstr "Neuer Bewunderer" -#: ../../mod/notifications.php:216 +#: ../../mod/notifications.php:217 msgid "No introductions." msgstr "Keine Kontaktanfragen." -#: ../../mod/notifications.php:219 ../../include/nav.php:123 +#: ../../mod/notifications.php:220 ../../include/nav.php:123 msgid "Notifications" msgstr "Benachrichtigungen" -#: ../../mod/notifications.php:256 ../../mod/notifications.php:381 -#: ../../mod/notifications.php:468 +#: ../../mod/notifications.php:257 ../../mod/notifications.php:382 +#: ../../mod/notifications.php:469 #, php-format msgid "%s liked %s's post" msgstr "%s mag %ss Beitrag" -#: ../../mod/notifications.php:265 ../../mod/notifications.php:390 -#: ../../mod/notifications.php:477 +#: ../../mod/notifications.php:266 ../../mod/notifications.php:391 +#: ../../mod/notifications.php:478 #, php-format msgid "%s disliked %s's post" msgstr "%s mag %ss Beitrag nicht" -#: ../../mod/notifications.php:279 ../../mod/notifications.php:404 -#: ../../mod/notifications.php:491 +#: ../../mod/notifications.php:280 ../../mod/notifications.php:405 +#: ../../mod/notifications.php:492 #, php-format msgid "%s is now friends with %s" msgstr "%s ist jetzt mit %s befreundet" -#: ../../mod/notifications.php:286 ../../mod/notifications.php:411 +#: ../../mod/notifications.php:287 ../../mod/notifications.php:412 #, php-format msgid "%s created a new post" msgstr "%s hat einen neuen Beitrag erstellt" -#: ../../mod/notifications.php:287 ../../mod/notifications.php:412 -#: ../../mod/notifications.php:500 +#: ../../mod/notifications.php:288 ../../mod/notifications.php:413 +#: ../../mod/notifications.php:501 #, php-format msgid "%s commented on %s's post" msgstr "%s hat %ss Beitrag kommentiert" -#: ../../mod/notifications.php:301 +#: ../../mod/notifications.php:302 msgid "No more network notifications." msgstr "Keine weiteren Netzwerk-Benachrichtigungen." -#: ../../mod/notifications.php:305 +#: ../../mod/notifications.php:306 msgid "Network Notifications" msgstr "Netzwerk Benachrichtigungen" -#: ../../mod/notifications.php:331 ../../mod/notify.php:61 +#: ../../mod/notifications.php:332 ../../mod/notify.php:61 msgid "No more system notifications." msgstr "Keine weiteren Systembenachrichtigungen." -#: ../../mod/notifications.php:335 ../../mod/notify.php:65 +#: ../../mod/notifications.php:336 ../../mod/notify.php:65 msgid "System Notifications" msgstr "Systembenachrichtigungen" -#: ../../mod/notifications.php:426 +#: ../../mod/notifications.php:427 msgid "No more personal notifications." msgstr "Keine weiteren persönlichen Benachrichtigungen" -#: ../../mod/notifications.php:430 +#: ../../mod/notifications.php:431 msgid "Personal Notifications" msgstr "Persönliche Benachrichtigungen" -#: ../../mod/notifications.php:507 +#: ../../mod/notifications.php:508 msgid "No more home notifications." msgstr "Keine weiteren Pinnwand-Benachrichtigungen" -#: ../../mod/notifications.php:511 +#: ../../mod/notifications.php:512 msgid "Home Notifications" msgstr "Pinnwand Benachrichtigungen" @@ -1855,12 +1886,12 @@ msgid "View all contacts" msgstr "Alle Kontakte anzeigen" #: ../../mod/contacts.php:319 ../../mod/contacts.php:378 -#: ../../mod/admin.php:701 +#: ../../mod/admin.php:737 msgid "Unblock" msgstr "Entsperren" #: ../../mod/contacts.php:319 ../../mod/contacts.php:378 -#: ../../mod/admin.php:700 +#: ../../mod/admin.php:736 msgid "Block" msgstr "Sperren" @@ -1957,7 +1988,7 @@ msgstr "letzte Aktualisierung:" msgid "Update public posts" msgstr "Öffentliche Beiträge aktualisieren" -#: ../../mod/contacts.php:375 ../../mod/admin.php:1173 +#: ../../mod/contacts.php:375 ../../mod/admin.php:1209 msgid "Update now" msgstr "Jetzt aktualisieren" @@ -1986,7 +2017,7 @@ msgstr "Kontaktvorschläge" msgid "Suggest potential friends" msgstr "Freunde vorschlagen" -#: ../../mod/contacts.php:444 ../../mod/group.php:191 +#: ../../mod/contacts.php:444 ../../mod/group.php:194 msgid "All Contacts" msgstr "Alle Kontakte" @@ -2050,7 +2081,7 @@ msgstr "du bist Fan von" msgid "Edit contact" msgstr "Kontakt bearbeiten" -#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89 +#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:90 #: ../../include/nav.php:144 msgid "Contacts" msgstr "Kontakte" @@ -2087,10 +2118,10 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten" #: ../../mod/register.php:91 ../../mod/register.php:145 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 #: ../../addon/facebook/facebook.php:702 -#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:777 +#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:805 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365 -#: ../../boot.php:837 ../../addon.old/facebook/facebook.php:702 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3375 +#: ../../boot.php:852 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 #: ../../addon.old/public_server/public_server.php:62 @@ -2104,7 +2135,7 @@ msgid "" "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:83 ../../boot.php:976 +#: ../../mod/lostpass.php:83 ../../boot.php:990 msgid "Password Reset" msgstr "Passwort zurücksetzen" @@ -2214,11 +2245,11 @@ msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gib #: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:495 #: ../../addon/fbpost/fbpost.php:151 -#: ../../addon/remote_permissions/remote_permissions.php:204 +#: ../../addon/remote_permissions/remote_permissions.php:205 #: ../../addon/impressum/impressum.php:78 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66 -#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:501 +#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:504 #: ../../addon.old/facebook/facebook.php:495 #: ../../addon.old/fbpost/fbpost.php:144 #: ../../addon.old/impressum/impressum.php:78 @@ -2234,13 +2265,13 @@ msgid "Add application" msgstr "Programm hinzufügen" #: ../../mod/settings.php:563 ../../mod/settings.php:589 -#: ../../addon/statusnet/statusnet.php:694 +#: ../../addon/statusnet/statusnet.php:697 #: ../../addon.old/statusnet/statusnet.php:570 msgid "Consumer Key" msgstr "Consumer Key" #: ../../mod/settings.php:564 ../../mod/settings.php:590 -#: ../../addon/statusnet/statusnet.php:693 +#: ../../addon/statusnet/statusnet.php:696 #: ../../addon.old/statusnet/statusnet.php:569 msgid "Consumer Secret" msgstr "Consumer Secret" @@ -2277,7 +2308,7 @@ msgstr "Autorisierung entziehen" msgid "No Plugin settings configured" msgstr "Keine Plugin-Einstellungen konfiguriert" -#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:124 #: ../../addon.old/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "Plugin-Einstellungen" @@ -2294,24 +2325,24 @@ msgstr "An" msgid "Additional Features" msgstr "Zusätzliche Features" -#: ../../mod/settings.php:682 ../../mod/settings.php:683 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 #, 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:682 ../../mod/settings.php:683 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 msgid "enabled" msgstr "eingeschaltet" -#: ../../mod/settings.php:682 ../../mod/settings.php:683 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 msgid "disabled" msgstr "ausgeschaltet" -#: ../../mod/settings.php:683 +#: ../../mod/settings.php:682 msgid "StatusNet" msgstr "StatusNet" -#: ../../mod/settings.php:715 +#: ../../mod/settings.php:714 msgid "Email access is disabled on this site." msgstr "Zugriff auf E-Mails für diese Seite deaktiviert." @@ -2384,7 +2415,7 @@ msgstr "In einen Ordner verschieben" msgid "Move to folder:" msgstr "In diesen Ordner verschieben:" -#: ../../mod/settings.php:769 ../../mod/admin.php:404 +#: ../../mod/settings.php:769 ../../mod/admin.php:420 msgid "No special theme for mobile devices" msgstr "Kein spezielles Theme für mobile Geräte verwenden." @@ -2780,16 +2811,16 @@ msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gela msgid "Invalid contact." msgstr "Ungültiger Kontakt." -#: ../../mod/notes.php:44 ../../boot.php:1768 +#: ../../mod/notes.php:44 ../../boot.php:1798 msgid "Personal Notes" msgstr "Persönliche Notizen" -#: ../../mod/notes.php:63 ../../mod/filer.php:30 +#: ../../mod/notes.php:63 ../../mod/filer.php:31 #: ../../addon/facebook/facebook.php:770 -#: ../../addon/privacy_image_cache/privacy_image_cache.php:281 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:346 #: ../../addon/fbpost/fbpost.php:314 #: ../../addon/dav/friendica/layout.fnk.php:441 -#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688 +#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:742 #: ../../addon.old/facebook/facebook.php:770 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263 #: ../../addon.old/fbpost/fbpost.php:267 @@ -2813,11 +2844,21 @@ msgid "Move account" msgstr "Account umziehen" #: ../../mod/uimport.php:67 +msgid "You can import an account from another Friendica server." +msgstr "Du kannst einen Account von einem anderen Friendica Server importieren." + +#: ../../mod/uimport.php:68 msgid "" -"You can import an account from another Friendica server.
\r\n" -" You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.
\r\n" -" This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora" -msgstr "Du kannst deinen Account auf einen anderen Friendica Server umziehen.
Dazu musst du deinen Account von deinem alten Server exportieren und hier hochladen. Wir werden dann deinen alten Account, mit allen Kontakten, hier wieder herstellen. Außerdem werden wir deine Kontakte darüber informieren, dass du hierher umgezogen bist.
Dieses Feature ist experimentell. Kontakte aus dem OStatus Netzwerk (StatusNet/identi.ca) oder von Diaspora können nicht mit umgezogen werden." +"You need to export your account from the old server and upload it here. We " +"will recreate your old account here with all your contacts. We will try also" +" to inform your friends that you moved here." +msgstr "Du musst deinen Account vom alten Server exportieren und hier hochladen. Wir stellen deinen alten Account mit all deinen Kontakten wieder her. Wir werden auch versuchen all deine Freunde darüber zu informieren, dass du hierher umgezogen bist." + +#: ../../mod/uimport.php:69 +msgid "" +"This feature is experimental. We can't import contacts from the OStatus " +"network (statusnet/identi.ca) or from Diaspora" +msgstr "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (statusnet/identi.ca) oder von Diaspora importieren" #: ../../mod/uimport.php:70 msgid "Account file" @@ -2860,7 +2901,8 @@ msgstr "Kein Empfänger." #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:249 ../../mod/message.php:257 -#: ../../include/conversation.php:905 ../../include/conversation.php:923 +#: ../../mod/message.php:429 ../../mod/message.php:437 +#: ../../include/conversation.php:941 ../../include/conversation.php:959 msgid "Please enter a link URL:" msgstr "Bitte gib die URL des Links ein:" @@ -2876,17 +2918,17 @@ msgid "" 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:140 ../../mod/message.php:286 -#: ../../mod/message.php:476 +#: ../../mod/message.php:516 msgid "To:" msgstr "An:" #: ../../mod/wallmessage.php:141 ../../mod/message.php:291 -#: ../../mod/message.php:478 +#: ../../mod/message.php:518 msgid "Subject:" msgstr "Betreff:" #: ../../mod/wallmessage.php:147 ../../mod/message.php:295 -#: ../../mod/message.php:481 ../../mod/invite.php:113 +#: ../../mod/message.php:521 ../../mod/invite.php:113 msgid "Your message:" msgstr "Deine Nachricht:" @@ -2941,9 +2983,9 @@ msgid "" 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:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:89 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1744 +#: ../../boot.php:1774 msgid "Profile" msgstr "Profil" @@ -3106,7 +3148,7 @@ msgstr "Gruppe erstellt." msgid "Could not create group." msgstr "Konnte die Gruppe nicht erstellen." -#: ../../mod/group.php:47 ../../mod/group.php:137 +#: ../../mod/group.php:47 ../../mod/group.php:140 msgid "Group not found." msgstr "Gruppe nicht gefunden." @@ -3118,31 +3160,31 @@ msgstr "Gruppenname geändert." msgid "Permission denied" msgstr "Zugriff verweigert" -#: ../../mod/group.php:90 +#: ../../mod/group.php:93 msgid "Create a group of contacts/friends." msgstr "Eine Gruppe von Kontakten/Freunden anlegen." -#: ../../mod/group.php:91 ../../mod/group.php:177 +#: ../../mod/group.php:94 ../../mod/group.php:180 msgid "Group Name: " msgstr "Gruppenname:" -#: ../../mod/group.php:110 +#: ../../mod/group.php:113 msgid "Group removed." msgstr "Gruppe entfernt." -#: ../../mod/group.php:112 +#: ../../mod/group.php:115 msgid "Unable to remove group." msgstr "Konnte die Gruppe nicht entfernen." -#: ../../mod/group.php:176 +#: ../../mod/group.php:179 msgid "Group Editor" msgstr "Gruppeneditor" -#: ../../mod/group.php:189 +#: ../../mod/group.php:192 msgid "Members" msgstr "Mitglieder" -#: ../../mod/group.php:221 ../../mod/profperm.php:105 +#: ../../mod/group.php:223 ../../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" @@ -3166,7 +3208,7 @@ msgstr "Alle Kontakte (mit gesichertem Profilzugriff)" msgid "No contacts." msgstr "Keine Kontakte." -#: ../../mod/viewcontacts.php:76 ../../include/text.php:625 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:679 msgid "View Contacts" msgstr "Kontakte anzeigen" @@ -3225,7 +3267,7 @@ msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung mögli msgid "Your invitation ID: " msgstr "ID deiner Einladung: " -#: ../../mod/register.php:260 ../../mod/admin.php:446 +#: ../../mod/register.php:260 ../../mod/admin.php:462 msgid "Registration" msgstr "Registrierung" @@ -3248,7 +3290,7 @@ msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstab msgid "Choose a nickname: " msgstr "Spitznamen wählen: " -#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:936 +#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:951 msgid "Register" msgstr "Registrieren" @@ -3257,9 +3299,9 @@ msgid "People Search" msgstr "Personensuche" #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62 -#: ../../addon/communityhome/communityhome.php:164 -#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1442 -#: ../../include/diaspora.php:1848 ../../include/conversation.php:125 +#: ../../addon/communityhome/communityhome.php:166 +#: ../../view/theme/diabook/theme.php:465 ../../include/text.php:1499 +#: ../../include/diaspora.php:1851 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 msgid "photo" @@ -3267,10 +3309,10 @@ msgstr "Foto" #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 -#: ../../addon/communityhome/communityhome.php:159 -#: ../../addon/communityhome/communityhome.php:168 -#: ../../view/theme/diabook/theme.php:459 -#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1848 +#: ../../addon/communityhome/communityhome.php:161 +#: ../../addon/communityhome/communityhome.php:170 +#: ../../view/theme/diabook/theme.php:460 +#: ../../view/theme/diabook/theme.php:469 ../../include/diaspora.php:1851 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3280,8 +3322,8 @@ msgid "status" msgstr "Status" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 -#: ../../addon/communityhome/communityhome.php:173 -#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1864 +#: ../../addon/communityhome/communityhome.php:175 +#: ../../view/theme/diabook/theme.php:474 ../../include/diaspora.php:1867 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3295,8 +3337,8 @@ 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:159 -#: ../../mod/admin.php:737 ../../mod/admin.php:936 ../../mod/display.php:39 -#: ../../mod/display.php:169 ../../include/items.php:3843 +#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:39 +#: ../../mod/display.php:169 ../../include/items.php:3853 msgid "Item not found." msgstr "Beitrag nicht gefunden." @@ -3304,12 +3346,12 @@ msgstr "Beitrag nicht gefunden." msgid "Access denied." msgstr "Zugriff verweigert." -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 -#: ../../include/nav.php:51 ../../boot.php:1751 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:91 +#: ../../include/nav.php:51 ../../boot.php:1781 msgid "Photos" msgstr "Bilder" -#: ../../mod/fbrowser.php:96 +#: ../../mod/fbrowser.php:113 msgid "Files" msgstr "Dateien" @@ -3496,36 +3538,36 @@ msgstr "Du und %s" msgid "%s and You" msgstr "%s und du" -#: ../../mod/message.php:357 ../../mod/message.php:469 +#: ../../mod/message.php:368 ../../mod/message.php:509 msgid "Delete conversation" msgstr "Unterhaltung löschen" -#: ../../mod/message.php:360 +#: ../../mod/message.php:371 msgid "D, d M Y - g:i A" msgstr "D, d. M Y - g:i A" -#: ../../mod/message.php:363 +#: ../../mod/message.php:374 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "%d Nachricht" msgstr[1] "%d Nachrichten" -#: ../../mod/message.php:398 +#: ../../mod/message.php:413 msgid "Message not available." msgstr "Nachricht nicht verfügbar." -#: ../../mod/message.php:451 +#: ../../mod/message.php:483 msgid "Delete message" msgstr "Nachricht löschen" -#: ../../mod/message.php:471 +#: ../../mod/message.php:511 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:475 +#: ../../mod/message.php:515 msgid "Send Reply" msgstr "Antwort senden" @@ -3542,19 +3584,19 @@ msgstr "Keine Freunde zum Anzeigen." msgid "Theme settings updated." msgstr "Themeneinstellungen aktualisiert." -#: ../../mod/admin.php:96 ../../mod/admin.php:444 +#: ../../mod/admin.php:96 ../../mod/admin.php:460 msgid "Site" msgstr "Seite" -#: ../../mod/admin.php:97 ../../mod/admin.php:691 ../../mod/admin.php:704 +#: ../../mod/admin.php:97 ../../mod/admin.php:727 ../../mod/admin.php:740 msgid "Users" msgstr "Nutzer" -#: ../../mod/admin.php:98 ../../mod/admin.php:786 ../../mod/admin.php:828 +#: ../../mod/admin.php:98 ../../mod/admin.php:822 ../../mod/admin.php:864 msgid "Plugins" msgstr "Plugins" -#: ../../mod/admin.php:99 ../../mod/admin.php:991 ../../mod/admin.php:1027 +#: ../../mod/admin.php:99 ../../mod/admin.php:1027 ../../mod/admin.php:1063 msgid "Themes" msgstr "Themen" @@ -3562,7 +3604,7 @@ msgstr "Themen" msgid "DB updates" msgstr "DB Updates" -#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1114 +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1150 msgid "Logs" msgstr "Protokolle" @@ -3578,19 +3620,19 @@ msgstr "Plugin Features" msgid "User registrations waiting for confirmation" msgstr "Nutzeranmeldungen die auf Bestätigung warten" -#: ../../mod/admin.php:183 ../../mod/admin.php:672 +#: ../../mod/admin.php:183 ../../mod/admin.php:698 msgid "Normal Account" msgstr "Normales Konto" -#: ../../mod/admin.php:184 ../../mod/admin.php:673 +#: ../../mod/admin.php:184 ../../mod/admin.php:699 msgid "Soapbox Account" msgstr "Marktschreier-Konto" -#: ../../mod/admin.php:185 ../../mod/admin.php:674 +#: ../../mod/admin.php:185 ../../mod/admin.php:700 msgid "Community/Celebrity Account" msgstr "Forum/Promi-Konto" -#: ../../mod/admin.php:186 ../../mod/admin.php:675 +#: ../../mod/admin.php:186 ../../mod/admin.php:701 msgid "Automatic Friend Account" msgstr "Automatisches Freundekonto" @@ -3606,9 +3648,9 @@ msgstr "Privates Forum" msgid "Message queues" msgstr "Nachrichten-Warteschlangen" -#: ../../mod/admin.php:212 ../../mod/admin.php:443 ../../mod/admin.php:690 -#: ../../mod/admin.php:785 ../../mod/admin.php:827 ../../mod/admin.php:990 -#: ../../mod/admin.php:1026 ../../mod/admin.php:1113 +#: ../../mod/admin.php:212 ../../mod/admin.php:459 ../../mod/admin.php:726 +#: ../../mod/admin.php:821 ../../mod/admin.php:863 ../../mod/admin.php:1026 +#: ../../mod/admin.php:1062 ../../mod/admin.php:1149 msgid "Administration" msgstr "Administration" @@ -3632,578 +3674,626 @@ msgstr "Version" msgid "Active plugins" msgstr "Aktive Plugins" -#: ../../mod/admin.php:375 +#: ../../mod/admin.php:391 msgid "Site settings updated." msgstr "Seiteneinstellungen aktualisiert." -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:446 msgid "Closed" msgstr "Geschlossen" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:447 msgid "Requires approval" msgstr "Bedarf der Zustimmung" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:448 msgid "Open" msgstr "Offen" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:452 msgid "No SSL policy, links will track page SSL state" msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:453 msgid "Force all links to use SSL" msgstr "SSL für alle Links erzwingen" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:454 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:447 +#: ../../mod/admin.php:463 msgid "File upload" msgstr "Datei hochladen" -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:464 msgid "Policies" msgstr "Regeln" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:465 msgid "Advanced" msgstr "Erweitert" -#: ../../mod/admin.php:453 ../../addon/statusnet/statusnet.php:691 +#: ../../mod/admin.php:466 +msgid "Performance" +msgstr "Performance" + +#: ../../mod/admin.php:470 ../../addon/statusnet/statusnet.php:694 #: ../../addon.old/statusnet/statusnet.php:567 msgid "Site name" msgstr "Seitenname" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:471 msgid "Banner/Logo" msgstr "Banner/Logo" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:472 msgid "System language" msgstr "Systemsprache" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:473 msgid "System theme" msgstr "Systemweites Thema" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:473 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - Theme-Einstellungen ändern" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:474 msgid "Mobile system theme" msgstr "Systemweites mobiles Thema" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:474 msgid "Theme for mobile devices" msgstr "Thema für mobile Geräte" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:475 msgid "SSL link policy" msgstr "Regeln für SSL Links" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:475 msgid "Determines whether generated links should be forced to use SSL" msgstr "Bestimmt, ob generierte Links SSL verwenden müssen" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:476 +msgid "'Share' element" +msgstr "'Teilen' Element" + +#: ../../mod/admin.php:476 +msgid "Activates the bbcode element 'share' for repeating items." +msgstr "Aktiviert das bbcode Element 'Teilen' um Einträge zu wiederholen." + +#: ../../mod/admin.php:477 msgid "Maximum image size" msgstr "Maximale Größe von Bildern" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:477 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:460 +#: ../../mod/admin.php:478 msgid "Maximum image length" msgstr "Maximale Länge von Bildern" -#: ../../mod/admin.php:460 +#: ../../mod/admin.php:478 msgid "" "Maximum length in pixels of the longest side of uploaded images. Default is " "-1, which means no limits." msgstr "Maximale Länge in Pixeln der längsten Seite eines hoch geladenen Bildes. Grundeinstellung ist -1 was keine Einschränkung bedeutet." -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:479 msgid "JPEG image quality" msgstr "Qualität des JPEG Bildes" -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:479 msgid "" "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " "100, which is full quality." msgstr "Hoch geladene JPEG Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust." -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:481 msgid "Register policy" msgstr "Registrierungsmethode" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:482 msgid "Maximum Daily Registrations" msgstr "Maximum täglicher Neuanmeldungen" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:482 msgid "" "If registration is permitted above, this sets the maximum number of new user" " registrations to accept per day. If register is set to closed, this " "setting has no effect." msgstr "Wenn die Registrierung weiter oben erlaubt ist, regelt dies die maximale Anzahl von Neuanmeldungen pro Tag. Wenn die Registrierung geschlossen ist, hat diese Einstellung keinen Effekt." -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:483 msgid "Register text" msgstr "Registrierungstext" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:483 msgid "Will be displayed prominently on the registration page." msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt." -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:484 msgid "Accounts abandoned after x days" msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:484 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 Konten nicht mehr benutzt werden. 0 eingeben für kein Limit." -#: ../../mod/admin.php:467 +#: ../../mod/admin.php:485 msgid "Allowed friend domains" msgstr "Erlaubte Domains für Kontakte" -#: ../../mod/admin.php:467 +#: ../../mod/admin.php:485 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:468 +#: ../../mod/admin.php:486 msgid "Allowed email domains" msgstr "Erlaubte Domains für E-Mails" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:486 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:469 +#: ../../mod/admin.php:487 msgid "Block public" msgstr "Öffentlichen Zugriff blockieren" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:487 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:470 +#: ../../mod/admin.php:488 msgid "Force publish" msgstr "Erzwinge Veröffentlichung" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:488 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:471 +#: ../../mod/admin.php:489 msgid "Global directory update URL" msgstr "URL für Updates beim weltweiten Verzeichnis" -#: ../../mod/admin.php:471 +#: ../../mod/admin.php:489 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:472 +#: ../../mod/admin.php:490 msgid "Allow threaded items" msgstr "Erlaube Threads in Diskussionen" -#: ../../mod/admin.php:472 +#: ../../mod/admin.php:490 msgid "Allow infinite level threading for items on this site." msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite." -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:491 msgid "Private posts by default for new users" msgstr "Private Beiträge als Standard für neue Nutzer" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:491 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." msgstr "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen." -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:493 msgid "Block multiple registrations" msgstr "Unterbinde Mehrfachregistrierung" -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:493 msgid "Disallow users to register additional accounts for use as pages." msgstr "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen." -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:494 msgid "OpenID support" msgstr "OpenID Unterstützung" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:494 msgid "OpenID support for registration and logins." msgstr "OpenID-Unterstützung für Registrierung und Login." -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:495 msgid "Fullname check" msgstr "Namen auf Vollständigkeit überprüfen" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:495 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:478 +#: ../../mod/admin.php:496 msgid "UTF-8 Regular expressions" msgstr "UTF-8 Reguläre Ausdrücke" -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:496 msgid "Use PHP UTF8 regular expressions" msgstr "PHP UTF8 Ausdrücke verwenden" -#: ../../mod/admin.php:479 +#: ../../mod/admin.php:497 msgid "Show Community Page" msgstr "Gemeinschaftsseite anzeigen" -#: ../../mod/admin.php:479 +#: ../../mod/admin.php:497 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:480 +#: ../../mod/admin.php:498 msgid "Enable OStatus support" msgstr "OStatus Unterstützung aktivieren" -#: ../../mod/admin.php:480 +#: ../../mod/admin.php:498 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, Privatsphäre Warnungen werden nur bei Bedarf angezeigt." -#: ../../mod/admin.php:481 +#: ../../mod/admin.php:499 msgid "Enable Diaspora support" msgstr "Diaspora-Support aktivieren" -#: ../../mod/admin.php:481 +#: ../../mod/admin.php:499 msgid "Provide built-in Diaspora network compatibility." msgstr "Verwende die eingebaute Diaspora-Verknüpfung." -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:500 msgid "Only allow Friendica contacts" msgstr "Nur Friendica-Kontakte erlauben" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:500 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:483 +#: ../../mod/admin.php:501 msgid "Verify SSL" msgstr "SSL Überprüfen" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:501 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 Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann." -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:502 msgid "Proxy user" msgstr "Proxy Nutzer" -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:503 msgid "Proxy URL" msgstr "Proxy URL" -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:504 msgid "Network timeout" msgstr "Netzwerk Wartezeit" -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:504 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:487 +#: ../../mod/admin.php:505 msgid "Delivery interval" msgstr "Zustellungsintervall" -#: ../../mod/admin.php:487 +#: ../../mod/admin.php:505 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server." -#: ../../mod/admin.php:488 +#: ../../mod/admin.php:506 msgid "Poll interval" msgstr "Abfrageintervall" -#: ../../mod/admin.php:488 +#: ../../mod/admin.php:506 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "Verzögere Hintergrundprozesse, um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet." -#: ../../mod/admin.php:489 +#: ../../mod/admin.php:507 msgid "Maximum Load Average" msgstr "Maximum Load Average" -#: ../../mod/admin.php:489 +#: ../../mod/admin.php:507 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50" -#: ../../mod/admin.php:506 +#: ../../mod/admin.php:509 +msgid "Use MySQL full text engine" +msgstr "Nutze MySQL full text engine" + +#: ../../mod/admin.php:509 +msgid "" +"Activates the full text engine. Speeds up search - but can only search for " +"four and more characters." +msgstr "Aktiviert die 'full text engine'. Beschleunigt die Suche - aber es kann nur nach vier oder mehr Zeichen gesucht werden." + +#: ../../mod/admin.php:510 +msgid "Path to item cache" +msgstr "Pfad zum Eintrag Cache" + +#: ../../mod/admin.php:511 +msgid "Cache duration in seconds" +msgstr "Cache-Dauer in Sekunden" + +#: ../../mod/admin.php:511 +msgid "" +"How long should the cache files be hold? Default value is 86400 seconds (One" +" day)." +msgstr "Wie lange sollen die Dateien im Cache vorgehalten werden? Standardwert ist 86400 Sekunden (ein Tag)." + +#: ../../mod/admin.php:512 +msgid "Path for lock file" +msgstr "Pfad für die Sperrdatei" + +#: ../../mod/admin.php:513 +msgid "Temp path" +msgstr "Temp Pfad" + +#: ../../mod/admin.php:514 +msgid "Base path to installation" +msgstr "Basis-Pfad zur Installation" + +#: ../../mod/admin.php:532 msgid "Update has been marked successful" msgstr "Update wurde als erfolgreich markiert" -#: ../../mod/admin.php:516 +#: ../../mod/admin.php:542 #, php-format msgid "Executing %s failed. Check system logs." msgstr "Ausführung von %s schlug fehl. Systemprotokolle prüfen." -#: ../../mod/admin.php:519 +#: ../../mod/admin.php:545 #, php-format msgid "Update %s was successfully applied." msgstr "Update %s war erfolgreich." -#: ../../mod/admin.php:523 +#: ../../mod/admin.php:549 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "Update %s hat keinen Status zurückgegeben. Unbekannter Status." -#: ../../mod/admin.php:526 +#: ../../mod/admin.php:552 #, php-format msgid "Update function %s could not be found." msgstr "Updatefunktion %s konnte nicht gefunden werden." -#: ../../mod/admin.php:541 +#: ../../mod/admin.php:567 msgid "No failed updates." msgstr "Keine fehlgeschlagenen Updates." -#: ../../mod/admin.php:545 +#: ../../mod/admin.php:571 msgid "Failed Updates" msgstr "Fehlgeschlagene Updates" -#: ../../mod/admin.php:546 +#: ../../mod/admin.php:572 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben." -#: ../../mod/admin.php:547 +#: ../../mod/admin.php:573 msgid "Mark success (if update was manually applied)" msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)" -#: ../../mod/admin.php:548 +#: ../../mod/admin.php:574 msgid "Attempt to execute this update step automatically" msgstr "Versuchen, diesen Schritt automatisch auszuführen" -#: ../../mod/admin.php:573 +#: ../../mod/admin.php:599 #, 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:580 +#: ../../mod/admin.php:606 #, 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:619 +#: ../../mod/admin.php:645 #, php-format msgid "User '%s' deleted" msgstr "Nutzer '%s' gelöscht" -#: ../../mod/admin.php:627 +#: ../../mod/admin.php:653 #, php-format msgid "User '%s' unblocked" msgstr "Nutzer '%s' entsperrt" -#: ../../mod/admin.php:627 +#: ../../mod/admin.php:653 #, php-format msgid "User '%s' blocked" msgstr "Nutzer '%s' gesperrt" -#: ../../mod/admin.php:693 +#: ../../mod/admin.php:729 msgid "select all" msgstr "Alle auswählen" -#: ../../mod/admin.php:694 +#: ../../mod/admin.php:730 msgid "User registrations waiting for confirm" msgstr "Neuanmeldungen, die auf deine Bestätigung warten" -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:731 msgid "Request date" msgstr "Anfragedatum" -#: ../../mod/admin.php:695 ../../mod/admin.php:705 +#: ../../mod/admin.php:731 ../../mod/admin.php:741 #: ../../include/contact_selectors.php:79 #: ../../include/contact_selectors.php:86 msgid "Email" msgstr "E-Mail" -#: ../../mod/admin.php:696 +#: ../../mod/admin.php:732 msgid "No registrations." msgstr "Keine Neuanmeldungen." -#: ../../mod/admin.php:698 +#: ../../mod/admin.php:734 msgid "Deny" msgstr "Verwehren" -#: ../../mod/admin.php:702 +#: ../../mod/admin.php:738 msgid "Site admin" msgstr "Seitenadministrator" -#: ../../mod/admin.php:705 +#: ../../mod/admin.php:741 msgid "Register date" msgstr "Anmeldedatum" -#: ../../mod/admin.php:705 +#: ../../mod/admin.php:741 msgid "Last login" msgstr "Letzte Anmeldung" -#: ../../mod/admin.php:705 +#: ../../mod/admin.php:741 msgid "Last item" msgstr "Letzter Beitrag" -#: ../../mod/admin.php:705 +#: ../../mod/admin.php:741 msgid "Account" msgstr "Nutzerkonto" -#: ../../mod/admin.php:707 +#: ../../mod/admin.php:743 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:708 +#: ../../mod/admin.php:744 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:749 +#: ../../mod/admin.php:785 #, php-format msgid "Plugin %s disabled." msgstr "Plugin %s deaktiviert." -#: ../../mod/admin.php:753 +#: ../../mod/admin.php:789 #, php-format msgid "Plugin %s enabled." msgstr "Plugin %s aktiviert." -#: ../../mod/admin.php:763 ../../mod/admin.php:961 +#: ../../mod/admin.php:799 ../../mod/admin.php:997 msgid "Disable" msgstr "Ausschalten" -#: ../../mod/admin.php:765 ../../mod/admin.php:963 +#: ../../mod/admin.php:801 ../../mod/admin.php:999 msgid "Enable" msgstr "Einschalten" -#: ../../mod/admin.php:787 ../../mod/admin.php:992 +#: ../../mod/admin.php:823 ../../mod/admin.php:1028 msgid "Toggle" msgstr "Umschalten" -#: ../../mod/admin.php:795 ../../mod/admin.php:1002 +#: ../../mod/admin.php:831 ../../mod/admin.php:1038 msgid "Author: " msgstr "Autor:" -#: ../../mod/admin.php:796 ../../mod/admin.php:1003 +#: ../../mod/admin.php:832 ../../mod/admin.php:1039 msgid "Maintainer: " msgstr "Betreuer:" -#: ../../mod/admin.php:925 +#: ../../mod/admin.php:961 msgid "No themes found." msgstr "Keine Themen gefunden." -#: ../../mod/admin.php:984 +#: ../../mod/admin.php:1020 msgid "Screenshot" msgstr "Bildschirmfoto" -#: ../../mod/admin.php:1032 +#: ../../mod/admin.php:1068 msgid "[Experimental]" msgstr "[Experimentell]" -#: ../../mod/admin.php:1033 +#: ../../mod/admin.php:1069 msgid "[Unsupported]" msgstr "[Nicht unterstützt]" -#: ../../mod/admin.php:1060 +#: ../../mod/admin.php:1096 msgid "Log settings updated." msgstr "Protokolleinstellungen aktualisiert." -#: ../../mod/admin.php:1116 +#: ../../mod/admin.php:1152 msgid "Clear" msgstr "löschen" -#: ../../mod/admin.php:1122 +#: ../../mod/admin.php:1158 msgid "Debugging" msgstr "Protokoll führen" -#: ../../mod/admin.php:1123 +#: ../../mod/admin.php:1159 msgid "Log file" msgstr "Protokolldatei" -#: ../../mod/admin.php:1123 +#: ../../mod/admin.php:1159 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:1124 +#: ../../mod/admin.php:1160 msgid "Log level" msgstr "Protokoll-Level" -#: ../../mod/admin.php:1174 +#: ../../mod/admin.php:1210 msgid "Close" msgstr "Schließen" -#: ../../mod/admin.php:1180 +#: ../../mod/admin.php:1216 msgid "FTP Host" msgstr "FTP Host" -#: ../../mod/admin.php:1181 +#: ../../mod/admin.php:1217 msgid "FTP Path" msgstr "FTP Pfad" -#: ../../mod/admin.php:1182 +#: ../../mod/admin.php:1218 msgid "FTP User" msgstr "FTP Nutzername" -#: ../../mod/admin.php:1183 +#: ../../mod/admin.php:1219 msgid "FTP Password" msgstr "FTP Passwort" -#: ../../mod/profile.php:21 ../../boot.php:1139 +#: ../../mod/profile.php:21 ../../boot.php:1160 msgid "Requested profile is not available." msgstr "Das angefragte Profil ist nicht vorhanden." -#: ../../mod/profile.php:155 ../../mod/display.php:87 +#: ../../mod/profile.php:156 ../../mod/display.php:87 msgid "Access to this profile has been restricted." msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt." -#: ../../mod/profile.php:180 +#: ../../mod/profile.php:181 msgid "Tips for New Members" msgstr "Tipps für neue Nutzer" @@ -4252,7 +4342,7 @@ msgstr "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen" msgid "{0} mentioned you in a post" msgstr "{0} hat dich in einem Beitrag erwähnt" -#: ../../mod/nogroup.php:58 +#: ../../mod/nogroup.php:59 msgid "Contacts who are not members of a group" msgstr "Kontakte, die keiner Gruppe zugewiesen sind" @@ -4265,8 +4355,8 @@ msgid "" "Account not found and OpenID registration is not permitted on this site." msgstr "Nutzerkonto wurde nicht gefunden, und OpenID-Registrierung ist auf diesem Server nicht gestattet." -#: ../../mod/openid.php:93 ../../include/auth.php:110 -#: ../../include/auth.php:173 +#: ../../mod/openid.php:93 ../../include/auth.php:112 +#: ../../include/auth.php:175 msgid "Login failed." msgstr "Anmeldung fehlgeschlagen." @@ -4287,7 +4377,7 @@ msgstr "Keine gemeinsamen Kontakte." msgid "%1$s is following %2$s's %3$s" msgstr "%1$s folgt %2$s %3$s" -#: ../../mod/share.php:28 +#: ../../mod/share.php:43 msgid "link" msgstr "Link" @@ -4303,8 +4393,8 @@ msgstr "Anwendungen" msgid "No installed applications." msgstr "Keine Applikationen installiert." -#: ../../mod/search.php:99 ../../include/text.php:685 -#: ../../include/text.php:686 ../../include/nav.php:91 +#: ../../mod/search.php:99 ../../include/text.php:739 +#: ../../include/text.php:740 ../../include/nav.php:91 msgid "Search" msgstr "Suche" @@ -4601,32 +4691,32 @@ msgstr "Alter: " msgid "Edit/Manage Profiles" msgstr "Verwalte/Editiere Profile" -#: ../../mod/profiles.php:700 ../../boot.php:1257 +#: ../../mod/profiles.php:700 ../../boot.php:1278 msgid "Change profile photo" msgstr "Profilbild ändern" -#: ../../mod/profiles.php:701 ../../boot.php:1258 +#: ../../mod/profiles.php:701 ../../boot.php:1279 msgid "Create New Profile" msgstr "Neues Profil anlegen" -#: ../../mod/profiles.php:712 ../../boot.php:1268 +#: ../../mod/profiles.php:712 ../../boot.php:1289 msgid "Profile Image" msgstr "Profilbild" -#: ../../mod/profiles.php:714 ../../boot.php:1271 +#: ../../mod/profiles.php:714 ../../boot.php:1292 msgid "visible to everybody" msgstr "sichtbar für jeden" -#: ../../mod/profiles.php:715 ../../boot.php:1272 +#: ../../mod/profiles.php:715 ../../boot.php:1293 msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" -#: ../../mod/filer.php:29 ../../include/conversation.php:909 -#: ../../include/conversation.php:927 +#: ../../mod/filer.php:30 ../../include/conversation.php:945 +#: ../../include/conversation.php:963 msgid "Save to Folder:" msgstr "In diesen Ordner verschieben:" -#: ../../mod/filer.php:29 +#: ../../mod/filer.php:30 msgid "- select -" msgstr "- auswählen -" @@ -4714,7 +4804,7 @@ msgstr "Texteingabe (Diaspora Format): " msgid "diaspora2bb: " msgstr "diaspora2bb: " -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:521 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Kontaktvorschläge" @@ -4730,7 +4820,7 @@ msgid "Ignore/Hide" msgstr "Ignorieren/Verbergen" #: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71 -#: ../../view/theme/diabook/theme.php:518 +#: ../../view/theme/diabook/theme.php:519 msgid "Global Directory" msgstr "Weltweites Verzeichnis" @@ -4749,19 +4839,19 @@ msgstr "Geschlecht:" #: ../../mod/directory.php:136 #: ../../addon/forumdirectory/forumdirectory.php:158 -#: ../../include/profile_advanced.php:17 ../../boot.php:1293 +#: ../../include/profile_advanced.php:17 ../../boot.php:1314 msgid "Gender:" msgstr "Geschlecht:" #: ../../mod/directory.php:138 #: ../../addon/forumdirectory/forumdirectory.php:160 -#: ../../include/profile_advanced.php:37 ../../boot.php:1296 +#: ../../include/profile_advanced.php:37 ../../boot.php:1317 msgid "Status:" msgstr "Status:" #: ../../mod/directory.php:140 #: ../../addon/forumdirectory/forumdirectory.php:162 -#: ../../include/profile_advanced.php:48 ../../boot.php:1298 +#: ../../include/profile_advanced.php:48 ../../boot.php:1319 msgid "Homepage:" msgstr "Homepage:" @@ -4771,8 +4861,8 @@ msgstr "Homepage:" msgid "About:" msgstr "Über:" -#: ../../mod/directory.php:180 -#: ../../addon/forumdirectory/forumdirectory.php:202 +#: ../../mod/directory.php:187 +#: ../../addon/forumdirectory/forumdirectory.php:203 msgid "No entries (some entries may be hidden)." msgstr "Keine Einträge (einige Einträge könnten versteckt sein)." @@ -5184,7 +5274,7 @@ msgstr "Die neuen Einstellungen wurden gespeichert." msgid "Post to Facebook" msgstr "Bei Facebook veröffentlichen" -#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:446 +#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:471 #: ../../addon.old/facebook/facebook.php:921 #: ../../addon.old/fbpost/fbpost.php:399 msgid "" @@ -5192,31 +5282,31 @@ msgid "" "conflict." msgstr "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen." -#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:722 +#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:750 #: ../../addon.old/facebook/facebook.php:1149 #: ../../addon.old/fbpost/fbpost.php:610 msgid "View on Friendica" msgstr "In Friendica betrachten" -#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:759 +#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:787 #: ../../addon.old/facebook/facebook.php:1182 #: ../../addon.old/fbpost/fbpost.php:643 msgid "Facebook post failed. Queued for retry." msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut." -#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:799 +#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:827 #: ../../addon.old/facebook/facebook.php:1222 #: ../../addon.old/fbpost/fbpost.php:683 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:1223 ../../addon/fbpost/fbpost.php:800 +#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:828 #: ../../addon.old/facebook/facebook.php:1223 #: ../../addon.old/fbpost/fbpost.php:684 msgid "Facebook connection became invalid" msgstr "Facebook Anmeldedaten sind ungültig geworden" -#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:801 +#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:829 #: ../../addon.old/facebook/facebook.php:1224 #: ../../addon.old/fbpost/fbpost.php:685 #, php-format @@ -5241,27 +5331,27 @@ msgstr "StatusNet AutoFollow Einstellungen" msgid "Automatically follow any StatusNet followers/mentioners" msgstr "Automatisch allen StatusNet Followern/Erwähnungen folgen" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:278 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:343 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260 msgid "Lifetime of the cache (in hours)" msgstr "Lebenszeit des Caches (in Stunden)" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:283 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:348 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265 msgid "Cache Statistics" msgstr "Cache Statistik" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:286 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:351 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268 msgid "Number of items" msgstr "Anzahl der Einträge" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:288 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:353 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270 msgid "Size of the cache" msgstr "Größe des Caches" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:290 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:355 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272 msgid "Delete the whole cache" msgstr "Cache leeren" @@ -5294,7 +5384,12 @@ msgstr "Auf FB Seite/Gruppe veröffentlichen" msgid "Facebook Post Settings" msgstr "Facebook-Beitragseinstellungen" -#: ../../addon/widgets/widget_like.php:58 +#: ../../addon/fbpost/fbpost.php:367 +#, php-format +msgid "%s:" +msgstr "%s:" + +#: ../../addon/widgets/widget_like.php:59 #: ../../addon.old/widgets/widget_like.php:58 #, php-format msgid "%d person likes this" @@ -5302,7 +5397,7 @@ msgid_plural "%d people like this" msgstr[0] "%d Person mag das" msgstr[1] "%d Leute mögen das" -#: ../../addon/widgets/widget_like.php:61 +#: ../../addon/widgets/widget_like.php:62 #: ../../addon.old/widgets/widget_like.php:61 #, php-format msgid "%d person doesn't like this" @@ -5315,15 +5410,15 @@ msgstr[1] "%d Leute mögen das nicht" msgid "Get added to this list!" msgstr "Werde Mitglied dieser Liste" -#: ../../addon/widgets/widgets.php:56 ../../addon.old/widgets/widgets.php:56 +#: ../../addon/widgets/widgets.php:57 ../../addon.old/widgets/widgets.php:56 msgid "Generate new key" msgstr "Neuen Schlüssel erstellen" -#: ../../addon/widgets/widgets.php:59 ../../addon.old/widgets/widgets.php:59 +#: ../../addon/widgets/widgets.php:60 ../../addon.old/widgets/widgets.php:59 msgid "Widgets key" msgstr "Widgets Schlüssel" -#: ../../addon/widgets/widgets.php:61 ../../addon.old/widgets/widgets.php:61 +#: ../../addon/widgets/widgets.php:62 ../../addon.old/widgets/widgets.php:61 msgid "Widgets available" msgstr "Verfügbare Widgets" @@ -5646,7 +5741,7 @@ msgstr "Foren Verzeichnis" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:962 +#: ../../include/nav.php:64 ../../boot.php:976 #: ../../addon.old/communityhome/communityhome.php:28 #: ../../addon.old/communityhome/communityhome.php:34 #: ../../addon.old/communityhome/twillingham/communityhome.php:28 @@ -5668,25 +5763,25 @@ msgstr "OpenID" msgid "Latest users" msgstr "Letzte Benutzer" -#: ../../addon/communityhome/communityhome.php:81 +#: ../../addon/communityhome/communityhome.php:82 #: ../../addon/communityhome/twillingham/communityhome.php:81 #: ../../addon.old/communityhome/communityhome.php:81 #: ../../addon.old/communityhome/twillingham/communityhome.php:81 msgid "Most active users" msgstr "Aktivste Nutzer" -#: ../../addon/communityhome/communityhome.php:98 +#: ../../addon/communityhome/communityhome.php:99 #: ../../addon.old/communityhome/communityhome.php:98 msgid "Latest photos" msgstr "Neueste Fotos" -#: ../../addon/communityhome/communityhome.php:134 +#: ../../addon/communityhome/communityhome.php:136 #: ../../addon.old/communityhome/communityhome.php:133 msgid "Latest likes" msgstr "Neueste Favoriten" -#: ../../addon/communityhome/communityhome.php:156 -#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1440 +#: ../../addon/communityhome/communityhome.php:158 +#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1497 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -5840,7 +5935,7 @@ msgstr "Tage" #: ../../addon/dav/common/wdcal_edit.inc.php:254 #: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:293 -#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:922 +#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:976 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270 @@ -5851,7 +5946,7 @@ msgstr "Sonntag" #: ../../addon/dav/common/wdcal_edit.inc.php:235 #: ../../addon/dav/common/wdcal_edit.inc.php:274 -#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:922 +#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:976 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308 @@ -5859,35 +5954,35 @@ msgid "Monday" msgstr "Montag" #: ../../addon/dav/common/wdcal_edit.inc.php:238 -#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:922 +#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:976 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277 msgid "Tuesday" msgstr "Dienstag" #: ../../addon/dav/common/wdcal_edit.inc.php:241 -#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:922 +#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:976 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280 msgid "Wednesday" msgstr "Mittwoch" #: ../../addon/dav/common/wdcal_edit.inc.php:244 -#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:922 +#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:976 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283 msgid "Thursday" msgstr "Donnerstag" #: ../../addon/dav/common/wdcal_edit.inc.php:247 -#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:922 +#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:976 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286 msgid "Friday" msgstr "Freitag" #: ../../addon/dav/common/wdcal_edit.inc.php:250 -#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:922 +#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:976 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289 msgid "Saturday" @@ -6504,43 +6599,43 @@ msgstr "Dreamwidth Passwort" msgid "Post to dreamwidth by default" msgstr "Standardmäßig bei Dreamwidth veröffentlichen" -#: ../../addon/remote_permissions/remote_permissions.php:44 +#: ../../addon/remote_permissions/remote_permissions.php:45 msgid "Remote Permissions Settings" msgstr "Entfernte Privatsphäreneinstellungen" -#: ../../addon/remote_permissions/remote_permissions.php:45 +#: ../../addon/remote_permissions/remote_permissions.php:46 msgid "" "Allow recipients of your private posts to see the other recipients of the " "posts" msgstr "Erlaube Empfängern von privaten Nachrichten zu sehen wer die anderen Empfänger sind" -#: ../../addon/remote_permissions/remote_permissions.php:57 +#: ../../addon/remote_permissions/remote_permissions.php:58 msgid "Remote Permissions settings updated." msgstr "Entfernte Privatsphäreneinstellungen aktualisiert." -#: ../../addon/remote_permissions/remote_permissions.php:177 +#: ../../addon/remote_permissions/remote_permissions.php:178 msgid "Visible to" msgstr "Sichtbar für" -#: ../../addon/remote_permissions/remote_permissions.php:177 +#: ../../addon/remote_permissions/remote_permissions.php:178 msgid "may only be a partial list" msgstr "könnte nur ein Teil der Liste sein" -#: ../../addon/remote_permissions/remote_permissions.php:196 +#: ../../addon/remote_permissions/remote_permissions.php:197 #: ../../addon/altpager/altpager.php:99 msgid "Global" msgstr "Global" -#: ../../addon/remote_permissions/remote_permissions.php:196 +#: ../../addon/remote_permissions/remote_permissions.php:197 msgid "The posts of every user on this server show the post recipients" msgstr "Die Beiträge jedes Nutzers dieses Servers werden die Empfänger des Beitrags anzeigen" -#: ../../addon/remote_permissions/remote_permissions.php:197 +#: ../../addon/remote_permissions/remote_permissions.php:198 #: ../../addon/altpager/altpager.php:100 msgid "Individual" msgstr "Individuell" -#: ../../addon/remote_permissions/remote_permissions.php:197 +#: ../../addon/remote_permissions/remote_permissions.php:198 msgid "Each user chooses whether his/her posts show the post recipients" msgstr "Jede/r Nutzer/in kann wählen ob die Empfänger der Beiträge angezeigt werden sollen oder nicht" @@ -7017,11 +7112,11 @@ msgstr "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX gesch msgid "Use the MathJax renderer" msgstr "MathJax verwenden" -#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74 +#: ../../addon/mathjax/mathjax.php:75 ../../addon.old/mathjax/mathjax.php:74 msgid "MathJax Base URL" msgstr "MathJax Basis-URL" -#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74 +#: ../../addon/mathjax/mathjax.php:75 ../../addon.old/mathjax/mathjax.php:74 msgid "" "The URL for the javascript file that should be included to use MathJax. Can " "be either the MathJax CDN or another installation of MathJax." @@ -7337,7 +7432,7 @@ msgstr "Sende verlinkte #-Tags und @-Namen nach StatusNet" msgid "Clear OAuth configuration" msgstr "OAuth-Konfiguration löschen" -#: ../../addon/statusnet/statusnet.php:692 +#: ../../addon/statusnet/statusnet.php:695 #: ../../addon.old/statusnet/statusnet.php:568 msgid "API URL" msgstr "API-URL" @@ -7583,11 +7678,11 @@ msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter" msgid "Send linked #-tags and @-names to Twitter" msgstr "Sende verlinkte #-Tags und @-Namen nach Twitter" -#: ../../addon/twitter/twitter.php:508 ../../addon.old/twitter/twitter.php:396 +#: ../../addon/twitter/twitter.php:517 ../../addon.old/twitter/twitter.php:396 msgid "Consumer key" msgstr "Consumer Key" -#: ../../addon/twitter/twitter.php:509 ../../addon.old/twitter/twitter.php:397 +#: ../../addon/twitter/twitter.php:518 ../../addon.old/twitter/twitter.php:397 msgid "Consumer secret" msgstr "Consumer Secret" @@ -7725,137 +7820,137 @@ msgstr "Theme Breite festlegen" msgid "Color scheme" msgstr "Farbschema" -#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:49 #: ../../include/nav.php:116 msgid "Your posts and conversations" msgstr "Deine Beiträge und Unterhaltungen" -#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:50 msgid "Your profile page" msgstr "Deine Profilseite" -#: ../../view/theme/diabook/theme.php:89 +#: ../../view/theme/diabook/theme.php:90 msgid "Your contacts" msgstr "Deine Kontakte" -#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:51 msgid "Your photos" msgstr "Deine Fotos" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:52 msgid "Your events" msgstr "Deine Ereignisse" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:93 ../../include/nav.php:53 msgid "Personal notes" msgstr "Persönliche Notizen" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:93 ../../include/nav.php:53 msgid "Your personal photos" msgstr "Deine privaten Fotos" -#: ../../view/theme/diabook/theme.php:94 -#: ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:632 +#: ../../view/theme/diabook/theme.php:95 +#: ../../view/theme/diabook/theme.php:538 +#: ../../view/theme/diabook/theme.php:633 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "Foren" -#: ../../view/theme/diabook/theme.php:384 -#: ../../view/theme/diabook/theme.php:634 +#: ../../view/theme/diabook/theme.php:385 +#: ../../view/theme/diabook/theme.php:635 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "Community-Profile" -#: ../../view/theme/diabook/theme.php:405 -#: ../../view/theme/diabook/theme.php:639 +#: ../../view/theme/diabook/theme.php:406 +#: ../../view/theme/diabook/theme.php:640 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "Letzte Nutzer" -#: ../../view/theme/diabook/theme.php:434 -#: ../../view/theme/diabook/theme.php:641 +#: ../../view/theme/diabook/theme.php:435 +#: ../../view/theme/diabook/theme.php:642 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "Zuletzt gemocht" -#: ../../view/theme/diabook/theme.php:479 -#: ../../view/theme/diabook/theme.php:640 +#: ../../view/theme/diabook/theme.php:480 +#: ../../view/theme/diabook/theme.php:641 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "Letzte Fotos" -#: ../../view/theme/diabook/theme.php:516 -#: ../../view/theme/diabook/theme.php:637 +#: ../../view/theme/diabook/theme.php:517 +#: ../../view/theme/diabook/theme.php:638 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "Freunde finden" -#: ../../view/theme/diabook/theme.php:517 +#: ../../view/theme/diabook/theme.php:518 msgid "Local Directory" msgstr "Lokales Verzeichnis" -#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:520 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Ähnliche Interessen" -#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:522 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Freunde einladen" -#: ../../view/theme/diabook/theme.php:572 -#: ../../view/theme/diabook/theme.php:633 +#: ../../view/theme/diabook/theme.php:573 +#: ../../view/theme/diabook/theme.php:634 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "Earth Layers" -#: ../../view/theme/diabook/theme.php:577 +#: ../../view/theme/diabook/theme.php:578 msgid "Set zoomfactor for Earth Layers" msgstr "Zoomfaktor der Earth Layer" -#: ../../view/theme/diabook/theme.php:578 +#: ../../view/theme/diabook/theme.php:579 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "Longitude (X) der Earth Layer" -#: ../../view/theme/diabook/theme.php:579 +#: ../../view/theme/diabook/theme.php:580 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "Latitude (Y) der Earth Layer" -#: ../../view/theme/diabook/theme.php:592 -#: ../../view/theme/diabook/theme.php:635 +#: ../../view/theme/diabook/theme.php:593 +#: ../../view/theme/diabook/theme.php:636 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "Hilfe oder @NewHere" -#: ../../view/theme/diabook/theme.php:599 -#: ../../view/theme/diabook/theme.php:636 +#: ../../view/theme/diabook/theme.php:600 +#: ../../view/theme/diabook/theme.php:637 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "Verbinde Dienste" -#: ../../view/theme/diabook/theme.php:606 -#: ../../view/theme/diabook/theme.php:638 +#: ../../view/theme/diabook/theme.php:607 +#: ../../view/theme/diabook/theme.php:639 msgid "Last Tweets" msgstr "Neueste Tweets" -#: ../../view/theme/diabook/theme.php:609 +#: ../../view/theme/diabook/theme.php:610 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "Twitter Suchbegriff" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:630 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:313 msgid "don't show" msgstr "nicht zeigen" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:630 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:312 msgid "show" msgstr "zeigen" -#: ../../view/theme/diabook/theme.php:630 +#: ../../view/theme/diabook/theme.php:631 msgid "Show/hide boxes at right-hand column:" msgstr "Rahmen auf der rechten Seite anzeigen/verbergen" @@ -8282,242 +8377,242 @@ msgstr "(kein Betreff)" msgid " on Last.fm" msgstr " bei Last.fm" -#: ../../include/text.php:243 +#: ../../include/text.php:263 msgid "prev" msgstr "vorige" -#: ../../include/text.php:245 +#: ../../include/text.php:265 msgid "first" msgstr "erste" -#: ../../include/text.php:274 +#: ../../include/text.php:294 msgid "last" msgstr "letzte" -#: ../../include/text.php:277 +#: ../../include/text.php:297 msgid "next" msgstr "nächste" -#: ../../include/text.php:295 +#: ../../include/text.php:315 msgid "newer" msgstr "neuer" -#: ../../include/text.php:299 +#: ../../include/text.php:319 msgid "older" msgstr "älter" -#: ../../include/text.php:604 +#: ../../include/text.php:658 msgid "No contacts" msgstr "Keine Kontakte" -#: ../../include/text.php:613 +#: ../../include/text.php:667 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "%d Kontakt" msgstr[1] "%d Kontakte" -#: ../../include/text.php:726 +#: ../../include/text.php:780 msgid "poke" msgstr "anstupsen" -#: ../../include/text.php:726 ../../include/conversation.php:210 +#: ../../include/text.php:780 ../../include/conversation.php:210 msgid "poked" msgstr "stupste" -#: ../../include/text.php:727 +#: ../../include/text.php:781 msgid "ping" msgstr "anpingen" -#: ../../include/text.php:727 +#: ../../include/text.php:781 msgid "pinged" msgstr "pingte" -#: ../../include/text.php:728 +#: ../../include/text.php:782 msgid "prod" msgstr "knuffen" -#: ../../include/text.php:728 +#: ../../include/text.php:782 msgid "prodded" msgstr "knuffte" -#: ../../include/text.php:729 +#: ../../include/text.php:783 msgid "slap" msgstr "ohrfeigen" -#: ../../include/text.php:729 +#: ../../include/text.php:783 msgid "slapped" msgstr "ohrfeigte" -#: ../../include/text.php:730 +#: ../../include/text.php:784 msgid "finger" msgstr "befummeln" -#: ../../include/text.php:730 +#: ../../include/text.php:784 msgid "fingered" msgstr "befummelte" -#: ../../include/text.php:731 +#: ../../include/text.php:785 msgid "rebuff" msgstr "eine Abfuhr erteilen" -#: ../../include/text.php:731 +#: ../../include/text.php:785 msgid "rebuffed" msgstr "abfuhrerteilte" -#: ../../include/text.php:743 +#: ../../include/text.php:797 msgid "happy" msgstr "glücklich" -#: ../../include/text.php:744 +#: ../../include/text.php:798 msgid "sad" msgstr "traurig" -#: ../../include/text.php:745 +#: ../../include/text.php:799 msgid "mellow" msgstr "sanft" -#: ../../include/text.php:746 +#: ../../include/text.php:800 msgid "tired" msgstr "müde" -#: ../../include/text.php:747 +#: ../../include/text.php:801 msgid "perky" msgstr "frech" -#: ../../include/text.php:748 +#: ../../include/text.php:802 msgid "angry" msgstr "sauer" -#: ../../include/text.php:749 +#: ../../include/text.php:803 msgid "stupified" msgstr "verblüfft" -#: ../../include/text.php:750 +#: ../../include/text.php:804 msgid "puzzled" msgstr "verwirrt" -#: ../../include/text.php:751 +#: ../../include/text.php:805 msgid "interested" msgstr "interessiert" -#: ../../include/text.php:752 +#: ../../include/text.php:806 msgid "bitter" msgstr "verbittert" -#: ../../include/text.php:753 +#: ../../include/text.php:807 msgid "cheerful" msgstr "fröhlich" -#: ../../include/text.php:754 +#: ../../include/text.php:808 msgid "alive" msgstr "lebendig" -#: ../../include/text.php:755 +#: ../../include/text.php:809 msgid "annoyed" msgstr "verärgert" -#: ../../include/text.php:756 +#: ../../include/text.php:810 msgid "anxious" msgstr "unruhig" -#: ../../include/text.php:757 +#: ../../include/text.php:811 msgid "cranky" msgstr "schrullig" -#: ../../include/text.php:758 +#: ../../include/text.php:812 msgid "disturbed" msgstr "verstört" -#: ../../include/text.php:759 +#: ../../include/text.php:813 msgid "frustrated" msgstr "frustriert" -#: ../../include/text.php:760 +#: ../../include/text.php:814 msgid "motivated" msgstr "motiviert" -#: ../../include/text.php:761 +#: ../../include/text.php:815 msgid "relaxed" msgstr "entspannt" -#: ../../include/text.php:762 +#: ../../include/text.php:816 msgid "surprised" msgstr "überrascht" -#: ../../include/text.php:926 +#: ../../include/text.php:980 msgid "January" msgstr "Januar" -#: ../../include/text.php:926 +#: ../../include/text.php:980 msgid "February" msgstr "Februar" -#: ../../include/text.php:926 +#: ../../include/text.php:980 msgid "March" msgstr "März" -#: ../../include/text.php:926 +#: ../../include/text.php:980 msgid "April" msgstr "April" -#: ../../include/text.php:926 +#: ../../include/text.php:980 msgid "May" msgstr "Mai" -#: ../../include/text.php:926 +#: ../../include/text.php:980 msgid "June" msgstr "Juni" -#: ../../include/text.php:926 +#: ../../include/text.php:980 msgid "July" msgstr "Juli" -#: ../../include/text.php:926 +#: ../../include/text.php:980 msgid "August" msgstr "August" -#: ../../include/text.php:926 +#: ../../include/text.php:980 msgid "September" msgstr "September" -#: ../../include/text.php:926 +#: ../../include/text.php:980 msgid "October" msgstr "Oktober" -#: ../../include/text.php:926 +#: ../../include/text.php:980 msgid "November" msgstr "November" -#: ../../include/text.php:926 +#: ../../include/text.php:980 msgid "December" msgstr "Dezember" -#: ../../include/text.php:1010 +#: ../../include/text.php:1067 msgid "bytes" msgstr "Byte" -#: ../../include/text.php:1037 ../../include/text.php:1049 +#: ../../include/text.php:1094 ../../include/text.php:1106 msgid "Click to open/close" msgstr "Zum öffnen/schließen klicken" -#: ../../include/text.php:1222 ../../include/user.php:236 +#: ../../include/text.php:1279 ../../include/user.php:236 msgid "default" msgstr "Standard" -#: ../../include/text.php:1234 +#: ../../include/text.php:1291 msgid "Select an alternate language" msgstr "Alternative Sprache auswählen" -#: ../../include/text.php:1444 +#: ../../include/text.php:1501 msgid "activity" msgstr "Aktivität" -#: ../../include/text.php:1447 +#: ../../include/text.php:1504 msgid "post" msgstr "Beitrag" -#: ../../include/text.php:1602 +#: ../../include/text.php:1659 msgid "Item filed" msgstr "Beitrag abgelegt" @@ -8525,11 +8620,11 @@ msgstr "Beitrag abgelegt" msgid "Sharing notification from Diaspora network" msgstr "Freigabe-Benachrichtigung von Diaspora" -#: ../../include/diaspora.php:2236 +#: ../../include/diaspora.php:2239 msgid "Attachments:" msgstr "Anhänge:" -#: ../../include/network.php:847 +#: ../../include/network.php:850 msgid "view full size" msgstr "Volle Größe anzeigen" @@ -8612,7 +8707,7 @@ msgstr "Neue Gruppe erstellen" msgid "Contacts not in any group" msgstr "Kontakte in keiner Gruppe" -#: ../../include/nav.php:46 ../../boot.php:961 +#: ../../include/nav.php:46 ../../boot.php:975 msgid "Logout" msgstr "Abmelden" @@ -8620,7 +8715,7 @@ msgstr "Abmelden" msgid "End this session" msgstr "Diese Sitzung beenden" -#: ../../include/nav.php:49 ../../boot.php:1737 +#: ../../include/nav.php:49 ../../boot.php:1767 msgid "Status" msgstr "Status" @@ -8712,7 +8807,7 @@ msgstr "Andere Seiten verwalten" msgid "Delegations" msgstr "Delegierungen" -#: ../../include/nav.php:142 ../../boot.php:1251 +#: ../../include/nav.php:142 ../../boot.php:1272 msgid "Profiles" msgstr "Profile" @@ -8791,17 +8886,17 @@ msgstr "Alles" msgid "Categories" msgstr "Kategorien" -#: ../../include/auth.php:36 +#: ../../include/auth.php:38 msgid "Logged out." msgstr "Abgemeldet." -#: ../../include/auth.php:126 +#: ../../include/auth.php:128 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:126 +#: ../../include/auth.php:128 msgid "The error message was:" msgstr "Die Fehlermeldung lautete:" @@ -8862,36 +8957,32 @@ msgstr "Sekunden" msgid "%1$d %2$s ago" msgstr "%1$d %2$s her" -#: ../../include/datetime.php:472 ../../include/items.php:1695 +#: ../../include/datetime.php:472 ../../include/items.php:1705 #, php-format msgid "%s's birthday" msgstr "%ss Geburtstag" -#: ../../include/datetime.php:473 ../../include/items.php:1696 +#: ../../include/datetime.php:473 ../../include/items.php:1706 #, php-format msgid "Happy Birthday %s" msgstr "Herzlichen Glückwunsch %s" -#: ../../include/onepoll.php:439 -msgid "From: " -msgstr "Von: " - -#: ../../include/bbcode.php:202 ../../include/bbcode.php:482 +#: ../../include/bbcode.php:210 ../../include/bbcode.php:491 msgid "Image/photo" msgstr "Bild/Foto" -#: ../../include/bbcode.php:254 +#: ../../include/bbcode.php:262 #, php-format msgid "" -"%s wrote the following post:" -msgstr "%s schrieb den folgenden Beitrag:" +"%s wrote the following post:" +msgstr "%s schrieb den folgenden Eintrag:" -#: ../../include/bbcode.php:447 ../../include/bbcode.php:467 +#: ../../include/bbcode.php:456 ../../include/bbcode.php:476 msgid "$1 wrote:" msgstr "$1 hat geschrieben:" -#: ../../include/bbcode.php:487 ../../include/bbcode.php:488 +#: ../../include/bbcode.php:496 ../../include/bbcode.php:497 msgid "Encrypted content" msgstr "Verschlüsselter Inhalt" @@ -9297,15 +9388,15 @@ msgstr "Konnte die Kontaktinformationen nicht empfangen." msgid "following" msgstr "folgen" -#: ../../include/items.php:3363 +#: ../../include/items.php:3373 msgid "A new person is sharing with you at " msgstr "Eine neue Person teilt mit dir auf " -#: ../../include/items.php:3363 +#: ../../include/items.php:3373 msgid "You have a new follower at " msgstr "Du hast einen neuen Kontakt auf " -#: ../../include/items.php:4047 +#: ../../include/items.php:4057 msgid "Archives" msgstr "Archiv" @@ -9399,34 +9490,34 @@ msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das msgid "stopped following" msgstr "wird nicht mehr gefolgt" -#: ../../include/Contact.php:225 ../../include/conversation.php:795 +#: ../../include/Contact.php:225 ../../include/conversation.php:816 msgid "Poke" msgstr "Anstupsen" -#: ../../include/Contact.php:226 ../../include/conversation.php:789 +#: ../../include/Contact.php:226 ../../include/conversation.php:810 msgid "View Status" msgstr "Pinnwand anschauen" -#: ../../include/Contact.php:227 ../../include/conversation.php:790 +#: ../../include/Contact.php:227 ../../include/conversation.php:811 msgid "View Profile" msgstr "Profil anschauen" -#: ../../include/Contact.php:228 ../../include/conversation.php:791 +#: ../../include/Contact.php:228 ../../include/conversation.php:812 msgid "View Photos" msgstr "Bilder anschauen" #: ../../include/Contact.php:229 ../../include/Contact.php:242 -#: ../../include/conversation.php:792 +#: ../../include/conversation.php:813 msgid "Network Posts" msgstr "Netzwerkbeiträge" #: ../../include/Contact.php:230 ../../include/Contact.php:242 -#: ../../include/conversation.php:793 +#: ../../include/conversation.php:814 msgid "Edit Contact" msgstr "Kontakt bearbeiten" #: ../../include/Contact.php:231 ../../include/Contact.php:242 -#: ../../include/conversation.php:794 +#: ../../include/conversation.php:815 msgid "Send PM" msgstr "Private Nachricht senden" @@ -9444,90 +9535,92 @@ 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:599 ../../object/Item.php:226 +#: ../../include/conversation.php:620 ../../object/Item.php:243 msgid "Categories:" msgstr "Kategorien" -#: ../../include/conversation.php:600 ../../object/Item.php:227 +#: ../../include/conversation.php:621 ../../object/Item.php:244 msgid "Filed under:" msgstr "Abgelegt unter:" -#: ../../include/conversation.php:685 +#: ../../include/conversation.php:706 msgid "remove" msgstr "löschen" -#: ../../include/conversation.php:689 +#: ../../include/conversation.php:710 msgid "Delete Selected Items" msgstr "Lösche die markierten Beiträge" -#: ../../include/conversation.php:788 +#: ../../include/conversation.php:809 msgid "Follow Thread" msgstr "Folge der Unterhaltung" -#: ../../include/conversation.php:857 +#: ../../include/conversation.php:878 #, php-format msgid "%s likes this." msgstr "%s mag das." -#: ../../include/conversation.php:857 +#: ../../include/conversation.php:878 #, php-format msgid "%s doesn't like this." msgstr "%s mag das nicht." -#: ../../include/conversation.php:861 -#, php-format -msgid "%2$d people like this." -msgstr "%2$d Leute mögen das." +#: ../../include/conversation.php:884 +msgid "like this" +msgstr "mag ich" -#: ../../include/conversation.php:863 -#, php-format -msgid "%2$d people don't like this." -msgstr "%2$d Leute mögen das nicht." +#: ../../include/conversation.php:888 +msgid "don't like this" +msgstr "mag ich nicht" -#: ../../include/conversation.php:869 +#: ../../include/conversation.php:895 +msgid "people" +msgstr "Leute" + +#: ../../include/conversation.php:905 msgid "and" msgstr "und" -#: ../../include/conversation.php:875 +#: ../../include/conversation.php:911 #, php-format msgid ", and %d other people" msgstr " und %d andere" -#: ../../include/conversation.php:877 +#: ../../include/conversation.php:913 #, php-format msgid "%s like this." msgstr "%s mögen das." -#: ../../include/conversation.php:877 +#: ../../include/conversation.php:913 #, php-format msgid "%s don't like this." msgstr "%s mögen das nicht." -#: ../../include/conversation.php:904 ../../include/conversation.php:922 +#: ../../include/conversation.php:940 ../../include/conversation.php:958 msgid "Visible to everybody" msgstr "Für jedermann sichtbar" -#: ../../include/conversation.php:906 ../../include/conversation.php:924 +#: ../../include/conversation.php:942 ../../include/conversation.php:960 msgid "Please enter a video link/URL:" msgstr "Bitte Link/URL zum Video einfügen:" -#: ../../include/conversation.php:907 ../../include/conversation.php:925 +#: ../../include/conversation.php:943 ../../include/conversation.php:961 msgid "Please enter an audio link/URL:" msgstr "Bitte Link/URL zum Audio einfügen:" -#: ../../include/conversation.php:908 ../../include/conversation.php:926 +#: ../../include/conversation.php:944 ../../include/conversation.php:962 msgid "Tag term:" msgstr "Tag:" -#: ../../include/conversation.php:910 ../../include/conversation.php:928 +#: ../../include/conversation.php:946 ../../include/conversation.php:964 msgid "Where are you right now?" msgstr "Wo hältst du dich jetzt gerade auf?" -#: ../../include/conversation.php:911 +#: ../../include/conversation.php:947 msgid "Delete item(s)?" msgstr "Einträge löschen?" -#: ../../include/conversation.php:990 +#: ../../include/conversation.php:1026 msgid "permissions" msgstr "Zugriffsrechte" @@ -9543,113 +9636,129 @@ msgstr "Diese Aktion überschreitet die Obergrenze deines Abonnements." msgid "This action is not available under your subscription plan." msgstr "Diese Aktion ist in deinem Abonnement nicht verfügbar." -#: ../../boot.php:620 +#: ../../boot.php:634 msgid "Delete this item?" msgstr "Diesen Beitrag löschen?" -#: ../../boot.php:623 +#: ../../boot.php:637 msgid "show fewer" msgstr "weniger anzeigen" -#: ../../boot.php:832 +#: ../../boot.php:847 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen." -#: ../../boot.php:834 +#: ../../boot.php:849 #, php-format msgid "Update Error at %s" msgstr "Updatefehler bei %s" -#: ../../boot.php:935 +#: ../../boot.php:950 msgid "Create a New Account" msgstr "Neues Konto erstellen" -#: ../../boot.php:964 +#: ../../boot.php:978 msgid "Nickname or Email address: " msgstr "Spitzname oder E-Mail-Adresse: " -#: ../../boot.php:965 +#: ../../boot.php:979 msgid "Password: " msgstr "Passwort: " -#: ../../boot.php:966 +#: ../../boot.php:980 msgid "Remember me" msgstr "Anmeldedaten merken" -#: ../../boot.php:969 +#: ../../boot.php:983 msgid "Or login using OpenID: " msgstr "Oder melde dich mit deiner OpenID an: " -#: ../../boot.php:975 +#: ../../boot.php:989 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: ../../boot.php:1100 +#: ../../boot.php:992 +msgid "Website Terms of Service" +msgstr "Website Nutzungsbedingungen" + +#: ../../boot.php:993 +msgid "terms of service" +msgstr "Nutzungsbedingungen" + +#: ../../boot.php:995 +msgid "Website Privacy Policy" +msgstr "Website Datenschutzerklärung" + +#: ../../boot.php:996 +msgid "privacy policy" +msgstr "Datenschutzerklärung" + +#: ../../boot.php:1121 msgid "Requested account is not available." msgstr "Das angefragte Profil ist nicht vorhanden." -#: ../../boot.php:1177 +#: ../../boot.php:1198 msgid "Edit profile" msgstr "Profil bearbeiten" -#: ../../boot.php:1243 +#: ../../boot.php:1264 msgid "Message" msgstr "Nachricht" -#: ../../boot.php:1251 +#: ../../boot.php:1272 msgid "Manage/edit profiles" msgstr "Profile verwalten/editieren" -#: ../../boot.php:1365 ../../boot.php:1451 +#: ../../boot.php:1395 ../../boot.php:1481 msgid "g A l F d" msgstr "l, d. F G \\U\\h\\r" -#: ../../boot.php:1366 ../../boot.php:1452 +#: ../../boot.php:1396 ../../boot.php:1482 msgid "F d" msgstr "d. F" -#: ../../boot.php:1411 ../../boot.php:1492 +#: ../../boot.php:1441 ../../boot.php:1522 msgid "[today]" msgstr "[heute]" -#: ../../boot.php:1423 +#: ../../boot.php:1453 msgid "Birthday Reminders" msgstr "Geburtstagserinnerungen" -#: ../../boot.php:1424 +#: ../../boot.php:1454 msgid "Birthdays this week:" msgstr "Geburtstage diese Woche:" -#: ../../boot.php:1485 +#: ../../boot.php:1515 msgid "[No description]" msgstr "[keine Beschreibung]" -#: ../../boot.php:1503 +#: ../../boot.php:1533 msgid "Event Reminders" msgstr "Veranstaltungserinnerungen" -#: ../../boot.php:1504 +#: ../../boot.php:1534 msgid "Events this week:" msgstr "Veranstaltungen diese Woche" -#: ../../boot.php:1740 +#: ../../boot.php:1770 msgid "Status Messages and Posts" msgstr "Statusnachrichten und Beiträge" -#: ../../boot.php:1747 +#: ../../boot.php:1777 msgid "Profile Details" msgstr "Profildetails" -#: ../../boot.php:1764 +#: ../../boot.php:1794 msgid "Events and Calendar" msgstr "Ereignisse und Kalender" -#: ../../boot.php:1771 +#: ../../boot.php:1801 msgid "Only You Can See This" msgstr "Nur du kannst das sehen" -#: ../../object/Item.php:238 +#: ../../object/Item.php:255 msgid "via" msgstr "via" diff --git a/view/de/request_notify_eml.tpl b/view/de/request_notify_eml.tpl index 057044e8c..16a4f7abe 100644 --- a/view/de/request_notify_eml.tpl +++ b/view/de/request_notify_eml.tpl @@ -7,7 +7,7 @@ erhalten. Du kannst sein/ihr Profil unter $[url] finden. -Bitte melde dich an um die komplette Vorstellung einzusehen +Bitte melde dich an um die komplette Anfrage einzusehen und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen. $[siteurl] diff --git a/view/de/strings.php b/view/de/strings.php index ae06508fe..22b23f79b 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -257,6 +257,11 @@ $a->strings["This is most often a permission setting, as the web server may not $a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Nachdem du alles ausgefüllt hast, erhältst du einen Text, den du in eine Datei namens .htconfig.php in deinem Friendica-Wurzelverzeichnis kopieren musst."; $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest du in der Datei INSTALL.txt."; $a->strings[".htconfig.php is writable"] = "Schreibrechte auf .htconfig.php"; +$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen."; +$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica."; +$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat."; +$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: aus Sicherheitsgründen solltest du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten."; +$a->strings["view/smarty3 is writable"] = "view/smarty3 ist schreibbar"; $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers."; $a->strings["Url rewrite is working"] = "URL rewrite funktioniert"; $a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis deiner Friendica-Installation zu erzeugen."; @@ -610,7 +615,9 @@ $a->strings["Save"] = "Speichern"; $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."; $a->strings["Import"] = "Import"; $a->strings["Move account"] = "Account umziehen"; -$a->strings["You can import an account from another Friendica server.
\r\n You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.
\r\n This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"] = "Du kannst deinen Account auf einen anderen Friendica Server umziehen.
Dazu musst du deinen Account von deinem alten Server exportieren und hier hochladen. Wir werden dann deinen alten Account, mit allen Kontakten, hier wieder herstellen. Außerdem werden wir deine Kontakte darüber informieren, dass du hierher umgezogen bist.
Dieses Feature ist experimentell. Kontakte aus dem OStatus Netzwerk (StatusNet/identi.ca) oder von Diaspora können nicht mit umgezogen werden."; +$a->strings["You can import an account from another Friendica server."] = "Du kannst einen Account von einem anderen Friendica Server importieren."; +$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Du musst deinen Account vom alten Server exportieren und hier hochladen. Wir stellen deinen alten Account mit all deinen Kontakten wieder her. Wir werden auch versuchen all deine Freunde darüber zu informieren, dass du hierher umgezogen bist."; +$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (statusnet/identi.ca) oder von Diaspora importieren"; $a->strings["Account file"] = "Account Datei"; $a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "Um deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\""; $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."; @@ -794,6 +801,7 @@ $a->strings["Self-signed certificate, use SSL for local links only (discouraged) $a->strings["File upload"] = "Datei hochladen"; $a->strings["Policies"] = "Regeln"; $a->strings["Advanced"] = "Erweitert"; +$a->strings["Performance"] = "Performance"; $a->strings["Site name"] = "Seitenname"; $a->strings["Banner/Logo"] = "Banner/Logo"; $a->strings["System language"] = "Systemsprache"; @@ -803,6 +811,8 @@ $a->strings["Mobile system theme"] = "Systemweites mobiles Thema"; $a->strings["Theme for mobile devices"] = "Thema für mobile Geräte"; $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["'Share' element"] = "'Teilen' Element"; +$a->strings["Activates the bbcode element 'share' for repeating items."] = "Aktiviert das bbcode Element 'Teilen' um Einträge zu wiederholen."; $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["Maximum image length"] = "Maximale Länge von Bildern"; @@ -858,6 +868,14 @@ $a->strings["Poll interval"] = "Abfrageintervall"; $a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Verzögere Hintergrundprozesse, um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet."; $a->strings["Maximum Load Average"] = "Maximum Load Average"; $a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50"; +$a->strings["Use MySQL full text engine"] = "Nutze MySQL full text engine"; +$a->strings["Activates the full text engine. Speeds up search - but can only search for four and more characters."] = "Aktiviert die 'full text engine'. Beschleunigt die Suche - aber es kann nur nach vier oder mehr Zeichen gesucht werden."; +$a->strings["Path to item cache"] = "Pfad zum Eintrag Cache"; +$a->strings["Cache duration in seconds"] = "Cache-Dauer in Sekunden"; +$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day)."] = "Wie lange sollen die Dateien im Cache vorgehalten werden? Standardwert ist 86400 Sekunden (ein Tag)."; +$a->strings["Path for lock file"] = "Pfad für die Sperrdatei"; +$a->strings["Temp path"] = "Temp Pfad"; +$a->strings["Base path to installation"] = "Basis-Pfad zur Installation"; $a->strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert"; $a->strings["Executing %s failed. Check system logs."] = "Ausführung von %s schlug fehl. Systemprotokolle prüfen."; $a->strings["Update %s was successfully applied."] = "Update %s war erfolgreich."; @@ -1148,6 +1166,7 @@ $a->strings["Remove Facebook Post connector"] = "Facebook-Connector entfernen"; $a->strings["Suppress \"View on friendica\""] = "Unterdrücke \"Auf Friendica Ansehen\""; $a->strings["Post to page/group:"] = "Auf FB Seite/Gruppe veröffentlichen"; $a->strings["Facebook Post Settings"] = "Facebook-Beitragseinstellungen"; +$a->strings["%s:"] = "%s:"; $a->strings["%d person likes this"] = array( 0 => "%d Person mag das", 1 => "%d Leute mögen das", @@ -1905,9 +1924,8 @@ $a->strings["seconds"] = "Sekunden"; $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s her"; $a->strings["%s's birthday"] = "%ss Geburtstag"; $a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s"; -$a->strings["From: "] = "Von: "; $a->strings["Image/photo"] = "Bild/Foto"; -$a->strings["%s wrote the following post:"] = "%s schrieb den folgenden Beitrag:"; +$a->strings["%s wrote the following post:"] = "%s schrieb den folgenden Eintrag:"; $a->strings["$1 wrote:"] = "$1 hat geschrieben:"; $a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; $a->strings["General Features"] = "Allgemeine Features"; @@ -2041,8 +2059,9 @@ $a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge"; $a->strings["Follow Thread"] = "Folge der Unterhaltung"; $a->strings["%s likes this."] = "%s mag das."; $a->strings["%s doesn't like this."] = "%s mag das nicht."; -$a->strings["%2\$d people like this."] = "%2\$d Leute mögen das."; -$a->strings["%2\$d people don't like this."] = "%2\$d Leute mögen das nicht."; +$a->strings["like this"] = "mag ich"; +$a->strings["don't like this"] = "mag ich nicht"; +$a->strings["people"] = "Leute"; $a->strings["and"] = "und"; $a->strings[", and %d other people"] = " und %d andere"; $a->strings["%s like this."] = "%s mögen das."; @@ -2067,6 +2086,10 @@ $a->strings["Password: "] = "Passwort: "; $a->strings["Remember me"] = "Anmeldedaten merken"; $a->strings["Or login using OpenID: "] = "Oder melde dich mit deiner OpenID an: "; $a->strings["Forgot your password?"] = "Passwort vergessen?"; +$a->strings["Website Terms of Service"] = "Website Nutzungsbedingungen"; +$a->strings["terms of service"] = "Nutzungsbedingungen"; +$a->strings["Website Privacy Policy"] = "Website Datenschutzerklärung"; +$a->strings["privacy policy"] = "Datenschutzerklärung"; $a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden."; $a->strings["Edit profile"] = "Profil bearbeiten"; $a->strings["Message"] = "Nachricht"; From 5bfd4cf5c4aec5ea36b5ce386c271a5a6ef78aca Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Tue, 1 Jan 2013 22:40:05 +0100 Subject: [PATCH 08/59] Move HTML part of oid to template + replace outside the tpl --- mod/register.php | 3 +-- view/register.tpl | 4 +++- view/smarty3/register.tpl | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mod/register.php b/mod/register.php index 1712ee84f..df46eca43 100644 --- a/mod/register.php +++ b/mod/register.php @@ -253,7 +253,6 @@ function register_content(&$a) { $o = replace_macros($o, array( '$oidhtml' => $oidhtml, - '$oidhtml_old' => $oidhtml_old, '$invitations' => get_config('system','invitation_only'), '$invite_desc' => t('Membership on this site is by invitation only.'), '$invite_label' => t('Your invitation ID: '), @@ -269,7 +268,7 @@ function register_content(&$a) { '$openid' => $openid_url, '$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '), '$addrlabel' => t('Your Email Address: '), - '$nickdesc' => t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.'), + '$nickdesc' => str_replace('$sitename',$a->get_hostname(),t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.')), '$nicklabel' => t('Choose a nickname: '), '$photo' => $photo, '$publish' => $profile_publish, diff --git a/view/register.tpl b/view/register.tpl index ed96f969b..2275356a2 100644 --- a/view/register.tpl +++ b/view/register.tpl @@ -11,10 +11,12 @@

$fillwith

$fillext

+{{ if $oidlabel }}
- $oidhtml_old +
+{{ endif }} {{ if $invitations }} diff --git a/view/smarty3/register.tpl b/view/smarty3/register.tpl index 899a9a25a..6e20bea39 100644 --- a/view/smarty3/register.tpl +++ b/view/smarty3/register.tpl @@ -11,10 +11,12 @@

{{$fillwith}}

{{$fillext}}

+{{if $oidlabel }}
- {{$oidhtml|sprintf:$oidlabel:$openid}} +
+{{/if}} {{if $invitations}} From 4ab7820663bf8780a9ea96eaf5268fa9b3549916 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Tue, 1 Jan 2013 22:44:02 +0100 Subject: [PATCH 09/59] . --- mod/register.php | 1 - 1 file changed, 1 deletion(-) diff --git a/mod/register.php b/mod/register.php index df46eca43..bfb27a7b8 100644 --- a/mod/register.php +++ b/mod/register.php @@ -240,7 +240,6 @@ function register_content(&$a) { )); } - $license = ''; $o = get_markup_template("register.tpl"); From 457a3b5220104184f9dc877d44a978f4b110a41e Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Tue, 1 Jan 2013 23:41:26 +0100 Subject: [PATCH 10/59] Change templates remove var modifiers --- view/smarty3/register.tpl | 2 +- view/theme/frost-mobile/register.tpl | 6 ++++-- view/theme/frost-mobile/smarty3/register.tpl | 8 +++++--- view/theme/frost/register.tpl | 6 ++++-- view/theme/frost/smarty3/register.tpl | 8 +++++--- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/view/smarty3/register.tpl b/view/smarty3/register.tpl index 6e20bea39..768ca9387 100644 --- a/view/smarty3/register.tpl +++ b/view/smarty3/register.tpl @@ -43,7 +43,7 @@
-

{{$nickdesc|replace:'$sitename':$sitename}}

+

{{$nickdesc}}

diff --git a/view/theme/frost-mobile/register.tpl b/view/theme/frost-mobile/register.tpl index 9844049b1..041be5e96 100644 --- a/view/theme/frost-mobile/register.tpl +++ b/view/theme/frost-mobile/register.tpl @@ -11,10 +11,12 @@

$realpeople


-
- $oidhtml_old +{{ if $oidlabel }} +
+
+{{ endif }}

$fillwith $fillext

diff --git a/view/theme/frost-mobile/smarty3/register.tpl b/view/theme/frost-mobile/smarty3/register.tpl index f73cd258b..bc0ce4cc9 100644 --- a/view/theme/frost-mobile/smarty3/register.tpl +++ b/view/theme/frost-mobile/smarty3/register.tpl @@ -11,10 +11,12 @@

{{$realpeople}}


-
- {{$oidhtml|sprintf:$oidlabel:$openid}} +{{if $oidlabel }} +
+
+{{/if}}

{{$fillwith}} {{$fillext}}

@@ -54,7 +56,7 @@
-

{{$nickdesc|replace:'$sitename':$sitename}}

+

{{$nickdesc}}

{{$publish}} diff --git a/view/theme/frost/register.tpl b/view/theme/frost/register.tpl index 7df552e3f..15ce5040e 100644 --- a/view/theme/frost/register.tpl +++ b/view/theme/frost/register.tpl @@ -11,10 +11,12 @@

$realpeople


-
- $oidhtml_old +{{ if $oidlabel }} +
+
+{{ endif }}

$fillwith $fillext

diff --git a/view/theme/frost/smarty3/register.tpl b/view/theme/frost/smarty3/register.tpl index 198223918..72b628f39 100644 --- a/view/theme/frost/smarty3/register.tpl +++ b/view/theme/frost/smarty3/register.tpl @@ -11,10 +11,12 @@

{{$realpeople}}


-
- {{$oidhtml|sprintf:$oidlabel:$openid}} +{{if $oidlabel }} +
+
+{{/if}}

{{$fillwith}} {{$fillext}}

@@ -55,7 +57,7 @@
-

{{$nickdesc|replace:'$sitename':$sitename}}

+

{{$nickdesc}}

{{$publish}} From d9961bc3b41c47919efb73b1bf40ec648d06a5b1 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Tue, 1 Jan 2013 23:47:56 +0100 Subject: [PATCH 11/59] revert one change --- mod/register.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mod/register.php b/mod/register.php index bfb27a7b8..f4c657087 100644 --- a/mod/register.php +++ b/mod/register.php @@ -214,8 +214,7 @@ function register_content(&$a) { $oidlabel = ''; } else { - $oidhtml = ''; - $oidhtml_old = ''; + $oidhtml = ''; $fillwith = t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."); $fillext = t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'); $oidlabel = t("Your OpenID \x28optional\x29: "); From 66b1448cdb1160b9b16dee1b19d49f2c3662e0f1 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 Jan 2013 17:32:46 -0800 Subject: [PATCH 12/59] rev update --- boot.php | 2 +- util/messages.po | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 864cdedd3..9fd9b2c64 100644 --- a/boot.php +++ b/boot.php @@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.1.1574' ); +define ( 'FRIENDICA_VERSION', '3.1.1575' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1157 ); diff --git a/util/messages.po b/util/messages.po index 73bd51ec6..9fc1745f5 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.1.1574\n" +"Project-Id-Version: 3.1.1575\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-31 10:00-0800\n" +"POT-Creation-Date: 2013-01-01 10:00-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From e56c04157909c11905ec9eb85d36f72a2c59c807 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 2 Jan 2013 11:10:24 +0100 Subject: [PATCH 13/59] DE: update to the strings --- view/de/messages.po | 12 ++++++------ view/de/strings.php | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index 400dce439..a3624c4ab 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -16,16 +16,16 @@ # , 2012. # Oliver , 2012. # , 2012. -# , 2011-2012. +# , 2011-2013. # , 2011-2012. # , 2011. msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-12-31 10:00-0800\n" -"PO-Revision-Date: 2012-12-31 11:02+0000\n" -"Last-Translator: Sennewood \n" +"POT-Creation-Date: 2013-01-01 10:00-0800\n" +"PO-Revision-Date: 2013-01-02 10:07+0000\n" +"Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -9567,11 +9567,11 @@ msgstr "%s mag das nicht." #: ../../include/conversation.php:884 msgid "like this" -msgstr "mag ich" +msgstr "mögen dies" #: ../../include/conversation.php:888 msgid "don't like this" -msgstr "mag ich nicht" +msgstr "mögen dies nicht" #: ../../include/conversation.php:895 msgid "people" diff --git a/view/de/strings.php b/view/de/strings.php index 22b23f79b..cea444b16 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -2059,8 +2059,8 @@ $a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge"; $a->strings["Follow Thread"] = "Folge der Unterhaltung"; $a->strings["%s likes this."] = "%s mag das."; $a->strings["%s doesn't like this."] = "%s mag das nicht."; -$a->strings["like this"] = "mag ich"; -$a->strings["don't like this"] = "mag ich nicht"; +$a->strings["like this"] = "mögen dies"; +$a->strings["don't like this"] = "mögen dies nicht"; $a->strings["people"] = "Leute"; $a->strings["and"] = "und"; $a->strings[", and %d other people"] = " und %d andere"; From 2943550fe289c67cbb1fcb50afa79ac2460a929d Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Wed, 2 Jan 2013 14:28:13 +0100 Subject: [PATCH 14/59] No need to remove data-src attributes Better comment string also --- js/acl.js | 2 +- js/main.js | 3 +-- view/theme/frost-mobile/js/acl.js | 2 +- view/theme/frost-mobile/js/main.js | 3 +-- view/theme/frost/js/acl.js | 2 +- view/theme/frost/js/main.js | 3 +-- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/js/acl.js b/js/acl.js index 35342a5c1..abdab97da 100644 --- a/js/acl.js +++ b/js/acl.js @@ -254,7 +254,7 @@ ACL.prototype.populate = function(data){ that.list_content.append(html); }); $(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){ - // Add data-src attribute with src attribute for every image + // Add src attribute for images with a data-src attribute $(el).attr('src', $(el).data("src")); }); that.update_view(); diff --git a/js/main.js b/js/main.js index 5cdf2a080..f17d1eaa0 100644 --- a/js/main.js +++ b/js/main.js @@ -183,9 +183,8 @@ }); $("img[data-src]", nnm).each(function(i, el){ - // Replace data-src attribute with src attribute for every image + // Add src attribute for images with a data-src attribute $(el).attr('src', $(el).data("src")); - $(el).removeAttr("data-src"); }); } diff --git a/view/theme/frost-mobile/js/acl.js b/view/theme/frost-mobile/js/acl.js index c22991dd6..4e319577f 100644 --- a/view/theme/frost-mobile/js/acl.js +++ b/view/theme/frost-mobile/js/acl.js @@ -254,7 +254,7 @@ ACL.prototype.populate = function(data){ that.list_content.append(html); }); $(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){ - // Add data-src attribute with src attribute for every image + // Add src attribute for images with a data-src attribute $(el).attr('src', $(el).data("src")); }); that.update_view(); diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js index 197d49664..5a15b081b 100644 --- a/view/theme/frost-mobile/js/main.js +++ b/view/theme/frost-mobile/js/main.js @@ -189,9 +189,8 @@ }); $("img[data-src]", nnm).each(function(i, el){ - // Replace data-src attribute with src attribute for every image + // Add src attribute for images with a data-src attribute $(el).attr('src', $(el).data("src")); - $(el).removeAttr("data-src"); }); } notif = eNotif.attr('count'); diff --git a/view/theme/frost/js/acl.js b/view/theme/frost/js/acl.js index 95067f174..1c843d7fe 100644 --- a/view/theme/frost/js/acl.js +++ b/view/theme/frost/js/acl.js @@ -254,7 +254,7 @@ ACL.prototype.populate = function(data){ that.list_content.append(html); }); $(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){ - // Add data-src attribute with src attribute for every image + // Add src attribute for images with a data-src attribute $(el).attr('src', $(el).data("src")); }); that.update_view(); diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js index 91e79ffc3..e47ecff37 100644 --- a/view/theme/frost/js/main.js +++ b/view/theme/frost/js/main.js @@ -181,9 +181,8 @@ }); $("img[data-src]", nnm).each(function(i, el){ - // Replace data-src attribute with src attribute for every image + // Add src attribute for images with a data-src attribute $(el).attr('src', $(el).data("src")); - $(el).removeAttr("data-src"); }); } notif = eNotif.attr('count'); From e394ccd0a8f3b67889daa6da9e5dbca7ba754990 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 3 Jan 2013 03:47:08 -0800 Subject: [PATCH 15/59] If we're going to encode the email headers, we probably should use the encoded version rather than the original --- boot.php | 2 +- include/enotify.php | 6 +++--- include/socgraph.php | 1 + util/messages.po | 20 ++++++++++---------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/boot.php b/boot.php index 9fd9b2c64..5d71a4d44 100644 --- a/boot.php +++ b/boot.php @@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.1.1575' ); +define ( 'FRIENDICA_VERSION', '3.1.1576' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1157 ); diff --git a/include/enotify.php b/include/enotify.php index ba947a9bf..9c405c101 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -471,8 +471,8 @@ class enotify { // generate a multipart/alternative message header $messageHeader = $params['additionalMailHeader'] . - "From: {$params['fromName']} <{$params['fromEmail']}>\n" . - "Reply-To: {$params['fromName']} <{$params['replyTo']}>\n" . + "From: $fromName <{$params['fromEmail']}>\n" . + "Reply-To: $fromName <{$params['replyTo']}>\n" . "MIME-Version: 1.0\n" . "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\""; @@ -493,7 +493,7 @@ class enotify { // send the message $res = mail( $params['toEmail'], // send to address - $params['messageSubject'], // subject + $messageSubject, // subject $multipartMessageBody, // message body $messageHeader // message headers ); diff --git a/include/socgraph.php b/include/socgraph.php index 4fe9eaf90..4d24bff28 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -1,6 +1,7 @@ \n" "Language-Team: LANGUAGE \n" @@ -3240,38 +3240,38 @@ msgstr "" msgid "Include your profile in member directory?" msgstr "" -#: ../../mod/register.php:256 +#: ../../mod/register.php:255 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/register.php:257 +#: ../../mod/register.php:256 msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:260 ../../mod/admin.php:462 +#: ../../mod/register.php:259 ../../mod/admin.php:462 msgid "Registration" msgstr "" -#: ../../mod/register.php:268 +#: ../../mod/register.php:267 msgid "Your Full Name (e.g. Joe Smith): " msgstr "" -#: ../../mod/register.php:269 +#: ../../mod/register.php:268 msgid "Your Email Address: " msgstr "" -#: ../../mod/register.php:270 +#: ../../mod/register.php:269 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be 'nickname@$sitename'." msgstr "" -#: ../../mod/register.php:271 +#: ../../mod/register.php:270 msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:951 +#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:951 msgid "Register" msgstr "" From fdd142c42ef097912e8fad1dc200ea091d769c1e Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Thu, 3 Jan 2013 10:47:45 -0700 Subject: [PATCH 16/59] never use profile_load outside of a module's _init() function --- boot.php | 6 + mod/display.php | 12 +- mod/profile.php | 1 - mod/profiles.php | 263 +++++++++++++++++-------------- view/theme/cleanzero/theme.php | 3 +- view/theme/comix-plain/theme.php | 3 + view/theme/comix/theme.php | 3 + view/theme/darkbubble/theme.php | 2 + view/theme/darkzero-NS/theme.php | 4 +- view/theme/darkzero/theme.php | 2 +- view/theme/diabook/theme.php | 5 +- view/theme/dispy/dark/theme.php | 13 +- view/theme/dispy/light/theme.php | 13 +- view/theme/dispy/theme.php | 13 +- view/theme/easterbunny/theme.php | 3 + view/theme/facepark/theme.php | 4 + view/theme/greenzero/theme.php | 3 +- view/theme/purplezero/theme.php | 3 +- view/theme/quattro/theme.php | 2 +- view/theme/slack-NS/theme.php | 5 +- view/theme/slackr/theme.php | 3 +- view/theme/smoothly/theme.php | 7 +- view/theme/testbubble/theme.php | 3 + view/theme/vier/theme.php | 2 +- 24 files changed, 214 insertions(+), 164 deletions(-) diff --git a/boot.php b/boot.php index 864cdedd3..b19f0aa96 100644 --- a/boot.php +++ b/boot.php @@ -1107,6 +1107,10 @@ if(! function_exists('get_max_import_size')) { * Profile information is placed in the App structure for later retrieval. * Honours the owner's chosen theme for display. * + * IMPORTANT: Should only be run in the _init() functions of a module. That ensures that + * the theme is chosen before the _init() function of a theme is run, which will usually + * load a lot of theme-specific content + * */ if(! function_exists('profile_load')) { @@ -1185,6 +1189,8 @@ if(! function_exists('profile_load')) { * load/reload current theme info */ + set_template_engine($a); // reset the template engine to the default in case the user's theme doesn't specify one + $theme_info_file = "view/theme/".current_theme()."/theme.php"; if (file_exists($theme_info_file)){ require_once($theme_info_file); diff --git a/mod/display.php b/mod/display.php index 32c4bcae9..2e0b8216a 100644 --- a/mod/display.php +++ b/mod/display.php @@ -1,13 +1,22 @@ argc > 1) ? $a->argv[1] : ''); + profile_load($a,$nick); + +} + + +function display_content(&$a, $update = 0) { + require_once("include/bbcode.php"); require_once('include/security.php'); require_once('include/conversation.php'); @@ -25,7 +34,6 @@ function display_content(&$a, $update = 0) { else { $nick = (($a->argc > 1) ? $a->argv[1] : ''); } - profile_load($a,$nick); if($update) { $item_id = $_REQUEST['item_id']; diff --git a/mod/profile.php b/mod/profile.php index 9e9af1983..25871c240 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -33,7 +33,6 @@ function profile_init(&$a) { auto_redir($a, $which); } - set_template_engine($a); // reset the template engine to the default in case the user's theme doesn't specify one profile_load($a,$which,$profile); $blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false); diff --git a/mod/profiles.php b/mod/profiles.php index eaa603a28..1fc1f484a 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -1,6 +1,147 @@ argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) { + $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1", + intval($a->argv[2]), + intval(local_user()) + ); + if(! count($r)) { + notice( t('Profile not found.') . EOL); + goaway($a->get_baseurl(true) . '/profiles'); + return; // NOTREACHED + } + + check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't'); + + // move every contact using this profile as their default to the user default + + $r = q("UPDATE `contact` SET `profile-id` = (SELECT `profile`.`id` AS `profile-id` FROM `profile` WHERE `profile`.`is-default` = 1 AND `profile`.`uid` = %d LIMIT 1) WHERE `profile-id` = %d AND `uid` = %d ", + intval(local_user()), + intval($a->argv[2]), + intval(local_user()) + ); + $r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1", + intval($a->argv[2]), + intval(local_user()) + ); + if($r) + info( t('Profile deleted.') . EOL); + + goaway($a->get_baseurl(true) . '/profiles'); + return; // NOTREACHED + } + + + + + + if(($a->argc > 1) && ($a->argv[1] === 'new')) { + + check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't'); + + $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d", + intval(local_user())); + $num_profiles = count($r0); + + $name = t('Profile-') . ($num_profiles + 1); + + $r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", + intval(local_user())); + + $r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`) + VALUES ( %d, '%s', '%s', '%s', '%s' )", + intval(local_user()), + dbesc($name), + dbesc($r1[0]['name']), + dbesc($r1[0]['photo']), + dbesc($r1[0]['thumb']) + ); + + $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1", + intval(local_user()), + dbesc($name) + ); + + info( t('New profile created.') . EOL); + if(count($r3) == 1) + goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']); + + goaway($a->get_baseurl(true) . '/profiles'); + } + + if(($a->argc > 2) && ($a->argv[1] === 'clone')) { + + check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't'); + + $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d", + intval(local_user())); + $num_profiles = count($r0); + + $name = t('Profile-') . ($num_profiles + 1); + $r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1", + intval(local_user()), + intval($a->argv[2]) + ); + if(! count($r1)) { + notice( t('Profile unavailable to clone.') . EOL); + killme(); + return; + } + unset($r1[0]['id']); + $r1[0]['is-default'] = 0; + $r1[0]['publish'] = 0; + $r1[0]['net-publish'] = 0; + $r1[0]['profile-name'] = dbesc($name); + + dbesc_array($r1[0]); + + $r2 = dbq("INSERT INTO `profile` (`" + . implode("`, `", array_keys($r1[0])) + . "`) VALUES ('" + . implode("', '", array_values($r1[0])) + . "')" ); + + $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1", + intval(local_user()), + dbesc($name) + ); + info( t('New profile created.') . EOL); + if(count($r3) == 1) + goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']); + + goaway($a->get_baseurl(true) . '/profiles'); + + return; // NOTREACHED + } + + + if(($a->argc > 1) && (intval($a->argv[1]))) { + $r = q("SELECT id FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1", + intval($a->argv[1]), + intval(local_user()) + ); + if(! count($r)) { + notice( t('Profile not found.') . EOL); + killme(); + return; + } + + profile_load($a,$a->user['nickname'],$r[0]['id']); + } + +} + function profiles_post(&$a) { if(! local_user()) { @@ -425,126 +566,6 @@ function profile_activity($changed, $value) { function profiles_content(&$a) { $o = ''; - nav_set_selected('profiles'); - - if(! local_user()) { - notice( t('Permission denied.') . EOL); - return; - } - - if(($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) { - $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1", - intval($a->argv[2]), - intval(local_user()) - ); - if(! count($r)) { - notice( t('Profile not found.') . EOL); - goaway($a->get_baseurl(true) . '/profiles'); - return; // NOTREACHED - } - - check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't'); - - // move every contact using this profile as their default to the user default - - $r = q("UPDATE `contact` SET `profile-id` = (SELECT `profile`.`id` AS `profile-id` FROM `profile` WHERE `profile`.`is-default` = 1 AND `profile`.`uid` = %d LIMIT 1) WHERE `profile-id` = %d AND `uid` = %d ", - intval(local_user()), - intval($a->argv[2]), - intval(local_user()) - ); - $r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($a->argv[2]), - intval(local_user()) - ); - if($r) - info( t('Profile deleted.') . EOL); - - goaway($a->get_baseurl(true) . '/profiles'); - return; // NOTREACHED - } - - - - - - if(($a->argc > 1) && ($a->argv[1] === 'new')) { - - check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't'); - - $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d", - intval(local_user())); - $num_profiles = count($r0); - - $name = t('Profile-') . ($num_profiles + 1); - - $r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", - intval(local_user())); - - $r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`) - VALUES ( %d, '%s', '%s', '%s', '%s' )", - intval(local_user()), - dbesc($name), - dbesc($r1[0]['name']), - dbesc($r1[0]['photo']), - dbesc($r1[0]['thumb']) - ); - - $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1", - intval(local_user()), - dbesc($name) - ); - - info( t('New profile created.') . EOL); - if(count($r3) == 1) - goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']); - - goaway($a->get_baseurl(true) . '/profiles'); - } - - if(($a->argc > 2) && ($a->argv[1] === 'clone')) { - - check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't'); - - $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d", - intval(local_user())); - $num_profiles = count($r0); - - $name = t('Profile-') . ($num_profiles + 1); - $r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1", - intval(local_user()), - intval($a->argv[2]) - ); - if(! count($r1)) { - notice( t('Profile unavailable to clone.') . EOL); - return; - } - unset($r1[0]['id']); - $r1[0]['is-default'] = 0; - $r1[0]['publish'] = 0; - $r1[0]['net-publish'] = 0; - $r1[0]['profile-name'] = dbesc($name); - - dbesc_array($r1[0]); - - $r2 = dbq("INSERT INTO `profile` (`" - . implode("`, `", array_keys($r1[0])) - . "`) VALUES ('" - . implode("', '", array_values($r1[0])) - . "')" ); - - $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1", - intval(local_user()), - dbesc($name) - ); - info( t('New profile created.') . EOL); - if(count($r3) == 1) - goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']); - - goaway($a->get_baseurl(true) . '/profiles'); - - return; // NOTREACHED - } - if(($a->argc > 1) && (intval($a->argv[1]))) { $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -556,8 +577,6 @@ function profiles_content(&$a) { return; } - profile_load($a,$a->user['nickname'],$r[0]['id']); - require_once('include/profile_selectors.php'); diff --git a/view/theme/cleanzero/theme.php b/view/theme/cleanzero/theme.php index 356a1b71c..37ba15ce0 100644 --- a/view/theme/cleanzero/theme.php +++ b/view/theme/cleanzero/theme.php @@ -5,12 +5,13 @@ * Version: * Author: Christian Vogeley (https://christian-vogeley.de/profile/christian) */ + +function cleanzero_init(&$a) { $a->theme_info = array( 'extends' => 'duepuntozero', ); set_template_engine($a, 'smarty3'); -function cleanzero_init(&$a) { $a->page['htmlhead'] .= <<< EOT EOT; +} + diff --git a/view/theme/comix/theme.php b/view/theme/comix/theme.php index ce28ebf18..da195f267 100644 --- a/view/theme/comix/theme.php +++ b/view/theme/comix/theme.php @@ -8,6 +8,7 @@ */ +function comix_init(&$a) { $a->theme_info = array( 'extends' => 'duepuntozero', ); @@ -59,3 +60,5 @@ $('.savedsearchterm').hover( EOT; +} + diff --git a/view/theme/darkbubble/theme.php b/view/theme/darkbubble/theme.php index ecd14da77..475d4e63c 100644 --- a/view/theme/darkbubble/theme.php +++ b/view/theme/darkbubble/theme.php @@ -7,6 +7,7 @@ */ +function darkbubble_init(&$a) { $a->theme_info = array( 'extends' => 'testbubble', ); @@ -21,3 +22,4 @@ $('html').click(function() { $("#nav-notifications-menu" ).hide(); }); }); EOT; +} diff --git a/view/theme/darkzero-NS/theme.php b/view/theme/darkzero-NS/theme.php index 211c552c5..ee227109b 100644 --- a/view/theme/darkzero-NS/theme.php +++ b/view/theme/darkzero-NS/theme.php @@ -7,11 +7,11 @@ * Author: Mike Macgirvin */ +function darkzero_NS_init(&$a) { $a->theme_info = array( 'extends' => 'duepuntozero', ); -function darkzero_NS_init(&$a) { $a->page['htmlhead'] .= <<< EOT EOT; -} \ No newline at end of file +} diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php index ceafdf595..1fe4bf859 100644 --- a/view/theme/darkzero/theme.php +++ b/view/theme/darkzero/theme.php @@ -8,12 +8,12 @@ * Maintainer: Mike Macgirvin */ +function darkzero_init(&$a) { $a->theme_info = array( 'extends' => 'duepuntozero', ); set_template_engine($a, 'smarty3'); -function darkzero_init(&$a) { $a->page['htmlhead'] .= <<< EOT EOT; +} + diff --git a/view/theme/greenzero/theme.php b/view/theme/greenzero/theme.php index 09a63c040..9a3dd1d3e 100644 --- a/view/theme/greenzero/theme.php +++ b/view/theme/greenzero/theme.php @@ -1,10 +1,11 @@ theme_info = array( 'extends' => 'duepuntozero', ); set_template_engine($a, 'smarty3'); -function greenzero_init(&$a) { $a->page['htmlhead'] .= <<< EOT EOT; -} \ No newline at end of file +} diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php index bc0929979..43deb4b8c 100644 --- a/view/theme/slackr/theme.php +++ b/view/theme/slackr/theme.php @@ -1,10 +1,11 @@ theme_info = array( 'extends' => 'duepuntozero', ); set_template_engine($a, 'smarty3'); -function slackr_init(&$a) { $a->page['htmlhead'] .= <<< EOT EOT; +} diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index 7c0f3d3f8..7da0731f7 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -8,11 +8,11 @@ * Description: "Vier" uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/ */ +function vier_init(&$a) { set_template_engine($a, 'smarty3'); $a->theme_info = array(); -function vier_init(&$a) { $a->page['htmlhead'] .= <<< EOT +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} diff --git a/view/smarty3/delegate.tpl b/view/smarty3/delegate.tpl index cbaa8da86..a6b365f54 100644 --- a/view/smarty3/delegate.tpl +++ b/view/smarty3/delegate.tpl @@ -1,4 +1,8 @@ -

{{$header}}

+{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}}

{{$header}}

{{$desc}}
diff --git a/view/smarty3/dfrn_req_confirm.tpl b/view/smarty3/dfrn_req_confirm.tpl index 655af22d4..195f55d78 100644 --- a/view/smarty3/dfrn_req_confirm.tpl +++ b/view/smarty3/dfrn_req_confirm.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}}

{{$welcome}}
diff --git a/view/smarty3/dfrn_request.tpl b/view/smarty3/dfrn_request.tpl index aa5cbd6e4..b268698df 100644 --- a/view/smarty3/dfrn_request.tpl +++ b/view/smarty3/dfrn_request.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}}

{{$header}}

diff --git a/view/smarty3/diasp_dec_hdr.tpl b/view/smarty3/diasp_dec_hdr.tpl index 636ff7bd0..2343bdc86 100644 --- a/view/smarty3/diasp_dec_hdr.tpl +++ b/view/smarty3/diasp_dec_hdr.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} {{$inner_iv}} {{$inner_key}} diff --git a/view/smarty3/diaspora_comment.tpl b/view/smarty3/diaspora_comment.tpl index 27ec3dffc..533703ba1 100644 --- a/view/smarty3/diaspora_comment.tpl +++ b/view/smarty3/diaspora_comment.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} {{$guid}} diff --git a/view/smarty3/diaspora_comment_relay.tpl b/view/smarty3/diaspora_comment_relay.tpl index 37a9e88b3..fd98e7210 100644 --- a/view/smarty3/diaspora_comment_relay.tpl +++ b/view/smarty3/diaspora_comment_relay.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} {{$guid}} diff --git a/view/smarty3/diaspora_conversation.tpl b/view/smarty3/diaspora_conversation.tpl index dc4482e4b..00e5373ea 100644 --- a/view/smarty3/diaspora_conversation.tpl +++ b/view/smarty3/diaspora_conversation.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} {{$conv.guid}} diff --git a/view/smarty3/diaspora_like.tpl b/view/smarty3/diaspora_like.tpl index b03aef37a..c0acfdd43 100644 --- a/view/smarty3/diaspora_like.tpl +++ b/view/smarty3/diaspora_like.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} {{$target_type}} diff --git a/view/smarty3/diaspora_like_relay.tpl b/view/smarty3/diaspora_like_relay.tpl index 30df4cac6..fc987e18d 100644 --- a/view/smarty3/diaspora_like_relay.tpl +++ b/view/smarty3/diaspora_like_relay.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} {{$guid}} diff --git a/view/smarty3/diaspora_message.tpl b/view/smarty3/diaspora_message.tpl index 3413d79b0..61d1ea4db 100644 --- a/view/smarty3/diaspora_message.tpl +++ b/view/smarty3/diaspora_message.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} {{$msg.guid}} diff --git a/view/smarty3/diaspora_photo.tpl b/view/smarty3/diaspora_photo.tpl index cd7ef5802..dfcb99fa8 100644 --- a/view/smarty3/diaspora_photo.tpl +++ b/view/smarty3/diaspora_photo.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} {{$path}} diff --git a/view/smarty3/diaspora_post.tpl b/view/smarty3/diaspora_post.tpl index abbcc4c61..fe2a80164 100644 --- a/view/smarty3/diaspora_post.tpl +++ b/view/smarty3/diaspora_post.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} {{$body}} diff --git a/view/smarty3/diaspora_profile.tpl b/view/smarty3/diaspora_profile.tpl index 04f2e2948..c6cd8d004 100644 --- a/view/smarty3/diaspora_profile.tpl +++ b/view/smarty3/diaspora_profile.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} {{$handle}} {{$first}} diff --git a/view/smarty3/diaspora_relay_retraction.tpl b/view/smarty3/diaspora_relay_retraction.tpl index 5e7aed41f..404c8a046 100644 --- a/view/smarty3/diaspora_relay_retraction.tpl +++ b/view/smarty3/diaspora_relay_retraction.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} {{$type}} diff --git a/view/smarty3/diaspora_relayable_retraction.tpl b/view/smarty3/diaspora_relayable_retraction.tpl index 927e394f3..54e137ae1 100644 --- a/view/smarty3/diaspora_relayable_retraction.tpl +++ b/view/smarty3/diaspora_relayable_retraction.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} {{$target_type}} diff --git a/view/smarty3/diaspora_retract.tpl b/view/smarty3/diaspora_retract.tpl index 26e2cb94e..b5115ffbf 100644 --- a/view/smarty3/diaspora_retract.tpl +++ b/view/smarty3/diaspora_retract.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} {{$guid}} diff --git a/view/smarty3/diaspora_share.tpl b/view/smarty3/diaspora_share.tpl index 59eb06124..16946ac79 100644 --- a/view/smarty3/diaspora_share.tpl +++ b/view/smarty3/diaspora_share.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} {{$sender}} diff --git a/view/smarty3/diaspora_signed_retract.tpl b/view/smarty3/diaspora_signed_retract.tpl index f0f346da8..bdeeafcc6 100644 --- a/view/smarty3/diaspora_signed_retract.tpl +++ b/view/smarty3/diaspora_signed_retract.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} {{$guid}} diff --git a/view/smarty3/diaspora_vcard.tpl b/view/smarty3/diaspora_vcard.tpl index 9d234a398..b94cc81b3 100644 --- a/view/smarty3/diaspora_vcard.tpl +++ b/view/smarty3/diaspora_vcard.tpl @@ -1,4 +1,8 @@ -

+{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}}
Nickname
diff --git a/view/smarty3/directory_header.tpl b/view/smarty3/directory_header.tpl index c2ca64682..91d547b42 100644 --- a/view/smarty3/directory_header.tpl +++ b/view/smarty3/directory_header.tpl @@ -1,4 +1,8 @@ -

{{$sitedir}}

+{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}}

{{$sitedir}}

{{$globaldir}} {{$admin}} diff --git a/view/smarty3/directory_item.tpl b/view/smarty3/directory_item.tpl index f4bd66d77..d9a4225f9 100644 --- a/view/smarty3/directory_item.tpl +++ b/view/smarty3/directory_item.tpl @@ -1,4 +1,8 @@ - +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}}
diff --git a/view/smarty3/display-head.tpl b/view/smarty3/display-head.tpl index 3d4e7e96a..aaa105fa8 100644 --- a/view/smarty3/display-head.tpl +++ b/view/smarty3/display-head.tpl @@ -1,4 +1,8 @@ - diff --git a/view/smarty3/events-js.tpl b/view/smarty3/events-js.tpl index c87d20529..f7f69d532 100644 --- a/view/smarty3/events-js.tpl +++ b/view/smarty3/events-js.tpl @@ -1,4 +1,8 @@ -{{$tabs}} +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}}{{$tabs}}

{{$title}}

diff --git a/view/smarty3/events.tpl b/view/smarty3/events.tpl index 50a8cf3a8..313092b68 100644 --- a/view/smarty3/events.tpl +++ b/view/smarty3/events.tpl @@ -1,4 +1,8 @@ -{{$tabs}} +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}}{{$tabs}}

{{$title}}

diff --git a/view/smarty3/events_reminder.tpl b/view/smarty3/events_reminder.tpl index bd070575f..cbc4bd340 100644 --- a/view/smarty3/events_reminder.tpl +++ b/view/smarty3/events_reminder.tpl @@ -1,4 +1,8 @@ -{{if $count}} +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}}{{if $count}}