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

diff --git a/boot.php b/boot.php
index 023c5807c8a4bb40474198711b25d4746b0dee6c..563067ad633b0691db57f0f16abe22455a28df81 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1559' );
+define ( 'FRIENDICA_VERSION',      '3.1.1561' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1157      );
 

diff --git a/util/messages.po b/util/messages.po
index b66db3e5555f4fe412f511a18ca711137abc324d..0d244a01eb0a939b0a531d5980c500c1ffc21331 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1559\n"
+"Project-Id-Version: 3.1.1561\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-16 10:00-0800\n"
+"POT-Creation-Date: 2012-12-18 10:00-0800\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"
@@ -440,7 +440,7 @@ msgstr ""
 #: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
 #: ../../mod/photos.php:1092 ../../mod/photos.php:1107
 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574
-#: ../../addon/communityhome/communityhome.php:110
+#: ../../addon/communityhome/communityhome.php:111
 #: ../../view/theme/diabook/theme.php:492
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
@@ -463,7 +463,7 @@ msgstr ""
 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
-#: ../../addon/communityhome/communityhome.php:111
+#: ../../addon/communityhome/communityhome.php:112
 #: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324
 #: ../../include/user.php:331 ../../include/user.php:338
 #: ../../addon.old/communityhome/communityhome.php:111
@@ -1555,7 +1555,7 @@ msgstr ""
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179
+#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:180
 #: ../../addon.old/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
@@ -3243,7 +3243,7 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
-#: ../../addon/communityhome/communityhome.php:163
+#: ../../addon/communityhome/communityhome.php:164
 #: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1442
 #: ../../include/diaspora.php:1848 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
@@ -3253,8 +3253,8 @@ msgstr ""
 
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87
 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
-#: ../../addon/communityhome/communityhome.php:158
-#: ../../addon/communityhome/communityhome.php:167
+#: ../../addon/communityhome/communityhome.php:159
+#: ../../addon/communityhome/communityhome.php:168
 #: ../../view/theme/diabook/theme.php:459
 #: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1848
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
@@ -3266,7 +3266,7 @@ msgid "status"
 msgstr ""
 
 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
-#: ../../addon/communityhome/communityhome.php:172
+#: ../../addon/communityhome/communityhome.php:173
 #: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1864
 #: ../../include/conversation.php:136
 #: ../../addon.old/facebook/facebook.php:1602
@@ -5666,12 +5666,12 @@ msgstr ""
 msgid "Latest photos"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:133
+#: ../../addon/communityhome/communityhome.php:134
 #: ../../addon.old/communityhome/communityhome.php:133
 msgid "Latest likes"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:155
+#: ../../addon/communityhome/communityhome.php:156
 #: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1440
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 #: ../../addon.old/communityhome/communityhome.php:155
@@ -8523,11 +8523,11 @@ msgstr ""
 msgid "view full size"
 msgstr ""
 
-#: ../../include/oembed.php:137
+#: ../../include/oembed.php:138
 msgid "Embedded content"
 msgstr ""
 
-#: ../../include/oembed.php:146
+#: ../../include/oembed.php:147
 msgid "Embedding disabled"
 msgstr ""