Merge https://github.com/friendica/friendica into pull

diff --git a/include/api.php b/include/api.php
index 0885a1434b19b773284f9b7d85b1a3d582e6c25f..f9be68c3df3a4961c3d9e6a98b6c7fe1337c9f80 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -567,8 +567,17 @@
                $_REQUEST['profile_uid'] = local_user();
                if(requestdata('parent'))
                        $_REQUEST['type'] = 'net-comment';
-               else
+               else {
                        $_REQUEST['type'] = 'wall';
+                        if(x($_FILES,'media')) {
+                               // upload the image if we have one
+                               $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
+                               require_once('mod/wall_upload.php');
+                               $media = wall_upload_post($a);
+                               if(strlen($media)>0)
+                                       $_REQUEST['body'] .= "\n\n".$media;
+                               }
+               }
 
                // set this so that the item_post() function is quiet and doesn't redirect or emit json
 

diff --git a/mod/ping.php b/mod/ping.php
index e911aaf1f470765ad815588de28d0cd2d872d544..63aaa0f45f3c5263f6bf0f98fe1cb7b2d5270972 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -134,6 +134,8 @@ function ping_init(&$a) {
 
 
                function xmlize($href, $name, $url, $photo, $date, $seen, $message){
+                       $data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message);
+                       call_hooks('ping_xmlize', $data);
                        $notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" >%s</note>';
                        return sprintf ( $notsxml,
                                xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message)

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index f341cc9cdaa837186d2b10d4efad4964f10f6fe5..fa66561e8ec3ab9c1fcd726f1080fa2878aa4e6b 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -5,19 +5,26 @@ require_once('Photo.php');
 function wall_upload_post(&$a) {
 
        if($a->argc > 1) {
-               $nick = $a->argv[1];
-               $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
-                       dbesc($nick)
-               );
-               if(! count($r))
-                       return;
-
+               if(! x($_FILES,'media')) {
+                       $nick = $a->argv[1];
+                       $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
+                               dbesc($nick)
+                       );
+
+                       if(! count($r))
+                                return;
+               }
+                else {
+                       $user_info = api_get_user($a);
+                       $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
+                               dbesc($user_info['screen_name'])
+                       );
+                }
        }
        else
                return;
 
 
-
        $can_post  = false;
        $visitor   = 0;
 
@@ -47,12 +54,19 @@ function wall_upload_post(&$a) {
                killme();
        }
 
-       if(! x($_FILES,'userfile'))
+       if(! x($_FILES,'userfile') && ! x($_FILES,'media'))
                killme();
 
-       $src      = $_FILES['userfile']['tmp_name'];
-       $filename = basename($_FILES['userfile']['name']);
-       $filesize = intval($_FILES['userfile']['size']);
+        if(x($_FILES,'userfile')) {
+               $src      = $_FILES['userfile']['tmp_name'];
+               $filename = basename($_FILES['userfile']['name']);
+               $filesize = intval($_FILES['userfile']['size']);
+        }
+        elseif(x($_FILES,'media')) {
+               $src = $_FILES['media']['tmp_name'];
+                $filename = basename($_FILES['media']['name']);
+               $filesize = intval($_FILES['media']['size']);
+        }
 
        $maximagesize = get_config('system','maximagesize');
 

diff --git a/view/de/friend_complete_eml.tpl b/view/de/friend_complete_eml.tpl
index 908d0df406cc22b79ae8b5cf5182bb8349a6f785..4011e0d6e1858b0e1e6f8b2da2227a643e293a21 100644 (file)
--- a/view/de/friend_complete_eml.tpl
+++ b/view/de/friend_complete_eml.tpl
@@ -1,22 +1,22 @@
 
-Liebe/r $username,
+Hallo $[username],
 
-großartige Neuigkeiten... '$fn' von '$dfrn_url' hat deine Kontaktaufnahme auf
-'$sitename' bestätigt.
+       Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat 
+deine Kontaktanfrage auf '$[sitename]' bestätigt.
 
-Ihr seit nun beidseitige Freunde und könnt Statusmitteilungen, Fotos und
-EMail ohne Einschränkungen austauschen.
+Ihr seit nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails
+ohne einschränkungen austauschen.
 
-Bitte rufe deine 'Kontakte' Seite auf $sitename auf um du Änderungen an
-dieser Freundschaft vorzunehmen.
+Rufe deine 'Kontakte' Seite auf $[sitename] auf wenn du 
+Änderungen an diesem Kontakt vornehmen willst. 
 
-$siteurl
+$[siteurl]
 
-[Du könntest zum Beispiel ein neue Profil anlegen mit Informationen die nicht
-für die Allgemeinheit bestimmt sind, die du aber gerne mit '$fn' teilen
-möchtest].
+[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthällt
+die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '$[fn]' zum Betrachten freigeben].
 
-Mit freundlichen Grüßen
-        $sitename Administrator
+Beste Grüße,
 
- 
+       $[sitename] Administrator
+
+ 
\ No newline at end of file

diff --git a/view/de/intro_complete_eml.tpl b/view/de/intro_complete_eml.tpl
index ff9b8a379fad6e0b7bc96110051d175a600d98e9..de85c8a7980aff144d94276c81d857c7dbfc63c0 100644 (file)
--- a/view/de/intro_complete_eml.tpl
+++ b/view/de/intro_complete_eml.tpl
@@ -1,18 +1,22 @@
 
-Liebe/r $username,
+Hallo $[username],
 
-'$fn' von '$dfrn_url' hat deine Kontaktanfrage auf '$sitename' bestätigt.
+       '$[fn]' auf '$[dfrn_url]' wurde akzeptiert 
+Deine Verbindungsanfrage auf '$[sitename]'.
 
-'$fn' hat sich dazu entschlossen dich als "Fan" mit eingeschränkten
-Kommunikationsmöglichkeiten zu akzeptieren. Dies umfasst private Nachrichten
-und einige Profilaktivitäten. Sollte dies eine Prominenten oder
-Gemeinschaftsseite sein, wurden diese Einstellungen automatisch vorgenommen.
+       '$[fn]' hat entschieden Dich als "Fan" zu akzeptieren, was ein 
+paar Formen der Kommunikation einschränkt - wie das schreiben von privaten Nachrichten und einige Profil
+Interaktionen. Wenn das ein Promi-Konto oder eine Forum-Seite ist, werden die Einstellungen
+automatisch angewendet.
 
-'$fn' kann sich in Zukunft dazu entschließen eure Beziehung in eine beidseitige
-Freundschaft oder freizügigere Beziehung zu erweitern.
+       '$[fn]' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende 
+Beziehung in der Zukunft erweitert wird. 
 
-Ab sofort wirst du Statusmitteilungen von '$fn' erhalten, die auf deiner
-'Netzwerkseite' erscheinen werden.
+       Du empfängst jetzt die öffentlichen Beiträge von '$[fn]', 
+welche auf der "Netzwerk" Seite erscheinen werden  
 
-Mit freundlichen Grüßen,
-        $sitename Administrator
+$[siteurl]
+
+Beste Grüße,
+
+       $[sitename] Administrator
\ No newline at end of file

diff --git a/view/de/messages.po b/view/de/messages.po
index 5b0b9ece445587c25d0af3172960780ed11caeb0..1dff9bfce12ac8c461dc8bc77f50fb79e07ea5d1 100644 (file)
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -9,6 +9,7 @@
 #   <friends@dostmusik.de>, 2012.
 #   <greeneyedred@googlemail.com>, 2012.
 #   <hzuehl@phone-talk.de>, 2011.
+#   <leberwurscht@hoegners.de>, 2012.
 #   <marmor69@web.de>, 2012.
 # Martin Schmitt <mas@scsy.de>, 2012.
 #   <tobias.diekershoff@gmx.net>, 2011, 2012.
@@ -18,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-04-16 10:00-0700\n"
-"PO-Revision-Date: 2012-04-17 15:40+0000\n"
-"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"POT-Creation-Date: 2012-04-21 10:00-0700\n"
+"PO-Revision-Date: 2012-04-22 09:36+0000\n"
+"Last-Translator: Fabian Dost <friends@dostmusik.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +48,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866
+#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865
 #: ../../mod/editpost.php:10 ../../mod/install.php:171
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125
 #: ../../mod/settings.php:99 ../../mod/settings.php:514
@@ -66,7 +67,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 #: ../../mod/profiles.php:7 ../../mod/profiles.php:329
 #: ../../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:461 ../../include/items.php:3170
+#: ../../addon/facebook/facebook.php:484 ../../include/items.php:3171
 #: ../../index.php:309
 msgid "Permission denied."
 msgstr "Zugriff verweigert."
@@ -97,7 +98,7 @@ msgid "Return to contact editor"
 msgstr "Zurück zum Kontakteditor"
 
 #: ../../mod/crepair.php:148 ../../mod/settings.php:534
-#: ../../mod/settings.php:560 ../../mod/admin.php:544 ../../mod/admin.php:553
+#: ../../mod/settings.php:560 ../../mod/admin.php:573 ../../mod/admin.php:582
 msgid "Name"
 msgstr "Name"
 
@@ -134,17 +135,17 @@ msgid "New photo from this URL"
 msgstr "Neues Foto von dieser URL"
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:400 ../../mod/photos.php:901 ../../mod/photos.php:959
-#: ../../mod/photos.php:1194 ../../mod/photos.php:1234
-#: ../../mod/photos.php:1274 ../../mod/photos.php:1305
+#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958
+#: ../../mod/photos.php:1193 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1273 ../../mod/photos.php:1304
 #: ../../mod/install.php:251 ../../mod/install.php:289
 #: ../../mod/localtime.php:45 ../../mod/contacts.php:325
 #: ../../mod/settings.php:532 ../../mod/settings.php:678
 #: ../../mod/settings.php:739 ../../mod/settings.php:930
-#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:374
-#: ../../mod/admin.php:541 ../../mod/admin.php:670 ../../mod/admin.php:850
-#: ../../mod/admin.php:930 ../../mod/profiles.php:498 ../../mod/invite.php:119
-#: ../../addon/facebook/facebook.php:552 ../../addon/yourls/yourls.php:76
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:392
+#: ../../mod/admin.php:570 ../../mod/admin.php:706 ../../mod/admin.php:905
+#: ../../mod/admin.php:993 ../../mod/profiles.php:498 ../../mod/invite.php:119
+#: ../../addon/facebook/facebook.php:574 ../../addon/yourls/yourls.php:76
 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
 #: ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
@@ -156,6 +157,7 @@ msgstr "Neues Foto von dieser URL"
 #: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
 #: ../../addon/blackout/blackout.php:94 ../../addon/gravatar/gravatar.php:86
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
+#: ../../addon/jappixmini/jappixmini.php:302
 #: ../../addon/statusnet/statusnet.php:278
 #: ../../addon/statusnet/statusnet.php:292
 #: ../../addon/statusnet/statusnet.php:318
@@ -168,11 +170,17 @@ msgstr "Neues Foto von dieser URL"
 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
 #: ../../addon/posterous/posterous.php:90
-#: ../../view/theme/diabook-red/config.php:64
-#: ../../view/theme/diabook-blue/config.php:64
-#: ../../view/theme/diabook/config.php:76
+#: ../../view/theme/diabook-red/config.php:76
+#: ../../view/theme/diabook-blue/config.php:76
+#: ../../view/theme/diabook/diabook-green/config.php:76
+#: ../../view/theme/diabook/diabook-red/config.php:76
+#: ../../view/theme/diabook/diabook-blue/config.php:76
+#: ../../view/theme/diabook/diabook-dark/config.php:76
+#: ../../view/theme/diabook/diabook-aerith/config.php:76
+#: ../../view/theme/diabook/diabook-pink/config.php:76
+#: ../../view/theme/diabook/config.php:91
 #: ../../view/theme/quattro/config.php:52
-#: ../../view/theme/diabook-aerith/config.php:64
+#: ../../view/theme/diabook-aerith/config.php:76
 #: ../../include/conversation.php:555
 msgid "Submit"
 msgstr "Senden"
@@ -231,10 +239,16 @@ msgstr "Veranstaltung bearbeiten"
 msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
-#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:243
-#: ../../view/theme/diabook-blue/theme.php:243
-#: ../../view/theme/diabook/theme.php:253
-#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52
+#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:231
+#: ../../view/theme/diabook-blue/theme.php:231
+#: ../../view/theme/diabook/diabook-green/theme.php:233
+#: ../../view/theme/diabook/diabook-red/theme.php:231
+#: ../../view/theme/diabook/diabook-blue/theme.php:231
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook/diabook-dark/theme.php:233
+#: ../../view/theme/diabook/diabook-aerith/theme.php:233
+#: ../../view/theme/diabook/diabook-pink/theme.php:233
+#: ../../view/theme/diabook-aerith/theme.php:233 ../../include/nav.php:52
 #: ../../boot.php:1471
 msgid "Events"
 msgstr "Veranstaltungen"
@@ -364,17 +378,23 @@ msgstr "Nein"
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
-#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:880
-#: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383
-#: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook-red/theme.php:113
-#: ../../view/theme/diabook-blue/theme.php:113
-#: ../../view/theme/diabook/theme.php:119
-#: ../../view/theme/diabook-aerith/theme.php:114
+#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879
+#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382
+#: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
+#: ../../view/theme/diabook-red/theme.php:115
+#: ../../view/theme/diabook-blue/theme.php:115
+#: ../../view/theme/diabook/diabook-green/theme.php:116
+#: ../../view/theme/diabook/diabook-red/theme.php:115
+#: ../../view/theme/diabook/diabook-blue/theme.php:115
+#: ../../view/theme/diabook/theme.php:130
+#: ../../view/theme/diabook/diabook-dark/theme.php:116
+#: ../../view/theme/diabook/diabook-aerith/theme.php:116
+#: ../../view/theme/diabook/diabook-pink/theme.php:116
+#: ../../view/theme/diabook-aerith/theme.php:116
 msgid "Contact Photos"
 msgstr "Kontaktbilder"
 
-#: ../../mod/photos.php:58 ../../mod/photos.php:976 ../../mod/photos.php:1425
+#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1424
 msgid "Upload New Photos"
 msgstr "Weitere Fotos hochladen"
 
@@ -386,17 +406,23 @@ msgstr "jeder"
 msgid "Contact information unavailable"
 msgstr "Kontaktinformationen nicht verfügbar"
 
-#: ../../mod/photos.php:151 ../../mod/photos.php:598 ../../mod/photos.php:951
-#: ../../mod/photos.php:966 ../../mod/register.php:335
+#: ../../mod/photos.php:151 ../../mod/photos.php:597 ../../mod/photos.php:950
+#: ../../mod/photos.php:965 ../../mod/register.php:335
 #: ../../mod/register.php:342 ../../mod/register.php:349
 #: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67
 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook-red/theme.php:114
-#: ../../view/theme/diabook-blue/theme.php:114
-#: ../../view/theme/diabook/theme.php:120
-#: ../../view/theme/diabook-aerith/theme.php:115
+#: ../../view/theme/diabook-red/theme.php:116
+#: ../../view/theme/diabook-blue/theme.php:116
+#: ../../view/theme/diabook/diabook-green/theme.php:117
+#: ../../view/theme/diabook/diabook-red/theme.php:116
+#: ../../view/theme/diabook/diabook-blue/theme.php:116
+#: ../../view/theme/diabook/theme.php:131
+#: ../../view/theme/diabook/diabook-dark/theme.php:117
+#: ../../view/theme/diabook/diabook-aerith/theme.php:117
+#: ../../view/theme/diabook/diabook-pink/theme.php:117
+#: ../../view/theme/diabook-aerith/theme.php:117
 msgid "Profile Photos"
 msgstr "Profilbilder"
 
@@ -404,192 +430,198 @@ msgstr "Profilbilder"
 msgid "Album not found."
 msgstr "Album nicht gefunden."
 
-#: ../../mod/photos.php:179 ../../mod/photos.php:960
+#: ../../mod/photos.php:179 ../../mod/photos.php:959
 msgid "Delete Album"
 msgstr "Album löschen"
 
-#: ../../mod/photos.php:242 ../../mod/photos.php:1195
+#: ../../mod/photos.php:242 ../../mod/photos.php:1194
 msgid "Delete Photo"
 msgstr "Foto löschen"
 
-#: ../../mod/photos.php:529
+#: ../../mod/photos.php:528
 msgid "was tagged in a"
 msgstr "wurde getaggt in einem"
 
-#: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook-red/theme.php:85
-#: ../../view/theme/diabook-blue/theme.php:85
-#: ../../view/theme/diabook/theme.php:91
-#: ../../view/theme/diabook-aerith/theme.php:86 ../../include/text.php:1304
+#: ../../view/theme/diabook-red/theme.php:87
+#: ../../view/theme/diabook-blue/theme.php:87
+#: ../../view/theme/diabook/diabook-green/theme.php:88
+#: ../../view/theme/diabook/diabook-red/theme.php:87
+#: ../../view/theme/diabook/diabook-blue/theme.php:87
+#: ../../view/theme/diabook/theme.php:102
+#: ../../view/theme/diabook/diabook-dark/theme.php:88
+#: ../../view/theme/diabook/diabook-aerith/theme.php:88
+#: ../../view/theme/diabook/diabook-pink/theme.php:88
+#: ../../view/theme/diabook-aerith/theme.php:88 ../../include/text.php:1304
 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53
 #: ../../include/conversation.php:126
 msgid "photo"
 msgstr "Foto"
 
-#: ../../mod/photos.php:529
+#: ../../mod/photos.php:528
 msgid "by"
 msgstr "von"
 
-#: ../../mod/photos.php:632 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr "Die Bildgröße übersteigt das Limit von "
 
