From 962c357ebdd2158760180be46df55dd178f3778c Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 12 Aug 2012 15:54:38 -0700 Subject: [PATCH] common_friends_visitor_widget warning --- boot.php | 2 +- mod/profile.php | 5 +- util/messages.po | 228 ++++++++++++++++++++++++----------------------- 3 files changed, 120 insertions(+), 115 deletions(-) diff --git a/boot.php b/boot.php index d11a0ce612..8105451c1d 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.1432' ); +define ( 'FRIENDICA_VERSION', '3.0.1433' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1154 ); diff --git a/mod/profile.php b/mod/profile.php index a3e25b76a1..f02cc1bd83 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -1,8 +1,9 @@ page,'aside')) $a->page['aside'] = ''; diff --git a/util/messages.po b/util/messages.po index a0bae5b0a6..ad53cf51a1 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1432\n" +"Project-Id-Version: 3.0.1433\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-11 10:00-0700\n" +"POT-Creation-Date: 2012-08-12 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -232,7 +232,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131 -#: ../../include/nav.php:52 ../../boot.php:1646 +#: ../../include/nav.php:52 ../../boot.php:1647 msgid "Events" msgstr "" @@ -288,7 +288,7 @@ msgstr "" #: ../../mod/events.php:432 ../../mod/directory.php:132 #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../boot.php:1198 +#: ../../boot.php:1199 msgid "Location:" msgstr "" @@ -370,7 +370,7 @@ msgstr "" msgid "No" msgstr "" -#: ../../mod/photos.php:46 ../../boot.php:1639 +#: ../../mod/photos.php:46 ../../boot.php:1640 msgid "Photo Albums" msgstr "" @@ -574,15 +574,15 @@ msgstr "" msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1305 ../../include/conversation.php:1138 +#: ../../mod/photos.php:1305 ../../include/conversation.php:1139 msgid "Share" msgstr "" #: ../../mod/photos.php:1306 ../../mod/editpost.php:112 #: ../../mod/content.php:482 ../../mod/content.php:843 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:479 ../../include/conversation.php:603 -#: ../../include/conversation.php:834 ../../include/conversation.php:1157 +#: ../../mod/message.php:479 ../../include/conversation.php:604 +#: ../../include/conversation.php:835 ../../include/conversation.php:1158 msgid "Please wait" msgstr "" @@ -594,20 +594,20 @@ msgstr "" #: ../../mod/photos.php:1324 ../../mod/photos.php:1365 #: ../../mod/photos.php:1397 ../../mod/content.php:690 -#: ../../include/conversation.php:537 ../../boot.php:581 +#: ../../include/conversation.php:537 ../../boot.php:582 msgid "Comment" msgstr "" #: ../../mod/photos.php:1326 ../../mod/editpost.php:133 #: ../../mod/content.php:700 ../../include/conversation.php:547 -#: ../../include/conversation.php:1175 +#: ../../include/conversation.php:1176 msgid "Preview" msgstr "" #: ../../mod/photos.php:1426 ../../mod/content.php:439 #: ../../mod/content.php:721 ../../mod/settings.php:600 #: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:671 -#: ../../include/conversation.php:395 ../../include/conversation.php:791 +#: ../../include/conversation.php:395 ../../include/conversation.php:792 msgid "Delete" msgstr "" @@ -673,7 +673,7 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:88 ../../include/conversation.php:1124 +#: ../../mod/editpost.php:88 ../../include/conversation.php:1125 msgid "Post to Email" msgstr "" @@ -684,17 +684,17 @@ msgstr "" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:476 -#: ../../include/conversation.php:1139 +#: ../../include/conversation.php:1140 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:1141 +#: ../../mod/editpost.php:105 ../../include/conversation.php:1142 msgid "Attach file" msgstr "" #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:477 -#: ../../include/conversation.php:1143 +#: ../../include/conversation.php:1144 msgid "Insert web link" msgstr "" @@ -710,35 +710,35 @@ msgstr "" msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:1149 +#: ../../mod/editpost.php:110 ../../include/conversation.php:1150 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:1151 +#: ../../mod/editpost.php:111 ../../include/conversation.php:1152 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:1158 +#: ../../mod/editpost.php:113 ../../include/conversation.php:1159 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:121 ../../include/conversation.php:1167 +#: ../../mod/editpost.php:121 ../../include/conversation.php:1168 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:122 ../../include/conversation.php:1168 +#: ../../mod/editpost.php:122 ../../include/conversation.php:1169 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:125 ../../include/conversation.php:1154 +#: ../../mod/editpost.php:125 ../../include/conversation.php:1155 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:127 ../../include/conversation.php:1156 +#: ../../mod/editpost.php:127 ../../include/conversation.php:1157 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:128 ../../include/conversation.php:1170 +#: ../../mod/editpost.php:128 ../../include/conversation.php:1171 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -1251,7 +1251,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1142 +#: ../../include/contact_widgets.php:9 ../../boot.php:1143 msgid "Connect" msgstr "" @@ -1280,28 +1280,28 @@ msgid "Group: " msgstr "" #: ../../mod/content.php:438 ../../mod/content.php:720 -#: ../../include/conversation.php:394 ../../include/conversation.php:790 +#: ../../include/conversation.php:394 ../../include/conversation.php:791 msgid "Select" msgstr "" #: ../../mod/content.php:455 ../../mod/content.php:813 -#: ../../mod/content.php:814 ../../include/conversation.php:573 -#: ../../include/conversation.php:574 ../../include/conversation.php:807 +#: ../../mod/content.php:814 ../../include/conversation.php:574 +#: ../../include/conversation.php:575 ../../include/conversation.php:808 #, php-format msgid "View %s's profile @ %s" msgstr "" #: ../../mod/content.php:465 ../../mod/content.php:825 -#: ../../include/conversation.php:585 ../../include/conversation.php:817 +#: ../../include/conversation.php:586 ../../include/conversation.php:818 #, php-format msgid "%s from %s" msgstr "" -#: ../../mod/content.php:480 ../../include/conversation.php:832 +#: ../../mod/content.php:480 ../../include/conversation.php:833 msgid "View in context" msgstr "" -#: ../../mod/content.php:586 ../../include/conversation.php:612 +#: ../../mod/content.php:586 ../../include/conversation.php:613 #, php-format msgid "%d comment" msgid_plural "%d comments" @@ -1310,8 +1310,8 @@ 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:188 ../../include/conversation.php:613 -#: ../../boot.php:582 +#: ../../include/contact_widgets.php:188 ../../include/conversation.php:614 +#: ../../boot.php:583 msgid "show more" msgstr "" @@ -1387,15 +1387,15 @@ msgstr "" msgid "save to folder" msgstr "" -#: ../../mod/content.php:815 ../../include/conversation.php:575 +#: ../../mod/content.php:815 ../../include/conversation.php:576 msgid "to" msgstr "" -#: ../../mod/content.php:816 ../../include/conversation.php:576 +#: ../../mod/content.php:816 ../../include/conversation.php:577 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/content.php:817 ../../include/conversation.php:577 +#: ../../mod/content.php:817 ../../include/conversation.php:578 msgid "via Wall-To-Wall:" msgstr "" @@ -1914,7 +1914,7 @@ msgstr "" #: ../../addon/facebook/facebook.php:1200 #: ../../addon/public_server/public_server.php:62 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3215 -#: ../../boot.php:791 +#: ../../boot.php:792 msgid "Administrator" msgstr "" @@ -1924,7 +1924,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:924 +#: ../../mod/lostpass.php:83 ../../boot.php:925 msgid "Password Reset" msgstr "" @@ -2592,7 +2592,7 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1653 +#: ../../mod/notes.php:44 ../../boot.php:1654 msgid "Personal Notes" msgstr "" @@ -2635,7 +2635,7 @@ msgstr "" #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:1075 ../../include/conversation.php:1092 +#: ../../include/conversation.php:1076 ../../include/conversation.php:1093 msgid "Please enter a link URL:" msgstr "" @@ -2845,7 +2845,7 @@ msgstr "" #: ../../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:1629 +#: ../../include/nav.php:50 ../../boot.php:1630 msgid "Profile" msgstr "" @@ -2949,7 +2949,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:890 +#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:891 msgid "Register" msgstr "" @@ -2992,7 +2992,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 -#: ../../include/nav.php:51 ../../boot.php:1636 +#: ../../include/nav.php:51 ../../boot.php:1637 msgid "Photos" msgstr "" @@ -3811,7 +3811,7 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:1055 +#: ../../mod/profile.php:21 ../../boot.php:1056 msgid "Requested profile is not available." msgstr "" @@ -4206,28 +4206,28 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:673 ../../boot.php:1164 +#: ../../mod/profiles.php:673 ../../boot.php:1165 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:674 ../../boot.php:1165 +#: ../../mod/profiles.php:674 ../../boot.php:1166 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:685 ../../boot.php:1175 +#: ../../mod/profiles.php:685 ../../boot.php:1176 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:687 ../../boot.php:1178 +#: ../../mod/profiles.php:687 ../../boot.php:1179 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:688 ../../boot.php:1179 +#: ../../mod/profiles.php:688 ../../boot.php:1180 msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:1079 -#: ../../include/conversation.php:1096 +#: ../../mod/filer.php:29 ../../include/conversation.php:1080 +#: ../../include/conversation.php:1097 msgid "Save to Folder:" msgstr "" @@ -4351,17 +4351,17 @@ msgid "Gender: " msgstr "" #: ../../mod/directory.php:134 ../../include/profile_advanced.php:17 -#: ../../boot.php:1200 +#: ../../boot.php:1201 msgid "Gender:" msgstr "" #: ../../mod/directory.php:136 ../../include/profile_advanced.php:37 -#: ../../boot.php:1203 +#: ../../boot.php:1204 msgid "Status:" msgstr "" #: ../../mod/directory.php:138 ../../include/profile_advanced.php:48 -#: ../../boot.php:1205 +#: ../../boot.php:1206 msgid "Homepage:" msgstr "" @@ -5119,7 +5119,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:911 +#: ../../include/nav.php:64 ../../boot.php:912 msgid "Login" msgstr "" @@ -7555,7 +7555,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:910 +#: ../../include/nav.php:46 ../../boot.php:911 msgid "Logout" msgstr "" @@ -7563,7 +7563,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1622 +#: ../../include/nav.php:49 ../../boot.php:1623 msgid "Status" msgstr "" @@ -7643,11 +7643,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1158 +#: ../../include/nav.php:138 ../../boot.php:1159 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1158 +#: ../../include/nav.php:138 ../../boot.php:1159 msgid "Manage/edit profiles" msgstr "" @@ -7815,6 +7815,10 @@ msgstr "" msgid "$1 wrote:" msgstr "" +#: ../../include/bbcode.php:327 +msgid "Encrypted content" +msgstr "" + #: ../../include/dba.php:41 #, php-format msgid "Cannot locate DNS info for database server '%s'" @@ -8170,34 +8174,34 @@ msgstr "" msgid "stopped following" msgstr "" -#: ../../include/Contact.php:220 ../../include/conversation.php:976 +#: ../../include/Contact.php:220 ../../include/conversation.php:977 msgid "Poke" msgstr "" -#: ../../include/Contact.php:221 ../../include/conversation.php:970 +#: ../../include/Contact.php:221 ../../include/conversation.php:971 msgid "View Status" msgstr "" -#: ../../include/Contact.php:222 ../../include/conversation.php:971 +#: ../../include/Contact.php:222 ../../include/conversation.php:972 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:223 ../../include/conversation.php:972 +#: ../../include/Contact.php:223 ../../include/conversation.php:973 msgid "View Photos" msgstr "" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:973 +#: ../../include/conversation.php:974 msgid "Network Posts" msgstr "" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:974 +#: ../../include/conversation.php:975 msgid "Edit Contact" msgstr "" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:975 +#: ../../include/conversation.php:976 msgid "Send PM" msgstr "" @@ -8215,106 +8219,106 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:876 +#: ../../include/conversation.php:877 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:1034 +#: ../../include/conversation.php:1035 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1034 +#: ../../include/conversation.php:1035 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1038 +#: ../../include/conversation.php:1039 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:1040 +#: ../../include/conversation.php:1041 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:1046 +#: ../../include/conversation.php:1047 msgid "and" msgstr "" -#: ../../include/conversation.php:1049 +#: ../../include/conversation.php:1050 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:1050 +#: ../../include/conversation.php:1051 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1050 +#: ../../include/conversation.php:1051 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1074 ../../include/conversation.php:1091 +#: ../../include/conversation.php:1075 ../../include/conversation.php:1092 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1076 ../../include/conversation.php:1093 +#: ../../include/conversation.php:1077 ../../include/conversation.php:1094 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1077 ../../include/conversation.php:1094 +#: ../../include/conversation.php:1078 ../../include/conversation.php:1095 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1078 ../../include/conversation.php:1095 +#: ../../include/conversation.php:1079 ../../include/conversation.php:1096 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1080 ../../include/conversation.php:1097 +#: ../../include/conversation.php:1081 ../../include/conversation.php:1098 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1140 +#: ../../include/conversation.php:1141 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1142 +#: ../../include/conversation.php:1143 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1144 +#: ../../include/conversation.php:1145 msgid "web link" msgstr "" -#: ../../include/conversation.php:1145 +#: ../../include/conversation.php:1146 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1146 +#: ../../include/conversation.php:1147 msgid "video link" msgstr "" -#: ../../include/conversation.php:1147 +#: ../../include/conversation.php:1148 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1148 +#: ../../include/conversation.php:1149 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1150 +#: ../../include/conversation.php:1151 msgid "set location" msgstr "" -#: ../../include/conversation.php:1152 +#: ../../include/conversation.php:1153 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1159 +#: ../../include/conversation.php:1160 msgid "permissions" msgstr "" @@ -8330,96 +8334,96 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../boot.php:580 +#: ../../boot.php:581 msgid "Delete this item?" msgstr "" -#: ../../boot.php:583 +#: ../../boot.php:584 msgid "show fewer" msgstr "" -#: ../../boot.php:786 +#: ../../boot.php:787 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:788 +#: ../../boot.php:789 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:889 +#: ../../boot.php:890 msgid "Create a New Account" msgstr "" -#: ../../boot.php:913 +#: ../../boot.php:914 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:914 +#: ../../boot.php:915 msgid "Password: " msgstr "" -#: ../../boot.php:917 +#: ../../boot.php:918 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:923 +#: ../../boot.php:924 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1090 +#: ../../boot.php:1091 msgid "Edit profile" msgstr "" -#: ../../boot.php:1150 +#: ../../boot.php:1151 msgid "Message" msgstr "" -#: ../../boot.php:1272 ../../boot.php:1358 +#: ../../boot.php:1273 ../../boot.php:1359 msgid "g A l F d" msgstr "" -#: ../../boot.php:1273 ../../boot.php:1359 +#: ../../boot.php:1274 ../../boot.php:1360 msgid "F d" msgstr "" -#: ../../boot.php:1318 ../../boot.php:1399 +#: ../../boot.php:1319 ../../boot.php:1400 msgid "[today]" msgstr "" -#: ../../boot.php:1330 +#: ../../boot.php:1331 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1331 +#: ../../boot.php:1332 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1392 +#: ../../boot.php:1393 msgid "[No description]" msgstr "" -#: ../../boot.php:1410 +#: ../../boot.php:1411 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1411 +#: ../../boot.php:1412 msgid "Events this week:" msgstr "" -#: ../../boot.php:1625 +#: ../../boot.php:1626 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1632 +#: ../../boot.php:1633 msgid "Profile Details" msgstr "" -#: ../../boot.php:1649 +#: ../../boot.php:1650 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1656 +#: ../../boot.php:1657 msgid "Only You Can See This" msgstr "" -- 2.39.5