X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=util%2Fmessages.po;h=bc4ff31d33874cfa844adae259d24ee4f1e8d46c;hb=a6e7ad9771d1781ce0fd6f4771168b11bdf1d056;hp=e6b4928aca4edca5de284eb3eb1518d4c6bd823d;hpb=c2af58da0140a3985a3bb611ba0f98cb07a9de23;p=friendica.git diff --git a/util/messages.po b/util/messages.po index e6b4928aca..bc4ff31d33 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1503\n" +"Project-Id-Version: 3.0.1540\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-21 10:00-0700\n" +"POT-Creation-Date: 2012-11-27 10:00-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,6 +23,7 @@ msgstr "" #: ../../mod/update_notes.php:41 ../../mod/update_community.php:18 #: ../../mod/update_network.php:22 ../../mod/update_profile.php:41 +#: ../../mod/update_display.php:22 msgid "[Embedded content - reload page to view]" msgstr "" @@ -36,30 +37,30 @@ msgstr "" #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:55 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:132 ../../mod/photos.php:994 +#: ../../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/notes.php:20 ../../mod/wallmessage.php:9 +#: ../../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 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 -#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126 -#: ../../mod/item.php:142 ../../mod/mood.php:114 +#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:139 +#: ../../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:64 ../../mod/follow.php:9 -#: ../../mod/display.php:141 ../../mod/profiles.php:7 +#: ../../mod/wall_upload.php:66 ../../mod/follow.php:9 +#: ../../mod/display.php:165 ../../mod/profiles.php:7 #: ../../mod/profiles.php:424 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913 -#: ../../index.php:319 ../../addon.old/facebook/facebook.php:510 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3977 +#: ../../index.php:333 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 #: ../../addon.old/dav/friendica/layout.fnk.php:354 @@ -91,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 "" @@ -129,19 +130,19 @@ msgid "New photo from this URL" msgstr "" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:455 ../../mod/photos.php:1027 -#: ../../mod/photos.php:1103 ../../mod/photos.php:1366 -#: ../../mod/photos.php:1406 ../../mod/photos.php:1449 -#: ../../mod/photos.php:1520 ../../mod/install.php:246 +#: ../../mod/events.php:455 ../../mod/photos.php:1028 +#: ../../mod/photos.php:1100 ../../mod/photos.php:1363 +#: ../../mod/photos.php:1403 ../../mod/photos.php:1447 +#: ../../mod/photos.php:1519 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 -#: ../../mod/content.php:693 ../../mod/contacts.php:348 -#: ../../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 @@ -170,18 +171,18 @@ msgstr "" #: ../../addon/statusnet/statusnet.php:318 #: ../../addon/statusnet/statusnet.php:325 #: ../../addon/statusnet/statusnet.php:353 -#: ../../addon/statusnet/statusnet.php:576 ../../addon/tumblr/tumblr.php:90 +#: ../../addon/statusnet/statusnet.php:685 ../../addon/tumblr/tumblr.php:90 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 -#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394 +#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:506 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:642 +#: ../../view/theme/diabook/theme.php:600 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 -#: ../../object/Item.php:558 ../../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 @@ -230,20 +231,20 @@ msgstr "" msgid "Submit" msgstr "" -#: ../../mod/help.php:30 +#: ../../mod/help.php:79 msgid "Help:" msgstr "" -#: ../../mod/help.php:34 ../../addon/dav/friendica/layout.fnk.php:225 +#: ../../mod/help.php:84 ../../addon/dav/friendica/layout.fnk.php:225 #: ../../include/nav.php:86 ../../addon.old/dav/friendica/layout.fnk.php:225 msgid "Help" msgstr "" -#: ../../mod/help.php:38 ../../index.php:228 +#: ../../mod/help.php:90 ../../index.php:218 msgid "Not Found" msgstr "" -#: ../../mod/help.php:41 ../../index.php:231 +#: ../../mod/help.php:93 ../../index.php:221 msgid "Page not found." msgstr "" @@ -281,12 +282,12 @@ msgstr "" msgid "Edit event" msgstr "" -#: ../../mod/events.php:323 ../../include/text.php:1185 +#: ../../mod/events.php:323 ../../include/text.php:1190 msgid "link to source" msgstr "" -#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 -#: ../../include/nav.php:52 ../../boot.php:1701 +#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 +#: ../../include/nav.php:52 ../../boot.php:1748 msgid "Events" msgstr "" @@ -343,8 +344,9 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:448 ../../mod/directory.php:134 +#: ../../addon/forumdirectory/forumdirectory.php:156 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412 -#: ../../boot.php:1237 +#: ../../boot.php:1278 msgid "Location:" msgstr "" @@ -356,10 +358,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:995 +#: ../../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 "" @@ -384,7 +386,7 @@ msgstr "" #: ../../mod/dfrn_poll.php:99 ../../mod/dfrn_poll.php:530 #, php-format -msgid "%s welcomes %s" +msgid "%1$s welcomes %2$s" msgstr "" #: ../../mod/api.php:76 ../../mod/api.php:102 @@ -406,125 +408,118 @@ 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:236 -#: ../../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:237 -#: ../../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:50 ../../boot.php:1694 +#: ../../mod/photos.php:51 ../../boot.php:1741 msgid "Photo Albums" msgstr "" -#: ../../mod/photos.php:58 ../../mod/photos.php:153 ../../mod/photos.php:1008 -#: ../../mod/photos.php:1095 ../../mod/photos.php:1110 +#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009 +#: ../../mod/photos.php:1092 ../../mod/photos.php:1107 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:492 +#: ../../view/theme/diabook/theme.php:486 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1612 +#: ../../mod/photos.php:66 ../../mod/photos.php:1123 ../../mod/photos.php:1612 msgid "Upload New Photos" msgstr "" -#: ../../mod/photos.php:78 ../../mod/settings.php:23 +#: ../../mod/photos.php:79 ../../mod/settings.php:23 msgid "everybody" msgstr "" -#: ../../mod/photos.php:142 +#: ../../mod/photos.php:143 msgid "Contact information unavailable" msgstr "" -#: ../../mod/photos.php:153 ../../mod/photos.php:675 ../../mod/photos.php:1095 -#: ../../mod/photos.php:1110 ../../mod/profile_photo.php:74 +#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1092 +#: ../../mod/photos.php:1107 ../../mod/profile_photo.php:74 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324 +#: ../../view/theme/diabook/theme.php:487 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" msgstr "" -#: ../../mod/photos.php:163 +#: ../../mod/photos.php:164 msgid "Album not found." msgstr "" -#: ../../mod/photos.php:181 ../../mod/photos.php:1104 +#: ../../mod/photos.php:182 ../../mod/photos.php:1101 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:244 ../../mod/photos.php:1367 +#: ../../mod/photos.php:245 ../../mod/photos.php:1364 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:606 -msgid "was tagged in a" -msgstr "" - -#: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87 -#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1437 -#: ../../include/diaspora.php:1835 ../../include/conversation.php:125 -#: ../../include/conversation.php:253 -#: ../../addon.old/communityhome/communityhome.php:163 -msgid "photo" +#: ../../mod/photos.php:607 +#, php-format +msgid "%1$s was tagged in %2$s by %3$s" msgstr "" -#: ../../mod/photos.php:606 -msgid "by" +#: ../../mod/photos.php:607 +msgid "a photo" msgstr "" -#: ../../mod/photos.php:711 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:321 #: ../../addon.old/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "" -#: ../../mod/photos.php:719 +#: ../../mod/photos.php:720 msgid "Image file is empty." msgstr "" -#: ../../mod/photos.php:751 ../../mod/profile_photo.php:153 -#: ../../mod/wall_upload.php:110 +#: ../../mod/photos.php:752 ../../mod/profile_photo.php:153 +#: ../../mod/wall_upload.php:112 msgid "Unable to process image." msgstr "" -#: ../../mod/photos.php:778 ../../mod/profile_photo.php:301 -#: ../../mod/wall_upload.php:136 +#: ../../mod/photos.php:779 ../../mod/profile_photo.php:301 +#: ../../mod/wall_upload.php:138 msgid "Image upload failed." msgstr "" -#: ../../mod/photos.php:864 ../../mod/community.php:18 +#: ../../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 +#: ../../addon/forumdirectory/forumdirectory.php:53 msgid "Public access denied." msgstr "" -#: ../../mod/photos.php:874 +#: ../../mod/photos.php:875 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:975 +#: ../../mod/photos.php:976 msgid "Access to this item is restricted." msgstr "" @@ -533,153 +528,148 @@ msgstr "" msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/photos.php:1040 -#, php-format -msgid "You have used %1$.2f Mbytes of photo storage." -msgstr "" - -#: ../../mod/photos.php:1046 +#: ../../mod/photos.php:1043 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:1050 ../../mod/photos.php:1099 +#: ../../mod/photos.php:1047 ../../mod/photos.php:1096 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:1051 +#: ../../mod/photos.php:1048 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:1052 +#: ../../mod/photos.php:1049 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:1054 ../../mod/photos.php:1362 +#: ../../mod/photos.php:1051 ../../mod/photos.php:1359 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:1114 +#: ../../mod/photos.php:1111 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:1120 +#: ../../mod/photos.php:1117 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:1122 +#: ../../mod/photos.php:1119 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:1146 ../../mod/photos.php:1595 +#: ../../mod/photos.php:1143 ../../mod/photos.php:1595 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:1181 +#: ../../mod/photos.php:1178 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:1183 +#: ../../mod/photos.php:1180 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:1239 +#: ../../mod/photos.php:1236 msgid "View photo" msgstr "" -#: ../../mod/photos.php:1239 +#: ../../mod/photos.php:1236 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1240 +#: ../../mod/photos.php:1237 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:1246 ../../mod/content.php:603 -#: ../../object/Item.php:103 +#: ../../mod/photos.php:1243 ../../mod/content.php:603 +#: ../../object/Item.php:104 msgid "Private Message" msgstr "" -#: ../../mod/photos.php:1265 +#: ../../mod/photos.php:1262 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1339 +#: ../../mod/photos.php:1336 msgid "Tags: " msgstr "" -#: ../../mod/photos.php:1342 +#: ../../mod/photos.php:1339 msgid "[Remove any tag]" msgstr "" -#: ../../mod/photos.php:1352 +#: ../../mod/photos.php:1349 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:1353 +#: ../../mod/photos.php:1350 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:1355 +#: ../../mod/photos.php:1352 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1358 +#: ../../mod/photos.php:1355 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1360 +#: ../../mod/photos.php:1357 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1364 +#: ../../mod/photos.php:1361 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1384 ../../mod/content.php:667 -#: ../../object/Item.php:196 +#: ../../mod/photos.php:1381 ../../mod/content.php:667 +#: ../../object/Item.php:202 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1385 ../../mod/content.php:668 -#: ../../object/Item.php:197 +#: ../../mod/photos.php:1382 ../../mod/content.php:668 +#: ../../object/Item.php:203 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1386 ../../include/conversation.php:956 +#: ../../mod/photos.php:1383 ../../include/conversation.php:969 msgid "Share" msgstr "" -#: ../../mod/photos.php:1387 ../../mod/editpost.php:118 -#: ../../mod/content.php:482 ../../mod/content.php:845 -#: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:619 -#: ../../include/conversation.php:975 ../../object/Item.php:258 +#: ../../mod/photos.php:1384 ../../mod/editpost.php:121 +#: ../../mod/content.php:482 ../../mod/content.php:848 +#: ../../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:1403 ../../mod/photos.php:1446 -#: ../../mod/photos.php:1517 ../../mod/content.php:690 -#: ../../object/Item.php:555 +#: ../../mod/photos.php:1400 ../../mod/photos.php:1444 +#: ../../mod/photos.php:1516 ../../mod/content.php:690 +#: ../../object/Item.php:567 msgid "This is you" msgstr "" -#: ../../mod/photos.php:1405 ../../mod/photos.php:1448 -#: ../../mod/photos.php:1519 ../../mod/content.php:692 ../../boot.php:585 -#: ../../object/Item.php:557 +#: ../../mod/photos.php:1402 ../../mod/photos.php:1446 +#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608 +#: ../../object/Item.php:266 ../../object/Item.php:569 msgid "Comment" msgstr "" -#: ../../mod/photos.php:1407 ../../mod/photos.php:1450 -#: ../../mod/photos.php:1521 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:993 -#: ../../object/Item.php:567 +#: ../../mod/photos.php:1404 ../../mod/photos.php:1448 +#: ../../mod/photos.php:1520 ../../mod/editpost.php:142 +#: ../../mod/content.php:702 ../../include/conversation.php:1006 +#: ../../object/Item.php:579 msgid "Preview" msgstr "" -#: ../../mod/photos.php:1489 ../../mod/content.php:439 -#: ../../mod/content.php:723 ../../mod/settings.php:606 +#: ../../mod/photos.php:1488 ../../mod/content.php:439 +#: ../../mod/content.php:724 ../../mod/settings.php:622 #: ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:564 ../../object/Item.php:117 +#: ../../include/conversation.php:569 ../../object/Item.php:118 msgid "Delete" msgstr "" @@ -695,13 +685,13 @@ msgstr "" msgid "Not available." msgstr "" -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92 #: ../../include/nav.php:101 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 "" @@ -741,100 +731,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:942 +#: ../../mod/editpost.php:91 ../../include/conversation.php:955 msgid "Post to Email" msgstr "" -#: ../../mod/editpost.php:103 ../../mod/content.php:710 -#: ../../mod/settings.php:605 ../../object/Item.php:107 +#: ../../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:957 +#: ../../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:958 +#: ../../mod/editpost.php:108 ../../include/conversation.php:971 msgid "upload photo" msgstr "" -#: ../../mod/editpost.php:106 ../../include/conversation.php:959 +#: ../../mod/editpost.php:109 ../../include/conversation.php:972 msgid "Attach file" msgstr "" -#: ../../mod/editpost.php:107 ../../include/conversation.php:960 +#: ../../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:961 +#: ../../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:962 +#: ../../mod/editpost.php:112 ../../include/conversation.php:975 msgid "web link" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:963 +#: ../../mod/editpost.php:113 ../../include/conversation.php:976 msgid "Insert video link" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:964 +#: ../../mod/editpost.php:114 ../../include/conversation.php:977 msgid "video link" msgstr "" -#: ../../mod/editpost.php:112 ../../include/conversation.php:965 +#: ../../mod/editpost.php:115 ../../include/conversation.php:978 msgid "Insert audio link" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:966 +#: ../../mod/editpost.php:116 ../../include/conversation.php:979 msgid "audio link" msgstr "" -#: ../../mod/editpost.php:114 ../../include/conversation.php:967 +#: ../../mod/editpost.php:117 ../../include/conversation.php:980 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:115 ../../include/conversation.php:968 +#: ../../mod/editpost.php:118 ../../include/conversation.php:981 msgid "set location" msgstr "" -#: ../../mod/editpost.php:116 ../../include/conversation.php:969 +#: ../../mod/editpost.php:119 ../../include/conversation.php:982 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:117 ../../include/conversation.php:970 +#: ../../mod/editpost.php:120 ../../include/conversation.php:983 msgid "clear location" msgstr "" -#: ../../mod/editpost.php:119 ../../include/conversation.php:976 +#: ../../mod/editpost.php:122 ../../include/conversation.php:989 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:127 ../../include/conversation.php:985 +#: ../../mod/editpost.php:130 ../../include/conversation.php:998 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:128 ../../include/conversation.php:986 +#: ../../mod/editpost.php:131 ../../include/conversation.php:999 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:131 ../../include/conversation.php:972 +#: ../../mod/editpost.php:134 ../../include/conversation.php:985 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:133 ../../include/conversation.php:974 +#: ../../mod/editpost.php:136 ../../include/conversation.php:987 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:134 ../../include/conversation.php:988 +#: ../../mod/editpost.php:137 ../../include/conversation.php:1001 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -919,7 +909,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 "" @@ -955,7 +945,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3356 msgid "[Name Withheld]" msgstr "" @@ -1007,7 +997,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 "" @@ -1027,6 +1017,64 @@ msgstr "" msgid "Submit Request" msgstr "" +#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138 +msgid "Account settings" +msgstr "" + +#: ../../mod/uexport.php:14 ../../mod/settings.php:40 +msgid "Display settings" +msgstr "" + +#: ../../mod/uexport.php:20 ../../mod/settings.php:46 +msgid "Connector settings" +msgstr "" + +#: ../../mod/uexport.php:25 ../../mod/settings.php:51 +msgid "Plugin settings" +msgstr "" + +#: ../../mod/uexport.php:30 ../../mod/settings.php:56 +msgid "Connected apps" +msgstr "" + +#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:61 +msgid "Export personal data" +msgstr "" + +#: ../../mod/uexport.php:40 ../../mod/settings.php:66 +msgid "Remove account" +msgstr "" + +#: ../../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:615 +#: ../../include/nav.php:138 ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon.old/mathjax/mathjax.php:36 +msgid "Settings" +msgstr "" + +#: ../../mod/uexport.php:72 +msgid "Export account" +msgstr "" + +#: ../../mod/uexport.php:72 +msgid "" +"Export your account info and contacts. Use this to make a backup of your " +"account and/or to move it to another server." +msgstr "" + +#: ../../mod/uexport.php:73 +msgid "Export all" +msgstr "" + +#: ../../mod/uexport.php:73 +msgid "" +"Export your accout info, contacts and all your items as json. Could be a " +"very big file, and could take a lot of time. Use this to make a full backup " +"of your account (photos are not exported)" +msgstr "" + #: ../../mod/install.php:117 msgid "Friendica Social Communications Server - Setup" msgstr "" @@ -1347,7 +1395,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1175 +#: ../../include/contact_widgets.php:9 ../../boot.php:1216 msgid "Connect" msgstr "" @@ -1364,49 +1412,49 @@ 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 "" -#: ../../mod/content.php:438 ../../mod/content.php:722 -#: ../../include/conversation.php:563 ../../object/Item.php:116 +#: ../../mod/content.php:438 ../../mod/content.php:723 +#: ../../include/conversation.php:568 ../../object/Item.php:117 msgid "Select" msgstr "" -#: ../../mod/content.php:455 ../../mod/content.php:815 -#: ../../mod/content.php:816 ../../include/conversation.php:582 -#: ../../object/Item.php:227 ../../object/Item.php:228 +#: ../../mod/content.php:455 ../../mod/content.php:817 +#: ../../mod/content.php:818 ../../include/conversation.php:587 +#: ../../object/Item.php:234 ../../object/Item.php:235 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../mod/content.php:465 ../../mod/content.php:827 -#: ../../include/conversation.php:602 ../../object/Item.php:240 +#: ../../mod/content.php:465 ../../mod/content.php:829 +#: ../../include/conversation.php:607 ../../object/Item.php:248 #, php-format msgid "%s from %s" msgstr "" -#: ../../mod/content.php:480 ../../include/conversation.php:617 +#: ../../mod/content.php:480 ../../include/conversation.php:622 msgid "View in context" msgstr "" -#: ../../mod/content.php:586 ../../object/Item.php:277 +#: ../../mod/content.php:586 ../../object/Item.php:288 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../mod/content.php:588 ../../include/text.php:1441 -#: ../../object/Item.php:279 ../../object/Item.php:292 +#: ../../mod/content.php:588 ../../include/text.php:1446 +#: ../../object/Item.php:290 ../../object/Item.php:303 msgid "comment" msgid_plural "comments" msgstr[0] "" @@ -1414,97 +1462,97 @@ 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:586 -#: ../../object/Item.php:280 ../../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:196 +#: ../../mod/content.php:667 ../../object/Item.php:202 msgid "like" msgstr "" -#: ../../mod/content.php:668 ../../object/Item.php:197 +#: ../../mod/content.php:668 ../../object/Item.php:203 msgid "dislike" msgstr "" -#: ../../mod/content.php:670 ../../object/Item.php:199 +#: ../../mod/content.php:670 ../../object/Item.php:205 msgid "Share this" msgstr "" -#: ../../mod/content.php:670 ../../object/Item.php:199 +#: ../../mod/content.php:670 ../../object/Item.php:205 msgid "share" msgstr "" -#: ../../mod/content.php:694 ../../object/Item.php:559 +#: ../../mod/content.php:694 ../../object/Item.php:571 msgid "Bold" msgstr "" -#: ../../mod/content.php:695 ../../object/Item.php:560 +#: ../../mod/content.php:695 ../../object/Item.php:572 msgid "Italic" msgstr "" -#: ../../mod/content.php:696 ../../object/Item.php:561 +#: ../../mod/content.php:696 ../../object/Item.php:573 msgid "Underline" msgstr "" -#: ../../mod/content.php:697 ../../object/Item.php:562 +#: ../../mod/content.php:697 ../../object/Item.php:574 msgid "Quote" msgstr "" -#: ../../mod/content.php:698 ../../object/Item.php:563 +#: ../../mod/content.php:698 ../../object/Item.php:575 msgid "Code" msgstr "" -#: ../../mod/content.php:699 ../../object/Item.php:564 +#: ../../mod/content.php:699 ../../object/Item.php:576 msgid "Image" msgstr "" -#: ../../mod/content.php:700 ../../object/Item.php:565 +#: ../../mod/content.php:700 ../../object/Item.php:577 msgid "Link" msgstr "" -#: ../../mod/content.php:701 ../../object/Item.php:566 +#: ../../mod/content.php:701 ../../object/Item.php:578 msgid "Video" msgstr "" -#: ../../mod/content.php:735 ../../object/Item.php:180 +#: ../../mod/content.php:736 ../../object/Item.php:181 msgid "add star" msgstr "" -#: ../../mod/content.php:736 ../../object/Item.php:181 +#: ../../mod/content.php:737 ../../object/Item.php:182 msgid "remove star" msgstr "" -#: ../../mod/content.php:737 ../../object/Item.php:182 +#: ../../mod/content.php:738 ../../object/Item.php:183 msgid "toggle star status" msgstr "" -#: ../../mod/content.php:740 ../../object/Item.php:185 +#: ../../mod/content.php:741 ../../object/Item.php:186 msgid "starred" msgstr "" -#: ../../mod/content.php:741 ../../object/Item.php:186 +#: ../../mod/content.php:742 ../../object/Item.php:191 msgid "add tag" msgstr "" -#: ../../mod/content.php:745 ../../object/Item.php:120 +#: ../../mod/content.php:746 ../../object/Item.php:121 msgid "save to folder" msgstr "" -#: ../../mod/content.php:817 ../../object/Item.php:229 +#: ../../mod/content.php:819 ../../object/Item.php:236 msgid "to" msgstr "" -#: ../../mod/content.php:818 ../../object/Item.php:230 +#: ../../mod/content.php:820 ../../object/Item.php:238 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/content.php:819 ../../object/Item.php:231 +#: ../../mod/content.php:821 ../../object/Item.php:239 msgid "via Wall-To-Wall:" msgstr "" -#: ../../mod/home.php:28 ../../addon/communityhome/communityhome.php:179 +#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179 #: ../../addon.old/communityhome/communityhome.php:179 #, php-format msgid "Welcome to %s" @@ -1520,8 +1568,8 @@ msgid "Discard" msgstr "" #: ../../mod/notifications.php:51 ../../mod/notifications.php:163 -#: ../../mod/notifications.php:209 ../../mod/contacts.php:321 -#: ../../mod/contacts.php:375 +#: ../../mod/notifications.php:209 ../../mod/contacts.php:325 +#: ../../mod/contacts.php:379 msgid "Ignore" msgstr "" @@ -1533,21 +1581,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 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 +#: ../../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 "" @@ -1573,7 +1621,7 @@ msgid "suggested by %s" msgstr "" #: ../../mod/notifications.php:156 ../../mod/notifications.php:203 -#: ../../mod/contacts.php:381 +#: ../../mod/contacts.php:385 msgid "Hide this contact from others" msgstr "" @@ -1630,7 +1678,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 "" @@ -1695,307 +1743,309 @@ 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:216 +#: ../../mod/contacts.php:220 msgid "Contact has been archived" msgstr "" -#: ../../mod/contacts.php:216 +#: ../../mod/contacts.php:220 msgid "Contact has been unarchived" msgstr "" -#: ../../mod/contacts.php:229 +#: ../../mod/contacts.php:233 msgid "Contact has been removed." msgstr "" -#: ../../mod/contacts.php:263 +#: ../../mod/contacts.php:267 #, php-format msgid "You are mutual friends with %s" msgstr "" -#: ../../mod/contacts.php:267 +#: ../../mod/contacts.php:271 #, php-format msgid "You are sharing with %s" msgstr "" -#: ../../mod/contacts.php:272 +#: ../../mod/contacts.php:276 #, php-format msgid "%s is sharing with you" msgstr "" -#: ../../mod/contacts.php:289 +#: ../../mod/contacts.php:293 msgid "Private communications are not available for this contact." msgstr "" -#: ../../mod/contacts.php:292 +#: ../../mod/contacts.php:296 msgid "Never" msgstr "" -#: ../../mod/contacts.php:296 +#: ../../mod/contacts.php:300 msgid "(Update was successful)" msgstr "" -#: ../../mod/contacts.php:296 +#: ../../mod/contacts.php:300 msgid "(Update was not successful)" msgstr "" -#: ../../mod/contacts.php:298 +#: ../../mod/contacts.php:302 msgid "Suggest friends" msgstr "" -#: ../../mod/contacts.php:302 +#: ../../mod/contacts.php:306 #, php-format msgid "Network type: %s" msgstr "" -#: ../../mod/contacts.php:305 ../../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:310 +#: ../../mod/contacts.php:314 msgid "View all contacts" msgstr "" -#: ../../mod/contacts.php:315 ../../mod/contacts.php:374 +#: ../../mod/contacts.php:319 ../../mod/contacts.php:378 #: ../../mod/admin.php:698 msgid "Unblock" msgstr "" -#: ../../mod/contacts.php:315 ../../mod/contacts.php:374 +#: ../../mod/contacts.php:319 ../../mod/contacts.php:378 #: ../../mod/admin.php:697 msgid "Block" msgstr "" -#: ../../mod/contacts.php:318 +#: ../../mod/contacts.php:322 msgid "Toggle Blocked status" msgstr "" -#: ../../mod/contacts.php:321 ../../mod/contacts.php:375 +#: ../../mod/contacts.php:325 ../../mod/contacts.php:379 msgid "Unignore" msgstr "" -#: ../../mod/contacts.php:324 +#: ../../mod/contacts.php:328 msgid "Toggle Ignored status" msgstr "" -#: ../../mod/contacts.php:328 +#: ../../mod/contacts.php:332 msgid "Unarchive" msgstr "" -#: ../../mod/contacts.php:328 +#: ../../mod/contacts.php:332 msgid "Archive" msgstr "" -#: ../../mod/contacts.php:331 +#: ../../mod/contacts.php:335 msgid "Toggle Archive status" msgstr "" -#: ../../mod/contacts.php:334 +#: ../../mod/contacts.php:338 msgid "Repair" msgstr "" -#: ../../mod/contacts.php:337 +#: ../../mod/contacts.php:341 msgid "Advanced Contact Settings" msgstr "" -#: ../../mod/contacts.php:343 +#: ../../mod/contacts.php:347 msgid "Communications lost with this contact!" msgstr "" -#: ../../mod/contacts.php:346 +#: ../../mod/contacts.php:350 msgid "Contact Editor" msgstr "" -#: ../../mod/contacts.php:349 +#: ../../mod/contacts.php:353 msgid "Profile Visibility" msgstr "" -#: ../../mod/contacts.php:350 +#: ../../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:351 +#: ../../mod/contacts.php:355 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/contacts.php:352 +#: ../../mod/contacts.php:356 msgid "Edit contact notes" msgstr "" -#: ../../mod/contacts.php:357 ../../mod/contacts.php:549 +#: ../../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:358 +#: ../../mod/contacts.php:362 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/contacts.php:359 +#: ../../mod/contacts.php:363 msgid "Ignore contact" msgstr "" -#: ../../mod/contacts.php:360 +#: ../../mod/contacts.php:364 msgid "Repair URL settings" msgstr "" -#: ../../mod/contacts.php:361 +#: ../../mod/contacts.php:365 msgid "View conversations" msgstr "" -#: ../../mod/contacts.php:363 +#: ../../mod/contacts.php:367 msgid "Delete contact" msgstr "" -#: ../../mod/contacts.php:367 +#: ../../mod/contacts.php:371 msgid "Last update:" msgstr "" -#: ../../mod/contacts.php:369 +#: ../../mod/contacts.php:373 msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:371 ../../mod/admin.php:1170 +#: ../../mod/contacts.php:375 ../../mod/admin.php:1170 msgid "Update now" msgstr "" -#: ../../mod/contacts.php:378 +#: ../../mod/contacts.php:382 msgid "Currently blocked" msgstr "" -#: ../../mod/contacts.php:379 +#: ../../mod/contacts.php:383 msgid "Currently ignored" msgstr "" -#: ../../mod/contacts.php:380 +#: ../../mod/contacts.php:384 msgid "Currently archived" msgstr "" -#: ../../mod/contacts.php:381 +#: ../../mod/contacts.php:385 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/contacts.php:434 +#: ../../mod/contacts.php:438 msgid "Suggestions" msgstr "" -#: ../../mod/contacts.php:437 +#: ../../mod/contacts.php:441 msgid "Suggest potential friends" msgstr "" -#: ../../mod/contacts.php:440 ../../mod/group.php:191 +#: ../../mod/contacts.php:444 ../../mod/group.php:191 msgid "All Contacts" msgstr "" -#: ../../mod/contacts.php:443 +#: ../../mod/contacts.php:447 msgid "Show all contacts" msgstr "" -#: ../../mod/contacts.php:446 +#: ../../mod/contacts.php:450 msgid "Unblocked" msgstr "" -#: ../../mod/contacts.php:449 +#: ../../mod/contacts.php:453 msgid "Only show unblocked contacts" msgstr "" -#: ../../mod/contacts.php:453 +#: ../../mod/contacts.php:457 msgid "Blocked" msgstr "" -#: ../../mod/contacts.php:456 +#: ../../mod/contacts.php:460 msgid "Only show blocked contacts" msgstr "" -#: ../../mod/contacts.php:460 +#: ../../mod/contacts.php:464 msgid "Ignored" msgstr "" -#: ../../mod/contacts.php:463 +#: ../../mod/contacts.php:467 msgid "Only show ignored contacts" msgstr "" -#: ../../mod/contacts.php:467 +#: ../../mod/contacts.php:471 msgid "Archived" msgstr "" -#: ../../mod/contacts.php:470 +#: ../../mod/contacts.php:474 msgid "Only show archived contacts" msgstr "" -#: ../../mod/contacts.php:474 +#: ../../mod/contacts.php:478 msgid "Hidden" msgstr "" -#: ../../mod/contacts.php:477 +#: ../../mod/contacts.php:481 msgid "Only show hidden contacts" msgstr "" -#: ../../mod/contacts.php:525 +#: ../../mod/contacts.php:529 msgid "Mutual Friendship" msgstr "" -#: ../../mod/contacts.php:529 +#: ../../mod/contacts.php:533 msgid "is a fan of yours" msgstr "" -#: ../../mod/contacts.php:533 +#: ../../mod/contacts.php:537 msgid "you are a fan of" msgstr "" -#: ../../mod/contacts.php:550 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:554 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89 -#: ../../include/nav.php:139 +#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:88 +#: ../../include/nav.php:142 msgid "Contacts" msgstr "" -#: ../../mod/contacts.php:575 +#: ../../mod/contacts.php:579 msgid "Search your contacts" msgstr "" -#: ../../mod/contacts.php:576 ../../mod/directory.php:59 +#: ../../mod/contacts.php:580 ../../mod/directory.php:59 +#: ../../addon/forumdirectory/forumdirectory.php:81 msgid "Finding: " msgstr "" -#: ../../mod/contacts.php:577 ../../mod/directory.php:61 +#: ../../mod/contacts.php:581 ../../mod/directory.php:61 +#: ../../addon/forumdirectory/forumdirectory.php:83 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "" @@ -2014,13 +2064,13 @@ msgid "Password reset requested at %s" msgstr "" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 -#: ../../mod/register.php:90 ../../mod/register.php:144 +#: ../../mod/register.php:91 ../../mod/register.php:145 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 #: ../../addon/facebook/facebook.php:702 #: ../../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:3301 -#: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365 +#: ../../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 @@ -2034,7 +2084,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:936 +#: ../../mod/lostpass.php:83 ../../boot.php:963 msgid "Password Reset" msgstr "" @@ -2078,107 +2128,77 @@ msgstr "" msgid "Reset" msgstr "" -#: ../../mod/settings.php:30 ../../include/nav.php:137 -msgid "Account settings" -msgstr "" - #: ../../mod/settings.php:35 -msgid "Display settings" -msgstr "" - -#: ../../mod/settings.php:41 -msgid "Connector settings" -msgstr "" - -#: ../../mod/settings.php:46 -msgid "Plugin settings" -msgstr "" - -#: ../../mod/settings.php:51 -msgid "Connected apps" -msgstr "" - -#: ../../mod/settings.php:56 -msgid "Export personal data" +msgid "Additional features" msgstr "" -#: ../../mod/settings.php:61 -msgid "Remove account" -msgstr "" - -#: ../../mod/settings.php:69 ../../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:537 -#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137 -#: ../../addon.old/dav/friendica/layout.fnk.php:225 -#: ../../addon.old/mathjax/mathjax.php:36 -msgid "Settings" -msgstr "" - -#: ../../mod/settings.php:113 +#: ../../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 +#: ../../mod/settings.php:246 +msgid "Features updated" +msgstr "" + +#: ../../mod/settings.php:306 msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/settings.php:295 +#: ../../mod/settings.php:311 msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/settings.php:306 +#: ../../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 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 -#: ../../addon/twitter/twitter.php:389 +#: ../../addon/twitter/twitter.php:501 #: ../../addon.old/facebook/facebook.php:495 #: ../../addon.old/fbpost/fbpost.php:144 #: ../../addon.old/impressum/impressum.php:78 @@ -2188,442 +2208,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 -#: ../../addon/statusnet/statusnet.php:570 +#: ../../mod/settings.php:562 ../../mod/settings.php:588 +#: ../../addon/statusnet/statusnet.php:679 #: ../../addon.old/statusnet/statusnet.php:570 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:547 ../../mod/settings.php:573 -#: ../../addon/statusnet/statusnet.php:569 +#: ../../mod/settings.php:563 ../../mod/settings.php:589 +#: ../../addon/statusnet/statusnet.php:678 #: ../../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 "" @@ -2645,63 +2677,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" +#: ../../mod/network.php:462 +msgid "Shared Links" msgstr "" -#: ../../mod/network.php:422 -msgid "Favourite Posts" +#: ../../mod/network.php:465 +msgid "Interesting Links" msgstr "" -#: ../../mod/network.php:425 -msgid "Shared Links" +#: ../../mod/network.php:471 +msgid "Starred" msgstr "" -#: ../../mod/network.php:428 -msgid "Interesting Links" +#: ../../mod/network.php:474 +msgid "Favourite Posts" msgstr "" -#: ../../mod/network.php:496 +#: ../../mod/network.php:546 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2709,32 +2742,32 @@ 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:1708 +#: ../../mod/notes.php:44 ../../boot.php:1755 msgid "Personal Notes" msgstr "" #: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../addon/facebook/facebook.php:770 -#: ../../addon/privacy_image_cache/privacy_image_cache.php:263 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:281 #: ../../addon/fbpost/fbpost.php:267 #: ../../addon/dav/friendica/layout.fnk.php:441 -#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681 +#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688 #: ../../addon.old/facebook/facebook.php:770 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263 #: ../../addon.old/fbpost/fbpost.php:267 @@ -2743,12 +2776,47 @@ msgstr "" msgid "Save" msgstr "" +#: ../../mod/uimport.php:50 ../../mod/register.php:190 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "" + +#: ../../mod/uimport.php:64 +msgid "Import" +msgstr "" + +#: ../../mod/uimport.php:66 +msgid "Move account" +msgstr "" + +#: ../../mod/uimport.php:67 +msgid "" +"You can import an account from another Friendica server.
\r\n" +" You need to export your account from the old " +"server and upload it here. We will recreate your old account here with all " +"your contacts. We will try also to inform your friends that you moved here." +"
\r\n" +" This feature is experimental. We can't import " +"contacts from the OStatus network (statusnet/identi.ca) or from diaspora" +msgstr "" + +#: ../../mod/uimport.php:70 +msgid "Account file" +msgstr "" + +#: ../../mod/uimport.php:70 +msgid "" +"To export your accont, go to \"Settings->Export your porsonal data\" and " +"select \"Export account\"" +msgstr "" + #: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112 #, php-format 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 "" @@ -2756,15 +2824,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 "" @@ -2773,12 +2841,12 @@ msgid "No recipient." msgstr "" #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 -#: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:893 ../../include/conversation.php:910 +#: ../../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 "" @@ -2789,18 +2857,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 "" @@ -2855,9 +2923,9 @@ msgid "" msgstr "" #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1684 +#: ../../boot.php:1731 msgid "Profile" msgstr "" @@ -3028,7 +3096,7 @@ msgstr "" msgid "Group name changed." msgstr "" -#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:318 +#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:332 msgid "Permission denied" msgstr "" @@ -3080,95 +3148,89 @@ msgstr "" msgid "No contacts." msgstr "" -#: ../../mod/viewcontacts.php:76 ../../include/text.php:618 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:625 msgid "View Contacts" msgstr "" -#: ../../mod/register.php:88 ../../mod/regmod.php:52 +#: ../../mod/register.php:89 ../../mod/regmod.php:52 #, php-format msgid "Registration details for %s" msgstr "" -#: ../../mod/register.php:96 +#: ../../mod/register.php:97 msgid "" "Registration successful. Please check your email for further instructions." msgstr "" -#: ../../mod/register.php:100 +#: ../../mod/register.php:101 msgid "Failed to send email message. Here is the message that failed." msgstr "" -#: ../../mod/register.php:105 +#: ../../mod/register.php:106 msgid "Your registration can not be processed." msgstr "" -#: ../../mod/register.php:142 +#: ../../mod/register.php:143 #, php-format msgid "Registration request at %s" msgstr "" -#: ../../mod/register.php:151 +#: ../../mod/register.php:152 msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../mod/register.php:189 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "" - -#: ../../mod/register.php:217 +#: ../../mod/register.php:218 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking 'Register'." msgstr "" -#: ../../mod/register.php:218 +#: ../../mod/register.php:219 msgid "" "If you are not familiar with OpenID, please leave that field blank and fill " "in the rest of the items." msgstr "" -#: ../../mod/register.php:219 +#: ../../mod/register.php:220 msgid "Your OpenID (optional): " msgstr "" -#: ../../mod/register.php:233 +#: ../../mod/register.php:234 msgid "Include your profile in member directory?" msgstr "" -#: ../../mod/register.php:255 +#: ../../mod/register.php:256 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/register.php:256 +#: ../../mod/register.php:257 msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:259 ../../mod/admin.php:444 +#: ../../mod/register.php:260 ../../mod/admin.php:444 msgid "Registration" msgstr "" -#: ../../mod/register.php:267 +#: ../../mod/register.php:268 msgid "Your Full Name (e.g. Joe Smith): " msgstr "" -#: ../../mod/register.php:268 +#: ../../mod/register.php:269 msgid "Your Email Address: " msgstr "" -#: ../../mod/register.php:269 +#: ../../mod/register.php:270 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be 'nickname@$sitename'." msgstr "" -#: ../../mod/register.php:270 +#: ../../mod/register.php:271 msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:898 +#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923 msgid "Register" msgstr "" @@ -3176,12 +3238,21 @@ msgstr "" msgid "People Search" msgstr "" +#: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62 +#: ../../addon/communityhome/communityhome.php:163 +#: ../../view/theme/diabook/theme.php:458 ../../include/text.php:1442 +#: ../../include/diaspora.php:1848 ../../include/conversation.php:125 +#: ../../include/conversation.php:253 +#: ../../addon.old/communityhome/communityhome.php:163 +msgid "photo" +msgstr "" + #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:459 -#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835 +#: ../../view/theme/diabook/theme.php:453 +#: ../../view/theme/diabook/theme.php:462 ../../include/diaspora.php:1848 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3192,7 +3263,7 @@ msgstr "" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:467 ../../include/diaspora.php:1864 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3206,8 +3277,8 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 -#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 -#: ../../mod/display.php:145 ../../include/items.php:3779 +#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39 +#: ../../mod/display.php:169 ../../include/items.php:3843 msgid "Item not found." msgstr "" @@ -3215,8 +3286,8 @@ msgstr "" msgid "Access denied." msgstr "" -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 -#: ../../include/nav.php:51 ../../boot.php:1691 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 +#: ../../include/nav.php:51 ../../boot.php:1738 msgid "Photos" msgstr "" @@ -3237,42 +3308,42 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../mod/item.php:91 +#: ../../mod/item.php:104 msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:275 +#: ../../mod/item.php:288 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:407 ../../mod/wall_upload.php:133 -#: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149 +#: ../../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:820 +#: ../../mod/item.php:837 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:845 +#: ../../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:847 +#: ../../mod/item.php:864 #, php-format msgid "You may visit them online at %s" msgstr "" -#: ../../mod/item.php:848 +#: ../../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:850 +#: ../../mod/item.php:867 #, php-format msgid "%s posted an update." msgstr "" @@ -3310,7 +3381,7 @@ msgstr "" msgid "Unable to process image" msgstr "" -#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:88 +#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:90 #, php-format msgid "Image exceeds size limit of %d" msgstr "" @@ -3371,71 +3442,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 "" @@ -3476,7 +3547,7 @@ msgstr "" msgid "Logs" msgstr "" -#: ../../mod/admin.php:120 ../../include/nav.php:146 +#: ../../mod/admin.php:120 ../../include/nav.php:149 msgid "Admin" msgstr "" @@ -3582,7 +3653,7 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:567 +#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:676 #: ../../addon.old/statusnet/statusnet.php:567 msgid "Site name" msgstr "" @@ -3958,6 +4029,7 @@ msgstr "" #: ../../mod/admin.php:692 ../../mod/admin.php:702 #: ../../include/contact_selectors.php:79 +#: ../../include/contact_selectors.php:86 msgid "Email" msgstr "" @@ -4093,11 +4165,11 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:1085 +#: ../../mod/profile.php:21 ../../boot.php:1126 msgid "Requested profile is not available." msgstr "" -#: ../../mod/profile.php:155 ../../mod/display.php:77 +#: ../../mod/profile.php:155 ../../mod/display.php:87 msgid "Access to this profile has been restricted." msgstr "" @@ -4163,8 +4235,8 @@ msgid "" "Account not found and OpenID registration is not permitted on this site." msgstr "" -#: ../../mod/openid.php:93 ../../include/auth.php:98 -#: ../../include/auth.php:161 +#: ../../mod/openid.php:93 ../../include/auth.php:110 +#: ../../include/auth.php:173 msgid "Login failed." msgstr "" @@ -4189,7 +4261,7 @@ msgstr "" msgid "link" msgstr "" -#: ../../mod/display.php:138 +#: ../../mod/display.php:162 msgid "Item has been removed." msgstr "" @@ -4201,8 +4273,8 @@ msgstr "" msgid "No installed applications." msgstr "" -#: ../../mod/search.php:96 ../../include/text.php:678 -#: ../../include/text.php:679 ../../include/nav.php:91 +#: ../../mod/search.php:99 ../../include/text.php:685 +#: ../../include/text.php:686 ../../include/nav.php:91 msgid "Search" msgstr "" @@ -4311,211 +4383,212 @@ 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 +#: ../../addon/forumdirectory/forumdirectory.php:133 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:688 +#: ../../mod/profiles.php:691 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:689 ../../boot.php:1203 +#: ../../mod/profiles.php:692 ../../boot.php:1244 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:690 ../../boot.php:1204 +#: ../../mod/profiles.php:693 ../../boot.php:1245 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:701 ../../boot.php:1214 +#: ../../mod/profiles.php:704 ../../boot.php:1255 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:703 ../../boot.php:1217 +#: ../../mod/profiles.php:706 ../../boot.php:1258 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:704 ../../boot.php:1218 +#: ../../mod/profiles.php:707 ../../boot.php:1259 msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:897 -#: ../../include/conversation.php:914 +#: ../../mod/filer.php:29 ../../include/conversation.php:909 +#: ../../include/conversation.php:927 msgid "Save to Folder:" msgstr "" @@ -4607,7 +4680,7 @@ msgstr "" msgid "diaspora2bb: " msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:514 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "" @@ -4622,42 +4695,50 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518 +#: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71 +#: ../../view/theme/diabook/theme.php:512 msgid "Global Directory" msgstr "" -#: ../../mod/directory.php:57 +#: ../../mod/directory.php:57 ../../addon/forumdirectory/forumdirectory.php:79 msgid "Find on this site" msgstr "" -#: ../../mod/directory.php:60 +#: ../../mod/directory.php:60 ../../addon/forumdirectory/forumdirectory.php:82 msgid "Site Directory" msgstr "" #: ../../mod/directory.php:114 +#: ../../addon/forumdirectory/forumdirectory.php:136 msgid "Gender: " msgstr "" -#: ../../mod/directory.php:136 ../../include/profile_advanced.php:17 -#: ../../boot.php:1239 +#: ../../mod/directory.php:136 +#: ../../addon/forumdirectory/forumdirectory.php:158 +#: ../../include/profile_advanced.php:17 ../../boot.php:1280 msgid "Gender:" msgstr "" -#: ../../mod/directory.php:138 ../../include/profile_advanced.php:37 -#: ../../boot.php:1242 +#: ../../mod/directory.php:138 +#: ../../addon/forumdirectory/forumdirectory.php:160 +#: ../../include/profile_advanced.php:37 ../../boot.php:1283 msgid "Status:" msgstr "" -#: ../../mod/directory.php:140 ../../include/profile_advanced.php:48 -#: ../../boot.php:1244 +#: ../../mod/directory.php:140 +#: ../../addon/forumdirectory/forumdirectory.php:162 +#: ../../include/profile_advanced.php:48 ../../boot.php:1285 msgid "Homepage:" msgstr "" -#: ../../mod/directory.php:142 ../../include/profile_advanced.php:58 +#: ../../mod/directory.php:142 +#: ../../addon/forumdirectory/forumdirectory.php:164 +#: ../../include/profile_advanced.php:58 msgid "About:" msgstr "" #: ../../mod/directory.php:180 +#: ../../addon/forumdirectory/forumdirectory.php:202 msgid "No entries (some entries may be hidden)." msgstr "" @@ -5128,27 +5209,27 @@ msgstr "" msgid "Automatically follow any StatusNet followers/mentioners" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:260 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:278 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260 msgid "Lifetime of the cache (in hours)" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:265 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:283 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265 msgid "Cache Statistics" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:268 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:286 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268 msgid "Number of items" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:270 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:288 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270 msgid "Size of the cache" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:272 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:290 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272 msgid "Delete the whole cache" msgstr "" @@ -5516,11 +5597,15 @@ msgstr "" msgid "Enable Planets Plugin" msgstr "" +#: ../../addon/forumdirectory/forumdirectory.php:22 +msgid "Forum Directory" +msgstr "" + #: ../../addon/communityhome/communityhome.php:28 #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:923 +#: ../../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 @@ -5560,7 +5645,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1435 +#: ../../view/theme/diabook/theme.php:450 ../../include/text.php:1440 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -5714,7 +5799,7 @@ msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:254 #: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:293 -#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270 @@ -5725,7 +5810,7 @@ msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:235 #: ../../addon/dav/common/wdcal_edit.inc.php:274 -#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308 @@ -5733,35 +5818,35 @@ msgid "Monday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:238 -#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277 msgid "Tuesday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:241 -#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280 msgid "Wednesday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:244 -#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283 msgid "Thursday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:247 -#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286 msgid "Friday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:250 -#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289 msgid "Saturday" @@ -6129,7 +6214,7 @@ msgstr "" #: ../../addon/dav/friendica/main.php:279 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464 -#: ../../include/enotify.php:28 ../../include/notifier.php:710 +#: ../../include/enotify.php:28 ../../include/notifier.php:774 #: ../../addon.old/dav/friendica/main.php:279 #: ../../addon.old/dav/friendica/main.php:280 msgid "noreply" @@ -6483,22 +6568,22 @@ msgstr "" msgid "Failed" msgstr "" -#: ../../addon/js_upload/js_upload.php:297 +#: ../../addon/js_upload/js_upload.php:303 #: ../../addon.old/js_upload/js_upload.php:297 msgid "No files were uploaded." msgstr "" -#: ../../addon/js_upload/js_upload.php:303 +#: ../../addon/js_upload/js_upload.php:309 #: ../../addon.old/js_upload/js_upload.php:303 msgid "Uploaded file is empty" msgstr "" -#: ../../addon/js_upload/js_upload.php:326 +#: ../../addon/js_upload/js_upload.php:332 #: ../../addon.old/js_upload/js_upload.php:326 msgid "File has an invalid extension, it should be one of " msgstr "" -#: ../../addon/js_upload/js_upload.php:337 +#: ../../addon/js_upload/js_upload.php:343 #: ../../addon.old/js_upload/js_upload.php:337 msgid "Upload was cancelled, or server error encountered" msgstr "" @@ -7202,7 +7287,7 @@ msgstr "" msgid "Clear OAuth configuration" msgstr "" -#: ../../addon/statusnet/statusnet.php:568 +#: ../../addon/statusnet/statusnet.php:677 #: ../../addon.old/statusnet/statusnet.php:568 msgid "API URL" msgstr "" @@ -7436,11 +7521,11 @@ msgstr "" msgid "Send linked #-tags and @-names to Twitter" msgstr "" -#: ../../addon/twitter/twitter.php:396 ../../addon.old/twitter/twitter.php:396 +#: ../../addon/twitter/twitter.php:508 ../../addon.old/twitter/twitter.php:396 msgid "Consumer key" msgstr "" -#: ../../addon/twitter/twitter.php:397 ../../addon.old/twitter/twitter.php:397 +#: ../../addon/twitter/twitter.php:509 ../../addon.old/twitter/twitter.php:397 msgid "Consumer secret" msgstr "" @@ -7578,137 +7663,135 @@ msgstr "" msgid "Color scheme" msgstr "" -#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 -#: ../../include/nav.php:115 +#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 +#: ../../include/nav.php:116 msgid "Your posts and conversations" msgstr "" -#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50 msgid "Your profile page" msgstr "" -#: ../../view/theme/diabook/theme.php:89 +#: ../../view/theme/diabook/theme.php:88 msgid "Your contacts" msgstr "" -#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51 msgid "Your photos" msgstr "" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52 msgid "Your events" msgstr "" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Personal notes" msgstr "" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Your personal photos" msgstr "" -#: ../../view/theme/diabook/theme.php:94 -#: ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:632 +#: ../../view/theme/diabook/theme.php:93 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook/theme.php:384 -#: ../../view/theme/diabook/theme.php:634 +#: ../../view/theme/diabook/theme.php:378 +#: ../../view/theme/diabook/theme.php:592 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "" -#: ../../view/theme/diabook/theme.php:405 -#: ../../view/theme/diabook/theme.php:639 +#: ../../view/theme/diabook/theme.php:399 +#: ../../view/theme/diabook/theme.php:597 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "" -#: ../../view/theme/diabook/theme.php:434 -#: ../../view/theme/diabook/theme.php:641 +#: ../../view/theme/diabook/theme.php:428 +#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "" -#: ../../view/theme/diabook/theme.php:479 -#: ../../view/theme/diabook/theme.php:640 +#: ../../view/theme/diabook/theme.php:473 +#: ../../view/theme/diabook/theme.php:598 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "" -#: ../../view/theme/diabook/theme.php:516 -#: ../../view/theme/diabook/theme.php:637 +#: ../../view/theme/diabook/theme.php:510 +#: ../../view/theme/diabook/theme.php:595 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:517 +#: ../../view/theme/diabook/theme.php:511 msgid "Local Directory" msgstr "" -#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:513 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "" -#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:515 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:572 -#: ../../view/theme/diabook/theme.php:633 +#: ../../view/theme/diabook/theme.php:532 +#: ../../view/theme/diabook/theme.php:591 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:577 +#: ../../view/theme/diabook/theme.php:537 msgid "Set zoomfactor for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:578 +#: ../../view/theme/diabook/theme.php:538 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:579 +#: ../../view/theme/diabook/theme.php:539 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:592 -#: ../../view/theme/diabook/theme.php:635 +#: ../../view/theme/diabook/theme.php:552 +#: ../../view/theme/diabook/theme.php:593 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "" -#: ../../view/theme/diabook/theme.php:599 -#: ../../view/theme/diabook/theme.php:636 +#: ../../view/theme/diabook/theme.php:559 +#: ../../view/theme/diabook/theme.php:594 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "" -#: ../../view/theme/diabook/theme.php:606 -#: ../../view/theme/diabook/theme.php:638 +#: ../../view/theme/diabook/theme.php:566 +#: ../../view/theme/diabook/theme.php:596 msgid "Last Tweets" msgstr "" -#: ../../view/theme/diabook/theme.php:609 +#: ../../view/theme/diabook/theme.php:569 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:588 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 msgid "don't show" msgstr "" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:588 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 msgid "show" msgstr "" -#: ../../view/theme/diabook/theme.php:630 +#: ../../view/theme/diabook/theme.php:589 msgid "Show/hide boxes at right-hand column:" msgstr "" @@ -7882,6 +7965,10 @@ msgstr "" msgid "MySpace" msgstr "" +#: ../../include/contact_selectors.php:87 +msgid "Google+" +msgstr "" + #: ../../include/profile_selectors.php:6 msgid "Male" msgstr "" @@ -8123,7 +8210,7 @@ msgstr "" msgid "Finishes:" msgstr "" -#: ../../include/delivery.php:457 ../../include/notifier.php:703 +#: ../../include/delivery.php:457 ../../include/notifier.php:767 msgid "(no subject)" msgstr "" @@ -8155,218 +8242,218 @@ msgstr "" msgid "older" msgstr "" -#: ../../include/text.php:597 +#: ../../include/text.php:604 msgid "No contacts" msgstr "" -#: ../../include/text.php:606 +#: ../../include/text.php:613 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:719 +#: ../../include/text.php:726 msgid "poke" msgstr "" -#: ../../include/text.php:719 ../../include/conversation.php:210 +#: ../../include/text.php:726 ../../include/conversation.php:210 msgid "poked" msgstr "" -#: ../../include/text.php:720 +#: ../../include/text.php:727 msgid "ping" msgstr "" -#: ../../include/text.php:720 +#: ../../include/text.php:727 msgid "pinged" msgstr "" -#: ../../include/text.php:721 +#: ../../include/text.php:728 msgid "prod" msgstr "" -#: ../../include/text.php:721 +#: ../../include/text.php:728 msgid "prodded" msgstr "" -#: ../../include/text.php:722 +#: ../../include/text.php:729 msgid "slap" msgstr "" -#: ../../include/text.php:722 +#: ../../include/text.php:729 msgid "slapped" msgstr "" -#: ../../include/text.php:723 +#: ../../include/text.php:730 msgid "finger" msgstr "" -#: ../../include/text.php:723 +#: ../../include/text.php:730 msgid "fingered" msgstr "" -#: ../../include/text.php:724 +#: ../../include/text.php:731 msgid "rebuff" msgstr "" -#: ../../include/text.php:724 +#: ../../include/text.php:731 msgid "rebuffed" msgstr "" -#: ../../include/text.php:736 +#: ../../include/text.php:743 msgid "happy" msgstr "" -#: ../../include/text.php:737 +#: ../../include/text.php:744 msgid "sad" msgstr "" -#: ../../include/text.php:738 +#: ../../include/text.php:745 msgid "mellow" msgstr "" -#: ../../include/text.php:739 +#: ../../include/text.php:746 msgid "tired" msgstr "" -#: ../../include/text.php:740 +#: ../../include/text.php:747 msgid "perky" msgstr "" -#: ../../include/text.php:741 +#: ../../include/text.php:748 msgid "angry" msgstr "" -#: ../../include/text.php:742 +#: ../../include/text.php:749 msgid "stupified" msgstr "" -#: ../../include/text.php:743 +#: ../../include/text.php:750 msgid "puzzled" msgstr "" -#: ../../include/text.php:744 +#: ../../include/text.php:751 msgid "interested" msgstr "" -#: ../../include/text.php:745 +#: ../../include/text.php:752 msgid "bitter" msgstr "" -#: ../../include/text.php:746 +#: ../../include/text.php:753 msgid "cheerful" msgstr "" -#: ../../include/text.php:747 +#: ../../include/text.php:754 msgid "alive" msgstr "" -#: ../../include/text.php:748 +#: ../../include/text.php:755 msgid "annoyed" msgstr "" -#: ../../include/text.php:749 +#: ../../include/text.php:756 msgid "anxious" msgstr "" -#: ../../include/text.php:750 +#: ../../include/text.php:757 msgid "cranky" msgstr "" -#: ../../include/text.php:751 +#: ../../include/text.php:758 msgid "disturbed" msgstr "" -#: ../../include/text.php:752 +#: ../../include/text.php:759 msgid "frustrated" msgstr "" -#: ../../include/text.php:753 +#: ../../include/text.php:760 msgid "motivated" msgstr "" -#: ../../include/text.php:754 +#: ../../include/text.php:761 msgid "relaxed" msgstr "" -#: ../../include/text.php:755 +#: ../../include/text.php:762 msgid "surprised" msgstr "" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "January" msgstr "" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "February" msgstr "" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "March" msgstr "" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "April" msgstr "" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "May" msgstr "" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "June" msgstr "" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "July" msgstr "" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "August" msgstr "" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "September" msgstr "" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "October" msgstr "" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "November" msgstr "" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "December" msgstr "" -#: ../../include/text.php:1005 +#: ../../include/text.php:1010 msgid "bytes" msgstr "" -#: ../../include/text.php:1032 ../../include/text.php:1044 +#: ../../include/text.php:1037 ../../include/text.php:1049 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1217 ../../include/user.php:236 +#: ../../include/text.php:1222 ../../include/user.php:236 msgid "default" msgstr "" -#: ../../include/text.php:1229 +#: ../../include/text.php:1234 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1439 +#: ../../include/text.php:1444 msgid "activity" msgstr "" -#: ../../include/text.php:1442 +#: ../../include/text.php:1447 msgid "post" msgstr "" -#: ../../include/text.php:1597 +#: ../../include/text.php:1602 msgid "Item filed" msgstr "" @@ -8374,11 +8461,11 @@ msgstr "" msgid "Sharing notification from Diaspora network" msgstr "" -#: ../../include/diaspora.php:2222 +#: ../../include/diaspora.php:2236 msgid "Attachments:" msgstr "" -#: ../../include/network.php:849 +#: ../../include/network.php:847 msgid "view full size" msgstr "" @@ -8390,6 +8477,46 @@ msgstr "" msgid "Embedding disabled" msgstr "" +#: ../../include/uimport.php:61 +msgid "Error decoding account file" +msgstr "" + +#: ../../include/uimport.php:67 +msgid "Error! No version data in file! This is not a Friendica account file?" +msgstr "" + +#: ../../include/uimport.php:72 +msgid "Error! I can't import this file: DB schema version is not compatible." +msgstr "" + +#: ../../include/uimport.php:81 +msgid "Error! Cannot check nickname" +msgstr "" + +#: ../../include/uimport.php:85 +#, php-format +msgid "User '%s' already exists on this server!" +msgstr "" + +#: ../../include/uimport.php:104 +msgid "User creation error" +msgstr "" + +#: ../../include/uimport.php:122 +msgid "User profile creation error" +msgstr "" + +#: ../../include/uimport.php:167 +#, php-format +msgid "%d contact not imported" +msgid_plural "%d contacts not imported" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/uimport.php:245 +msgid "Done. You can now login with your username and password" +msgstr "" + #: ../../include/group.php:25 msgid "" "A deleted group with this name was revived. Existing item permissions " @@ -8421,7 +8548,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:922 +#: ../../include/nav.php:46 ../../boot.php:948 msgid "Logout" msgstr "" @@ -8429,7 +8556,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1677 +#: ../../include/nav.php:49 ../../boot.php:1724 msgid "Status" msgstr "" @@ -8477,55 +8604,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:1197 +#: ../../include/nav.php:140 ../../boot.php:1238 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1197 -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 "" @@ -8568,37 +8703,37 @@ 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 "" -#: ../../include/auth.php:35 +#: ../../include/auth.php:36 msgid "Logged out." msgstr "" -#: ../../include/auth.php:114 +#: ../../include/auth.php:126 msgid "" "We encountered a problem while logging in with the OpenID you provided. " "Please check the correct spelling of the ID." msgstr "" -#: ../../include/auth.php:114 +#: ../../include/auth.php:126 msgid "The error message was:" msgstr "" @@ -8659,38 +8794,166 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/datetime.php:472 ../../include/items.php:1688 +#: ../../include/datetime.php:472 ../../include/items.php:1695 #, php-format msgid "%s's birthday" msgstr "" -#: ../../include/datetime.php:473 ../../include/items.php:1689 +#: ../../include/datetime.php:473 ../../include/items.php:1696 #, php-format msgid "Happy Birthday %s" msgstr "" -#: ../../include/onepoll.php:409 +#: ../../include/onepoll.php:414 msgid "From: " msgstr "" -#: ../../include/bbcode.php:185 ../../include/bbcode.php:406 +#: ../../include/bbcode.php:202 ../../include/bbcode.php:423 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:371 ../../include/bbcode.php:391 +#: ../../include/bbcode.php:388 ../../include/bbcode.php:408 msgid "$1 wrote:" msgstr "" -#: ../../include/bbcode.php:410 ../../include/bbcode.php:411 +#: ../../include/bbcode.php:427 ../../include/bbcode.php:428 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'" msgstr "" -#: ../../include/message.php:15 ../../include/message.php:171 +#: ../../include/message.php:15 ../../include/message.php:172 msgid "[no subject]" msgstr "" @@ -8938,15 +9201,15 @@ msgstr "" msgid "following" msgstr "" -#: ../../include/items.php:3299 +#: ../../include/items.php:3363 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:3299 +#: ../../include/items.php:3363 msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:3980 +#: ../../include/items.php:4047 msgid "Archives" msgstr "" @@ -9030,44 +9293,44 @@ msgstr "" msgid "Welcome back " msgstr "" -#: ../../include/security.php:354 +#: ../../include/security.php:357 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: ../../include/Contact.php:111 +#: ../../include/Contact.php:115 msgid "stopped following" msgstr "" -#: ../../include/Contact.php:220 ../../include/conversation.php:790 +#: ../../include/Contact.php:225 ../../include/conversation.php:795 msgid "Poke" msgstr "" -#: ../../include/Contact.php:221 ../../include/conversation.php:784 +#: ../../include/Contact.php:226 ../../include/conversation.php:789 msgid "View Status" msgstr "" -#: ../../include/Contact.php:222 ../../include/conversation.php:785 +#: ../../include/Contact.php:227 ../../include/conversation.php:790 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:223 ../../include/conversation.php:786 +#: ../../include/Contact.php:228 ../../include/conversation.php:791 msgid "View Photos" msgstr "" -#: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:787 +#: ../../include/Contact.php:229 ../../include/Contact.php:242 +#: ../../include/conversation.php:792 msgid "Network Posts" msgstr "" -#: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:788 +#: ../../include/Contact.php:230 ../../include/Contact.php:242 +#: ../../include/conversation.php:793 msgid "Edit Contact" msgstr "" -#: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:789 +#: ../../include/Contact.php:231 ../../include/Contact.php:242 +#: ../../include/conversation.php:794 msgid "Send PM" msgstr "" @@ -9085,86 +9348,90 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:594 ../../object/Item.php:218 +#: ../../include/conversation.php:599 ../../object/Item.php:225 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:595 ../../object/Item.php:219 +#: ../../include/conversation.php:600 ../../object/Item.php:226 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:680 +#: ../../include/conversation.php:685 msgid "remove" msgstr "" -#: ../../include/conversation.php:684 +#: ../../include/conversation.php:689 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:783 +#: ../../include/conversation.php:788 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:857 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:857 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:856 +#: ../../include/conversation.php:861 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:858 +#: ../../include/conversation.php:863 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:864 +#: ../../include/conversation.php:869 msgid "and" msgstr "" -#: ../../include/conversation.php:867 +#: ../../include/conversation.php:875 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:877 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:877 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:892 ../../include/conversation.php:909 +#: ../../include/conversation.php:904 ../../include/conversation.php:922 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:894 ../../include/conversation.php:911 +#: ../../include/conversation.php:906 ../../include/conversation.php:924 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:895 ../../include/conversation.php:912 +#: ../../include/conversation.php:907 ../../include/conversation.php:925 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:896 ../../include/conversation.php:913 +#: ../../include/conversation.php:908 ../../include/conversation.php:926 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:898 ../../include/conversation.php:915 +#: ../../include/conversation.php:910 ../../include/conversation.php:928 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:977 +#: ../../include/conversation.php:911 +msgid "Delete item(s)?" +msgstr "" + +#: ../../include/conversation.php:990 msgid "permissions" msgstr "" @@ -9180,105 +9447,117 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../boot.php:584 +#: ../../boot.php:607 msgid "Delete this item?" msgstr "" -#: ../../boot.php:587 +#: ../../boot.php:610 msgid "show fewer" msgstr "" -#: ../../boot.php:794 +#: ../../boot.php:819 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:796 +#: ../../boot.php:821 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:897 +#: ../../boot.php:922 msgid "Create a New Account" msgstr "" -#: ../../boot.php:925 +#: ../../boot.php:951 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:926 +#: ../../boot.php:952 msgid "Password: " msgstr "" -#: ../../boot.php:929 +#: ../../boot.php:953 +msgid "Remember me" +msgstr "" + +#: ../../boot.php:956 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:935 +#: ../../boot.php:962 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1046 +#: ../../boot.php:1087 msgid "Requested account is not available." msgstr "" -#: ../../boot.php:1123 +#: ../../boot.php:1164 msgid "Edit profile" msgstr "" -#: ../../boot.php:1189 +#: ../../boot.php:1230 msgid "Message" msgstr "" -#: ../../boot.php:1311 ../../boot.php:1397 +#: ../../boot.php:1238 +msgid "Manage/edit profiles" +msgstr "" + +#: ../../boot.php:1352 ../../boot.php:1438 msgid "g A l F d" msgstr "" -#: ../../boot.php:1312 ../../boot.php:1398 +#: ../../boot.php:1353 ../../boot.php:1439 msgid "F d" msgstr "" -#: ../../boot.php:1357 ../../boot.php:1438 +#: ../../boot.php:1398 ../../boot.php:1479 msgid "[today]" msgstr "" -#: ../../boot.php:1369 +#: ../../boot.php:1410 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1370 +#: ../../boot.php:1411 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1431 +#: ../../boot.php:1472 msgid "[No description]" msgstr "" -#: ../../boot.php:1449 +#: ../../boot.php:1490 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1450 +#: ../../boot.php:1491 msgid "Events this week:" msgstr "" -#: ../../boot.php:1680 +#: ../../boot.php:1727 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1687 +#: ../../boot.php:1734 msgid "Profile Details" msgstr "" -#: ../../boot.php:1704 +#: ../../boot.php:1751 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1711 +#: ../../boot.php:1758 msgid "Only You Can See This" msgstr "" -#: ../../index.php:380 +#: ../../object/Item.php:237 +msgid "via" +msgstr "" + +#: ../../index.php:398 msgid "toggle mobile" msgstr ""