rev update

diff --git a/boot.php b/boot.php
index 63e22d00620717281d2a08466c8a0b8aa7e3c69e..d52607503c6d7af5fa255f0d3bf6821600a154a7 100644 (file)
--- 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.1485' );
+define ( 'FRIENDICA_VERSION',      '3.0.1486' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1156      );
 

diff --git a/util/messages.po b/util/messages.po
index 2dafeaf67058aa3826d6780ec2e44077eba5c71c..f770b636fab73eaa00f04f14ca96ee233c1e86fb 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1485\n"
+"Project-Id-Version: 3.0.1486\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-03 10:00-0700\n"
+"POT-Creation-Date: 2012-10-04 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"
@@ -143,12 +143,12 @@ msgstr ""
 #: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90
 #: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76
 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:88
-#: ../../addon/page/page.php:210 ../../addon/planets/planets.php:158
+#: ../../addon/page/page.php:211 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
-#: ../../addon/forumlist/forumlist.php:163
+#: ../../addon/forumlist/forumlist.php:164
 #: ../../addon/impressum/impressum.php:83
 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
 #: ../../addon/qcomment/qcomment.php:61
@@ -175,7 +175,7 @@ msgstr ""
 #: ../../view/theme/cleanzero/config.php:80
 #: ../../view/theme/diabook/theme.php:757
 #: ../../view/theme/diabook/config.php:190
-#: ../../view/theme/quattro/config.php:53 ../../view/theme/dispy/config.php:70
+#: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
 #: ../../object/Item.php:558
 msgid "Submit"
 msgstr ""
@@ -304,7 +304,7 @@ msgstr ""
 msgid "Share this event"
 msgstr ""
 
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:136
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142
 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
 #: ../../include/conversation.php:948
@@ -458,7 +458,7 @@ msgstr ""
 
 #: ../../mod/photos.php:860 ../../mod/community.php:18
 #: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17
-#: ../../mod/display.php:7 ../../mod/search.php:73 ../../mod/directory.php:31
+#: ../../mod/display.php:7 ../../mod/search.php:86 ../../mod/directory.php:31
 msgid "Public access denied."
 msgstr ""
 
@@ -591,7 +591,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: ../../mod/photos.php:1383 ../../mod/editpost.php:112
+#: ../../mod/photos.php:1383 ../../mod/editpost.php:118
 #: ../../mod/content.php:482 ../../mod/content.php:845
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
 #: ../../mod/message.php:481 ../../include/conversation.php:573
@@ -611,7 +611,7 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1403 ../../mod/editpost.php:133
+#: ../../mod/photos.php:1403 ../../mod/editpost.php:139
 #: ../../mod/content.php:702 ../../include/conversation.php:946
 #: ../../object/Item.php:567
 msgid "Preview"
@@ -642,7 +642,7 @@ msgid "Community"
 msgstr ""
 
 #: ../../mod/community.php:63 ../../mod/community.php:88
-#: ../../mod/search.php:148 ../../mod/search.php:174
+#: ../../mod/search.php:161 ../../mod/search.php:187
 msgid "No results."
 msgstr ""
 
@@ -701,57 +701,81 @@ msgstr ""
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:912
+#: ../../mod/editpost.php:105 ../../include/conversation.php:911
+msgid "upload photo"
+msgstr ""
+
+#: ../../mod/editpost.php:106 ../../include/conversation.php:912
 msgid "Attach file"
 msgstr ""
 
-#: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
+#: ../../mod/editpost.php:107 ../../include/conversation.php:913
+msgid "attach file"
+msgstr ""
+
+#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151
 #: ../../mod/message.php:292 ../../mod/message.php:479
 #: ../../include/conversation.php:914
 msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/editpost.php:107
-msgid "Insert YouTube video"
+#: ../../mod/editpost.php:109 ../../include/conversation.php:915
+msgid "web link"
+msgstr ""
+
+#: ../../mod/editpost.php:110 ../../include/conversation.php:916
+msgid "Insert video link"
+msgstr ""
+
+#: ../../mod/editpost.php:111 ../../include/conversation.php:917
+msgid "video link"
 msgstr ""
 
-#: ../../mod/editpost.php:108
-msgid "Insert Vorbis [.ogg] video"
+#: ../../mod/editpost.php:112 ../../include/conversation.php:918
+msgid "Insert audio link"
 msgstr ""
 
-#: ../../mod/editpost.php:109
-msgid "Insert Vorbis [.ogg] audio"
+#: ../../mod/editpost.php:113 ../../include/conversation.php:919
+msgid "audio link"
 msgstr ""
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:920
+#: ../../mod/editpost.php:114 ../../include/conversation.php:920
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:922
+#: ../../mod/editpost.php:115 ../../include/conversation.php:921
+msgid "set location"
+msgstr ""
+
+#: ../../mod/editpost.php:116 ../../include/conversation.php:922
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:929
+#: ../../mod/editpost.php:117 ../../include/conversation.php:923
+msgid "clear location"
+msgstr ""
+
+#: ../../mod/editpost.php:119 ../../include/conversation.php:929
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:121 ../../include/conversation.php:938
+#: ../../mod/editpost.php:127 ../../include/conversation.php:938
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:939
+#: ../../mod/editpost.php:128 ../../include/conversation.php:939
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:125 ../../include/conversation.php:925
+#: ../../mod/editpost.php:131 ../../include/conversation.php:925
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:927
+#: ../../mod/editpost.php:133 ../../include/conversation.php:927
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:941
+#: ../../mod/editpost.php:134 ../../include/conversation.php:941
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -1328,8 +1352,8 @@ msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/content.php:589 ../../addon/page/page.php:76
-#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
+#: ../../mod/content.php:589 ../../addon/page/page.php:77
+#: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
 #: ../../include/contact_widgets.php:195 ../../boot.php:585
 #: ../../object/Item.php:280
 msgid "show more"