-#: ../../mod/photos.php:640
+#: ../../mod/photos.php:639
 msgid "Image file is empty."
 msgstr "Bilddatei ist leer."
 
-#: ../../mod/photos.php:654 ../../mod/profile_photo.php:124
+#: ../../mod/photos.php:653 ../../mod/profile_photo.php:124
 #: ../../mod/wall_upload.php:69
 msgid "Unable to process image."
 msgstr "Konnte das Bild nicht bearbeiten."
 
-#: ../../mod/photos.php:674 ../../mod/profile_photo.php:257
+#: ../../mod/photos.php:673 ../../mod/profile_photo.php:257
 #: ../../mod/wall_upload.php:88
 msgid "Image upload failed."
 msgstr "Hochladen des Bildes gescheitert."
 
-#: ../../mod/photos.php:760 ../../mod/community.php:16
+#: ../../mod/photos.php:759 ../../mod/community.php:16
 #: ../../mod/dfrn_request.php:671 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
 msgid "Public access denied."
 msgstr "Öffentlicher Zugriff verweigert."
 
-#: ../../mod/photos.php:770
+#: ../../mod/photos.php:769
 msgid "No photos selected"
 msgstr "Keine Bilder ausgewählt"
 
-#: ../../mod/photos.php:847
+#: ../../mod/photos.php:846
 msgid "Access to this item is restricted."
 msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt."
 
-#: ../../mod/photos.php:908
+#: ../../mod/photos.php:907
 msgid "Upload Photos"
 msgstr "Bilder hochladen"
 
-#: ../../mod/photos.php:911 ../../mod/photos.php:955
+#: ../../mod/photos.php:910 ../../mod/photos.php:954
 msgid "New album name: "
 msgstr "Name des neuen Albums: "
 
-#: ../../mod/photos.php:912
+#: ../../mod/photos.php:911
 msgid "or existing album name: "
 msgstr "oder existierender Albumname: "
 
-#: ../../mod/photos.php:913
+#: ../../mod/photos.php:912
 msgid "Do not show a status post for this upload"
 msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen"
 
-#: ../../mod/photos.php:915 ../../mod/photos.php:1190
+#: ../../mod/photos.php:914 ../../mod/photos.php:1189
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: ../../mod/photos.php:970
+#: ../../mod/photos.php:969
 msgid "Edit Album"
 msgstr "Album bearbeiten"
 
-#: ../../mod/photos.php:985 ../../mod/photos.php:1408
+#: ../../mod/photos.php:984 ../../mod/photos.php:1407
 msgid "View Photo"
 msgstr "Fotos betrachten"
 
-#: ../../mod/photos.php:1020
+#: ../../mod/photos.php:1019
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein."
 
-#: ../../mod/photos.php:1022
+#: ../../mod/photos.php:1021
 msgid "Photo not available"
 msgstr "Foto nicht verfügbar"
 
-#: ../../mod/photos.php:1072
+#: ../../mod/photos.php:1071
 msgid "View photo"
 msgstr "Fotos ansehen"
 
-#: ../../mod/photos.php:1072
+#: ../../mod/photos.php:1071
 msgid "Edit photo"
 msgstr "Foto bearbeiten"
 
-#: ../../mod/photos.php:1073
+#: ../../mod/photos.php:1072
 msgid "Use as profile photo"
 msgstr "Als Profilbild verwenden"
 
-#: ../../mod/photos.php:1079 ../../include/conversation.php:480
+#: ../../mod/photos.php:1078 ../../include/conversation.php:480
 msgid "Private Message"
 msgstr "Private Nachricht"
 
-#: ../../mod/photos.php:1101
+#: ../../mod/photos.php:1100
 msgid "View Full Size"
 msgstr "Betrachte Originalgröße"
 
-#: ../../mod/photos.php:1169
+#: ../../mod/photos.php:1168
 msgid "Tags: "
 msgstr "Tags: "
 
-#: ../../mod/photos.php:1172
+#: ../../mod/photos.php:1171
 msgid "[Remove any tag]"
 msgstr "[Tag entfernen]"
 
-#: ../../mod/photos.php:1183
+#: ../../mod/photos.php:1182
 msgid "New album name"
 msgstr "Name des neuen Albums"
 
-#: ../../mod/photos.php:1186
+#: ../../mod/photos.php:1185
 msgid "Caption"
 msgstr "Bildunterschrift"
 
-#: ../../mod/photos.php:1188
+#: ../../mod/photos.php:1187
 msgid "Add a Tag"
 msgstr "Tag hinzufügen"
 
-#: ../../mod/photos.php:1192
+#: ../../mod/photos.php:1191
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1212 ../../include/conversation.php:529
+#: ../../mod/photos.php:1211 ../../include/conversation.php:529
 msgid "I like this (toggle)"
 msgstr "Ich mag das (toggle)"
 
-#: ../../mod/photos.php:1213 ../../include/conversation.php:530
+#: ../../mod/photos.php:1212 ../../include/conversation.php:530
 msgid "I don't like this (toggle)"
 msgstr "Ich mag das nicht (toggle)"
 
-#: ../../mod/photos.php:1214 ../../include/conversation.php:956
+#: ../../mod/photos.php:1213 ../../include/conversation.php:956
 msgid "Share"
 msgstr "Teilen"
 
-#: ../../mod/photos.php:1215 ../../mod/editpost.php:104
+#: ../../mod/photos.php:1214 ../../mod/editpost.php:104
 #: ../../mod/wallmessage.php:145 ../../mod/message.php:188
-#: ../../mod/message.php:357 ../../include/conversation.php:362
+#: ../../mod/message.php:357 ../../include/conversation.php:361
 #: ../../include/conversation.php:698 ../../include/conversation.php:975
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: ../../mod/photos.php:1231 ../../mod/photos.php:1271
-#: ../../mod/photos.php:1302 ../../include/conversation.php:552
+#: ../../mod/photos.php:1230 ../../mod/photos.php:1270
+#: ../../mod/photos.php:1301 ../../include/conversation.php:552
 msgid "This is you"
 msgstr "Das bist du"
 
-#: ../../mod/photos.php:1233 ../../mod/photos.php:1273
-#: ../../mod/photos.php:1304 ../../include/conversation.php:554
+#: ../../mod/photos.php:1232 ../../mod/photos.php:1272
+#: ../../mod/photos.php:1303 ../../include/conversation.php:554
 #: ../../boot.php:495
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../mod/photos.php:1235 ../../mod/editpost.php:125
+#: ../../mod/photos.php:1234 ../../mod/editpost.php:125
 #: ../../include/conversation.php:556 ../../include/conversation.php:993
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../../mod/photos.php:1332 ../../mod/settings.php:595
-#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:548
+#: ../../mod/photos.php:1331 ../../mod/settings.php:595
+#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:577
 #: ../../include/conversation.php:318 ../../include/conversation.php:576
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../../mod/photos.php:1414
+#: ../../mod/photos.php:1413
 msgid "View Album"
 msgstr "Album betrachten"
 
-#: ../../mod/photos.php:1423
+#: ../../mod/photos.php:1422
 msgid "Recent Photos"
 msgstr "Neueste Fotos"
 
@@ -597,10 +629,16 @@ msgstr "Neueste Fotos"
 msgid "Not available."
 msgstr "Nicht verfügbar."
 
-#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:245
-#: ../../view/theme/diabook-blue/theme.php:245
-#: ../../view/theme/diabook/theme.php:255
-#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:101
+#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:233
+#: ../../view/theme/diabook-blue/theme.php:233
+#: ../../view/theme/diabook/diabook-green/theme.php:235
+#: ../../view/theme/diabook/diabook-red/theme.php:233
+#: ../../view/theme/diabook/diabook-blue/theme.php:233
+#: ../../view/theme/diabook/theme.php:253
+#: ../../view/theme/diabook/diabook-dark/theme.php:235
+#: ../../view/theme/diabook/diabook-aerith/theme.php:235
+#: ../../view/theme/diabook/diabook-pink/theme.php:235
+#: ../../view/theme/diabook-aerith/theme.php:235 ../../include/nav.php:101
 msgid "Community"
 msgstr "Gemeinschaft"
 
@@ -671,7 +709,7 @@ msgstr "Datei anhängen"
 #: ../../mod/message.php:187 ../../mod/message.php:356
 #: ../../include/conversation.php:961
 msgid "Insert web link"
-msgstr "eine Kontaktanfrage"
+msgstr "einen Link einfügen"
 
 #: ../../mod/editpost.php:99
 msgid "Insert YouTube video"
@@ -775,7 +813,7 @@ msgstr "Ungültige E-Mail Adresse."
 
 #: ../../mod/dfrn_request.php:344
 msgid "This account has not been configured for email. Request failed."
-msgstr ""
+msgstr "Dieses Konto ist nicht für Email konfiguriert. Anfrage fehlgeschlagen."
 
 #: ../../mod/dfrn_request.php:372
 msgid "Unable to resolve your name at the provided location."
@@ -830,7 +868,7 @@ msgstr "Bitte bestätige deine Kontaktanfrage bei %s."
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: ../../mod/dfrn_request.php:628 ../../include/items.php:2690
+#: ../../mod/dfrn_request.php:628 ../../include/items.php:2691
 msgid "[Name Withheld]"
 msgstr "[Name unterdrückt]"
 
@@ -1079,8 +1117,8 @@ msgid "mb_string PHP module"
 msgstr "PHP: mb_string-Modul"
 
 #: ../../mod/install.php:383 ../../mod/install.php:385
-msgid "Apace mod_rewrite module"
-msgstr "Apache: mod_rewrite-Modul"
+msgid "Apache mod_rewrite module"
+msgstr "Apache mod_rewrite module"
 
 #: ../../mod/install.php:383
 msgid ""
@@ -1242,10 +1280,16 @@ msgstr "Netzwerk"
 msgid "Personal"
 msgstr "Persönlich"
 
-#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:239
-#: ../../view/theme/diabook-blue/theme.php:239
-#: ../../view/theme/diabook/theme.php:249
-#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:77
+#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:227
+#: ../../view/theme/diabook-blue/theme.php:227
+#: ../../view/theme/diabook/diabook-green/theme.php:229
+#: ../../view/theme/diabook/diabook-red/theme.php:227
+#: ../../view/theme/diabook/diabook-blue/theme.php:227
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook/diabook-dark/theme.php:229
+#: ../../view/theme/diabook/diabook-aerith/theme.php:229
+#: ../../view/theme/diabook/diabook-pink/theme.php:229
+#: ../../view/theme/diabook-aerith/theme.php:229 ../../include/nav.php:77
 #: ../../include/nav.php:115
 msgid "Home"
 msgstr "Pinnwand"
@@ -1294,7 +1338,7 @@ msgid "if applicable"
 msgstr "falls anwendbar"
 
 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:546
+#: ../../mod/admin.php:575
 msgid "Approve"
 msgstr "Genehmigen"
 
@@ -1491,12 +1535,12 @@ msgid "View all contacts"
 msgstr "Alle Kontakte anzeigen"
 
 #: ../../mod/contacts.php:303 ../../mod/contacts.php:350
-#: ../../mod/admin.php:550
+#: ../../mod/admin.php:579
 msgid "Unblock"
 msgstr "Entsperren"
 
 #: ../../mod/contacts.php:303 ../../mod/contacts.php:350
-#: ../../mod/admin.php:549
+#: ../../mod/admin.php:578
 msgid "Block"
 msgstr "Sperren"
 
@@ -1565,7 +1609,7 @@ msgstr "letzte Aktualisierung:"
 msgid "Update public posts"
 msgstr "Öffentliche Beiträge aktualisieren"
 
-#: ../../mod/contacts.php:347 ../../mod/admin.php:979
+#: ../../mod/contacts.php:347 ../../mod/admin.php:1051
 msgid "Update now"
 msgstr "Jetzt aktualisieren"
 
@@ -1622,10 +1666,16 @@ msgstr "du bist Fan von"
 msgid "Edit contact"
 msgstr "Kontakt bearbeiten"
 
-#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:241
-#: ../../view/theme/diabook-blue/theme.php:241
-#: ../../view/theme/diabook/theme.php:251
-#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:139
+#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:229
+#: ../../view/theme/diabook-blue/theme.php:229
+#: ../../view/theme/diabook/diabook-green/theme.php:231
+#: ../../view/theme/diabook/diabook-red/theme.php:229
+#: ../../view/theme/diabook/diabook-blue/theme.php:229
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook/diabook-dark/theme.php:231
+#: ../../view/theme/diabook/diabook-aerith/theme.php:231
+#: ../../view/theme/diabook/diabook-pink/theme.php:231
+#: ../../view/theme/diabook-aerith/theme.php:231 ../../include/nav.php:139
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -1658,9 +1708,9 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
 #: ../../mod/register.php:388 ../../mod/register.php:442
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
-#: ../../addon/facebook/facebook.php:625
-#: ../../addon/facebook/facebook.php:1090
-#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2699
+#: ../../addon/facebook/facebook.php:650
+#: ../../addon/facebook/facebook.php:1136
+#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700
 msgid "Administrator"
 msgstr "Administrator"
 
@@ -1738,7 +1788,7 @@ msgstr "Verbundene Programme"
 msgid "Export personal data"
 msgstr "Persönliche Daten exportieren"
 
-#: ../../mod/settings.php:83 ../../mod/admin.php:631 ../../mod/admin.php:817
+#: ../../mod/settings.php:83 ../../mod/admin.php:665 ../../mod/admin.php:870
 #: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137
 msgid "Settings"
 msgstr "Einstellungen"
@@ -1748,7 +1798,7 @@ msgid "Missing some important data!"
 msgstr "Wichtige Daten fehlen!"
 
 #: ../../mod/settings.php:129 ../../mod/settings.php:558
-#: ../../mod/admin.php:89
+#: ../../mod/admin.php:97
 msgid "Update"
 msgstr "Aktualisierungen"
 
@@ -1792,10 +1842,10 @@ msgstr " Keine gültige E-Mail."
 msgid " Cannot change to that email."
 msgstr "Ändern der E-Mail nicht möglich. "
 
-#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:450
+#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:469
 #: ../../addon/impressum/impressum.php:75
 #: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/mathjax/mathjax.php:64 ../../addon/piwik/piwik.php:105
+#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
 #: ../../addon/twitter/twitter.php:370
 msgid "Settings updated."
 msgstr "Einstellungen aktualisiert."
@@ -1966,7 +2016,7 @@ msgstr "Maximal 100 Beiträge"
 msgid "Don't show emoticons"
 msgstr "Keine Smilies anzeigen"
 
-#: ../../mod/settings.php:811 ../../mod/admin.php:162 ../../mod/admin.php:522
+#: ../../mod/settings.php:811 ../../mod/admin.php:173 ../../mod/admin.php:551
 msgid "Normal Account"
 msgstr "Normaler Account"
 
@@ -1974,7 +2024,7 @@ msgstr "Normaler Account"
 msgid "This account is a normal personal profile"
 msgstr "Dieser Account ist ein normales persönliches Profil"
 
-#: ../../mod/settings.php:815 ../../mod/admin.php:163 ../../mod/admin.php:523
+#: ../../mod/settings.php:815 ../../mod/admin.php:174 ../../mod/admin.php:552
 msgid "Soapbox Account"
 msgstr "Sandkasten-Account"
 
@@ -1982,7 +2032,7 @@ msgstr "Sandkasten-Account"
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "Freundschaftsanfragen werden automatisch als Nurlese-Fans akzeptiert"
 
-#: ../../mod/settings.php:819 ../../mod/admin.php:164 ../../mod/admin.php:524
+#: ../../mod/settings.php:819 ../../mod/admin.php:175 ../../mod/admin.php:553
 msgid "Community/Celebrity Account"
 msgstr "Gemeinschafts/Promi-Account"
 
@@ -1991,7 +2041,7 @@ msgid ""
 "Automatically approve all connection/friend requests as read-write fans"
 msgstr "Freundschaftsanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert"
 
-#: ../../mod/settings.php:823 ../../mod/admin.php:165 ../../mod/admin.php:525
+#: ../../mod/settings.php:823 ../../mod/admin.php:176 ../../mod/admin.php:554
 msgid "Automatic Friend Account"
 msgstr "Automatischer Freundesaccount"
 
@@ -2157,7 +2207,7 @@ msgstr "Benachrichtigungseinstellungen"
 
 #: ../../mod/settings.php:972
 msgid "By default post a status message when:"
-msgstr ""
+msgstr "Standardmäßig eine Status-Nachricht posten wenn:"
 
 #: ../../mod/settings.php:973
 msgid "accepting a friend request"
@@ -2165,7 +2215,7 @@ msgstr "akzeptieren einer Freundschaftsanfrage"
 
 #: ../../mod/settings.php:974
 msgid "making an <em>interesting</em> profile change"
-msgstr ""
+msgstr "<em>interessante</em> Änderungen am Profil gemacht werden"
 
 #: ../../mod/settings.php:975
 msgid "Send a notification email when:"
@@ -2294,7 +2344,7 @@ msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:683 ../../include/text.php:652
+#: ../../addon/facebook/facebook.php:715 ../../include/text.php:652
 msgid "Save"
 msgstr "Speichern"
 
@@ -2536,11 +2586,17 @@ msgstr "Ungültiger Profil-Bezeichner"
 msgid "Profile Visibility Editor"
 msgstr "Editor für die Profil-Sichtbarkeit"
 
