Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update

* master:

2 files changed, 67 insertions, 67 deletions

diff --git a/boot.php b/boot.php
index 03a685514..f4247483f 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1340' );
+define ( 'FRIENDICA_VERSION',      '3.0.1341' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1143      );
 
diff --git a/util/messages.po b/util/messages.po
index 5b58e674e..d5acf5568 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1340\n"
+"Project-Id-Version: 3.0.1341\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-12 10:00-0700\n"
+"POT-Creation-Date: 2012-05-13 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"
@@ -158,7 +158,7 @@ msgstr ""
 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
 #: ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:757
+#: ../../view/theme/diabook/theme.php:753
 #: ../../view/theme/diabook/config.php:190
 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
 #: ../../include/conversation.php:558
@@ -219,7 +219,7 @@ msgstr ""
 msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:127
+#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:126
 #: ../../include/nav.php:52 ../../boot.php:1503
 msgid "Events"
 msgstr ""
@@ -352,7 +352,7 @@ msgstr ""
 #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879
 #: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382
 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:598
+#: ../../view/theme/diabook/theme.php:594
 msgid "Contact Photos"
 msgstr ""
 
@@ -375,7 +375,7 @@ msgstr ""
 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:599
+#: ../../view/theme/diabook/theme.php:595
 msgid "Profile Photos"
 msgstr ""
 
@@ -397,7 +397,7 @@ msgstr ""
 
 #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1305
+#: ../../view/theme/diabook/theme.php:566 ../../include/text.php:1305
 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53
 #: ../../include/conversation.php:126
 msgid "photo"
@@ -572,7 +572,7 @@ msgstr ""
 msgid "Not available."
 msgstr ""
 
-#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:129
+#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:128
 #: ../../include/nav.php:101
 msgid "Community"
 msgstr ""
@@ -1214,7 +1214,7 @@ msgstr ""
 msgid "Personal"
 msgstr ""
 
-#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:123
+#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:122
 #: ../../include/nav.php:77 ../../include/nav.php:115
 msgid "Home"
 msgstr ""
@@ -1655,7 +1655,7 @@ msgstr ""
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:125
+#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:124
 #: ../../include/nav.php:139
 msgid "Contacts"
 msgstr ""
@@ -1775,8 +1775,8 @@ msgid "Remove account"
 msgstr ""
 
 #: ../../mod/settings.php:88 ../../mod/admin.php:735 ../../mod/admin.php:940
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643
-#: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:639
+#: ../../view/theme/diabook/theme.php:769 ../../include/nav.php:137
 msgid "Settings"
 msgstr ""
 
@@ -2601,7 +2601,7 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:124
+#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:123
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
 #: ../../include/nav.php:50 ../../boot.php:1488
 msgid "Profile"
@@ -2787,8 +2787,8 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:1564
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:565
-#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1654
+#: ../../view/theme/diabook/theme.php:561
+#: ../../view/theme/diabook/theme.php:570 ../../include/diaspora.php:1654
 #: ../../include/conversation.php:48 ../../include/conversation.php:57
 #: ../../include/conversation.php:121 ../../include/conversation.php:130
 msgid "status"
@@ -2796,7 +2796,7 @@ msgstr ""
 
 #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1568
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1670
+#: ../../view/theme/diabook/theme.php:575 ../../include/diaspora.php:1670
 #: ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
@@ -2817,7 +2817,7 @@ msgstr ""
 msgid "Access denied."
 msgstr ""
 
-#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:126
+#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:125
 #: ../../include/nav.php:51 ../../boot.php:1494
 msgid "Photos"
 msgstr ""
@@ -4073,7 +4073,7 @@ msgstr ""
 msgid "No entries."
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:622
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr ""
@@ -4088,7 +4088,7 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:624
+#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:620
 msgid "Global Directory"
 msgstr ""
 
@@ -4673,7 +4673,7 @@ msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1303
+#: ../../view/theme/diabook/theme.php:558 ../../include/text.php:1303
 #: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr ""
@@ -5601,153 +5601,153 @@ msgstr ""
 msgid "Color scheme"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:123 ../../include/nav.php:49
+#: ../../view/theme/diabook/theme.php:122 ../../include/nav.php:49
 #: ../../include/nav.php:115
 msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:124 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:123 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:125
+#: ../../view/theme/diabook/theme.php:124
 msgid "Your contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:126 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:125 ../../include/nav.php:51
 msgid "Your photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:126 ../../include/nav.php:52
 msgid "Your events"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:130
-#: ../../view/theme/diabook/theme.php:643
-#: ../../view/theme/diabook/theme.php:747
+#: ../../view/theme/diabook/theme.php:129
+#: ../../view/theme/diabook/theme.php:639
+#: ../../view/theme/diabook/theme.php:743
 #: ../../view/theme/diabook/config.php:201
 msgid "Community Pages"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:490
