diff --git a/.htaccess b/.htaccess
index 6cb3a074..a22c8c37 100644
--- a/.htaccess
+++ b/.htaccess
@@ -15,6 +15,16 @@ Deny from all
   # Also place auth information into REMOTE_USER for sites running
   # in CGI mode.
 
+  # If you have troubles or use VirtualDocumentRoot
+  # uncomment this and set it to the path where your friendica installation is
+  # i.e.:
+  # Friendica url: http://some.example.com
+  # RewriteBase /
+  # Friendica url: http://some.example.com/friendica
+  # RewriteBase /firendica/
+  #
+  #RewriteBase /
+
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteRule ^(.*)$ index.php?q=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
diff --git a/view/de/messages.po b/view/de/messages.po
index b641a76f..7ca3b565 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -15,15 +15,15 @@
 # Martin Schmitt <mas@scsy.de>, 2012.
 # Oliver  <post@toktan.org>, 2012.
 #   <tobias.diekershoff@gmx.net>, 2011, 2012.
-#   <transifex@zottel.net>, 2011, 2012.
+#   <transifex@zottel.net>, 2011-2012.
 #   <ts+transifex@ml.tschlotfeldt.de>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-08-23 10:00-0700\n"
-"PO-Revision-Date: 2012-08-24 15:53+0000\n"
-"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"POT-Creation-Date: 2012-08-28 10:00-0700\n"
+"PO-Revision-Date: 2012-08-31 23:04+0000\n"
+"Last-Translator: zottel <transifex@zottel.net>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -248,7 +248,7 @@ msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
 #: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1656
+#: ../../include/nav.php:52 ../../boot.php:1659
 msgid "Events"
 msgstr "Veranstaltungen"
 
@@ -386,7 +386,7 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: ../../mod/photos.php:46 ../../boot.php:1649
+#: ../../mod/photos.php:46 ../../boot.php:1652
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
@@ -1238,11 +1238,11 @@ msgstr "Bitte wähle deine Zeitzone."
 
 #: ../../mod/poke.php:192
 msgid "Poke/Prod"
-msgstr ""
+msgstr "Anstupsen etc."
 
 #: ../../mod/poke.php:193
 msgid "poke, prod or do other things to somebody"
-msgstr ""
+msgstr "Stupse Leute an oder mache anderes mit ihnen"
 
 #: ../../mod/poke.php:194
 msgid "Recipient"
@@ -2503,7 +2503,7 @@ msgstr "– du in einem Beitrag erwähnt wirst"
 
 #: ../../mod/settings.php:1015
 msgid "You are poked/prodded/etc. in a post"
-msgstr ""
+msgstr "– du von jemandem angestupst oder sonstwie behandelt wirst"
 
 #: ../../mod/settings.php:1018
 msgid "Advanced Account/Page Type Settings"
@@ -2611,7 +2611,7 @@ msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gela
 msgid "Invalid contact."
 msgstr "Ungültiger Kontakt."
 
-#: ../../mod/notes.php:44 ../../boot.php:1663
+#: ../../mod/notes.php:44 ../../boot.php:1666
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
@@ -2864,7 +2864,7 @@ msgstr "Editor für die Profil-Sichtbarkeit"
 
 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
-#: ../../include/nav.php:50 ../../boot.php:1639
+#: ../../include/nav.php:50 ../../boot.php:1642
 msgid "Profile"
 msgstr "Profil"
 
@@ -3011,7 +3011,7 @@ msgid "Access denied."
 msgstr "Zugriff verweigert."
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1646
+#: ../../include/nav.php:51 ../../boot.php:1649
 msgid "Photos"
 msgstr "Bilder"
 
@@ -4331,7 +4331,7 @@ msgstr "Eingabe (Diaspora) Nach BBCode zu konvertierender Text:"
 
 #: ../../mod/babel.php:31
 msgid "Source input: "
-msgstr ""
+msgstr "Originaltext:"
 
 #: ../../mod/babel.php:35
 msgid "bb2html: "
@@ -4892,43 +4892,43 @@ msgstr "In Friendica verbinden!"
 
 #: ../../addon/morepokes/morepokes.php:19
 msgid "bitchslap"