-#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:240
-#: ../../view/theme/diabook-blue/theme.php:240
-#: ../../view/theme/diabook/theme.php:250
-#: ../../view/theme/diabook-aerith/theme.php:241
-#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76
+#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:228
+#: ../../view/theme/diabook-blue/theme.php:228
+#: ../../view/theme/diabook/diabook-green/theme.php:230
+#: ../../view/theme/diabook/diabook-red/theme.php:228
+#: ../../view/theme/diabook/diabook-blue/theme.php:228
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook/diabook-dark/theme.php:230
+#: ../../view/theme/diabook/diabook-aerith/theme.php:230
+#: ../../view/theme/diabook/diabook-pink/theme.php:230
+#: ../../view/theme/diabook-aerith/theme.php:230
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
 #: ../../include/nav.php:50 ../../boot.php:1458
 msgid "Profile"
 msgstr "Profil"
@@ -2690,7 +2746,7 @@ msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung mögli
 msgid "Your invitation ID: "
 msgstr "ID deiner Einladung: "
 
-#: ../../mod/register.php:553 ../../mod/admin.php:375
+#: ../../mod/register.php:553 ../../mod/admin.php:393
 msgid "Registration"
 msgstr "Registrierung"
 
@@ -2722,28 +2778,47 @@ msgid "People Search"
 msgstr "Personen Suche"
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1574
+#: ../../addon/facebook/facebook.php:1655
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook-red/theme.php:80
-#: ../../view/theme/diabook-red/theme.php:89
-#: ../../view/theme/diabook-blue/theme.php:80
-#: ../../view/theme/diabook-blue/theme.php:89
-#: ../../view/theme/diabook/theme.php:86 ../../view/theme/diabook/theme.php:95
-#: ../../view/theme/diabook-aerith/theme.php:81
-#: ../../view/theme/diabook-aerith/theme.php:90
+#: ../../view/theme/diabook-red/theme.php:82
+#: ../../view/theme/diabook-red/theme.php:91
+#: ../../view/theme/diabook-blue/theme.php:82
+#: ../../view/theme/diabook-blue/theme.php:91
+#: ../../view/theme/diabook/diabook-green/theme.php:83
+#: ../../view/theme/diabook/diabook-green/theme.php:92
+#: ../../view/theme/diabook/diabook-red/theme.php:82
+#: ../../view/theme/diabook/diabook-red/theme.php:91
+#: ../../view/theme/diabook/diabook-blue/theme.php:82
+#: ../../view/theme/diabook/diabook-blue/theme.php:91
+#: ../../view/theme/diabook/theme.php:97
+#: ../../view/theme/diabook/theme.php:106
+#: ../../view/theme/diabook/diabook-dark/theme.php:83
+#: ../../view/theme/diabook/diabook-dark/theme.php:92
+#: ../../view/theme/diabook/diabook-aerith/theme.php:83
+#: ../../view/theme/diabook/diabook-aerith/theme.php:92
+#: ../../view/theme/diabook/diabook-pink/theme.php:83
+#: ../../view/theme/diabook/diabook-pink/theme.php:92
+#: ../../view/theme/diabook-aerith/theme.php:83
+#: ../../view/theme/diabook-aerith/theme.php:92
 #: ../../include/diaspora.php:1654 ../../include/conversation.php:48
 #: ../../include/conversation.php:57 ../../include/conversation.php:121
 #: ../../include/conversation.php:130
 msgid "status"
 msgstr "Status"
 
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1578
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1659
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook-red/theme.php:94
-#: ../../view/theme/diabook-blue/theme.php:94
-#: ../../view/theme/diabook/theme.php:100
-#: ../../view/theme/diabook-aerith/theme.php:95
+#: ../../view/theme/diabook-red/theme.php:96
+#: ../../view/theme/diabook-blue/theme.php:96
+#: ../../view/theme/diabook/diabook-green/theme.php:97
+#: ../../view/theme/diabook/diabook-red/theme.php:96
+#: ../../view/theme/diabook/diabook-blue/theme.php:96
+#: ../../view/theme/diabook/theme.php:111
+#: ../../view/theme/diabook/diabook-dark/theme.php:97
+#: ../../view/theme/diabook/diabook-aerith/theme.php:97
+#: ../../view/theme/diabook/diabook-pink/theme.php:97
+#: ../../view/theme/diabook-aerith/theme.php:97
 #: ../../include/diaspora.php:1670 ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
@@ -2754,9 +2829,9 @@ msgstr "%1$s mag %2$ss %3$s"
 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:141
-#: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3082
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:149
+#: ../../mod/admin.php:614 ../../mod/admin.php:813 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3083
 msgid "Item not found."
 msgstr "Beitrag nicht gefunden."
 
@@ -2764,6 +2839,24 @@ msgstr "Beitrag nicht gefunden."
 msgid "Access denied."
 msgstr "Zugriff verweigert."
 
+#: ../../mod/fbrowser.php:23 ../../view/theme/diabook-red/theme.php:230
+#: ../../view/theme/diabook-blue/theme.php:230
+#: ../../view/theme/diabook/diabook-green/theme.php:232
+#: ../../view/theme/diabook/diabook-red/theme.php:230
+#: ../../view/theme/diabook/diabook-blue/theme.php:230
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook/diabook-dark/theme.php:232
+#: ../../view/theme/diabook/diabook-aerith/theme.php:232
+#: ../../view/theme/diabook/diabook-pink/theme.php:232
+#: ../../view/theme/diabook-aerith/theme.php:232 ../../include/nav.php:51
+#: ../../boot.php:1463
+msgid "Photos"
+msgstr "Bilder"
+
+#: ../../mod/fbrowser.php:86
+msgid "Files"
+msgstr "Dateien"
+
 #: ../../mod/regmod.php:61
 msgid "Account approved."
 msgstr "Account freigegeben."
@@ -2974,481 +3067,481 @@ msgstr "Freunde von %s"
 msgid "No friends to display."
 msgstr "Keine Freunde zum Anzeigen."
 
-#: ../../mod/admin.php:51
+#: ../../mod/admin.php:55
 msgid "Theme settings updated."
 msgstr "Themen Einstellungen aktualisiert."
 
-#: ../../mod/admin.php:85 ../../mod/admin.php:373
+#: ../../mod/admin.php:93 ../../mod/admin.php:391
 msgid "Site"
 msgstr "Seite"
 
-#: ../../mod/admin.php:86 ../../mod/admin.php:540 ../../mod/admin.php:552
+#: ../../mod/admin.php:94 ../../mod/admin.php:569 ../../mod/admin.php:581
 msgid "Users"
 msgstr "Nutzer"
 
-#: ../../mod/admin.php:87 ../../mod/admin.php:629 ../../mod/admin.php:669
+#: ../../mod/admin.php:95 ../../mod/admin.php:663 ../../mod/admin.php:705
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../../mod/admin.php:88 ../../mod/admin.php:815 ../../mod/admin.php:849
+#: ../../mod/admin.php:96 ../../mod/admin.php:868 ../../mod/admin.php:904
 msgid "Themes"
 msgstr "Themen"
 
-#: ../../mod/admin.php:103 ../../mod/admin.php:929
+#: ../../mod/admin.php:111 ../../mod/admin.php:992
 msgid "Logs"
 msgstr "Protokolle"
 
-#: ../../mod/admin.php:108
+#: ../../mod/admin.php:116
 msgid "User registrations waiting for confirmation"
 msgstr "Nutzeranmeldungen die auf Bestätigung warten"
 
-#: ../../mod/admin.php:177 ../../mod/admin.php:372 ../../mod/admin.php:539
-#: ../../mod/admin.php:628 ../../mod/admin.php:668 ../../mod/admin.php:814
-#: ../../mod/admin.php:848 ../../mod/admin.php:928
+#: ../../mod/admin.php:188 ../../mod/admin.php:390 ../../mod/admin.php:568
+#: ../../mod/admin.php:662 ../../mod/admin.php:704 ../../mod/admin.php:867
+#: ../../mod/admin.php:903 ../../mod/admin.php:991
 msgid "Administration"
 msgstr "Administration"
 
-#: ../../mod/admin.php:178
+#: ../../mod/admin.php:189
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: ../../mod/admin.php:179
+#: ../../mod/admin.php:190
 msgid "Registered users"
 msgstr "Registrierte Nutzer"
 
-#: ../../mod/admin.php:181
+#: ../../mod/admin.php:192
 msgid "Pending registrations"
 msgstr "Anstehende Anmeldungen"
 
-#: ../../mod/admin.php:182
+#: ../../mod/admin.php:193
 msgid "Version"
 msgstr "Version"
 
-#: ../../mod/admin.php:184
+#: ../../mod/admin.php:195
 msgid "Active plugins"
 msgstr "Aktive Plugins"
 
-#: ../../mod/admin.php:315
+#: ../../mod/admin.php:329
 msgid "Site settings updated."
 msgstr "Seiteneinstellungen aktualisiert."
 
-#: ../../mod/admin.php:359
+#: ../../mod/admin.php:377
 msgid "Closed"
 msgstr "Geschlossen"
 
-#: ../../mod/admin.php:360
+#: ../../mod/admin.php:378
 msgid "Requires approval"
 msgstr "Bedarf der Zustimmung"
 
-#: ../../mod/admin.php:361
+#: ../../mod/admin.php:379
 msgid "Open"
 msgstr "Offen"
 
-#: ../../mod/admin.php:365
+#: ../../mod/admin.php:383
 msgid "No SSL policy, links will track page SSL state"
 msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"
 
-#: ../../mod/admin.php:366
+#: ../../mod/admin.php:384
 msgid "Force all links to use SSL"
 msgstr "SSL für alle Links erzwingen"
 
-#: ../../mod/admin.php:367
+#: ../../mod/admin.php:385
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)"
 
-#: ../../mod/admin.php:376
+#: ../../mod/admin.php:394
 msgid "File upload"
 msgstr "Datei hochladen"
 
-#: ../../mod/admin.php:377
+#: ../../mod/admin.php:395
 msgid "Policies"
 msgstr "Regeln"
 
-#: ../../mod/admin.php:378
+#: ../../mod/admin.php:396
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../../mod/admin.php:382 ../../addon/statusnet/statusnet.php:544
+#: ../../mod/admin.php:400 ../../addon/statusnet/statusnet.php:544
 msgid "Site name"
 msgstr "Seitenname"
 
-#: ../../mod/admin.php:383
+#: ../../mod/admin.php:401
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../mod/admin.php:384
+#: ../../mod/admin.php:402
 msgid "System language"
 msgstr "Systemsprache"
 
-#: ../../mod/admin.php:385
+#: ../../mod/admin.php:403
 msgid "System theme"
 msgstr "Systemweites Thema"
 
-#: ../../mod/admin.php:385
+#: ../../mod/admin.php:403
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
-msgstr ""
+msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>"
 
-#: ../../mod/admin.php:386
+#: ../../mod/admin.php:404
 msgid "SSL link policy"
 msgstr "Regeln für SSL Links"
 
-#: ../../mod/admin.php:386
+#: ../../mod/admin.php:404
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Bestimmt, ob generierte Links SSL verwenden müssen"
 
-#: ../../mod/admin.php:387
+#: ../../mod/admin.php:405
 msgid "Maximum image size"
 msgstr "Maximale Größe von Bildern"
 
-#: ../../mod/admin.php:387
+#: ../../mod/admin.php:405
 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:389
+#: ../../mod/admin.php:407
 msgid "Register policy"
 msgstr "Registrierungsmethode"
 
-#: ../../mod/admin.php:390
+#: ../../mod/admin.php:408
 msgid "Register text"
 msgstr "Registrierungstext"
 
-#: ../../mod/admin.php:390
+#: ../../mod/admin.php:408
 msgid "Will be displayed prominently on the registration page."
 msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
 
-#: ../../mod/admin.php:391
+#: ../../mod/admin.php:409
 msgid "Accounts abandoned after x days"
 msgstr "Accounts gelten nach x Tagen als unbenutzt"
 
-#: ../../mod/admin.php:391
+#: ../../mod/admin.php:409
 msgid ""
-"Will not waste system resources polling external sites for abandoned "
+"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:392
+#: ../../mod/admin.php:410
 msgid "Allowed friend domains"
 msgstr "Erlaubte Domains für Kontakte"
 
-#: ../../mod/admin.php:392
+#: ../../mod/admin.php:410
 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:393
+#: ../../mod/admin.php:411
 msgid "Allowed email domains"
 msgstr "Erlaubte Domains für Emails"
 
-#: ../../mod/admin.php:393
+#: ../../mod/admin.php:411
 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:394
+#: ../../mod/admin.php:412
 msgid "Block public"
 msgstr "Öffentlichen Zugriff blockieren"
 
-#: ../../mod/admin.php:394
+#: ../../mod/admin.php:412
 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:395
+#: ../../mod/admin.php:413
 msgid "Force publish"
 msgstr "Erzwinge Veröffentlichung"
 
-#: ../../mod/admin.php:395
+#: ../../mod/admin.php:413
 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:396
+#: ../../mod/admin.php:414
 msgid "Global directory update URL"
 msgstr "URL für Updates beim weltweiten Verzeichnis"
 
-#: ../../mod/admin.php:396
+#: ../../mod/admin.php:414
 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:398
+#: ../../mod/admin.php:416
 msgid "Block multiple registrations"
 msgstr "Unterbinde Mehrfachregistrierung"
 
-#: ../../mod/admin.php:398
+#: ../../mod/admin.php:416
 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:399
+#: ../../mod/admin.php:417
 msgid "OpenID support"
 msgstr "OpenID Unterstützung"
 
-#: ../../mod/admin.php:399
+#: ../../mod/admin.php:417
 msgid "OpenID support for registration and logins."
 msgstr "OpenID-Unterstützung für Registrierung und Login."
 
-#: ../../mod/admin.php:400
+#: ../../mod/admin.php:418
 msgid "Fullname check"
 msgstr "Namen auf Vollständigkeit überprüfen"
 
-#: ../../mod/admin.php:400
+#: ../../mod/admin.php:418
 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:401
+#: ../../mod/admin.php:419
 msgid "UTF-8 Regular expressions"
 msgstr "UTF-8 Reguläre Ausdrücke"
 
-#: ../../mod/admin.php:401
+#: ../../mod/admin.php:419
 msgid "Use PHP UTF8 regular expressions"
 msgstr "PHP UTF8 Ausdrücke verwenden"
 
-#: ../../mod/admin.php:402
+#: ../../mod/admin.php:420
 msgid "Show Community Page"
 msgstr "Gemeinschaftsseite anzeigen"
 
-#: ../../mod/admin.php:402
+#: ../../mod/admin.php:420
 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:403
+#: ../../mod/admin.php:421
 msgid "Enable OStatus support"
 msgstr "OStatus Unterstützung aktivieren"
 
-#: ../../mod/admin.php:403
+#: ../../mod/admin.php:421
 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:404
+#: ../../mod/admin.php:422
 msgid "Enable Diaspora support"
 msgstr "Diaspora-Support aktivieren"
 
-#: ../../mod/admin.php:404
+#: ../../mod/admin.php:422
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Verwende die eingebaute Diaspora-Verknüpfung."
 
-#: ../../mod/admin.php:405
+#: ../../mod/admin.php:423
 msgid "Only allow Friendica contacts"
 msgstr "Nur Friendica-Kontakte erlauben"
 
-#: ../../mod/admin.php:405
+#: ../../mod/admin.php:423
 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:406
+#: ../../mod/admin.php:424
 msgid "Verify SSL"
 msgstr "SSL Überprüfen"
 
-#: ../../mod/admin.php:406
+#: ../../mod/admin.php:424
 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 einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann."
 
-#: ../../mod/admin.php:407
+#: ../../mod/admin.php:425
 msgid "Proxy user"
 msgstr "Proxy Nutzer"
 
-#: ../../mod/admin.php:408
+#: ../../mod/admin.php:426
 msgid "Proxy URL"
 msgstr "Proxy URL"
 
-#: ../../mod/admin.php:409
+#: ../../mod/admin.php:427
 msgid "Network timeout"
 msgstr "Netzwerk Wartezeit"
 
-#: ../../mod/admin.php:409
+#: ../../mod/admin.php:427
 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:430
+#: ../../mod/admin.php:453
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] "%s Benutzer geblockt/freigegeben"
 msgstr[1] "%s Benutzer geblockt/freigegeben"
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:460
 #, 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:471
+#: ../../mod/admin.php:499
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Nutzer '%s' gelöscht"
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:507
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Nutzer '%s' entsperrt"
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:507
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Nutzer '%s' gesperrt"
 
-#: ../../mod/admin.php:542
+#: ../../mod/admin.php:571
 msgid "select all"
 msgstr "Alle auswählen"
 
-#: ../../mod/admin.php:543
+#: ../../mod/admin.php:572
 msgid "User registrations waiting for confirm"
 msgstr "Neuanmeldungen, die auf deine Bestätigung warten"
 
-#: ../../mod/admin.php:544
+#: ../../mod/admin.php:573
 msgid "Request date"
 msgstr "Anfrage Datum"
 
-#: ../../mod/admin.php:544 ../../mod/admin.php:553
+#: ../../mod/admin.php:573 ../../mod/admin.php:582
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr "Email"
 
-#: ../../mod/admin.php:545
+#: ../../mod/admin.php:574
 msgid "No registrations."
 msgstr "Keine Neuanmeldungen."
 
-#: ../../mod/admin.php:547
+#: ../../mod/admin.php:576
 msgid "Deny"
 msgstr "Verwehren"
 
-#: ../../mod/admin.php:553
+#: ../../mod/admin.php:582
 msgid "Register date"
 msgstr "Anmeldedatum"
 
-#: ../../mod/admin.php:553
+#: ../../mod/admin.php:582
 msgid "Last login"
 msgstr "Letzte Anmeldung"
 
-#: ../../mod/admin.php:553
+#: ../../mod/admin.php:582
 msgid "Last item"
 msgstr "Letzter Beitrag"
 