@@ -2541,11 +2565,11 @@ msgstr ""
 msgid "Search Results For:"
 msgstr ""
 
-#: ../../mod/network.php:221 ../../mod/search.php:16
+#: ../../mod/network.php:221 ../../mod/search.php:18
 msgid "Remove term"
 msgstr ""
 
-#: ../../mod/network.php:230 ../../mod/search.php:13
+#: ../../mod/network.php:230 ../../mod/search.php:27
 msgid "Saved Searches"
 msgstr ""
 
@@ -4083,7 +4107,7 @@ msgstr ""
 msgid "No installed applications."
 msgstr ""
 
-#: ../../mod/search.php:85 ../../include/text.php:678
+#: ../../mod/search.php:98 ../../include/text.php:678
 #: ../../include/text.php:679 ../../include/nav.php:91
 msgid "Search"
 msgstr ""
@@ -5259,32 +5283,32 @@ msgstr ""
 msgid "%s - Click to open/close"
 msgstr ""
 
-#: ../../addon/page/page.php:61 ../../addon/page/page.php:91
-#: ../../addon/forumlist/forumlist.php:55
+#: ../../addon/page/page.php:62 ../../addon/page/page.php:92
+#: ../../addon/forumlist/forumlist.php:56
 msgid "Forums"
 msgstr ""
 
-#: ../../addon/page/page.php:129 ../../addon/forumlist/forumlist.php:89
+#: ../../addon/page/page.php:130 ../../addon/forumlist/forumlist.php:90
 msgid "Forums:"
 msgstr ""
 
-#: ../../addon/page/page.php:165
+#: ../../addon/page/page.php:166
 msgid "Page settings updated."
 msgstr ""
 
-#: ../../addon/page/page.php:194
+#: ../../addon/page/page.php:195
 msgid "Page Settings"
 msgstr ""
 
-#: ../../addon/page/page.php:196
+#: ../../addon/page/page.php:197
 msgid "How many forums to display on sidebar without paging"
 msgstr ""
 
-#: ../../addon/page/page.php:199
+#: ../../addon/page/page.php:200
 msgid "Randomise Page/Forum list"
 msgstr ""
 
-#: ../../addon/page/page.php:202
+#: ../../addon/page/page.php:203
 msgid "Show pages/forums on profile page"
 msgstr ""
 
@@ -6109,27 +6133,27 @@ msgstr ""
 msgid "URL to embed:"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:58
+#: ../../addon/forumlist/forumlist.php:59
 msgid "show/hide"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:72
+#: ../../addon/forumlist/forumlist.php:73
 msgid "No forum subscriptions"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:125
+#: ../../addon/forumlist/forumlist.php:126
 msgid "Forumlist settings updated."
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:150
+#: ../../addon/forumlist/forumlist.php:151
 msgid "Forumlist Settings"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:152
+#: ../../addon/forumlist/forumlist.php:153
 msgid "Randomise forum list"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:155
+#: ../../addon/forumlist/forumlist.php:156
 msgid "Show forums on profile page"
 msgstr ""
 
@@ -7005,7 +7029,7 @@ msgstr ""
 
 #: ../../view/theme/cleanzero/config.php:82
 #: ../../view/theme/diabook/config.php:192
-#: ../../view/theme/quattro/config.php:55 ../../view/theme/dispy/config.php:72
+#: ../../view/theme/quattro/config.php:66 ../../view/theme/dispy/config.php:72
 msgid "Theme settings"
 msgstr ""
 
@@ -7024,7 +7048,7 @@ msgid "Set theme width"
 msgstr ""
 
 #: ../../view/theme/cleanzero/config.php:86
-#: ../../view/theme/quattro/config.php:57
+#: ../../view/theme/quattro/config.php:68
 msgid "Color scheme"
 msgstr ""
 
@@ -7199,18 +7223,26 @@ msgstr ""
 msgid "Last tweets"
 msgstr ""
 
-#: ../../view/theme/quattro/config.php:56
+#: ../../view/theme/quattro/config.php:67
 msgid "Alignment"
 msgstr ""
 
-#: ../../view/theme/quattro/config.php:56
+#: ../../view/theme/quattro/config.php:67
 msgid "Left"
 msgstr ""
 
-#: ../../view/theme/quattro/config.php:56
+#: ../../view/theme/quattro/config.php:67
 msgid "Center"
 msgstr ""
 
+#: ../../view/theme/quattro/config.php:69
+msgid "Posts font size"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:70
+msgid "Textareas font size"
+msgstr ""
+
 #: ../../view/theme/dispy/config.php:75
 msgid "Set colour scheme"
 msgstr ""
@@ -8622,42 +8654,6 @@ msgstr ""
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:911
-msgid "upload photo"
-msgstr ""
-
-#: ../../include/conversation.php:913
-msgid "attach file"
-msgstr ""
-
-#: ../../include/conversation.php:915
-msgid "web link"
-msgstr ""
-
-#: ../../include/conversation.php:916
-msgid "Insert video link"
-msgstr ""
-
-#: ../../include/conversation.php:917
-msgid "video link"
-msgstr ""
-
-#: ../../include/conversation.php:918
-msgid "Insert audio link"
-msgstr ""
-
-#: ../../include/conversation.php:919
-msgid "audio link"
-msgstr ""
-
-#: ../../include/conversation.php:921
-msgid "set location"
-msgstr ""
-
-#: ../../include/conversation.php:923
-msgid "clear location"
-msgstr ""
-
 #: ../../include/conversation.php:930
 msgid "permissions"
 msgstr ""