aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xboot.php2
-rw-r--r--include/bbcode.php6
-rwxr-xr-xmod/message.php21
-rw-r--r--view/de/messages.po1201
-rwxr-xr-xview/de/strings.php82
-rwxr-xr-xview/prv_message.tpl2
-rwxr-xr-xview/theme/diabook-blue/icons/notifications.pngbin795 -> 727 bytes
-rw-r--r--view/theme/diabook-blue/style.css29
-rw-r--r--view/theme/diabook-blue/wall_item.tpl4
-rw-r--r--view/theme/diabook-blue/wallwall_item.tpl4
-rwxr-xr-xview/theme/diabook/icons/notifications.pngbin758 -> 714 bytes
-rw-r--r--view/theme/diabook/style.css15
-rwxr-xr-xview/theme/diabook/theme.php3
-rw-r--r--view/theme/diabook/wall_item.tpl4
-rw-r--r--view/theme/diabook/wallwall_item.tpl4
15 files changed, 883 insertions, 494 deletions
diff --git a/boot.php b/boot.php
index 45f728999..1414adb06 100755
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1276' );
+define ( 'FRIENDICA_VERSION', '2.3.1277' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1131 );
diff --git a/include/bbcode.php b/include/bbcode.php
index cff26f5c8..d69cb263f 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -216,6 +216,9 @@ function bbcode($Text,$preserve_nl = false) {
$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
+ $Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text);
+
+ $Text = preg_replace("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3))\[\/audio\]/ism", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text);
// Try to Oembed
$Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", 'tryoembed', $Text);
@@ -224,9 +227,6 @@ function bbcode($Text,$preserve_nl = false) {
// html5 video and audio
- $Text = preg_replace("/\[video\](.*?)\[\/video\]/ism", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text);
-
- $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/ism", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text);
$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text);
diff --git a/mod/message.php b/mod/message.php
index 91db5baef..57d45ee3c 100755
--- a/mod/message.php
+++ b/mod/message.php
@@ -10,17 +10,19 @@ function message_post(&$a) {
return;
}
- $replyto = ((x($_POST,'replyto')) ? notags(trim($_POST['replyto'])) : '');
- $subject = ((x($_POST,'subject')) ? notags(trim($_POST['subject'])) : '');
- $body = ((x($_POST,'body')) ? escape_tags(trim($_POST['body'])) : '');
- $recipient = ((x($_POST,'messageto')) ? intval($_POST['messageto']) : 0 );
+ $replyto = ((x($_REQUEST,'replyto')) ? notags(trim($_REQUEST['replyto'])) : '');
+ $subject = ((x($_REQUEST,'subject')) ? notags(trim($_REQUEST['subject'])) : '');
+ $body = ((x($_REQUEST,'body')) ? escape_tags(trim($_REQUEST['body'])) : '');
+ $recipient = ((x($_REQUEST,'messageto')) ? intval($_REQUEST['messageto']) : 0 );
$ret = send_message($recipient, $body, $subject, $replyto);
+ $norecip = false;
switch($ret){
case -1:
notice( t('No recipient selected.') . EOL );
+ $norecip = true;
break;
case -2:
notice( t('Unable to locate contact information.') . EOL );
@@ -35,6 +37,13 @@ function message_post(&$a) {
info( t('Message sent.') . EOL );
}
+ // fake it to go back to the input form if no recipient listed
+
+ if($norecip) {
+ $a->argc = 2;
+ $a->argv[1] = 'new';
+ }
+
}
function message_content(&$a) {
@@ -151,7 +160,8 @@ function message_content(&$a) {
'$header' => t('Send Private Message'),
'$to' => t('To:'),
'$subject' => t('Subject:'),
- '$subjtxt' => '',
+ '$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
+ '$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
'$readonly' => '',
'$yourmessage' => t('Your message:'),
'$select' => $select,
@@ -295,6 +305,7 @@ function message_content(&$a) {
'$subjtxt' => template_escape($message['title']),
'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
'$yourmessage' => t('Your message:'),
+ '$text' => '',
'$select' => $select,
'$parent' => $parent,
'$upload' => t('Upload photo'),
diff --git a/view/de/messages.po b/view/de/messages.po
index 33adc8c76..6aab0bf1b 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-02-24 22:44-0800\n"
-"PO-Revision-Date: 2012-02-28 20:51+0000\n"
+"POT-Creation-Date: 2012-03-06 15:09-0800\n"
+"PO-Revision-Date: 2012-03-07 20:47+0000\n"
"Last-Translator: greeneyedred <greeneyedred@googlemail.com>\n"
"Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -48,8 +48,8 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
#: ../../mod/api.php:31 ../../mod/photos.php:129 ../../mod/photos.php:865
#: ../../mod/editpost.php:10 ../../mod/install.php:171
#: ../../mod/notifications.php:62 ../../mod/contacts.php:125
-#: ../../mod/settings.php:49 ../../mod/settings.php:404
-#: ../../mod/settings.php:409 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/settings.php:49 ../../mod/settings.php:411
+#: ../../mod/settings.php:416 ../../mod/manage.php:86 ../../mod/network.php:6
#: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19
#: ../../mod/viewcontacts.php:22 ../../mod/register.php:36
#: ../../mod/regmod.php:111 ../../mod/item.php:124 ../../mod/item.php:140
@@ -57,11 +57,11 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
#: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159
#: ../../mod/message.php:9 ../../mod/message.php:46 ../../mod/allfriends.php:9
#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
-#: ../../mod/display.php:130 ../../mod/profiles.php:7
+#: ../../mod/display.php:133 ../../mod/profiles.php:7
#: ../../mod/profiles.php:229 ../../mod/delegate.php:6
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:332
-#: ../../include/items.php:2968 ../../index.php:288
+#: ../../include/items.php:3030 ../../index.php:288
msgid "Permission denied."
msgstr "Zugriff verweigert."
@@ -90,8 +90,8 @@ msgstr "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, w
msgid "Return to contact editor"
msgstr "Zurück zum Kontakteditor"
-#: ../../mod/crepair.php:148 ../../mod/settings.php:455
-#: ../../mod/settings.php:481 ../../mod/admin.php:480 ../../mod/admin.php:489
+#: ../../mod/crepair.php:148 ../../mod/settings.php:462
+#: ../../mod/settings.php:488 ../../mod/admin.php:484 ../../mod/admin.php:493
msgid "Name"
msgstr "Name"
@@ -133,18 +133,18 @@ msgstr "Neues Foto von dieser URL"
#: ../../mod/photos.php:1262 ../../mod/photos.php:1293
#: ../../mod/install.php:251 ../../mod/install.php:289
#: ../../mod/localtime.php:45 ../../mod/contacts.php:319
-#: ../../mod/settings.php:453 ../../mod/settings.php:592
-#: ../../mod/settings.php:786 ../../mod/manage.php:109 ../../mod/group.php:84
-#: ../../mod/group.php:167 ../../mod/admin.php:312 ../../mod/admin.php:477
-#: ../../mod/admin.php:603 ../../mod/admin.php:769 ../../mod/admin.php:847
-#: ../../mod/profiles.php:375 ../../mod/invite.php:106
-#: ../../addon/facebook/facebook.php:411 ../../addon/yourls/yourls.php:76
+#: ../../mod/settings.php:460 ../../mod/settings.php:603
+#: ../../mod/settings.php:797 ../../mod/manage.php:109 ../../mod/group.php:80
+#: ../../mod/admin.php:313 ../../mod/admin.php:481 ../../mod/admin.php:609
+#: ../../mod/admin.php:776 ../../mod/admin.php:856 ../../mod/profiles.php:375
+#: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:411
+#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:92
#: ../../addon/nsfw/nsfw.php:57
#: ../../addon/uhremotestorage/uhremotestorage.php:89
-#: ../../addon/randplace/randplace.php:179 ../../addon/drpost/drpost.php:110
-#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
-#: ../../addon/impressum/impressum.php:69 ../../addon/blockem/blockem.php:57
-#: ../../addon/qcomment/qcomment.php:60
+#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:92
+#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
+#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:69
+#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
#: ../../addon/openstreetmap/openstreetmap.php:70
#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
#: ../../addon/pageheader/pageheader.php:52
@@ -154,11 +154,12 @@ msgstr "Neues Foto von dieser URL"
#: ../../addon/statusnet/statusnet.php:320
#: ../../addon/statusnet/statusnet.php:345
#: ../../addon/statusnet/statusnet.php:532 ../../addon/tumblr/tumblr.php:90
-#: ../../addon/numfriends/numfriends.php:85 ../../addon/wppost/wppost.php:102
-#: ../../addon/showmore/showmore.php:48 ../../addon/piwik/piwik.php:89
-#: ../../addon/twitter/twitter.php:175 ../../addon/twitter/twitter.php:201
-#: ../../addon/twitter/twitter.php:355 ../../addon/posterous/posterous.php:90
-#: ../../include/conversation.php:542
+#: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
+#: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
+#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:175
+#: ../../addon/twitter/twitter.php:201 ../../addon/twitter/twitter.php:355
+#: ../../addon/posterous/posterous.php:90
+#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:552
msgid "Submit"
msgstr "Senden"
@@ -212,7 +213,7 @@ msgstr "l, F j"
msgid "Edit event"
msgstr "Veranstaltung bearbeiten"
-#: ../../mod/events.php:272 ../../include/text.php:964
+#: ../../mod/events.php:272 ../../include/text.php:982
msgid "link to source"
msgstr "Link zum Originalbeitrag"
@@ -266,7 +267,7 @@ msgid "Description:"
msgstr "Beschreibung"
#: ../../mod/events.php:395 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:290 ../../boot.php:980
+#: ../../include/bb2diaspora.php:260 ../../boot.php:980
msgid "Location:"
msgstr "Ort:"
@@ -275,8 +276,8 @@ msgid "Share this event"
msgstr "Veranstaltung teilen"
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:686 ../../mod/settings.php:454
-#: ../../mod/settings.php:480 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:686 ../../mod/settings.php:461
+#: ../../mod/settings.php:487 ../../addon/js_upload/js_upload.php:45
msgid "Cancel"
msgstr "Abbrechen"
@@ -320,23 +321,23 @@ msgid ""
msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?"
#: ../../mod/api.php:105 ../../mod/dfrn_request.php:676
-#: ../../mod/settings.php:681 ../../mod/settings.php:687
-#: ../../mod/settings.php:695 ../../mod/settings.php:699
-#: ../../mod/settings.php:704 ../../mod/settings.php:710
-#: ../../mod/settings.php:716 ../../mod/settings.php:776
-#: ../../mod/settings.php:777 ../../mod/settings.php:778
-#: ../../mod/settings.php:779 ../../mod/register.php:524
+#: ../../mod/settings.php:692 ../../mod/settings.php:698
+#: ../../mod/settings.php:706 ../../mod/settings.php:710
+#: ../../mod/settings.php:715 ../../mod/settings.php:721
+#: ../../mod/settings.php:727 ../../mod/settings.php:787
+#: ../../mod/settings.php:788 ../../mod/settings.php:789
+#: ../../mod/settings.php:790 ../../mod/register.php:524
#: ../../mod/profiles.php:357
msgid "Yes"
msgstr "Ja"
#: ../../mod/api.php:106 ../../mod/dfrn_request.php:677
-#: ../../mod/settings.php:681 ../../mod/settings.php:687
-#: ../../mod/settings.php:695 ../../mod/settings.php:699
-#: ../../mod/settings.php:704 ../../mod/settings.php:710
-#: ../../mod/settings.php:716 ../../mod/settings.php:776
-#: ../../mod/settings.php:777 ../../mod/settings.php:778
-#: ../../mod/settings.php:779 ../../mod/register.php:525
+#: ../../mod/settings.php:692 ../../mod/settings.php:698
+#: ../../mod/settings.php:706 ../../mod/settings.php:710
+#: ../../mod/settings.php:715 ../../mod/settings.php:721
+#: ../../mod/settings.php:727 ../../mod/settings.php:787
+#: ../../mod/settings.php:788 ../../mod/settings.php:789
+#: ../../mod/settings.php:790 ../../mod/register.php:525
#: ../../mod/profiles.php:358
msgid "No"
msgstr "Nein"
@@ -390,7 +391,7 @@ msgid "was tagged in a"
msgstr "wurde getaggt in einem"
#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/communityhome/communityhome.php:163
+#: ../../addon/communityhome/communityhome.php:163 ../../include/text.php:1226
#: ../../include/diaspora.php:1600 ../../include/conversation.php:53
#: ../../include/conversation.php:126
msgid "photo"
@@ -480,7 +481,7 @@ msgstr "Foto bearbeiten"
msgid "Use as profile photo"
msgstr "Als Profilbild verwenden"
-#: ../../mod/photos.php:1078 ../../include/conversation.php:472
+#: ../../mod/photos.php:1078 ../../include/conversation.php:482
msgid "Private Message"
msgstr "Private Nachricht"
@@ -513,44 +514,44 @@ msgid ""
"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-#: ../../mod/photos.php:1200 ../../include/conversation.php:519
+#: ../../mod/photos.php:1200 ../../include/conversation.php:529
msgid "I like this (toggle)"
msgstr "Ich mag das (toggle)"
-#: ../../mod/photos.php:1201 ../../include/conversation.php:520
+#: ../../mod/photos.php:1201 ../../include/conversation.php:530
msgid "I don't like this (toggle)"
msgstr "Ich mag das nicht (toggle)"
-#: ../../mod/photos.php:1202 ../../include/conversation.php:914
+#: ../../mod/photos.php:1202 ../../include/conversation.php:933
msgid "Share"
msgstr "Teilen"
#: ../../mod/photos.php:1203 ../../mod/editpost.php:104
#: ../../mod/message.php:155 ../../mod/message.php:296
-#: ../../include/conversation.php:343 ../../include/conversation.php:677
-#: ../../include/conversation.php:931
+#: ../../include/conversation.php:348 ../../include/conversation.php:694
+#: ../../include/conversation.php:950
msgid "Please wait"
msgstr "Bitte warten"
#: ../../mod/photos.php:1219 ../../mod/photos.php:1259
-#: ../../mod/photos.php:1290 ../../include/conversation.php:539
+#: ../../mod/photos.php:1290 ../../include/conversation.php:549
msgid "This is you"
msgstr "Das bist du"
#: ../../mod/photos.php:1221 ../../mod/photos.php:1261
-#: ../../mod/photos.php:1292 ../../include/conversation.php:541
+#: ../../mod/photos.php:1292 ../../include/conversation.php:551
#: ../../boot.php:447
msgid "Comment"
msgstr "Kommentar"
#: ../../mod/photos.php:1223 ../../mod/editpost.php:123
-#: ../../include/conversation.php:543 ../../include/conversation.php:949
+#: ../../include/conversation.php:553 ../../include/conversation.php:968
msgid "Preview"
msgstr "Vorschau"
-#: ../../mod/photos.php:1320 ../../mod/settings.php:513
-#: ../../mod/group.php:154 ../../mod/admin.php:484
-#: ../../include/conversation.php:302 ../../include/conversation.php:563
+#: ../../mod/photos.php:1320 ../../mod/settings.php:520
+#: ../../mod/settings.php:601 ../../mod/group.php:158 ../../mod/admin.php:488
+#: ../../include/conversation.php:304 ../../include/conversation.php:573
msgid "Delete"
msgstr "Löschen"
@@ -614,26 +615,26 @@ msgstr "Beitrag nicht gefunden"
msgid "Edit post"
msgstr "Beitrag bearbeiten"
-#: ../../mod/editpost.php:80 ../../include/conversation.php:900
+#: ../../mod/editpost.php:80 ../../include/conversation.php:919
msgid "Post to Email"
msgstr "An E-Mail senden"
-#: ../../mod/editpost.php:95 ../../mod/settings.php:512
-#: ../../include/conversation.php:550
+#: ../../mod/editpost.php:95 ../../mod/settings.php:519
+#: ../../include/conversation.php:560
msgid "Edit"
msgstr "Bearbeiten"
#: ../../mod/editpost.php:96 ../../mod/message.php:153
-#: ../../mod/message.php:294 ../../include/conversation.php:915
+#: ../../mod/message.php:294 ../../include/conversation.php:934
msgid "Upload photo"
msgstr "Foto hochladen"
-#: ../../mod/editpost.php:97 ../../include/conversation.php:917
+#: ../../mod/editpost.php:97 ../../include/conversation.php:936
msgid "Attach file"
msgstr "Datei anhängen"
#: ../../mod/editpost.php:98 ../../mod/message.php:154
-#: ../../mod/message.php:295 ../../include/conversation.php:919
+#: ../../mod/message.php:295 ../../include/conversation.php:938
msgid "Insert web link"
msgstr "Weblink einfügen"
@@ -649,31 +650,31 @@ msgstr "Vorbis [.ogg] Video einfügen"
msgid "Insert Vorbis [.ogg] audio"
msgstr "Vorbis [.ogg] Audio einfügen"
-#: ../../mod/editpost.php:102 ../../include/conversation.php:925
+#: ../../mod/editpost.php:102 ../../include/conversation.php:944
msgid "Set your location"
msgstr "Deinen Standort festlegen"
-#: ../../mod/editpost.php:103 ../../include/conversation.php:927
+#: ../../mod/editpost.php:103 ../../include/conversation.php:946
msgid "Clear browser location"
msgstr "Browser-Standort leeren"
-#: ../../mod/editpost.php:105 ../../include/conversation.php:932
+#: ../../mod/editpost.php:105 ../../include/conversation.php:951
msgid "Permission settings"
msgstr "Berechtigungseinstellungen"
-#: ../../mod/editpost.php:113 ../../include/conversation.php:941
+#: ../../mod/editpost.php:113 ../../include/conversation.php:960
msgid "CC: email addresses"
msgstr "Cc:-E-Mail-Addressen"
-#: ../../mod/editpost.php:114 ../../include/conversation.php:942
+#: ../../mod/editpost.php:114 ../../include/conversation.php:961
msgid "Public post"
msgstr "Öffentlicher Beitrag"
-#: ../../mod/editpost.php:117 ../../include/conversation.php:930
+#: ../../mod/editpost.php:117 ../../include/conversation.php:949
msgid "Set title"
msgstr "Titel setzen"
-#: ../../mod/editpost.php:118 ../../include/conversation.php:944
+#: ../../mod/editpost.php:118 ../../include/conversation.php:963
msgid "Example: bob@example.com, mary@example.com"
msgstr "Z.B.: bob@example.com, mary@example.com"
@@ -782,7 +783,7 @@ msgstr "Bitte bestätige deine Kontaktanfrage bei %s."
msgid "Confirm"
msgstr "Bestätigen"
-#: ../../mod/dfrn_request.php:582 ../../include/items.php:2504
+#: ../../mod/dfrn_request.php:582 ../../include/items.php:2566
msgid "[Name Withheld]"
msgstr "[Name unterdrückt]"
@@ -830,7 +831,7 @@ msgstr "Friendica"
msgid "StatusNet/Federated Social Web"
msgstr "StatusNet/Federated Social Web"
-#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:548
+#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:555
#: ../../include/contact_selectors.php:80
msgid "Diaspora"
msgstr "Diaspora"
@@ -1093,7 +1094,7 @@ msgid "Errors encountered creating database tables."
msgstr "Fehler aufgetreten während der Erzeugung der Datenbanktabellen."
#: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:268
+#: ../../include/bb2diaspora.php:238
msgid "l F d, Y \\@ g:i A"
msgstr "l F d, Y \\@ g:i A"
@@ -1236,7 +1237,7 @@ msgid "if applicable"
msgstr "falls anwendbar"
#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:486
msgid "Approve"
msgstr "Genehmigen"
@@ -1321,11 +1322,11 @@ msgstr "Keine weiteren Netzwerk-Benachrichtigungen."
msgid "Network Notifications"
msgstr "Netzwerk Benachrichtigungen"
-#: ../../mod/notifications.php:324 ../../mod/notify.php:59
+#: ../../mod/notifications.php:324 ../../mod/notify.php:61
msgid "No more system notifications."
msgstr "Keine weiteren System Benachrichtigungen."
-#: ../../mod/notifications.php:328 ../../mod/notify.php:63
+#: ../../mod/notifications.php:328 ../../mod/notify.php:65
msgid "System Notifications"
msgstr "System Benachrichtigungen"
@@ -1433,12 +1434,12 @@ msgid "View all contacts"
msgstr "Alle Kontakte anzeigen"
#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:490
msgid "Unblock"
msgstr "Entsperren"
#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:489
msgid "Block"
msgstr "Sperren"
@@ -1507,7 +1508,7 @@ msgstr "letzte Aktualisierung:"
msgid "Update public posts"
msgstr "Öffentliche Beiträge aktualisieren"
-#: ../../mod/contacts.php:341 ../../mod/admin.php:896
+#: ../../mod/contacts.php:341 ../../mod/admin.php:905
msgid "Update now"
msgstr "Jetzt aktualisieren"
@@ -1524,7 +1525,7 @@ msgid ""
"Replies/likes to your public posts <strong>may</strong> still be visible"
msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein"
-#: ../../mod/contacts.php:399 ../../mod/group.php:194
+#: ../../mod/contacts.php:399 ../../mod/group.php:179
msgid "All Contacts"
msgstr "Alle Kontakte"
@@ -1557,23 +1558,23 @@ msgid "you are a fan of"
msgstr "du bist Fan von"
#: ../../mod/contacts.php:498 ../../include/Contact.php:135
-#: ../../include/conversation.php:773
+#: ../../include/conversation.php:792
msgid "Edit contact"
msgstr "Kontakt bearbeiten"
-#: ../../mod/contacts.php:518 ../../include/nav.php:132
+#: ../../mod/contacts.php:519 ../../include/nav.php:132
msgid "Contacts"
msgstr "Kontakte"
-#: ../../mod/contacts.php:522
+#: ../../mod/contacts.php:523
msgid "Search your contacts"
msgstr "Suche in deinen Kontakten"
-#: ../../mod/contacts.php:523 ../../mod/directory.php:67
+#: ../../mod/contacts.php:524 ../../mod/directory.php:67
msgid "Finding: "
msgstr "Funde: "
-#: ../../mod/contacts.php:524 ../../mod/directory.php:69
+#: ../../mod/contacts.php:525 ../../mod/directory.php:69
#: ../../include/contact_widgets.php:34
msgid "Find"
msgstr "Finde"
@@ -1593,8 +1594,8 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106
#: ../../mod/register.php:380 ../../mod/register.php:434
-#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:716
-#: ../../include/items.php:2513
+#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:726
+#: ../../include/items.php:2575
msgid "Administrator"
msgstr "Administrator"
@@ -1648,429 +1649,445 @@ msgstr "Spitzname oder Email:"
msgid "Reset"
msgstr "Zurücksetzen"
-#: ../../mod/settings.php:70
+#: ../../mod/settings.php:72
msgid "Missing some important data!"
msgstr "Wichtige Daten fehlen!"
-#: ../../mod/settings.php:73 ../../mod/settings.php:479 ../../mod/admin.php:75
+#: ../../mod/settings.php:75 ../../mod/settings.php:486 ../../mod/admin.php:75
msgid "Update"
msgstr "Aktualisierungen"
-#: ../../mod/settings.php:168
+#: ../../mod/settings.php:175
msgid "Failed to connect with email account using the settings provided."
msgstr "Konnte das Email Konto mit den angegebenen Einstellungen nicht erreichen."
-#: ../../mod/settings.php:173
+#: ../../mod/settings.php:180
msgid "Email settings updated."
msgstr "EMail Einstellungen bearbeitet."
-#: ../../mod/settings.php:191
+#: ../../mod/settings.php:198
msgid "Passwords do not match. Password unchanged."
msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."
-#: ../../mod/settings.php:196
+#: ../../mod/settings.php:203
msgid "Empty passwords are not allowed. Password unchanged."
msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."
-#: ../../mod/settings.php:207
+#: ../../mod/settings.php:214
msgid "Password changed."
msgstr "Passwort ändern."
-#: ../../mod/settings.php:209
+#: ../../mod/settings.php:216
msgid "Password update failed. Please try again."
msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal."
-#: ../../mod/settings.php:273
+#: ../../mod/settings.php:280
msgid " Please use a shorter name."
msgstr " Bitte verwende einen kürzeren Namen."
-#: ../../mod/settings.php:275
+#: ../../mod/settings.php:282
msgid " Name too short."
msgstr " Name ist zu kurz."
-#: ../../mod/settings.php:281
+#: ../../mod/settings.php:288
msgid " Not valid email."
msgstr " Keine gültige E-Mail."
-#: ../../mod/settings.php:283
+#: ../../mod/settings.php:290
msgid " Cannot change to that email."
msgstr "Ändern der E-Mail nicht möglich. "
-#: ../../mod/settings.php:351 ../../addon/facebook/facebook.php:321
+#: ../../mod/settings.php:358 ../../addon/facebook/facebook.php:321
#: ../../addon/impressum/impressum.php:64
#: ../../addon/openstreetmap/openstreetmap.php:80
#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350
msgid "Settings updated."
msgstr "Einstellungen aktualisiert."
-#: ../../mod/settings.php:415 ../../include/nav.php:130
+#: ../../mod/settings.php:422 ../../include/nav.php:130
msgid "Account settings"
msgstr "Account Einstellungen"
-#: ../../mod/settings.php:420
+#: ../../mod/settings.php:427
msgid "Connector settings"
msgstr "Connector-Einstellungen"
-#: ../../mod/settings.php:425
+#: ../../mod/settings.php:432
msgid "Plugin settings"
msgstr "Plugin-Einstellungen"
-#: ../../mod/settings.php:430
+#: ../../mod/settings.php:437
msgid "Connections"
msgstr "Verbindungen"
-#: ../../mod/settings.php:435
+#: ../../mod/settings.php:442
msgid "Export personal data"
msgstr "Persönliche Daten exportieren"
-#: ../../mod/settings.php:452 ../../mod/settings.php:478
-#: ../../mod/settings.php:511
+#: ../../mod/settings.php:459 ../../mod/settings.php:485
+#: ../../mod/settings.php:518
msgid "Add application"
msgstr "Programm hinzufügen"
-#: ../../mod/settings.php:456 ../../mod/settings.php:482
+#: ../../mod/settings.php:463 ../../mod/settings.php:489
#: ../../addon/statusnet/statusnet.php:526
msgid "Consumer Key"
msgstr "Consumer Key"
-#: ../../mod/settings.php:457 ../../mod/settings.php:483
+#: ../../mod/settings.php:464 ../../mod/settings.php:490
#: ../../addon/statusnet/statusnet.php:525
msgid "Consumer Secret"
msgstr "Consumer Secret"
-#: ../../mod/settings.php:458 ../../mod/settings.php:484
+#: ../../mod/settings.php:465 ../../mod/settings.php:491
msgid "Redirect"
msgstr "Umleiten"
-#: ../../mod/settings.php:459 ../../mod/settings.php:485
+#: ../../mod/settings.php:466 ../../mod/settings.php:492
msgid "Icon url"
msgstr "Icon URL"
-#: ../../mod/settings.php:470
+#: ../../mod/settings.php:477
msgid "You can't edit this application."
msgstr "Du kannst dieses Programm nicht bearbeiten."
-#: ../../mod/settings.php:510
+#: ../../mod/settings.php:517
msgid "Connected Apps"
msgstr "Verbundene Programme"
-#: ../../mod/settings.php:514
+#: ../../mod/settings.php:521
msgid "Client key starts with"
msgstr "Anwender Schlüssel beginnt mit"
-#: ../../mod/settings.php:515
+#: ../../mod/settings.php:522
msgid "No name"
msgstr "Kein Name"
-#: ../../mod/settings.php:516
+#: ../../mod/settings.php:523
msgid "Remove authorization"
msgstr "Autorisierung entziehen"
-#: ../../mod/settings.php:528
+#: ../../mod/settings.php:535
msgid "No Plugin settings configured"
msgstr "Keine Plugin-Einstellungen konfiguriert"
-#: ../../mod/settings.php:535 ../../addon/widgets/widgets.php:122
+#: ../../mod/settings.php:542 ../../addon/widgets/widgets.php:122
msgid "Plugin Settings"
msgstr "Plugin-Einstellungen"
-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:555 ../../mod/settings.php:556
#, 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:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:555 ../../mod/settings.php:556
msgid "enabled"
msgstr "eingeschaltet"
-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:555 ../../mod/settings.php:556
msgid "disabled"
msgstr "ausgeschaltet"
-#: ../../mod/settings.php:549
+#: ../../mod/settings.php:556
msgid "StatusNet"
msgstr "StatusNet"
-#: ../../mod/settings.php:575
+#: ../../mod/settings.php:584
msgid "Connector Settings"
msgstr "Verbindungs-Einstellungen"
-#: ../../mod/settings.php:581
+#: ../../mod/settings.php:590
msgid "Email/Mailbox Setup"
msgstr "E-Mail/Postfach-Einstellungen"
-#: ../../mod/settings.php:582
+#: ../../mod/settings.php:591
msgid ""
"If you wish to communicate with email contacts using this service "
"(optional), please specify how to connect to your mailbox."
msgstr "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an."
-#: ../../mod/settings.php:583
+#: ../../mod/settings.php:592
msgid "Last successful email check:"
msgstr "Letzter erfolgreicher Email Check"
-#: ../../mod/settings.php:584
+#: ../../mod/settings.php:593
msgid "Email access is disabled on this site."
msgstr "Zugriff auf E-Mails für diese Seite deaktiviert."
-#: ../../mod/settings.php:585
+#: ../../mod/settings.php:594
msgid "IMAP server name:"
msgstr "IMAP-Server-Name:"
-#: ../../mod/settings.php:586
+#: ../../mod/settings.php:595
msgid "IMAP port:"
msgstr "IMAP-Port:"
-#: ../../mod/settings.php:587
+#: ../../mod/settings.php:596
msgid "Security:"
msgstr "Sicherheit:"
-#: ../../mod/settings.php:587
+#: ../../mod/settings.php:596 ../../mod/settings.php:601
msgid "None"
msgstr "Keine"
-#: ../../mod/settings.php:588
+#: ../../mod/settings.php:597
msgid "Email login name:"
msgstr "E-Mail-Login-Name:"
-#: ../../mod/settings.php:589
+#: ../../mod/settings.php:598
msgid "Email password:"
msgstr "E-Mail-Passwort:"
-#: ../../mod/settings.php:590
+#: ../../mod/settings.php:599
msgid "Reply-to address:"
msgstr "Reply-to Adresse:"
-#: ../../mod/settings.php:591
+#: ../../mod/settings.php:600
msgid "Send public posts to all email contacts:"
msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:"
-#: ../../mod/settings.php:648 ../../mod/admin.php:142 ../../mod/admin.php:459
+#: ../../mod/settings.php:601
+msgid "Action after import:"
+msgstr "Aktion nach Import:"
+
+#: ../../mod/settings.php:601
+msgid "Mark as seen"
+msgstr "Als gelesen markieren"
+
+#: ../../mod/settings.php:601
+msgid "Move to folder"
+msgstr "In einen Ordner verschieben"
+
+#: ../../mod/settings.php:602
+msgid "Move to folder:"
+msgstr "In diesen Ordner verschieben:"
+
+#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:462
msgid "Normal Account"
msgstr "Normaler Account"
-#: ../../mod/settings.php:649
+#: ../../mod/settings.php:660
msgid "This account is a normal personal profile"
msgstr "Dieser Account ist ein normales persönliches Profil"
-#: ../../mod/settings.php:652 ../../mod/admin.php:143 ../../mod/admin.php:460
+#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:463
msgid "Soapbox Account"
msgstr "Sandkasten-Account"
-#: ../../mod/settings.php:653
+#: ../../mod/settings.php:664
msgid "Automatically approve all connection/friend requests as read-only fans"
msgstr "Freundschaftsanfragen werden automatisch als Nurlese-Fans akzeptiert"
-#: ../../mod/settings.php:656 ../../mod/admin.php:144 ../../mod/admin.php:461
+#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:464
msgid "Community/Celebrity Account"
msgstr "Gemeinschafts/Promi-Account"
-#: ../../mod/settings.php:657
+#: ../../mod/settings.php:668
msgid ""
"Automatically approve all connection/friend requests as read-write fans"
msgstr "Freundschaftsanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert"
-#: ../../mod/settings.php:660 ../../mod/admin.php:145 ../../mod/admin.php:462
+#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:465
msgid "Automatic Friend Account"
msgstr "Automatischer Freundesaccount"
-#: ../../mod/settings.php:661
+#: ../../mod/settings.php:672
msgid "Automatically approve all connection/friend requests as friends"
msgstr "Freundschaftsanfragen werden automatisch als Freund akzeptiert"
-#: ../../mod/settings.php:671
+#: ../../mod/settings.php:682
msgid "OpenID:"
msgstr "OpenID:"
-#: ../../mod/settings.php:671
+#: ../../mod/settings.php:682
msgid "(Optional) Allow this OpenID to login to this account."
msgstr "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID."
-#: ../../mod/settings.php:681
+#: ../../mod/settings.php:692
msgid "Publish your default profile in your local site directory?"
msgstr "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?"
-#: ../../mod/settings.php:687
+#: ../../mod/settings.php:698
msgid "Publish your default profile in the global social directory?"
msgstr "Veröffentliche dein Standardprofil im weltweiten Verzeichnis?"
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:706
msgid "Hide your contact/friend list from viewers of your default profile?"
msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?"
-#: ../../mod/settings.php:699
+#: ../../mod/settings.php:710
msgid "Hide your profile details from unknown viewers?"
msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
-#: ../../mod/settings.php:704
+#: ../../mod/settings.php:715
msgid "Allow friends to post to your profile page?"
msgstr "Deinen Kontakten erlauben, auf deine Pinnwand zu schreiben?"
-#: ../../mod/settings.php:710
+#: ../../mod/settings.php:721
msgid "Allow friends to tag your posts?"
msgstr "Deinen Kontakten erlauben, deine Beiträge mit Schlagwörtern zu versehen?"
-#: ../../mod/settings.php:716
+#: ../../mod/settings.php:727
msgid "Allow us to suggest you as a potential friend to new members?"
msgstr "Erlaube uns dich als potentiellen Kontakt für neue Mitglieder vorzuschlagen?"
-#: ../../mod/settings.php:725
+#: ../../mod/settings.php:736
msgid "Profile is <strong>not published</strong>."
msgstr "Profil ist <strong>nicht veröffentlicht</strong>."
-#: ../../mod/settings.php:757 ../../mod/profile_photo.php:206
+#: ../../mod/settings.php:768 ../../mod/profile_photo.php:206
msgid "or"
msgstr "oder"
-#: ../../mod/settings.php:762
+#: ../../mod/settings.php:773
msgid "Your Identity Address is"
msgstr "Die Adresse deines Profils lautet:"
-#: ../../mod/settings.php:773
+#: ../../mod/settings.php:784
msgid "Automatically expire posts after this many days:"
msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen"
-#: ../../mod/settings.php:773
+#: ../../mod/settings.php:784
msgid "If empty, posts will not expire. Expired posts will be deleted"
msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht."
-#: ../../mod/settings.php:774
+#: ../../mod/settings.php:785
msgid "Advanced expiration settings"
msgstr "Erweiterte Verfallseinstellungen"
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:786
msgid "Advanced Expiration"
msgstr "Erweitertes Verfallen"
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:787
msgid "Expire posts:"
msgstr "Beiträge verfallen lassen:"
-#: ../../mod/settings.php:777
+#: ../../mod/settings.php:788
msgid "Expire personal notes:"
msgstr "Persönliche Notizen verfallen lassen:"
-#: ../../mod/settings.php:778
+#: ../../mod/settings.php:789
msgid "Expire starred posts:"
msgstr "Markierte Beiträge verfallen lassen:"
-#: ../../mod/settings.php:779
+#: ../../mod/settings.php:790
msgid "Expire photos:"
msgstr "Fotos verfallen lassen:"
-#: ../../mod/settings.php:784
+#: ../../mod/settings.php:795
msgid "Account Settings"
msgstr "Account-Einstellungen"
-#: ../../mod/settings.php:792
+#: ../../mod/settings.php:803
msgid "Password Settings"
msgstr "Passwort-Einstellungen"
-#: ../../mod/settings.php:793
+#: ../../mod/settings.php:804
msgid "New Password:"
msgstr "Neues Passwort:"
-#: ../../mod/settings.php:794
+#: ../../mod/settings.php:805
msgid "Confirm:"
msgstr "Bestätigen:"
-#: ../../mod/settings.php:794
+#: ../../mod/settings.php:805
msgid "Leave password fields blank unless changing"
msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern"
-#: ../../mod/settings.php:798
+#: ../../mod/settings.php:809
msgid "Basic Settings"
msgstr "Grundeinstellungen"
-#: ../../mod/settings.php:799 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:810 ../../include/profile_advanced.php:15
msgid "Full Name:"
msgstr "Kompletter Name:"
-#: ../../mod/settings.php:800
+#: ../../mod/settings.php:811
msgid "Email Address:"
msgstr "Emailadresse:"
-#: ../../mod/settings.php:801
+#: ../../mod/settings.php:812
msgid "Your Timezone:"
msgstr "Deine Zeitzone:"
-#: ../../mod/settings.php:802
+#: ../../mod/settings.php:813
msgid "Default Post Location:"
msgstr "Standardstandort:"
-#: ../../mod/settings.php:803
+#: ../../mod/settings.php:814
msgid "Use Browser Location:"
msgstr "Verwende den Standort des Browsers:"
-#: ../../mod/settings.php:804
+#: ../../mod/settings.php:815
msgid "Display Theme:"
msgstr "Theme:"
-#: ../../mod/settings.php:805
+#: ../../mod/settings.php:816
msgid "Update browser every xx seconds"
msgstr "Browser alle xx Sekunden aktualisieren"
-#: ../../mod/settings.php:805
+#: ../../mod/settings.php:816
msgid "Minimum of 10 seconds, no maximum"
msgstr "Minimal 10 Sekunden, kein Maximum"
-#: ../../mod/settings.php:807
+#: ../../mod/settings.php:818
msgid "Security and Privacy Settings"
msgstr "Sicherheits- und Privatsphäre-Einstellungen"
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:820
msgid "Maximum Friend Requests/Day:"
msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:"
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:820
msgid "(to prevent spam abuse)"
msgstr "(um SPAM zu vermeiden)"
-#: ../../mod/settings.php:810
+#: ../../mod/settings.php:821
msgid "Default Post Permissions"
msgstr "Standard-Zugriffsrechte für Beiträge"
-#: ../../mod/settings.php:811
+#: ../../mod/settings.php:822
msgid "(click to open/close)"
msgstr "(klicke zum öffnen/schließen)"
-#: ../../mod/settings.php:826
+#: ../../mod/settings.php:837
msgid "Notification Settings"
msgstr "Benachrichtigungseinstellungen"
-#: ../../mod/settings.php:827
+#: ../../mod/settings.php:838
msgid "Send a notification email when:"
msgstr "Benachrichtigungs-E-Mail senden wenn:"
-#: ../../mod/settings.php:828
+#: ../../mod/settings.php:839
msgid "You receive an introduction"
msgstr "- du eine Kontaktanfrage erhältst"
-#: ../../mod/settings.php:829
+#: ../../mod/settings.php:840
msgid "Your introductions are confirmed"
msgstr "- eine deiner Kontaktanfragen akzeptiert wurde"
-#: ../../mod/settings.php:830
+#: ../../mod/settings.php:841
msgid "Someone writes on your profile wall"
msgstr "- jemand etwas auf deine Pinnwand schreibt"
-#: ../../mod/settings.php:831
+#: ../../mod/settings.php:842
msgid "Someone writes a followup comment"
msgstr "- jemand auch einen Kommentar verfasst"
-#: ../../mod/settings.php:832
+#: ../../mod/settings.php:843
msgid "You receive a private message"
msgstr "- du eine private Nachricht erhältst"
-#: ../../mod/settings.php:833
+#: ../../mod/settings.php:844
msgid "You receive a friend suggestion"
msgstr "- du eine Empfehlung erhältst"
-#: ../../mod/settings.php:834
+#: ../../mod/settings.php:845
msgid "You are tagged in a post"
msgstr "- du in einem Beitrag erwähnt wurdest"
-#: ../../mod/settings.php:837
+#: ../../mod/settings.php:848
msgid "Advanced Page Settings"
msgstr "Erweiterte Seiten-Einstellungen"
@@ -2136,27 +2153,27 @@ msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerke
msgid "Private messages to this group are at risk of public disclosure."
msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten."
-#: ../../mod/network.php:300
+#: ../../mod/network.php:298
msgid "No such group"
msgstr "Es gibt keine solche Gruppe"
-#: ../../mod/network.php:311
+#: ../../mod/network.php:309
msgid "Group is empty"
msgstr "Gruppe ist leer"
-#: ../../mod/network.php:315
+#: ../../mod/network.php:313
msgid "Group: "
msgstr "Gruppe: "
-#: ../../mod/network.php:325
+#: ../../mod/network.php:323
msgid "Contact: "
msgstr "Kontakt: "
-#: ../../mod/network.php:327
+#: ../../mod/network.php:325
msgid "Private messages to this person are at risk of public disclosure."
msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."
-#: ../../mod/network.php:332
+#: ../../mod/network.php:330
msgid "Invalid contact."
msgstr "Ungültiger Kontakt."
@@ -2164,7 +2181,7 @@ msgstr "Ungültiger Kontakt."
msgid "Personal Notes"
msgstr "Persönliche Notizen"
-#: ../../mod/notes.php:63 ../../include/text.php:639
+#: ../../mod/notes.php:63 ../../include/text.php:645
msgid "Save"
msgstr "Speichern"
@@ -2291,7 +2308,7 @@ msgstr "Gruppe erstellt."
msgid "Could not create group."
msgstr "Konnte die Gruppe nicht erstellen."
-#: ../../mod/group.php:43 ../../mod/group.php:123
+#: ../../mod/group.php:43 ../../mod/group.php:127
msgid "Group not found."
msgstr "Gruppe nicht gefunden."
@@ -2303,34 +2320,34 @@ msgstr "Gruppenname geändert."
msgid "Permission denied"
msgstr "Zugriff verweigert"
-#: ../../mod/group.php:82
+#: ../../mod/group.php:85
msgid "Create a group of contacts/friends."
msgstr "Eine Gruppe von Kontakten/Freunden anlegen."
-#: ../../mod/group.php:83 ../../mod/group.php:166
+#: ../../mod/group.php:86 ../../mod/group.php:166
msgid "Group Name: "
msgstr "Gruppenname:"
-#: ../../mod/group.php:98
+#: ../../mod/group.php:102
msgid "Group removed."
msgstr "Gruppe entfernt."
-#: ../../mod/group.php:100
+#: ../../mod/group.php:104
msgid "Unable to remove group."
msgstr "Konnte die Gruppe nicht entfernen."
-#: ../../mod/group.php:164 ../../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"
-
#: ../../mod/group.php:165
msgid "Group Editor"
msgstr "Gruppeneditor"
-#: ../../mod/group.php:179
+#: ../../mod/group.php:177
msgid "Members"
msgstr "Mitglieder"
+#: ../../mod/group.php:209 ../../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"
+
#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
msgid "Invalid profile identifier."
msgstr "Ungültiger Profil-Bezeichner"
@@ -2357,7 +2374,7 @@ msgstr "Alle Kontakte (mit gesichertem Profilzugriff)"
msgid "No contacts."
msgstr "Keine Kontakte."
-#: ../../mod/viewcontacts.php:73 ../../include/text.php:578
+#: ../../mod/viewcontacts.php:74 ../../include/text.php:584
msgid "View Contacts"
msgstr "Kontakte anzeigen"
@@ -2484,7 +2501,7 @@ msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung mögli
msgid "Your invitation ID: "
msgstr "ID deiner Einladung: "
-#: ../../mod/register.php:540 ../../mod/admin.php:313
+#: ../../mod/register.php:540 ../../mod/admin.php:314
msgid "Registration"
msgstr "Registrierung"
@@ -2538,9 +2555,9 @@ msgid "%1$s doesn't like %2$s's %3$s"
msgstr "%1$s mag %2$ss %3$s nicht"
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127
-#: ../../mod/admin.php:518 ../../mod/admin.php:694 ../../mod/display.php:29
-#: ../../mod/display.php:134 ../../mod/viewd.php:14
-#: ../../include/items.php:2880
+#: ../../mod/admin.php:522 ../../mod/admin.php:700 ../../mod/display.php:29
+#: ../../mod/display.php:137 ../../mod/viewd.php:14
+#: ../../include/items.php:2942
msgid "Item not found."
msgstr "Beitrag nicht gefunden."
@@ -2575,29 +2592,29 @@ msgstr "Leerer Beitrag wurde verworfen."
msgid "Wall Photos"
msgstr "Pinnwand-Bilder"
-#: ../../mod/item.php:830
+#: ../../mod/item.php:833
msgid "System error. Post not saved."
msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden."
-#: ../../mod/item.php:855
+#: ../../mod/item.php:858
#, php-format
msgid ""
"This message was sent to you by %s, a member of the Friendica social "
"network."
msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica."
-#: ../../mod/item.php:857
+#: ../../mod/item.php:860
#, php-format
msgid "You may visit them online at %s"
msgstr "Du kannst sie online unter %s besuchen"
-#: ../../mod/item.php:858
+#: ../../mod/item.php:861
msgid ""
"Please contact the sender by replying to this post if you do not wish to "
"receive these messages."
msgstr "Falls du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem du auf diese Nachricht antwortest."
-#: ../../mod/item.php:860
+#: ../../mod/item.php:863
#, php-format
msgid "%s posted an update."
msgstr "%s hat ein Update veröffentlicht."
@@ -2721,7 +2738,7 @@ msgstr "Nachricht gelöscht."
msgid "Conversation removed."
msgstr "Unterhaltung gelöscht."
-#: ../../mod/message.php:137 ../../include/conversation.php:868
+#: ../../mod/message.php:137 ../../include/conversation.php:887
msgid "Please enter a link URL:"
msgstr "Bitte gib die URL des Links ein:"
@@ -2775,23 +2792,23 @@ msgstr "Freunde von %s"
msgid "No friends to display."
msgstr "Keine Freunde zum Anzeigen."
-#: ../../mod/admin.php:71 ../../mod/admin.php:311
+#: ../../mod/admin.php:71 ../../mod/admin.php:312
msgid "Site"
msgstr "Seite"
-#: ../../mod/admin.php:72 ../../mod/admin.php:476 ../../mod/admin.php:488
+#: ../../mod/admin.php:72 ../../mod/admin.php:480 ../../mod/admin.php:492
msgid "Users"
msgstr "Nutzer"
-#: ../../mod/admin.php:73 ../../mod/admin.php:565 ../../mod/admin.php:602
+#: ../../mod/admin.php:73 ../../mod/admin.php:569 ../../mod/admin.php:608
msgid "Plugins"
msgstr "Plugins"
-#: ../../mod/admin.php:74 ../../mod/admin.php:736 ../../mod/admin.php:768
+#: ../../mod/admin.php:74 ../../mod/admin.php:742 ../../mod/admin.php:775
msgid "Themes"
msgstr "Themen"
-#: ../../mod/admin.php:89 ../../mod/admin.php:846
+#: ../../mod/admin.php:89 ../../mod/admin.php:855
msgid "Logs"
msgstr "Protokolle"
@@ -2799,325 +2816,439 @@ msgstr "Protokolle"
msgid "User registrations waiting for confirmation"
msgstr "Nutzeranmeldungen die auf Bestätigung warten"
-#: ../../mod/admin.php:160 ../../mod/admin.php:310 ../../mod/admin.php:475
-#: ../../mod/admin.php:564 ../../mod/admin.php:601 ../../mod/admin.php:735
-#: ../../mod/admin.php:767 ../../mod/admin.php:845
+#: ../../mod/admin.php:161 ../../mod/admin.php:311 ../../mod/admin.php:479
+#: ../../mod/admin.php:568 ../../mod/admin.php:607 ../../mod/admin.php:741
+#: ../../mod/admin.php:774 ../../mod/admin.php:854
msgid "Administration"
msgstr "Administration"
-#: ../../mod/admin.php:161
+#: ../../mod/admin.php:162
msgid "Summary"
msgstr "Zusammenfassung"
-#: ../../mod/admin.php:162
+#: ../../mod/admin.php:163
msgid "Registered users"
msgstr "Registrierte Nutzer"
-#: ../../mod/admin.php:164
+#: ../../mod/admin.php:165
msgid "Pending registrations"
msgstr "Anstehende Anmeldungen"
-#: ../../mod/admin.php:165
+#: ../../mod/admin.php:166
msgid "Version"
msgstr "Version"
-#: ../../mod/admin.php:167
+#: ../../mod/admin.php:168
msgid "Active plugins"
msgstr "Aktive Plugins"
-#: ../../mod/admin.php:259
+#: ../../mod/admin.php:260
msgid "Site settings updated."
msgstr "Seiteneinstellungen aktualisiert."
-#: ../../mod/admin.php:303
+#: ../../mod/admin.php:304
msgid "Closed"
msgstr "Geschlossen"
-#: ../../mod/admin.php:304
+#: ../../mod/admin.php:305
msgid "Requires approval"
msgstr "Bedarf der Zustimmung"
-#: ../../mod/admin.php:305
+#: ../../mod/admin.php:306
msgid "Open"
msgstr "Offen"
-#: ../../mod/admin.php:314
+#: ../../mod/admin.php:315
msgid "File upload"
msgstr "Datei hochladen"
-#: ../../mod/admin.php:315
+#: ../../mod/admin.php:316
msgid "Policies"
msgstr "Regeln"
-#: ../../mod/admin.php:316
+#: ../../mod/admin.php:317
msgid "Advanced"
msgstr "Erweitert"
-#: ../../mod/admin.php:320 ../../addon/statusnet/statusnet.php:523
+#: ../../mod/admin.php:321 ../../addon/statusnet/statusnet.php:523
msgid "Site name"
msgstr "Seitenname"
-#: ../../mod/admin.php:321
+#: ../../mod/admin.php:322
msgid "Banner/Logo"
msgstr "Banner/Logo"
-#: ../../mod/admin.php:322
+#: ../../mod/admin.php:323
msgid "System language"
msgstr "Systemsprache"
-#: ../../mod/admin.php:323
+#: ../../mod/admin.php:324
msgid "System theme"
msgstr "Systemweites Thema"
-#: ../../mod/admin.php:325
+#: ../../mod/admin.php:324
+msgid "Default system theme - may be over-ridden by user profiles"
+msgstr "Standard Server Theme - kann von den Benutzereinstellungen überschrieben werden."
+
+#: ../../mod/admin.php:326
msgid "Maximum image size"
msgstr "Maximale Größe von Bildern"
-#: ../../mod/admin.php:327
+#: ../../mod/admin.php:326
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit."
+
+#: ../../mod/admin.php:328
msgid "Register policy"
msgstr "Registrierungsmethode"
-#: ../../mod/admin.php:328
+#: ../../mod/admin.php:329
msgid "Register text"
msgstr "Registrierungstext"
#: ../../mod/admin.php:329
+msgid "Will be displayed prominently on the registration page."
+msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
+
+#: ../../mod/admin.php:330
msgid "Accounts abandoned after x days"
msgstr "Accounts gelten nach x Tagen als unbenutzt"
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:330
msgid ""
"Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit."
msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit."
-#: ../../mod/admin.php:330
+#: ../../mod/admin.php:331
msgid "Allowed friend domains"
msgstr "Erlaubte Domains für Kontakte"
#: ../../mod/admin.php:331
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
+
+#: ../../mod/admin.php:332
msgid "Allowed email domains"
msgstr "Erlaubte Domains für Emails"
#: ../../mod/admin.php:332
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
+
+#: ../../mod/admin.php:333
msgid "Block public"
msgstr "Öffentlichen Zugriff blockieren"
#: ../../mod/admin.php:333
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist."
+
+#: ../../mod/admin.php:334
msgid "Force publish"
msgstr "Erzwinge Veröffentlichung"
#: ../../mod/admin.php:334
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen."
+
+#: ../../mod/admin.php:335
msgid "Global directory update URL"
msgstr "URL für Updates beim weltweiten Verzeichnis"
-#: ../../mod/admin.php:336
+#: ../../mod/admin.php:335
+msgid ""
+"URL to update the global directory. If this is not set, the global directory"
+" is completely unavailable to the application."
+msgstr "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar."
+
+#: ../../mod/admin.php:337
msgid "Block multiple registrations"
msgstr "Unterbinde Mehrfachregistrierung"
#: ../../mod/admin.php:337
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen."
+
+#: ../../mod/admin.php:338
msgid "OpenID support"
msgstr "OpenID Unterstützung"
#: ../../mod/admin.php:338
+msgid "OpenID support for registration and logins."
+msgstr "OpenID-Unterstützung für Registrierung und Login."
+
+#: ../../mod/admin.php:339
msgid "Gravatar support"
msgstr "Gravatar Unterstützung"
#: ../../mod/admin.php:339
+msgid "Search new user's photo on Gravatar."
+msgstr "Suchfunktion bei Gravatar für Profilbilder neuer Nutzer."
+
+#: ../../mod/admin.php:340
msgid "Fullname check"
msgstr "Namen auf Vollständigkeit überprüfen"
#: ../../mod/admin.php:340
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden."
+
+#: ../../mod/admin.php:341
msgid "UTF-8 Regular expressions"
msgstr "UTF-8 Reguläre Ausdrücke"
#: ../../mod/admin.php:341
+msgid "Use PHP UTF8 regular expressions"
+msgstr "PHP UTF8 Ausdrücke verwenden"
+
+#: ../../mod/admin.php:342
msgid "Show Community Page"
msgstr "Gemeinschaftsseite anzeigen"
#: ../../mod/admin.php:342
+msgid ""
+"Display a Community page showing all recent public postings on this site."
+msgstr "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server."
+
+#: ../../mod/admin.php:343
msgid "Enable OStatus support"
msgstr "OStatus Unterstützung aktivieren"
#: ../../mod/admin.php:343
+msgid ""
+"Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
+"communications in OStatus are public, so privacy warnings will be "
+"occasionally displayed."
+msgstr "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt."
+
+#: ../../mod/admin.php:344
msgid "Enable Diaspora support"
msgstr "Diaspora-Support aktivieren"
#: ../../mod/admin.php:344
+msgid "Provide built-in Diaspora network compatibility."
+msgstr "Verwende die eingebaute Diaspora-Verknüpfung."
+
+#: ../../mod/admin.php:345
msgid "Only allow Friendica contacts"
msgstr "Nur Friendica-Kontakte erlauben"
#: ../../mod/admin.php:345
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert."
+
+#: ../../mod/admin.php:346
msgid "Verify SSL"
msgstr "SSL Überprüfen"
#: ../../mod/admin.php:346
+msgid ""
+"If you wish, you can turn on strict certificate checking. This will mean you"
+" cannot connect (at all) to self-signed SSL sites."
+msgstr "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle anstellen. Das bedeutet, das man zu keinen Seiten mit selbst unterzeichneten SSL eine Verbindung herstellen kann."
+
+#: ../../mod/admin.php:347
msgid "Proxy user"
msgstr "Proxy Nutzer"
-#: ../../mod/admin.php:347
+#: ../../mod/admin.php:348
msgid "Proxy URL"
msgstr "Proxy URL"
-#: ../../mod/admin.php:348
+#: ../../mod/admin.php:349
msgid "Network timeout"
msgstr "Netzwerk Wartezeit"
-#: ../../mod/admin.php:369
+#: ../../mod/admin.php:349
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."
+
+#: ../../mod/admin.php:370
#, php-format
-msgid "%s user blocked"
+msgid "%s user blocked/unblocked"
msgid_plural "%s users blocked/unblocked"
-msgstr[0] "%s Nutzer gesperrt"
-msgstr[1] "%s Nutzer gesperrt/entsperrt"
+msgstr[0] "%s Benutzer geblockt/freigegeben"
+msgstr[1] "%s Benutzer geblockt/freigegeben"
-#: ../../mod/admin.php:376
+#: ../../mod/admin.php:377
#, 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:410
+#: ../../mod/admin.php:411
#, php-format
msgid "User '%s' deleted"
msgstr "Nutzer '%s' gelöscht"
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:418
#, php-format
msgid "User '%s' unblocked"
msgstr "Nutzer '%s' entsperrt"
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:418
#, php-format
msgid "User '%s' blocked"
msgstr "Nutzer '%s' gesperrt"
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:482
msgid "select all"
msgstr "Alle auswählen"
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:483
msgid "User registrations waiting for confirm"
msgstr "Neuanmeldungen, die auf deine Bestätigung warten"
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:484
msgid "Request date"
msgstr "Anfrage Datum"
-#: ../../mod/admin.php:480 ../../mod/admin.php:489
+#: ../../mod/admin.php:484 ../../mod/admin.php:493
#: ../../include/contact_selectors.php:79
msgid "Email"
msgstr "Email"
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:485
msgid "No registrations."
msgstr "Keine Neuanmeldungen."
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:487
msgid "Deny"
msgstr "Verwehren"
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:493
msgid "Register date"
msgstr "Anmeldedatum"
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:493
msgid "Last login"
msgstr "Letzte Anmeldung"
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:493
msgid "Last item"
msgstr "Letzter Beitrag"
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:493
msgid "Account"
msgstr "Nutzerkonto"
-#: ../../mod/admin.php:491
+#: ../../mod/admin.php:495
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:492
+#: ../../mod/admin.php:496
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:528
+#: ../../mod/admin.php:532
#, php-format
msgid "Plugin %s disabled."
msgstr "Plugin %s deaktiviert."
-#: ../../mod/admin.php:532
+#: ../../mod/admin.php:536
#, php-format
msgid "Plugin %s enabled."
msgstr "Plugin %s aktiviert."
-#: ../../mod/admin.php:542 ../../mod/admin.php:718
+#: ../../mod/admin.php:546 ../../mod/admin.php:724
msgid "Disable"
msgstr "Ausschalten"
-#: ../../mod/admin.php:544 ../../mod/admin.php:720
+#: ../../mod/admin.php:548 ../../mod/admin.php:726
msgid "Enable"
msgstr "Einschalten"
-#: ../../mod/admin.php:566 ../../mod/admin.php:737
+#: ../../mod/admin.php:570 ../../mod/admin.php:743
msgid "Toggle"
msgstr "Umschalten"
-#: ../../mod/admin.php:567 ../../mod/admin.php:738 ../../include/nav.php:130
+#: ../../mod/admin.php:571 ../../mod/admin.php:744 ../../include/nav.php:130
msgid "Settings"
msgstr "Einstellungen"
-#: ../../mod/admin.php:683
+#: ../../mod/admin.php:578 ../../mod/admin.php:753
+msgid "Author: "
+msgstr "Autor:"
+
+#: ../../mod/admin.php:579 ../../mod/admin.php:754
+msgid "Maintainer: "
+msgstr "Betreuer:"
+
+#: ../../mod/admin.php:689
msgid "No themes found."
msgstr "Keine Themen gefunden."
-#: ../../mod/admin.php:795
+#: ../../mod/admin.php:780
+msgid "[Experimental]"
+msgstr "[Experimentell]"
+
+#: ../../mod/admin.php:781
+msgid "[Unsupported]"
+msgstr "[Nicht unterstützt]"
+
+#: ../../mod/admin.php:804
msgid "Log settings updated."
msgstr "Protokolleinstellungen aktualisiert."
-#: ../../mod/admin.php:848
+#: ../../mod/admin.php:857
msgid "Clear"
msgstr "löschen"
-#: ../../mod/admin.php:854
+#: ../../mod/admin.php:863
msgid "Debugging"
msgstr "Protokoll führen"
-#: ../../mod/admin.php:855
+#: ../../mod/admin.php:864
msgid "Log file"
msgstr "Protokolldatei"
-#: ../../mod/admin.php:855
+#: ../../mod/admin.php:864
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:856
+#: ../../mod/admin.php:865
msgid "Log level"
msgstr "Protokoll-Level"
-#: ../../mod/admin.php:897
+#: ../../mod/admin.php:906
msgid "Close"
msgstr "Schließen"
-#: ../../mod/admin.php:903
+#: ../../mod/admin.php:912
msgid "FTP Host"
msgstr "FTP Host"
-#: ../../mod/admin.php:904
+#: ../../mod/admin.php:913
msgid "FTP Path"
msgstr "FTP Pfad"
-#: ../../mod/admin.php:905
+#: ../../mod/admin.php:914
msgid "FTP User"
msgstr "FTP Nutzername"
-#: ../../mod/admin.php:906
+#: ../../mod/admin.php:915
msgid "FTP Password"
msgstr "FTP Passwort"
@@ -3133,48 +3264,48 @@ msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt."
msgid "Tips for New Members"
msgstr "Tipps für neue Nutzer"
-#: ../../mod/ping.php:146
+#: ../../mod/ping.php:174
msgid "{0} wants to be your friend"
msgstr "{0} möchte mit dir in Kontakt treten"
-#: ../../mod/ping.php:151
+#: ../../mod/ping.php:179
msgid "{0} sent you a message"
msgstr "{0} hat dir eine Nachricht geschickt"
-#: ../../mod/ping.php:156
+#: ../../mod/ping.php:184
msgid "{0} requested registration"
msgstr "{0} möchte sich registrieren"
-#: ../../mod/ping.php:162
+#: ../../mod/ping.php:190
#, php-format
msgid "{0} commented %s's post"
msgstr "{0} kommentierte einen Beitrag von %s"
-#: ../../mod/ping.php:167
+#: ../../mod/ping.php:195
#, php-format
msgid "{0} liked %s's post"
msgstr "{0} mag %ss Beitrag"
-#: ../../mod/ping.php:172
+#: ../../mod/ping.php:200
#, php-format
msgid "{0} disliked %s's post"
msgstr "{0} mag %ss Beitrag nicht"
-#: ../../mod/ping.php:177
+#: ../../mod/ping.php:205
#, php-format
msgid "{0} is now friends with %s"
msgstr "{0} ist jetzt mit %s befreundet"
-#: ../../mod/ping.php:182
+#: ../../mod/ping.php:210
msgid "{0} posted"
msgstr "{0} hat etwas veröffentlicht"
-#: ../../mod/ping.php:187
+#: ../../mod/ping.php:215
#, php-format
msgid "{0} tagged %s's post with #%s"
msgstr "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen"
-#: ../../mod/ping.php:193
+#: ../../mod/ping.php:221
msgid "{0} mentioned you in a post"
msgstr "{0} hat dich in einem Beitrag erwähnt"
@@ -3236,7 +3367,7 @@ msgstr "Gemeinsame Freunde"
msgid "No friends in common."
msgstr "Keine gemeinsamen Freunde."
-#: ../../mod/display.php:127
+#: ../../mod/display.php:130
msgid "Item has been removed."
msgstr "Eintrag wurde entfernt."
@@ -3602,78 +3733,84 @@ msgid ""
"Once you have registered, please connect with me via my profile page at:"
msgstr "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:"
-#: ../../mod/dfrn_confirm.php:238
+#: ../../mod/dfrn_confirm.php:119
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it"
+" has already been approved."
+msgstr "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde."
+
+#: ../../mod/dfrn_confirm.php:239
msgid "Response from remote site was not understood."
msgstr "Antwort der Gegenstelle unverständlich."
-#: ../../mod/dfrn_confirm.php:247
+#: ../../mod/dfrn_confirm.php:248
msgid "Unexpected response from remote site: "
msgstr "Unerwartete Antwort der Gegenstelle: "
-#: ../../mod/dfrn_confirm.php:255
+#: ../../mod/dfrn_confirm.php:256
msgid "Confirmation completed successfully."
msgstr "Bestätigung erfolgreich abgeschlossen."
-#: ../../mod/dfrn_confirm.php:257 ../../mod/dfrn_confirm.php:271
-#: ../../mod/dfrn_confirm.php:278
+#: ../../mod/dfrn_confirm.php:258 ../../mod/dfrn_confirm.php:272
+#: ../../mod/dfrn_confirm.php:279
msgid "Remote site reported: "
msgstr "Gegenstelle meldet: "
-#: ../../mod/dfrn_confirm.php:269
+#: ../../mod/dfrn_confirm.php:270
msgid "Temporary failure. Please wait and try again."
msgstr "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal."
-#: ../../mod/dfrn_confirm.php:276
+#: ../../mod/dfrn_confirm.php:277
msgid "Introduction failed or was revoked."
msgstr "Kontaktanfrage schlug fehl oder wurde zurück gezogen."
-#: ../../mod/dfrn_confirm.php:421
+#: ../../mod/dfrn_confirm.php:422
msgid "Unable to set contact photo."
msgstr "Konnte das Bild des Kontakts nicht speichern."
-#: ../../mod/dfrn_confirm.php:473 ../../include/diaspora.php:495
+#: ../../mod/dfrn_confirm.php:474 ../../include/diaspora.php:495
#: ../../include/conversation.php:101
#, php-format
msgid "%1$s is now friends with %2$s"
msgstr "%1$s ist nun mit %2$s befreundet"
-#: ../../mod/dfrn_confirm.php:543
+#: ../../mod/dfrn_confirm.php:544
#, php-format
msgid "No user record found for '%s' "
msgstr "Für '%s' wurde kein Nutzer gefunden"
-#: ../../mod/dfrn_confirm.php:553
+#: ../../mod/dfrn_confirm.php:554
msgid "Our site encryption key is apparently messed up."
msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend im Arsch."
-#: ../../mod/dfrn_confirm.php:564
+#: ../../mod/dfrn_confirm.php:565
msgid "Empty site URL was provided or URL could not be decrypted by us."
msgstr "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden."
-#: ../../mod/dfrn_confirm.php:585
+#: ../../mod/dfrn_confirm.php:586
msgid "Contact record was not found for you on our site."
msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden."
-#: ../../mod/dfrn_confirm.php:599
+#: ../../mod/dfrn_confirm.php:600
#, php-format
msgid "Site public key not available in contact record for URL %s."
msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server."
-#: ../../mod/dfrn_confirm.php:619
+#: ../../mod/dfrn_confirm.php:620
msgid ""
"The ID provided by your system is a duplicate on our system. It should work "
"if you try again."
msgstr "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal."
-#: ../../mod/dfrn_confirm.php:630
+#: ../../mod/dfrn_confirm.php:631
msgid "Unable to set your contact credentials on our system."
msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden."
-#: ../../mod/dfrn_confirm.php:684
+#: ../../mod/dfrn_confirm.php:694
msgid "Unable to update your contact profile details on our system"
msgstr "Die Updates für dein Profil konnten nicht gespeichert werden"
-#: ../../mod/dfrn_confirm.php:714
+#: ../../mod/dfrn_confirm.php:724
#, php-format
msgid "Connection accepted at %s"
msgstr "Auf %s wurde die Verbindung akzeptiert"
@@ -3786,7 +3923,7 @@ msgid "Facebook post failed. Queued for retry."
msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut."
#: ../../addon/facebook/facebook.php:877 ../../addon/facebook/facebook.php:886
-#: ../../include/bb2diaspora.php:132
+#: ../../include/bb2diaspora.php:102
msgid "link"
msgstr "Verweis"
@@ -3844,6 +3981,30 @@ msgstr "SSL Verwenden "
msgid "yourls Settings saved."
msgstr "yourls Einstellungen gespeichert"
+#: ../../addon/ljpost/ljpost.php:38
+msgid "Post to LiveJournal"
+msgstr "In LiveJournal veröffentlichen."
+
+#: ../../addon/ljpost/ljpost.php:69
+msgid "LiveJournal Post Settings"
+msgstr "LiveJournal Veröffentlichungs-Einstellungen"
+
+#: ../../addon/ljpost/ljpost.php:71
+msgid "Enable LiveJournal Post Plugin"
+msgstr "LiveJournal Post Plugin aktivieren"
+
+#: ../../addon/ljpost/ljpost.php:76
+msgid "LiveJournal username"
+msgstr "LiveJournal Benutzername"
+
+#: ../../addon/ljpost/ljpost.php:81
+msgid "LiveJournal password"
+msgstr "LiveJournal Passwort"
+
+#: ../../addon/ljpost/ljpost.php:86
+msgid "Post to LiveJournal by default"
+msgstr "Standardmäßig bei LiveJournal veröffentlichen"
+
#: ../../addon/nsfw/nsfw.php:47
msgid "\"Not Safe For Work\" Settings"
msgstr "\"Not Safe For Work\"-Einstellungen"
@@ -3870,12 +4031,15 @@ msgid "%s - Click to open/close"
msgstr "%s – Zum Öffnen/Schließen klicken"
#: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:62
-#: ../../boot.php:710
+#: ../../addon/communityhome/communityhome.php:34
+#: ../../addon/communityhome/twillingham/communityhome.php:28
+#: ../../addon/communityhome/twillingham/communityhome.php:34
+#: ../../include/nav.php:62 ../../boot.php:710
msgid "Login"
msgstr "Anmeldung"
#: ../../addon/communityhome/communityhome.php:29
+#: ../../addon/communityhome/twillingham/communityhome.php:29
msgid "OpenID"
msgstr "OpenID"
@@ -3884,6 +4048,7 @@ msgid "Last users"
msgstr "Letzte Nutzer"
#: ../../addon/communityhome/communityhome.php:81
+#: ../../addon/communityhome/twillingham/communityhome.php:81
msgid "Most active users"
msgstr "Aktivste Nutzer"
@@ -3895,11 +4060,15 @@ msgstr "Letzte Fotos"
msgid "Last likes"
msgstr "Zuletzt gemocht"
-#: ../../addon/communityhome/communityhome.php:155
+#: ../../addon/communityhome/communityhome.php:155 ../../include/text.php:1224
#: ../../include/conversation.php:45 ../../include/conversation.php:118
msgid "event"
msgstr "Veranstaltung"
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
+msgstr "Letzte Benutzer"
+
#: ../../addon/uhremotestorage/uhremotestorage.php:84
#, php-format
msgid ""
@@ -3987,6 +4156,30 @@ msgstr "Randplace-Einstellungen"
msgid "Enable Randplace Plugin"
msgstr "Randplace-Plugin aktivieren"
+#: ../../addon/dwpost/dwpost.php:38
+msgid "Post to Dreamwidth"
+msgstr "In Dreamwidth veröffentlichen"
+
+#: ../../addon/dwpost/dwpost.php:69
+msgid "Dreamwidth Post Settings"
+msgstr "Dreamwidth Veröffentlichungs-Einstellungen"
+
+#: ../../addon/dwpost/dwpost.php:71
+msgid "Enable dreamwidth Post Plugin"
+msgstr "Dreamwidth Post Plugin aktivieren"
+
+#: ../../addon/dwpost/dwpost.php:76
+msgid "dreamwidth username"
+msgstr "Dreamwidth Benutzername"
+
+#: ../../addon/dwpost/dwpost.php:81
+msgid "dreamwidth password"
+msgstr "Dreamwidth Passwort"
+
+#: ../../addon/dwpost/dwpost.php:86
+msgid "Post to dreamwidth by default"
+msgstr "Standardmäßig bei Dreamwidth veröffentlichen"
+
#: ../../addon/drpost/drpost.php:35
msgid "Post to Drupal"
msgstr "Bei Drupal veröffentlichen"
@@ -4165,10 +4358,16 @@ msgid "Quick Comment Settings"
msgstr "Schnell-Kommentar Einstellungen"
#: ../../addon/qcomment/qcomment.php:56
+msgid ""
+"Quick comments are found near comment boxes, sometimes hidden. Click them to"
+" provide simple replies."
+msgstr "Kurz-Kommentare findet man in der Nähe der Kommentar-Boxen. Ein Klick darauf erstellt einfache Antworten."
+
+#: ../../addon/qcomment/qcomment.php:57
msgid "Enter quick comments, one per line"
msgstr "Gib einen Schnell-Kommentar pro Zeile ein"
-#: ../../addon/qcomment/qcomment.php:74
+#: ../../addon/qcomment/qcomment.php:75
msgid "Quick Comment settings saved."
msgstr "Schnell-Kommentare Einstellungen gespeichert"
@@ -4371,6 +4570,29 @@ msgstr "Numfriends Einstellungen"
msgid "How many contacts to display on profile sidebar"
msgstr "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden"
+#: ../../addon/gnot/gnot.php:48
+msgid "Gnot settings updated."
+msgstr "Gnot Einstellungen aktualisiert."
+
+#: ../../addon/gnot/gnot.php:79
+msgid "Gnot Settings"
+msgstr "Gnot Einstellungen"
+
+#: ../../addon/gnot/gnot.php:81
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the"
+" subject line."
+msgstr "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff"
+
+#: ../../addon/gnot/gnot.php:82
+msgid "Enable this plugin/addon?"
+msgstr "Dieses Plugin/Addon aktivieren?"
+
+#: ../../addon/gnot/gnot.php:97
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr "[Friendica Meldung] Kommentar zum Beitrag #%d"
+
#: ../../addon/wppost/wppost.php:42
msgid "Post to Wordpress"
msgstr "Bei WordPress veröffentlichen"
@@ -4521,6 +4743,10 @@ msgstr "Consumer Key"
msgid "Consumer secret"
msgstr "Consumer Secret"
+#: ../../addon/irc/irc.php:20
+msgid "irc Chatroom"
+msgstr "irc Chatroom"
+
#: ../../addon/posterous/posterous.php:36
msgid "Post to Posterous"
msgstr "Nach Posterous senden"
@@ -4545,6 +4771,22 @@ msgstr "Posterous-Passwort"
msgid "Post to Posterous by default"
msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous"
+#: ../../view/theme/quattro/theme.php:17
+msgid "Theme settings"
+msgstr "Themen Einstellungen"
+
+#: ../../view/theme/quattro/theme.php:18
+msgid "Alignment"
+msgstr "Ausrichtung"
+
+#: ../../view/theme/quattro/theme.php:18
+msgid "Left"
+msgstr "Links"
+
+#: ../../view/theme/quattro/theme.php:18
+msgid "Center"
+msgstr "Mitte"
+
#: ../../include/profile_advanced.php:17 ../../boot.php:982
msgid "Gender:"
msgstr "Geschlecht:"
@@ -4906,142 +5148,154 @@ msgstr "Ist mir nicht wichtig"
msgid "Ask me"
msgstr "Frag mich"
-#: ../../include/event.php:17 ../../include/bb2diaspora.php:274
+#: ../../include/event.php:17 ../../include/bb2diaspora.php:244
msgid "Starts:"
msgstr "Beginnt:"
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:282
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:252
msgid "Finishes:"
msgstr "Endet:"
-#: ../../include/delivery.php:424 ../../include/notifier.php:637
+#: ../../include/delivery.php:425 ../../include/notifier.php:638
msgid "(no subject)"
msgstr "(kein Betreff)"
-#: ../../include/delivery.php:431 ../../include/enotify.php:16
-#: ../../include/notifier.php:644
+#: ../../include/delivery.php:432 ../../include/enotify.php:17
+#: ../../include/notifier.php:645
msgid "noreply"
msgstr "noreply"
-#: ../../include/text.php:232
+#: ../../include/text.php:238
msgid "prev"
msgstr "vorige"
-#: ../../include/text.php:234
+#: ../../include/text.php:240
msgid "first"
msgstr "erste"
-#: ../../include/text.php:263
+#: ../../include/text.php:269
msgid "last"
msgstr "letzte"
-#: ../../include/text.php:266
+#: ../../include/text.php:272
msgid "next"
msgstr "nächste"
-#: ../../include/text.php:557
+#: ../../include/text.php:563
msgid "No contacts"
msgstr "Keine Kontakte"
-#: ../../include/text.php:566
+#: ../../include/text.php:572
#, php-format
msgid "%d Contact"
msgid_plural "%d Contacts"
msgstr[0] "%d Kontakt"
msgstr[1] "%d Kontakte"
-#: ../../include/text.php:637 ../../include/nav.php:87
+#: ../../include/text.php:643 ../../include/nav.php:87
msgid "Search"
msgstr "Suche"
-#: ../../include/text.php:813
+#: ../../include/text.php:831
msgid "Monday"
msgstr "Montag"
-#: ../../include/text.php:813
+#: ../../include/text.php:831
msgid "Tuesday"
msgstr "Dienstag"
-#: ../../include/text.php:813
+#: ../../include/text.php:831
msgid "Wednesday"
msgstr "Mittwoch"
-#: ../../include/text.php:813
+#: ../../include/text.php:831
msgid "Thursday"
msgstr "Donnerstag"
-#: ../../include/text.php:813
+#: ../../include/text.php:831
msgid "Friday"
msgstr "Freitag"
-#: ../../include/text.php:813
+#: ../../include/text.php:831
msgid "Saturday"
msgstr "Samstag"
-#: ../../include/text.php:813
+#: ../../include/text.php:831
msgid "Sunday"
msgstr "Sonntag"
-#: ../../include/text.php:817
+#: ../../include/text.php:835
msgid "January"
msgstr "Januar"
-#: ../../include/text.php:817
+#: ../../include/text.php:835
msgid "February"
msgstr "Februar"
-#: ../../include/text.php:817
+#: ../../include/text.php:835
msgid "March"
msgstr "März"
-#: ../../include/text.php:817
+#: ../../include/text.php:835
msgid "April"
msgstr "April"
-#: ../../include/text.php:817
+#: ../../include/text.php:835
msgid "May"
msgstr "Mai"
-#: ../../include/text.php:817
+#: ../../include/text.php:835
msgid "June"
msgstr "Juni"
-#: ../../include/text.php:817
+#: ../../include/text.php:835
msgid "July"
msgstr "Juli"
-#: ../../include/text.php:817
+#: ../../include/text.php:835
msgid "August"
msgstr "August"
-#: ../../include/text.php:817
+#: ../../include/text.php:835
msgid "September"
msgstr "September"
-#: ../../include/text.php:817
+#: ../../include/text.php:835
msgid "October"
msgstr "Oktober"
-#: ../../include/text.php:817
+#: ../../include/text.php:835
msgid "November"
msgstr "November"
-#: ../../include/text.php:817
+#: ../../include/text.php:835
msgid "December"
msgstr "Dezember"
-#: ../../include/text.php:887
+#: ../../include/text.php:905
msgid "bytes"
msgstr "Byte"
-#: ../../include/text.php:982
+#: ../../include/text.php:1000
msgid "Select an alternate language"
msgstr "Alternative Sprache auswählen"
-#: ../../include/text.php:994
+#: ../../include/text.php:1012
msgid "default"
msgstr "standard"
+#: ../../include/text.php:1228
+msgid "activity"
+msgstr "Aktivität"
+
+#: ../../include/text.php:1230
+msgid "comment"
+msgstr "Kommentar"
+
+#: ../../include/text.php:1231
+msgid "post"
+msgstr "Beitrag"
+
#: ../../include/diaspora.php:570
msgid "Sharing notification from Diaspora network"
msgstr "Freigabe-Benachrichtigung von Diaspora"
@@ -5055,6 +5309,10 @@ msgstr "Anhänge:"
msgid "[Relayed] Comment authored by %s from network %s"
msgstr "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk"
+#: ../../include/network.php:814
+msgid "view full size"
+msgstr "Volle Größe anzeigen"
+
#: ../../include/oembed.php:128
msgid "Embedded content"
msgstr "Eingebetteter Inhalt"
@@ -5350,7 +5608,7 @@ msgstr "Sekunden"
msgid "%1$d %2$s ago"
msgstr "%1$d %2$s her"
-#: ../../include/poller.php:474
+#: ../../include/poller.php:513
msgid "From: "
msgstr "Von: "
@@ -5371,15 +5629,15 @@ msgstr "Kann die DNS Informationen für den Datenbanken Server '%s' nicht ermitt
msgid "[no subject]"
msgstr "[kein Betreff]"
-#: ../../include/acl_selectors.php:279
+#: ../../include/acl_selectors.php:284
msgid "Visible to everybody"
msgstr "Für jeden sichtbar"
-#: ../../include/acl_selectors.php:280
+#: ../../include/acl_selectors.php:285
msgid "show"
msgstr "zeigen"
-#: ../../include/acl_selectors.php:281
+#: ../../include/acl_selectors.php:286
msgid "don't show"
msgstr "nicht zeigen"
@@ -5396,172 +5654,191 @@ msgstr "Danke,"
msgid "%s Administrator"
msgstr "der Administrator von %s"
-#: ../../include/enotify.php:28
+#: ../../include/enotify.php:29
#, php-format
-msgid "New mail received at %s"
-msgstr "Neue Nachricht auf %s empfangen"
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
-#: ../../include/enotify.php:30
+#: ../../include/enotify.php:33
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
+msgstr "[Friendica Meldung] Neue Nachricht erhalten von %s"
+
+#: ../../include/enotify.php:35
#, php-format
msgid "%s sent you a new private message at %s."
msgstr "%s hat dir eine neue private Nachricht auf %s geschrieben."
-#: ../../include/enotify.php:31
+#: ../../include/enotify.php:36
#, php-format
msgid "%s sent you %s."
msgstr "%s hat Dir geschickt %s"
-#: ../../include/enotify.php:31
+#: ../../include/enotify.php:36
msgid "a private message"
msgstr "eine private Nachricht"
-#: ../../include/enotify.php:32
+#: ../../include/enotify.php:37
#, php-format
msgid "Please visit %s to view and/or reply to your private messages."
msgstr "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten."
-#: ../../include/enotify.php:40
+#: ../../include/enotify.php:67
+#, php-format
+msgid "%s's"
+msgstr "%s's"
+
+#: ../../include/enotify.php:71
+msgid "your"
+msgstr "Dein"
+
+#: ../../include/enotify.php:78
#, php-format
-msgid "%s commented on an item at %s"
-msgstr "%s kommentierte einen Beitrag auf %s"
+msgid "[Friendica:Notify] Comment to conversation #%d by %s"
+msgstr "[Friendica Meldung] Kommentar zum Beitrag #%d von %s"
-#: ../../include/enotify.php:41
+#: ../../include/enotify.php:79
#, php-format
msgid "%s commented on an item/conversation you have been following."
msgstr "%s hat einen Beitrag kommentiert, dem du folgst."
-#: ../../include/enotify.php:42
+#: ../../include/enotify.php:80
#, php-format
-msgid "%s commented in %s."
-msgstr "%s wurde kommentiert in %s"
+msgid "%s commented on %s."
+msgstr "%s kommentierte %s."
-#: ../../include/enotify.php:42
-msgid "a watched conversation"
-msgstr "eine beobachtete Unterhaltung"
-
-#: ../../include/enotify.php:44 ../../include/enotify.php:54
-#: ../../include/enotify.php:64 ../../include/enotify.php:74
+#: ../../include/enotify.php:82 ../../include/enotify.php:95
+#: ../../include/enotify.php:106 ../../include/enotify.php:117
#, php-format
msgid "Please visit %s to view and/or reply to the conversation."
msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."
-#: ../../include/enotify.php:51
+#: ../../include/enotify.php:89
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr "[Friendica Meldung] %s hat auf Deine Pinnwand geschrieben"
+
+#: ../../include/enotify.php:91
#, php-format
msgid "%s posted to your profile wall at %s"
msgstr "%s hat auf deine Pinnwand bei %s gepostet"
-#: ../../include/enotify.php:52
+#: ../../include/enotify.php:93
#, php-format
msgid "%s posted to %s"
msgstr "%s schrieb an %s"
-#: ../../include/enotify.php:52
+#: ../../include/enotify.php:93
msgid "your profile wall."
msgstr "Deine Pinnwand"
-#: ../../include/enotify.php:61
+#: ../../include/enotify.php:102
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr "[Friendica Meldung] %s hat Dich erwähnt"
+
+#: ../../include/enotify.php:103
#, php-format
msgid "%s tagged you at %s"
msgstr "%s hat dich auf %s erwähnt"
-#: ../../include/enotify.php:62
+#: ../../include/enotify.php:104
#, php-format
msgid "%s %s."
msgstr "%s %s."
-#: ../../include/enotify.php:62
+#: ../../include/enotify.php:104
msgid "tagged you"
msgstr "erwähnte Dich"
-#: ../../include/enotify.php:71
+#: ../../include/enotify.php:113
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr "[Friendica Meldung] %s markierte Deinen Beitrag"
+
+#: ../../include/enotify.php:114
#, php-format
msgid "%s tagged your post at %s"
msgstr "%s hat deinen Beitrag auf %s getaggt"
-#: ../../include/enotify.php:72
+#: ../../include/enotify.php:115
#, php-format
msgid "%s tagged %s"
msgstr "%s markierte %s"
-#: ../../include/enotify.php:72
+#: ../../include/enotify.php:115
msgid "your post"
msgstr "Dein Beitrag"
-#: ../../include/enotify.php:81
-#, php-format
-msgid "Introduction received at %s"
-msgstr "Kontaktanfrage auf %s erhalten"
+#: ../../include/enotify.php:124
+msgid "[Friendica:Notify] Introduction received"
+msgstr "[Friendica Meldung] Kontaktanfrage erhalten"
-#: ../../include/enotify.php:82
+#: ../../include/enotify.php:125
#, php-format
msgid "You've received an introduction from '%s' at %s"
msgstr "Du hast eine Kontaktanfrage von '%s' auf %s erhalten"
-#: ../../include/enotify.php:83
+#: ../../include/enotify.php:126
#, php-format
msgid "You've received %s from %s."
msgstr "Du hast %s von %s erhalten."
-#: ../../include/enotify.php:83
+#: ../../include/enotify.php:126
msgid "an introduction"
msgstr "eine Einführung"
-#: ../../include/enotify.php:84 ../../include/enotify.php:101
+#: ../../include/enotify.php:127 ../../include/enotify.php:144
#, php-format
msgid "You may visit their profile at %s"
msgstr "Hier kannst du das Profil betrachten: %s"
-#: ../../include/enotify.php:86
+#: ../../include/enotify.php:129
#, php-format
msgid "Please visit %s to approve or reject the introduction."
msgstr "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen."
-#: ../../include/enotify.php:93
-#, php-format
-msgid "Friend suggestion received at %s"
-msgstr "Kontaktvorschlag empfangen auf %s"
+#: ../../include/enotify.php:136
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr "[Friendica Meldung] Kontaktvorschlag erhalten"
-#: ../../include/enotify.php:94
+#: ../../include/enotify.php:137
#, php-format
msgid "You've received a friend suggestion from '%s' at %s"
msgstr "Du hast von '%s' einen Kontaktvorschlag erhalten auf %s"
-#: ../../include/enotify.php:95
+#: ../../include/enotify.php:138
#, php-format
msgid "You've received %s for %s from %s."
msgstr "Du hast %s für %s von %s erhalten."
-#: ../../include/enotify.php:96
+#: ../../include/enotify.php:139
msgid "a friend suggestion"
msgstr "ein Freunde Vorschlag"
-#: ../../include/enotify.php:99
+#: ../../include/enotify.php:142
msgid "Name:"
msgstr "Name:"
-#: ../../include/enotify.php:100
+#: ../../include/enotify.php:143
msgid "Photo:"
msgstr "Foto:"
-#: ../../include/enotify.php:103
+#: ../../include/enotify.php:146
#, php-format
msgid "Please visit %s to approve or reject the suggestion."
msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen."
-#: ../../include/items.php:2511
+#: ../../include/items.php:2573
msgid "A new person is sharing with you at "
msgstr "Eine neue Person teilt mit dir auf "
-#: ../../include/items.php:2511
+#: ../../include/items.php:2573
msgid "You have a new follower at "
msgstr "Du hast einen neuen Kontakt auf "
-#: ../../include/bb2diaspora.php:83
-msgid "view full size"
-msgstr "Volle Größe anzeigen"
-
-#: ../../include/bb2diaspora.php:132 ../../include/bb2diaspora.php:142
-#: ../../include/bb2diaspora.php:143
+#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
+#: ../../include/bb2diaspora.php:113
msgid "image/photo"
msgstr "Bild/Foto"
@@ -5577,25 +5854,25 @@ msgstr "Bitte lade ein Profilbild hoch."
msgid "Welcome back "
msgstr "Willkommen zurück "
-#: ../../include/Contact.php:131 ../../include/conversation.php:769
+#: ../../include/Contact.php:131 ../../include/conversation.php:788
msgid "View status"
msgstr "Status anzeigen"
-#: ../../include/Contact.php:132 ../../include/conversation.php:770
+#: ../../include/Contact.php:132 ../../include/conversation.php:789
msgid "View profile"
msgstr "Profil anzeigen"
-#: ../../include/Contact.php:133 ../../include/conversation.php:771
+#: ../../include/Contact.php:133 ../../include/conversation.php:790
msgid "View photos"
msgstr "Fotos ansehen"
#: ../../include/Contact.php:134 ../../include/Contact.php:147
-#: ../../include/conversation.php:772
+#: ../../include/conversation.php:791
msgid "View recent"
msgstr "Neueste anzeigen"
#: ../../include/Contact.php:136 ../../include/Contact.php:147
-#: ../../include/conversation.php:774
+#: ../../include/conversation.php:793
msgid "Send PM"
msgstr "Private Nachricht senden"
@@ -5608,188 +5885,188 @@ 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:301 ../../include/conversation.php:562
+#: ../../include/conversation.php:303 ../../include/conversation.php:572
msgid "Select"
msgstr "Auswählen"
-#: ../../include/conversation.php:316 ../../include/conversation.php:648
-#: ../../include/conversation.php:649
+#: ../../include/conversation.php:320 ../../include/conversation.php:665
+#: ../../include/conversation.php:666
#, php-format
msgid "View %s's profile @ %s"
msgstr "Das Profil von %s auf %s betrachten."
-#: ../../include/conversation.php:325 ../../include/conversation.php:660
+#: ../../include/conversation.php:330 ../../include/conversation.php:677
#, php-format
msgid "%s from %s"
msgstr "%s von %s"
-#: ../../include/conversation.php:341
+#: ../../include/conversation.php:346
msgid "View in context"
msgstr "Im Zusammenhang betrachten"
-#: ../../include/conversation.php:456
+#: ../../include/conversation.php:467
#, php-format
msgid "%d comment"
msgid_plural "%d comments"
msgstr[0] "%d Kommentar"
msgstr[1] "%d Kommentare"
-#: ../../include/conversation.php:459 ../../boot.php:448
+#: ../../include/conversation.php:468 ../../boot.php:448
msgid "show more"
msgstr "mehr anzeigen"
-#: ../../include/conversation.php:519
+#: ../../include/conversation.php:529
msgid "like"
msgstr "mag ich"
-#: ../../include/conversation.php:520
+#: ../../include/conversation.php:530
msgid "dislike"
msgstr "mag ich nicht"
-#: ../../include/conversation.php:522
+#: ../../include/conversation.php:532
msgid "Share this"
msgstr "Teile dieses"
-#: ../../include/conversation.php:522
+#: ../../include/conversation.php:532
msgid "share"
msgstr "Teilen"
-#: ../../include/conversation.php:572
+#: ../../include/conversation.php:582
msgid "add star"
msgstr "markieren"
-#: ../../include/conversation.php:573
+#: ../../include/conversation.php:583
msgid "remove star"
msgstr "Markierung entfernen"
-#: ../../include/conversation.php:574
+#: ../../include/conversation.php:584
msgid "toggle star status"
msgstr "Markierung umschalten"
-#: ../../include/conversation.php:577
+#: ../../include/conversation.php:587
msgid "starred"
msgstr "markiert"
-#: ../../include/conversation.php:578
+#: ../../include/conversation.php:588
msgid "add tag"
msgstr "Tag hinzufügen"
-#: ../../include/conversation.php:650
+#: ../../include/conversation.php:667
msgid "to"
msgstr "zu"
-#: ../../include/conversation.php:651
+#: ../../include/conversation.php:668
msgid "Wall-to-Wall"
msgstr "Wall-to-Wall"
-#: ../../include/conversation.php:652
+#: ../../include/conversation.php:669
msgid "via Wall-To-Wall:"
msgstr "via Wall-To-Wall:"
-#: ../../include/conversation.php:694
+#: ../../include/conversation.php:713
msgid "Delete Selected Items"
msgstr "Lösche die markierten Beiträge"
-#: ../../include/conversation.php:826
+#: ../../include/conversation.php:845
#, php-format
msgid "%s likes this."
msgstr "%s mag das."
-#: ../../include/conversation.php:826
+#: ../../include/conversation.php:845
#, php-format
msgid "%s doesn't like this."
msgstr "%s mag das nicht."
-#: ../../include/conversation.php:830
+#: ../../include/conversation.php:849
#, php-format
msgid "<span %1$s>%2$d people</span> like this."
msgstr "<span %1$s>%2$d Leute</span> mögen das."
-#: ../../include/conversation.php:832
+#: ../../include/conversation.php:851
#, php-format
msgid "<span %1$s>%2$d people</span> don't like this."
msgstr "<span %1$s>%2$d Leute</span> mögen das nicht."
-#: ../../include/conversation.php:838
+#: ../../include/conversation.php:857
msgid "and"
msgstr "und"
-#: ../../include/conversation.php:841
+#: ../../include/conversation.php:860
#, php-format
msgid ", and %d other people"
msgstr " und %d andere"
-#: ../../include/conversation.php:842
+#: ../../include/conversation.php:861
#, php-format
msgid "%s like this."
msgstr "%s mögen das."
-#: ../../include/conversation.php:842
+#: ../../include/conversation.php:861
#, php-format
msgid "%s don't like this."
msgstr "%s mögen das nicht."
-#: ../../include/conversation.php:867
+#: ../../include/conversation.php:886
msgid "Visible to <strong>everybody</strong>"
msgstr "Für <strong>jedermann</strong> sichtbar"
-#: ../../include/conversation.php:869
+#: ../../include/conversation.php:888
msgid "Please enter a video link/URL:"
msgstr "Bitte Link/URL zum Video einfügen:"
-#: ../../include/conversation.php:870
+#: ../../include/conversation.php:889
msgid "Please enter an audio link/URL:"
msgstr "Bitte Link/URL zum Audio einfügen:"
-#: ../../include/conversation.php:871
+#: ../../include/conversation.php:890
msgid "Tag term:"
msgstr "Tag:"
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:891
msgid "Where are you right now?"
msgstr "Wo hältst du dich jetzt gerade auf?"
-#: ../../include/conversation.php:873
+#: ../../include/conversation.php:892
msgid "Enter a title for this item"
msgstr "Gib den Titel für diesen Beitrag ein"
-#: ../../include/conversation.php:916
+#: ../../include/conversation.php:935
msgid "upload photo"
msgstr "Bild hochladen"
-#: ../../include/conversation.php:918
+#: ../../include/conversation.php:937
msgid "attach file"
msgstr "Datei anhängen"
-#: ../../include/conversation.php:920
+#: ../../include/conversation.php:939
msgid "web link"
msgstr "Weblink"
-#: ../../include/conversation.php:921
+#: ../../include/conversation.php:940
msgid "Insert video link"
msgstr "Video-Adresse einfügen"
-#: ../../include/conversation.php:922
+#: ../../include/conversation.php:941
msgid "video link"
msgstr "Video-Link"
-#: ../../include/conversation.php:923
+#: ../../include/conversation.php:942
msgid "Insert audio link"
msgstr "Audio-Adresse einfügen"
-#: ../../include/conversation.php:924
+#: ../../include/conversation.php:943
msgid "audio link"
msgstr "Audio-Link"
-#: ../../include/conversation.php:926
+#: ../../include/conversation.php:945
msgid "set location"
msgstr "Ort setzen"
-#: ../../include/conversation.php:928
+#: ../../include/conversation.php:947
msgid "clear location"
msgstr "Ort löschen"
-#: ../../include/conversation.php:933
+#: ../../include/conversation.php:952
msgid "permissions"
msgstr "Zugriffsrechte"
diff --git a/view/de/strings.php b/view/de/strings.php
index a093b7068..3f9176cd7 100755
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -409,6 +409,10 @@ $a->strings["Email login name:"] = "E-Mail-Login-Name:";
$a->strings["Email password:"] = "E-Mail-Passwort:";
$a->strings["Reply-to address:"] = "Reply-to Adresse:";
$a->strings["Send public posts to all email contacts:"] = "Sende öffentliche Beiträge an alle E-Mail-Kontakte:";
+$a->strings["Action after import:"] = "Aktion nach Import:";
+$a->strings["Mark as seen"] = "Als gelesen markieren";
+$a->strings["Move to folder"] = "In einen Ordner verschieben";
+$a->strings["Move to folder:"] = "In diesen Ordner verschieben:";
$a->strings["Normal Account"] = "Normaler Account";
$a->strings["This account is a normal personal profile"] = "Dieser Account ist ein normales persönliches Profil";
$a->strings["Soapbox Account"] = "Sandkasten-Account";
@@ -518,9 +522,9 @@ $a->strings["Create a group of contacts/friends."] = "Eine Gruppe von Kontakten/
$a->strings["Group Name: "] = "Gruppenname:";
$a->strings["Group removed."] = "Gruppe entfernt.";
$a->strings["Unable to remove group."] = "Konnte die Gruppe nicht entfernen.";
-$a->strings["Click on a contact to add or remove."] = "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen";
$a->strings["Group Editor"] = "Gruppeneditor";
$a->strings["Members"] = "Mitglieder";
+$a->strings["Click on a contact to add or remove."] = "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen";
$a->strings["Invalid profile identifier."] = "Ungültiger Profil-Bezeichner";
$a->strings["Profile Visibility Editor"] = "Editor für die Profil-Sichtbarkeit";
$a->strings["Profile"] = "Profil";
@@ -643,32 +647,51 @@ $a->strings["Site name"] = "Seitenname";
$a->strings["Banner/Logo"] = "Banner/Logo";
$a->strings["System language"] = "Systemsprache";
$a->strings["System theme"] = "Systemweites Thema";
+$a->strings["Default system theme - may be over-ridden by user profiles"] = "Standard Server Theme - kann von den Benutzereinstellungen überschrieben werden.";
$a->strings["Maximum image size"] = "Maximale Größe von Bildern";
+$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit.";
$a->strings["Register policy"] = "Registrierungsmethode";
$a->strings["Register text"] = "Registrierungstext";
+$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt.";
$a->strings["Accounts abandoned after x days"] = "Accounts gelten nach x Tagen als unbenutzt";
$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit.";
$a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte";
+$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
$a->strings["Allowed email domains"] = "Erlaubte Domains für Emails";
+$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "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.";
$a->strings["Block public"] = "Öffentlichen Zugriff blockieren";
+$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist.";
$a->strings["Force publish"] = "Erzwinge Veröffentlichung";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen.";
$a->strings["Global directory update URL"] = "URL für Updates beim weltweiten Verzeichnis";
+$a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar.";
$a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung";
+$a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen.";
$a->strings["OpenID support"] = "OpenID Unterstützung";
+$a->strings["OpenID support for registration and logins."] = "OpenID-Unterstützung für Registrierung und Login.";
$a->strings["Gravatar support"] = "Gravatar Unterstützung";
+$a->strings["Search new user's photo on Gravatar."] = "Suchfunktion bei Gravatar für Profilbilder neuer Nutzer.";
$a->strings["Fullname check"] = "Namen auf Vollständigkeit überprüfen";
+$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden.";
$a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke";
+$a->strings["Use PHP UTF8 regular expressions"] = "PHP UTF8 Ausdrücke verwenden";
$a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen";
+$a->strings["Display a Community page showing all recent public postings on this site."] = "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server.";
$a->strings["Enable OStatus support"] = "OStatus Unterstützung aktivieren";
+$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt.";
$a->strings["Enable Diaspora support"] = "Diaspora-Support aktivieren";
+$a->strings["Provide built-in Diaspora network compatibility."] = "Verwende die eingebaute Diaspora-Verknüpfung.";
$a->strings["Only allow Friendica contacts"] = "Nur Friendica-Kontakte erlauben";
+$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert.";
$a->strings["Verify SSL"] = "SSL Überprüfen";
+$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle anstellen. Das bedeutet, das man zu keinen Seiten mit selbst unterzeichneten SSL eine Verbindung herstellen kann.";
$a->strings["Proxy user"] = "Proxy Nutzer";
$a->strings["Proxy URL"] = "Proxy URL";
$a->strings["Network timeout"] = "Netzwerk Wartezeit";
-$a->strings["%s user blocked"] = array(
- 0 => "%s Nutzer gesperrt",
- 1 => "%s Nutzer gesperrt/entsperrt",
+$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen).";
+$a->strings["%s user blocked/unblocked"] = array(
+ 0 => "%s Benutzer geblockt/freigegeben",
+ 1 => "%s Benutzer geblockt/freigegeben",
);
$a->strings["%s user deleted"] = array(
0 => "%s Nutzer gelöscht",
@@ -695,7 +718,11 @@ $a->strings["Disable"] = "Ausschalten";
$a->strings["Enable"] = "Einschalten";
$a->strings["Toggle"] = "Umschalten";
$a->strings["Settings"] = "Einstellungen";
+$a->strings["Author: "] = "Autor:";
+$a->strings["Maintainer: "] = "Betreuer:";
$a->strings["No themes found."] = "Keine Themen gefunden.";
+$a->strings["[Experimental]"] = "[Experimentell]";
+$a->strings["[Unsupported]"] = "[Nicht unterstützt]";
$a->strings["Log settings updated."] = "Protokolleinstellungen aktualisiert.";
$a->strings["Clear"] = "löschen";
$a->strings["Debugging"] = "Protokoll führen";
@@ -823,6 +850,7 @@ $a->strings["Please join my social network on %s"] = "Bitte trete meinem Soziale
$a->strings["To accept this invitation, please visit:"] = "Um diese Einladung anzunehmen besuche bitte:";
$a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungscode: \$invite_code";
$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:";
+$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde.";
$a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich.";
$a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: ";
$a->strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen.";
@@ -882,6 +910,12 @@ $a->strings["Username:"] = "Nutzername:";
$a->strings["Password:"] = "Passwort:";
$a->strings["Use SSL "] = "SSL Verwenden ";
$a->strings["yourls Settings saved."] = "yourls Einstellungen gespeichert";
+$a->strings["Post to LiveJournal"] = "In LiveJournal veröffentlichen.";
+$a->strings["LiveJournal Post Settings"] = "LiveJournal Veröffentlichungs-Einstellungen";
+$a->strings["Enable LiveJournal Post Plugin"] = "LiveJournal Post Plugin aktivieren";
+$a->strings["LiveJournal username"] = "LiveJournal Benutzername";
+$a->strings["LiveJournal password"] = "LiveJournal Passwort";
+$a->strings["Post to LiveJournal by default"] = "Standardmäßig bei LiveJournal veröffentlichen";
$a->strings["\"Not Safe For Work\" Settings"] = "\"Not Safe For Work\"-Einstellungen";
$a->strings["Enable NSFW filter"] = "NSFW Filter aktivieren";
$a->strings["Comma separated words to treat as NSFW"] = "Wörter, die gefiltert werden sollen (durch Kommas getrennt)";
@@ -895,6 +929,7 @@ $a->strings["Most active users"] = "Aktivste Nutzer";
$a->strings["Last photos"] = "Letzte Fotos";
$a->strings["Last likes"] = "Zuletzt gemocht";
$a->strings["event"] = "Veranstaltung";
+$a->strings["Latest users"] = "Letzte Benutzer";
$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Ermöglicht dir, deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
$a->strings["Template URL (with {category})"] = "Vorlagen URL (mit {Kategorie})";
$a->strings["OAuth end-point"] = "OAuth end-point";
@@ -914,6 +949,12 @@ $a->strings["\"Cat\" game!"] = "Unentschieden!";
$a->strings["I won!"] = "Ich gewinne!";
$a->strings["Randplace Settings"] = "Randplace-Einstellungen";
$a->strings["Enable Randplace Plugin"] = "Randplace-Plugin aktivieren";
+$a->strings["Post to Dreamwidth"] = "In Dreamwidth veröffentlichen";
+$a->strings["Dreamwidth Post Settings"] = "Dreamwidth Veröffentlichungs-Einstellungen";
+$a->strings["Enable dreamwidth Post Plugin"] = "Dreamwidth Post Plugin aktivieren";
+$a->strings["dreamwidth username"] = "Dreamwidth Benutzername";
+$a->strings["dreamwidth password"] = "Dreamwidth Passwort";
+$a->strings["Post to dreamwidth by default"] = "Standardmäßig bei Dreamwidth veröffentlichen";
$a->strings["Post to Drupal"] = "Bei Drupal veröffentlichen";
$a->strings["Drupal Post Settings"] = "Drupal-Beitragseinstellungen";
$a->strings["Enable Drupal Post Plugin"] = "Veröffentlichung bei Drupal erlauben";
@@ -956,6 +997,7 @@ $a->strings[":-)"] = ":-)";
$a->strings[":-("] = ":-(";
$a->strings["lol"] = "lol";
$a->strings["Quick Comment Settings"] = "Schnell-Kommentar Einstellungen";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Kurz-Kommentare findet man in der Nähe der Kommentar-Boxen. Ein Klick darauf erstellt einfache Antworten.";
$a->strings["Enter quick comments, one per line"] = "Gib einen Schnell-Kommentar pro Zeile ein";
$a->strings["Quick Comment settings saved."] = "Schnell-Kommentare Einstellungen gespeichert";
$a->strings["Tile Server URL"] = "Tile Server URL";
@@ -1002,6 +1044,11 @@ $a->strings["Post to Tumblr by default"] = "Standardmäßig bei Tumblr veröffen
$a->strings["Numfriends settings updated."] = "Numfriends Einstellungen aktualisiert";
$a->strings["Numfriends Settings"] = "Numfriends Einstellungen";
$a->strings["How many contacts to display on profile sidebar"] = "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden";
+$a->strings["Gnot settings updated."] = "Gnot Einstellungen aktualisiert.";
+$a->strings["Gnot Settings"] = "Gnot Einstellungen";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff";
+$a->strings["Enable this plugin/addon?"] = "Dieses Plugin/Addon aktivieren?";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica Meldung] Kommentar zum Beitrag #%d";
$a->strings["Post to Wordpress"] = "Bei WordPress veröffentlichen";
$a->strings["WordPress Post Settings"] = "WordPress-Beitragseinstellungen";
$a->strings["Enable WordPress Post Plugin"] = "WordPress-Plugin aktivieren.";
@@ -1034,12 +1081,17 @@ $a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlaube
$a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter";
$a->strings["Consumer key"] = "Consumer Key";
$a->strings["Consumer secret"] = "Consumer Secret";
+$a->strings["irc Chatroom"] = "irc Chatroom";
$a->strings["Post to Posterous"] = "Nach Posterous senden";
$a->strings["Posterous Post Settings"] = "Posterous Beitrags-Einstellungen";
$a->strings["Enable Posterous Post Plugin"] = "Posterous-Plugin aktivieren";
$a->strings["Posterous login"] = "Posterous-Anmeldename";
$a->strings["Posterous password"] = "Posterous-Passwort";
$a->strings["Post to Posterous by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous";
+$a->strings["Theme settings"] = "Themen Einstellungen";
+$a->strings["Alignment"] = "Ausrichtung";
+$a->strings["Left"] = "Links";
+$a->strings["Center"] = "Mitte";
$a->strings["Gender:"] = "Geschlecht:";
$a->strings["j F, Y"] = "j F, Y";
$a->strings["j F"] = "j F";
@@ -1166,9 +1218,13 @@ $a->strings["December"] = "Dezember";
$a->strings["bytes"] = "Byte";
$a->strings["Select an alternate language"] = "Alternative Sprache auswählen";
$a->strings["default"] = "standard";
+$a->strings["activity"] = "Aktivität";
+$a->strings["comment"] = "Kommentar";
+$a->strings["post"] = "Beitrag";
$a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
$a->strings["Attachments:"] = "Anhänge:";
$a->strings["[Relayed] Comment authored by %s from network %s"] = "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk";
+$a->strings["view full size"] = "Volle Größe anzeigen";
$a->strings["Embedded content"] = "Eingebetteter Inhalt";
$a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen.";
@@ -1255,32 +1311,37 @@ $a->strings["don't show"] = "nicht zeigen";
$a->strings["Friendica Notification"] = "Friendica-Benachrichtigung";
$a->strings["Thank You,"] = "Danke,";
$a->strings["%s Administrator"] = "der Administrator von %s";
-$a->strings["New mail received at %s"] = "Neue Nachricht auf %s empfangen";
+$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
+$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica Meldung] Neue Nachricht erhalten von %s";
$a->strings["%s sent you a new private message at %s."] = "%s hat dir eine neue private Nachricht auf %s geschrieben.";
$a->strings["%s sent you %s."] = "%s hat Dir geschickt %s";
$a->strings["a private message"] = "eine private Nachricht";
$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten.";
-$a->strings["%s commented on an item at %s"] = "%s kommentierte einen Beitrag auf %s";
+$a->strings["%s's"] = "%s's";
+$a->strings["your"] = "Dein";
+$a->strings["[Friendica:Notify] Comment to conversation #%d by %s"] = "[Friendica Meldung] Kommentar zum Beitrag #%d von %s";
$a->strings["%s commented on an item/conversation you have been following."] = "%s hat einen Beitrag kommentiert, dem du folgst.";
-$a->strings["%s commented in %s."] = "%s wurde kommentiert in %s";
-$a->strings["a watched conversation"] = "eine beobachtete Unterhaltung";
+$a->strings["%s commented on %s."] = "%s kommentierte %s.";
$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";
+$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica Meldung] %s hat auf Deine Pinnwand geschrieben";
$a->strings["%s posted to your profile wall at %s"] = "%s hat auf deine Pinnwand bei %s gepostet";
$a->strings["%s posted to %s"] = "%s schrieb an %s";
$a->strings["your profile wall."] = "Deine Pinnwand";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica Meldung] %s hat Dich erwähnt";
$a->strings["%s tagged you at %s"] = "%s hat dich auf %s erwähnt";
$a->strings["%s %s."] = "%s %s.";
$a->strings["tagged you"] = "erwähnte Dich";
+$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte Deinen Beitrag";
$a->strings["%s tagged your post at %s"] = "%s hat deinen Beitrag auf %s getaggt";
$a->strings["%s tagged %s"] = "%s markierte %s";
$a->strings["your post"] = "Dein Beitrag";
-$a->strings["Introduction received at %s"] = "Kontaktanfrage auf %s erhalten";
+$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten";
$a->strings["You've received an introduction from '%s' at %s"] = "Du hast eine Kontaktanfrage von '%s' auf %s erhalten";
$a->strings["You've received %s from %s."] = "Du hast %s von %s erhalten.";
$a->strings["an introduction"] = "eine Einführung";
$a->strings["You may visit their profile at %s"] = "Hier kannst du das Profil betrachten: %s";
$a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen.";
-$a->strings["Friend suggestion received at %s"] = "Kontaktvorschlag empfangen auf %s";
+$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica Meldung] Kontaktvorschlag erhalten";
$a->strings["You've received a friend suggestion from '%s' at %s"] = "Du hast von '%s' einen Kontaktvorschlag erhalten auf %s";
$a->strings["You've received %s for %s from %s."] = "Du hast %s für %s von %s erhalten.";
$a->strings["a friend suggestion"] = "ein Freunde Vorschlag";
@@ -1289,7 +1350,6 @@ $a->strings["Photo:"] = "Foto:";
$a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen.";
$a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mit dir auf ";
$a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf ";
-$a->strings["view full size"] = "Volle Größe anzeigen";
$a->strings["image/photo"] = "Bild/Foto";
$a->strings["Welcome "] = "Willkommen ";
$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
diff --git a/view/prv_message.tpl b/view/prv_message.tpl
index 25bf93b99..4b904cbcd 100755
--- a/view/prv_message.tpl
+++ b/view/prv_message.tpl
@@ -13,7 +13,7 @@ $select
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly />
<div id="prvmail-message-label">$yourmessage</div>
-<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" ></textarea>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" >$text</textarea>
<div id="prvmail-submit-wrapper" >
diff --git a/view/theme/diabook-blue/icons/notifications.png b/view/theme/diabook-blue/icons/notifications.png
index 33ae95c6a..c23673dbd 100755
--- a/view/theme/diabook-blue/icons/notifications.png
+++ b/view/theme/diabook-blue/icons/notifications.png
Binary files differ
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index 7f5fe1fec..51b173f2a 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -652,6 +652,17 @@ nav .nav-menu-icon {
-webkit-border-radius: 5px 5px 0 0;
border-radius: 5px 5px 0 0;
}
+nav .nav-menu-icon:hover {
+ background-color: #308dbf;
+ position: relative;
+ height: 22px;
+ padding: 5px;
+ margin: 0px 7px;
+ -moz-border-radius: 5px 5px 0 0;
+ -webkit-border-radius: 5px 5px 0 0;
+ border-radius: 5px 5px 0 0;
+}
+
nav .nav-menu-icon.selected {
background-color: #fff;
}
@@ -1037,13 +1048,22 @@ section {
width: 800px;
padding: 0px 0px 0px 12px;
}
+#id_username {
+ width: 173px;
+ }
+#id_password {
+ width: 173px;
+ }
+#id_openid_url {
+ width: 173px;
+ }
#contact-edit-end {
- margin-top: 140%;
}
.pager {
padding: 10px;
text-align: center;
font-size: 1.0em;
+ margin-top: 140%;
}
.tabs {
@@ -1075,6 +1095,10 @@ section {
margin-bottom: 0px;
width: 775px;
}
+.tread-wrapper a{
+ color: #1872A2;
+}
+
.wall-item-decor {
position: absolute;
left: 790px;
@@ -1118,6 +1142,7 @@ section {
}
.wall-item-container .wall-item-location {
padding-right: 40px;
+ display: table-cell;
}
.wall-item-container .wall-item-ago {
word-wrap: break-word;
@@ -1173,6 +1198,7 @@ section {
.wall-item-container .wall-item-actions-social {
float: left;
margin-bottom: 1px;
+ display: table-cell;
}
.wall-item-container .wall-item-actions-social a {
margin-right: 1em;
@@ -1183,6 +1209,7 @@ section {
.wall-item-container .wall-item-actions-tools {
float: right;
width: 80px;
+ display: table-cell;done
}
.wall-item-container .wall-item-actions-tools a {
float: right;
diff --git a/view/theme/diabook-blue/wall_item.tpl b/view/theme/diabook-blue/wall_item.tpl
index b1a014949..ebe40fd4e 100644
--- a/view/theme/diabook-blue/wall_item.tpl
+++ b/view/theme/diabook-blue/wall_item.tpl
@@ -46,7 +46,7 @@
</div>
<div class="wall-item-actions">
- <div class="wall-item-location">$item.location&nbsp;</div>
+
<div class="wall-item-actions-social">
@@ -82,7 +82,7 @@
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
-
+ <div class="wall-item-location">$item.location&nbsp;</div>
</div>
</div>
<div class="wall-item-bottom">
diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl
index 603a908c5..e02e5a8be 100644
--- a/view/theme/diabook-blue/wallwall_item.tpl
+++ b/view/theme/diabook-blue/wallwall_item.tpl
@@ -52,7 +52,7 @@
</div>
<div class="wall-item-actions">
- <div class="wall-item-location">$item.location&nbsp;</div>
+
<div class="wall-item-actions-social">
@@ -88,7 +88,7 @@
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
-
+ <div class="wall-item-location">$item.location&nbsp;</div>
</div>
</div>
<div class="wall-item-bottom">
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index 5bdc34f76..270997740 100755
--- a/view/theme/diabook/icons/notifications.png
+++ b/view/theme/diabook/icons/notifications.png
Binary files differ
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 6e3909ab4..ad7119c2a 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -1036,13 +1036,23 @@ section {
width: 800px;
padding: 0px 0px 0px 12px;
}
+#id_username {
+ width: 173px;
+ }
+#id_password {
+ width: 173px;
+ }
+#id_openid_url {
+ width: 173px;
+ }
#contact-edit-end {
- margin-top: 140%;
+
}
.pager {
padding: 10px;
text-align: center;
font-size: 1.0em;
+ margin-top: 140%;
}
.tabs {
@@ -1116,6 +1126,7 @@ section {
}
.wall-item-container .wall-item-location {
padding-right: 40px;
+ display: table-cell;
}
.wall-item-container .wall-item-ago {
word-wrap: break-word;
@@ -1171,6 +1182,7 @@ section {
.wall-item-container .wall-item-actions-social {
float: left;
margin-bottom: 1px;
+ display: table-cell;
}
.wall-item-container .wall-item-actions-social a {
margin-right: 1em;
@@ -1181,6 +1193,7 @@ section {
.wall-item-container .wall-item-actions-tools {
float: right;
width: 80px;
+ display: table-cell;
}
.wall-item-container .wall-item-actions-tools a {
float: right;
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 0a20c9fbc..5a1828ad7 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -13,6 +13,7 @@ $a->theme_info = array(
$a->page['htmlhead'] .= <<< EOT
<script>
+
//contacts
$('html').click(function() {
$('#nav-contacts-linkmenu').removeClass('selected');
@@ -62,5 +63,5 @@ $('html').click(function() {
$('#nav-site-linkmenu').click(function(event){
event.stopPropagation();
});
-</script>
+</script>
EOT;
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index b1a014949..ebe40fd4e 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -46,7 +46,7 @@
</div>
<div class="wall-item-actions">
- <div class="wall-item-location">$item.location&nbsp;</div>
+
<div class="wall-item-actions-social">
@@ -82,7 +82,7 @@
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
-
+ <div class="wall-item-location">$item.location&nbsp;</div>
</div>
</div>
<div class="wall-item-bottom">
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 603a908c5..e02e5a8be 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -52,7 +52,7 @@
</div>
<div class="wall-item-actions">
- <div class="wall-item-location">$item.location&nbsp;</div>
+
<div class="wall-item-actions-social">
@@ -88,7 +88,7 @@
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
-
+ <div class="wall-item-location">$item.location&nbsp;</div>
</div>
</div>
<div class="wall-item-bottom">