-msgstr ""
+msgstr "abwatschen"
 
 #: ../../addon/morepokes/morepokes.php:19
 msgid "bitchslapped"
-msgstr ""
+msgstr "watschte"
 
 #: ../../addon/morepokes/morepokes.php:20
 msgid "shag"
-msgstr ""
+msgstr "poppen"
 
 #: ../../addon/morepokes/morepokes.php:20
 msgid "shagged"
-msgstr ""
+msgstr "poppte"
 
 #: ../../addon/morepokes/morepokes.php:21
 msgid "do something obscenely biological to"
-msgstr ""
+msgstr "mit ihm/ihr etwas obszönes Körperliches machen"
 
 #: ../../addon/morepokes/morepokes.php:21
 msgid "did something obscenely biological to"
-msgstr ""
+msgstr "machte etwas obszönes Körperliches mit"
 
 #: ../../addon/morepokes/morepokes.php:22
 msgid "point out the new poke feature to"
-msgstr ""
+msgstr "die neue Anstups-Funktion zeigen"
 
 #: ../../addon/morepokes/morepokes.php:22
 msgid "pointed out the new poke feature to"
-msgstr ""
+msgstr "zeigte die neue Anstups-Funktion"
 
 #: ../../addon/morepokes/morepokes.php:23
 msgid "declare undying love for"
-msgstr ""
+msgstr "unterbliche Liebe verkünden"
 
 #: ../../addon/morepokes/morepokes.php:23
 msgid "declared undying love for"
-msgstr ""
+msgstr "verkündete unsterbliche Liebe für"
 
 #: ../../addon/morepokes/morepokes.php:24
 msgid "set fire to"
@@ -4936,110 +4936,110 @@ msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:25
 msgid "patent"
-msgstr ""
+msgstr "patentieren"
 
 #: ../../addon/morepokes/morepokes.php:25
 msgid "patented"
-msgstr ""
+msgstr "patentierte"
 
 #: ../../addon/morepokes/morepokes.php:26
 msgid "stroke beard"
-msgstr ""
+msgstr "sich den Bart kratzen"
 
 #: ../../addon/morepokes/morepokes.php:26
 msgid "stroked their beard at"
-msgstr ""
+msgstr "kratzte sich den Bart in Richtung"
 
 #: ../../addon/morepokes/morepokes.php:27
 msgid ""
 "bemoan the declining standards of modern secondary and tertiary education to"
-msgstr ""
+msgstr "sich über die sinkenden Standards der Schul- und Hochschulbildung beklagen"
 
 #: ../../addon/morepokes/morepokes.php:27
 msgid ""
 "bemoans the declining standards of modern secondary and tertiary education "
 "to"
-msgstr ""
+msgstr "beklagte sich über die sinkenden Standards der Schul- und Hochschulbildung bei"
 
 #: ../../addon/morepokes/morepokes.php:28
 msgid "hug"
-msgstr ""
+msgstr "umarmen"
 
 #: ../../addon/morepokes/morepokes.php:28
 msgid "hugged"
-msgstr ""
+msgstr "umarmte"
 
 #: ../../addon/morepokes/morepokes.php:29
 msgid "kiss"
-msgstr ""
+msgstr "küssen"
 
 #: ../../addon/morepokes/morepokes.php:29
 msgid "kissed"
-msgstr ""
+msgstr "küsste"
 
 #: ../../addon/morepokes/morepokes.php:30
 msgid "raise eyebrows at"
-msgstr ""
+msgstr "Augenbrauen hochziehen"
 
 #: ../../addon/morepokes/morepokes.php:30
 msgid "raised their eyebrows at"
-msgstr ""
+msgstr "zog die Augenbrauen hoch in Richtung"
 
 #: ../../addon/morepokes/morepokes.php:31
 msgid "insult"
-msgstr ""
+msgstr "beleidigen"
 
 #: ../../addon/morepokes/morepokes.php:31
 msgid "insulted"
-msgstr ""
+msgstr "beleidigte"
 
 #: ../../addon/morepokes/morepokes.php:32
 msgid "praise"
