From bb51be4ea853eef19b0a6c44a3bf6773ccb65ac2 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 25 Nov 2012 19:21:08 -0800 Subject: [PATCH 1/2] rev update --- boot.php | 2 +- util/messages.po | 1194 ++++++++++++++++++++++++++-------------------- 2 files changed, 681 insertions(+), 515 deletions(-) diff --git a/boot.php b/boot.php index b83fe32a1..8c3cf7b27 100644 --- 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.0.1535' ); +define ( 'FRIENDICA_VERSION', '3.0.1538' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); diff --git a/util/messages.po b/util/messages.po index 9f2d08243..6e5e6a3e2 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1535\n" +"Project-Id-Version: 3.0.1538\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-22 10:00-0800\n" +"POT-Creation-Date: 2012-11-25 10:00-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -39,9 +39,9 @@ msgstr "" #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135 -#: ../../mod/notifications.php:66 ../../mod/contacts.php:146 -#: ../../mod/settings.php:86 ../../mod/settings.php:525 -#: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6 +#: ../../mod/notifications.php:66 ../../mod/contacts.php:147 +#: ../../mod/settings.php:91 ../../mod/settings.php:541 +#: ../../mod/settings.php:546 ../../mod/manage.php:90 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 @@ -50,7 +50,7 @@ msgstr "" #: ../../mod/item.php:155 ../../mod/mood.php:114 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193 -#: ../../mod/message.php:38 ../../mod/message.php:168 +#: ../../mod/message.php:38 ../../mod/message.php:172 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 #: ../../mod/wall_upload.php:66 ../../mod/follow.php:9 #: ../../mod/display.php:165 ../../mod/profiles.php:7 @@ -92,8 +92,8 @@ msgstr "" msgid "Return to contact editor" msgstr "" -#: ../../mod/crepair.php:148 ../../mod/settings.php:545 -#: ../../mod/settings.php:571 ../../mod/admin.php:692 ../../mod/admin.php:702 +#: ../../mod/crepair.php:148 ../../mod/settings.php:561 +#: ../../mod/settings.php:587 ../../mod/admin.php:692 ../../mod/admin.php:702 msgid "Name" msgstr "" @@ -135,14 +135,14 @@ msgstr "" #: ../../mod/photos.php:1407 ../../mod/photos.php:1451 #: ../../mod/photos.php:1523 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 -#: ../../mod/content.php:693 ../../mod/contacts.php:351 -#: ../../mod/settings.php:543 ../../mod/settings.php:697 -#: ../../mod/settings.php:769 ../../mod/settings.php:976 -#: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294 -#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:689 -#: ../../mod/admin.php:826 ../../mod/admin.php:1025 ../../mod/admin.php:1112 -#: ../../mod/profiles.php:594 ../../mod/invite.php:119 -#: ../../addon/fromgplus/fromgplus.php:40 +#: ../../mod/content.php:693 ../../mod/contacts.php:352 +#: ../../mod/settings.php:559 ../../mod/settings.php:669 +#: ../../mod/settings.php:738 ../../mod/settings.php:810 +#: ../../mod/settings.php:1017 ../../mod/group.php:85 ../../mod/mood.php:137 +#: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:443 +#: ../../mod/admin.php:689 ../../mod/admin.php:826 ../../mod/admin.php:1025 +#: ../../mod/admin.php:1112 ../../mod/profiles.php:597 +#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 #: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76 @@ -182,7 +182,7 @@ msgstr "" #: ../../view/theme/diabook/theme.php:645 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 -#: ../../object/Item.php:564 ../../addon.old/fromgplus/fromgplus.php:40 +#: ../../object/Item.php:570 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../addon.old/facebook/facebook.php:619 #: ../../addon.old/snautofollow/snautofollow.php:64 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226 @@ -287,7 +287,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 -#: ../../include/nav.php:52 ../../boot.php:1746 +#: ../../include/nav.php:52 ../../boot.php:1748 msgid "Events" msgstr "" @@ -345,7 +345,7 @@ msgstr "" #: ../../mod/events.php:448 ../../mod/directory.php:134 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412 -#: ../../boot.php:1276 +#: ../../boot.php:1278 msgid "Location:" msgstr "" @@ -357,10 +357,10 @@ msgstr "" msgid "Share this event" msgstr "" -#: ../../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:1005 +#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145 +#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:560 +#: ../../mod/settings.php:586 ../../addon/js_upload/js_upload.php:45 +#: ../../include/conversation.php:1009 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -407,30 +407,30 @@ msgid "" msgstr "" #: ../../mod/api.php:105 ../../mod/dfrn_request.php:835 -#: ../../mod/settings.php:892 ../../mod/settings.php:898 -#: ../../mod/settings.php:906 ../../mod/settings.php:910 -#: ../../mod/settings.php:915 ../../mod/settings.php:921 -#: ../../mod/settings.php:927 ../../mod/settings.php:933 -#: ../../mod/settings.php:963 ../../mod/settings.php:964 -#: ../../mod/settings.php:965 ../../mod/settings.php:966 -#: ../../mod/settings.php:967 ../../mod/register.php:237 -#: ../../mod/profiles.php:574 +#: ../../mod/settings.php:933 ../../mod/settings.php:939 +#: ../../mod/settings.php:947 ../../mod/settings.php:951 +#: ../../mod/settings.php:956 ../../mod/settings.php:962 +#: ../../mod/settings.php:968 ../../mod/settings.php:974 +#: ../../mod/settings.php:1004 ../../mod/settings.php:1005 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1007 +#: ../../mod/settings.php:1008 ../../mod/register.php:237 +#: ../../mod/profiles.php:577 msgid "Yes" msgstr "" #: ../../mod/api.php:106 ../../mod/dfrn_request.php:836 -#: ../../mod/settings.php:892 ../../mod/settings.php:898 -#: ../../mod/settings.php:906 ../../mod/settings.php:910 -#: ../../mod/settings.php:915 ../../mod/settings.php:921 -#: ../../mod/settings.php:927 ../../mod/settings.php:933 -#: ../../mod/settings.php:963 ../../mod/settings.php:964 -#: ../../mod/settings.php:965 ../../mod/settings.php:966 -#: ../../mod/settings.php:967 ../../mod/register.php:238 -#: ../../mod/profiles.php:575 +#: ../../mod/settings.php:933 ../../mod/settings.php:939 +#: ../../mod/settings.php:947 ../../mod/settings.php:951 +#: ../../mod/settings.php:956 ../../mod/settings.php:962 +#: ../../mod/settings.php:968 ../../mod/settings.php:974 +#: ../../mod/settings.php:1004 ../../mod/settings.php:1005 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1007 +#: ../../mod/settings.php:1008 ../../mod/register.php:238 +#: ../../mod/profiles.php:578 msgid "No" msgstr "" -#: ../../mod/photos.php:51 ../../boot.php:1739 +#: ../../mod/photos.php:51 ../../boot.php:1741 msgid "Photo Albums" msgstr "" @@ -509,7 +509,7 @@ msgstr "" #: ../../mod/photos.php:865 ../../mod/community.php:18 #: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17 -#: ../../mod/display.php:7 ../../mod/search.php:86 ../../mod/directory.php:31 +#: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31 msgid "Public access denied." msgstr "" @@ -629,48 +629,48 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" #: ../../mod/photos.php:1385 ../../mod/content.php:667 -#: ../../object/Item.php:197 +#: ../../object/Item.php:202 msgid "I like this (toggle)" msgstr "" #: ../../mod/photos.php:1386 ../../mod/content.php:668 -#: ../../object/Item.php:198 +#: ../../object/Item.php:203 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1387 ../../include/conversation.php:966 +#: ../../mod/photos.php:1387 ../../include/conversation.php:969 msgid "Share" msgstr "" -#: ../../mod/photos.php:1388 ../../mod/editpost.php:118 +#: ../../mod/photos.php:1388 ../../mod/editpost.php:121 #: ../../mod/content.php:482 ../../mod/content.php:848 -#: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:624 -#: ../../include/conversation.php:985 ../../object/Item.php:263 +#: ../../mod/wallmessage.php:152 ../../mod/message.php:300 +#: ../../mod/message.php:488 ../../include/conversation.php:624 +#: ../../include/conversation.php:988 ../../object/Item.php:269 msgid "Please wait" msgstr "" #: ../../mod/photos.php:1404 ../../mod/photos.php:1448 #: ../../mod/photos.php:1520 ../../mod/content.php:690 -#: ../../object/Item.php:561 +#: ../../object/Item.php:567 msgid "This is you" msgstr "" #: ../../mod/photos.php:1406 ../../mod/photos.php:1450 -#: ../../mod/photos.php:1522 ../../mod/content.php:692 ../../boot.php:606 -#: ../../object/Item.php:260 ../../object/Item.php:563 +#: ../../mod/photos.php:1522 ../../mod/content.php:692 ../../boot.php:608 +#: ../../object/Item.php:266 ../../object/Item.php:569 msgid "Comment" msgstr "" #: ../../mod/photos.php:1408 ../../mod/photos.php:1452 -#: ../../mod/photos.php:1524 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:1003 -#: ../../object/Item.php:573 +#: ../../mod/photos.php:1524 ../../mod/editpost.php:142 +#: ../../mod/content.php:702 ../../include/conversation.php:1006 +#: ../../object/Item.php:579 msgid "Preview" msgstr "" #: ../../mod/photos.php:1492 ../../mod/content.php:439 -#: ../../mod/content.php:724 ../../mod/settings.php:606 +#: ../../mod/content.php:724 ../../mod/settings.php:622 #: ../../mod/group.php:168 ../../mod/admin.php:696 #: ../../include/conversation.php:569 ../../object/Item.php:118 msgid "Delete" @@ -694,7 +694,7 @@ msgid "Community" msgstr "" #: ../../mod/community.php:61 ../../mod/community.php:86 -#: ../../mod/search.php:159 ../../mod/search.php:185 +#: ../../mod/search.php:162 ../../mod/search.php:188 msgid "No results." msgstr "" @@ -734,100 +734,100 @@ msgstr "" msgid "Item not found" msgstr "" -#: ../../mod/editpost.php:36 +#: ../../mod/editpost.php:39 msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:88 ../../include/conversation.php:952 +#: ../../mod/editpost.php:91 ../../include/conversation.php:955 msgid "Post to Email" msgstr "" -#: ../../mod/editpost.php:103 ../../mod/content.php:711 -#: ../../mod/settings.php:605 ../../object/Item.php:108 +#: ../../mod/editpost.php:106 ../../mod/content.php:711 +#: ../../mod/settings.php:621 ../../object/Item.php:108 msgid "Edit" msgstr "" -#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 -#: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:967 +#: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150 +#: ../../mod/message.php:298 ../../mod/message.php:485 +#: ../../include/conversation.php:970 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:968 +#: ../../mod/editpost.php:108 ../../include/conversation.php:971 msgid "upload photo" msgstr "" -#: ../../mod/editpost.php:106 ../../include/conversation.php:969 +#: ../../mod/editpost.php:109 ../../include/conversation.php:972 msgid "Attach file" msgstr "" -#: ../../mod/editpost.php:107 ../../include/conversation.php:970 +#: ../../mod/editpost.php:110 ../../include/conversation.php:973 msgid "attach file" msgstr "" -#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 -#: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:971 +#: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151 +#: ../../mod/message.php:299 ../../mod/message.php:486 +#: ../../include/conversation.php:974 msgid "Insert web link" msgstr "" -#: ../../mod/editpost.php:109 ../../include/conversation.php:972 +#: ../../mod/editpost.php:112 ../../include/conversation.php:975 msgid "web link" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:973 +#: ../../mod/editpost.php:113 ../../include/conversation.php:976 msgid "Insert video link" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:974 +#: ../../mod/editpost.php:114 ../../include/conversation.php:977 msgid "video link" msgstr "" -#: ../../mod/editpost.php:112 ../../include/conversation.php:975 +#: ../../mod/editpost.php:115 ../../include/conversation.php:978 msgid "Insert audio link" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:976 +#: ../../mod/editpost.php:116 ../../include/conversation.php:979 msgid "audio link" msgstr "" -#: ../../mod/editpost.php:114 ../../include/conversation.php:977 +#: ../../mod/editpost.php:117 ../../include/conversation.php:980 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:115 ../../include/conversation.php:978 +#: ../../mod/editpost.php:118 ../../include/conversation.php:981 msgid "set location" msgstr "" -#: ../../mod/editpost.php:116 ../../include/conversation.php:979 +#: ../../mod/editpost.php:119 ../../include/conversation.php:982 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:117 ../../include/conversation.php:980 +#: ../../mod/editpost.php:120 ../../include/conversation.php:983 msgid "clear location" msgstr "" -#: ../../mod/editpost.php:119 ../../include/conversation.php:986 +#: ../../mod/editpost.php:122 ../../include/conversation.php:989 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:127 ../../include/conversation.php:995 +#: ../../mod/editpost.php:130 ../../include/conversation.php:998 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:128 ../../include/conversation.php:996 +#: ../../mod/editpost.php:131 ../../include/conversation.php:999 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:131 ../../include/conversation.php:982 +#: ../../mod/editpost.php:134 ../../include/conversation.php:985 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:133 ../../include/conversation.php:984 +#: ../../mod/editpost.php:136 ../../include/conversation.php:987 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:134 ../../include/conversation.php:998 +#: ../../mod/editpost.php:137 ../../include/conversation.php:1001 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -912,7 +912,7 @@ msgstr "" msgid "Disallowed profile URL." msgstr "" -#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:123 +#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:124 msgid "Failed to update contact record." msgstr "" @@ -1000,7 +1000,7 @@ msgstr "" msgid "StatusNet/Federated Social Web" msgstr "" -#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:640 +#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:681 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "" @@ -1020,39 +1020,39 @@ msgstr "" msgid "Submit Request" msgstr "" -#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:137 +#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138 msgid "Account settings" msgstr "" -#: ../../mod/uexport.php:14 ../../mod/settings.php:35 +#: ../../mod/uexport.php:14 ../../mod/settings.php:40 msgid "Display settings" msgstr "" -#: ../../mod/uexport.php:20 ../../mod/settings.php:41 +#: ../../mod/uexport.php:20 ../../mod/settings.php:46 msgid "Connector settings" msgstr "" -#: ../../mod/uexport.php:25 ../../mod/settings.php:46 +#: ../../mod/uexport.php:25 ../../mod/settings.php:51 msgid "Plugin settings" msgstr "" -#: ../../mod/uexport.php:30 ../../mod/settings.php:51 +#: ../../mod/uexport.php:30 ../../mod/settings.php:56 msgid "Connected apps" msgstr "" -#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:56 +#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:61 msgid "Export personal data" msgstr "" -#: ../../mod/uexport.php:40 ../../mod/settings.php:61 +#: ../../mod/uexport.php:40 ../../mod/settings.php:66 msgid "Remove account" msgstr "" -#: ../../mod/uexport.php:48 ../../mod/settings.php:69 +#: ../../mod/uexport.php:48 ../../mod/settings.php:74 #: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../addon/dav/friendica/layout.fnk.php:225 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:387 -#: ../../view/theme/diabook/theme.php:661 ../../include/nav.php:137 +#: ../../view/theme/diabook/theme.php:661 ../../include/nav.php:138 #: ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" @@ -1399,7 +1399,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1214 +#: ../../include/contact_widgets.php:9 ../../boot.php:1216 msgid "Connect" msgstr "" @@ -1416,15 +1416,15 @@ msgstr "" msgid "Visible to:" msgstr "" -#: ../../mod/content.php:119 ../../mod/network.php:544 +#: ../../mod/content.php:119 ../../mod/network.php:594 msgid "No such group" msgstr "" -#: ../../mod/content.php:130 ../../mod/network.php:555 +#: ../../mod/content.php:130 ../../mod/network.php:605 msgid "Group is empty" msgstr "" -#: ../../mod/content.php:134 ../../mod/network.php:559 +#: ../../mod/content.php:134 ../../mod/network.php:609 msgid "Group: " msgstr "" @@ -1435,13 +1435,13 @@ msgstr "" #: ../../mod/content.php:455 ../../mod/content.php:817 #: ../../mod/content.php:818 ../../include/conversation.php:587 -#: ../../object/Item.php:229 ../../object/Item.php:230 +#: ../../object/Item.php:234 ../../object/Item.php:235 #, php-format msgid "View %s's profile @ %s" msgstr "" #: ../../mod/content.php:465 ../../mod/content.php:829 -#: ../../include/conversation.php:607 ../../object/Item.php:243 +#: ../../include/conversation.php:607 ../../object/Item.php:248 #, php-format msgid "%s from %s" msgstr "" @@ -1450,7 +1450,7 @@ msgstr "" msgid "View in context" msgstr "" -#: ../../mod/content.php:586 ../../object/Item.php:282 +#: ../../mod/content.php:586 ../../object/Item.php:288 #, php-format msgid "%d comment" msgid_plural "%d comments" @@ -1458,7 +1458,7 @@ msgstr[0] "" msgstr[1] "" #: ../../mod/content.php:588 ../../include/text.php:1446 -#: ../../object/Item.php:284 ../../object/Item.php:297 +#: ../../object/Item.php:290 ../../object/Item.php:303 msgid "comment" msgid_plural "comments" msgstr[0] "" @@ -1466,57 +1466,57 @@ msgstr[1] "" #: ../../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:607 -#: ../../object/Item.php:285 ../../addon.old/page/page.php:77 +#: ../../include/contact_widgets.php:204 ../../boot.php:609 +#: ../../object/Item.php:291 ../../addon.old/page/page.php:77 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119 msgid "show more" msgstr "" -#: ../../mod/content.php:667 ../../object/Item.php:197 +#: ../../mod/content.php:667 ../../object/Item.php:202 msgid "like" msgstr "" -#: ../../mod/content.php:668 ../../object/Item.php:198 +#: ../../mod/content.php:668 ../../object/Item.php:203 msgid "dislike" msgstr "" -#: ../../mod/content.php:670 ../../object/Item.php:200 +#: ../../mod/content.php:670 ../../object/Item.php:205 msgid "Share this" msgstr "" -#: ../../mod/content.php:670 ../../object/Item.php:200 +#: ../../mod/content.php:670 ../../object/Item.php:205 msgid "share" msgstr "" -#: ../../mod/content.php:694 ../../object/Item.php:565 +#: ../../mod/content.php:694 ../../object/Item.php:571 msgid "Bold" msgstr "" -#: ../../mod/content.php:695 ../../object/Item.php:566 +#: ../../mod/content.php:695 ../../object/Item.php:572 msgid "Italic" msgstr "" -#: ../../mod/content.php:696 ../../object/Item.php:567 +#: ../../mod/content.php:696 ../../object/Item.php:573 msgid "Underline" msgstr "" -#: ../../mod/content.php:697 ../../object/Item.php:568 +#: ../../mod/content.php:697 ../../object/Item.php:574 msgid "Quote" msgstr "" -#: ../../mod/content.php:698 ../../object/Item.php:569 +#: ../../mod/content.php:698 ../../object/Item.php:575 msgid "Code" msgstr "" -#: ../../mod/content.php:699 ../../object/Item.php:570 +#: ../../mod/content.php:699 ../../object/Item.php:576 msgid "Image" msgstr "" -#: ../../mod/content.php:700 ../../object/Item.php:571 +#: ../../mod/content.php:700 ../../object/Item.php:577 msgid "Link" msgstr "" -#: ../../mod/content.php:701 ../../object/Item.php:572 +#: ../../mod/content.php:701 ../../object/Item.php:578 msgid "Video" msgstr "" @@ -1536,7 +1536,7 @@ msgstr "" msgid "starred" msgstr "" -#: ../../mod/content.php:742 ../../object/Item.php:187 +#: ../../mod/content.php:742 ../../object/Item.php:191 msgid "add tag" msgstr "" @@ -1544,15 +1544,15 @@ msgstr "" msgid "save to folder" msgstr "" -#: ../../mod/content.php:819 ../../object/Item.php:231 +#: ../../mod/content.php:819 ../../object/Item.php:236 msgid "to" msgstr "" -#: ../../mod/content.php:820 ../../object/Item.php:233 +#: ../../mod/content.php:820 ../../object/Item.php:238 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/content.php:821 ../../object/Item.php:234 +#: ../../mod/content.php:821 ../../object/Item.php:239 msgid "via Wall-To-Wall:" msgstr "" @@ -1572,8 +1572,8 @@ msgid "Discard" msgstr "" #: ../../mod/notifications.php:51 ../../mod/notifications.php:163 -#: ../../mod/notifications.php:209 ../../mod/contacts.php:324 -#: ../../mod/contacts.php:378 +#: ../../mod/notifications.php:209 ../../mod/contacts.php:325 +#: ../../mod/contacts.php:379 msgid "Ignore" msgstr "" @@ -1585,21 +1585,21 @@ msgstr "" msgid "Network" msgstr "" -#: ../../mod/notifications.php:88 ../../mod/network.php:407 +#: ../../mod/notifications.php:88 ../../mod/network.php:444 msgid "Personal" msgstr "" #: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 -#: ../../include/nav.php:77 ../../include/nav.php:115 +#: ../../include/nav.php:77 ../../include/nav.php:116 msgid "Home" msgstr "" -#: ../../mod/notifications.php:98 ../../include/nav.php:121 +#: ../../mod/notifications.php:98 ../../include/nav.php:122 msgid "Introductions" msgstr "" -#: ../../mod/notifications.php:103 ../../mod/message.php:176 -#: ../../include/nav.php:128 +#: ../../mod/notifications.php:103 ../../mod/message.php:180 +#: ../../include/nav.php:129 msgid "Messages" msgstr "" @@ -1625,7 +1625,7 @@ msgid "suggested by %s" msgstr "" #: ../../mod/notifications.php:156 ../../mod/notifications.php:203 -#: ../../mod/contacts.php:384 +#: ../../mod/contacts.php:385 msgid "Hide this contact from others" msgstr "" @@ -1682,7 +1682,7 @@ msgstr "" msgid "No introductions." msgstr "" -#: ../../mod/notifications.php:219 ../../include/nav.php:122 +#: ../../mod/notifications.php:219 ../../include/nav.php:123 msgid "Notifications" msgstr "" @@ -1747,307 +1747,307 @@ msgstr "" msgid "Home Notifications" msgstr "" -#: ../../mod/contacts.php:84 ../../mod/contacts.php:164 +#: ../../mod/contacts.php:85 ../../mod/contacts.php:165 msgid "Could not access contact record." msgstr "" -#: ../../mod/contacts.php:98 +#: ../../mod/contacts.php:99 msgid "Could not locate selected profile." msgstr "" -#: ../../mod/contacts.php:121 +#: ../../mod/contacts.php:122 msgid "Contact updated." msgstr "" -#: ../../mod/contacts.php:186 +#: ../../mod/contacts.php:187 msgid "Contact has been blocked" msgstr "" -#: ../../mod/contacts.php:186 +#: ../../mod/contacts.php:187 msgid "Contact has been unblocked" msgstr "" -#: ../../mod/contacts.php:200 +#: ../../mod/contacts.php:201 msgid "Contact has been ignored" msgstr "" -#: ../../mod/contacts.php:200 +#: ../../mod/contacts.php:201 msgid "Contact has been unignored" msgstr "" -#: ../../mod/contacts.php:219 +#: ../../mod/contacts.php:220 msgid "Contact has been archived" msgstr "" -#: ../../mod/contacts.php:219 +#: ../../mod/contacts.php:220 msgid "Contact has been unarchived" msgstr "" -#: ../../mod/contacts.php:232 +#: ../../mod/contacts.php:233 msgid "Contact has been removed." msgstr "" -#: ../../mod/contacts.php:266 +#: ../../mod/contacts.php:267 #, php-format msgid "You are mutual friends with %s" msgstr "" -#: ../../mod/contacts.php:270 +#: ../../mod/contacts.php:271 #, php-format msgid "You are sharing with %s" msgstr "" -#: ../../mod/contacts.php:275 +#: ../../mod/contacts.php:276 #, php-format msgid "%s is sharing with you" msgstr "" -#: ../../mod/contacts.php:292 +#: ../../mod/contacts.php:293 msgid "Private communications are not available for this contact." msgstr "" -#: ../../mod/contacts.php:295 +#: ../../mod/contacts.php:296 msgid "Never" msgstr "" -#: ../../mod/contacts.php:299 +#: ../../mod/contacts.php:300 msgid "(Update was successful)" msgstr "" -#: ../../mod/contacts.php:299 +#: ../../mod/contacts.php:300 msgid "(Update was not successful)" msgstr "" -#: ../../mod/contacts.php:301 +#: ../../mod/contacts.php:302 msgid "Suggest friends" msgstr "" -#: ../../mod/contacts.php:305 +#: ../../mod/contacts.php:306 #, php-format msgid "Network type: %s" msgstr "" -#: ../../mod/contacts.php:308 ../../include/contact_widgets.php:190 +#: ../../mod/contacts.php:309 ../../include/contact_widgets.php:199 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "" msgstr[1] "" -#: ../../mod/contacts.php:313 +#: ../../mod/contacts.php:314 msgid "View all contacts" msgstr "" -#: ../../mod/contacts.php:318 ../../mod/contacts.php:377 +#: ../../mod/contacts.php:319 ../../mod/contacts.php:378 #: ../../mod/admin.php:698 msgid "Unblock" msgstr "" -#: ../../mod/contacts.php:318 ../../mod/contacts.php:377 +#: ../../mod/contacts.php:319 ../../mod/contacts.php:378 #: ../../mod/admin.php:697 msgid "Block" msgstr "" -#: ../../mod/contacts.php:321 +#: ../../mod/contacts.php:322 msgid "Toggle Blocked status" msgstr "" -#: ../../mod/contacts.php:324 ../../mod/contacts.php:378 +#: ../../mod/contacts.php:325 ../../mod/contacts.php:379 msgid "Unignore" msgstr "" -#: ../../mod/contacts.php:327 +#: ../../mod/contacts.php:328 msgid "Toggle Ignored status" msgstr "" -#: ../../mod/contacts.php:331 +#: ../../mod/contacts.php:332 msgid "Unarchive" msgstr "" -#: ../../mod/contacts.php:331 +#: ../../mod/contacts.php:332 msgid "Archive" msgstr "" -#: ../../mod/contacts.php:334 +#: ../../mod/contacts.php:335 msgid "Toggle Archive status" msgstr "" -#: ../../mod/contacts.php:337 +#: ../../mod/contacts.php:338 msgid "Repair" msgstr "" -#: ../../mod/contacts.php:340 +#: ../../mod/contacts.php:341 msgid "Advanced Contact Settings" msgstr "" -#: ../../mod/contacts.php:346 +#: ../../mod/contacts.php:347 msgid "Communications lost with this contact!" msgstr "" -#: ../../mod/contacts.php:349 +#: ../../mod/contacts.php:350 msgid "Contact Editor" msgstr "" -#: ../../mod/contacts.php:352 +#: ../../mod/contacts.php:353 msgid "Profile Visibility" msgstr "" -#: ../../mod/contacts.php:353 +#: ../../mod/contacts.php:354 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/contacts.php:354 +#: ../../mod/contacts.php:355 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/contacts.php:355 +#: ../../mod/contacts.php:356 msgid "Edit contact notes" msgstr "" -#: ../../mod/contacts.php:360 ../../mod/contacts.php:552 +#: ../../mod/contacts.php:361 ../../mod/contacts.php:553 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: ../../mod/contacts.php:361 +#: ../../mod/contacts.php:362 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/contacts.php:362 +#: ../../mod/contacts.php:363 msgid "Ignore contact" msgstr "" -#: ../../mod/contacts.php:363 +#: ../../mod/contacts.php:364 msgid "Repair URL settings" msgstr "" -#: ../../mod/contacts.php:364 +#: ../../mod/contacts.php:365 msgid "View conversations" msgstr "" -#: ../../mod/contacts.php:366 +#: ../../mod/contacts.php:367 msgid "Delete contact" msgstr "" -#: ../../mod/contacts.php:370 +#: ../../mod/contacts.php:371 msgid "Last update:" msgstr "" -#: ../../mod/contacts.php:372 +#: ../../mod/contacts.php:373 msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:374 ../../mod/admin.php:1170 +#: ../../mod/contacts.php:375 ../../mod/admin.php:1170 msgid "Update now" msgstr "" -#: ../../mod/contacts.php:381 +#: ../../mod/contacts.php:382 msgid "Currently blocked" msgstr "" -#: ../../mod/contacts.php:382 +#: ../../mod/contacts.php:383 msgid "Currently ignored" msgstr "" -#: ../../mod/contacts.php:383 +#: ../../mod/contacts.php:384 msgid "Currently archived" msgstr "" -#: ../../mod/contacts.php:384 +#: ../../mod/contacts.php:385 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/contacts.php:437 +#: ../../mod/contacts.php:438 msgid "Suggestions" msgstr "" -#: ../../mod/contacts.php:440 +#: ../../mod/contacts.php:441 msgid "Suggest potential friends" msgstr "" -#: ../../mod/contacts.php:443 ../../mod/group.php:191 +#: ../../mod/contacts.php:444 ../../mod/group.php:191 msgid "All Contacts" msgstr "" -#: ../../mod/contacts.php:446 +#: ../../mod/contacts.php:447 msgid "Show all contacts" msgstr "" -#: ../../mod/contacts.php:449 +#: ../../mod/contacts.php:450 msgid "Unblocked" msgstr "" -#: ../../mod/contacts.php:452 +#: ../../mod/contacts.php:453 msgid "Only show unblocked contacts" msgstr "" -#: ../../mod/contacts.php:456 +#: ../../mod/contacts.php:457 msgid "Blocked" msgstr "" -#: ../../mod/contacts.php:459 +#: ../../mod/contacts.php:460 msgid "Only show blocked contacts" msgstr "" -#: ../../mod/contacts.php:463 +#: ../../mod/contacts.php:464 msgid "Ignored" msgstr "" -#: ../../mod/contacts.php:466 +#: ../../mod/contacts.php:467 msgid "Only show ignored contacts" msgstr "" -#: ../../mod/contacts.php:470 +#: ../../mod/contacts.php:471 msgid "Archived" msgstr "" -#: ../../mod/contacts.php:473 +#: ../../mod/contacts.php:474 msgid "Only show archived contacts" msgstr "" -#: ../../mod/contacts.php:477 +#: ../../mod/contacts.php:478 msgid "Hidden" msgstr "" -#: ../../mod/contacts.php:480 +#: ../../mod/contacts.php:481 msgid "Only show hidden contacts" msgstr "" -#: ../../mod/contacts.php:528 +#: ../../mod/contacts.php:529 msgid "Mutual Friendship" msgstr "" -#: ../../mod/contacts.php:532 +#: ../../mod/contacts.php:533 msgid "is a fan of yours" msgstr "" -#: ../../mod/contacts.php:536 +#: ../../mod/contacts.php:537 msgid "you are a fan of" msgstr "" -#: ../../mod/contacts.php:553 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:554 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:574 ../../view/theme/diabook/theme.php:89 -#: ../../include/nav.php:139 +#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89 +#: ../../include/nav.php:142 msgid "Contacts" msgstr "" -#: ../../mod/contacts.php:578 +#: ../../mod/contacts.php:579 msgid "Search your contacts" msgstr "" -#: ../../mod/contacts.php:579 ../../mod/directory.php:59 +#: ../../mod/contacts.php:580 ../../mod/directory.php:59 msgid "Finding: " msgstr "" -#: ../../mod/contacts.php:580 ../../mod/directory.php:61 +#: ../../mod/contacts.php:581 ../../mod/directory.php:61 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "" @@ -2072,7 +2072,7 @@ msgstr "" #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365 -#: ../../boot.php:822 ../../addon.old/facebook/facebook.php:702 +#: ../../boot.php:824 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 #: ../../addon.old/public_server/public_server.php:62 @@ -2086,7 +2086,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:961 +#: ../../mod/lostpass.php:83 ../../boot.php:963 msgid "Password Reset" msgstr "" @@ -2130,63 +2130,71 @@ msgstr "" msgid "Reset" msgstr "" -#: ../../mod/settings.php:113 +#: ../../mod/settings.php:35 +msgid "Additional features" +msgstr "" + +#: ../../mod/settings.php:118 msgid "Missing some important data!" msgstr "" -#: ../../mod/settings.php:116 ../../mod/settings.php:569 +#: ../../mod/settings.php:121 ../../mod/settings.php:585 msgid "Update" msgstr "" -#: ../../mod/settings.php:221 +#: ../../mod/settings.php:226 msgid "Failed to connect with email account using the settings provided." msgstr "" -#: ../../mod/settings.php:226 +#: ../../mod/settings.php:231 msgid "Email settings updated." msgstr "" -#: ../../mod/settings.php:290 -msgid "Passwords do not match. Password unchanged." -msgstr "" - -#: ../../mod/settings.php:295 -msgid "Empty passwords are not allowed. Password unchanged." +#: ../../mod/settings.php:246 +msgid "Features updated" msgstr "" #: ../../mod/settings.php:306 +msgid "Passwords do not match. Password unchanged." +msgstr "" + +#: ../../mod/settings.php:311 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "" + +#: ../../mod/settings.php:322 msgid "Password changed." msgstr "" -#: ../../mod/settings.php:308 +#: ../../mod/settings.php:324 msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/settings.php:373 +#: ../../mod/settings.php:389 msgid " Please use a shorter name." msgstr "" -#: ../../mod/settings.php:375 +#: ../../mod/settings.php:391 msgid " Name too short." msgstr "" -#: ../../mod/settings.php:381 +#: ../../mod/settings.php:397 msgid " Not valid email." msgstr "" -#: ../../mod/settings.php:383 +#: ../../mod/settings.php:399 msgid " Cannot change to that email." msgstr "" -#: ../../mod/settings.php:437 +#: ../../mod/settings.php:453 msgid "Private forum has no privacy permissions. Using default privacy group." msgstr "" -#: ../../mod/settings.php:441 +#: ../../mod/settings.php:457 msgid "Private forum has no privacy permissions and no default privacy group." msgstr "" -#: ../../mod/settings.php:471 ../../addon/facebook/facebook.php:495 +#: ../../mod/settings.php:487 ../../addon/facebook/facebook.php:495 #: ../../addon/fbpost/fbpost.php:144 #: ../../addon/remote_permissions/remote_permissions.php:204 #: ../../addon/impressum/impressum.php:78 @@ -2202,442 +2210,454 @@ msgstr "" msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:542 ../../mod/settings.php:568 -#: ../../mod/settings.php:604 +#: ../../mod/settings.php:558 ../../mod/settings.php:584 +#: ../../mod/settings.php:620 msgid "Add application" msgstr "" -#: ../../mod/settings.php:546 ../../mod/settings.php:572 +#: ../../mod/settings.php:562 ../../mod/settings.php:588 #: ../../addon/statusnet/statusnet.php:570 #: ../../addon.old/statusnet/statusnet.php:570 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:547 ../../mod/settings.php:573 +#: ../../mod/settings.php:563 ../../mod/settings.php:589 #: ../../addon/statusnet/statusnet.php:569 #: ../../addon.old/statusnet/statusnet.php:569 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:548 ../../mod/settings.php:574 +#: ../../mod/settings.php:564 ../../mod/settings.php:590 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:549 ../../mod/settings.php:575 +#: ../../mod/settings.php:565 ../../mod/settings.php:591 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:560 +#: ../../mod/settings.php:576 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:603 +#: ../../mod/settings.php:619 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:607 +#: ../../mod/settings.php:623 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:608 +#: ../../mod/settings.php:624 msgid "No name" msgstr "" -#: ../../mod/settings.php:609 +#: ../../mod/settings.php:625 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:620 +#: ../../mod/settings.php:637 msgid "No Plugin settings configured" msgstr "" -#: ../../mod/settings.php:628 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:645 ../../addon/widgets/widgets.php:123 #: ../../addon.old/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "" -#: ../../mod/settings.php:640 ../../mod/settings.php:641 +#: ../../mod/settings.php:659 +msgid "Off" +msgstr "" + +#: ../../mod/settings.php:659 +msgid "On" +msgstr "" + +#: ../../mod/settings.php:667 +msgid "Additional Features" +msgstr "" + +#: ../../mod/settings.php:681 ../../mod/settings.php:682 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: ../../mod/settings.php:640 ../../mod/settings.php:641 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 msgid "enabled" msgstr "" -#: ../../mod/settings.php:640 ../../mod/settings.php:641 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 msgid "disabled" msgstr "" -#: ../../mod/settings.php:641 +#: ../../mod/settings.php:682 msgid "StatusNet" msgstr "" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:714 msgid "Email access is disabled on this site." msgstr "" -#: ../../mod/settings.php:679 +#: ../../mod/settings.php:720 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:684 +#: ../../mod/settings.php:725 msgid "Email/Mailbox Setup" msgstr "" -#: ../../mod/settings.php:685 +#: ../../mod/settings.php:726 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "" -#: ../../mod/settings.php:686 +#: ../../mod/settings.php:727 msgid "Last successful email check:" msgstr "" -#: ../../mod/settings.php:688 +#: ../../mod/settings.php:729 msgid "IMAP server name:" msgstr "" -#: ../../mod/settings.php:689 +#: ../../mod/settings.php:730 msgid "IMAP port:" msgstr "" -#: ../../mod/settings.php:690 +#: ../../mod/settings.php:731 msgid "Security:" msgstr "" -#: ../../mod/settings.php:690 ../../mod/settings.php:695 +#: ../../mod/settings.php:731 ../../mod/settings.php:736 #: ../../addon/dav/common/wdcal_edit.inc.php:191 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191 msgid "None" msgstr "" -#: ../../mod/settings.php:691 +#: ../../mod/settings.php:732 msgid "Email login name:" msgstr "" -#: ../../mod/settings.php:692 +#: ../../mod/settings.php:733 msgid "Email password:" msgstr "" -#: ../../mod/settings.php:693 +#: ../../mod/settings.php:734 msgid "Reply-to address:" msgstr "" -#: ../../mod/settings.php:694 +#: ../../mod/settings.php:735 msgid "Send public posts to all email contacts:" msgstr "" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:736 msgid "Action after import:" msgstr "" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:736 msgid "Mark as seen" msgstr "" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:736 msgid "Move to folder" msgstr "" -#: ../../mod/settings.php:696 +#: ../../mod/settings.php:737 msgid "Move to folder:" msgstr "" -#: ../../mod/settings.php:727 ../../mod/admin.php:402 +#: ../../mod/settings.php:768 ../../mod/admin.php:402 msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/settings.php:767 +#: ../../mod/settings.php:808 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:773 ../../mod/settings.php:784 +#: ../../mod/settings.php:814 ../../mod/settings.php:825 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:774 +#: ../../mod/settings.php:815 msgid "Mobile Theme:" msgstr "" -#: ../../mod/settings.php:775 +#: ../../mod/settings.php:816 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:775 +#: ../../mod/settings.php:816 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:776 +#: ../../mod/settings.php:817 msgid "Number of items to display per page:" msgstr "" -#: ../../mod/settings.php:776 +#: ../../mod/settings.php:817 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:777 +#: ../../mod/settings.php:818 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:853 +#: ../../mod/settings.php:894 msgid "Normal Account Page" msgstr "" -#: ../../mod/settings.php:854 +#: ../../mod/settings.php:895 msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:857 +#: ../../mod/settings.php:898 msgid "Soapbox Page" msgstr "" -#: ../../mod/settings.php:858 +#: ../../mod/settings.php:899 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:861 +#: ../../mod/settings.php:902 msgid "Community Forum/Celebrity Account" msgstr "" -#: ../../mod/settings.php:862 +#: ../../mod/settings.php:903 msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:865 +#: ../../mod/settings.php:906 msgid "Automatic Friend Page" msgstr "" -#: ../../mod/settings.php:866 +#: ../../mod/settings.php:907 msgid "Automatically approve all connection/friend requests as friends" msgstr "" -#: ../../mod/settings.php:869 +#: ../../mod/settings.php:910 msgid "Private Forum [Experimental]" msgstr "" -#: ../../mod/settings.php:870 +#: ../../mod/settings.php:911 msgid "Private forum - approved members only" msgstr "" -#: ../../mod/settings.php:882 +#: ../../mod/settings.php:923 msgid "OpenID:" msgstr "" -#: ../../mod/settings.php:882 +#: ../../mod/settings.php:923 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:933 msgid "Publish your default profile in your local site directory?" msgstr "" -#: ../../mod/settings.php:898 +#: ../../mod/settings.php:939 msgid "Publish your default profile in the global social directory?" msgstr "" -#: ../../mod/settings.php:906 +#: ../../mod/settings.php:947 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "" -#: ../../mod/settings.php:910 +#: ../../mod/settings.php:951 msgid "Hide your profile details from unknown viewers?" msgstr "" -#: ../../mod/settings.php:915 +#: ../../mod/settings.php:956 msgid "Allow friends to post to your profile page?" msgstr "" -#: ../../mod/settings.php:921 +#: ../../mod/settings.php:962 msgid "Allow friends to tag your posts?" msgstr "" -#: ../../mod/settings.php:927 +#: ../../mod/settings.php:968 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:974 msgid "Permit unknown people to send you private mail?" msgstr "" -#: ../../mod/settings.php:941 +#: ../../mod/settings.php:982 msgid "Profile is not published." msgstr "" -#: ../../mod/settings.php:944 ../../mod/profile_photo.php:248 +#: ../../mod/settings.php:985 ../../mod/profile_photo.php:248 msgid "or" msgstr "" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:990 msgid "Your Identity Address is" msgstr "" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:1001 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:1001 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:961 +#: ../../mod/settings.php:1002 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:962 +#: ../../mod/settings.php:1003 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:963 +#: ../../mod/settings.php:1004 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:964 +#: ../../mod/settings.php:1005 msgid "Expire personal notes:" msgstr "" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:1006 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:966 +#: ../../mod/settings.php:1007 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:967 +#: ../../mod/settings.php:1008 msgid "Only expire posts by others:" msgstr "" -#: ../../mod/settings.php:974 +#: ../../mod/settings.php:1015 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:1023 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:1024 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:1025 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:1025 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:988 +#: ../../mod/settings.php:1029 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:989 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:1030 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:1031 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:1032 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:1033 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:1034 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:996 +#: ../../mod/settings.php:1037 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:998 +#: ../../mod/settings.php:1039 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:998 ../../mod/settings.php:1017 +#: ../../mod/settings.php:1039 ../../mod/settings.php:1058 msgid "(to prevent spam abuse)" msgstr "" -#: ../../mod/settings.php:999 +#: ../../mod/settings.php:1040 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:1000 +#: ../../mod/settings.php:1041 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:1017 +#: ../../mod/settings.php:1058 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:1020 +#: ../../mod/settings.php:1061 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:1021 +#: ../../mod/settings.php:1062 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:1022 +#: ../../mod/settings.php:1063 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:1023 +#: ../../mod/settings.php:1064 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:1024 +#: ../../mod/settings.php:1065 msgid "making an interesting profile change" msgstr "" -#: ../../mod/settings.php:1025 +#: ../../mod/settings.php:1066 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:1026 +#: ../../mod/settings.php:1067 msgid "You receive an introduction" msgstr "" -#: ../../mod/settings.php:1027 +#: ../../mod/settings.php:1068 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:1028 +#: ../../mod/settings.php:1069 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:1029 +#: ../../mod/settings.php:1070 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:1030 +#: ../../mod/settings.php:1071 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:1031 +#: ../../mod/settings.php:1072 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:1032 +#: ../../mod/settings.php:1073 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1074 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/settings.php:1036 +#: ../../mod/settings.php:1077 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:1037 +#: ../../mod/settings.php:1078 msgid "Change the behaviour of this account for special situations" msgstr "" @@ -2659,63 +2679,64 @@ msgstr "" msgid "Search Results For:" msgstr "" -#: ../../mod/network.php:221 ../../mod/search.php:18 +#: ../../mod/network.php:224 ../../mod/search.php:21 msgid "Remove term" msgstr "" -#: ../../mod/network.php:230 ../../mod/search.php:27 +#: ../../mod/network.php:233 ../../mod/search.php:30 +#: ../../include/features.php:41 msgid "Saved Searches" msgstr "" -#: ../../mod/network.php:231 ../../include/group.php:275 +#: ../../mod/network.php:234 ../../include/group.php:275 msgid "add" msgstr "" -#: ../../mod/network.php:394 +#: ../../mod/network.php:397 msgid "Commented Order" msgstr "" -#: ../../mod/network.php:397 +#: ../../mod/network.php:400 msgid "Sort by Comment Date" msgstr "" -#: ../../mod/network.php:400 +#: ../../mod/network.php:403 msgid "Posted Order" msgstr "" -#: ../../mod/network.php:403 +#: ../../mod/network.php:406 msgid "Sort by Post Date" msgstr "" -#: ../../mod/network.php:410 +#: ../../mod/network.php:447 msgid "Posts that mention or involve you" msgstr "" -#: ../../mod/network.php:413 +#: ../../mod/network.php:453 msgid "New" msgstr "" -#: ../../mod/network.php:416 +#: ../../mod/network.php:456 msgid "Activity Stream - by date" msgstr "" -#: ../../mod/network.php:419 -msgid "Starred" -msgstr "" - -#: ../../mod/network.php:422 -msgid "Favourite Posts" -msgstr "" - -#: ../../mod/network.php:425 +#: ../../mod/network.php:462 msgid "Shared Links" msgstr "" -#: ../../mod/network.php:428 +#: ../../mod/network.php:465 msgid "Interesting Links" msgstr "" -#: ../../mod/network.php:496 +#: ../../mod/network.php:471 +msgid "Starred" +msgstr "" + +#: ../../mod/network.php:474 +msgid "Favourite Posts" +msgstr "" + +#: ../../mod/network.php:546 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2723,23 +2744,23 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../../mod/network.php:499 +#: ../../mod/network.php:549 msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:569 +#: ../../mod/network.php:619 msgid "Contact: " msgstr "" -#: ../../mod/network.php:571 +#: ../../mod/network.php:621 msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:576 +#: ../../mod/network.php:626 msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1753 +#: ../../mod/notes.php:44 ../../boot.php:1755 msgid "Personal Notes" msgstr "" @@ -2797,7 +2818,7 @@ msgstr "" msgid "Number of daily wall messages for %s exceeded. Message failed." msgstr "" -#: ../../mod/wallmessage.php:56 ../../mod/message.php:59 +#: ../../mod/wallmessage.php:56 ../../mod/message.php:63 msgid "No recipient selected." msgstr "" @@ -2805,15 +2826,15 @@ msgstr "" msgid "Unable to check your home location." msgstr "" -#: ../../mod/wallmessage.php:62 ../../mod/message.php:66 +#: ../../mod/wallmessage.php:62 ../../mod/message.php:70 msgid "Message could not be sent." msgstr "" -#: ../../mod/wallmessage.php:65 ../../mod/message.php:69 +#: ../../mod/wallmessage.php:65 ../../mod/message.php:73 msgid "Message collection failure." msgstr "" -#: ../../mod/wallmessage.php:68 ../../mod/message.php:72 +#: ../../mod/wallmessage.php:68 ../../mod/message.php:76 msgid "Message sent." msgstr "" @@ -2822,12 +2843,12 @@ msgid "No recipient." msgstr "" #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 -#: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:902 ../../include/conversation.php:920 +#: ../../mod/message.php:249 ../../mod/message.php:257 +#: ../../include/conversation.php:905 ../../include/conversation.php:923 msgid "Please enter a link URL:" msgstr "" -#: ../../mod/wallmessage.php:138 ../../mod/message.php:278 +#: ../../mod/wallmessage.php:138 ../../mod/message.php:285 msgid "Send Private Message" msgstr "" @@ -2838,18 +2859,18 @@ msgid "" "your site allow private mail from unknown senders." msgstr "" -#: ../../mod/wallmessage.php:140 ../../mod/message.php:279 -#: ../../mod/message.php:469 +#: ../../mod/wallmessage.php:140 ../../mod/message.php:286 +#: ../../mod/message.php:476 msgid "To:" msgstr "" -#: ../../mod/wallmessage.php:141 ../../mod/message.php:284 -#: ../../mod/message.php:471 +#: ../../mod/wallmessage.php:141 ../../mod/message.php:291 +#: ../../mod/message.php:478 msgid "Subject:" msgstr "" -#: ../../mod/wallmessage.php:147 ../../mod/message.php:288 -#: ../../mod/message.php:474 ../../mod/invite.php:113 +#: ../../mod/wallmessage.php:147 ../../mod/message.php:295 +#: ../../mod/message.php:481 ../../mod/invite.php:113 msgid "Your message:" msgstr "" @@ -2906,7 +2927,7 @@ msgstr "" #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 #: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1729 +#: ../../boot.php:1731 msgid "Profile" msgstr "" @@ -3211,7 +3232,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:921 +#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923 msgid "Register" msgstr "" @@ -3268,7 +3289,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 -#: ../../include/nav.php:51 ../../boot.php:1736 +#: ../../include/nav.php:51 ../../boot.php:1738 msgid "Photos" msgstr "" @@ -3297,34 +3318,34 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:420 ../../mod/wall_upload.php:135 +#: ../../mod/item.php:424 ../../mod/wall_upload.php:135 #: ../../mod/wall_upload.php:144 ../../mod/wall_upload.php:151 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "" -#: ../../mod/item.php:833 +#: ../../mod/item.php:837 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:858 +#: ../../mod/item.php:862 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social network." msgstr "" -#: ../../mod/item.php:860 +#: ../../mod/item.php:864 #, php-format msgid "You may visit them online at %s" msgstr "" -#: ../../mod/item.php:861 +#: ../../mod/item.php:865 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: ../../mod/item.php:863 +#: ../../mod/item.php:867 #, php-format msgid "%s posted an update." msgstr "" @@ -3423,71 +3444,71 @@ msgstr "" msgid "Please enter your password for verification:" msgstr "" -#: ../../mod/message.php:9 ../../include/nav.php:131 +#: ../../mod/message.php:9 ../../include/nav.php:132 msgid "New Message" msgstr "" -#: ../../mod/message.php:63 +#: ../../mod/message.php:67 msgid "Unable to locate contact information." msgstr "" -#: ../../mod/message.php:191 +#: ../../mod/message.php:195 msgid "Message deleted." msgstr "" -#: ../../mod/message.php:221 +#: ../../mod/message.php:225 msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:327 +#: ../../mod/message.php:334 msgid "No messages." msgstr "" -#: ../../mod/message.php:334 +#: ../../mod/message.php:341 #, php-format msgid "Unknown sender - %s" msgstr "" -#: ../../mod/message.php:337 +#: ../../mod/message.php:344 #, php-format msgid "You and %s" msgstr "" -#: ../../mod/message.php:340 +#: ../../mod/message.php:347 #, php-format msgid "%s and You" msgstr "" -#: ../../mod/message.php:350 ../../mod/message.php:462 +#: ../../mod/message.php:357 ../../mod/message.php:469 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:353 +#: ../../mod/message.php:360 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:356 +#: ../../mod/message.php:363 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "" msgstr[1] "" -#: ../../mod/message.php:391 +#: ../../mod/message.php:398 msgid "Message not available." msgstr "" -#: ../../mod/message.php:444 +#: ../../mod/message.php:451 msgid "Delete message" msgstr "" -#: ../../mod/message.php:464 +#: ../../mod/message.php:471 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:468 +#: ../../mod/message.php:475 msgid "Send Reply" msgstr "" @@ -3528,7 +3549,7 @@ msgstr "" msgid "Logs" msgstr "" -#: ../../mod/admin.php:120 ../../include/nav.php:146 +#: ../../mod/admin.php:120 ../../include/nav.php:149 msgid "Admin" msgstr "" @@ -4010,6 +4031,7 @@ msgstr "" #: ../../mod/admin.php:692 ../../mod/admin.php:702 #: ../../include/contact_selectors.php:79 +#: ../../include/contact_selectors.php:86 msgid "Email" msgstr "" @@ -4145,7 +4167,7 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:1124 +#: ../../mod/profile.php:21 ../../boot.php:1126 msgid "Requested profile is not available." msgstr "" @@ -4253,7 +4275,7 @@ msgstr "" msgid "No installed applications." msgstr "" -#: ../../mod/search.php:96 ../../include/text.php:685 +#: ../../mod/search.php:99 ../../include/text.php:685 #: ../../include/text.php:686 ../../include/nav.php:91 msgid "Search" msgstr "" @@ -4363,211 +4385,211 @@ msgstr "" msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/profiles.php:573 +#: ../../mod/profiles.php:576 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:593 +#: ../../mod/profiles.php:596 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:595 +#: ../../mod/profiles.php:598 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:596 +#: ../../mod/profiles.php:599 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:597 +#: ../../mod/profiles.php:600 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:598 +#: ../../mod/profiles.php:601 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:599 +#: ../../mod/profiles.php:602 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:600 +#: ../../mod/profiles.php:603 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:601 +#: ../../mod/profiles.php:604 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:602 +#: ../../mod/profiles.php:605 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:603 +#: ../../mod/profiles.php:606 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:604 +#: ../../mod/profiles.php:607 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:605 +#: ../../mod/profiles.php:608 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:606 +#: ../../mod/profiles.php:609 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:607 +#: ../../mod/profiles.php:610 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:608 +#: ../../mod/profiles.php:611 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:609 +#: ../../mod/profiles.php:612 msgid "♥ Marital Status:" msgstr "" -#: ../../mod/profiles.php:610 +#: ../../mod/profiles.php:613 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:611 +#: ../../mod/profiles.php:614 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:612 +#: ../../mod/profiles.php:615 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:613 ../../include/profile_advanced.php:46 +#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:46 msgid "Sexual Preference:" msgstr "" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:617 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:615 ../../include/profile_advanced.php:50 +#: ../../mod/profiles.php:618 ../../include/profile_advanced.php:50 msgid "Hometown:" msgstr "" -#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:54 +#: ../../mod/profiles.php:619 ../../include/profile_advanced.php:54 msgid "Political Views:" msgstr "" -#: ../../mod/profiles.php:617 +#: ../../mod/profiles.php:620 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:621 msgid "Public Keywords:" msgstr "" -#: ../../mod/profiles.php:619 +#: ../../mod/profiles.php:622 msgid "Private Keywords:" msgstr "" -#: ../../mod/profiles.php:620 ../../include/profile_advanced.php:62 +#: ../../mod/profiles.php:623 ../../include/profile_advanced.php:62 msgid "Likes:" msgstr "" -#: ../../mod/profiles.php:621 ../../include/profile_advanced.php:64 +#: ../../mod/profiles.php:624 ../../include/profile_advanced.php:64 msgid "Dislikes:" msgstr "" -#: ../../mod/profiles.php:622 +#: ../../mod/profiles.php:625 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:626 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "" -#: ../../mod/profiles.php:624 +#: ../../mod/profiles.php:627 msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: ../../mod/profiles.php:625 +#: ../../mod/profiles.php:628 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:626 +#: ../../mod/profiles.php:629 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:627 +#: ../../mod/profiles.php:630 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:628 +#: ../../mod/profiles.php:631 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:629 +#: ../../mod/profiles.php:632 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:630 +#: ../../mod/profiles.php:633 msgid "Television" msgstr "" -#: ../../mod/profiles.php:631 +#: ../../mod/profiles.php:634 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:632 +#: ../../mod/profiles.php:635 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:633 +#: ../../mod/profiles.php:636 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:634 +#: ../../mod/profiles.php:637 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:639 +#: ../../mod/profiles.php:642 msgid "" "This is your public profile.
It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:649 ../../mod/directory.php:111 +#: ../../mod/profiles.php:652 ../../mod/directory.php:111 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:688 +#: ../../mod/profiles.php:691 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:689 ../../boot.php:1242 +#: ../../mod/profiles.php:692 ../../boot.php:1244 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:690 ../../boot.php:1243 +#: ../../mod/profiles.php:693 ../../boot.php:1245 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:701 ../../boot.php:1253 +#: ../../mod/profiles.php:704 ../../boot.php:1255 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:703 ../../boot.php:1256 +#: ../../mod/profiles.php:706 ../../boot.php:1258 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:704 ../../boot.php:1257 +#: ../../mod/profiles.php:707 ../../boot.php:1259 msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:906 -#: ../../include/conversation.php:924 +#: ../../mod/filer.php:29 ../../include/conversation.php:909 +#: ../../include/conversation.php:927 msgid "Save to Folder:" msgstr "" @@ -4691,17 +4713,17 @@ msgid "Gender: " msgstr "" #: ../../mod/directory.php:136 ../../include/profile_advanced.php:17 -#: ../../boot.php:1278 +#: ../../boot.php:1280 msgid "Gender:" msgstr "" #: ../../mod/directory.php:138 ../../include/profile_advanced.php:37 -#: ../../boot.php:1281 +#: ../../boot.php:1283 msgid "Status:" msgstr "" #: ../../mod/directory.php:140 ../../include/profile_advanced.php:48 -#: ../../boot.php:1283 +#: ../../boot.php:1285 msgid "Homepage:" msgstr "" @@ -5572,7 +5594,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:947 +#: ../../include/nav.php:64 ../../boot.php:949 #: ../../addon.old/communityhome/communityhome.php:28 #: ../../addon.old/communityhome/communityhome.php:34 #: ../../addon.old/communityhome/twillingham/communityhome.php:28 @@ -7631,7 +7653,7 @@ msgid "Color scheme" msgstr "" #: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 -#: ../../include/nav.php:115 +#: ../../include/nav.php:116 msgid "Your posts and conversations" msgstr "" @@ -7934,6 +7956,10 @@ msgstr "" msgid "MySpace" msgstr "" +#: ../../include/contact_selectors.php:87 +msgid "Google+" +msgstr "" + #: ../../include/profile_selectors.php:6 msgid "Male" msgstr "" @@ -8513,7 +8539,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:946 +#: ../../include/nav.php:46 ../../boot.php:948 msgid "Logout" msgstr "" @@ -8521,7 +8547,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1722 +#: ../../include/nav.php:49 ../../boot.php:1724 msgid "Status" msgstr "" @@ -8569,55 +8595,63 @@ msgstr "" msgid "Conversations from your friends" msgstr "" -#: ../../include/nav.php:121 +#: ../../include/nav.php:114 +msgid "Network Reset" +msgstr "" + +#: ../../include/nav.php:114 +msgid "Load Network page with no filters" +msgstr "" + +#: ../../include/nav.php:122 msgid "Friend Requests" msgstr "" -#: ../../include/nav.php:123 +#: ../../include/nav.php:124 msgid "See all notifications" msgstr "" -#: ../../include/nav.php:124 +#: ../../include/nav.php:125 msgid "Mark all system notifications seen" msgstr "" -#: ../../include/nav.php:128 +#: ../../include/nav.php:129 msgid "Private mail" msgstr "" -#: ../../include/nav.php:129 +#: ../../include/nav.php:130 msgid "Inbox" msgstr "" -#: ../../include/nav.php:130 +#: ../../include/nav.php:131 msgid "Outbox" msgstr "" -#: ../../include/nav.php:134 +#: ../../include/nav.php:135 msgid "Manage" msgstr "" -#: ../../include/nav.php:134 +#: ../../include/nav.php:135 msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1236 +#: ../../include/nav.php:140 ../../boot.php:1238 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1236 -msgid "Manage/edit profiles" +#: ../../include/nav.php:140 +msgid "Manage/Edit Profiles" msgstr "" -#: ../../include/nav.php:139 +#: ../../include/nav.php:142 msgid "Manage/edit friends and contacts" msgstr "" -#: ../../include/nav.php:146 +#: ../../include/nav.php:149 msgid "Site setup and configuration" msgstr "" -#: ../../include/nav.php:170 +#: ../../include/nav.php:173 msgid "Nothing new here" msgstr "" @@ -8660,23 +8694,23 @@ msgstr "" msgid "Random Profile" msgstr "" -#: ../../include/contact_widgets.php:68 +#: ../../include/contact_widgets.php:70 msgid "Networks" msgstr "" -#: ../../include/contact_widgets.php:71 +#: ../../include/contact_widgets.php:73 msgid "All Networks" msgstr "" -#: ../../include/contact_widgets.php:98 +#: ../../include/contact_widgets.php:103 ../../include/features.php:59 msgid "Saved Folders" msgstr "" -#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129 +#: ../../include/contact_widgets.php:106 ../../include/contact_widgets.php:138 msgid "Everything" msgstr "" -#: ../../include/contact_widgets.php:126 +#: ../../include/contact_widgets.php:135 msgid "Categories" msgstr "" @@ -8777,6 +8811,134 @@ msgstr "" msgid "Encrypted content" msgstr "" +#: ../../include/features.php:25 +msgid "Multiple Profiles" +msgstr "" + +#: ../../include/features.php:25 +msgid "Ability to create multiple profiles" +msgstr "" + +#: ../../include/features.php:31 +msgid "Richtext Editor" +msgstr "" + +#: ../../include/features.php:31 +msgid "Enable richtext editor" +msgstr "" + +#: ../../include/features.php:32 +msgid "Post Preview" +msgstr "" + +#: ../../include/features.php:32 +msgid "Allow previewing posts and comments before publishing them" +msgstr "" + +#: ../../include/features.php:38 +msgid "Search by Date" +msgstr "" + +#: ../../include/features.php:38 +msgid "Ability to select posts by date ranges" +msgstr "" + +#: ../../include/features.php:39 +msgid "Group Filter" +msgstr "" + +#: ../../include/features.php:39 +msgid "Enable widget to display Network posts only from selected group" +msgstr "" + +#: ../../include/features.php:40 +msgid "Network Filter" +msgstr "" + +#: ../../include/features.php:40 +msgid "Enable widget to display Network posts only from selected network" +msgstr "" + +#: ../../include/features.php:41 +msgid "Save search terms for re-use" +msgstr "" + +#: ../../include/features.php:47 +msgid "Network Personal Tab" +msgstr "" + +#: ../../include/features.php:47 +msgid "Enable tab to display only Network posts that you've interacted on" +msgstr "" + +#: ../../include/features.php:48 +msgid "Network New Tab" +msgstr "" + +#: ../../include/features.php:48 +msgid "Enable tab to display only new Network posts (from the last 12 hours)" +msgstr "" + +#: ../../include/features.php:49 +msgid "Network Shared Links Tab" +msgstr "" + +#: ../../include/features.php:49 +msgid "Enable tab to display only Network posts with links in them" +msgstr "" + +#: ../../include/features.php:55 +msgid "Multiple Deletion" +msgstr "" + +#: ../../include/features.php:55 +msgid "Select and delete multiple posts/comments at once" +msgstr "" + +#: ../../include/features.php:56 +msgid "Edit Sent Posts" +msgstr "" + +#: ../../include/features.php:56 +msgid "Edit and correct posts and comments after sending" +msgstr "" + +#: ../../include/features.php:57 +msgid "Tagging" +msgstr "" + +#: ../../include/features.php:57 +msgid "Ability to tag existing posts" +msgstr "" + +#: ../../include/features.php:58 +msgid "Post Categories" +msgstr "" + +#: ../../include/features.php:58 +msgid "Add categories to your posts" +msgstr "" + +#: ../../include/features.php:59 +msgid "Ability to file posts under folders" +msgstr "" + +#: ../../include/features.php:60 +msgid "Dislike Posts" +msgstr "" + +#: ../../include/features.php:60 +msgid "Ability to dislike posts/comments" +msgstr "" + +#: ../../include/features.php:61 +msgid "Star Posts" +msgstr "" + +#: ../../include/features.php:61 +msgid "Ability to mark special posts with a star indicator" +msgstr "" + #: ../../include/dba.php:41 #, php-format msgid "Cannot locate DNS info for database server '%s'" @@ -9038,7 +9200,7 @@ msgstr "" msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:4044 +#: ../../include/items.php:4047 msgid "Archives" msgstr "" @@ -9177,11 +9339,11 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:599 ../../object/Item.php:220 +#: ../../include/conversation.php:599 ../../object/Item.php:225 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:600 ../../object/Item.php:221 +#: ../../include/conversation.php:600 ../../object/Item.php:226 msgid "Filed under:" msgstr "" @@ -9236,31 +9398,31 @@ msgstr "" msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:901 ../../include/conversation.php:919 +#: ../../include/conversation.php:904 ../../include/conversation.php:922 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:903 ../../include/conversation.php:921 +#: ../../include/conversation.php:906 ../../include/conversation.php:924 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:904 ../../include/conversation.php:922 +#: ../../include/conversation.php:907 ../../include/conversation.php:925 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:905 ../../include/conversation.php:923 +#: ../../include/conversation.php:908 ../../include/conversation.php:926 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:907 ../../include/conversation.php:925 +#: ../../include/conversation.php:910 ../../include/conversation.php:928 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:908 +#: ../../include/conversation.php:911 msgid "Delete item(s)?" msgstr "" -#: ../../include/conversation.php:987 +#: ../../include/conversation.php:990 msgid "permissions" msgstr "" @@ -9276,109 +9438,113 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../boot.php:605 +#: ../../boot.php:607 msgid "Delete this item?" msgstr "" -#: ../../boot.php:608 +#: ../../boot.php:610 msgid "show fewer" msgstr "" -#: ../../boot.php:817 -#, php-format -msgid "Update %s failed. See error logs." -msgstr "" - #: ../../boot.php:819 #, php-format +msgid "Update %s failed. See error logs." +msgstr "" + +#: ../../boot.php:821 +#, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:920 +#: ../../boot.php:922 msgid "Create a New Account" msgstr "" -#: ../../boot.php:949 +#: ../../boot.php:951 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:950 +#: ../../boot.php:952 msgid "Password: " msgstr "" -#: ../../boot.php:951 +#: ../../boot.php:953 msgid "Remember me" msgstr "" -#: ../../boot.php:954 +#: ../../boot.php:956 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:960 +#: ../../boot.php:962 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1085 +#: ../../boot.php:1087 msgid "Requested account is not available." msgstr "" -#: ../../boot.php:1162 +#: ../../boot.php:1164 msgid "Edit profile" msgstr "" -#: ../../boot.php:1228 +#: ../../boot.php:1230 msgid "Message" msgstr "" -#: ../../boot.php:1350 ../../boot.php:1436 +#: ../../boot.php:1238 +msgid "Manage/edit profiles" +msgstr "" + +#: ../../boot.php:1352 ../../boot.php:1438 msgid "g A l F d" msgstr "" -#: ../../boot.php:1351 ../../boot.php:1437 +#: ../../boot.php:1353 ../../boot.php:1439 msgid "F d" msgstr "" -#: ../../boot.php:1396 ../../boot.php:1477 +#: ../../boot.php:1398 ../../boot.php:1479 msgid "[today]" msgstr "" -#: ../../boot.php:1408 +#: ../../boot.php:1410 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1409 +#: ../../boot.php:1411 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1470 +#: ../../boot.php:1472 msgid "[No description]" msgstr "" -#: ../../boot.php:1488 +#: ../../boot.php:1490 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1489 +#: ../../boot.php:1491 msgid "Events this week:" msgstr "" -#: ../../boot.php:1725 +#: ../../boot.php:1727 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1732 +#: ../../boot.php:1734 msgid "Profile Details" msgstr "" -#: ../../boot.php:1749 +#: ../../boot.php:1751 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1756 +#: ../../boot.php:1758 msgid "Only You Can See This" msgstr "" -#: ../../object/Item.php:232 +#: ../../object/Item.php:237 msgid "via" msgstr "" From 5d904a9fa8b383c7aa736993aa07b7d4d74c5fce Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 25 Nov 2012 19:34:54 -0800 Subject: [PATCH 2/2] improve performance of photo upload page --- boot.php | 2 +- database.sql | 2 ++ include/Photo.php | 7 +++++-- mod/photos.php | 14 +++++--------- update.php | 9 ++++++++- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/boot.php b/boot.php index 8c3cf7b27..1809df966 100644 --- a/boot.php +++ b/boot.php @@ -14,7 +14,7 @@ require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '3.0.1538' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1156 ); +define ( 'DB_UPDATE_VERSION', 1157 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/database.sql b/database.sql index 0f82616f7..369637fe6 100644 --- a/database.sql +++ b/database.sql @@ -777,6 +777,7 @@ CREATE TABLE IF NOT EXISTS `photo` ( `type` CHAR(128) NOT NULL DEFAULT 'image/jpeg', `height` smallint(6) NOT NULL, `width` smallint(6) NOT NULL, + `datasize` int(10) unsigned NOT NULL DEFAULT '0', `data` mediumblob NOT NULL, `scale` tinyint(3) NOT NULL, `profile` tinyint(1) NOT NULL DEFAULT '0', @@ -789,6 +790,7 @@ CREATE TABLE IF NOT EXISTS `photo` ( KEY `resource-id` (`resource-id`), KEY `album` (`album`), KEY `scale` (`scale`), + KEY `datasize` (`datasize`), KEY `profile` (`profile`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/include/Photo.php b/include/Photo.php index 8fd581977..69b08f629 100644 --- a/include/Photo.php +++ b/include/Photo.php @@ -584,6 +584,7 @@ class Photo { `album` = '%s', `height` = %d, `width` = %d, + `datasize` = %d, `data` = '%s', `scale` = %d, `profile` = %d, @@ -604,6 +605,7 @@ class Photo { dbesc($album), intval($this->getHeight()), intval($this->getWidth()), + dbesc(strlen($this->imageString())), dbesc($this->imageString()), intval($scale), intval($profile), @@ -616,8 +618,8 @@ class Photo { } else { $r = q("INSERT INTO `photo` - ( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` ) - VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )", + ( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `datasize`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` ) + VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )", intval($uid), intval($cid), dbesc($guid), @@ -629,6 +631,7 @@ class Photo { dbesc($album), intval($this->getHeight()), intval($this->getWidth()), + dbesc(strlen($this->imageString())), dbesc($this->imageString()), intval($scale), intval($profile), diff --git a/mod/photos.php b/mod/photos.php index 08dc0e0fc..efccb0e10 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1027,19 +1027,15 @@ function photos_content(&$a) { $default_upload = '
'; - - $r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ", - intval($a->data['user']['uid']) - ); - - + $usage_message = ''; $limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit'); if($limit !== false) { + + $r = q("select sum(datasize) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ", + intval($a->data['user']['uid']) + ); $usage_message = sprintf( t("You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."), $r[0]['total'] / 1024000, $limit / 1024000 ); } - else { - $usage_message = sprintf( t('You have used %1$.2f Mbytes of photo storage.'), $r[0]['total'] / 1024000 ); - } $tpl = get_markup_template('photos_upload.tpl'); diff --git a/update.php b/update.php index 3d3eec6f9..b29afdb74 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@