From f9a9b7012397ec4c4a18f49352d919266816dbd7 Mon Sep 17 00:00:00 2001
From: Domovoy <domovoy@errlock.org>
Date: Fri, 14 Sep 2012 05:30:21 +0200
Subject: [PATCH 1/9] Detect the namespace uri from token name

---
 library/HTML5/TreeBuilder.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/library/HTML5/TreeBuilder.php b/library/HTML5/TreeBuilder.php
index 578e73682b..26cd410bf3 100644
--- a/library/HTML5/TreeBuilder.php
+++ b/library/HTML5/TreeBuilder.php
@@ -3037,8 +3037,22 @@ class HTML5_TreeBuilder {
         }
 
     private function insertElement($token, $append = true) {
-        $el = $this->dom->createElementNS(self::NS_HTML, $token['name']);
-
+		$sep_pos = strpos($token['name'],':');
+		$ns_uri = self::NS_HTML;
+		if($sep_pos !== FALSE) {
+			// This tag has a namespace
+			$ns = substr($token['name'], 0, $sep_pos);
+			switch($ns) {
+				case 'g':
+					$ns_uri = 'http://base.google.com/ns/1.0';
+					break;
+				default:
+					logger("HTML5/TreeBuilder.php: Unknown namespace '". $ns ."', tag = ". $token['name'], LOGGER_DEBUG);
+					break;
+			}
+		}
+        $el = $this->dom->createElementNS($ns_uri, $token['name']);
+		
         if (!empty($token['attr'])) {
             foreach($token['attr'] as $attr) {
 

From 09413a0f0a04ad84c9869fc8e9f8fbd75317d35e Mon Sep 17 00:00:00 2001
From: Domovoy <domovoy@errlock.org>
Date: Fri, 14 Sep 2012 05:50:35 +0200
Subject: [PATCH 2/9] Better integration with the existing code

---
 library/HTML5/TreeBuilder.php | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/library/HTML5/TreeBuilder.php b/library/HTML5/TreeBuilder.php
index 26cd410bf3..257e73c3e0 100644
--- a/library/HTML5/TreeBuilder.php
+++ b/library/HTML5/TreeBuilder.php
@@ -127,6 +127,7 @@ class HTML5_TreeBuilder {
     const NS_XLINK  = 'http://www.w3.org/1999/xlink';
     const NS_XML    = 'http://www.w3.org/XML/1998/namespace';
     const NS_XMLNS  = 'http://www.w3.org/2000/xmlns/';
+    const NS_GOOGLE = 'http://base.google.com/ns/1.0';
 
     public function __construct() {
         $this->mode = self::INITIAL;
@@ -1430,6 +1431,14 @@ class HTML5_TreeBuilder {
                     // parse error
                 break;
 
+                /* Google */
+                case 'g:plusone':
+					/* Reconstruct the active formatting elements, if any. */
+                    $this->reconstructActiveFormattingElements();
+
+                    $this->insertForeignElement($token, self::NS_GOOGLE);
+                break;
+
                 /* A start tag token not covered by the previous entries */
                 default:
                     /* Reconstruct the active formatting elements, if any. */
@@ -3037,21 +3046,7 @@ class HTML5_TreeBuilder {
         }
 
     private function insertElement($token, $append = true) {
-		$sep_pos = strpos($token['name'],':');
-		$ns_uri = self::NS_HTML;
-		if($sep_pos !== FALSE) {
-			// This tag has a namespace
-			$ns = substr($token['name'], 0, $sep_pos);
-			switch($ns) {
-				case 'g':
-					$ns_uri = 'http://base.google.com/ns/1.0';
-					break;
-				default:
-					logger("HTML5/TreeBuilder.php: Unknown namespace '". $ns ."', tag = ". $token['name'], LOGGER_DEBUG);
-					break;
-			}
-		}
-        $el = $this->dom->createElementNS($ns_uri, $token['name']);
+        $el = $this->dom->createElementNS(self::NS_HTML, $token['name']);
 		
         if (!empty($token['attr'])) {
             foreach($token['attr'] as $attr) {

From a31c779a15e0457054b8a2d02569dda5ab8fe9b4 Mon Sep 17 00:00:00 2001
From: Domovoy <domovoy@errlock.org>
Date: Fri, 14 Sep 2012 07:59:54 +0200
Subject: [PATCH 3/9] Transform prefixed elements to classic ones

---
 library/HTML5/TreeBuilder.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/library/HTML5/TreeBuilder.php b/library/HTML5/TreeBuilder.php
index 257e73c3e0..2a789f4df9 100644
--- a/library/HTML5/TreeBuilder.php
+++ b/library/HTML5/TreeBuilder.php
@@ -127,7 +127,6 @@ class HTML5_TreeBuilder {
     const NS_XLINK  = 'http://www.w3.org/1999/xlink';
     const NS_XML    = 'http://www.w3.org/XML/1998/namespace';
     const NS_XMLNS  = 'http://www.w3.org/2000/xmlns/';
-    const NS_GOOGLE = 'http://base.google.com/ns/1.0';
 
     public function __construct() {
         $this->mode = self::INITIAL;
@@ -159,6 +158,8 @@ class HTML5_TreeBuilder {
 
         if ($this->ignore_lf_token) $this->ignore_lf_token--;
         $this->ignored = false;
+
+        $token['name'] = str_replace(':', '-', $token['name']);
         // indenting is a little wonky, this can be changed later on
         switch ($mode) {
 
@@ -1430,15 +1431,7 @@ class HTML5_TreeBuilder {
                 case 'tbody': case 'td': case 'tfoot': case 'th': case 'thead': case 'tr':
                     // parse error
                 break;
-
-                /* Google */
-                case 'g:plusone':
-					/* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
-
-                    $this->insertForeignElement($token, self::NS_GOOGLE);
-                break;
-
+                
                 /* A start tag token not covered by the previous entries */
                 default:
                     /* Reconstruct the active formatting elements, if any. */

From f445ed47df9d706cb0cfb3d24f1c967f9ae86658 Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Fri, 14 Sep 2012 18:22:56 -0600
Subject: [PATCH 4/9] fix permissions for uploaded images with size specified

---
 mod/item.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index 52ea9d58c9..8fe1c05c12 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -373,8 +373,8 @@ function item_post(&$a) {
 
 	$match = null;
 
-	if((! $preview) && preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
-		$images = $match[1];
+	if((! $preview) && preg_match_all("/\[img([\=0-9x]*)\](.*?)\[\/img\]/",$body,$match)) {
+		$images = $match[2];
 		if(count($images)) {
 			foreach($images as $image) {
 				if(! stristr($image,$a->get_baseurl() . '/photo/'))

From 8a4dcc28c1e3a0bdb5b8b4fa971ff48cf3e0fb75 Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Fri, 14 Sep 2012 18:33:07 -0600
Subject: [PATCH 5/9] make size search less greedy

---
 mod/item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/item.php b/mod/item.php
index 8fe1c05c12..7d36d7f70a 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -373,7 +373,7 @@ function item_post(&$a) {
 
 	$match = null;
 
-	if((! $preview) && preg_match_all("/\[img([\=0-9x]*)\](.*?)\[\/img\]/",$body,$match)) {
+	if((! $preview) && preg_match_all("/\[img([\=0-9x]*?)\](.*?)\[\/img\]/",$body,$match)) {
 		$images = $match[2];
 		if(count($images)) {
 			foreach($images as $image) {

From 21d685b21cccb5055b867271fdc9faaedf9e6685 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 15 Sep 2012 10:38:08 +0200
Subject: [PATCH 6/9] DE: update to the strings

---
 view/de/messages.po | 15 ++++++++-------
 view/de/strings.php | 12 ++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/view/de/messages.po b/view/de/messages.po
index a01bf6a830..5e3963cff4 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -13,6 +13,7 @@
 #   <leberwurscht@hoegners.de>, 2012.
 #   <marmor69@web.de>, 2012.
 # Martin Schmitt <mas@scsy.de>, 2012.
+#   <matthias@matthiasmoritz.de>, 2012.
 # Oliver  <post@toktan.org>, 2012.
 #   <tobias.diekershoff@gmx.net>, 2011-2012.
 #   <transifex@zottel.net>, 2011-2012.
@@ -22,7 +23,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
 "POT-Creation-Date: 2012-09-13 10:00-0700\n"
-"PO-Revision-Date: 2012-09-14 13:44+0000\n"
+"PO-Revision-Date: 2012-09-15 08:34+0000\n"
 "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -5010,19 +5011,19 @@ msgstr ""
 
 #: ../../addon/fbpost/fbpost.php:199
 msgid "Facebook Post"
-msgstr ""
+msgstr "Beitrag auf Facebook"
 
 #: ../../addon/fbpost/fbpost.php:205
 msgid "Install Facebook Post connector for this account."
-msgstr ""
+msgstr "Facebook-Connector für dieses Konto installieren."
 
 #: ../../addon/fbpost/fbpost.php:212
 msgid "Remove Facebook Post connector"
-msgstr ""
+msgstr "Facebook-Connector entfernen"
 
 #: ../../addon/fbpost/fbpost.php:240
 msgid "Facebook Post Settings"
-msgstr ""
+msgstr "Facebook-Beitragseinstellungen"
 
 #: ../../addon/widgets/widget_like.php:58
 #, php-format
@@ -5084,11 +5085,11 @@ msgstr "machte etwas obszönes Körperliches mit"
 
 #: ../../addon/morepokes/morepokes.php:22
 msgid "point out the poke feature to"
-msgstr ""
+msgstr "zeigte die neue Anstups-Funktion"
 
 #: ../../addon/morepokes/morepokes.php:22
 msgid "pointed out the poke feature to"
-msgstr ""
+msgstr "zeigte die neue Anstups-Funktion"
 
 #: ../../addon/morepokes/morepokes.php:23
 msgid "declare undying love for"
diff --git a/view/de/strings.php b/view/de/strings.php
index f59f898c9e..38e25f5651 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -1117,10 +1117,10 @@ $a->strings["Number of items"] = "Anzahl der Einträge";
 $a->strings["Size of the cache"] = "Größe des Caches";
 $a->strings["Delete the whole cache"] = "Cache leeren";
 $a->strings["Facebook Post disabled"] = "";
-$a->strings["Facebook Post"] = "";
-$a->strings["Install Facebook Post connector for this account."] = "";
-$a->strings["Remove Facebook Post connector"] = "";
-$a->strings["Facebook Post Settings"] = "";
+$a->strings["Facebook Post"] = "Beitrag auf Facebook";
+$a->strings["Install Facebook Post connector for this account."] = "Facebook-Connector für dieses Konto installieren.";
+$a->strings["Remove Facebook Post connector"] = "Facebook-Connector entfernen";
+$a->strings["Facebook Post Settings"] = "Facebook-Beitragseinstellungen";
 $a->strings["%d person likes this"] = array(
 	0 => "%d Person mag das",
 	1 => "%d Leute mögen das",
@@ -1140,8 +1140,8 @@ $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 poke feature to"] = "";
-$a->strings["pointed out the poke feature to"] = "";
+$a->strings["point out the poke feature to"] = "zeigte die neue Anstups-Funktion";
+$a->strings["pointed out the 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["patent"] = "patentieren";

From 669d2b890ead6d5bc268c038a469e8ce65dee715 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 15 Sep 2012 15:23:15 -0700
Subject: [PATCH 7/9] rev update - add cancel markup to editor

---
 boot.php                 |   2 +-
 include/conversation.php |   1 +
 mod/editpost.php         |   1 +
 util/messages.po         | 204 +++++++++++++++++++--------------------
 4 files changed, 105 insertions(+), 103 deletions(-)

diff --git a/boot.php b/boot.php
index 66aeb28ec8..713e8e2aa4 100644
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1465' );
+define ( 'FRIENDICA_VERSION',      '3.0.1467' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1155      );
 
diff --git a/include/conversation.php b/include/conversation.php
index 91310277fc..cb225127d1 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1280,6 +1280,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		'$profile_uid' => $x['profile_uid'],
 		'$preview' => t('Preview'),
 		'$sourceapp' => t($a->sourcename),
+		'$cancel' => t('Cancel')
 	));
 
 
diff --git a/mod/editpost.php b/mod/editpost.php
index b44afe245f..03d5263a1d 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -133,6 +133,7 @@ function editpost_content(&$a) {
 		'$preview' => t('Preview'),
 		'$jotplugins' => $jotplugins,
 		'$sourceapp' => t($a->sourcename),
+		'$cancel' => t('Cancel')
 	));
 
 	return $o;
diff --git a/util/messages.po b/util/messages.po
index e88044c5b0..23f3c724d2 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1465\n"
+"Project-Id-Version: 3.0.1467\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-13 10:00-0700\n"
+"POT-Creation-Date: 2012-09-15 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -176,7 +176,7 @@ msgstr ""
 #: ../../view/theme/diabook/theme.php:757
 #: ../../view/theme/diabook/config.php:190
 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
-#: ../../include/conversation.php:591 ../../object/Item.php:532
+#: ../../include/conversation.php:601 ../../object/Item.php:532
 msgid "Submit"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgid "link to source"
 msgstr ""
 
 #: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1683
+#: ../../include/nav.php:52 ../../boot.php:1689
 msgid "Events"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:46 ../../boot.php:1676
+#: ../../mod/photos.php:46 ../../boot.php:1682
 msgid "Photo Albums"
 msgstr ""
 
@@ -404,8 +404,8 @@ msgstr ""
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:318
-#: ../../include/user.php:325 ../../include/user.php:332
+#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:324
+#: ../../include/user.php:331 ../../include/user.php:338
 msgid "Profile Photos"
 msgstr ""
 
@@ -577,51 +577,51 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
 #: ../../mod/photos.php:1356 ../../mod/content.php:665
-#: ../../include/conversation.php:565 ../../object/Item.php:185
+#: ../../include/conversation.php:575 ../../object/Item.php:185
 msgid "I like this (toggle)"
 msgstr ""
 
 #: ../../mod/photos.php:1357 ../../mod/content.php:666
-#: ../../include/conversation.php:566 ../../object/Item.php:186
+#: ../../include/conversation.php:576 ../../object/Item.php:186
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1358 ../../include/conversation.php:1214
+#: ../../mod/photos.php:1358 ../../include/conversation.php:1244
 msgid "Share"
 msgstr ""
 
 #: ../../mod/photos.php:1359 ../../mod/editpost.php:112
 #: ../../mod/content.php:482 ../../mod/content.php:843
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:481 ../../include/conversation.php:659
-#: ../../include/conversation.php:891 ../../include/conversation.php:1233
+#: ../../mod/message.php:481 ../../include/conversation.php:671
+#: ../../include/conversation.php:921 ../../include/conversation.php:1263
 #: ../../object/Item.php:237
 msgid "Please wait"
 msgstr ""
 
 #: ../../mod/photos.php:1375 ../../mod/photos.php:1416
 #: ../../mod/photos.php:1448 ../../mod/content.php:688
-#: ../../include/conversation.php:588 ../../object/Item.php:529
+#: ../../include/conversation.php:598 ../../object/Item.php:529
 msgid "This is you"
 msgstr ""
 
 #: ../../mod/photos.php:1377 ../../mod/photos.php:1418
 #: ../../mod/photos.php:1450 ../../mod/content.php:690
-#: ../../include/conversation.php:590 ../../boot.php:574
+#: ../../include/conversation.php:600 ../../boot.php:574
 #: ../../object/Item.php:531
 msgid "Comment"
 msgstr ""
 
 #: ../../mod/photos.php:1379 ../../mod/editpost.php:133
-#: ../../mod/content.php:700 ../../include/conversation.php:600
-#: ../../include/conversation.php:1251 ../../object/Item.php:541
+#: ../../mod/content.php:700 ../../include/conversation.php:610
+#: ../../include/conversation.php:1281 ../../object/Item.php:541
 msgid "Preview"
 msgstr ""
 
 #: ../../mod/photos.php:1479 ../../mod/content.php:439
 #: ../../mod/content.php:721 ../../mod/settings.php:606
 #: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:694
-#: ../../include/conversation.php:440 ../../include/conversation.php:847
+#: ../../include/conversation.php:440 ../../include/conversation.php:874
 #: ../../object/Item.php:116
 msgid "Delete"
 msgstr ""
@@ -688,7 +688,7 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:1200
+#: ../../mod/editpost.php:88 ../../include/conversation.php:1230
 msgid "Post to Email"
 msgstr ""
 
@@ -700,17 +700,17 @@ msgstr ""
 
 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:291 ../../mod/message.php:478
-#: ../../include/conversation.php:1215
+#: ../../include/conversation.php:1245
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:1217
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1247
 msgid "Attach file"
 msgstr ""
 
 #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
 #: ../../mod/message.php:292 ../../mod/message.php:479
-#: ../../include/conversation.php:1219
+#: ../../include/conversation.php:1249
 msgid "Insert web link"
 msgstr ""
 
@@ -726,35 +726,35 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:1225
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1255
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:1227
+#: ../../mod/editpost.php:111 ../../include/conversation.php:1257
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1234
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1264
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:121 ../../include/conversation.php:1243
+#: ../../mod/editpost.php:121 ../../include/conversation.php:1273
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1244
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1274
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:125 ../../include/conversation.php:1230
+#: ../../mod/editpost.php:125 ../../include/conversation.php:1260
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:1232
+#: ../../mod/editpost.php:127 ../../include/conversation.php:1262
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:1246
+#: ../../mod/editpost.php:128 ../../include/conversation.php:1276
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -1296,31 +1296,31 @@ msgid "Group: "
 msgstr ""
 
 #: ../../mod/content.php:438 ../../mod/content.php:720
-#: ../../include/conversation.php:439 ../../include/conversation.php:846
+#: ../../include/conversation.php:439 ../../include/conversation.php:873
 #: ../../object/Item.php:115
 msgid "Select"
 msgstr ""
 
 #: ../../mod/content.php:455 ../../mod/content.php:813
-#: ../../mod/content.php:814 ../../include/conversation.php:627
-#: ../../include/conversation.php:628 ../../include/conversation.php:863
+#: ../../mod/content.php:814 ../../include/conversation.php:639
+#: ../../include/conversation.php:640 ../../include/conversation.php:890
 #: ../../object/Item.php:206 ../../object/Item.php:207
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
 #: ../../mod/content.php:465 ../../mod/content.php:825
-#: ../../include/conversation.php:641 ../../include/conversation.php:874
+#: ../../include/conversation.php:653 ../../include/conversation.php:904
 #: ../../object/Item.php:219
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../mod/content.php:480 ../../include/conversation.php:889
+#: ../../mod/content.php:480 ../../include/conversation.php:919
 msgid "View in context"
 msgstr ""
 
-#: ../../mod/content.php:586 ../../include/conversation.php:668
+#: ../../mod/content.php:586 ../../include/conversation.php:680
 #: ../../object/Item.php:256
 #, php-format
 msgid "%d comment"
@@ -1330,92 +1330,92 @@ msgstr[1] ""
 
 #: ../../mod/content.php:587 ../../addon/page/page.php:76
 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../include/conversation.php:669
+#: ../../include/contact_widgets.php:195 ../../include/conversation.php:681
 #: ../../boot.php:575 ../../object/Item.php:257
 msgid "show more"
 msgstr ""
 
-#: ../../mod/content.php:665 ../../include/conversation.php:565
+#: ../../mod/content.php:665 ../../include/conversation.php:575
 #: ../../object/Item.php:185
 msgid "like"
 msgstr ""
 
-#: ../../mod/content.php:666 ../../include/conversation.php:566
+#: ../../mod/content.php:666 ../../include/conversation.php:576
 #: ../../object/Item.php:186
 msgid "dislike"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../include/conversation.php:568
+#: ../../mod/content.php:668 ../../include/conversation.php:578
 #: ../../object/Item.php:188
 msgid "Share this"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../include/conversation.php:568
+#: ../../mod/content.php:668 ../../include/conversation.php:578
 #: ../../object/Item.php:188
 msgid "share"
 msgstr ""
 
-#: ../../mod/content.php:692 ../../include/conversation.php:592
+#: ../../mod/content.php:692 ../../include/conversation.php:602
 #: ../../object/Item.php:533
 msgid "Bold"
 msgstr ""
 
-#: ../../mod/content.php:693 ../../include/conversation.php:593
+#: ../../mod/content.php:693 ../../include/conversation.php:603
 #: ../../object/Item.php:534
 msgid "Italic"
 msgstr ""
 
-#: ../../mod/content.php:694 ../../include/conversation.php:594
+#: ../../mod/content.php:694 ../../include/conversation.php:604
 #: ../../object/Item.php:535
 msgid "Underline"
 msgstr ""
 
-#: ../../mod/content.php:695 ../../include/conversation.php:595
+#: ../../mod/content.php:695 ../../include/conversation.php:605
 #: ../../object/Item.php:536
 msgid "Quote"
 msgstr ""
 
-#: ../../mod/content.php:696 ../../include/conversation.php:596
+#: ../../mod/content.php:696 ../../include/conversation.php:606
 #: ../../object/Item.php:537
 msgid "Code"
 msgstr ""
 
-#: ../../mod/content.php:697 ../../include/conversation.php:597
+#: ../../mod/content.php:697 ../../include/conversation.php:607
 #: ../../object/Item.php:538
 msgid "Image"
 msgstr ""
 
-#: ../../mod/content.php:698 ../../include/conversation.php:598
+#: ../../mod/content.php:698 ../../include/conversation.php:608
 #: ../../object/Item.php:539
 msgid "Link"
 msgstr ""
 
-#: ../../mod/content.php:699 ../../include/conversation.php:599
+#: ../../mod/content.php:699 ../../include/conversation.php:609
 #: ../../object/Item.php:540
 msgid "Video"
 msgstr ""
 
-#: ../../mod/content.php:733 ../../include/conversation.php:529
+#: ../../mod/content.php:733 ../../include/conversation.php:539
 #: ../../object/Item.php:169
 msgid "add star"
 msgstr ""
 
-#: ../../mod/content.php:734 ../../include/conversation.php:530
+#: ../../mod/content.php:734 ../../include/conversation.php:540
 #: ../../object/Item.php:170
 msgid "remove star"
 msgstr ""
 
-#: ../../mod/content.php:735 ../../include/conversation.php:531
+#: ../../mod/content.php:735 ../../include/conversation.php:541
 #: ../../object/Item.php:171
 msgid "toggle star status"
 msgstr ""
 
-#: ../../mod/content.php:738 ../../include/conversation.php:534
+#: ../../mod/content.php:738 ../../include/conversation.php:544
 #: ../../object/Item.php:174
 msgid "starred"
 msgstr ""
 
-#: ../../mod/content.php:739 ../../include/conversation.php:535
+#: ../../mod/content.php:739 ../../include/conversation.php:545
 #: ../../object/Item.php:175
 msgid "add tag"
 msgstr ""
@@ -1425,17 +1425,17 @@ msgstr ""
 msgid "save to folder"
 msgstr ""
 
-#: ../../mod/content.php:815 ../../include/conversation.php:629
+#: ../../mod/content.php:815 ../../include/conversation.php:641
 #: ../../object/Item.php:208
 msgid "to"
 msgstr ""
 
-#: ../../mod/content.php:816 ../../include/conversation.php:630
+#: ../../mod/content.php:816 ../../include/conversation.php:642
 #: ../../object/Item.php:209
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/content.php:817 ../../include/conversation.php:631
+#: ../../mod/content.php:817 ../../include/conversation.php:643
 #: ../../object/Item.php:210
 msgid "via Wall-To-Wall:"
 msgstr ""
@@ -2642,7 +2642,7 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1690
+#: ../../mod/notes.php:44 ../../boot.php:1696
 msgid "Personal Notes"
 msgstr ""
 
@@ -2686,7 +2686,7 @@ msgstr ""
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:1151 ../../include/conversation.php:1168
+#: ../../include/conversation.php:1181 ../../include/conversation.php:1198
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2769,7 +2769,7 @@ msgstr ""
 #: ../../mod/newmember.php:32 ../../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:1666
+#: ../../boot.php:1672
 msgid "Profile"
 msgstr ""
 
@@ -3121,7 +3121,7 @@ msgid "Access denied."
 msgstr ""
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1673
+#: ../../include/nav.php:51 ../../boot.php:1679
 msgid "Photos"
 msgstr ""
 
@@ -3635,13 +3635,13 @@ msgid "Allow infinite level threading for items on this site."
 msgstr ""
 
 #: ../../mod/admin.php:470
-msgid "No default permissions for new users"
+msgid "Private posts by default for new users"
 msgstr ""
 
 #: ../../mod/admin.php:470
 msgid ""
-"New users will have no private permissions set for their posts by default, "
-"making their posts public until they change it."
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
 msgstr ""
 
 #: ../../mod/admin.php:472
@@ -4407,8 +4407,8 @@ msgstr ""
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:1155
-#: ../../include/conversation.php:1172
+#: ../../mod/filer.php:29 ../../include/conversation.php:1185
+#: ../../include/conversation.php:1202
 msgid "Save to Folder:"
 msgstr ""
 
@@ -7480,7 +7480,7 @@ msgid "Sex Addict"
 msgstr ""
 
 #: ../../include/profile_selectors.php:42 ../../include/user.php:278
-#: ../../include/user.php:283
+#: ../../include/user.php:282
 msgid "Friends"
 msgstr ""
 
@@ -7902,7 +7902,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1659
+#: ../../include/nav.php:49 ../../boot.php:1665
 msgid "Status"
 msgstr ""
 
@@ -8513,34 +8513,34 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:1052
+#: ../../include/Contact.php:220 ../../include/conversation.php:1082
 msgid "Poke"
 msgstr ""
 
-#: ../../include/Contact.php:221 ../../include/conversation.php:1046
+#: ../../include/Contact.php:221 ../../include/conversation.php:1076
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:222 ../../include/conversation.php:1047
+#: ../../include/Contact.php:222 ../../include/conversation.php:1077
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:223 ../../include/conversation.php:1048
+#: ../../include/Contact.php:223 ../../include/conversation.php:1078
 msgid "View Photos"
 msgstr ""
 
 #: ../../include/Contact.php:224 ../../include/Contact.php:237
-#: ../../include/conversation.php:1049
+#: ../../include/conversation.php:1079
 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:225 ../../include/Contact.php:237
-#: ../../include/conversation.php:1050
+#: ../../include/conversation.php:1080
 msgid "Edit Contact"
 msgstr ""
 
 #: ../../include/Contact.php:226 ../../include/Contact.php:237
-#: ../../include/conversation.php:1051
+#: ../../include/conversation.php:1081
 msgid "Send PM"
 msgstr ""
 
@@ -8558,106 +8558,106 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:952
+#: ../../include/conversation.php:982
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:1110
+#: ../../include/conversation.php:1140
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:1110
+#: ../../include/conversation.php:1140
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1114
+#: ../../include/conversation.php:1144
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:1116
+#: ../../include/conversation.php:1146
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1122
+#: ../../include/conversation.php:1152
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:1125
+#: ../../include/conversation.php:1155
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:1126
+#: ../../include/conversation.php:1156
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:1126
+#: ../../include/conversation.php:1156
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1150 ../../include/conversation.php:1167
+#: ../../include/conversation.php:1180 ../../include/conversation.php:1197
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:1152 ../../include/conversation.php:1169
+#: ../../include/conversation.php:1182 ../../include/conversation.php:1199
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1153 ../../include/conversation.php:1170
+#: ../../include/conversation.php:1183 ../../include/conversation.php:1200
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1154 ../../include/conversation.php:1171
+#: ../../include/conversation.php:1184 ../../include/conversation.php:1201
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:1156 ../../include/conversation.php:1173
+#: ../../include/conversation.php:1186 ../../include/conversation.php:1203
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:1216
+#: ../../include/conversation.php:1246
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:1218
+#: ../../include/conversation.php:1248
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:1220
+#: ../../include/conversation.php:1250
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:1221
+#: ../../include/conversation.php:1251
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:1222
+#: ../../include/conversation.php:1252
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:1223
+#: ../../include/conversation.php:1253
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1224
+#: ../../include/conversation.php:1254
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1226
+#: ../../include/conversation.php:1256
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:1228
+#: ../../include/conversation.php:1258
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:1235
+#: ../../include/conversation.php:1265
 msgid "permissions"
 msgstr ""
 
@@ -8755,18 +8755,18 @@ msgstr ""
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1662
+#: ../../boot.php:1668
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1669
+#: ../../boot.php:1675
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1686
+#: ../../boot.php:1692
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1693
+#: ../../boot.php:1699
 msgid "Only You Can See This"
 msgstr ""

From 2abbd1dc19680fcfc00c841b6a73a97a297055b9 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 15 Sep 2012 20:21:17 -0700
Subject: [PATCH 8/9] permissions selector showing up for guests, testbubble
 and smoothly

---
 include/Photo.php             | 2 +-
 view/theme/smoothly/jot.tpl   | 2 +-
 view/theme/testbubble/jot.tpl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/Photo.php b/include/Photo.php
index 8e4eb84bdb..00c424c64c 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -663,7 +663,7 @@ function import_profile_photo($photo,$uid,$cid) {
         intval($uid),
         intval($cid)
     );
-    if(count($r)) {
+    if(count($r) && strlen($r[0]['resource-id'])) {
         $hash = $r[0]['resource-id'];
     }
     else {
diff --git a/view/theme/smoothly/jot.tpl b/view/theme/smoothly/jot.tpl
index 5f711cf242..2f52643f0c 100644
--- a/view/theme/smoothly/jot.tpl
+++ b/view/theme/smoothly/jot.tpl
@@ -47,7 +47,7 @@
 
 	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
 		<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-		<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" >
+		<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
             <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate sharePerms" title="$permset"></a>$bang</div>
 	</div>
 
diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl
index 45d206d57d..89150534c3 100644
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
@@ -47,7 +47,7 @@
 
 	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
 		<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-		<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" >
+		<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
             <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate sharePerms" title="$permset"></a>$bang</div>
 	</div>
 

From 89981b33bbbd8e16cb7a2dad013f83b1f58944c7 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 16 Sep 2012 10:48:29 +0200
Subject: [PATCH 9/9] DE: update to the strings

---
 view/de/messages.po | 212 ++++++++++++++++++++++----------------------
 view/de/strings.php |   8 +-
 2 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/view/de/messages.po b/view/de/messages.po
index 5e3963cff4..0eeb50ab88 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-09-13 10:00-0700\n"
-"PO-Revision-Date: 2012-09-15 08:34+0000\n"
+"POT-Creation-Date: 2012-09-15 10:00-0700\n"
+"PO-Revision-Date: 2012-09-16 08:41+0000\n"
 "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -191,7 +191,7 @@ msgstr "Neues Foto von dieser URL"
 #: ../../view/theme/diabook/theme.php:757
 #: ../../view/theme/diabook/config.php:190
 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
-#: ../../include/conversation.php:591 ../../object/Item.php:532
+#: ../../include/conversation.php:601 ../../object/Item.php:532
 msgid "Submit"
 msgstr "Senden"
 
@@ -251,7 +251,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:1683
+#: ../../include/nav.php:52 ../../boot.php:1689
 msgid "Events"
 msgstr "Veranstaltungen"
 
@@ -389,7 +389,7 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: ../../mod/photos.php:46 ../../boot.php:1676
+#: ../../mod/photos.php:46 ../../boot.php:1682
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
@@ -419,8 +419,8 @@ msgstr "Kontaktinformationen nicht verfügbar"
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:318
-#: ../../include/user.php:325 ../../include/user.php:332
+#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:324
+#: ../../include/user.php:331 ../../include/user.php:338
 msgid "Profile Photos"
 msgstr "Profilbilder"
 
@@ -593,51 +593,51 @@ msgid ""
 msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
 #: ../../mod/photos.php:1356 ../../mod/content.php:665
-#: ../../include/conversation.php:565 ../../object/Item.php:185
+#: ../../include/conversation.php:575 ../../object/Item.php:185
 msgid "I like this (toggle)"
 msgstr "Ich mag das (toggle)"
 
 #: ../../mod/photos.php:1357 ../../mod/content.php:666
-#: ../../include/conversation.php:566 ../../object/Item.php:186
+#: ../../include/conversation.php:576 ../../object/Item.php:186
 msgid "I don't like this (toggle)"
 msgstr "Ich mag das nicht (toggle)"
 
-#: ../../mod/photos.php:1358 ../../include/conversation.php:1214
+#: ../../mod/photos.php:1358 ../../include/conversation.php:1244
 msgid "Share"
 msgstr "Teilen"
 
 #: ../../mod/photos.php:1359 ../../mod/editpost.php:112
 #: ../../mod/content.php:482 ../../mod/content.php:843
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:481 ../../include/conversation.php:659
-#: ../../include/conversation.php:891 ../../include/conversation.php:1233
+#: ../../mod/message.php:481 ../../include/conversation.php:671
+#: ../../include/conversation.php:921 ../../include/conversation.php:1263
 #: ../../object/Item.php:237
 msgid "Please wait"
 msgstr "Bitte warten"
 
 #: ../../mod/photos.php:1375 ../../mod/photos.php:1416
 #: ../../mod/photos.php:1448 ../../mod/content.php:688
-#: ../../include/conversation.php:588 ../../object/Item.php:529
+#: ../../include/conversation.php:598 ../../object/Item.php:529
 msgid "This is you"
 msgstr "Das bist du"
 
 #: ../../mod/photos.php:1377 ../../mod/photos.php:1418
 #: ../../mod/photos.php:1450 ../../mod/content.php:690
-#: ../../include/conversation.php:590 ../../boot.php:574
+#: ../../include/conversation.php:600 ../../boot.php:574
 #: ../../object/Item.php:531
 msgid "Comment"
 msgstr "Kommentar"
 
 #: ../../mod/photos.php:1379 ../../mod/editpost.php:133
-#: ../../mod/content.php:700 ../../include/conversation.php:600
-#: ../../include/conversation.php:1251 ../../object/Item.php:541
+#: ../../mod/content.php:700 ../../include/conversation.php:610
+#: ../../include/conversation.php:1281 ../../object/Item.php:541
 msgid "Preview"
 msgstr "Vorschau"
 
 #: ../../mod/photos.php:1479 ../../mod/content.php:439
 #: ../../mod/content.php:721 ../../mod/settings.php:606
 #: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:694
-#: ../../include/conversation.php:440 ../../include/conversation.php:847
+#: ../../include/conversation.php:440 ../../include/conversation.php:874
 #: ../../object/Item.php:116
 msgid "Delete"
 msgstr "Löschen"
@@ -704,7 +704,7 @@ msgstr "Beitrag nicht gefunden"
 msgid "Edit post"
 msgstr "Beitrag bearbeiten"
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:1200
+#: ../../mod/editpost.php:88 ../../include/conversation.php:1230
 msgid "Post to Email"
 msgstr "An E-Mail senden"
 
@@ -716,17 +716,17 @@ msgstr "Bearbeiten"
 
 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:291 ../../mod/message.php:478
-#: ../../include/conversation.php:1215
+#: ../../include/conversation.php:1245
 msgid "Upload photo"
 msgstr "Foto hochladen"
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:1217
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1247
 msgid "Attach file"
 msgstr "Datei anhängen"
 
 #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
 #: ../../mod/message.php:292 ../../mod/message.php:479
-#: ../../include/conversation.php:1219
+#: ../../include/conversation.php:1249
 msgid "Insert web link"
 msgstr "einen Link einfügen"
 
@@ -742,35 +742,35 @@ msgstr "Vorbis [.ogg] Video einfügen"
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Vorbis [.ogg] Audio einfügen"
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:1225
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1255
 msgid "Set your location"
 msgstr "Deinen Standort festlegen"
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:1227
+#: ../../mod/editpost.php:111 ../../include/conversation.php:1257
 msgid "Clear browser location"
 msgstr "Browser-Standort leeren"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1234
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1264
 msgid "Permission settings"
 msgstr "Berechtigungseinstellungen"
 
-#: ../../mod/editpost.php:121 ../../include/conversation.php:1243
+#: ../../mod/editpost.php:121 ../../include/conversation.php:1273
 msgid "CC: email addresses"
 msgstr "Cc:-E-Mail-Addressen"
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1244
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1274
 msgid "Public post"
 msgstr "Öffentlicher Beitrag"
 
-#: ../../mod/editpost.php:125 ../../include/conversation.php:1230
+#: ../../mod/editpost.php:125 ../../include/conversation.php:1260
 msgid "Set title"
 msgstr "Titel setzen"
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:1232
+#: ../../mod/editpost.php:127 ../../include/conversation.php:1262
 msgid "Categories (comma-separated list)"
 msgstr "Kategorien (kommasepariert)"
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:1246
+#: ../../mod/editpost.php:128 ../../include/conversation.php:1276
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Z.B.: bob@example.com, mary@example.com"
 
@@ -1313,31 +1313,31 @@ msgid "Group: "
 msgstr "Gruppe: "
 
 #: ../../mod/content.php:438 ../../mod/content.php:720
-#: ../../include/conversation.php:439 ../../include/conversation.php:846
+#: ../../include/conversation.php:439 ../../include/conversation.php:873
 #: ../../object/Item.php:115
 msgid "Select"
 msgstr "Auswählen"
 
 #: ../../mod/content.php:455 ../../mod/content.php:813
-#: ../../mod/content.php:814 ../../include/conversation.php:627
-#: ../../include/conversation.php:628 ../../include/conversation.php:863
+#: ../../mod/content.php:814 ../../include/conversation.php:639
+#: ../../include/conversation.php:640 ../../include/conversation.php:890
 #: ../../object/Item.php:206 ../../object/Item.php:207
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Das Profil von %s auf %s betrachten."
 
 #: ../../mod/content.php:465 ../../mod/content.php:825
-#: ../../include/conversation.php:641 ../../include/conversation.php:874
+#: ../../include/conversation.php:653 ../../include/conversation.php:904
 #: ../../object/Item.php:219
 #, php-format
 msgid "%s from %s"
 msgstr "%s von %s"
 
-#: ../../mod/content.php:480 ../../include/conversation.php:889
+#: ../../mod/content.php:480 ../../include/conversation.php:919
 msgid "View in context"
 msgstr "Im Zusammenhang betrachten"
 
-#: ../../mod/content.php:586 ../../include/conversation.php:668
+#: ../../mod/content.php:586 ../../include/conversation.php:680
 #: ../../object/Item.php:256
 #, php-format
 msgid "%d comment"
@@ -1347,92 +1347,92 @@ msgstr[1] "%d Kommentare"
 
 #: ../../mod/content.php:587 ../../addon/page/page.php:76
 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../include/conversation.php:669
+#: ../../include/contact_widgets.php:195 ../../include/conversation.php:681
 #: ../../boot.php:575 ../../object/Item.php:257
 msgid "show more"
 msgstr "mehr anzeigen"
 
-#: ../../mod/content.php:665 ../../include/conversation.php:565
+#: ../../mod/content.php:665 ../../include/conversation.php:575
 #: ../../object/Item.php:185
 msgid "like"
 msgstr "mag ich"
 
-#: ../../mod/content.php:666 ../../include/conversation.php:566
+#: ../../mod/content.php:666 ../../include/conversation.php:576
 #: ../../object/Item.php:186
 msgid "dislike"
 msgstr "mag ich nicht"
 
-#: ../../mod/content.php:668 ../../include/conversation.php:568
+#: ../../mod/content.php:668 ../../include/conversation.php:578
 #: ../../object/Item.php:188
 msgid "Share this"
 msgstr "Weitersagen"
 
-#: ../../mod/content.php:668 ../../include/conversation.php:568
+#: ../../mod/content.php:668 ../../include/conversation.php:578
 #: ../../object/Item.php:188
 msgid "share"
 msgstr "Teilen"
 
-#: ../../mod/content.php:692 ../../include/conversation.php:592
+#: ../../mod/content.php:692 ../../include/conversation.php:602
 #: ../../object/Item.php:533
 msgid "Bold"
 msgstr "Fett"
 
-#: ../../mod/content.php:693 ../../include/conversation.php:593
+#: ../../mod/content.php:693 ../../include/conversation.php:603
 #: ../../object/Item.php:534
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../../mod/content.php:694 ../../include/conversation.php:594
+#: ../../mod/content.php:694 ../../include/conversation.php:604
 #: ../../object/Item.php:535
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../../mod/content.php:695 ../../include/conversation.php:595
+#: ../../mod/content.php:695 ../../include/conversation.php:605
 #: ../../object/Item.php:536
 msgid "Quote"
 msgstr "Zitat"
 
-#: ../../mod/content.php:696 ../../include/conversation.php:596
+#: ../../mod/content.php:696 ../../include/conversation.php:606
 #: ../../object/Item.php:537
 msgid "Code"
 msgstr "Code"
 
-#: ../../mod/content.php:697 ../../include/conversation.php:597
+#: ../../mod/content.php:697 ../../include/conversation.php:607
 #: ../../object/Item.php:538
 msgid "Image"
 msgstr "Bild"
 
-#: ../../mod/content.php:698 ../../include/conversation.php:598
+#: ../../mod/content.php:698 ../../include/conversation.php:608
 #: ../../object/Item.php:539
 msgid "Link"
 msgstr "Verweis"
 
-#: ../../mod/content.php:699 ../../include/conversation.php:599
+#: ../../mod/content.php:699 ../../include/conversation.php:609
 #: ../../object/Item.php:540
 msgid "Video"
 msgstr "Video"
 
-#: ../../mod/content.php:733 ../../include/conversation.php:529
+#: ../../mod/content.php:733 ../../include/conversation.php:539
 #: ../../object/Item.php:169
 msgid "add star"
 msgstr "markieren"
 
-#: ../../mod/content.php:734 ../../include/conversation.php:530
+#: ../../mod/content.php:734 ../../include/conversation.php:540
 #: ../../object/Item.php:170
 msgid "remove star"
 msgstr "Markierung entfernen"
 
-#: ../../mod/content.php:735 ../../include/conversation.php:531
+#: ../../mod/content.php:735 ../../include/conversation.php:541
 #: ../../object/Item.php:171
 msgid "toggle star status"
 msgstr "Markierung umschalten"
 
-#: ../../mod/content.php:738 ../../include/conversation.php:534
+#: ../../mod/content.php:738 ../../include/conversation.php:544
 #: ../../object/Item.php:174
 msgid "starred"
 msgstr "markiert"
 
-#: ../../mod/content.php:739 ../../include/conversation.php:535
+#: ../../mod/content.php:739 ../../include/conversation.php:545
 #: ../../object/Item.php:175
 msgid "add tag"
 msgstr "Tag hinzufügen"
@@ -1442,17 +1442,17 @@ msgstr "Tag hinzufügen"
 msgid "save to folder"
 msgstr "In Ordner speichern"
 
-#: ../../mod/content.php:815 ../../include/conversation.php:629
+#: ../../mod/content.php:815 ../../include/conversation.php:641
 #: ../../object/Item.php:208
 msgid "to"
 msgstr "zu"
 
-#: ../../mod/content.php:816 ../../include/conversation.php:630
+#: ../../mod/content.php:816 ../../include/conversation.php:642
 #: ../../object/Item.php:209
 msgid "Wall-to-Wall"
 msgstr "Wall-to-Wall"
 
-#: ../../mod/content.php:817 ../../include/conversation.php:631
+#: ../../mod/content.php:817 ../../include/conversation.php:643
 #: ../../object/Item.php:210
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
@@ -2660,7 +2660,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:1690
+#: ../../mod/notes.php:44 ../../boot.php:1696
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
@@ -2704,7 +2704,7 @@ msgstr "Kein Empfänger."
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:1151 ../../include/conversation.php:1168
+#: ../../include/conversation.php:1181 ../../include/conversation.php:1198
 msgid "Please enter a link URL:"
 msgstr "Bitte gib die URL des Links ein:"
 
@@ -2787,7 +2787,7 @@ msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen
 #: ../../mod/newmember.php:32 ../../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:1666
+#: ../../boot.php:1672
 msgid "Profile"
 msgstr "Profil"
 
@@ -3139,7 +3139,7 @@ msgid "Access denied."
 msgstr "Zugriff verweigert."
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1673
+#: ../../include/nav.php:51 ../../boot.php:1679
 msgid "Photos"
 msgstr "Bilder"
 
@@ -3654,14 +3654,14 @@ msgid "Allow infinite level threading for items on this site."
 msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite."
 
 #: ../../mod/admin.php:470
-msgid "No default permissions for new users"
-msgstr "Keine Standard-Zugriffsrechte für Beiträge neuer Nutzer"
+msgid "Private posts by default for new users"
+msgstr "Private Beiträge als Standard für neue Nutzer"
 
 #: ../../mod/admin.php:470
 msgid ""
-"New users will have no private permissions set for their posts by default, "
-"making their posts public until they change it."
-msgstr "Neue Benutzer werden keine Voreinstellungen für die Zugriffrechte haben, so dass ihre Beiträge öffentlich sind, bis sie es ändern."
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
+msgstr "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen."
 
 #: ../../mod/admin.php:472
 msgid "Block multiple registrations"
@@ -4426,8 +4426,8 @@ msgstr "sichtbar für jeden"
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:1155
-#: ../../include/conversation.php:1172
+#: ../../mod/filer.php:29 ../../include/conversation.php:1185
+#: ../../include/conversation.php:1202
 msgid "Save to Folder:"
 msgstr "In diesen Ordner verschieben:"
 
@@ -5007,11 +5007,11 @@ msgstr "Cache leeren"
 
 #: ../../addon/fbpost/fbpost.php:172
 msgid "Facebook Post disabled"
-msgstr ""
+msgstr "Nach Facebook senden deaktiviert"
 
 #: ../../addon/fbpost/fbpost.php:199
 msgid "Facebook Post"
-msgstr "Beitrag auf Facebook"
+msgstr "Facebook Relai"
 
 #: ../../addon/fbpost/fbpost.php:205
 msgid "Install Facebook Post connector for this account."
@@ -7494,7 +7494,7 @@ msgid "Sex Addict"
 msgstr "Sexbesessen"
 
 #: ../../include/profile_selectors.php:42 ../../include/user.php:278
-#: ../../include/user.php:283
+#: ../../include/user.php:282
 msgid "Friends"
 msgstr "Freunde"
 
@@ -7916,7 +7916,7 @@ msgstr "Abmelden"
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:49 ../../boot.php:1659
+#: ../../include/nav.php:49 ../../boot.php:1665
 msgid "Status"
 msgstr "Status"
 
@@ -8528,34 +8528,34 @@ msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das
 msgid "stopped following"
 msgstr "wird nicht mehr gefolgt"
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:1052
+#: ../../include/Contact.php:220 ../../include/conversation.php:1082
 msgid "Poke"
 msgstr "Anstupsen"
 
-#: ../../include/Contact.php:221 ../../include/conversation.php:1046
+#: ../../include/Contact.php:221 ../../include/conversation.php:1076
 msgid "View Status"
 msgstr "Pinnwand anschauen"
 
-#: ../../include/Contact.php:222 ../../include/conversation.php:1047
+#: ../../include/Contact.php:222 ../../include/conversation.php:1077
 msgid "View Profile"
 msgstr "Profil anschauen"
 
-#: ../../include/Contact.php:223 ../../include/conversation.php:1048
+#: ../../include/Contact.php:223 ../../include/conversation.php:1078
 msgid "View Photos"
 msgstr "Bilder anschauen"
 
 #: ../../include/Contact.php:224 ../../include/Contact.php:237
-#: ../../include/conversation.php:1049
+#: ../../include/conversation.php:1079
 msgid "Network Posts"
 msgstr "Netzwerkbeiträge"
 
 #: ../../include/Contact.php:225 ../../include/Contact.php:237
-#: ../../include/conversation.php:1050
+#: ../../include/conversation.php:1080
 msgid "Edit Contact"
 msgstr "Kontakt bearbeiten"
 
 #: ../../include/Contact.php:226 ../../include/Contact.php:237
-#: ../../include/conversation.php:1051
+#: ../../include/conversation.php:1081
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
@@ -8573,106 +8573,106 @@ msgstr "Nachricht/Beitrag"
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert"
 
-#: ../../include/conversation.php:952
+#: ../../include/conversation.php:982
 msgid "Delete Selected Items"
 msgstr "Lösche die markierten Beiträge"
 
-#: ../../include/conversation.php:1110
+#: ../../include/conversation.php:1140
 #, php-format
 msgid "%s likes this."
 msgstr "%s mag das."
 
-#: ../../include/conversation.php:1110
+#: ../../include/conversation.php:1140
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s mag das nicht."
 
-#: ../../include/conversation.php:1114
+#: ../../include/conversation.php:1144
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr "<span  %1$s>%2$d Leute</span> mögen das."
 
-#: ../../include/conversation.php:1116
+#: ../../include/conversation.php:1146
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr "<span  %1$s>%2$d Leute</span> mögen das nicht."
 
-#: ../../include/conversation.php:1122
+#: ../../include/conversation.php:1152
 msgid "and"
 msgstr "und"
 
-#: ../../include/conversation.php:1125
+#: ../../include/conversation.php:1155
 #, php-format
 msgid ", and %d other people"
 msgstr " und %d andere"
 
-#: ../../include/conversation.php:1126
+#: ../../include/conversation.php:1156
 #, php-format
 msgid "%s like this."
 msgstr "%s mögen das."
 
-#: ../../include/conversation.php:1126
+#: ../../include/conversation.php:1156
 #, php-format
 msgid "%s don't like this."
 msgstr "%s mögen das nicht."
 
-#: ../../include/conversation.php:1150 ../../include/conversation.php:1167
+#: ../../include/conversation.php:1180 ../../include/conversation.php:1197
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Für <strong>jedermann</strong> sichtbar"
 
-#: ../../include/conversation.php:1152 ../../include/conversation.php:1169
+#: ../../include/conversation.php:1182 ../../include/conversation.php:1199
 msgid "Please enter a video link/URL:"
 msgstr "Bitte Link/URL zum Video einfügen:"
 
-#: ../../include/conversation.php:1153 ../../include/conversation.php:1170
+#: ../../include/conversation.php:1183 ../../include/conversation.php:1200
 msgid "Please enter an audio link/URL:"
 msgstr "Bitte Link/URL zum Audio einfügen:"
 
-#: ../../include/conversation.php:1154 ../../include/conversation.php:1171
+#: ../../include/conversation.php:1184 ../../include/conversation.php:1201
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: ../../include/conversation.php:1156 ../../include/conversation.php:1173
+#: ../../include/conversation.php:1186 ../../include/conversation.php:1203
 msgid "Where are you right now?"
 msgstr "Wo hältst du dich jetzt gerade auf?"
 
-#: ../../include/conversation.php:1216
+#: ../../include/conversation.php:1246
 msgid "upload photo"
 msgstr "Bild hochladen"
 
-#: ../../include/conversation.php:1218
+#: ../../include/conversation.php:1248
 msgid "attach file"
 msgstr "Datei anhängen"
 
-#: ../../include/conversation.php:1220
+#: ../../include/conversation.php:1250
 msgid "web link"
 msgstr "Weblink"
 
-#: ../../include/conversation.php:1221
+#: ../../include/conversation.php:1251
 msgid "Insert video link"
 msgstr "Video-Adresse einfügen"
 
-#: ../../include/conversation.php:1222
+#: ../../include/conversation.php:1252
 msgid "video link"
 msgstr "Video-Link"
 
-#: ../../include/conversation.php:1223
+#: ../../include/conversation.php:1253
 msgid "Insert audio link"
 msgstr "Audio-Adresse einfügen"
 
-#: ../../include/conversation.php:1224
+#: ../../include/conversation.php:1254
 msgid "audio link"
 msgstr "Audio-Link"
 
-#: ../../include/conversation.php:1226
+#: ../../include/conversation.php:1256
 msgid "set location"
 msgstr "Ort setzen"
 
-#: ../../include/conversation.php:1228
+#: ../../include/conversation.php:1258
 msgid "clear location"
 msgstr "Ort löschen"
 
-#: ../../include/conversation.php:1235
+#: ../../include/conversation.php:1265
 msgid "permissions"
 msgstr "Zugriffsrechte"
 
@@ -8770,18 +8770,18 @@ msgstr "Veranstaltungserinnerungen"
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: ../../boot.php:1662
+#: ../../boot.php:1668
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../boot.php:1669
+#: ../../boot.php:1675
 msgid "Profile Details"
 msgstr "Profildetails"
 
-#: ../../boot.php:1686
+#: ../../boot.php:1692
 msgid "Events and Calendar"
 msgstr "Ereignisse und Kalender"
 
-#: ../../boot.php:1693
+#: ../../boot.php:1699
 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 38e25f5651..330b26ce2b 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -803,8 +803,8 @@ $a->strings["Global directory update URL"] = "URL für Updates beim weltweiten V
 $a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar.";
 $a->strings["Allow threaded items"] = "Erlaube Threads in Diskussionen";
 $a->strings["Allow infinite level threading for items on this site."] = "Erlaube ein unendliches Level für Threads auf dieser Seite.";
-$a->strings["No default permissions for new users"] = "Keine Standard-Zugriffsrechte für Beiträge neuer Nutzer";
-$a->strings["New users will have no private permissions set for their posts by default, making their posts public until they change it."] = "Neue Benutzer werden keine Voreinstellungen für die Zugriffrechte haben, so dass ihre Beiträge öffentlich sind, bis sie es ändern.";
+$a->strings["Private posts by default for new users"] = "Private Beiträge als Standard für neue Nutzer";
+$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen.";
 $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen.";
 $a->strings["OpenID support"] = "OpenID Unterstützung";
@@ -1116,8 +1116,8 @@ $a->strings["Cache Statistics"] = "Cache Statistik";
 $a->strings["Number of items"] = "Anzahl der Einträge";
 $a->strings["Size of the cache"] = "Größe des Caches";
 $a->strings["Delete the whole cache"] = "Cache leeren";
-$a->strings["Facebook Post disabled"] = "";
-$a->strings["Facebook Post"] = "Beitrag auf Facebook";
+$a->strings["Facebook Post disabled"] = "Nach Facebook senden deaktiviert";
+$a->strings["Facebook Post"] = "Facebook Relai";
 $a->strings["Install Facebook Post connector for this account."] = "Facebook-Connector für dieses Konto installieren.";
 $a->strings["Remove Facebook Post connector"] = "Facebook-Connector entfernen";
 $a->strings["Facebook Post Settings"] = "Facebook-Beitragseinstellungen";