-msgstr ""
+msgstr "preisen"
 
 #: ../../addon/morepokes/morepokes.php:32
 msgid "praised"
-msgstr ""
+msgstr "pries"
 
 #: ../../addon/morepokes/morepokes.php:33
 msgid "be dubious of"
-msgstr ""
+msgstr "ungewiss sein"
 
 #: ../../addon/morepokes/morepokes.php:33
 msgid "was dubious of"
-msgstr ""
+msgstr "war ungewiss über"
 
 #: ../../addon/morepokes/morepokes.php:34
 msgid "eat"
-msgstr ""
+msgstr "essen"
 
 #: ../../addon/morepokes/morepokes.php:34
 msgid "ate"
-msgstr ""
+msgstr "aß"
 
 #: ../../addon/morepokes/morepokes.php:35
 msgid "giggle and fawn at"
-msgstr ""
+msgstr "kichern und einschleimen"
 
 #: ../../addon/morepokes/morepokes.php:35
 msgid "giggled and fawned at"
-msgstr ""
+msgstr "kicherte und schleimte sich ein bei"
 
 #: ../../addon/morepokes/morepokes.php:36
 msgid "doubt"
-msgstr "anzeigen/verbergen"
+msgstr "bezweifeln"
 
 #: ../../addon/morepokes/morepokes.php:36
 msgid "doubted"
-msgstr ""
+msgstr "bezweifelte"
 
 #: ../../addon/morepokes/morepokes.php:37
 msgid "glare"
-msgstr ""
+msgstr "zornig anstarren"
 
 #: ../../addon/morepokes/morepokes.php:37
 msgid "glared at"
-msgstr ""
+msgstr "starrte zornig auf"
 
 #: ../../addon/yourls/yourls.php:55
 msgid "YourLS Settings"
@@ -5210,7 +5210,7 @@ msgstr "Kein Zugriff"
 #: ../../addon/dav/common/wdcal_edit.inc.php:30
 #: ../../addon/dav/common/wdcal_edit.inc.php:738
 msgid "Could not open component for editing"
-msgstr ""
+msgstr "Kalender-Editierfunktion konnte nicht geöffnet werden"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:140
 #: ../../addon/dav/friendica/layout.fnk.php:143
@@ -6163,11 +6163,11 @@ msgstr "Editplain Einstellungen aktualisiert"
 
 #: ../../addon/group_text/group_text.php:76
 msgid "Group Text"
-msgstr ""
+msgstr "Gruppen als Text"
 
 #: ../../addon/group_text/group_text.php:78
 msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr ""
+msgstr "Beim Bearbeiten von Gruppen Text statt Bilder anzeigen"
 
 #: ../../addon/libravatar/libravatar.php:14
 msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
@@ -6550,7 +6550,7 @@ msgstr "Dieses Plugin/Addon aktivieren?"
 #: ../../addon/gnot/gnot.php:97
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%d"
-msgstr "[Friendica Meldung] Kommentar zum Beitrag #%d"
+msgstr "[Friendica-Meldung] Kommentar zum Beitrag #%d"
 
 #: ../../addon/wppost/wppost.php:42
 msgid "Post to Wordpress"
@@ -7416,51 +7416,51 @@ msgstr[1] "%d Kontakte"
 
 #: ../../include/text.php:719
 msgid "poke"
-msgstr ""
+msgstr "anstupsen"
 
 #: ../../include/text.php:719 ../../include/conversation.php:201
 msgid "poked"
-msgstr ""
+msgstr "stupste"
 
 #: ../../include/text.php:720
 msgid "ping"
-msgstr ""
+msgstr "anpingen"
 
 #: ../../include/text.php:720
 msgid "pinged"
-msgstr ""
+msgstr "pingte"
 
 #: ../../include/text.php:721
 msgid "prod"
-msgstr ""
+msgstr "knuffen"
 
 #: ../../include/text.php:721
 msgid "prodded"
-msgstr ""
+msgstr "knuffte"
 
 #: ../../include/text.php:722
 msgid "slap"
-msgstr ""
+msgstr "ohrfeigen"
 
 #: ../../include/text.php:722
 msgid "slapped"