-#: ../../mod/admin.php:553
+#: ../../mod/admin.php:582
 msgid "Account"
 msgstr "Nutzerkonto"
 
-#: ../../mod/admin.php:555
+#: ../../mod/admin.php:584
 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:556
+#: ../../mod/admin.php:585
 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:592
+#: ../../mod/admin.php:626
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s deaktiviert."
 
-#: ../../mod/admin.php:596
+#: ../../mod/admin.php:630
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s aktiviert."
 
-#: ../../mod/admin.php:606 ../../mod/admin.php:785
+#: ../../mod/admin.php:640 ../../mod/admin.php:838
 msgid "Disable"
 msgstr "Ausschalten"
 
-#: ../../mod/admin.php:608 ../../mod/admin.php:787
+#: ../../mod/admin.php:642 ../../mod/admin.php:840
 msgid "Enable"
 msgstr "Einschalten"
 
-#: ../../mod/admin.php:630 ../../mod/admin.php:816
+#: ../../mod/admin.php:664 ../../mod/admin.php:869
 msgid "Toggle"
 msgstr "Umschalten"
 
-#: ../../mod/admin.php:638 ../../mod/admin.php:826
+#: ../../mod/admin.php:672 ../../mod/admin.php:879
 msgid "Author: "
 msgstr "Autor:"
 
-#: ../../mod/admin.php:639 ../../mod/admin.php:827
+#: ../../mod/admin.php:673 ../../mod/admin.php:880
 msgid "Maintainer: "
 msgstr "Betreuer:"
 
-#: ../../mod/admin.php:750
+#: ../../mod/admin.php:802
 msgid "No themes found."
 msgstr "Keine Themen gefunden."
 
-#: ../../mod/admin.php:808
+#: ../../mod/admin.php:861
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: ../../mod/admin.php:854
+#: ../../mod/admin.php:909
 msgid "[Experimental]"
 msgstr "[Experimentell]"
 
-#: ../../mod/admin.php:855
+#: ../../mod/admin.php:910
 msgid "[Unsupported]"
 msgstr "[Nicht unterstützt]"
 
-#: ../../mod/admin.php:878
+#: ../../mod/admin.php:937
 msgid "Log settings updated."
 msgstr "Protokolleinstellungen aktualisiert."
 
-#: ../../mod/admin.php:931
+#: ../../mod/admin.php:994
 msgid "Clear"
 msgstr "löschen"
 
-#: ../../mod/admin.php:937
+#: ../../mod/admin.php:1000
 msgid "Debugging"
 msgstr "Protokoll führen"
 
-#: ../../mod/admin.php:938
+#: ../../mod/admin.php:1001
 msgid "Log file"
 msgstr "Protokolldatei"
 
-#: ../../mod/admin.php:938
+#: ../../mod/admin.php:1001
 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:939
+#: ../../mod/admin.php:1002
 msgid "Log level"
 msgstr "Protokoll-Level"
 
-#: ../../mod/admin.php:980
+#: ../../mod/admin.php:1052
 msgid "Close"
 msgstr "Schließen"
 
-#: ../../mod/admin.php:986
+#: ../../mod/admin.php:1058
 msgid "FTP Host"
 msgstr "FTP Host"
 
-#: ../../mod/admin.php:987
+#: ../../mod/admin.php:1059
 msgid "FTP Path"
 msgstr "FTP Pfad"
 
-#: ../../mod/admin.php:988
+#: ../../mod/admin.php:1060
 msgid "FTP User"
 msgstr "FTP Nutzername"
 
-#: ../../mod/admin.php:989
+#: ../../mod/admin.php:1061
 msgid "FTP Password"
 msgstr "FTP Passwort"
 
@@ -3511,7 +3604,7 @@ msgstr "{0} hat dich in einem Beitrag erwähnt"
 
 #: ../../mod/nogroup.php:58
 msgid "Contacts who are not members of a group"
-msgstr ""
+msgstr "Kontakte, die keiner Gruppe zugewiesen sind"
 
 #: ../../mod/openid.php:24
 msgid "OpenID protocol error. No ID returned."
@@ -3607,15 +3700,15 @@ msgstr "Profilname ist erforderlich."
 
 #: ../../mod/profiles.php:143
 msgid "Marital Status"
-msgstr ""
+msgstr "Familienstand"
 
 #: ../../mod/profiles.php:144
 msgid "Romantic Partner"
-msgstr ""
+msgstr "Romanze"
 
 #: ../../mod/profiles.php:145
 msgid "Work/Employment"
-msgstr ""
+msgstr "Arbeit / Beschäftigung"
 
 #: ../../mod/profiles.php:146
 msgid "Religion"
@@ -3643,7 +3736,7 @@ msgstr "Interessen"
 
 #: ../../mod/profiles.php:154
 msgid "Location"
-msgstr ""
+msgstr "Wohnort"
 
 #: ../../mod/profiles.php:225
 msgid "Profile updated."
@@ -3651,12 +3744,12 @@ msgstr "Profil aktualisiert."
 
 #: ../../mod/profiles.php:300
 msgid "public profile"
-msgstr ""
+msgstr "öffentliches Profil"
 
 #: ../../mod/profiles.php:302
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr ""
+msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s."
 
 #: ../../mod/profiles.php:358
 msgid "Profile deleted."
@@ -3909,10 +4002,16 @@ msgstr "Hinzufügen"
 msgid "No entries."
 msgstr "Keine Einträge"
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:149
-#: ../../view/theme/diabook-blue/theme.php:149
-#: ../../view/theme/diabook/theme.php:155
-#: ../../view/theme/diabook-aerith/theme.php:150
+#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:143
+#: ../../view/theme/diabook-blue/theme.php:143
+#: ../../view/theme/diabook/diabook-green/theme.php:145
+#: ../../view/theme/diabook/diabook-red/theme.php:143
+#: ../../view/theme/diabook/diabook-blue/theme.php:143
+#: ../../view/theme/diabook/theme.php:159
+#: ../../view/theme/diabook/diabook-dark/theme.php:145
+#: ../../view/theme/diabook/diabook-aerith/theme.php:145
+#: ../../view/theme/diabook/diabook-pink/theme.php:145
+#: ../../view/theme/diabook-aerith/theme.php:145
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr "Kontaktvorschläge"
@@ -3927,10 +4026,16 @@ msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es
 msgid "Ignore/Hide"
 msgstr "Ignorieren/Verbergen"
 
-#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:147
-#: ../../view/theme/diabook-blue/theme.php:147
-#: ../../view/theme/diabook/theme.php:153
-#: ../../view/theme/diabook-aerith/theme.php:148
+#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:141
+#: ../../view/theme/diabook-blue/theme.php:141
+#: ../../view/theme/diabook/diabook-green/theme.php:143
+#: ../../view/theme/diabook/diabook-red/theme.php:141
+#: ../../view/theme/diabook/diabook-blue/theme.php:141
+#: ../../view/theme/diabook/theme.php:157
+#: ../../view/theme/diabook/diabook-dark/theme.php:143
+#: ../../view/theme/diabook/diabook-aerith/theme.php:143
+#: ../../view/theme/diabook/diabook-pink/theme.php:143
+#: ../../view/theme/diabook-aerith/theme.php:143
 msgid "Global Directory"
 msgstr "Weltweites Verzeichnis"
 
@@ -4116,71 +4221,71 @@ msgstr "Die Updates für dein Profil konnten nicht gespeichert werden"
 msgid "Connection accepted at %s"
 msgstr "Auf %s wurde die Verbindung akzeptiert"
 
-#: ../../addon/facebook/facebook.php:467
+#: ../../addon/facebook/facebook.php:490
 msgid "Facebook disabled"
 msgstr "Facebook deaktiviert"
 
-#: ../../addon/facebook/facebook.php:472
+#: ../../addon/facebook/facebook.php:495
 msgid "Updating contacts"
 msgstr "Aktualisiere Kontakte"
 
-#: ../../addon/facebook/facebook.php:493
+#: ../../addon/facebook/facebook.php:515
 msgid "Facebook API key is missing."
 msgstr "Facebook-API-Schlüssel nicht gefunden"
 
-#: ../../addon/facebook/facebook.php:500
+#: ../../addon/facebook/facebook.php:522
 msgid "Facebook Connect"
 msgstr "Mit Facebook verbinden"
 
-#: ../../addon/facebook/facebook.php:506
+#: ../../addon/facebook/facebook.php:528
 msgid "Install Facebook connector for this account."
 msgstr "Facebook-Connector für diesen Account installieren."
 
-#: ../../addon/facebook/facebook.php:513
+#: ../../addon/facebook/facebook.php:535
 msgid "Remove Facebook connector"
 msgstr "Facebook-Connector entfernen"
 
-#: ../../addon/facebook/facebook.php:518
+#: ../../addon/facebook/facebook.php:540
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]"
 
-#: ../../addon/facebook/facebook.php:525
+#: ../../addon/facebook/facebook.php:547
 msgid "Post to Facebook by default"
 msgstr "Veröffentliche standardmäßig bei Facebook"
 
-#: ../../addon/facebook/facebook.php:529
+#: ../../addon/facebook/facebook.php:551
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren"
 
-#: ../../addon/facebook/facebook.php:531
+#: ../../addon/facebook/facebook.php:553
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend"
 " <em>stream</em>."
 msgstr "Facebook-Konversationen bestehen aus deinen Beiträgen auf deiner<em>Pinnwand</em>, sowie den Beiträgen deiner Freunde <em>Stream</em>."
 
-#: ../../addon/facebook/facebook.php:532
+#: ../../addon/facebook/facebook.php:554
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen."
 
-#: ../../addon/facebook/facebook.php:533
+#: ../../addon/facebook/facebook.php:555
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr "Mit den folgenden Einstellungen kannst Du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen."
 
-#: ../../addon/facebook/facebook.php:537
+#: ../../addon/facebook/facebook.php:559
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen"
 
-#: ../../addon/facebook/facebook.php:542
+#: ../../addon/facebook/facebook.php:564
 msgid "Do not import your Facebook profile wall conversations"
 msgstr "Facebook-Pinnwand nicht importieren"
 
-#: ../../addon/facebook/facebook.php:544
+#: ../../addon/facebook/facebook.php:566
 msgid ""
 "If you choose to link conversations and leave both of these boxes unchecked,"
 " your Facebook profile wall will be merged with your profile wall on this "
@@ -4188,114 +4293,114 @@ msgid ""
 "who may see the conversations."
 msgstr "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann."
 
-#: ../../addon/facebook/facebook.php:549
+#: ../../addon/facebook/facebook.php:571
 msgid "Comma separated applications to ignore"
 msgstr "Komma separiert Anwendungen, die ignoriert werden sollen"
 
-#: ../../addon/facebook/facebook.php:623
+#: ../../addon/facebook/facebook.php:648
 msgid "Problems with Facebook Real-Time Updates"
 msgstr "Probleme mit Facebook Echtzeit-Updates"
 
-#: ../../addon/facebook/facebook.php:647
+#: ../../addon/facebook/facebook.php:675
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../../addon/facebook/facebook.php:648
+#: ../../addon/facebook/facebook.php:676
 msgid "Facebook Connector Settings"
 msgstr "Facebook-Verbindungseinstellungen"
 
-#: ../../addon/facebook/facebook.php:659
+#: ../../addon/facebook/facebook.php:691
 msgid "Facebook API Key"
 msgstr "Facebook API Schlüssel"
 
-#: ../../addon/facebook/facebook.php:668
+#: ../../addon/facebook/facebook.php:700
 msgid ""
 "Error: it appears that you have specified the App-ID and -Secret in your "
 ".htconfig.php file. As long as they are specified there, they cannot be set "
 "using this form.<br><br>"
 msgstr "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>"
 
-#: ../../addon/facebook/facebook.php:673
+#: ../../addon/facebook/facebook.php:705
 msgid ""
 "Error: the given API Key seems to be incorrect (the application access token"
 " could not be retrieved)."
 msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)."
 
-#: ../../addon/facebook/facebook.php:675
+#: ../../addon/facebook/facebook.php:707
 msgid "The given API Key seems to work correctly."
 msgstr "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren."
 
-#: ../../addon/facebook/facebook.php:677
+#: ../../addon/facebook/facebook.php:709
 msgid ""
 "The correctness of the API Key could not be detected. Somthing strange's "
 "going on."
 msgstr "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange."
 
-#: ../../addon/facebook/facebook.php:680
+#: ../../addon/facebook/facebook.php:712
 msgid "App-ID / API-Key"
 msgstr "App-ID / API-Key"
 
-#: ../../addon/facebook/facebook.php:681
+#: ../../addon/facebook/facebook.php:713
 msgid "Application secret"
 msgstr "Anwendungs-Geheimnis"
 
-#: ../../addon/facebook/facebook.php:682
+#: ../../addon/facebook/facebook.php:714
 #, php-format
 msgid "Polling Interval (min. %1$s minutes)"
 msgstr "Abrufintervall (min. %1$s Minuten)"
 
-#: ../../addon/facebook/facebook.php:686
+#: ../../addon/facebook/facebook.php:718
 msgid "Real-Time Updates"
 msgstr "Echt-Zeit Aktualisierungen"
 
-#: ../../addon/facebook/facebook.php:690
+#: ../../addon/facebook/facebook.php:722
 msgid "Real-Time Updates are activated."
 msgstr "Echtzeit-Updates sind aktiviert."
 
-#: ../../addon/facebook/facebook.php:691
+#: ../../addon/facebook/facebook.php:723
 msgid "Deactivate Real-Time Updates"
 msgstr "Echtzeit-Updates deaktivieren"
 
-#: ../../addon/facebook/facebook.php:693
+#: ../../addon/facebook/facebook.php:725
 msgid "Real-Time Updates not activated."
 msgstr "Echtzeit-Updates nicht aktiviert."
 
-#: ../../addon/facebook/facebook.php:693
+#: ../../addon/facebook/facebook.php:725
 msgid "Activate Real-Time Updates"
 msgstr "Echtzeit-Updates aktivieren"
 
-#: ../../addon/facebook/facebook.php:707
+#: ../../addon/facebook/facebook.php:743
 msgid "The new values have been saved."
 msgstr "Die neuen Einstellungen wurden gespeichert."
 
-#: ../../addon/facebook/facebook.php:726
+#: ../../addon/facebook/facebook.php:767
 msgid "Post to Facebook"
 msgstr "Bei Facebook veröffentlichen"
 
-#: ../../addon/facebook/facebook.php:818
+#: ../../addon/facebook/facebook.php:865
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen."
 
-#: ../../addon/facebook/facebook.php:1039
+#: ../../addon/facebook/facebook.php:1085
 msgid "View on Friendica"
 msgstr "In Friendica betrachten"
 
-#: ../../addon/facebook/facebook.php:1072
+#: ../../addon/facebook/facebook.php:1118
 msgid "Facebook post failed. Queued for retry."
 msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut."
 
-#: ../../addon/facebook/facebook.php:1108
+#: ../../addon/facebook/facebook.php:1158
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich."
 
-#: ../../addon/facebook/facebook.php:1109
+#: ../../addon/facebook/facebook.php:1159
 msgid "Facebook connection became invalid"
 msgstr "Facebook Anmeldedaten sind ungültig geworden"
 
-#: ../../addon/facebook/facebook.php:1110
+#: ../../addon/facebook/facebook.php:1160
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -4460,10 +4565,16 @@ msgid "Latest likes"
 msgstr "Neueste Favoriten"
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook-red/theme.php:77
-#: ../../view/theme/diabook-blue/theme.php:77
-#: ../../view/theme/diabook/theme.php:83
-#: ../../view/theme/diabook-aerith/theme.php:78 ../../include/text.php:1302
+#: ../../view/theme/diabook-red/theme.php:79
+#: ../../view/theme/diabook-blue/theme.php:79
+#: ../../view/theme/diabook/diabook-green/theme.php:80
+#: ../../view/theme/diabook/diabook-red/theme.php:79
+#: ../../view/theme/diabook/diabook-blue/theme.php:79
+#: ../../view/theme/diabook/theme.php:94
+#: ../../view/theme/diabook/diabook-dark/theme.php:80
+#: ../../view/theme/diabook/diabook-aerith/theme.php:80
+#: ../../view/theme/diabook/diabook-pink/theme.php:80
+#: ../../view/theme/diabook-aerith/theme.php:80 ../../include/text.php:1302
 #: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr "Veranstaltung"
@@ -4827,11 +4938,11 @@ msgstr "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX gesch
 msgid "Use the MathJax renderer"
 msgstr "MathJax verwenden"
 
-#: ../../addon/mathjax/mathjax.php:72
+#: ../../addon/mathjax/mathjax.php:74
 msgid "MathJax Base URL"
 msgstr "MathJax Basis-URL"
 
-#: ../../addon/mathjax/mathjax.php:72
+#: ../../addon/mathjax/mathjax.php:74
 msgid ""
 "The URL for the javascript file that should be included to use MathJax. Can "
 "be either the MathJax CDN or another installation of MathJax."
@@ -4851,23 +4962,23 @@ msgstr "RichText Editor deaktivieren"
 
 #: ../../addon/gravatar/gravatar.php:71
 msgid "generic profile image"
-msgstr ""
+msgstr "allgemeines Profilbild"
 
 #: ../../addon/gravatar/gravatar.php:72
 msgid "random geometric pattern"
-msgstr ""
+msgstr "zufällig erzeugtes geometrisches Muster"
 
 #: ../../addon/gravatar/gravatar.php:73
 msgid "monster face"
-msgstr ""
+msgstr "Monstergesicht"
 
 #: ../../addon/gravatar/gravatar.php:74
 msgid "computer generated face"
-msgstr ""
+msgstr "Computergesicht"
 
 #: ../../addon/gravatar/gravatar.php:75
 msgid "retro arcade style face"