-#: ../../view/theme/diabook/theme.php:749
+#: ../../view/theme/diabook/theme.php:486
+#: ../../view/theme/diabook/theme.php:745
 #: ../../view/theme/diabook/config.php:203
 msgid "Community Profiles"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:511
-#: ../../view/theme/diabook/theme.php:754
+#: ../../view/theme/diabook/theme.php:507
+#: ../../view/theme/diabook/theme.php:750
 #: ../../view/theme/diabook/config.php:208
 msgid "Last users"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:540
-#: ../../view/theme/diabook/theme.php:756
+#: ../../view/theme/diabook/theme.php:536
+#: ../../view/theme/diabook/theme.php:752
 #: ../../view/theme/diabook/config.php:210
 msgid "Last likes"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:585
-#: ../../view/theme/diabook/theme.php:755
+#: ../../view/theme/diabook/theme.php:581
+#: ../../view/theme/diabook/theme.php:751
 #: ../../view/theme/diabook/config.php:209
 msgid "Last photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:622
-#: ../../view/theme/diabook/theme.php:752
+#: ../../view/theme/diabook/theme.php:618
+#: ../../view/theme/diabook/theme.php:748
 #: ../../view/theme/diabook/config.php:206
 msgid "Find Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:623
+#: ../../view/theme/diabook/theme.php:619
 msgid "Local Directory"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:625 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:621 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:627 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:623 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:678
-#: ../../view/theme/diabook/theme.php:748
+#: ../../view/theme/diabook/theme.php:674
+#: ../../view/theme/diabook/theme.php:744
 #: ../../view/theme/diabook/config.php:202
 msgid "Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:683
+#: ../../view/theme/diabook/theme.php:679
 msgid "Set zoomfactor for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:684
+#: ../../view/theme/diabook/theme.php:680
 #: ../../view/theme/diabook/config.php:199
 msgid "Set longitude (X) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:685
+#: ../../view/theme/diabook/theme.php:681
 #: ../../view/theme/diabook/config.php:200
 msgid "Set latitude (Y) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:698
-#: ../../view/theme/diabook/theme.php:750
+#: ../../view/theme/diabook/theme.php:694
+#: ../../view/theme/diabook/theme.php:746
 #: ../../view/theme/diabook/config.php:204
 msgid "Help or @NewHere ?"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:705
-#: ../../view/theme/diabook/theme.php:751
+#: ../../view/theme/diabook/theme.php:701
+#: ../../view/theme/diabook/theme.php:747
 #: ../../view/theme/diabook/config.php:205
 msgid "Connect Services"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:712
-#: ../../view/theme/diabook/theme.php:753
+#: ../../view/theme/diabook/theme.php:708
+#: ../../view/theme/diabook/theme.php:749
 msgid "Last Tweets"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:715
+#: ../../view/theme/diabook/theme.php:711
 #: ../../view/theme/diabook/config.php:197
 msgid "Set twitter search term"
 msgstr ""
 
+#: ../../view/theme/diabook/theme.php:731
+#: ../../view/theme/diabook/theme.php:732
+#: ../../view/theme/diabook/theme.php:733
+#: ../../view/theme/diabook/theme.php:734
 #: ../../view/theme/diabook/theme.php:735
 #: ../../view/theme/diabook/theme.php:736
 #: ../../view/theme/diabook/theme.php:737
 #: ../../view/theme/diabook/theme.php:738
 #: ../../view/theme/diabook/theme.php:739
-#: ../../view/theme/diabook/theme.php:740
-#: ../../view/theme/diabook/theme.php:741
-#: ../../view/theme/diabook/theme.php:742
-#: ../../view/theme/diabook/theme.php:743
-#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:288
+#: ../../view/theme/diabook/theme.php:740 ../../include/acl_selectors.php:288
 msgid "don't show"
 msgstr ""
 
+#: ../../view/theme/diabook/theme.php:731
+#: ../../view/theme/diabook/theme.php:732
+#: ../../view/theme/diabook/theme.php:733
+#: ../../view/theme/diabook/theme.php:734
 #: ../../view/theme/diabook/theme.php:735
 #: ../../view/theme/diabook/theme.php:736
 #: ../../view/theme/diabook/theme.php:737
 #: ../../view/theme/diabook/theme.php:738
 #: ../../view/theme/diabook/theme.php:739
-#: ../../view/theme/diabook/theme.php:740
-#: ../../view/theme/diabook/theme.php:741
-#: ../../view/theme/diabook/theme.php:742
-#: ../../view/theme/diabook/theme.php:743
-#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:287
+#: ../../view/theme/diabook/theme.php:740 ../../include/acl_selectors.php:287
 msgid "show"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:745
+#: ../../view/theme/diabook/theme.php:741
 msgid "Show/hide boxes at right-hand column:"
 msgstr ""