-msgstr ""
+msgstr "ohrfeigte"
 
 #: ../../include/text.php:723
 msgid "finger"
-msgstr ""
+msgstr "befummeln"
 
 #: ../../include/text.php:723
 msgid "fingered"
-msgstr ""
+msgstr "befummelte"
 
 #: ../../include/text.php:724
 msgid "rebuff"
-msgstr ""
+msgstr "eine Abfuhr erteilen"
 
 #: ../../include/text.php:724
 msgid "rebuffed"
-msgstr ""
+msgstr "abfuhrerteilte"
 
 #: ../../include/text.php:736
 msgid "happy"
@@ -7701,7 +7701,7 @@ msgstr "Abmelden"
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:49 ../../boot.php:1632
+#: ../../include/nav.php:49 ../../boot.php:1635
 msgid "Status"
 msgstr "Status"
 
@@ -7991,7 +7991,7 @@ msgstr "%s <!item_type!>"
 #: ../../include/enotify.php:44
 #, php-format
 msgid "[Friendica:Notify] New mail received at %s"
-msgstr "[Friendica Meldung] Neue Nachricht erhalten von %s"
+msgstr "[Friendica-Meldung] Neue Nachricht erhalten von %s"
 
 #: ../../include/enotify.php:46
 #, php-format
@@ -8030,7 +8030,7 @@ msgstr "%1$s kommentierte [url=%2$s]deinen %3$s[/url]"
 #: ../../include/enotify.php:114
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Friendica Meldung] Kommentar zum Beitrag #%1$d von %2$s"
+msgstr "[Friendica-Meldung] Kommentar zum Beitrag #%1$d von %2$s"
 
 #: ../../include/enotify.php:115
 #, php-format
@@ -8047,7 +8047,7 @@ msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren
 #: ../../include/enotify.php:125
 #, php-format
 msgid "[Friendica:Notify] %s posted to your profile wall"
-msgstr "[Friendica Meldung] %s hat auf deine Pinnwand geschrieben"
+msgstr "[Friendica-Meldung] %s hat auf deine Pinnwand geschrieben"
 
 #: ../../include/enotify.php:127
 #, php-format
@@ -8062,7 +8062,7 @@ msgstr "%1$s hat etwas auf [url=%2$s]deiner Pinnwand[/url] gepostet"
 #: ../../include/enotify.php:140
 #, php-format
 msgid "[Friendica:Notify] %s tagged you"
-msgstr "[Friendica Meldung] %s hat dich erwähnt"
+msgstr "[Friendica-Meldung] %s hat dich erwähnt"
 
 #: ../../include/enotify.php:141
 #, php-format
@@ -8077,22 +8077,22 @@ msgstr "%1$s [url=%2$s]erwähnte dich[/url]."
 #: ../../include/enotify.php:154
 #, php-format
 msgid "[Friendica:Notify] %1$s poked you"
-msgstr ""
+msgstr "[Friendica-Meldung] %1$s hat dich angestupst"
 
 #: ../../include/enotify.php:155
 #, php-format
 msgid "%1$s poked you at %2$s"
-msgstr ""
+msgstr "%1$s hat dich auf %2$s angestupst"
 
 #: ../../include/enotify.php:156
 #, php-format
 msgid "%1$s [url=%2$s]poked you[/url]."
-msgstr ""
+msgstr "%1$s [url=%2$s]hat dich angestupst[/url]."
 
 #: ../../include/enotify.php:171
 #, php-format
 msgid "[Friendica:Notify] %s tagged your post"
-msgstr "[Friendica Meldung] %s markierte deinen Beitrag"
+msgstr "[Friendica-Meldung] %s hat deinen Beitrag getaggt"
 
 #: ../../include/enotify.php:172
 #, php-format
@@ -8106,7 +8106,7 @@ msgstr "%1$s erwähnte [url=%2$s]Deinen Beitrag[/url]"
 
 #: ../../include/enotify.php:184
 msgid "[Friendica:Notify] Introduction received"
-msgstr "[Friendica Meldung] Kontaktanfrage erhalten"
+msgstr "[Friendica-Meldung] Kontaktanfrage erhalten"
 
 #: ../../include/enotify.php:185
 #, php-format