-msgstr ""
+msgstr "Retro Arcade Design Gesicht"
 
 #: ../../addon/gravatar/gravatar.php:87
 msgid "Default avatar image"
@@ -4875,19 +4986,19 @@ msgstr "Standard Profilbild "
 
 #: ../../addon/gravatar/gravatar.php:87
 msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr ""
+msgstr "Wähle das Standardgesicht, wenn kein Bild auf Gravatar gefunden wurde. Schaue auch sonst im README nach."
 
 #: ../../addon/gravatar/gravatar.php:88
 msgid "Rating of images"
-msgstr ""
+msgstr "Bildbewertung"
 
 #: ../../addon/gravatar/gravatar.php:88
 msgid "Select the appropriate avatar rating for your site. See README"
-msgstr ""
+msgstr "Wähle eine angemessene Bildbewertung für Deinen Server. Schaue auch sonst im README nach."
 
 #: ../../addon/gravatar/gravatar.php:102
 msgid "Gravatar settings updated."
-msgstr ""
+msgstr "Gravatar Einstellungen aktualisiert."
 
 #: ../../addon/testdrive/testdrive.php:85
 #, php-format
@@ -4904,7 +5015,7 @@ msgid ""
 "Hi %1$s,\n"
 "\n"
 "Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."
-msgstr ""
+msgstr "Hallo %1$s,\n\ndein Test-Konto auf %2$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir eine feste Friendica-Site für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Sites findest du auf http://dir.friendica.com/siteinfo. Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica Projektseite werfen: http://friendica.com"
 
 #: ../../addon/pageheader/pageheader.php:50
 msgid "\"pageheader\" Settings"
@@ -5287,11 +5398,11 @@ msgstr "IRC Einstellungen"
 
 #: ../../addon/irc/irc.php:46
 msgid "Channel(s) to auto connect (comma separated)"
-msgstr ""
+msgstr "mit diesen Kanälen soll man automatisch verbunden werden (Komma getrennt)"
 
 #: ../../addon/irc/irc.php:51
 msgid "Popular Channels (comma separated)"
-msgstr ""
+msgstr "Beliebte Kanäle (mit Komma getrennt)"
 
 #: ../../addon/irc/irc.php:69
 msgid "IRC settings saved."
@@ -5307,31 +5418,31 @@ msgstr "Beliebte Räume"
 
 #: ../../addon/blogger/blogger.php:42
 msgid "Post to blogger"
-msgstr ""
+msgstr "Auf Blogger posten"
 
 #: ../../addon/blogger/blogger.php:74
 msgid "Blogger Post Settings"
-msgstr ""
+msgstr "Einstellungen zum posten auf Blogger"
 
 #: ../../addon/blogger/blogger.php:76
 msgid "Enable Blogger Post Plugin"
-msgstr ""
+msgstr "Blogger-Post-Plugin aktivieren"
 
 #: ../../addon/blogger/blogger.php:81
 msgid "Blogger username"
-msgstr ""
+msgstr "Blogger-Benutzername"
 
 #: ../../addon/blogger/blogger.php:86
 msgid "Blogger password"
-msgstr ""
+msgstr "Blogger-Passwort"
 
 #: ../../addon/blogger/blogger.php:91
 msgid "Blogger API URL"
-msgstr ""
+msgstr "Blogger-API-URL"
 
 #: ../../addon/blogger/blogger.php:96
 msgid "Post to Blogger by default"
-msgstr ""
+msgstr "Standardmäßig auf Blogger posten"
 
 #: ../../addon/posterous/posterous.php:36
 msgid "Post to Posterous"
@@ -5357,186 +5468,296 @@ msgstr "Posterous-Passwort"
 msgid "Post to Posterous by default"
 msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous"
 
-#: ../../view/theme/diabook-red/theme.php:26
-#: ../../view/theme/diabook-blue/theme.php:26
-#: ../../view/theme/diabook/theme.php:32
-#: ../../view/theme/diabook-aerith/theme.php:27
+#: ../../view/theme/diabook-red/theme.php:28
+#: ../../view/theme/diabook-blue/theme.php:28
+#: ../../view/theme/diabook/diabook-green/theme.php:29
+#: ../../view/theme/diabook/diabook-red/theme.php:28
+#: ../../view/theme/diabook/diabook-blue/theme.php:28
+#: ../../view/theme/diabook/theme.php:43
+#: ../../view/theme/diabook/diabook-dark/theme.php:29
+#: ../../view/theme/diabook/diabook-aerith/theme.php:29
+#: ../../view/theme/diabook/diabook-pink/theme.php:29
+#: ../../view/theme/diabook-aerith/theme.php:29
 msgid "Last users"
 msgstr "Letzte Nutzer"
 
-#: ../../view/theme/diabook-red/theme.php:55
-#: ../../view/theme/diabook-blue/theme.php:55
-#: ../../view/theme/diabook/theme.php:61
-#: ../../view/theme/diabook-aerith/theme.php:56
+#: ../../view/theme/diabook-red/theme.php:57
+#: ../../view/theme/diabook-blue/theme.php:57
+#: ../../view/theme/diabook/diabook-green/theme.php:58
+#: ../../view/theme/diabook/diabook-red/theme.php:57
+#: ../../view/theme/diabook/diabook-blue/theme.php:57
+#: ../../view/theme/diabook/theme.php:72
+#: ../../view/theme/diabook/diabook-dark/theme.php:58
+#: ../../view/theme/diabook/diabook-aerith/theme.php:58
+#: ../../view/theme/diabook/diabook-pink/theme.php:58
+#: ../../view/theme/diabook-aerith/theme.php:58
 msgid "Last likes"
 msgstr "Zuletzt gemocht"
 
-#: ../../view/theme/diabook-red/theme.php:100
-#: ../../view/theme/diabook-blue/theme.php:100
-#: ../../view/theme/diabook/theme.php:106
-#: ../../view/theme/diabook-aerith/theme.php:101
+#: ../../view/theme/diabook-red/theme.php:102
+#: ../../view/theme/diabook-blue/theme.php:102
+#: ../../view/theme/diabook/diabook-green/theme.php:103
+#: ../../view/theme/diabook/diabook-red/theme.php:102
+#: ../../view/theme/diabook/diabook-blue/theme.php:102
+#: ../../view/theme/diabook/theme.php:117
+#: ../../view/theme/diabook/diabook-dark/theme.php:103
+#: ../../view/theme/diabook/diabook-aerith/theme.php:103
+#: ../../view/theme/diabook/diabook-pink/theme.php:103
+#: ../../view/theme/diabook-aerith/theme.php:103
 msgid "Last photos"
 msgstr "Letzte Fotos"
 
-#: ../../view/theme/diabook-red/theme.php:145
-#: ../../view/theme/diabook-blue/theme.php:145
-#: ../../view/theme/diabook/theme.php:151
-#: ../../view/theme/diabook-aerith/theme.php:146
+#: ../../view/theme/diabook-red/theme.php:139
+#: ../../view/theme/diabook-blue/theme.php:139
+#: ../../view/theme/diabook/diabook-green/theme.php:141
+#: ../../view/theme/diabook/diabook-red/theme.php:139
+#: ../../view/theme/diabook/diabook-blue/theme.php:139
+#: ../../view/theme/diabook/theme.php:155
+#: ../../view/theme/diabook/diabook-dark/theme.php:141
+#: ../../view/theme/diabook/diabook-aerith/theme.php:141
+#: ../../view/theme/diabook/diabook-pink/theme.php:141
+#: ../../view/theme/diabook-aerith/theme.php:141
 msgid "Find Friends"
 msgstr "Freunde finden"
 
-#: ../../view/theme/diabook-red/theme.php:146
-#: ../../view/theme/diabook-blue/theme.php:146
-#: ../../view/theme/diabook/theme.php:152
-#: ../../view/theme/diabook-aerith/theme.php:147
+#: ../../view/theme/diabook-red/theme.php:140
+#: ../../view/theme/diabook-blue/theme.php:140
+#: ../../view/theme/diabook/diabook-green/theme.php:142
+#: ../../view/theme/diabook/diabook-red/theme.php:140
+#: ../../view/theme/diabook/diabook-blue/theme.php:140
+#: ../../view/theme/diabook/theme.php:156
+#: ../../view/theme/diabook/diabook-dark/theme.php:142
+#: ../../view/theme/diabook/diabook-aerith/theme.php:142
+#: ../../view/theme/diabook/diabook-pink/theme.php:142
+#: ../../view/theme/diabook-aerith/theme.php:142
 msgid "Local Directory"
 msgstr "Lokales Verzeichnis"
 
-#: ../../view/theme/diabook-red/theme.php:148
-#: ../../view/theme/diabook-blue/theme.php:148
-#: ../../view/theme/diabook/theme.php:154
-#: ../../view/theme/diabook-aerith/theme.php:149
+#: ../../view/theme/diabook-red/theme.php:142
+#: ../../view/theme/diabook-blue/theme.php:142
+#: ../../view/theme/diabook/diabook-green/theme.php:144
+#: ../../view/theme/diabook/diabook-red/theme.php:142
+#: ../../view/theme/diabook/diabook-blue/theme.php:142
+#: ../../view/theme/diabook/theme.php:158
+#: ../../view/theme/diabook/diabook-dark/theme.php:144
+#: ../../view/theme/diabook/diabook-aerith/theme.php:144
+#: ../../view/theme/diabook/diabook-pink/theme.php:144
+#: ../../view/theme/diabook-aerith/theme.php:144
 #: ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr "Ähnliche Interessen"
 
-#: ../../view/theme/diabook-red/theme.php:150
-#: ../../view/theme/diabook-blue/theme.php:150
-#: ../../view/theme/diabook/theme.php:156
-#: ../../view/theme/diabook-aerith/theme.php:151
+#: ../../view/theme/diabook-red/theme.php:144
+#: ../../view/theme/diabook-blue/theme.php:144
+#: ../../view/theme/diabook/diabook-green/theme.php:146
+#: ../../view/theme/diabook/diabook-red/theme.php:144
+#: ../../view/theme/diabook/diabook-blue/theme.php:144
+#: ../../view/theme/diabook/theme.php:160
+#: ../../view/theme/diabook/diabook-dark/theme.php:146
+#: ../../view/theme/diabook/diabook-aerith/theme.php:146
+#: ../../view/theme/diabook/diabook-pink/theme.php:146
+#: ../../view/theme/diabook-aerith/theme.php:146
 #: ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr "Freunde einladen"
 
-#: ../../view/theme/diabook-red/theme.php:165
-#: ../../view/theme/diabook-red/theme.php:246
-#: ../../view/theme/diabook-blue/theme.php:165
-#: ../../view/theme/diabook-blue/theme.php:246
-#: ../../view/theme/diabook/theme.php:172
-#: ../../view/theme/diabook/theme.php:256
-#: ../../view/theme/diabook-aerith/theme.php:166
-#: ../../view/theme/diabook-aerith/theme.php:247
+#: ../../view/theme/diabook-red/theme.php:159
+#: ../../view/theme/diabook-red/theme.php:234
+#: ../../view/theme/diabook-blue/theme.php:159
+#: ../../view/theme/diabook-blue/theme.php:234
+#: ../../view/theme/diabook/diabook-green/theme.php:161
+#: ../../view/theme/diabook/diabook-green/theme.php:236
+#: ../../view/theme/diabook/diabook-red/theme.php:159
+#: ../../view/theme/diabook/diabook-red/theme.php:234
+#: ../../view/theme/diabook/diabook-blue/theme.php:159
+#: ../../view/theme/diabook/diabook-blue/theme.php:234
+#: ../../view/theme/diabook/theme.php:176
+#: ../../view/theme/diabook/theme.php:254
+#: ../../view/theme/diabook/diabook-dark/theme.php:161
+#: ../../view/theme/diabook/diabook-dark/theme.php:236
+#: ../../view/theme/diabook/diabook-aerith/theme.php:161
+#: ../../view/theme/diabook/diabook-aerith/theme.php:236
+#: ../../view/theme/diabook/diabook-pink/theme.php:161
+#: ../../view/theme/diabook/diabook-pink/theme.php:236
+#: ../../view/theme/diabook-aerith/theme.php:161
+#: ../../view/theme/diabook-aerith/theme.php:236
 msgid "Community Pages"
 msgstr "Foren"
 
-#: ../../view/theme/diabook-red/theme.php:198
-#: ../../view/theme/diabook-blue/theme.php:198
-#: ../../view/theme/diabook/theme.php:205
-#: ../../view/theme/diabook-aerith/theme.php:199
+#: ../../view/theme/diabook-red/theme.php:192
+#: ../../view/theme/diabook-blue/theme.php:192
+#: ../../view/theme/diabook/diabook-green/theme.php:194
+#: ../../view/theme/diabook/diabook-red/theme.php:192
+#: ../../view/theme/diabook/diabook-blue/theme.php:192
+#: ../../view/theme/diabook/theme.php:209
+#: ../../view/theme/diabook/diabook-dark/theme.php:194
+#: ../../view/theme/diabook/diabook-aerith/theme.php:194
+#: ../../view/theme/diabook/diabook-pink/theme.php:194
+#: ../../view/theme/diabook-aerith/theme.php:194
 msgid "Help or @NewHere ?"
 msgstr "Hilfe oder @NewHere"
 
-#: ../../view/theme/diabook-red/theme.php:204
-#: ../../view/theme/diabook-blue/theme.php:204
-#: ../../view/theme/diabook/theme.php:211
-#: ../../view/theme/diabook-aerith/theme.php:205
+#: ../../view/theme/diabook-red/theme.php:198
+#: ../../view/theme/diabook-blue/theme.php:198
+#: ../../view/theme/diabook/diabook-green/theme.php:200
+#: ../../view/theme/diabook/diabook-red/theme.php:198
+#: ../../view/theme/diabook/diabook-blue/theme.php:198
+#: ../../view/theme/diabook/theme.php:215
+#: ../../view/theme/diabook/diabook-dark/theme.php:200
+#: ../../view/theme/diabook/diabook-aerith/theme.php:200
+#: ../../view/theme/diabook/diabook-pink/theme.php:200
+#: ../../view/theme/diabook-aerith/theme.php:200
 msgid "Connect Services"
 msgstr "Verbinde Dienste"
 
-#: ../../view/theme/diabook-red/theme.php:210
-#: ../../view/theme/diabook-blue/theme.php:210
-#: ../../view/theme/diabook/theme.php:217
-#: ../../view/theme/diabook-aerith/theme.php:211
-msgid "PostIt to Friendica"
-msgstr "Bei Friendica posten"
-
-#: ../../view/theme/diabook-red/theme.php:210
-#: ../../view/theme/diabook-blue/theme.php:210
-#: ../../view/theme/diabook/theme.php:217
-#: ../../view/theme/diabook-aerith/theme.php:211
-msgid "Post to Friendica"
-msgstr "Wenn du diesen Link"
-
-#: ../../view/theme/diabook-red/theme.php:211
-#: ../../view/theme/diabook-blue/theme.php:211
-#: ../../view/theme/diabook/theme.php:218
-#: ../../view/theme/diabook-aerith/theme.php:212
-msgid " from anywhere by bookmarking this Link."
-msgstr "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen."
-
-#: ../../view/theme/diabook-red/theme.php:239
-#: ../../view/theme/diabook-blue/theme.php:239
-#: ../../view/theme/diabook/theme.php:249
-#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:49
+#: ../../view/theme/diabook-red/theme.php:227
+#: ../../view/theme/diabook-blue/theme.php:227
+#: ../../view/theme/diabook/diabook-green/theme.php:229
+#: ../../view/theme/diabook/diabook-red/theme.php:227
+#: ../../view/theme/diabook/diabook-blue/theme.php:227
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook/diabook-dark/theme.php:229
+#: ../../view/theme/diabook/diabook-aerith/theme.php:229
+#: ../../view/theme/diabook/diabook-pink/theme.php:229
+#: ../../view/theme/diabook-aerith/theme.php:229 ../../include/nav.php:49
 #: ../../include/nav.php:115
 msgid "Your posts and conversations"
 msgstr "Deine Beiträge und Unterhaltungen"
 
-#: ../../view/theme/diabook-red/theme.php:240
-#: ../../view/theme/diabook-blue/theme.php:240
-#: ../../view/theme/diabook/theme.php:250
-#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:50
+#: ../../view/theme/diabook-red/theme.php:228
+#: ../../view/theme/diabook-blue/theme.php:228
+#: ../../view/theme/diabook/diabook-green/theme.php:230
+#: ../../view/theme/diabook/diabook-red/theme.php:228
+#: ../../view/theme/diabook/diabook-blue/theme.php:228
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook/diabook-dark/theme.php:230
+#: ../../view/theme/diabook/diabook-aerith/theme.php:230
+#: ../../view/theme/diabook/diabook-pink/theme.php:230
+#: ../../view/theme/diabook-aerith/theme.php:230 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr "Deine Profilseite"
 
-#: ../../view/theme/diabook-red/theme.php:241
-#: ../../view/theme/diabook-blue/theme.php:241
-#: ../../view/theme/diabook/theme.php:251
-#: ../../view/theme/diabook-aerith/theme.php:242
+#: ../../view/theme/diabook-red/theme.php:229
+#: ../../view/theme/diabook-blue/theme.php:229
+#: ../../view/theme/diabook/diabook-green/theme.php:231
+#: ../../view/theme/diabook/diabook-red/theme.php:229
+#: ../../view/theme/diabook/diabook-blue/theme.php:229
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook/diabook-dark/theme.php:231
+#: ../../view/theme/diabook/diabook-aerith/theme.php:231
+#: ../../view/theme/diabook/diabook-pink/theme.php:231
+#: ../../view/theme/diabook-aerith/theme.php:231
 msgid "Your contacts"
 msgstr "Deine Kontakte"
 