@@ -8130,7 +8130,7 @@ msgstr "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen."
 
 #: ../../include/enotify.php:198
 msgid "[Friendica:Notify] Friend suggestion received"
-msgstr "[Friendica Meldung] Kontaktvorschlag erhalten"
+msgstr "[Friendica-Meldung] Kontaktvorschlag erhalten"
 
 #: ../../include/enotify.php:199
 #, php-format
@@ -8315,7 +8315,7 @@ msgstr "wird nicht mehr gefolgt"
 
 #: ../../include/Contact.php:220 ../../include/conversation.php:1002
 msgid "Poke"
-msgstr ""
+msgstr "Anstupsen"
 
 #: ../../include/Contact.php:221 ../../include/conversation.php:996
 msgid "View Status"
@@ -8347,7 +8347,7 @@ msgstr "Private Nachricht senden"
 #: ../../include/conversation.php:197
 #, php-format
 msgid "%1$s poked %2$s"
-msgstr ""
+msgstr "%1$s hat %2$s angestupst"
 
 #: ../../include/conversation.php:281
 msgid "post/item"
@@ -8551,18 +8551,18 @@ msgstr "Veranstaltungserinnerungen"
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: ../../boot.php:1635
+#: ../../boot.php:1638
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../boot.php:1642
+#: ../../boot.php:1645
 msgid "Profile Details"
 msgstr "Profildetails"
 
-#: ../../boot.php:1659
+#: ../../boot.php:1662
 msgid "Events and Calendar"
 msgstr "Ereignisse und Kalender"
 
-#: ../../boot.php:1666
+#: ../../boot.php:1669
 msgid "Only You Can See This"
 msgstr "Nur du kannst das sehen"
diff --git a/view/de/strings.php b/view/de/strings.php
index b80525f3..c9e84ba2 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -252,8 +252,8 @@ $a->strings["UTC time: %s"] = "UTC Zeit: %s";
 $a->strings["Current timezone: %s"] = "Aktuelle Zeitzone: %s";
 $a->strings["Converted localtime: %s"] = "Umgerechnete lokale Zeit: %s";
 $a->strings["Please select your timezone:"] = "Bitte wähle deine Zeitzone.";
-$a->strings["Poke/Prod"] = "";
-$a->strings["poke, prod or do other things to somebody"] = "";
+$a->strings["Poke/Prod"] = "Anstupsen etc.";
+$a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen";
 $a->strings["Recipient"] = "Empfänger";
 $a->strings["Choose what you wish to do to recipient"] = "Was willst du mit dem Empfänger machen:";
 $a->strings["Make this post private"] = "Diesen Beitrag privat machen";
@@ -555,7 +555,7 @@ $a->strings["Someone writes a followup comment"] = "– jemand auch einen Kommen
 $a->strings["You receive a private message"] = "– du eine private Nachricht erhältst";
 $a->strings["You receive a friend suggestion"] = "– du eine Empfehlung erhältst";
 $a->strings["You are tagged in a post"] = "– du in einem Beitrag erwähnt wirst";
-$a->strings["You are poked/prodded/etc. in a post"] = "";
+$a->strings["You are poked/prodded/etc. in a post"] = "– du von jemandem angestupst oder sonstwie behandelt wirst";
 $a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Konto-/Seitentyp-Einstellungen";
 $a->strings["Change the behaviour of this account for special situations"] = "Verhalten dieses Kontos in bestimmten Situationen:";
 $a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten";
@@ -974,7 +974,7 @@ $a->strings["Add"] = "Hinzufügen";
 $a->strings["No entries."] = "Keine Einträge";
 $a->strings["Source (bbcode) text:"] = "Quelle (bbcode) Text:";
 $a->strings["Source (Diaspora) text to convert to BBcode:"] = "Eingabe (Diaspora) Nach BBCode zu konvertierender Text:";
-$a->strings["Source input: "] = "";
+$a->strings["Source input: "] = "Originaltext:";
 $a->strings["bb2html: "] = "bb2html: ";
 $a->strings["bb2html2bb: "] = "bb2html2bb: ";
 $a->strings["bb2md: "] = "bb2md: ";
@@ -1103,43 +1103,43 @@ $a->strings["Generate new key"] = "Neuen Schlüssel erstellen";
 $a->strings["Widgets key"] = "Widgets Schlüssel";
 $a->strings["Widgets available"] = "Verfügbare Widgets";
 $a->strings["Connect on Friendica!"] = "In Friendica verbinden!";
-$a->strings["bitchslap"] = "";
-$a->strings["bitchslapped"] = "";
-$a->strings["shag"] = "";
-$a->strings["shagged"] = "";
-$a->strings["do something obscenely biological to"] = "";
-$a->strings["did something obscenely biological to"] = "";
-$a->strings["point out the new poke feature to"] = "";
-$a->strings["pointed out the new poke feature to"] = "";
-$a->strings["declare undying love for"] = "";
-$a->strings["declared undying love for"] = "";
+$a->strings["bitchslap"] = "abwatschen";
+$a->strings["bitchslapped"] = "watschte";
+$a->strings["shag"] = "poppen";
+$a->strings["shagged"] = "poppte";
+$a->strings["do something obscenely biological to"] = "mit ihm/ihr etwas obszönes Körperliches machen";
+$a->strings["did something obscenely biological to"] = "machte etwas obszönes Körperliches mit";
+$a->strings["point out the new poke feature to"] = "die neue Anstups-Funktion zeigen";
+$a->strings["pointed out the new poke feature to"] = "zeigte die neue Anstups-Funktion";
+$a->strings["declare undying love for"] = "unterbliche Liebe verkünden";
+$a->strings["declared undying love for"] = "verkündete unsterbliche Liebe für";
 $a->strings["set fire to"] = "";
-$a->strings["patent"] = "";
-$a->strings["patented"] = "";
-$a->strings["stroke beard"] = "";
-$a->strings["stroked their beard at"] = "";
-$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "";
-$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "";
-$a->strings["hug"] = "";
-$a->strings["hugged"] = "";
-$a->strings["kiss"] = "";
-$a->strings["kissed"] = "";
-$a->strings["raise eyebrows at"] = "";
-$a->strings["raised their eyebrows at"] = "";
-$a->strings["insult"] = "";
-$a->strings["insulted"] = "";
-$a->strings["praise"] = "";
-$a->strings["praised"] = "";
-$a->strings["be dubious of"] = "";
-$a->strings["was dubious of"] = "";
-$a->strings["eat"] = "";
-$a->strings["ate"] = "";
-$a->strings["giggle and fawn at"] = "";
-$a->strings["giggled and fawned at"] = "";
-$a->strings["doubt"] = "anzeigen/verbergen";
-$a->strings["doubted"] = "";
-$a->strings["glare"] = "";
-$a->strings["glared at"] = "";
+$a->strings["patent"] = "patentieren";
+$a->strings["patented"] = "patentierte";
+$a->strings["stroke beard"] = "sich den Bart kratzen";
+$a->strings["stroked their beard at"] = "kratzte sich den Bart in Richtung";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "sich über die sinkenden Standards der Schul- und Hochschulbildung beklagen";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "beklagte sich über die sinkenden Standards der Schul- und Hochschulbildung bei";
+$a->strings["hug"] = "umarmen";
+$a->strings["hugged"] = "umarmte";
+$a->strings["kiss"] = "küssen";
+$a->strings["kissed"] = "küsste";
+$a->strings["raise eyebrows at"] = "Augenbrauen hochziehen";
+$a->strings["raised their eyebrows at"] = "zog die Augenbrauen hoch in Richtung";
+$a->strings["insult"] = "beleidigen";
+$a->strings["insulted"] = "beleidigte";
+$a->strings["praise"] = "preisen";
+$a->strings["praised"] = "pries";
+$a->strings["be dubious of"] = "ungewiss sein";
+$a->strings["was dubious of"] = "war ungewiss über";
+$a->strings["eat"] = "essen";
+$a->strings["ate"] = "aß";
+$a->strings["giggle and fawn at"] = "kichern und einschleimen";
+$a->strings["giggled and fawned at"] = "kicherte und schleimte sich ein bei";
+$a->strings["doubt"] = "bezweifeln";
+$a->strings["doubted"] = "bezweifelte";
+$a->strings["glare"] = "zornig anstarren";
+$a->strings["glared at"] = "starrte zornig auf";
 $a->strings["YourLS Settings"] = "YourLS Einstellungen";
 $a->strings["URL: http://"] = "URL: http://";
 $a->strings["Username:"] = "Nutzername:";