-#: ../../view/theme/diabook-red/theme.php:242
-#: ../../view/theme/diabook-blue/theme.php:242
-#: ../../view/theme/diabook/theme.php:252
-#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51
-#: ../../boot.php:1463
-msgid "Photos"
-msgstr "Bilder"
-
-#: ../../view/theme/diabook-red/theme.php:242
-#: ../../view/theme/diabook-blue/theme.php:242
-#: ../../view/theme/diabook/theme.php:252
-#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51
+#: ../../view/theme/diabook-red/theme.php:230
+#: ../../view/theme/diabook-blue/theme.php:230
+#: ../../view/theme/diabook/diabook-green/theme.php:232
+#: ../../view/theme/diabook/diabook-red/theme.php:230
+#: ../../view/theme/diabook/diabook-blue/theme.php:230
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook/diabook-dark/theme.php:232
+#: ../../view/theme/diabook/diabook-aerith/theme.php:232
+#: ../../view/theme/diabook/diabook-pink/theme.php:232
+#: ../../view/theme/diabook-aerith/theme.php:232 ../../include/nav.php:51
 msgid "Your photos"
 msgstr "Deine Fotos"
 
-#: ../../view/theme/diabook-red/theme.php:243
-#: ../../view/theme/diabook-blue/theme.php:243
-#: ../../view/theme/diabook/theme.php:253
-#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52
+#: ../../view/theme/diabook-red/theme.php:231
+#: ../../view/theme/diabook-blue/theme.php:231
+#: ../../view/theme/diabook/diabook-green/theme.php:233
+#: ../../view/theme/diabook/diabook-red/theme.php:231
+#: ../../view/theme/diabook/diabook-blue/theme.php:231
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook/diabook-dark/theme.php:233
+#: ../../view/theme/diabook/diabook-aerith/theme.php:233
+#: ../../view/theme/diabook/diabook-pink/theme.php:233
+#: ../../view/theme/diabook-aerith/theme.php:233 ../../include/nav.php:52
 msgid "Your events"
 msgstr "Deine Ereignisse"
 
-#: ../../view/theme/diabook-red/theme.php:244
-#: ../../view/theme/diabook-blue/theme.php:244
-#: ../../view/theme/diabook/theme.php:254
-#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53
+#: ../../view/theme/diabook-red/theme.php:232
+#: ../../view/theme/diabook-blue/theme.php:232
+#: ../../view/theme/diabook/diabook-green/theme.php:234
+#: ../../view/theme/diabook/diabook-red/theme.php:232
+#: ../../view/theme/diabook/diabook-blue/theme.php:232
+#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook/diabook-dark/theme.php:234
+#: ../../view/theme/diabook/diabook-aerith/theme.php:234
+#: ../../view/theme/diabook/diabook-pink/theme.php:234
+#: ../../view/theme/diabook-aerith/theme.php:234 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr "Persönliche Notizen"
 
-#: ../../view/theme/diabook-red/theme.php:244
-#: ../../view/theme/diabook-blue/theme.php:244
-#: ../../view/theme/diabook/theme.php:254
-#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53
+#: ../../view/theme/diabook-red/theme.php:232
+#: ../../view/theme/diabook-blue/theme.php:232
+#: ../../view/theme/diabook/diabook-green/theme.php:234
+#: ../../view/theme/diabook/diabook-red/theme.php:232
+#: ../../view/theme/diabook/diabook-blue/theme.php:232
+#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook/diabook-dark/theme.php:234
+#: ../../view/theme/diabook/diabook-aerith/theme.php:234
+#: ../../view/theme/diabook/diabook-pink/theme.php:234
+#: ../../view/theme/diabook-aerith/theme.php:234 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr "Deine privaten Fotos"
 
-#: ../../view/theme/diabook-red/config.php:66
-#: ../../view/theme/diabook-blue/config.php:66
-#: ../../view/theme/diabook/config.php:78
+#: ../../view/theme/diabook-red/config.php:78
+#: ../../view/theme/diabook-blue/config.php:78
+#: ../../view/theme/diabook/diabook-green/config.php:78
+#: ../../view/theme/diabook/diabook-red/config.php:78
+#: ../../view/theme/diabook/diabook-blue/config.php:78
+#: ../../view/theme/diabook/diabook-dark/config.php:78
+#: ../../view/theme/diabook/diabook-aerith/config.php:78
+#: ../../view/theme/diabook/diabook-pink/config.php:78
+#: ../../view/theme/diabook/config.php:93
 #: ../../view/theme/quattro/config.php:54
-#: ../../view/theme/diabook-aerith/config.php:66
+#: ../../view/theme/diabook-aerith/config.php:78
 msgid "Theme settings"
 msgstr "Themen Einstellungen"
 
-#: ../../view/theme/diabook-red/config.php:67
-#: ../../view/theme/diabook-blue/config.php:67
-#: ../../view/theme/diabook/config.php:79
-#: ../../view/theme/diabook-aerith/config.php:67
+#: ../../view/theme/diabook-red/config.php:79
+#: ../../view/theme/diabook-blue/config.php:79
+#: ../../view/theme/diabook/diabook-green/config.php:79
+#: ../../view/theme/diabook/diabook-red/config.php:79
+#: ../../view/theme/diabook/diabook-blue/config.php:79
+#: ../../view/theme/diabook/diabook-dark/config.php:79
+#: ../../view/theme/diabook/diabook-aerith/config.php:79
+#: ../../view/theme/diabook/diabook-pink/config.php:79
+#: ../../view/theme/diabook/config.php:94
+#: ../../view/theme/diabook-aerith/config.php:79
 msgid "Set font-size for posts and comments"
-msgstr ""
-
-#: ../../view/theme/diabook-red/config.php:68
-#: ../../view/theme/diabook-blue/config.php:68
-#: ../../view/theme/diabook/config.php:80
-#: ../../view/theme/diabook-aerith/config.php:68
+msgstr "Schriftgröße für Beiträge und Kommentare festlegen"
+
+#: ../../view/theme/diabook-red/config.php:80
+#: ../../view/theme/diabook-blue/config.php:80
+#: ../../view/theme/diabook/diabook-green/config.php:80
+#: ../../view/theme/diabook/diabook-red/config.php:80
+#: ../../view/theme/diabook/diabook-blue/config.php:80
+#: ../../view/theme/diabook/diabook-dark/config.php:80
+#: ../../view/theme/diabook/diabook-aerith/config.php:80
+#: ../../view/theme/diabook/diabook-pink/config.php:80
+#: ../../view/theme/diabook/config.php:95
+#: ../../view/theme/diabook-aerith/config.php:80
 msgid "Set line-height for posts and comments"
-msgstr ""
-
-#: ../../view/theme/diabook/config.php:81
+msgstr "Liniengröße für Beiträge und Kommantare festlegen"
+
+#: ../../view/theme/diabook-red/config.php:81
+#: ../../view/theme/diabook-blue/config.php:81
+#: ../../view/theme/diabook/diabook-green/config.php:81
+#: ../../view/theme/diabook/diabook-red/config.php:81
+#: ../../view/theme/diabook/diabook-blue/config.php:81
+#: ../../view/theme/diabook/diabook-dark/config.php:81
+#: ../../view/theme/diabook/diabook-aerith/config.php:81
+#: ../../view/theme/diabook/diabook-pink/config.php:81
+#: ../../view/theme/diabook/config.php:96
+#: ../../view/theme/diabook-aerith/config.php:81
 msgid "Set resolution for middle column"
-msgstr ""
+msgstr "Auflösung für die Mittelspalte setzen"
+
+#: ../../view/theme/diabook/config.php:97
+msgid "Set color scheme"
+msgstr "Wähle Farbschema"
 
 #: ../../view/theme/quattro/config.php:55
 msgid "Alignment"
@@ -5567,7 +5788,7 @@ msgid "j F"
 msgstr "j F"
 
 #: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
-#: ../../include/items.php:1402
+#: ../../include/items.php:1403
 msgid "Birthday:"
 msgstr "Geburtstag:"
 
@@ -5829,11 +6050,11 @@ msgstr "Nicht verfügbar"
 
 #: ../../include/profile_selectors.php:33
 msgid "Has crush"
-msgstr ""
+msgstr "verknallt"
 
 #: ../../include/profile_selectors.php:33
 msgid "Infatuated"
-msgstr ""
+msgstr "verliebt"
 
 #: ../../include/profile_selectors.php:33
 msgid "Dating"
@@ -5869,7 +6090,7 @@ msgstr "Verheiratet"
 
 #: ../../include/profile_selectors.php:33
 msgid "Imaginarily married"
-msgstr ""
+msgstr "imaginär verheiratet"
 
 #: ../../include/profile_selectors.php:33
 msgid "Partners"
@@ -5881,7 +6102,7 @@ msgstr "zusammenlebend"
 
 #: ../../include/profile_selectors.php:33
 msgid "Common law"
-msgstr ""
+msgstr "wilde Ehe"
 
 #: ../../include/profile_selectors.php:33
 msgid "Happy"
@@ -5913,7 +6134,7 @@ msgstr "Geschieden"
 
 #: ../../include/profile_selectors.php:33
 msgid "Imaginarily divorced"
-msgstr ""
+msgstr "imaginär geschieden"
 
 #: ../../include/profile_selectors.php:33
 msgid "Widowed"
@@ -6120,7 +6341,7 @@ msgstr "Anhänge:"
 msgid "[Relayed] Comment authored by %s from network %s"
 msgstr "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk"
 
-#: ../../include/network.php:823
+#: ../../include/network.php:824
 msgid "view full size"
 msgstr "Volle Größe anzeigen"
 
@@ -6161,7 +6382,7 @@ msgstr "Neue Gruppe erstellen"
 
 #: ../../include/group.php:215
 msgid "Contacts not in any group"
-msgstr ""
+msgstr "Kontakte in keiner Gruppe"
 
 #: ../../include/nav.php:46 ../../boot.php:795
 msgid "Logout"
@@ -6642,11 +6863,11 @@ msgstr "Foto:"
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen."
 
-#: ../../include/items.php:2697
+#: ../../include/items.php:2698
 msgid "A new person is sharing with you at "
 msgstr "Eine neue Person teilt mit dir auf "
 
-#: ../../include/items.php:2697
+#: ../../include/items.php:2698
 msgid "You have a new follower at "
 msgstr "Du hast einen neuen Kontakt auf "
 
@@ -6675,7 +6896,7 @@ msgstr "Willkommen zurück "
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
-msgstr ""
+msgstr "Das Sicherheits-Merkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."
 
 #: ../../include/Contact.php:145 ../../include/conversation.php:809
 msgid "View Status"
@@ -6728,7 +6949,7 @@ msgstr "Das Profil von %s auf %s betrachten."
 msgid "%s from %s"
 msgstr "%s von %s"
 
-#: ../../include/conversation.php:360
+#: ../../include/conversation.php:359
 msgid "View in context"
 msgstr "Im Zusammenhang betrachten"
 

diff --git a/view/de/passchanged_eml.tpl b/view/de/passchanged_eml.tpl
index d5e8d9048dc21e55ac49d49cc384269c63afb457..dcabbbe4911aefcbebe992ca7e350f124c784be1 100644 (file)
--- a/view/de/passchanged_eml.tpl
+++ b/view/de/passchanged_eml.tpl
@@ -1,20 +1,20 @@
 
-Liebe/r $username,
-dein Passwort wurde wie gewünscht geändert. Bitte hebe diese Informationen
-für deine Unterlagen auf (oder ändere das Passwort augenblicklich in etwas
-das du dir merken kannst).
+Hallo $[username],
+       Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese 
+Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort 
+in etwas, was du dir merken kannst).
 
 
-Deine Anmeldedaten sind die Folgenden:
+Deine Login Daten wurden wie folgt geändert:
 
-Adresse der Seite:     $siteurl
-Anmelde Name:  $email
-Passwort:      $new_password
+Adresse der Seite:     $[siteurl]
+Login Name:    $[email]
+Passwort:      $[new_password]
 
-Du kannst diesen Passwort auf der "Einstellungen" Seite deines Accounts
-ändern nachdem du angemeldet bits.
+Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist.
 
 
-Viele Grüße,
-       $sitename Administrator
+Beste Grüße,
+       $[sitename] Administrator
 
+ 
\ No newline at end of file

diff --git a/view/de/register_open_eml.tpl b/view/de/register_open_eml.tpl
index d27c3c7439dbe28089e588fbdd6577b06996235a..d1c0e5ff4c91039b1e258d086371cba346c2b194 100644 (file)
--- a/view/de/register_open_eml.tpl
+++ b/view/de/register_open_eml.tpl
@@ -1,19 +1,34 @@
-
-Liebe/r $username,
-danke für die Registrierung bei $sitename. Dein neuer Account wurde angelegt.
-Die Anmeldedetails sind die Folgenden.
-
-Adresse der Seite: $siteurl
-Anmelde Name: $email
-Passwort: $password
-
-Du kannst dein Passwort auf der "Einstellungen" Seite deines Accounts ändern
-nachdem du dich angemeldet hast.
-
-Nimm dir bitte ein paar Augenblicke Zeit um die anderen Einstellungen deines
-Accounts zu bearbeiten. 
-
-Vielen Dank und Willkommen auf $sitename.
-
-Mit freundlichem Gruß,
-       $sitename Administrator
+\r
+Hallo $[username],\r
+       Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt. \r
+Die Login Details sind die folgenden:\r
+\r
+\r
+Adresse der Seite:     $[siteurl]\r
+Login Name:    $[email]\r
+Passwort:      $[password]\r
+\r
+Du kannst das Passwort in den "Einstellungen" zu deinem Account ändern \r
+nachdem du dich eingeloggt hast.\r
+\r
+Bitte nimm dir einige Augenblicke Zeit um die anderen Einstellungen auf der Seite zu überprüfen.\r
+\r
+Eventuell möchtest du außerdem einige grundlegenden Informationen in dein Standart-Profil eintragen \r
+(auf der "Profile" Seite) damit andere Leute dich einfacher finden können.\r
+\r
+Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profil-Foto,\r
+ein paar "Profil-Schlüsselwörter" anzugeben (damit man leichter Gleichinteressierte finden kann) - und \r
+natürlich in welchen Land Du lebst; wenn Du es nicht genauer angeben möchtest\r
+dann das.\r
+\r
+Wir respektieren Ihr Recht auf Privatsphäre, und keines dieser Elemente sind notwendig. \r
+Wenn Du hier neu bist und keinen kennst, wird man Dir helfen\r
+ein paar neue und interessante Freunde zu  finden.  \r
+\r
+\r
+Danke dir und willkommen auf $[sitename].\r
+\r
+Beste Grüße,\r
+       $[sitename] Administrator\r
+\r
+ 
\ No newline at end of file

diff --git a/view/de/register_verify_eml.tpl b/view/de/register_verify_eml.tpl
index 7ae432d612589facb57ab4805944a4f1f3ec2fea..8f25f5c36ac865dd866fbc5ec73edc59a0432a74 100644 (file)
--- a/view/de/register_verify_eml.tpl
+++ b/view/de/register_verify_eml.tpl
@@ -1,21 +1,25 @@
 
-Ein neuer Nutzer hat sich auf $sitename registriert. Diese Registration
-benötigt noch deine Zustimmung.
+Eine Neuanmeldung auf $[sitename] benötigt 
+deine Aufmerksamkeit. 
 
-Die Anmeldedetails sind Folgende:
 
-Kompletter Name: $username
-Adresse der Seite: $siteurl
-Anmelde Name: $email
+Die Login-Einzelheiten sind die folgenden:
 
+Kompletter Name:       $[username]
+Adresse der Seite:     $[siteurl]
+Login Name:    $[email]
 
-Um dieser Anmeldung zuzustimmen folge bitte diesem Link:
 
-$siteurl/regmod/allow/$hash 
+Um die Anfrage zu bestätigen besuche bitte:
 
 
-Um die Anfrage abzulehen und den Account zu entfernen folge diesem Link:
+$[siteurl]/regmod/allow/$[hash] 
 
-$siteurl/regmod/deny/$hash
 
-Besten Dank!
+Um die Anfrage abzulehnen und den Account zu löschen besuche bitte:
+
+
+$[siteurl]/regmod/deny/$[hash]
+
+
+Danke!

diff --git a/view/de/request_notify_eml.tpl b/view/de/request_notify_eml.tpl
index 55fa98e96a3bb15b5cff0c436f81ff64084b7cc7..057044e8c92d23abef5ec14665ece878cba3834f 100644 (file)
--- a/view/de/request_notify_eml.tpl
+++ b/view/de/request_notify_eml.tpl
@@ -1,14 +1,17 @@
 
-Liebe/r $myname,
+Hallo $[myname],
 
-du hast gerade eine Kontaktanfrage von '$requestor' auf $sitename erhalten.
+du hast eine Kontaktanfrage von '$[requestor]' auf $[sitename] 
 
-Du kannst dir das Profil unter $url ansehen.
+erhalten.
 
-Bitte melde dich auf deiner Seite an um die komplette Vorstellung anzusehen
-und bestätige oder ignoriere die Anfrage.
+Du kannst sein/ihr Profil unter $[url] finden.
 
-$siteurl
+Bitte melde dich an um die komplette Vorstellung einzusehen 
+und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen.
 
-Schöne Grüße,
-       $sitename Administrator
+$[siteurl]
+
+Beste Grüße,
+
+       $[sitename] Administrator
\ No newline at end of file

diff --git a/view/de/strings.php b/view/de/strings.php
index 13f6f716ed0a320b6a9f31a9f937d989fae3cc82..4e31f97de3c583e9a3ce2638bdaa2a10084ceba6 100644 (file)
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -1214,7 +1214,7 @@ $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
 $a->strings["Connect Services"] = "Verbinde Dienste";
 $a->strings["PostIt to Friendica"] = "Bei Friendica posten";
 $a->strings["Post to Friendica"] = "Wenn du diesen Link";
-$a->strings[" from anywhere by bookmarking this Link."] = " zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
+$a->strings[" from anywhere by bookmarking this Link."] = "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
 $a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
 $a->strings["Your profile page"] = "Deine Profilseite";
 $a->strings["Your contacts"] = "Deine Kontakte";

diff --git a/view/theme/diabook/admin_users.tpl b/view/theme/diabook/admin_users.tpl
index b465dc1b08b84e6bf34d152f6a8e48b8d1c27646..8aabb51ec9931bc694fdaf5098e6128ee516a6e5 100644 (file)
--- a/view/theme/diabook/admin_users.tpl
+++ b/view/theme/diabook/admin_users.tpl
@@ -14,8 +14,7 @@
        <h1>$title - $page</h1>
        
        <form action="$baseurl/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='$form_security_token'>
-               
+                       <input type='hidden' name='form_security_token' value='$form_security_token'>
                <h3>$h_pending</h3>
                {{ if $pending }}
                        <table id='pending'>

diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl
index 6843f958c7259c1e29d0cb4fb40322eee963fdb3..e10b868450028e02140a13068609fe1a900e568e 100644 (file)
--- a/view/theme/diabook/comment_item.tpl
+++ b/view/theme/diabook/comment_item.tpl
@@ -11,15 +11,15 @@
                                        <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
                                </div>
                                <div class="comment-edit-photo-end"></div>
-                               <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>
+                               <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);"  >$comment</textarea>
                                <div class="comment-edit-bb-$id" style="display:none;">                         
-                               <a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('img',$id);">img</a>        
-                               <a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('url',$id);">url</a>
-                               <a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('video',$id);">video</a>                                                                                                            
-                               <a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('u',$id);">u</a>
-                               <a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('i',$id);">i</a>
-                               <a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('b',$id);">b</a>
-                               <a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('quote',$id);">quote</a>                                                                                                                                                       
+                               <a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>     
+                               <a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
+                               <a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>                                                                                                         
+                               <a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
+                               <a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
+                               <a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
+                               <a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>                                                                                                                                                    
                                </div>                          
                                {{ if $qcomment }}
                                        <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >

diff --git a/view/theme/diabook/diabook-aerith/admin_users.tpl b/view/theme/diabook/diabook-aerith/admin_users.tpl
index 40f94f5fef8aa507e542814c57fd569c0cbc0a55..8aabb51ec9931bc694fdaf5098e6128ee516a6e5 100644 (file)
--- a/view/theme/diabook/diabook-aerith/admin_users.tpl
+++ b/view/theme/diabook/diabook-aerith/admin_users.tpl
@@ -14,7 +14,7 @@
        <h1>$title - $page</h1>
        
        <form action="$baseurl/admin/users" method="post">
-               
+                       <input type='hidden' name='form_security_token' value='$form_security_token'>
                <h3>$h_pending</h3>
                {{ if $pending }}
                        <table id='pending'>
@@ -72,8 +72,8 @@
                                                <td class='login_date'>$u.page-flags</td>
                                                <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
                                                <td class="tools" style="width:60px;">
-                                                       <a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-                                                       <a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+                                                       <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+                                                       <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
                                                </td>
                                        </tr>
                                {{ endfor }}

diff --git a/view/theme/diabook/diabook-aerith/nav.tpl b/view/theme/diabook/diabook-aerith/nav.tpl
index 5f316bcdd4f2023e0cfd4fe721c867b42f12d864..e3aabaa8b77bc4fd0389971fc9a77a0fadf778e8 100644 (file)
--- a/view/theme/diabook/diabook-aerith/nav.tpl
+++ b/view/theme/diabook/diabook-aerith/nav.tpl
@@ -138,7 +138,7 @@
 </nav>
 
 
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
 <div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
 

diff --git a/view/theme/diabook/diabook-aerith/style-network-wide.css b/view/theme/diabook/diabook-aerith/style-network-wide.css
index 28f47552e15a75b248347c7270f284f82bbf33de..d5c91c9a4e0e0d8fb6b3c00ff0da13cd43190465 100644 (file)
--- a/view/theme/diabook/diabook-aerith/style-network-wide.css
+++ b/view/theme/diabook/diabook-aerith/style-network-wide.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-aerith/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-aerith/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1395,7 +1395,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-aerith/style-network.css b/view/theme/diabook/diabook-aerith/style-network.css
index c78ed53d905c7fb29d920f4d42a047484c365c89..21273c19cc36afd8a303e33276d4d90ed26b71c1 100644 (file)
--- a/view/theme/diabook/diabook-aerith/style-network.css
+++ b/view/theme/diabook/diabook-aerith/style-network.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-aerith/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-aerith/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1388,7 +1388,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-aerith/style-profile-wide.css b/view/theme/diabook/diabook-aerith/style-profile-wide.css
index 19ebd956921680fa31b1252791bc1d9cd0bb15d5..1b8e384811da342c20355174a86d0132c2df70d4 100644 (file)
--- a/view/theme/diabook/diabook-aerith/style-profile-wide.css
+++ b/view/theme/diabook/diabook-aerith/style-profile-wide.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-aerith/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-aerith/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1370,7 +1370,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-aerith/style-profile.css b/view/theme/diabook/diabook-aerith/style-profile.css
index 4dc84e95c5d234353b167672edb18f1313e90bd1..e21432d4e05706416782ff238fc1031517883d5a 100644 (file)
--- a/view/theme/diabook/diabook-aerith/style-profile.css
+++ b/view/theme/diabook/diabook-aerith/style-profile.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-aerith/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-aerith/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1362,7 +1362,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-aerith/style-wide.css b/view/theme/diabook/diabook-aerith/style-wide.css
index 759e2a15a739fd8004cee6a346958526d3a23226..388a05b46c67ca10124bf0cd9c0ed005d48c203b 100644 (file)
--- a/view/theme/diabook/diabook-aerith/style-wide.css
+++ b/view/theme/diabook/diabook-aerith/style-wide.css
@@ -150,7 +150,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1624,7 +1624,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css
index 18873ebc5fd9194e5d5bd203c4b9fd6ac280a7a0..1f3e65ccad8444f4d2ee6d90b76bbdbb1b096855 100644 (file)
--- a/view/theme/diabook/diabook-aerith/style.css
+++ b/view/theme/diabook/diabook-aerith/style.css
@@ -150,7 +150,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1616,7 +1616,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-blue/admin_users.tpl b/view/theme/diabook/diabook-blue/admin_users.tpl
index 40f94f5fef8aa507e542814c57fd569c0cbc0a55..8aabb51ec9931bc694fdaf5098e6128ee516a6e5 100644 (file)
--- a/view/theme/diabook/diabook-blue/admin_users.tpl
+++ b/view/theme/diabook/diabook-blue/admin_users.tpl
@@ -14,7 +14,7 @@
        <h1>$title - $page</h1>
        
        <form action="$baseurl/admin/users" method="post">
-               
+                       <input type='hidden' name='form_security_token' value='$form_security_token'>
                <h3>$h_pending</h3>
                {{ if $pending }}
                        <table id='pending'>
@@ -72,8 +72,8 @@
                                                <td class='login_date'>$u.page-flags</td>
                                                <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
                                                <td class="tools" style="width:60px;">
-                                                       <a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-                                                       <a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+                                                       <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+                                                       <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
                                                </td>
                                        </tr>
                                {{ endfor }}

diff --git a/view/theme/diabook/diabook-blue/nav.tpl b/view/theme/diabook/diabook-blue/nav.tpl
index 5f316bcdd4f2023e0cfd4fe721c867b42f12d864..e3aabaa8b77bc4fd0389971fc9a77a0fadf778e8 100644 (file)
--- a/view/theme/diabook/diabook-blue/nav.tpl
+++ b/view/theme/diabook/diabook-blue/nav.tpl
@@ -138,7 +138,7 @@
 </nav>
 
 
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
 <div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
 

diff --git a/view/theme/diabook/diabook-blue/style-network-wide.css b/view/theme/diabook/diabook-blue/style-network-wide.css
index 9cf8bb3a7614e7fd233fa1548bb14458dd9b9bfb..eb1cee255ad1b465d52bea489a62f69151eb61b0 100644 (file)
--- a/view/theme/diabook/diabook-blue/style-network-wide.css
+++ b/view/theme/diabook/diabook-blue/style-network-wide.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-blue/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-blue/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1357,7 +1357,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-blue/style-network.css b/view/theme/diabook/diabook-blue/style-network.css
index df646f45691772dc4bd9b29c33e84a94391d524a..3a972b83274ccde6c5b8f4a3834f900c9c522eb1 100644 (file)
--- a/view/theme/diabook/diabook-blue/style-network.css
+++ b/view/theme/diabook/diabook-blue/style-network.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-blue/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-blue/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1350,7 +1350,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-blue/style-profile-wide.css b/view/theme/diabook/diabook-blue/style-profile-wide.css
index 04d2a73ef323432f56cccd9938450fcfeeab48ed..ad6b7ca21453150edc1909501e6fb3c8911c6756 100644 (file)
--- a/view/theme/diabook/diabook-blue/style-profile-wide.css
+++ b/view/theme/diabook/diabook-blue/style-profile-wide.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-blue/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-blue/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1337,7 +1337,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-blue/style-profile.css b/view/theme/diabook/diabook-blue/style-profile.css
index 958b32f9c6c664f0e2d6824c3f9d39c4b733925a..50fb980d6fc4c73b84ee8ef30dd10fdb6a405168 100644 (file)
--- a/view/theme/diabook/diabook-blue/style-profile.css
+++ b/view/theme/diabook/diabook-blue/style-profile.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-blue/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-blue/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1329,7 +1329,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-blue/style-wide.css b/view/theme/diabook/diabook-blue/style-wide.css
index 92664ff86b2965101d671df9b9eca3a32993b315..7745e7e2d19e8a453b16f2334f6f192e5e30fc81 100644 (file)
--- a/view/theme/diabook/diabook-blue/style-wide.css
+++ b/view/theme/diabook/diabook-blue/style-wide.css
@@ -149,7 +149,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1581,7 +1581,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-blue/style.css b/view/theme/diabook/diabook-blue/style.css
index 7cecfd34d430d601f2f6db410d5aa3d6d5bb0ecf..12648bffba4d1ae1796764104a3badfcaf7ee2ef 100644 (file)
--- a/view/theme/diabook/diabook-blue/style.css
+++ b/view/theme/diabook/diabook-blue/style.css
@@ -149,7 +149,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1574,7 +1574,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-dark/admin_users.tpl b/view/theme/diabook/diabook-dark/admin_users.tpl
index 40f94f5fef8aa507e542814c57fd569c0cbc0a55..8aabb51ec9931bc694fdaf5098e6128ee516a6e5 100644 (file)
--- a/view/theme/diabook/diabook-dark/admin_users.tpl
+++ b/view/theme/diabook/diabook-dark/admin_users.tpl
@@ -14,7 +14,7 @@
        <h1>$title - $page</h1>
        
        <form action="$baseurl/admin/users" method="post">
-               
+                       <input type='hidden' name='form_security_token' value='$form_security_token'>
                <h3>$h_pending</h3>
                {{ if $pending }}
                        <table id='pending'>
@@ -72,8 +72,8 @@
                                                <td class='login_date'>$u.page-flags</td>
                                                <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
                                                <td class="tools" style="width:60px;">
-                                                       <a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-                                                       <a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+                                                       <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+                                                       <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
                                                </td>
                                        </tr>
                                {{ endfor }}

diff --git a/view/theme/diabook/diabook-dark/nav.tpl b/view/theme/diabook/diabook-dark/nav.tpl
index 5f316bcdd4f2023e0cfd4fe721c867b42f12d864..e3aabaa8b77bc4fd0389971fc9a77a0fadf778e8 100644 (file)
--- a/view/theme/diabook/diabook-dark/nav.tpl
+++ b/view/theme/diabook/diabook-dark/nav.tpl
@@ -138,7 +138,7 @@
 </nav>
 
 
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
 <div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
 

diff --git a/view/theme/diabook/diabook-dark/style-network-wide.css b/view/theme/diabook/diabook-dark/style-network-wide.css
index 87efd8aa7e0087b6255e51092147ecbc8068c1db..23118a2cdf6f19506478707f6ac14b856fc3e389 100644 (file)
--- a/view/theme/diabook/diabook-dark/style-network-wide.css
+++ b/view/theme/diabook/diabook-dark/style-network-wide.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-dark/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-dark/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1372,7 +1372,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css
index 4111bdb5bc6a9213e7d05fe5dbd3befc8168bc5b..5639bde29463950bbf93c7a2fa07b01f1605a36c 100644 (file)
--- a/view/theme/diabook/diabook-dark/style-network.css
+++ b/view/theme/diabook/diabook-dark/style-network.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-dark/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-dark/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1351,7 +1351,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-dark/style-profile-wide.css b/view/theme/diabook/diabook-dark/style-profile-wide.css
index 04d2a73ef323432f56cccd9938450fcfeeab48ed..ad6b7ca21453150edc1909501e6fb3c8911c6756 100644 (file)
--- a/view/theme/diabook/diabook-dark/style-profile-wide.css
+++ b/view/theme/diabook/diabook-dark/style-profile-wide.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-blue/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-blue/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1337,7 +1337,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css
index d4c99ac5113a980f07c81e1798a058522d816f03..8824d18fe3c5fade99f267acf70a7075785dfb95 100644 (file)
--- a/view/theme/diabook/diabook-dark/style-profile.css
+++ b/view/theme/diabook/diabook-dark/style-profile.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-dark/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-dark/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1329,7 +1329,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-dark/style-wide.css b/view/theme/diabook/diabook-dark/style-wide.css
index 0a7cabcb0275c5854f06fe823e5f6012bcea1fd9..73d0e4c0f37cb8f7da74d2c3bdba282eea015290 100644 (file)
--- a/view/theme/diabook/diabook-dark/style-wide.css
+++ b/view/theme/diabook/diabook-dark/style-wide.css
@@ -149,7 +149,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1581,7 +1581,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css
index 631628a076b23306494a25ff50f830e44511636e..24de9f26262fe1c248d8d962ae6a0e3da133e245 100644 (file)
--- a/view/theme/diabook/diabook-dark/style.css
+++ b/view/theme/diabook/diabook-dark/style.css
@@ -149,7 +149,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/diabook-dark/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/diabook-dark/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1574,7 +1574,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-green/admin_users.tpl b/view/theme/diabook/diabook-green/admin_users.tpl
index 40f94f5fef8aa507e542814c57fd569c0cbc0a55..8aabb51ec9931bc694fdaf5098e6128ee516a6e5 100644 (file)
--- a/view/theme/diabook/diabook-green/admin_users.tpl
+++ b/view/theme/diabook/diabook-green/admin_users.tpl
@@ -14,7 +14,7 @@
        <h1>$title - $page</h1>
        
        <form action="$baseurl/admin/users" method="post">
-               
+                       <input type='hidden' name='form_security_token' value='$form_security_token'>
                <h3>$h_pending</h3>
                {{ if $pending }}
                        <table id='pending'>
@@ -72,8 +72,8 @@
                                                <td class='login_date'>$u.page-flags</td>
                                                <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
                                                <td class="tools" style="width:60px;">
-                                                       <a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-                                                       <a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+                                                       <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+                                                       <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
                                                </td>
                                        </tr>
                                {{ endfor }}

diff --git a/view/theme/diabook/diabook-green/nav.tpl b/view/theme/diabook/diabook-green/nav.tpl
index 5f316bcdd4f2023e0cfd4fe721c867b42f12d864..e3aabaa8b77bc4fd0389971fc9a77a0fadf778e8 100644 (file)
--- a/view/theme/diabook/diabook-green/nav.tpl
+++ b/view/theme/diabook/diabook-green/nav.tpl
@@ -138,7 +138,7 @@
 </nav>
 
 
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
 <div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
 

diff --git a/view/theme/diabook/diabook-green/style-network-wide.css b/view/theme/diabook/diabook-green/style-network-wide.css
index 5cdcb9132362dd76efd6f47a06a3c677087cbdcd..cc598b9fe4074d4610d429c33fe892f1934481d5 100644 (file)
--- a/view/theme/diabook/diabook-green/style-network-wide.css
+++ b/view/theme/diabook/diabook-green/style-network-wide.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-green/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-green/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1371,7 +1371,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-green/style-network.css b/view/theme/diabook/diabook-green/style-network.css
index 41ddc7442e65b23391c9610f51ea8f185036122f..7865477112eb52e670c9dfd0099f85d1bccc0192 100644 (file)
--- a/view/theme/diabook/diabook-green/style-network.css
+++ b/view/theme/diabook/diabook-green/style-network.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-green/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-green/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1365,7 +1365,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-green/style-profile-wide.css b/view/theme/diabook/diabook-green/style-profile-wide.css
index f1bf0d5ff9228d0298cabd94630bb20d4ad5b55a..65b7f2ba3f5be1666d1133f3917b770c89d913c8 100644 (file)
--- a/view/theme/diabook/diabook-green/style-profile-wide.css
+++ b/view/theme/diabook/diabook-green/style-profile-wide.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-green/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-green/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1346,7 +1346,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-green/style-profile.css b/view/theme/diabook/diabook-green/style-profile.css
index ef196bede9bdd2d841e6869b5570ba5b06c2455e..dcc7b373a1e21851b640b120dc5244a779f48d8c 100644 (file)
--- a/view/theme/diabook/diabook-green/style-profile.css
+++ b/view/theme/diabook/diabook-green/style-profile.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-green/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-green/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1338,7 +1338,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-green/style-wide.css b/view/theme/diabook/diabook-green/style-wide.css
index e7243f4cbab229636ee93f843fb4af9b01c7e289..e07af7c697b2de4071eaf0ace1dd17d23a9f8164 100644 (file)
--- a/view/theme/diabook/diabook-green/style-wide.css
+++ b/view/theme/diabook/diabook-green/style-wide.css
@@ -150,7 +150,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/diabook-green/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/diabook-green/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1601,7 +1601,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-green/style.css b/view/theme/diabook/diabook-green/style.css
index 273f4b5a895036e4aff1a6cd18e3673dc18ff580..d4e2052a788e56b4ad10f7cdaa8059bc254766e1 100644 (file)
--- a/view/theme/diabook/diabook-green/style.css
+++ b/view/theme/diabook/diabook-green/style.css
@@ -150,7 +150,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/diabook-green/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/diabook-green/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1600,7 +1600,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-pink/admin_users.tpl b/view/theme/diabook/diabook-pink/admin_users.tpl
index 40f94f5fef8aa507e542814c57fd569c0cbc0a55..8aabb51ec9931bc694fdaf5098e6128ee516a6e5 100644 (file)
--- a/view/theme/diabook/diabook-pink/admin_users.tpl
+++ b/view/theme/diabook/diabook-pink/admin_users.tpl
@@ -14,7 +14,7 @@
        <h1>$title - $page</h1>
        
        <form action="$baseurl/admin/users" method="post">
-               
+                       <input type='hidden' name='form_security_token' value='$form_security_token'>
                <h3>$h_pending</h3>
                {{ if $pending }}
                        <table id='pending'>
@@ -72,8 +72,8 @@
                                                <td class='login_date'>$u.page-flags</td>
                                                <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
                                                <td class="tools" style="width:60px;">
-                                                       <a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-                                                       <a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+                                                       <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+                                                       <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
                                                </td>
                                        </tr>
                                {{ endfor }}

diff --git a/view/theme/diabook/diabook-pink/nav.tpl b/view/theme/diabook/diabook-pink/nav.tpl
index 5f316bcdd4f2023e0cfd4fe721c867b42f12d864..e3aabaa8b77bc4fd0389971fc9a77a0fadf778e8 100644 (file)
--- a/view/theme/diabook/diabook-pink/nav.tpl
+++ b/view/theme/diabook/diabook-pink/nav.tpl
@@ -138,7 +138,7 @@
 </nav>
 
 
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
 <div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
 

diff --git a/view/theme/diabook/diabook-pink/style-network-wide.css b/view/theme/diabook/diabook-pink/style-network-wide.css
index c66432e841143c49570dee1228c01f1c73832ea3..0a83955dfa668e5c931ea2a637ce842b5b333115 100644 (file)
--- a/view/theme/diabook/diabook-pink/style-network-wide.css
+++ b/view/theme/diabook/diabook-pink/style-network-wide.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-pink/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-pink/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1371,7 +1371,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-pink/style-network.css b/view/theme/diabook/diabook-pink/style-network.css
index 7e8263e1a4293c311ff18584606d097e30729541..3a4f49877ef531c476aae120919a772803ace6f5 100644 (file)
--- a/view/theme/diabook/diabook-pink/style-network.css
+++ b/view/theme/diabook/diabook-pink/style-network.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-pink/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-pink/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1365,7 +1365,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-pink/style-profile-wide.css b/view/theme/diabook/diabook-pink/style-profile-wide.css
index c7cfd111e98ec7e874cc9b9683bcf776133d5e3b..0805518963f485a71831d7b2c1fc9e06f2131e00 100644 (file)
--- a/view/theme/diabook/diabook-pink/style-profile-wide.css
+++ b/view/theme/diabook/diabook-pink/style-profile-wide.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-pink/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-pink/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1346,7 +1346,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-pink/style-profile.css b/view/theme/diabook/diabook-pink/style-profile.css
index 8d32cf0288481ca8f058d09c310cf02a9621c3dc..8f3753061446f6c98339f6ad41c9a6fb17940673 100644 (file)
--- a/view/theme/diabook/diabook-pink/style-profile.css
+++ b/view/theme/diabook/diabook-pink/style-profile.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-pink/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-pink/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1338,7 +1338,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-pink/style-wide.css b/view/theme/diabook/diabook-pink/style-wide.css
index 8442a8880fc11e318520f705dcee174989c2ffd6..65e22aa902f46a2b82c2d9c9cd114bd16476312d 100644 (file)
--- a/view/theme/diabook/diabook-pink/style-wide.css
+++ b/view/theme/diabook/diabook-pink/style-wide.css
@@ -150,7 +150,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/diabook-pink/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/diabook-pink/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1601,7 +1601,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-pink/style.css b/view/theme/diabook/diabook-pink/style.css
index 15b25d5cb9ce9690172d2892cf7c111fc8d4c5b1..c223e6439163bebb5df85950cc4a5e93bd5114d7 100644 (file)
--- a/view/theme/diabook/diabook-pink/style.css
+++ b/view/theme/diabook/diabook-pink/style.css
@@ -150,7 +150,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/diabook-pink/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/diabook-pink/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1600,7 +1600,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-red/admin_users.tpl b/view/theme/diabook/diabook-red/admin_users.tpl
index 40f94f5fef8aa507e542814c57fd569c0cbc0a55..8aabb51ec9931bc694fdaf5098e6128ee516a6e5 100644 (file)
--- a/view/theme/diabook/diabook-red/admin_users.tpl
+++ b/view/theme/diabook/diabook-red/admin_users.tpl
@@ -14,7 +14,7 @@
        <h1>$title - $page</h1>
        
        <form action="$baseurl/admin/users" method="post">
-               
+                       <input type='hidden' name='form_security_token' value='$form_security_token'>
                <h3>$h_pending</h3>
                {{ if $pending }}
                        <table id='pending'>
@@ -72,8 +72,8 @@
                                                <td class='login_date'>$u.page-flags</td>
                                                <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
                                                <td class="tools" style="width:60px;">
-                                                       <a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-                                                       <a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+                                                       <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+                                                       <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
                                                </td>
                                        </tr>
                                {{ endfor }}

diff --git a/view/theme/diabook/diabook-red/nav.tpl b/view/theme/diabook/diabook-red/nav.tpl
index 5f316bcdd4f2023e0cfd4fe721c867b42f12d864..e3aabaa8b77bc4fd0389971fc9a77a0fadf778e8 100644 (file)
--- a/view/theme/diabook/diabook-red/nav.tpl
+++ b/view/theme/diabook/diabook-red/nav.tpl
@@ -138,7 +138,7 @@
 </nav>
 
 
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
 <div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
 

diff --git a/view/theme/diabook/diabook-red/style-network-wide.css b/view/theme/diabook/diabook-red/style-network-wide.css
index b761465bc199a27fb2f070c8d7335b47bc8cbd9e..8c3b67cb6c02b7b929d1d07a1b6b72b7117db473 100644 (file)
--- a/view/theme/diabook/diabook-red/style-network-wide.css
+++ b/view/theme/diabook/diabook-red/style-network-wide.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-red/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-red/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1391,7 +1391,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-red/style-network.css b/view/theme/diabook/diabook-red/style-network.css
index 61fa694733cbe69cc9b7285f73a17722a05e0465..84fd5da48477109b79eb139affa6d42ad21d3162 100644 (file)
--- a/view/theme/diabook/diabook-red/style-network.css
+++ b/view/theme/diabook/diabook-red/style-network.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-red/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-red/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1384,7 +1384,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-red/style-profile-wide.css b/view/theme/diabook/diabook-red/style-profile-wide.css
index 1e4688b23308a52b4dc2cb53dc1f91c0c1026bd8..acb6075f7497f6db214bdf44da207d3300cee2d1 100644 (file)
--- a/view/theme/diabook/diabook-red/style-profile-wide.css
+++ b/view/theme/diabook/diabook-red/style-profile-wide.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-red/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-red/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1350,7 +1350,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-red/style-profile.css b/view/theme/diabook/diabook-red/style-profile.css
index 45f27a31133111411548346b5cfb44790c1ef75c..a29eb3eb0d848d709f1e7ee43b00e8aab907b0e5 100644 (file)
--- a/view/theme/diabook/diabook-red/style-profile.css
+++ b/view/theme/diabook/diabook-red/style-profile.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../diabook-red/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../diabook-red/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1342,7 +1342,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-red/style-wide.css b/view/theme/diabook/diabook-red/style-wide.css
index 7a037694ba04dccc615106231ad6623c3c5230e7..1df0d56bc750f55404977e50d0e3a69368ac9605 100644 (file)
--- a/view/theme/diabook/diabook-red/style-wide.css
+++ b/view/theme/diabook/diabook-red/style-wide.css
@@ -149,7 +149,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/diabook-red/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/diabook-red/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1609,7 +1609,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/diabook-red/style.css b/view/theme/diabook/diabook-red/style.css
index b45f5f5933f634c04070a749778e4a152ffdf268..856a5d08a8c3930bc9f9250c320c7f89a99939f0 100644 (file)
--- a/view/theme/diabook/diabook-red/style.css
+++ b/view/theme/diabook/diabook-red/style.css
@@ -149,7 +149,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/diabook-red/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/diabook-red/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1602,7 +1602,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {

diff --git a/view/theme/diabook/footer.tpl b/view/theme/diabook/footer.tpl
new file mode 100644 (file)
index 0000000..8d3c651
--- /dev/null
+++ b/view/theme/diabook/footer.tpl
@@ -0,0 +1,4 @@
+<div style="display: table-cell"></div>
+<div style="border-top: 1px solid #D2D2D2; width: 100%;margin-top: 30px;">
+<a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
+</div>
\ No newline at end of file

diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 29a89527c5e35d510cdf813926cc1226b535452b..e0ffa4f7b06bee2eec4a3622da1f8ddd7fbe84db 100644 (file)
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -136,7 +136,7 @@
 </nav>
 
 
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:$('html, body').animate({scrollTop:0}, 'slow'); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
 <div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
 

diff --git a/view/theme/diabook/oembed_video.tpl b/view/theme/diabook/oembed_video.tpl
index d6d29f724498a1699761772bddf75a06db43d056..5e046d8c5ff96808f87487c5ebae2d459dfc5234 100644 (file)
--- a/view/theme/diabook/oembed_video.tpl
+++ b/view/theme/diabook/oembed_video.tpl
@@ -1,4 +1,4 @@
-<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
+<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe();javascript:$(this).parent().css("height", "370px"); return false;' style='float:left; margin: 1em; position: relative;'>
        <img width='$tw' height='$th' src='$turl' >
        <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
 </a>

diff --git a/view/theme/diabook/style-network-wide.css b/view/theme/diabook/style-network-wide.css
index a31007f0a77ea7bc29b615d39df5af9475f9c788..13801b6ba15b5077638d85f41e4e5eb14fd43165 100644 (file)
--- a/view/theme/diabook/style-network-wide.css
+++ b/view/theme/diabook/style-network-wide.css
@@ -122,7 +122,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1334,7 +1334,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
@@ -1480,14 +1480,14 @@ transition: all 0.2s ease-in-out;
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;

diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 00c4d303ad6305a49a23ffee2f7e55647ebfcd10..502e46f233d1de207d3a6060008f7eed9bc828fa 100644 (file)
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -122,7 +122,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1326,7 +1326,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
@@ -1471,14 +1471,14 @@ transition: all 0.2s ease-in-out;
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;

diff --git a/view/theme/diabook/style-profile-wide.css b/view/theme/diabook/style-profile-wide.css
index 30b5e642291873a410dbb5d3251d6d162f882bbc..1c8257b7ee3a44d80204a5b839c5a281b724dd91 100644 (file)
--- a/view/theme/diabook/style-profile-wide.css
+++ b/view/theme/diabook/style-profile-wide.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1309,7 +1309,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
@@ -1455,14 +1455,14 @@ transition: all 0.2s ease-in-out;
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;

diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 9cd8386e3ffd81db6a04d9751bff942494719a1b..cb7f1df6902e9b002ffe7f0dabfda73069cf14c8 100644 (file)
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -121,7 +121,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1302,7 +1302,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
@@ -1447,14 +1447,14 @@ transition: all 0.2s ease-in-out;
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;

diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css
index 19abf267da45caf838f022ef899f5046a82f3b81..abd10476a6cfcd6121a2beed1636361d144f11e5 100644 (file)
--- a/view/theme/diabook/style-wide.css
+++ b/view/theme/diabook/style-wide.css
@@ -150,7 +150,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1457,7 +1457,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-photo-container .wall-item-content {
@@ -1690,14 +1690,14 @@ body .pageheader{
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index edc87df988051f42443eda6c9aa6c71400ba29f8..23f8ac465a4b7b3922d16605fc14ec8cfb2039da 100644 (file)
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -150,7 +150,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1457,7 +1457,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 .wall-item-photo-container .wall-item-content {
 
@@ -1688,14 +1688,14 @@ body .pageheader{
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index e8518a1c6f4423c38b08f2b68ceac21212ccb15a..269015d0a3e5fa83e90d36d2353129f044f01192 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.021)
+ * Version: (Version: 1.022)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.021)";
+$diabook_version = "Diabook (Version: 1.022)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -291,7 +291,9 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
 // custom css
 if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
 
-
+//footer
+$tpl = get_markup_template('footer.tpl');
+$a->page['footer'] .= replace_macros($tpl, array());
 
 //load jquery.cookie.js
 $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
@@ -355,12 +357,18 @@ $(document).ready(function() {
         }
         else $(this).attr("src",ifr_source+"?"+wmode);
     });
+    
+    $("a[href=#top]").click(function() {
+                       $("html, body").animate({scrollTop:0}, "slow");
+                       return false;
+               });
       
 
 });
 
 function yt_iframe() {
-       
+
+
        $("iframe").load(function() { 
        var ifr_src = $(this).contents().find("body iframe").attr("src");
        $("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
@@ -480,7 +488,7 @@ function close_lastlikes(){
 $a->page['htmlhead'] .= ' 
 
 <script>
-function insertFormatting(BBcode,id) {
+function insertFormatting(comment,BBcode,id) {
        
                var tmpStr = $("#comment-edit-text-" + id).val();
                if(tmpStr == comment) {

diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 1c7bf8f4065477e5251bb2fae61e11f1a17e3f92..05d544b0a60e60b8a83771ab47b4ccb8b4a0ef94 100644 (file)
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -910,22 +910,20 @@ width: 100%;
     padding: 2px 20px 5px 0;
 }
 #profile-jot-text_parent {
-    /*border-radius: 10px;*/
     box-shadow: 5px 0 10px 0 #111;
 }
 #profile-jot-text_tbl {
     margin-bottom: 10px;
-    /*border-radius: 10px;*/
-    background: #888;
+    background: #777;
 }
 #profile-jot-text_ifr {
     width:99.900002% !important;
 }
 #profile-jot-text_toolbargroup {
-    background: #888;
+    background: #777;
 }
 .mceCenter table tr {
-    background: #888;
+    background: #777;
 }
 [id$="jot-text_ifr"] {
     width: 99.900002% !important;
@@ -936,14 +934,20 @@ width: 100%;
     color: #2e2f2e;
     background: #eec;
 }
-.mceFirst tr {
-    background: #888;
+.defaultSkin tr.mceFirst {
+    background: #777;
 }
-.mceFirst td {
-    /*border-radius: 10px 10px 0px 0px;*/
+.defaultSkin td.mceFirst {
+       background-color: #eec;
 }
-.mceLast td {
-    /*border-radius: 0 0 10px 10px;*/
+.defaultSkin td.mceLast {
+       background-color: #eec;
+}
+.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {
+       background-color: #eec;
+}
+.defaultSkin .mceButtonDisabled .mceIcon {
+       background-color: #eec;
 }
 #profile-attach-wrapper,
 #profile-audio-wrapper,

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 8823bc81a5bf23d7ea18aa8d1c54fddc672e8ef8..cf3b83cfacc5195a8ab9bff58546dc0917be9da6 100644 (file)
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -911,22 +911,20 @@ width: 100%;
     padding: 2px 20px 5px 0;
 }
 #profile-jot-text_parent {
-    /*border-radius: 10px;*/
     box-shadow: 5px 0 10px 0 #111;
 }
 #profile-jot-text_tbl {
     margin-bottom: 10px;
-    /*border-radius: 10px;*/
-    background: #888;
+    background: #777;
 }
 #profile-jot-text_ifr {
     width:99.900002% !important;
 }
 #profile-jot-text_toolbargroup {
-    background: #888;
+    background: #777;
 }
 .mceCenter table tr {
-    background: #888;
+    background: #777;
 }
 [id$="jot-text_ifr"] {
     width: 99.900002% !important;
@@ -937,14 +935,20 @@ width: 100%;
     color: #2e2f2e;
     background: #eec;
 }
-.mceFirst tr {
-    background: #888;
+.defaultSkin tr.mceFirst {
+    background: #777;
 }
-.mceFirst td {
-    /*border-radius: 10px 10px 0px 0px;*/
+.defaultSkin td.mceFirst {
+       background-color: #eec;
 }
-.mceLast td {
-    /*border-radius: 0 0 10px 10px;*/
+.defaultSkin td.mceLast {
+       background-color: #eec;
+}
+.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {
+       background-color: #eec;
+}
+.defaultSkin .mceButtonDisabled .mceIcon {
+       background-color: #eec;
 }
 #profile-attach-wrapper,
 #profile-audio-wrapper,