@@ -1176,7 +1176,7 @@ $a->strings["Latest photos"] = "Neueste Fotos";
 $a->strings["Latest likes"] = "Neueste Favoriten";
 $a->strings["event"] = "Veranstaltung";
 $a->strings["No access"] = "Kein Zugriff";
-$a->strings["Could not open component for editing"] = "";
+$a->strings["Could not open component for editing"] = "Kalender-Editierfunktion konnte nicht geöffnet werden";
 $a->strings["Go back to the calendar"] = "Zurück zum Kalender";
 $a->strings["Event data"] = "Veranstaltungsdetails";
 $a->strings["Calendar"] = "Kalender";
@@ -1395,8 +1395,8 @@ $a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target
 $a->strings["Default zoom"] = "Standard Zoom";
 $a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoomlevel (1: Welt; 18: höchstes)";
 $a->strings["Editplain settings updated."] = "Editplain Einstellungen aktualisiert";
-$a->strings["Group Text"] = "";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
+$a->strings["Group Text"] = "Gruppen als Text";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Beim Bearbeiten von Gruppen Text statt Bilder anzeigen";
 $a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Kann Libravatar NICHT erfolgreich installieren.<br>PHP >=5.3 wird benötigt";
 $a->strings["generic profile image"] = "allgemeines Profilbild";
 $a->strings["random geometric pattern"] = "zufällig erzeugtes geometrisches Muster";
@@ -1480,7 +1480,7 @@ $a->strings["Gnot settings updated."] = "Gnot Einstellungen aktualisiert.";
 $a->strings["Gnot Settings"] = "Gnot Einstellungen";
 $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff";
 $a->strings["Enable this plugin/addon?"] = "Dieses Plugin/Addon aktivieren?";
-$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica Meldung] Kommentar zum Beitrag #%d";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica-Meldung] Kommentar zum Beitrag #%d";
 $a->strings["Post to Wordpress"] = "Bei WordPress veröffentlichen";
 $a->strings["WordPress Post Settings"] = "WordPress-Beitragseinstellungen";
 $a->strings["Enable WordPress Post Plugin"] = "WordPress-Plugin aktivieren.";
@@ -1681,18 +1681,18 @@ $a->strings["%d Contact"] = array(
 	0 => "%d Kontakt",
 	1 => "%d Kontakte",
 );
-$a->strings["poke"] = "";
-$a->strings["poked"] = "";
-$a->strings["ping"] = "";
-$a->strings["pinged"] = "";
-$a->strings["prod"] = "";
-$a->strings["prodded"] = "";
-$a->strings["slap"] = "";
-$a->strings["slapped"] = "";
-$a->strings["finger"] = "";
-$a->strings["fingered"] = "";
-$a->strings["rebuff"] = "";
-$a->strings["rebuffed"] = "";
+$a->strings["poke"] = "anstupsen";
+$a->strings["poked"] = "stupste";
+$a->strings["ping"] = "anpingen";
+$a->strings["pinged"] = "pingte";
+$a->strings["prod"] = "knuffen";
+$a->strings["prodded"] = "knuffte";
+$a->strings["slap"] = "ohrfeigen";
+$a->strings["slapped"] = "ohrfeigte";
+$a->strings["finger"] = "befummeln";
+$a->strings["fingered"] = "befummelte";
+$a->strings["rebuff"] = "eine Abfuhr erteilen";
+$a->strings["rebuffed"] = "abfuhrerteilte";
 $a->strings["happy"] = "glücklich";
 $a->strings["sad"] = "traurig";
 $a->strings["mellow"] = "sanft";
@@ -1824,7 +1824,7 @@ $a->strings["Friendica Notification"] = "Friendica-Benachrichtigung";
 $a->strings["Thank You,"] = "Danke,";
 $a->strings["%s Administrator"] = "der Administrator von %s";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
-$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica Meldung] Neue Nachricht erhalten von %s";
+$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica-Meldung] Neue Nachricht erhalten von %s";
 $a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s hat dir eine neue private Nachricht auf %2\$s geschickt.";
 $a->strings["%1\$s sent you %2\$s."] = "%1\$s schickte dir %2\$s.";
 $a->strings["a private message"] = "eine private Nachricht";
@@ -1832,27 +1832,27 @@ $a->strings["Please visit %s to view and/or reply to your private messages."] =
 $a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]a %3\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]%3\$ss %4\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]deinen %3\$s[/url]";
-$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica Meldung] Kommentar zum Beitrag #%1\$d von %2\$s";
+$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica-Meldung] Kommentar zum Beitrag #%1\$d von %2\$s";
 $a->strings["%s commented on an item/conversation you have been following."] = "%s hat einen Beitrag kommentiert, dem du folgst.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";
-$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica Meldung] %s hat auf deine Pinnwand geschrieben";
+$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica-Meldung] %s hat auf deine Pinnwand geschrieben";
 $a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s schrieb auf %2\$s auf deine Pinnwand";
 $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s hat etwas auf [url=%2\$s]deiner Pinnwand[/url] gepostet";
-$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica Meldung] %s hat dich erwähnt";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica-Meldung] %s hat dich erwähnt";
 $a->strings["%1\$s tagged you at %2\$s"] = "%1\$s erwähnte dich auf %2\$s";
 $a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]erwähnte dich[/url].";
-$a->strings["[Friendica:Notify] %1\$s poked you"] = "";
-$a->strings["%1\$s poked you at %2\$s"] = "";
-$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "";
-$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte deinen Beitrag";
+$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica-Meldung] %1\$s hat dich angestupst";
+$a->strings["%1\$s poked you at %2\$s"] = "%1\$s hat dich auf %2\$s angestupst";
+$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s [url=%2\$s]hat dich angestupst[/url].";
+$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica-Meldung] %s hat deinen Beitrag getaggt";
 $a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s erwähnte deinen Beitrag auf %2\$s";
 $a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s erwähnte [url=%2\$s]Deinen Beitrag[/url]";
-$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten";
+$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica-Meldung] Kontaktanfrage erhalten";
 $a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Du hast eine Kontaktanfrage von '%1\$s' auf %2\$s erhalten";
 $a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Du hast eine [url=%1\$s]Kontaktanfrage[/url] von %2\$s erhalten.";
 $a->strings["You may visit their profile at %s"] = "Hier kannst du das Profil betrachten: %s";
 $a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen.";
-$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica Meldung] Kontaktvorschlag erhalten";
+$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica-Meldung] Kontaktvorschlag erhalten";
 $a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Du hast einen Freunde-Vorschlag von '%1\$s' auf %2\$s erhalten";
 $a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Du hast einen [url=%1\$s]Freunde-Vorschlag[/url] %2\$s von %3\$s erhalten.";
 $a->strings["Name:"] = "Name:";
@@ -1894,14 +1894,14 @@ $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.
 $a->strings["Welcome back "] = "Willkommen zurück ";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden).";
 $a->strings["stopped following"] = "wird nicht mehr gefolgt";
-$a->strings["Poke"] = "";
+$a->strings["Poke"] = "Anstupsen";
 $a->strings["View Status"] = "Pinnwand anschauen";
 $a->strings["View Profile"] = "Profil anschauen";
 $a->strings["View Photos"] = "Bilder anschauen";
 $a->strings["Network Posts"] = "Netzwerkbeiträge";
 $a->strings["Edit Contact"] = "Kontakt bearbeiten";
 $a->strings["Send PM"] = "Private Nachricht senden";
-$a->strings["%1\$s poked %2\$s"] = "";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s hat %2\$s angestupst";
 $a->strings["post/item"] = "Nachricht/Beitrag";
 $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s hat %2\$s\\s %3\$s als Favorit markiert";
 $a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge";