X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=util%2Fmessages.po;h=966d51cc6ce3a83e22f7429bac45bbe04d9a69f2;hb=ad25336d107778d90dd683089927e9dff2392c8d;hp=b65dfb582902c32f4566ac6210504bb3529fd5bf;hpb=1fda9e9365c62cc61788e25d6c7d802f5065fbc8;p=friendica.git diff --git a/util/messages.po b/util/messages.po index b65dfb5829..966d51cc6c 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1399\n" +"Project-Id-Version: 3.0.1422\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-09 10:00-0700\n" +"POT-Creation-Date: 2012-08-01 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -36,27 +36,27 @@ msgstr "" #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:135 ../../mod/photos.php:957 -#: ../../mod/editpost.php:10 ../../mod/install.php:151 -#: ../../mod/notifications.php:66 ../../mod/contacts.php:145 -#: ../../mod/settings.php:106 ../../mod/settings.php:537 -#: ../../mod/settings.php:542 ../../mod/manage.php:86 ../../mod/network.php:6 +#: ../../mod/api.php:31 ../../mod/photos.php:116 ../../mod/photos.php:938 +#: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135 +#: ../../mod/notifications.php:66 ../../mod/contacts.php:139 +#: ../../mod/settings.php:86 ../../mod/settings.php:519 +#: ../../mod/settings.php:524 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../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:124 -#: ../../mod/item.php:140 ../../mod/profile_photo.php:19 +#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:125 +#: ../../mod/item.php:141 ../../mod/profile_photo.php:19 #: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:153 -#: ../../mod/profile_photo.php:166 ../../mod/message.php:45 -#: ../../mod/message.php:175 ../../mod/allfriends.php:9 +#: ../../mod/profile_photo.php:166 ../../mod/message.php:38 +#: ../../mod/message.php:168 ../../mod/allfriends.php:9 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 -#: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:400 ../../mod/delegate.php:6 +#: ../../mod/follow.php:9 ../../mod/display.php:130 ../../mod/profiles.php:7 +#: ../../mod/profiles.php:408 ../../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/dav/layout.fnk.php:353 -#: ../../include/items.php:3585 ../../index.php:309 +#: ../../addon/facebook/facebook.php:516 ../../addon/dav/layout.fnk.php:354 +#: ../../include/items.php:3813 ../../index.php:315 msgid "Permission denied." msgstr "" @@ -85,8 +85,8 @@ msgstr "" msgid "Return to contact editor" msgstr "" -#: ../../mod/crepair.php:148 ../../mod/settings.php:557 -#: ../../mod/settings.php:583 ../../mod/admin.php:661 ../../mod/admin.php:670 +#: ../../mod/crepair.php:148 ../../mod/settings.php:539 +#: ../../mod/settings.php:565 ../../mod/admin.php:664 ../../mod/admin.php:673 msgid "Name" msgstr "" @@ -123,20 +123,20 @@ msgid "New photo from this URL" msgstr "" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:436 ../../mod/photos.php:992 ../../mod/photos.php:1063 -#: ../../mod/photos.php:1309 ../../mod/photos.php:1349 -#: ../../mod/photos.php:1389 ../../mod/photos.php:1420 +#: ../../mod/events.php:439 ../../mod/photos.php:971 ../../mod/photos.php:1042 +#: ../../mod/photos.php:1285 ../../mod/photos.php:1325 +#: ../../mod/photos.php:1365 ../../mod/photos.php:1396 #: ../../mod/install.php:246 ../../mod/install.php:284 -#: ../../mod/localtime.php:45 ../../mod/content.php:691 -#: ../../mod/contacts.php:343 ../../mod/settings.php:555 -#: ../../mod/settings.php:709 ../../mod/settings.php:770 -#: ../../mod/settings.php:971 ../../mod/group.php:85 ../../mod/message.php:294 -#: ../../mod/message.php:473 ../../mod/admin.php:422 ../../mod/admin.php:658 -#: ../../mod/admin.php:794 ../../mod/admin.php:993 ../../mod/admin.php:1080 -#: ../../mod/profiles.php:569 ../../mod/invite.php:119 +#: ../../mod/localtime.php:45 ../../mod/poke.php:199 ../../mod/content.php:691 +#: ../../mod/contacts.php:341 ../../mod/settings.php:537 +#: ../../mod/settings.php:691 ../../mod/settings.php:752 +#: ../../mod/settings.php:958 ../../mod/group.php:85 ../../mod/message.php:294 +#: ../../mod/message.php:478 ../../mod/admin.php:422 ../../mod/admin.php:661 +#: ../../mod/admin.php:797 ../../mod/admin.php:996 ../../mod/admin.php:1083 +#: ../../mod/profiles.php:578 ../../mod/invite.php:119 #: ../../addon/fromgplus/fromgplus.php:40 #: ../../addon/facebook/facebook.php:619 -#: ../../addon/snautofollow/snautofollow.php:64 +#: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 #: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:210 #: ../../addon/planets/planets.php:158 @@ -144,13 +144,16 @@ msgstr "" #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41 +#: ../../addon/forumlist/forumlist.php:169 #: ../../addon/impressum/impressum.php:82 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57 #: ../../addon/qcomment/qcomment.php:61 #: ../../addon/openstreetmap/openstreetmap.php:70 -#: ../../addon/libertree/libertree.php:90 ../../addon/mathjax/mathjax.php:42 -#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98 -#: ../../addon/gravatar/gravatar.php:86 +#: ../../addon/group_text/group_text.php:84 +#: ../../addon/libravatar/libravatar.php:99 +#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:87 +#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84 +#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93 #: ../../addon/jappixmini/jappixmini.php:302 #: ../../addon/statusnet/statusnet.php:278 @@ -158,18 +161,18 @@ msgstr "" #: ../../addon/statusnet/statusnet.php:318 #: ../../addon/statusnet/statusnet.php:325 #: ../../addon/statusnet/statusnet.php:353 -#: ../../addon/statusnet/statusnet.php:567 ../../addon/tumblr/tumblr.php:90 +#: ../../addon/statusnet/statusnet.php:576 ../../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:387 +#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 #: ../../view/theme/diabook/theme.php:757 #: ../../view/theme/diabook/config.php:190 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 -#: ../../include/conversation.php:642 +#: ../../include/conversation.php:696 msgid "Submit" msgstr "" @@ -177,16 +180,16 @@ msgstr "" msgid "Help:" msgstr "" -#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:116 +#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:225 #: ../../include/nav.php:86 msgid "Help" msgstr "" -#: ../../mod/help.php:38 ../../index.php:218 +#: ../../mod/help.php:38 ../../index.php:224 msgid "Not Found" msgstr "" -#: ../../mod/help.php:41 ../../index.php:221 +#: ../../mod/help.php:41 ../../index.php:227 msgid "Page not found." msgstr "" @@ -216,90 +219,90 @@ msgstr "" msgid "Event title and start time are required." msgstr "" -#: ../../mod/events.php:260 +#: ../../mod/events.php:263 msgid "l, F j" msgstr "" -#: ../../mod/events.php:282 +#: ../../mod/events.php:285 msgid "Edit event" msgstr "" -#: ../../mod/events.php:304 ../../include/text.php:1069 +#: ../../mod/events.php:307 ../../include/text.php:1110 msgid "link to source" msgstr "" -#: ../../mod/events.php:328 ../../view/theme/diabook/theme.php:131 -#: ../../include/nav.php:52 ../../boot.php:1595 +#: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131 +#: ../../include/nav.php:52 ../../boot.php:1634 msgid "Events" msgstr "" -#: ../../mod/events.php:329 +#: ../../mod/events.php:332 msgid "Create New Event" msgstr "" -#: ../../mod/events.php:330 ../../addon/dav/layout.fnk.php:154 +#: ../../mod/events.php:333 ../../addon/dav/layout.fnk.php:263 msgid "Previous" msgstr "" -#: ../../mod/events.php:331 ../../mod/install.php:205 -#: ../../addon/dav/layout.fnk.php:157 +#: ../../mod/events.php:334 ../../mod/install.php:205 +#: ../../addon/dav/layout.fnk.php:266 msgid "Next" msgstr "" -#: ../../mod/events.php:404 +#: ../../mod/events.php:407 msgid "hour:minute" msgstr "" -#: ../../mod/events.php:414 +#: ../../mod/events.php:417 msgid "Event details" msgstr "" -#: ../../mod/events.php:415 +#: ../../mod/events.php:418 #, php-format msgid "Format is %s %s. Starting date and Title are required." msgstr "" -#: ../../mod/events.php:417 +#: ../../mod/events.php:420 msgid "Event Starts:" msgstr "" -#: ../../mod/events.php:417 ../../mod/events.php:431 +#: ../../mod/events.php:420 ../../mod/events.php:434 msgid "Required" msgstr "" -#: ../../mod/events.php:420 +#: ../../mod/events.php:423 msgid "Finish date/time is not known or not relevant" msgstr "" -#: ../../mod/events.php:422 +#: ../../mod/events.php:425 msgid "Event Finishes:" msgstr "" -#: ../../mod/events.php:425 +#: ../../mod/events.php:428 msgid "Adjust for viewer timezone" msgstr "" -#: ../../mod/events.php:427 +#: ../../mod/events.php:430 msgid "Description:" msgstr "" -#: ../../mod/events.php:429 ../../mod/directory.php:132 -#: ../../include/event.php:40 ../../include/bb2diaspora.php:409 -#: ../../boot.php:1172 +#: ../../mod/events.php:432 ../../mod/directory.php:132 +#: ../../include/event.php:40 ../../include/bb2diaspora.php:447 +#: ../../boot.php:1186 msgid "Location:" msgstr "" -#: ../../mod/events.php:431 +#: ../../mod/events.php:434 msgid "Title:" msgstr "" -#: ../../mod/events.php:433 +#: ../../mod/events.php:436 msgid "Share this event" msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:845 ../../mod/settings.php:556 -#: ../../mod/settings.php:582 ../../addon/js_upload/js_upload.php:45 +#: ../../mod/dfrn_request.php:845 ../../mod/settings.php:538 +#: ../../mod/settings.php:564 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -316,6 +319,7 @@ msgid "Select a tag to remove: " msgstr "" #: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 +#: ../../addon/dav/common/wdcal_edit.inc.php:468 msgid "Remove" msgstr "" @@ -343,55 +347,55 @@ msgid "" msgstr "" #: ../../mod/api.php:105 ../../mod/dfrn_request.php:833 -#: ../../mod/settings.php:887 ../../mod/settings.php:893 -#: ../../mod/settings.php:901 ../../mod/settings.php:905 -#: ../../mod/settings.php:910 ../../mod/settings.php:916 -#: ../../mod/settings.php:922 ../../mod/settings.php:928 -#: ../../mod/settings.php:958 ../../mod/settings.php:959 -#: ../../mod/settings.php:960 ../../mod/settings.php:961 -#: ../../mod/settings.php:962 ../../mod/register.php:234 -#: ../../mod/profiles.php:546 +#: ../../mod/settings.php:874 ../../mod/settings.php:880 +#: ../../mod/settings.php:888 ../../mod/settings.php:892 +#: ../../mod/settings.php:897 ../../mod/settings.php:903 +#: ../../mod/settings.php:909 ../../mod/settings.php:915 +#: ../../mod/settings.php:945 ../../mod/settings.php:946 +#: ../../mod/settings.php:947 ../../mod/settings.php:948 +#: ../../mod/settings.php:949 ../../mod/register.php:234 +#: ../../mod/profiles.php:558 msgid "Yes" msgstr "" #: ../../mod/api.php:106 ../../mod/dfrn_request.php:834 -#: ../../mod/settings.php:887 ../../mod/settings.php:893 -#: ../../mod/settings.php:901 ../../mod/settings.php:905 -#: ../../mod/settings.php:910 ../../mod/settings.php:916 -#: ../../mod/settings.php:922 ../../mod/settings.php:928 -#: ../../mod/settings.php:958 ../../mod/settings.php:959 -#: ../../mod/settings.php:960 ../../mod/settings.php:961 -#: ../../mod/settings.php:962 ../../mod/register.php:235 -#: ../../mod/profiles.php:547 +#: ../../mod/settings.php:874 ../../mod/settings.php:880 +#: ../../mod/settings.php:888 ../../mod/settings.php:892 +#: ../../mod/settings.php:897 ../../mod/settings.php:903 +#: ../../mod/settings.php:909 ../../mod/settings.php:915 +#: ../../mod/settings.php:945 ../../mod/settings.php:946 +#: ../../mod/settings.php:947 ../../mod/settings.php:948 +#: ../../mod/settings.php:949 ../../mod/register.php:235 +#: ../../mod/profiles.php:559 msgid "No" msgstr "" -#: ../../mod/photos.php:46 ../../boot.php:1589 +#: ../../mod/photos.php:46 ../../boot.php:1627 msgid "Photo Albums" msgstr "" -#: ../../mod/photos.php:54 ../../mod/photos.php:156 ../../mod/photos.php:971 -#: ../../mod/photos.php:1055 ../../mod/photos.php:1070 -#: ../../mod/photos.php:1498 ../../mod/photos.php:1510 +#: ../../mod/photos.php:54 ../../mod/photos.php:137 ../../mod/photos.php:952 +#: ../../mod/photos.php:1034 ../../mod/photos.php:1049 +#: ../../mod/photos.php:1474 ../../mod/photos.php:1486 #: ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:598 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:61 ../../mod/photos.php:1080 ../../mod/photos.php:1548 +#: ../../mod/photos.php:61 ../../mod/photos.php:1059 ../../mod/photos.php:1524 msgid "Upload New Photos" msgstr "" -#: ../../mod/photos.php:72 ../../mod/settings.php:21 +#: ../../mod/photos.php:74 ../../mod/settings.php:23 msgid "everybody" msgstr "" -#: ../../mod/photos.php:145 +#: ../../mod/photos.php:126 msgid "Contact information unavailable" msgstr "" -#: ../../mod/photos.php:156 ../../mod/photos.php:660 ../../mod/photos.php:1055 -#: ../../mod/photos.php:1070 ../../mod/profile_photo.php:60 +#: ../../mod/photos.php:137 ../../mod/photos.php:641 ../../mod/photos.php:1034 +#: ../../mod/photos.php:1049 ../../mod/profile_photo.php:60 #: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74 #: ../../mod/profile_photo.php:177 ../../mod/profile_photo.php:261 #: ../../mod/profile_photo.php:270 @@ -401,217 +405,217 @@ msgstr "" msgid "Profile Photos" msgstr "" -#: ../../mod/photos.php:166 +#: ../../mod/photos.php:147 msgid "Album not found." msgstr "" -#: ../../mod/photos.php:184 ../../mod/photos.php:1064 +#: ../../mod/photos.php:165 ../../mod/photos.php:1043 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:247 ../../mod/photos.php:1310 +#: ../../mod/photos.php:228 ../../mod/photos.php:1286 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:591 +#: ../../mod/photos.php:572 msgid "was tagged in a" msgstr "" -#: ../../mod/photos.php:591 ../../mod/like.php:144 ../../mod/tagger.php:70 +#: ../../mod/photos.php:572 ../../mod/like.php:145 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1321 -#: ../../include/diaspora.php:1792 ../../include/conversation.php:115 -#: ../../include/conversation.php:188 +#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1362 +#: ../../include/diaspora.php:1793 ../../include/conversation.php:114 +#: ../../include/conversation.php:230 msgid "photo" msgstr "" -#: ../../mod/photos.php:591 +#: ../../mod/photos.php:572 msgid "by" msgstr "" -#: ../../mod/photos.php:696 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:677 ../../addon/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "" -#: ../../mod/photos.php:704 +#: ../../mod/photos.php:685 msgid "Image file is empty." msgstr "" -#: ../../mod/photos.php:736 ../../mod/profile_photo.php:126 +#: ../../mod/photos.php:717 ../../mod/profile_photo.php:126 #: ../../mod/wall_upload.php:99 msgid "Unable to process image." msgstr "" -#: ../../mod/photos.php:763 ../../mod/profile_photo.php:266 +#: ../../mod/photos.php:744 ../../mod/profile_photo.php:266 #: ../../mod/wall_upload.php:125 msgid "Image upload failed." msgstr "" -#: ../../mod/photos.php:849 ../../mod/community.php:16 +#: ../../mod/photos.php:830 ../../mod/community.php:16 #: ../../mod/dfrn_request.php:759 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "" -#: ../../mod/photos.php:859 +#: ../../mod/photos.php:840 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:938 +#: ../../mod/photos.php:919 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:1002 +#: ../../mod/photos.php:981 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/photos.php:1005 +#: ../../mod/photos.php:984 #, php-format msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/photos.php:1011 +#: ../../mod/photos.php:990 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:1015 ../../mod/photos.php:1059 +#: ../../mod/photos.php:994 ../../mod/photos.php:1038 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:1016 +#: ../../mod/photos.php:995 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:1017 +#: ../../mod/photos.php:996 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:1019 ../../mod/photos.php:1305 +#: ../../mod/photos.php:998 ../../mod/photos.php:1281 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:1074 +#: ../../mod/photos.php:1053 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:1098 ../../mod/photos.php:1531 +#: ../../mod/photos.php:1077 ../../mod/photos.php:1507 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:1133 +#: ../../mod/photos.php:1112 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:1135 +#: ../../mod/photos.php:1114 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:1185 +#: ../../mod/photos.php:1164 msgid "View photo" msgstr "" -#: ../../mod/photos.php:1185 +#: ../../mod/photos.php:1164 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1186 +#: ../../mod/photos.php:1165 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:1192 ../../mod/content.php:601 -#: ../../include/conversation.php:552 +#: ../../mod/photos.php:1171 ../../mod/content.php:601 +#: ../../include/conversation.php:606 msgid "Private Message" msgstr "" -#: ../../mod/photos.php:1214 +#: ../../mod/photos.php:1190 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1282 +#: ../../mod/photos.php:1258 msgid "Tags: " msgstr "" -#: ../../mod/photos.php:1285 +#: ../../mod/photos.php:1261 msgid "[Remove any tag]" msgstr "" -#: ../../mod/photos.php:1295 +#: ../../mod/photos.php:1271 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:1296 +#: ../../mod/photos.php:1272 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:1298 +#: ../../mod/photos.php:1274 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1301 +#: ../../mod/photos.php:1277 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1303 +#: ../../mod/photos.php:1279 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1307 +#: ../../mod/photos.php:1283 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1327 ../../mod/content.php:665 -#: ../../include/conversation.php:616 +#: ../../mod/photos.php:1303 ../../mod/content.php:665 +#: ../../include/conversation.php:670 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1328 ../../mod/content.php:666 -#: ../../include/conversation.php:617 +#: ../../mod/photos.php:1304 ../../mod/content.php:666 +#: ../../include/conversation.php:671 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1329 ../../include/conversation.php:1055 +#: ../../mod/photos.php:1305 ../../include/conversation.php:1128 msgid "Share" msgstr "" -#: ../../mod/photos.php:1330 ../../mod/editpost.php:104 +#: ../../mod/photos.php:1306 ../../mod/editpost.php:112 #: ../../mod/content.php:482 ../../mod/content.php:842 -#: ../../mod/wallmessage.php:145 ../../mod/message.php:293 -#: ../../mod/message.php:474 ../../include/conversation.php:433 -#: ../../include/conversation.php:793 ../../include/conversation.php:1074 +#: ../../mod/wallmessage.php:152 ../../mod/message.php:293 +#: ../../mod/message.php:479 ../../include/conversation.php:487 +#: ../../include/conversation.php:847 ../../include/conversation.php:1147 msgid "Please wait" msgstr "" -#: ../../mod/photos.php:1346 ../../mod/photos.php:1386 -#: ../../mod/photos.php:1417 ../../mod/content.php:688 -#: ../../include/conversation.php:639 +#: ../../mod/photos.php:1322 ../../mod/photos.php:1362 +#: ../../mod/photos.php:1393 ../../mod/content.php:688 +#: ../../include/conversation.php:693 msgid "This is you" msgstr "" -#: ../../mod/photos.php:1348 ../../mod/photos.php:1388 -#: ../../mod/photos.php:1419 ../../mod/content.php:690 -#: ../../include/conversation.php:641 ../../boot.php:564 +#: ../../mod/photos.php:1324 ../../mod/photos.php:1364 +#: ../../mod/photos.php:1395 ../../mod/content.php:690 +#: ../../include/conversation.php:695 ../../boot.php:569 msgid "Comment" msgstr "" -#: ../../mod/photos.php:1350 ../../mod/editpost.php:125 -#: ../../mod/content.php:700 ../../include/conversation.php:651 -#: ../../include/conversation.php:1092 +#: ../../mod/photos.php:1326 ../../mod/editpost.php:133 +#: ../../mod/content.php:700 ../../include/conversation.php:705 +#: ../../include/conversation.php:1165 msgid "Preview" msgstr "" -#: ../../mod/photos.php:1447 ../../mod/content.php:439 -#: ../../mod/content.php:720 ../../mod/settings.php:618 -#: ../../mod/settings.php:707 ../../mod/group.php:168 ../../mod/admin.php:665 -#: ../../include/conversation.php:390 ../../include/conversation.php:671 +#: ../../mod/photos.php:1423 ../../mod/content.php:439 +#: ../../mod/content.php:720 ../../mod/settings.php:600 +#: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:668 +#: ../../include/conversation.php:444 ../../include/conversation.php:725 msgid "Delete" msgstr "" -#: ../../mod/photos.php:1537 +#: ../../mod/photos.php:1513 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1546 +#: ../../mod/photos.php:1522 msgid "Recent Photos" msgstr "" @@ -624,7 +628,8 @@ msgstr "" msgid "Community" msgstr "" -#: ../../mod/community.php:61 ../../mod/search.php:144 +#: ../../mod/community.php:61 ../../mod/community.php:86 +#: ../../mod/search.php:146 ../../mod/search.php:172 msgid "No results." msgstr "" @@ -668,75 +673,79 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:80 ../../include/conversation.php:1041 +#: ../../mod/editpost.php:88 ../../include/conversation.php:1114 msgid "Post to Email" msgstr "" -#: ../../mod/editpost.php:95 ../../mod/content.php:707 -#: ../../mod/settings.php:617 ../../include/conversation.php:658 +#: ../../mod/editpost.php:103 ../../mod/content.php:707 +#: ../../mod/settings.php:599 ../../include/conversation.php:712 msgid "Edit" msgstr "" -#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 -#: ../../mod/message.php:291 ../../mod/message.php:471 -#: ../../include/conversation.php:1056 +#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 +#: ../../mod/message.php:291 ../../mod/message.php:476 +#: ../../include/conversation.php:1129 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:97 ../../include/conversation.php:1058 +#: ../../mod/editpost.php:105 ../../include/conversation.php:1131 msgid "Attach file" msgstr "" -#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 -#: ../../mod/message.php:292 ../../mod/message.php:472 -#: ../../include/conversation.php:1060 +#: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 +#: ../../mod/message.php:292 ../../mod/message.php:477 +#: ../../include/conversation.php:1133 msgid "Insert web link" msgstr "" -#: ../../mod/editpost.php:99 +#: ../../mod/editpost.php:107 msgid "Insert YouTube video" msgstr "" -#: ../../mod/editpost.php:100 +#: ../../mod/editpost.php:108 msgid "Insert Vorbis [.ogg] video" msgstr "" -#: ../../mod/editpost.php:101 +#: ../../mod/editpost.php:109 msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/editpost.php:102 ../../include/conversation.php:1066 +#: ../../mod/editpost.php:110 ../../include/conversation.php:1139 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:103 ../../include/conversation.php:1068 +#: ../../mod/editpost.php:111 ../../include/conversation.php:1141 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:1075 +#: ../../mod/editpost.php:113 ../../include/conversation.php:1148 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:1084 +#: ../../mod/editpost.php:121 ../../include/conversation.php:1157 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:114 ../../include/conversation.php:1085 +#: ../../mod/editpost.php:122 ../../include/conversation.php:1158 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:117 ../../include/conversation.php:1071 +#: ../../mod/editpost.php:125 ../../include/conversation.php:1144 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:119 ../../include/conversation.php:1073 +#: ../../mod/editpost.php:127 ../../include/conversation.php:1146 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:120 ../../include/conversation.php:1087 +#: ../../mod/editpost.php:128 ../../include/conversation.php:1160 msgid "Example: bob@example.com, mary@example.com" msgstr "" +#: ../../mod/editpost.php:135 ../../include/conversation.php:1166 +msgid "Friendica mobile web" +msgstr "" + #: ../../mod/dfrn_request.php:93 msgid "This introduction has already been accepted." msgstr "" @@ -818,7 +827,7 @@ msgstr "" msgid "Disallowed profile URL." msgstr "" -#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:122 +#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:116 msgid "Failed to update contact record." msgstr "" @@ -854,7 +863,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:2976 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3204 msgid "[Name Withheld]" msgstr "" @@ -906,7 +915,7 @@ msgstr "" msgid "StatusNet/Federated Social Web" msgstr "" -#: ../../mod/dfrn_request.php:839 ../../mod/settings.php:652 +#: ../../mod/dfrn_request.php:839 ../../mod/settings.php:634 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "" @@ -1180,7 +1189,7 @@ msgid "" msgstr "" #: ../../mod/localtime.php:12 ../../include/event.php:11 -#: ../../include/bb2diaspora.php:387 +#: ../../include/bb2diaspora.php:425 msgid "l F d, Y \\@ g:i A" msgstr "" @@ -1213,6 +1222,26 @@ msgstr "" msgid "Please select your timezone:" msgstr "" +#: ../../mod/poke.php:192 +msgid "Poke/Prod" +msgstr "" + +#: ../../mod/poke.php:193 +msgid "poke, prod or do other things to somebody" +msgstr "" + +#: ../../mod/poke.php:194 +msgid "Recipient" +msgstr "" + +#: ../../mod/poke.php:195 +msgid "Choose what you wish to do to recipient" +msgstr "" + +#: ../../mod/poke.php:198 +msgid "Make this post private" +msgstr "" + #: ../../mod/match.php:12 msgid "Profile Match" msgstr "" @@ -1226,7 +1255,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1116 +#: ../../include/contact_widgets.php:9 ../../boot.php:1130 msgid "Connect" msgstr "" @@ -1255,28 +1284,28 @@ msgid "Group: " msgstr "" #: ../../mod/content.php:438 ../../mod/content.php:719 -#: ../../include/conversation.php:389 ../../include/conversation.php:670 +#: ../../include/conversation.php:443 ../../include/conversation.php:724 msgid "Select" msgstr "" #: ../../mod/content.php:455 ../../mod/content.php:812 -#: ../../mod/content.php:813 ../../include/conversation.php:406 -#: ../../include/conversation.php:763 ../../include/conversation.php:764 +#: ../../mod/content.php:813 ../../include/conversation.php:460 +#: ../../include/conversation.php:817 ../../include/conversation.php:818 #, php-format msgid "View %s's profile @ %s" msgstr "" #: ../../mod/content.php:465 ../../mod/content.php:824 -#: ../../include/conversation.php:416 ../../include/conversation.php:775 +#: ../../include/conversation.php:470 ../../include/conversation.php:829 #, php-format msgid "%s from %s" msgstr "" -#: ../../mod/content.php:480 ../../include/conversation.php:431 +#: ../../mod/content.php:480 ../../include/conversation.php:485 msgid "View in context" msgstr "" -#: ../../mod/content.php:586 ../../include/conversation.php:537 +#: ../../mod/content.php:586 ../../include/conversation.php:591 #, php-format msgid "%d comment" msgid_plural "%d comments" @@ -1284,93 +1313,93 @@ msgstr[0] "" msgstr[1] "" #: ../../mod/content.php:587 ../../addon/page/page.php:76 -#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:87 -#: ../../include/contact_widgets.php:188 ../../include/conversation.php:538 -#: ../../boot.php:565 +#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119 +#: ../../include/contact_widgets.php:188 ../../include/conversation.php:592 +#: ../../boot.php:570 msgid "show more" msgstr "" -#: ../../mod/content.php:665 ../../include/conversation.php:616 +#: ../../mod/content.php:665 ../../include/conversation.php:670 msgid "like" msgstr "" -#: ../../mod/content.php:666 ../../include/conversation.php:617 +#: ../../mod/content.php:666 ../../include/conversation.php:671 msgid "dislike" msgstr "" -#: ../../mod/content.php:668 ../../include/conversation.php:619 +#: ../../mod/content.php:668 ../../include/conversation.php:673 msgid "Share this" msgstr "" -#: ../../mod/content.php:668 ../../include/conversation.php:619 +#: ../../mod/content.php:668 ../../include/conversation.php:673 msgid "share" msgstr "" -#: ../../mod/content.php:692 ../../include/conversation.php:643 +#: ../../mod/content.php:692 ../../include/conversation.php:697 msgid "Bold" msgstr "" -#: ../../mod/content.php:693 ../../include/conversation.php:644 +#: ../../mod/content.php:693 ../../include/conversation.php:698 msgid "Italic" msgstr "" -#: ../../mod/content.php:694 ../../include/conversation.php:645 +#: ../../mod/content.php:694 ../../include/conversation.php:699 msgid "Underline" msgstr "" -#: ../../mod/content.php:695 ../../include/conversation.php:646 +#: ../../mod/content.php:695 ../../include/conversation.php:700 msgid "Quote" msgstr "" -#: ../../mod/content.php:696 ../../include/conversation.php:647 +#: ../../mod/content.php:696 ../../include/conversation.php:701 msgid "Code" msgstr "" -#: ../../mod/content.php:697 ../../include/conversation.php:648 +#: ../../mod/content.php:697 ../../include/conversation.php:702 msgid "Image" msgstr "" -#: ../../mod/content.php:698 ../../include/conversation.php:649 +#: ../../mod/content.php:698 ../../include/conversation.php:703 msgid "Link" msgstr "" -#: ../../mod/content.php:699 ../../include/conversation.php:650 +#: ../../mod/content.php:699 ../../include/conversation.php:704 msgid "Video" msgstr "" -#: ../../mod/content.php:732 ../../include/conversation.php:683 +#: ../../mod/content.php:732 ../../include/conversation.php:737 msgid "add star" msgstr "" -#: ../../mod/content.php:733 ../../include/conversation.php:684 +#: ../../mod/content.php:733 ../../include/conversation.php:738 msgid "remove star" msgstr "" -#: ../../mod/content.php:734 ../../include/conversation.php:685 +#: ../../mod/content.php:734 ../../include/conversation.php:739 msgid "toggle star status" msgstr "" -#: ../../mod/content.php:737 ../../include/conversation.php:688 +#: ../../mod/content.php:737 ../../include/conversation.php:742 msgid "starred" msgstr "" -#: ../../mod/content.php:738 ../../include/conversation.php:689 +#: ../../mod/content.php:738 ../../include/conversation.php:743 msgid "add tag" msgstr "" -#: ../../mod/content.php:742 ../../include/conversation.php:693 +#: ../../mod/content.php:742 ../../include/conversation.php:747 msgid "save to folder" msgstr "" -#: ../../mod/content.php:814 ../../include/conversation.php:765 +#: ../../mod/content.php:814 ../../include/conversation.php:819 msgid "to" msgstr "" -#: ../../mod/content.php:815 ../../include/conversation.php:766 +#: ../../mod/content.php:815 ../../include/conversation.php:820 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/content.php:816 ../../include/conversation.php:767 +#: ../../mod/content.php:816 ../../include/conversation.php:821 msgid "via Wall-To-Wall:" msgstr "" @@ -1389,8 +1418,8 @@ msgid "Discard" msgstr "" #: ../../mod/notifications.php:51 ../../mod/notifications.php:160 -#: ../../mod/notifications.php:206 ../../mod/contacts.php:316 -#: ../../mod/contacts.php:370 +#: ../../mod/notifications.php:206 ../../mod/contacts.php:314 +#: ../../mod/contacts.php:368 msgid "Ignore" msgstr "" @@ -1415,7 +1444,7 @@ msgstr "" msgid "Introductions" msgstr "" -#: ../../mod/notifications.php:100 ../../mod/message.php:183 +#: ../../mod/notifications.php:100 ../../mod/message.php:176 #: ../../include/nav.php:128 msgid "Messages" msgstr "" @@ -1442,7 +1471,7 @@ msgid "suggested by %s" msgstr "" #: ../../mod/notifications.php:153 ../../mod/notifications.php:200 -#: ../../mod/contacts.php:376 +#: ../../mod/contacts.php:374 msgid "Hide this contact from others" msgstr "" @@ -1455,7 +1484,7 @@ msgid "if applicable" msgstr "" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:663 +#: ../../mod/admin.php:666 msgid "Approve" msgstr "" @@ -1564,307 +1593,307 @@ msgstr "" msgid "Home Notifications" msgstr "" -#: ../../mod/contacts.php:83 ../../mod/contacts.php:163 +#: ../../mod/contacts.php:77 ../../mod/contacts.php:157 msgid "Could not access contact record." msgstr "" -#: ../../mod/contacts.php:97 +#: ../../mod/contacts.php:91 msgid "Could not locate selected profile." msgstr "" -#: ../../mod/contacts.php:120 +#: ../../mod/contacts.php:114 msgid "Contact updated." msgstr "" -#: ../../mod/contacts.php:185 +#: ../../mod/contacts.php:179 msgid "Contact has been blocked" msgstr "" -#: ../../mod/contacts.php:185 +#: ../../mod/contacts.php:179 msgid "Contact has been unblocked" msgstr "" -#: ../../mod/contacts.php:199 +#: ../../mod/contacts.php:193 msgid "Contact has been ignored" msgstr "" -#: ../../mod/contacts.php:199 +#: ../../mod/contacts.php:193 msgid "Contact has been unignored" msgstr "" -#: ../../mod/contacts.php:215 +#: ../../mod/contacts.php:209 msgid "Contact has been archived" msgstr "" -#: ../../mod/contacts.php:215 +#: ../../mod/contacts.php:209 msgid "Contact has been unarchived" msgstr "" -#: ../../mod/contacts.php:228 +#: ../../mod/contacts.php:222 msgid "Contact has been removed." msgstr "" -#: ../../mod/contacts.php:258 +#: ../../mod/contacts.php:256 #, php-format msgid "You are mutual friends with %s" msgstr "" -#: ../../mod/contacts.php:262 +#: ../../mod/contacts.php:260 #, php-format msgid "You are sharing with %s" msgstr "" -#: ../../mod/contacts.php:267 +#: ../../mod/contacts.php:265 #, php-format msgid "%s is sharing with you" msgstr "" -#: ../../mod/contacts.php:284 +#: ../../mod/contacts.php:282 msgid "Private communications are not available for this contact." msgstr "" -#: ../../mod/contacts.php:287 +#: ../../mod/contacts.php:285 msgid "Never" msgstr "" -#: ../../mod/contacts.php:291 +#: ../../mod/contacts.php:289 msgid "(Update was successful)" msgstr "" -#: ../../mod/contacts.php:291 +#: ../../mod/contacts.php:289 msgid "(Update was not successful)" msgstr "" -#: ../../mod/contacts.php:293 +#: ../../mod/contacts.php:291 msgid "Suggest friends" msgstr "" -#: ../../mod/contacts.php:297 +#: ../../mod/contacts.php:295 #, php-format msgid "Network type: %s" msgstr "" -#: ../../mod/contacts.php:300 ../../include/contact_widgets.php:183 +#: ../../mod/contacts.php:298 ../../include/contact_widgets.php:183 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "" msgstr[1] "" -#: ../../mod/contacts.php:305 +#: ../../mod/contacts.php:303 msgid "View all contacts" msgstr "" -#: ../../mod/contacts.php:310 ../../mod/contacts.php:369 -#: ../../mod/admin.php:667 +#: ../../mod/contacts.php:308 ../../mod/contacts.php:367 +#: ../../mod/admin.php:670 msgid "Unblock" msgstr "" -#: ../../mod/contacts.php:310 ../../mod/contacts.php:369 -#: ../../mod/admin.php:666 +#: ../../mod/contacts.php:308 ../../mod/contacts.php:367 +#: ../../mod/admin.php:669 msgid "Block" msgstr "" -#: ../../mod/contacts.php:313 +#: ../../mod/contacts.php:311 msgid "Toggle Blocked status" msgstr "" -#: ../../mod/contacts.php:316 ../../mod/contacts.php:370 +#: ../../mod/contacts.php:314 ../../mod/contacts.php:368 msgid "Unignore" msgstr "" -#: ../../mod/contacts.php:319 +#: ../../mod/contacts.php:317 msgid "Toggle Ignored status" msgstr "" -#: ../../mod/contacts.php:323 +#: ../../mod/contacts.php:321 msgid "Unarchive" msgstr "" -#: ../../mod/contacts.php:323 +#: ../../mod/contacts.php:321 msgid "Archive" msgstr "" -#: ../../mod/contacts.php:326 +#: ../../mod/contacts.php:324 msgid "Toggle Archive status" msgstr "" -#: ../../mod/contacts.php:329 +#: ../../mod/contacts.php:327 msgid "Repair" msgstr "" -#: ../../mod/contacts.php:332 +#: ../../mod/contacts.php:330 msgid "Advanced Contact Settings" msgstr "" -#: ../../mod/contacts.php:338 +#: ../../mod/contacts.php:336 msgid "Communications lost with this contact!" msgstr "" -#: ../../mod/contacts.php:341 +#: ../../mod/contacts.php:339 msgid "Contact Editor" msgstr "" -#: ../../mod/contacts.php:344 +#: ../../mod/contacts.php:342 msgid "Profile Visibility" msgstr "" -#: ../../mod/contacts.php:345 +#: ../../mod/contacts.php:343 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/contacts.php:346 +#: ../../mod/contacts.php:344 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/contacts.php:347 +#: ../../mod/contacts.php:345 msgid "Edit contact notes" msgstr "" -#: ../../mod/contacts.php:352 ../../mod/contacts.php:544 +#: ../../mod/contacts.php:350 ../../mod/contacts.php:542 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: ../../mod/contacts.php:353 +#: ../../mod/contacts.php:351 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/contacts.php:354 +#: ../../mod/contacts.php:352 msgid "Ignore contact" msgstr "" -#: ../../mod/contacts.php:355 +#: ../../mod/contacts.php:353 msgid "Repair URL settings" msgstr "" -#: ../../mod/contacts.php:356 +#: ../../mod/contacts.php:354 msgid "View conversations" msgstr "" -#: ../../mod/contacts.php:358 +#: ../../mod/contacts.php:356 msgid "Delete contact" msgstr "" -#: ../../mod/contacts.php:362 +#: ../../mod/contacts.php:360 msgid "Last update:" msgstr "" -#: ../../mod/contacts.php:364 +#: ../../mod/contacts.php:362 msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:366 ../../mod/admin.php:1138 +#: ../../mod/contacts.php:364 ../../mod/admin.php:1141 msgid "Update now" msgstr "" -#: ../../mod/contacts.php:373 +#: ../../mod/contacts.php:371 msgid "Currently blocked" msgstr "" -#: ../../mod/contacts.php:374 +#: ../../mod/contacts.php:372 msgid "Currently ignored" msgstr "" -#: ../../mod/contacts.php:375 +#: ../../mod/contacts.php:373 msgid "Currently archived" msgstr "" -#: ../../mod/contacts.php:376 +#: ../../mod/contacts.php:374 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/contacts.php:429 +#: ../../mod/contacts.php:427 msgid "Suggestions" msgstr "" -#: ../../mod/contacts.php:432 +#: ../../mod/contacts.php:430 msgid "Suggest potential friends" msgstr "" -#: ../../mod/contacts.php:435 ../../mod/group.php:191 +#: ../../mod/contacts.php:433 ../../mod/group.php:191 msgid "All Contacts" msgstr "" -#: ../../mod/contacts.php:438 +#: ../../mod/contacts.php:436 msgid "Show all contacts" msgstr "" -#: ../../mod/contacts.php:441 +#: ../../mod/contacts.php:439 msgid "Unblocked" msgstr "" -#: ../../mod/contacts.php:444 +#: ../../mod/contacts.php:442 msgid "Only show unblocked contacts" msgstr "" -#: ../../mod/contacts.php:448 +#: ../../mod/contacts.php:446 msgid "Blocked" msgstr "" -#: ../../mod/contacts.php:451 +#: ../../mod/contacts.php:449 msgid "Only show blocked contacts" msgstr "" -#: ../../mod/contacts.php:455 +#: ../../mod/contacts.php:453 msgid "Ignored" msgstr "" -#: ../../mod/contacts.php:458 +#: ../../mod/contacts.php:456 msgid "Only show ignored contacts" msgstr "" -#: ../../mod/contacts.php:462 +#: ../../mod/contacts.php:460 msgid "Archived" msgstr "" -#: ../../mod/contacts.php:465 +#: ../../mod/contacts.php:463 msgid "Only show archived contacts" msgstr "" -#: ../../mod/contacts.php:469 +#: ../../mod/contacts.php:467 msgid "Hidden" msgstr "" -#: ../../mod/contacts.php:472 +#: ../../mod/contacts.php:470 msgid "Only show hidden contacts" msgstr "" -#: ../../mod/contacts.php:520 +#: ../../mod/contacts.php:518 msgid "Mutual Friendship" msgstr "" -#: ../../mod/contacts.php:524 +#: ../../mod/contacts.php:522 msgid "is a fan of yours" msgstr "" -#: ../../mod/contacts.php:528 +#: ../../mod/contacts.php:526 msgid "you are a fan of" msgstr "" -#: ../../mod/contacts.php:545 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:543 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:566 ../../view/theme/diabook/theme.php:129 +#: ../../mod/contacts.php:564 ../../view/theme/diabook/theme.php:129 #: ../../include/nav.php:139 msgid "Contacts" msgstr "" -#: ../../mod/contacts.php:570 +#: ../../mod/contacts.php:568 msgid "Search your contacts" msgstr "" -#: ../../mod/contacts.php:571 ../../mod/directory.php:57 +#: ../../mod/contacts.php:569 ../../mod/directory.php:57 msgid "Finding: " msgstr "" -#: ../../mod/contacts.php:572 ../../mod/directory.php:59 +#: ../../mod/contacts.php:570 ../../mod/directory.php:59 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "" @@ -1886,10 +1915,10 @@ msgstr "" #: ../../mod/register.php:90 ../../mod/register.php:144 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 #: ../../addon/facebook/facebook.php:702 -#: ../../addon/facebook/facebook.php:1192 +#: ../../addon/facebook/facebook.php:1200 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2985 -#: ../../boot.php:766 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3213 +#: ../../boot.php:779 msgid "Administrator" msgstr "" @@ -1899,7 +1928,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:898 +#: ../../mod/lostpass.php:83 ../../boot.php:912 msgid "Password Reset" msgstr "" @@ -1943,524 +1972,529 @@ msgstr "" msgid "Reset" msgstr "" -#: ../../mod/settings.php:50 ../../include/nav.php:137 +#: ../../mod/settings.php:30 ../../include/nav.php:137 msgid "Account settings" msgstr "" -#: ../../mod/settings.php:55 +#: ../../mod/settings.php:35 msgid "Display settings" msgstr "" -#: ../../mod/settings.php:61 +#: ../../mod/settings.php:41 msgid "Connector settings" msgstr "" -#: ../../mod/settings.php:66 +#: ../../mod/settings.php:46 msgid "Plugin settings" msgstr "" -#: ../../mod/settings.php:71 +#: ../../mod/settings.php:51 msgid "Connected apps" msgstr "" -#: ../../mod/settings.php:76 +#: ../../mod/settings.php:56 msgid "Export personal data" msgstr "" -#: ../../mod/settings.php:81 +#: ../../mod/settings.php:61 msgid "Remove account" msgstr "" -#: ../../mod/settings.php:89 ../../mod/admin.php:753 ../../mod/admin.php:958 -#: ../../addon/dav/layout.fnk.php:116 ../../addon/mathjax/mathjax.php:36 +#: ../../mod/settings.php:69 ../../mod/admin.php:756 ../../mod/admin.php:961 +#: ../../addon/dav/layout.fnk.php:225 ../../addon/mathjax/mathjax.php:36 #: ../../view/theme/diabook/theme.php:643 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137 msgid "Settings" msgstr "" -#: ../../mod/settings.php:133 +#: ../../mod/settings.php:113 msgid "Missing some important data!" msgstr "" -#: ../../mod/settings.php:136 ../../mod/settings.php:581 +#: ../../mod/settings.php:116 ../../mod/settings.php:563 msgid "Update" msgstr "" -#: ../../mod/settings.php:241 +#: ../../mod/settings.php:221 msgid "Failed to connect with email account using the settings provided." msgstr "" -#: ../../mod/settings.php:246 +#: ../../mod/settings.php:226 msgid "Email settings updated." msgstr "" -#: ../../mod/settings.php:305 +#: ../../mod/settings.php:285 msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/settings.php:310 +#: ../../mod/settings.php:290 msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/settings.php:321 +#: ../../mod/settings.php:301 msgid "Password changed." msgstr "" -#: ../../mod/settings.php:323 +#: ../../mod/settings.php:303 msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/settings.php:386 +#: ../../mod/settings.php:368 msgid " Please use a shorter name." msgstr "" -#: ../../mod/settings.php:388 +#: ../../mod/settings.php:370 msgid " Name too short." msgstr "" -#: ../../mod/settings.php:394 +#: ../../mod/settings.php:376 msgid " Not valid email." msgstr "" -#: ../../mod/settings.php:396 +#: ../../mod/settings.php:378 msgid " Cannot change to that email." msgstr "" -#: ../../mod/settings.php:450 +#: ../../mod/settings.php:432 msgid "Private forum has no privacy permissions. Using default privacy group." msgstr "" -#: ../../mod/settings.php:454 +#: ../../mod/settings.php:436 msgid "Private forum has no privacy permissions and no default privacy group." msgstr "" -#: ../../mod/settings.php:484 ../../addon/facebook/facebook.php:495 +#: ../../mod/settings.php:466 ../../addon/facebook/facebook.php:495 #: ../../addon/impressum/impressum.php:77 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 -#: ../../addon/twitter/twitter.php:382 +#: ../../addon/twitter/twitter.php:389 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:554 ../../mod/settings.php:580 -#: ../../mod/settings.php:616 +#: ../../mod/settings.php:536 ../../mod/settings.php:562 +#: ../../mod/settings.php:598 msgid "Add application" msgstr "" -#: ../../mod/settings.php:558 ../../mod/settings.php:584 -#: ../../addon/statusnet/statusnet.php:561 +#: ../../mod/settings.php:540 ../../mod/settings.php:566 +#: ../../addon/statusnet/statusnet.php:570 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:559 ../../mod/settings.php:585 -#: ../../addon/statusnet/statusnet.php:560 +#: ../../mod/settings.php:541 ../../mod/settings.php:567 +#: ../../addon/statusnet/statusnet.php:569 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:560 ../../mod/settings.php:586 +#: ../../mod/settings.php:542 ../../mod/settings.php:568 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:561 ../../mod/settings.php:587 +#: ../../mod/settings.php:543 ../../mod/settings.php:569 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:572 +#: ../../mod/settings.php:554 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:615 +#: ../../mod/settings.php:597 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:619 +#: ../../mod/settings.php:601 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:620 +#: ../../mod/settings.php:602 msgid "No name" msgstr "" -#: ../../mod/settings.php:621 +#: ../../mod/settings.php:603 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:632 +#: ../../mod/settings.php:614 msgid "No Plugin settings configured" msgstr "" -#: ../../mod/settings.php:640 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:622 ../../addon/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "" -#: ../../mod/settings.php:652 ../../mod/settings.php:653 +#: ../../mod/settings.php:634 ../../mod/settings.php:635 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: ../../mod/settings.php:652 ../../mod/settings.php:653 +#: ../../mod/settings.php:634 ../../mod/settings.php:635 msgid "enabled" msgstr "" -#: ../../mod/settings.php:652 ../../mod/settings.php:653 +#: ../../mod/settings.php:634 ../../mod/settings.php:635 msgid "disabled" msgstr "" -#: ../../mod/settings.php:653 +#: ../../mod/settings.php:635 msgid "StatusNet" msgstr "" -#: ../../mod/settings.php:685 +#: ../../mod/settings.php:667 msgid "Email access is disabled on this site." msgstr "" -#: ../../mod/settings.php:691 +#: ../../mod/settings.php:673 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:696 +#: ../../mod/settings.php:678 msgid "Email/Mailbox Setup" msgstr "" -#: ../../mod/settings.php:697 +#: ../../mod/settings.php:679 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:698 +#: ../../mod/settings.php:680 msgid "Last successful email check:" msgstr "" -#: ../../mod/settings.php:700 +#: ../../mod/settings.php:682 msgid "IMAP server name:" msgstr "" -#: ../../mod/settings.php:701 +#: ../../mod/settings.php:683 msgid "IMAP port:" msgstr "" -#: ../../mod/settings.php:702 +#: ../../mod/settings.php:684 msgid "Security:" msgstr "" -#: ../../mod/settings.php:702 ../../mod/settings.php:707 +#: ../../mod/settings.php:684 ../../mod/settings.php:689 +#: ../../addon/dav/common/wdcal_edit.inc.php:191 msgid "None" msgstr "" -#: ../../mod/settings.php:703 +#: ../../mod/settings.php:685 msgid "Email login name:" msgstr "" -#: ../../mod/settings.php:704 +#: ../../mod/settings.php:686 msgid "Email password:" msgstr "" -#: ../../mod/settings.php:705 +#: ../../mod/settings.php:687 msgid "Reply-to address:" msgstr "" -#: ../../mod/settings.php:706 +#: ../../mod/settings.php:688 msgid "Send public posts to all email contacts:" msgstr "" -#: ../../mod/settings.php:707 +#: ../../mod/settings.php:689 msgid "Action after import:" msgstr "" -#: ../../mod/settings.php:707 +#: ../../mod/settings.php:689 msgid "Mark as seen" msgstr "" -#: ../../mod/settings.php:707 +#: ../../mod/settings.php:689 msgid "Move to folder" msgstr "" -#: ../../mod/settings.php:708 +#: ../../mod/settings.php:690 msgid "Move to folder:" msgstr "" -#: ../../mod/settings.php:768 +#: ../../mod/settings.php:750 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:774 +#: ../../mod/settings.php:756 ../../mod/settings.php:766 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:775 +#: ../../mod/settings.php:757 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:775 +#: ../../mod/settings.php:757 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:776 +#: ../../mod/settings.php:758 msgid "Number of items to display on the network page:" msgstr "" -#: ../../mod/settings.php:776 +#: ../../mod/settings.php:758 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:777 +#: ../../mod/settings.php:759 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:848 +#: ../../mod/settings.php:835 msgid "Normal Account Page" msgstr "" -#: ../../mod/settings.php:849 +#: ../../mod/settings.php:836 msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:852 +#: ../../mod/settings.php:839 msgid "Soapbox Page" msgstr "" -#: ../../mod/settings.php:853 +#: ../../mod/settings.php:840 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:856 +#: ../../mod/settings.php:843 msgid "Community Forum/Celebrity Account" msgstr "" -#: ../../mod/settings.php:857 +#: ../../mod/settings.php:844 msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:860 +#: ../../mod/settings.php:847 msgid "Automatic Friend Page" msgstr "" -#: ../../mod/settings.php:861 +#: ../../mod/settings.php:848 msgid "Automatically approve all connection/friend requests as friends" msgstr "" -#: ../../mod/settings.php:864 +#: ../../mod/settings.php:851 msgid "Private Forum [Experimental]" msgstr "" -#: ../../mod/settings.php:865 +#: ../../mod/settings.php:852 msgid "Private forum - approved members only" msgstr "" -#: ../../mod/settings.php:877 +#: ../../mod/settings.php:864 msgid "OpenID:" msgstr "" -#: ../../mod/settings.php:877 +#: ../../mod/settings.php:864 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/settings.php:887 +#: ../../mod/settings.php:874 msgid "Publish your default profile in your local site directory?" msgstr "" -#: ../../mod/settings.php:893 +#: ../../mod/settings.php:880 msgid "Publish your default profile in the global social directory?" msgstr "" -#: ../../mod/settings.php:901 +#: ../../mod/settings.php:888 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "" -#: ../../mod/settings.php:905 +#: ../../mod/settings.php:892 msgid "Hide your profile details from unknown viewers?" msgstr "" -#: ../../mod/settings.php:910 +#: ../../mod/settings.php:897 msgid "Allow friends to post to your profile page?" msgstr "" -#: ../../mod/settings.php:916 +#: ../../mod/settings.php:903 msgid "Allow friends to tag your posts?" msgstr "" -#: ../../mod/settings.php:922 +#: ../../mod/settings.php:909 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:928 +#: ../../mod/settings.php:915 msgid "Permit unknown people to send you private mail?" msgstr "" -#: ../../mod/settings.php:936 +#: ../../mod/settings.php:923 msgid "Profile is not published." msgstr "" -#: ../../mod/settings.php:939 ../../mod/profile_photo.php:214 +#: ../../mod/settings.php:926 ../../mod/profile_photo.php:214 msgid "or" msgstr "" -#: ../../mod/settings.php:944 +#: ../../mod/settings.php:931 msgid "Your Identity Address is" msgstr "" -#: ../../mod/settings.php:955 +#: ../../mod/settings.php:942 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:955 +#: ../../mod/settings.php:942 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:956 +#: ../../mod/settings.php:943 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:957 +#: ../../mod/settings.php:944 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:958 +#: ../../mod/settings.php:945 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:959 +#: ../../mod/settings.php:946 msgid "Expire personal notes:" msgstr "" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:947 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:961 +#: ../../mod/settings.php:948 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:962 +#: ../../mod/settings.php:949 msgid "Only expire posts by others:" msgstr "" -#: ../../mod/settings.php:969 +#: ../../mod/settings.php:956 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:977 +#: ../../mod/settings.php:964 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:965 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:979 +#: ../../mod/settings.php:966 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:979 +#: ../../mod/settings.php:966 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:970 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:984 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:971 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "" -#: ../../mod/settings.php:985 +#: ../../mod/settings.php:972 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:986 +#: ../../mod/settings.php:973 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:987 +#: ../../mod/settings.php:974 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:988 +#: ../../mod/settings.php:975 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:978 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:980 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:993 ../../mod/settings.php:1012 +#: ../../mod/settings.php:980 ../../mod/settings.php:999 msgid "(to prevent spam abuse)" msgstr "" -#: ../../mod/settings.php:994 +#: ../../mod/settings.php:981 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:995 +#: ../../mod/settings.php:982 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:1012 +#: ../../mod/settings.php:999 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:1015 +#: ../../mod/settings.php:1002 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:1016 +#: ../../mod/settings.php:1003 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:1017 +#: ../../mod/settings.php:1004 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:1018 +#: ../../mod/settings.php:1005 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:1019 +#: ../../mod/settings.php:1006 msgid "making an interesting profile change" msgstr "" -#: ../../mod/settings.php:1020 +#: ../../mod/settings.php:1007 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:1021 +#: ../../mod/settings.php:1008 msgid "You receive an introduction" msgstr "" -#: ../../mod/settings.php:1022 +#: ../../mod/settings.php:1009 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:1023 +#: ../../mod/settings.php:1010 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:1024 +#: ../../mod/settings.php:1011 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:1025 +#: ../../mod/settings.php:1012 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:1026 +#: ../../mod/settings.php:1013 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:1027 +#: ../../mod/settings.php:1014 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:1030 +#: ../../mod/settings.php:1015 +msgid "You are poked/prodded/etc. in a post" +msgstr "" + +#: ../../mod/settings.php:1018 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:1031 +#: ../../mod/settings.php:1019 msgid "Change the behaviour of this account for special situations" msgstr "" @@ -2562,14 +2596,15 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1601 +#: ../../mod/notes.php:44 ../../boot.php:1641 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:187 -#: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:652 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:236 +#: ../../addon/dav/layout.fnk.php:441 ../../addon/dav/layout.fnk.php:488 +#: ../../include/text.php:677 msgid "Save" msgstr "" @@ -2578,7 +2613,7 @@ msgstr "" msgid "Number of daily wall messages for %s exceeded. Message failed." msgstr "" -#: ../../mod/wallmessage.php:56 ../../mod/message.php:66 +#: ../../mod/wallmessage.php:56 ../../mod/message.php:59 msgid "No recipient selected." msgstr "" @@ -2586,15 +2621,15 @@ msgstr "" msgid "Unable to check your home location." msgstr "" -#: ../../mod/wallmessage.php:62 ../../mod/message.php:73 +#: ../../mod/wallmessage.php:62 ../../mod/message.php:66 msgid "Message could not be sent." msgstr "" -#: ../../mod/wallmessage.php:65 ../../mod/message.php:76 +#: ../../mod/wallmessage.php:65 ../../mod/message.php:69 msgid "Message collection failure." msgstr "" -#: ../../mod/wallmessage.php:68 ../../mod/message.php:79 +#: ../../mod/wallmessage.php:68 ../../mod/message.php:72 msgid "Message sent." msgstr "" @@ -2602,34 +2637,35 @@ msgstr "" msgid "No recipient." msgstr "" -#: ../../mod/wallmessage.php:124 ../../mod/message.php:250 -#: ../../include/conversation.php:1009 +#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 +#: ../../mod/message.php:242 ../../mod/message.php:250 +#: ../../include/conversation.php:1065 ../../include/conversation.php:1082 msgid "Please enter a link URL:" msgstr "" -#: ../../mod/wallmessage.php:131 ../../mod/message.php:278 +#: ../../mod/wallmessage.php:138 ../../mod/message.php:278 msgid "Send Private Message" msgstr "" -#: ../../mod/wallmessage.php:132 +#: ../../mod/wallmessage.php:139 #, php-format msgid "" "If you wish for %s to respond, please check that the privacy settings on " "your site allow private mail from unknown senders." msgstr "" -#: ../../mod/wallmessage.php:133 ../../mod/message.php:279 -#: ../../mod/message.php:462 +#: ../../mod/wallmessage.php:140 ../../mod/message.php:279 +#: ../../mod/message.php:467 msgid "To:" msgstr "" -#: ../../mod/wallmessage.php:134 ../../mod/message.php:284 -#: ../../mod/message.php:464 +#: ../../mod/wallmessage.php:141 ../../mod/message.php:284 +#: ../../mod/message.php:469 msgid "Subject:" msgstr "" -#: ../../mod/wallmessage.php:140 ../../mod/message.php:288 -#: ../../mod/message.php:467 ../../mod/invite.php:113 +#: ../../mod/wallmessage.php:147 ../../mod/message.php:288 +#: ../../mod/message.php:472 ../../mod/invite.php:113 msgid "Your message:" msgstr "" @@ -2771,7 +2807,7 @@ msgstr "" msgid "Group name changed." msgstr "" -#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308 +#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:314 msgid "Permission denied" msgstr "" @@ -2813,7 +2849,7 @@ msgstr "" #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84 -#: ../../include/nav.php:50 ../../boot.php:1580 +#: ../../include/nav.php:50 ../../boot.php:1617 msgid "Profile" msgstr "" @@ -2829,7 +2865,7 @@ msgstr "" msgid "No contacts." msgstr "" -#: ../../mod/viewcontacts.php:76 ../../include/text.php:589 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:614 msgid "View Contacts" msgstr "" @@ -2917,7 +2953,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:864 +#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:878 msgid "Register" msgstr "" @@ -2925,33 +2961,33 @@ msgstr "" msgid "People Search" msgstr "" -#: ../../mod/like.php:144 ../../mod/like.php:301 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1586 +#: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/tagger.php:70 +#: ../../addon/facebook/facebook.php:1594 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:565 -#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1792 -#: ../../include/conversation.php:110 ../../include/conversation.php:119 -#: ../../include/conversation.php:183 ../../include/conversation.php:192 +#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1793 +#: ../../include/conversation.php:109 ../../include/conversation.php:118 +#: ../../include/conversation.php:225 ../../include/conversation.php:234 msgid "status" msgstr "" -#: ../../mod/like.php:161 ../../addon/facebook/facebook.php:1590 +#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1808 -#: ../../include/conversation.php:127 +#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1809 +#: ../../include/conversation.php:126 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../mod/like.php:163 ../../include/conversation.php:130 +#: ../../mod/like.php:164 ../../include/conversation.php:129 #, php-format 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:702 ../../mod/admin.php:901 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3464 +#: ../../mod/admin.php:705 ../../mod/admin.php:904 ../../mod/display.php:29 +#: ../../mod/display.php:134 ../../include/items.php:3692 msgid "Item not found." msgstr "" @@ -2960,7 +2996,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 -#: ../../include/nav.php:51 ../../boot.php:1586 +#: ../../include/nav.php:51 ../../boot.php:1624 msgid "Photos" msgstr "" @@ -2981,42 +3017,42 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../mod/item.php:89 +#: ../../mod/item.php:90 msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:258 +#: ../../mod/item.php:274 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:379 ../../mod/wall_upload.php:122 +#: ../../mod/item.php:395 ../../mod/wall_upload.php:122 #: ../../mod/wall_upload.php:131 ../../mod/wall_upload.php:138 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "" -#: ../../mod/item.php:784 +#: ../../mod/item.php:800 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:809 +#: ../../mod/item.php:825 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social network." msgstr "" -#: ../../mod/item.php:811 +#: ../../mod/item.php:827 #, php-format msgid "You may visit them online at %s" msgstr "" -#: ../../mod/item.php:812 +#: ../../mod/item.php:828 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: ../../mod/item.php:814 +#: ../../mod/item.php:830 #, php-format msgid "%s posted an update." msgstr "" @@ -3054,7 +3090,7 @@ msgstr "" msgid "Upload Profile Photo" msgstr "" -#: ../../mod/profile_photo.php:212 +#: ../../mod/profile_photo.php:212 ../../addon/dav/layout.fnk.php:152 msgid "Upload" msgstr "" @@ -3104,15 +3140,15 @@ msgstr "" msgid "New Message" msgstr "" -#: ../../mod/message.php:70 +#: ../../mod/message.php:63 msgid "Unable to locate contact information." msgstr "" -#: ../../mod/message.php:198 +#: ../../mod/message.php:191 msgid "Message deleted." msgstr "" -#: ../../mod/message.php:228 +#: ../../mod/message.php:221 msgid "Conversation removed." msgstr "" @@ -3135,7 +3171,7 @@ msgstr "" msgid "%s and You" msgstr "" -#: ../../mod/message.php:350 ../../mod/message.php:455 +#: ../../mod/message.php:350 ../../mod/message.php:460 msgid "Delete conversation" msgstr "" @@ -3154,17 +3190,17 @@ msgstr[1] "" msgid "Message not available." msgstr "" -#: ../../mod/message.php:438 +#: ../../mod/message.php:443 msgid "Delete message" msgstr "" -#: ../../mod/message.php:457 +#: ../../mod/message.php:462 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:461 +#: ../../mod/message.php:466 msgid "Send Reply" msgstr "" @@ -3185,15 +3221,15 @@ msgstr "" msgid "Site" msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:657 ../../mod/admin.php:669 +#: ../../mod/admin.php:97 ../../mod/admin.php:660 ../../mod/admin.php:672 msgid "Users" msgstr "" -#: ../../mod/admin.php:98 ../../mod/admin.php:751 ../../mod/admin.php:793 +#: ../../mod/admin.php:98 ../../mod/admin.php:754 ../../mod/admin.php:796 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:99 ../../mod/admin.php:956 ../../mod/admin.php:992 +#: ../../mod/admin.php:99 ../../mod/admin.php:959 ../../mod/admin.php:995 msgid "Themes" msgstr "" @@ -3201,7 +3237,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1079 +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1082 msgid "Logs" msgstr "" @@ -3217,19 +3253,19 @@ msgstr "" msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:183 ../../mod/admin.php:639 +#: ../../mod/admin.php:183 ../../mod/admin.php:642 msgid "Normal Account" msgstr "" -#: ../../mod/admin.php:184 ../../mod/admin.php:640 +#: ../../mod/admin.php:184 ../../mod/admin.php:643 msgid "Soapbox Account" msgstr "" -#: ../../mod/admin.php:185 ../../mod/admin.php:641 +#: ../../mod/admin.php:185 ../../mod/admin.php:644 msgid "Community/Celebrity Account" msgstr "" -#: ../../mod/admin.php:186 ../../mod/admin.php:642 +#: ../../mod/admin.php:186 ../../mod/admin.php:645 msgid "Automatic Friend Account" msgstr "" @@ -3245,9 +3281,9 @@ msgstr "" msgid "Message queues" msgstr "" -#: ../../mod/admin.php:212 ../../mod/admin.php:420 ../../mod/admin.php:656 -#: ../../mod/admin.php:750 ../../mod/admin.php:792 ../../mod/admin.php:955 -#: ../../mod/admin.php:991 ../../mod/admin.php:1078 +#: ../../mod/admin.php:212 ../../mod/admin.php:420 ../../mod/admin.php:659 +#: ../../mod/admin.php:753 ../../mod/admin.php:795 ../../mod/admin.php:958 +#: ../../mod/admin.php:994 ../../mod/admin.php:1081 msgid "Administration" msgstr "" @@ -3311,7 +3347,7 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../../mod/admin.php:430 ../../addon/statusnet/statusnet.php:558 +#: ../../mod/admin.php:430 ../../addon/statusnet/statusnet.php:567 msgid "Site name" msgstr "" @@ -3552,230 +3588,230 @@ msgid "" "default 50." msgstr "" -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:477 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:487 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:487 +#: ../../mod/admin.php:490 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:491 +#: ../../mod/admin.php:494 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:494 +#: ../../mod/admin.php:497 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:509 +#: ../../mod/admin.php:512 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:513 +#: ../../mod/admin.php:516 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:514 +#: ../../mod/admin.php:517 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "" -#: ../../mod/admin.php:515 +#: ../../mod/admin.php:518 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:516 +#: ../../mod/admin.php:519 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:541 +#: ../../mod/admin.php:544 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:548 +#: ../../mod/admin.php:551 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:587 +#: ../../mod/admin.php:590 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:595 +#: ../../mod/admin.php:598 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:595 +#: ../../mod/admin.php:598 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:659 +#: ../../mod/admin.php:662 msgid "select all" msgstr "" -#: ../../mod/admin.php:660 +#: ../../mod/admin.php:663 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:661 +#: ../../mod/admin.php:664 msgid "Request date" msgstr "" -#: ../../mod/admin.php:661 ../../mod/admin.php:670 +#: ../../mod/admin.php:664 ../../mod/admin.php:673 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "" -#: ../../mod/admin.php:662 +#: ../../mod/admin.php:665 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:664 +#: ../../mod/admin.php:667 msgid "Deny" msgstr "" -#: ../../mod/admin.php:670 +#: ../../mod/admin.php:673 msgid "Register date" msgstr "" -#: ../../mod/admin.php:670 +#: ../../mod/admin.php:673 msgid "Last login" msgstr "" -#: ../../mod/admin.php:670 +#: ../../mod/admin.php:673 msgid "Last item" msgstr "" -#: ../../mod/admin.php:670 +#: ../../mod/admin.php:673 msgid "Account" msgstr "" -#: ../../mod/admin.php:672 +#: ../../mod/admin.php:675 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:673 +#: ../../mod/admin.php:676 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:714 +#: ../../mod/admin.php:717 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:718 +#: ../../mod/admin.php:721 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:728 ../../mod/admin.php:926 +#: ../../mod/admin.php:731 ../../mod/admin.php:929 msgid "Disable" msgstr "" -#: ../../mod/admin.php:730 ../../mod/admin.php:928 +#: ../../mod/admin.php:733 ../../mod/admin.php:931 msgid "Enable" msgstr "" -#: ../../mod/admin.php:752 ../../mod/admin.php:957 +#: ../../mod/admin.php:755 ../../mod/admin.php:960 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:760 ../../mod/admin.php:967 +#: ../../mod/admin.php:763 ../../mod/admin.php:970 msgid "Author: " msgstr "" -#: ../../mod/admin.php:761 ../../mod/admin.php:968 +#: ../../mod/admin.php:764 ../../mod/admin.php:971 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:890 +#: ../../mod/admin.php:893 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:949 +#: ../../mod/admin.php:952 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:997 +#: ../../mod/admin.php:1000 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:998 +#: ../../mod/admin.php:1001 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1025 +#: ../../mod/admin.php:1028 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1081 +#: ../../mod/admin.php:1084 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1087 +#: ../../mod/admin.php:1090 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1088 +#: ../../mod/admin.php:1091 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1088 +#: ../../mod/admin.php:1091 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:1089 +#: ../../mod/admin.php:1092 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1139 +#: ../../mod/admin.php:1142 msgid "Close" msgstr "" -#: ../../mod/admin.php:1145 +#: ../../mod/admin.php:1148 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:1146 +#: ../../mod/admin.php:1149 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:1147 +#: ../../mod/admin.php:1150 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:1148 +#: ../../mod/admin.php:1151 msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:1029 +#: ../../mod/profile.php:21 ../../boot.php:1043 msgid "Requested profile is not available." msgstr "" -#: ../../mod/profile.php:141 ../../mod/display.php:75 +#: ../../mod/profile.php:141 ../../mod/display.php:67 msgid "Access to this profile has been restricted." msgstr "" @@ -3858,11 +3894,11 @@ msgstr "" msgid "No contacts in common." msgstr "" -#: ../../mod/share.php:28 ../../include/bb2diaspora.php:226 +#: ../../mod/share.php:28 msgid "link" msgstr "" -#: ../../mod/display.php:135 +#: ../../mod/display.php:127 msgid "Item has been removed." msgstr "" @@ -3874,13 +3910,13 @@ msgstr "" msgid "No installed applications." msgstr "" -#: ../../mod/search.php:83 ../../include/text.php:649 -#: ../../include/text.php:650 ../../include/nav.php:91 +#: ../../mod/search.php:83 ../../include/text.php:674 +#: ../../include/text.php:675 ../../include/nav.php:91 msgid "Search" msgstr "" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:410 -#: ../../mod/profiles.php:524 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:418 +#: ../../mod/profiles.php:532 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "" @@ -3936,7 +3972,7 @@ msgstr "" msgid "Address" msgstr "" -#: ../../mod/profiles.php:205 ../../addon/dav/layout.fnk.php:310 +#: ../../mod/profiles.php:205 ../../addon/dav/common/wdcal_edit.inc.php:183 msgid "Location" msgstr "" @@ -3967,226 +4003,227 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../mod/profiles.php:429 +#: ../../mod/profiles.php:437 msgid "Profile deleted." msgstr "" -#: ../../mod/profiles.php:447 ../../mod/profiles.php:481 +#: ../../mod/profiles.php:455 ../../mod/profiles.php:489 msgid "Profile-" msgstr "" -#: ../../mod/profiles.php:466 ../../mod/profiles.php:508 +#: ../../mod/profiles.php:474 ../../mod/profiles.php:516 msgid "New profile created." msgstr "" -#: ../../mod/profiles.php:487 +#: ../../mod/profiles.php:495 msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/profiles.php:545 +#: ../../mod/profiles.php:557 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:568 +#: ../../mod/profiles.php:577 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:570 +#: ../../mod/profiles.php:579 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:571 +#: ../../mod/profiles.php:580 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:572 +#: ../../mod/profiles.php:581 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:573 +#: ../../mod/profiles.php:582 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:574 +#: ../../mod/profiles.php:583 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:575 +#: ../../mod/profiles.php:584 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:576 +#: ../../mod/profiles.php:585 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:577 +#: ../../mod/profiles.php:586 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:578 +#: ../../mod/profiles.php:587 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:579 +#: ../../mod/profiles.php:588 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:580 +#: ../../mod/profiles.php:589 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:581 +#: ../../mod/profiles.php:590 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:582 +#: ../../mod/profiles.php:591 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:583 +#: ../../mod/profiles.php:592 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:584 +#: ../../mod/profiles.php:593 msgid "♥ Marital Status:" msgstr "" -#: ../../mod/profiles.php:585 +#: ../../mod/profiles.php:594 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:586 +#: ../../mod/profiles.php:595 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:587 +#: ../../mod/profiles.php:596 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:588 ../../include/profile_advanced.php:46 +#: ../../mod/profiles.php:597 ../../include/profile_advanced.php:46 msgid "Sexual Preference:" msgstr "" -#: ../../mod/profiles.php:589 +#: ../../mod/profiles.php:598 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:590 ../../include/profile_advanced.php:50 +#: ../../mod/profiles.php:599 ../../include/profile_advanced.php:50 msgid "Hometown:" msgstr "" -#: ../../mod/profiles.php:591 ../../include/profile_advanced.php:54 +#: ../../mod/profiles.php:600 ../../include/profile_advanced.php:54 msgid "Political Views:" msgstr "" -#: ../../mod/profiles.php:592 +#: ../../mod/profiles.php:601 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:593 +#: ../../mod/profiles.php:602 msgid "Public Keywords:" msgstr "" -#: ../../mod/profiles.php:594 +#: ../../mod/profiles.php:603 msgid "Private Keywords:" msgstr "" -#: ../../mod/profiles.php:595 ../../include/profile_advanced.php:62 +#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:62 msgid "Likes:" msgstr "" -#: ../../mod/profiles.php:596 ../../include/profile_advanced.php:64 +#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:64 msgid "Dislikes:" msgstr "" -#: ../../mod/profiles.php:597 +#: ../../mod/profiles.php:606 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:598 +#: ../../mod/profiles.php:607 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "" -#: ../../mod/profiles.php:599 +#: ../../mod/profiles.php:608 msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: ../../mod/profiles.php:600 +#: ../../mod/profiles.php:609 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:601 +#: ../../mod/profiles.php:610 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:602 +#: ../../mod/profiles.php:611 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:603 +#: ../../mod/profiles.php:612 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:604 +#: ../../mod/profiles.php:613 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:605 +#: ../../mod/profiles.php:614 msgid "Television" msgstr "" -#: ../../mod/profiles.php:606 +#: ../../mod/profiles.php:615 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:607 +#: ../../mod/profiles.php:616 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:608 +#: ../../mod/profiles.php:617 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:609 +#: ../../mod/profiles.php:618 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:623 msgid "" "This is your public profile.
It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:624 ../../mod/directory.php:109 +#: ../../mod/profiles.php:633 ../../mod/directory.php:109 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:663 +#: ../../mod/profiles.php:672 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:664 ../../boot.php:1138 +#: ../../mod/profiles.php:673 ../../boot.php:1152 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:665 ../../boot.php:1139 +#: ../../mod/profiles.php:674 ../../boot.php:1153 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:676 ../../boot.php:1149 +#: ../../mod/profiles.php:685 ../../boot.php:1163 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:678 ../../boot.php:1152 +#: ../../mod/profiles.php:687 ../../boot.php:1166 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:679 ../../boot.php:1153 +#: ../../mod/profiles.php:688 ../../boot.php:1167 msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:1013 +#: ../../mod/filer.php:29 ../../include/conversation.php:1069 +#: ../../include/conversation.php:1086 msgid "Save to Folder:" msgstr "" @@ -4194,7 +4231,7 @@ msgstr "" msgid "- select -" msgstr "" -#: ../../mod/tagger.php:103 ../../include/conversation.php:200 +#: ../../mod/tagger.php:103 ../../include/conversation.php:242 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" @@ -4238,34 +4275,46 @@ msgstr "" msgid "Source (bbcode) text:" msgstr "" -#: ../../mod/babel.php:25 +#: ../../mod/babel.php:23 +msgid "Source (Diaspora) text to convert to BBcode:" +msgstr "" + +#: ../../mod/babel.php:31 msgid "Source input: " msgstr "" -#: ../../mod/babel.php:29 +#: ../../mod/babel.php:35 msgid "bb2html: " msgstr "" -#: ../../mod/babel.php:33 +#: ../../mod/babel.php:39 msgid "bb2html2bb: " msgstr "" -#: ../../mod/babel.php:37 +#: ../../mod/babel.php:43 msgid "bb2md: " msgstr "" -#: ../../mod/babel.php:41 +#: ../../mod/babel.php:47 msgid "bb2md2html: " msgstr "" -#: ../../mod/babel.php:45 +#: ../../mod/babel.php:51 msgid "bb2dia2bb: " msgstr "" -#: ../../mod/babel.php:49 +#: ../../mod/babel.php:55 msgid "bb2md2html2bb: " msgstr "" +#: ../../mod/babel.php:65 +msgid "Source input (Diaspora format): " +msgstr "" + +#: ../../mod/babel.php:70 +msgid "diaspora2bb: " +msgstr "" + #: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" @@ -4298,17 +4347,17 @@ msgid "Gender: " msgstr "" #: ../../mod/directory.php:134 ../../include/profile_advanced.php:17 -#: ../../boot.php:1174 +#: ../../boot.php:1188 msgid "Gender:" msgstr "" #: ../../mod/directory.php:136 ../../include/profile_advanced.php:37 -#: ../../boot.php:1177 +#: ../../boot.php:1191 msgid "Status:" msgstr "" #: ../../mod/directory.php:138 ../../include/profile_advanced.php:48 -#: ../../boot.php:1179 +#: ../../boot.php:1193 msgid "Homepage:" msgstr "" @@ -4440,7 +4489,7 @@ msgid "Unable to set contact photo." msgstr "" #: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:577 -#: ../../include/conversation.php:163 +#: ../../include/conversation.php:162 #, php-format msgid "%1$s is now friends with %2$s" msgstr "" @@ -4674,7 +4723,7 @@ msgstr "" msgid "Activate Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:799 ../../addon/dav/layout.fnk.php:360 +#: ../../addon/facebook/facebook.php:799 ../../addon/dav/layout.fnk.php:361 msgid "The new values have been saved." msgstr "" @@ -4688,23 +4737,23 @@ msgid "" "conflict." msgstr "" -#: ../../addon/facebook/facebook.php:1141 +#: ../../addon/facebook/facebook.php:1149 msgid "View on Friendica" msgstr "" -#: ../../addon/facebook/facebook.php:1174 +#: ../../addon/facebook/facebook.php:1182 msgid "Facebook post failed. Queued for retry." msgstr "" -#: ../../addon/facebook/facebook.php:1214 +#: ../../addon/facebook/facebook.php:1222 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "" -#: ../../addon/facebook/facebook.php:1215 +#: ../../addon/facebook/facebook.php:1223 msgid "Facebook connection became invalid" msgstr "" -#: ../../addon/facebook/facebook.php:1216 +#: ../../addon/facebook/facebook.php:1224 #, php-format msgid "" "Hi %1$s,\n" @@ -4726,23 +4775,35 @@ msgstr "" msgid "Automatically follow any StatusNet followers/mentioners" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:184 +#: ../../addon/bg/bg.php:51 +msgid "Bg settings updated." +msgstr "" + +#: ../../addon/bg/bg.php:82 +msgid "Bg Settings" +msgstr "" + +#: ../../addon/bg/bg.php:84 ../../addon/numfriends/numfriends.php:79 +msgid "How many contacts to display on profile sidebar" +msgstr "" + +#: ../../addon/privacy_image_cache/privacy_image_cache.php:233 msgid "Lifetime of the cache (in hours)" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:189 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:238 msgid "Cache Statistics" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:192 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:241 msgid "Number of items" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:194 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:243 msgid "Size of the cache" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:196 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:245 msgid "Delete the whole cache" msgstr "" @@ -4780,6 +4841,156 @@ msgstr "" msgid "Connect on Friendica!" msgstr "" +#: ../../addon/morepokes/morepokes.php:19 +msgid "bitchslap" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:19 +msgid "bitchslapped" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:20 +msgid "shag" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:20 +msgid "shagged" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:21 +msgid "do something obscenely biological to" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:21 +msgid "did something obscenely biological to" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:22 +msgid "point out the new poke feature to" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:22 +msgid "pointed out the new poke feature to" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:23 +msgid "declare undying love for" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:23 +msgid "declared undying love for" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:24 +msgid "set fire to" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:25 +msgid "patent" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:25 +msgid "patented" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:26 +msgid "stroke beard" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:26 +msgid "stroked their beard at" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:27 +msgid "" +"bemoan the declining standards of modern secondary and tertiary education to" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:27 +msgid "" +"bemoans the declining standards of modern secondary and tertiary education to" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:28 +msgid "hug" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:28 +msgid "hugged" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:29 +msgid "kiss" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:29 +msgid "kissed" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:30 +msgid "raise eyebrows at" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:30 +msgid "raised their eyebrows at" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:31 +msgid "insult" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:31 +msgid "insulted" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:32 +msgid "praise" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:32 +msgid "praised" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:33 +msgid "be dubious of" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:33 +msgid "was dubious of" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:34 +msgid "eat" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:34 +msgid "ate" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:35 +msgid "giggle and fawn at" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:35 +msgid "giggled and fawned at" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:36 +msgid "doubt" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:36 +msgid "doubted" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:37 +msgid "glare" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:37 +msgid "glared at" +msgstr "" + #: ../../addon/yourls/yourls.php:55 msgid "YourLS Settings" msgstr "" @@ -4864,10 +5075,11 @@ msgid "%s - Click to open/close" msgstr "" #: ../../addon/page/page.php:61 ../../addon/page/page.php:91 +#: ../../addon/forumlist/forumlist.php:54 msgid "Forums" msgstr "" -#: ../../addon/page/page.php:129 +#: ../../addon/page/page.php:129 ../../addon/forumlist/forumlist.php:88 msgid "Forums:" msgstr "" @@ -4879,7 +5091,7 @@ msgstr "" msgid "Page Settings" msgstr "" -#: ../../addon/page/page.php:196 +#: ../../addon/page/page.php:196 ../../addon/forumlist/forumlist.php:155 msgid "How many forums to display on sidebar without paging" msgstr "" @@ -4903,7 +5115,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:885 +#: ../../include/nav.php:64 ../../boot.php:899 msgid "Login" msgstr "" @@ -4931,205 +5143,533 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1319 -#: ../../include/conversation.php:107 ../../include/conversation.php:180 +#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1360 +#: ../../include/conversation.php:106 ../../include/conversation.php:222 msgid "event" msgstr "" -#: ../../addon/dav/common/wdcal_configuration.php:126 -msgid "U.S. Time Format (mm/dd/YYYY)" +#: ../../addon/dav/dav_caldav_backend_virtual_friendica.inc.php:36 +msgid "Friendicy-Native events" msgstr "" -#: ../../addon/dav/common/wdcal_configuration.php:205 -msgid "German Time Format (dd.mm.YYYY)" +#: ../../addon/dav/common/wdcal_backend.inc.php:92 +#: ../../addon/dav/common/wdcal_backend.inc.php:166 +#: ../../addon/dav/common/wdcal_backend.inc.php:178 +#: ../../addon/dav/common/wdcal_backend.inc.php:206 +#: ../../addon/dav/common/wdcal_backend.inc.php:214 +#: ../../addon/dav/common/wdcal_backend.inc.php:229 +msgid "No access" msgstr "" -#: ../../addon/dav/common/calendar.fnk.php:517 -#: ../../addon/dav/common/calendar.fnk.php:533 -#: ../../addon/dav/layout.fnk.php:200 -msgid "Error" +#: ../../addon/dav/common/wdcal_edit.inc.php:30 +#: ../../addon/dav/common/wdcal_edit.inc.php:738 +msgid "Could not open component for editing" msgstr "" -#: ../../addon/dav/common/calendar.fnk.php:568 -#: ../../addon/dav/common/calendar.fnk.php:637 -#: ../../addon/dav/common/calendar.fnk.php:664 -#: ../../addon/dav/layout.fnk.php:231 -msgid "No access" +#: ../../addon/dav/common/wdcal_edit.inc.php:140 +#: ../../addon/dav/layout.fnk.php:143 ../../addon/dav/layout.fnk.php:422 +msgid "Go back to the calendar" msgstr "" -#: ../../addon/dav/layout.fnk.php:119 -msgid "New event" +#: ../../addon/dav/common/wdcal_edit.inc.php:144 +msgid "Event data" msgstr "" -#: ../../addon/dav/layout.fnk.php:123 -msgid "Today" +#: ../../addon/dav/common/wdcal_edit.inc.php:146 ../../addon/dav/main.php:206 +msgid "Calendar" msgstr "" -#: ../../addon/dav/layout.fnk.php:132 -msgid "Day" +#: ../../addon/dav/common/wdcal_edit.inc.php:163 +msgid "Special color" msgstr "" -#: ../../addon/dav/layout.fnk.php:139 -msgid "Week" +#: ../../addon/dav/common/wdcal_edit.inc.php:169 +msgid "Subject" msgstr "" -#: ../../addon/dav/layout.fnk.php:146 -msgid "Month" +#: ../../addon/dav/common/wdcal_edit.inc.php:173 +msgid "Starts" msgstr "" -#: ../../addon/dav/layout.fnk.php:151 -msgid "Reload" +#: ../../addon/dav/common/wdcal_edit.inc.php:178 +msgid "Ends" msgstr "" -#: ../../addon/dav/layout.fnk.php:162 -msgid "Date" +#: ../../addon/dav/common/wdcal_edit.inc.php:185 +msgid "Description" msgstr "" -#: ../../addon/dav/layout.fnk.php:224 -msgid "Not found" +#: ../../addon/dav/common/wdcal_edit.inc.php:188 +msgid "Recurrence" msgstr "" -#: ../../addon/dav/layout.fnk.php:292 ../../addon/dav/layout.fnk.php:365 -msgid "Go back to the calendar" +#: ../../addon/dav/common/wdcal_edit.inc.php:190 +msgid "Frequency" msgstr "" -#: ../../addon/dav/layout.fnk.php:300 -msgid "Starts" +#: ../../addon/dav/common/wdcal_edit.inc.php:194 +#: ../../include/contact_selectors.php:59 +msgid "Daily" msgstr "" -#: ../../addon/dav/layout.fnk.php:305 -msgid "Ends" +#: ../../addon/dav/common/wdcal_edit.inc.php:197 +#: ../../include/contact_selectors.php:60 +msgid "Weekly" msgstr "" -#: ../../addon/dav/layout.fnk.php:312 -msgid "Description" +#: ../../addon/dav/common/wdcal_edit.inc.php:200 +#: ../../include/contact_selectors.php:61 +msgid "Monthly" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:203 +msgid "Yearly" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:214 +#: ../../include/datetime.php:288 +msgid "days" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:215 +#: ../../include/datetime.php:287 +msgid "weeks" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:216 +#: ../../include/datetime.php:286 +msgid "months" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:217 +#: ../../include/datetime.php:285 +msgid "years" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:218 +msgid "Interval" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:218 +msgid "All %select% %time%" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:222 +#: ../../addon/dav/common/wdcal_edit.inc.php:260 +#: ../../addon/dav/common/wdcal_edit.inc.php:481 +msgid "Days" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:231 +#: ../../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:880 +msgid "Sunday" +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:880 +msgid "Monday" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:238 +#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:880 +msgid "Tuesday" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:241 +#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:880 +msgid "Wednesday" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:244 +#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:880 +msgid "Thursday" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:247 +#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:880 +msgid "Friday" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:250 +#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:880 +msgid "Saturday" msgstr "" -#: ../../addon/dav/layout.fnk.php:315 +#: ../../addon/dav/common/wdcal_edit.inc.php:297 +msgid "First day of week:" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:350 +#: ../../addon/dav/common/wdcal_edit.inc.php:373 +msgid "Day of month" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:354 +msgid "#num#th of each month" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:357 +msgid "#num#th-last of each month" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:360 +msgid "#num#th #wkday# of each month" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:363 +msgid "#num#th-last #wkday# of each month" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:372 +#: ../../addon/dav/layout.fnk.php:255 +msgid "Month" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:377 +msgid "#num#th of the given month" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:380 +msgid "#num#th-last of the given month" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:383 +msgid "#num#th #wkday# of the given month" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:386 +msgid "#num#th-last #wkday# of the given month" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:413 +msgid "Repeat until" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:417 +msgid "Infinite" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:420 +msgid "Until the following date" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:423 +msgid "Number of times" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:429 +msgid "Exceptions" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:432 +msgid "none" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:449 msgid "Notification" msgstr "" -#: ../../addon/dav/layout.fnk.php:324 -msgid "Minutes" +#: ../../addon/dav/common/wdcal_edit.inc.php:466 +msgid "Notify by" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:469 +msgid "E-Mail" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:470 +msgid "On Friendica / Display" msgstr "" -#: ../../addon/dav/layout.fnk.php:327 +#: ../../addon/dav/common/wdcal_edit.inc.php:474 +msgid "Time" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:478 msgid "Hours" msgstr "" -#: ../../addon/dav/layout.fnk.php:330 -msgid "Days" +#: ../../addon/dav/common/wdcal_edit.inc.php:479 +msgid "Minutes" msgstr "" -#: ../../addon/dav/layout.fnk.php:331 -msgid "before" +#: ../../addon/dav/common/wdcal_edit.inc.php:480 +msgid "Seconds" msgstr "" -#: ../../addon/dav/layout.fnk.php:367 +#: ../../addon/dav/common/wdcal_edit.inc.php:482 +msgid "Weeks" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:485 +msgid "before the" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:486 +msgid "start of the event" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:487 +msgid "end of the event" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:492 +msgid "Add a notification" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:687 +msgid "The event #name# will start at #date" +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:696 +msgid "#name# is about to begin." +msgstr "" + +#: ../../addon/dav/common/wdcal_edit.inc.php:769 +msgid "Saved" +msgstr "" + +#: ../../addon/dav/common/wdcal_configuration.php:148 +msgid "U.S. Time Format (mm/dd/YYYY)" +msgstr "" + +#: ../../addon/dav/common/wdcal_configuration.php:243 +msgid "German Time Format (dd.mm.YYYY)" +msgstr "" + +#: ../../addon/dav/common/dav_caldav_backend_private.inc.php:39 +msgid "Private Events" +msgstr "" + +#: ../../addon/dav/dav_carddav_backend_virtual_friendica.inc.php:53 +msgid "Friendica-Contacts" +msgstr "" + +#: ../../addon/dav/dav_carddav_backend_virtual_friendica.inc.php:54 +msgid "Your Friendica-Contacts" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:99 ../../addon/dav/layout.fnk.php:136 +msgid "" +"Something went wrong when trying to import the file. Sorry. Maybe some " +"events were imported anyway." +msgstr "" + +#: ../../addon/dav/layout.fnk.php:131 +msgid "Something went wrong when trying to import the file. Sorry." +msgstr "" + +#: ../../addon/dav/layout.fnk.php:134 +msgid "The ICS-File has been imported." +msgstr "" + +#: ../../addon/dav/layout.fnk.php:138 +msgid "No file was uploaded." +msgstr "" + +#: ../../addon/dav/layout.fnk.php:147 +msgid "Import a ICS-file" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:150 +msgid "ICS-File" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:151 +msgid "Overwrite all #num# existing events" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:228 +msgid "New event" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:232 +msgid "Today" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:241 +msgid "Day" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:248 +msgid "Week" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:260 +msgid "Reload" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:271 +msgid "Date" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:313 +msgid "Error" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:380 +msgid "The calendar has been updated." +msgstr "" + +#: ../../addon/dav/layout.fnk.php:393 +msgid "The new calendar has been created." +msgstr "" + +#: ../../addon/dav/layout.fnk.php:417 +msgid "The calendar has been deleted." +msgstr "" + +#: ../../addon/dav/layout.fnk.php:424 msgid "Calendar Settings" msgstr "" -#: ../../addon/dav/layout.fnk.php:373 +#: ../../addon/dav/layout.fnk.php:430 msgid "Date format" msgstr "" -#: ../../addon/dav/layout.fnk.php:382 +#: ../../addon/dav/layout.fnk.php:439 msgid "Time zone" msgstr "" -#: ../../addon/dav/layout.fnk.php:387 +#: ../../addon/dav/layout.fnk.php:445 +msgid "Calendars" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:487 +msgid "Create a new calendar" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:496 msgid "Limitations" msgstr "" -#: ../../addon/dav/layout.fnk.php:391 +#: ../../addon/dav/layout.fnk.php:500 ../../addon/libravatar/libravatar.php:82 msgid "Warning" msgstr "" -#: ../../addon/dav/layout.fnk.php:395 +#: ../../addon/dav/layout.fnk.php:504 msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)" msgstr "" -#: ../../addon/dav/layout.fnk.php:402 +#: ../../addon/dav/layout.fnk.php:511 msgid "Synchronizing this calendar with the iPhone" msgstr "" -#: ../../addon/dav/layout.fnk.php:413 +#: ../../addon/dav/layout.fnk.php:522 msgid "Synchronizing your Friendica-Contacts with the iPhone" msgstr "" -#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:37 -msgid "Friendica-Contacts" +#: ../../addon/dav/main.php:169 +msgid "" +"The current version of this plugin has not been set up correctly. Please " +"contact the system administrator of your installation of friendica to fix " +"this." msgstr "" -#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:38 -msgid "Your Friendica-Contacts" +#: ../../addon/dav/main.php:209 +msgid "Extended calendar with CalDAV-support" msgstr "" -#: ../../addon/dav/main.php:244 -msgid "Calendar" +#: ../../addon/dav/main.php:246 ../../addon/dav/main.php:247 +#: ../../include/delivery.php:463 ../../include/enotify.php:26 +#: ../../include/notifier.php:685 +msgid "noreply" msgstr "" -#: ../../addon/dav/main.php:247 -msgid "Extended calendar with CalDAV-support" +#: ../../addon/dav/main.php:249 +msgid "Notification: " msgstr "" -#: ../../addon/dav/main.php:263 +#: ../../addon/dav/main.php:276 msgid "The database tables have been installed." msgstr "" -#: ../../addon/dav/main.php:264 +#: ../../addon/dav/main.php:277 msgid "An error occurred during the installation." msgstr "" -#: ../../addon/dav/main.php:280 +#: ../../addon/dav/main.php:283 +msgid "The database tables have been updated." +msgstr "" + +#: ../../addon/dav/main.php:285 +msgid "An error occurred during the update." +msgstr "" + +#: ../../addon/dav/main.php:301 msgid "No system-wide settings yet." msgstr "" -#: ../../addon/dav/main.php:283 +#: ../../addon/dav/main.php:304 msgid "Database status" msgstr "" -#: ../../addon/dav/main.php:286 +#: ../../addon/dav/main.php:307 msgid "Installed" msgstr "" -#: ../../addon/dav/main.php:289 +#: ../../addon/dav/main.php:310 msgid "Upgrade needed" msgstr "" -#: ../../addon/dav/main.php:289 +#: ../../addon/dav/main.php:310 +msgid "" +"Please back up all calendar data (the tables beginning with dav_*) before " +"proceeding. While all calendar events should be converted to the new " +"database structure, it's always safe to have a backup. Below, you can have a " +"look at the database-queries that will be made when pressing the 'update'-" +"button." +msgstr "" + +#: ../../addon/dav/main.php:310 msgid "Upgrade" msgstr "" -#: ../../addon/dav/main.php:292 +#: ../../addon/dav/main.php:313 msgid "Not installed" msgstr "" -#: ../../addon/dav/main.php:292 +#: ../../addon/dav/main.php:313 msgid "Install" msgstr "" -#: ../../addon/dav/main.php:297 +#: ../../addon/dav/main.php:317 +msgid "Unknown" +msgstr "" + +#: ../../addon/dav/main.php:317 +msgid "" +"Something really went wrong. I cannot recover from this state automatically, " +"sorry. Please go to the database backend, back up the data, and delete all " +"tables beginning with 'dav_' manually. Afterwards, this installation routine " +"should be able to reinitialize the tables automatically." +msgstr "" + +#: ../../addon/dav/main.php:322 msgid "Troubleshooting" msgstr "" -#: ../../addon/dav/main.php:298 +#: ../../addon/dav/main.php:323 msgid "Manual creation of the database tables:" msgstr "" -#: ../../addon/dav/main.php:299 +#: ../../addon/dav/main.php:324 msgid "Show SQL-statements" msgstr "" -#: ../../addon/dav/calendar.friendica.fnk.php:151 +#: ../../addon/dav/calendar.friendica.fnk.php:193 msgid "Private Calendar" msgstr "" -#: ../../addon/dav/calendar.friendica.fnk.php:158 +#: ../../addon/dav/calendar.friendica.fnk.php:194 msgid "Friendica Events: Mine" msgstr "" -#: ../../addon/dav/calendar.friendica.fnk.php:161 +#: ../../addon/dav/calendar.friendica.fnk.php:195 msgid "Friendica Events: Contacts" msgstr "" @@ -5367,6 +5907,30 @@ msgstr "" msgid "URL to embed:" msgstr "" +#: ../../addon/forumlist/forumlist.php:57 +msgid "show/hide" +msgstr "" + +#: ../../addon/forumlist/forumlist.php:72 +msgid "No forum subscriptions" +msgstr "" + +#: ../../addon/forumlist/forumlist.php:124 +msgid "Forumlist settings updated." +msgstr "" + +#: ../../addon/forumlist/forumlist.php:153 +msgid "Forumlist Settings" +msgstr "" + +#: ../../addon/forumlist/forumlist.php:158 +msgid "Randomise Forumlist/Forum list" +msgstr "" + +#: ../../addon/forumlist/forumlist.php:161 +msgid "Show forumlists/forums on profile forumlist" +msgstr "" + #: ../../addon/impressum/impressum.php:36 msgid "Impressum" msgstr "" @@ -5525,6 +6089,82 @@ msgstr "" msgid "The default zoom level. (1:world, 18:highest)" msgstr "" +#: ../../addon/group_text/group_text.php:46 +#: ../../addon/editplain/editplain.php:46 +msgid "Editplain settings updated." +msgstr "" + +#: ../../addon/group_text/group_text.php:76 +msgid "Group Text" +msgstr "" + +#: ../../addon/group_text/group_text.php:78 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "" + +#: ../../addon/libravatar/libravatar.php:14 +msgid "Could NOT install Libravatar successfully.
It requires PHP >= 5.3" +msgstr "" + +#: ../../addon/libravatar/libravatar.php:73 +#: ../../addon/gravatar/gravatar.php:71 +msgid "generic profile image" +msgstr "" + +#: ../../addon/libravatar/libravatar.php:74 +#: ../../addon/gravatar/gravatar.php:72 +msgid "random geometric pattern" +msgstr "" + +#: ../../addon/libravatar/libravatar.php:75 +#: ../../addon/gravatar/gravatar.php:73 +msgid "monster face" +msgstr "" + +#: ../../addon/libravatar/libravatar.php:76 +#: ../../addon/gravatar/gravatar.php:74 +msgid "computer generated face" +msgstr "" + +#: ../../addon/libravatar/libravatar.php:77 +#: ../../addon/gravatar/gravatar.php:75 +msgid "retro arcade style face" +msgstr "" + +#: ../../addon/libravatar/libravatar.php:83 +#, php-format +msgid "Your PHP version %s is lower than the required PHP >= 5.3." +msgstr "" + +#: ../../addon/libravatar/libravatar.php:84 +msgid "This addon is not functional on your server." +msgstr "" + +#: ../../addon/libravatar/libravatar.php:93 +#: ../../addon/gravatar/gravatar.php:89 +msgid "Information" +msgstr "" + +#: ../../addon/libravatar/libravatar.php:93 +msgid "" +"Gravatar addon is installed. Please disable the Gravatar addon.
The " +"Libravatar addon will fall back to Gravatar if nothing was found at " +"Libravatar." +msgstr "" + +#: ../../addon/libravatar/libravatar.php:100 +#: ../../addon/gravatar/gravatar.php:96 +msgid "Default avatar image" +msgstr "" + +#: ../../addon/libravatar/libravatar.php:100 +msgid "Select default avatar image if none was found. See README" +msgstr "" + +#: ../../addon/libravatar/libravatar.php:112 +msgid "Libravatar settings updated." +msgstr "" + #: ../../addon/libertree/libertree.php:36 msgid "Post to libertree" msgstr "" @@ -5549,6 +6189,18 @@ msgstr "" msgid "Post to Libertree by default" msgstr "" +#: ../../addon/altpager/altpager.php:46 +msgid "Altpager settings updated." +msgstr "" + +#: ../../addon/altpager/altpager.php:79 +msgid "Alternate Pagination Setting" +msgstr "" + +#: ../../addon/altpager/altpager.php:81 +msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?" +msgstr "" + #: ../../addon/mathjax/mathjax.php:37 msgid "" "The MathJax addon renders mathematical formulae written using the LaTeX " @@ -5570,10 +6222,6 @@ msgid "" "be either the MathJax CDN or another installation of MathJax." msgstr "" -#: ../../addon/editplain/editplain.php:46 -msgid "Editplain settings updated." -msgstr "" - #: ../../addon/editplain/editplain.php:76 msgid "Editplain Settings" msgstr "" @@ -5582,43 +6230,26 @@ msgstr "" msgid "Disable richtext status editor" msgstr "" -#: ../../addon/gravatar/gravatar.php:71 -msgid "generic profile image" -msgstr "" - -#: ../../addon/gravatar/gravatar.php:72 -msgid "random geometric pattern" -msgstr "" - -#: ../../addon/gravatar/gravatar.php:73 -msgid "monster face" -msgstr "" - -#: ../../addon/gravatar/gravatar.php:74 -msgid "computer generated face" -msgstr "" - -#: ../../addon/gravatar/gravatar.php:75 -msgid "retro arcade style face" -msgstr "" - -#: ../../addon/gravatar/gravatar.php:87 -msgid "Default avatar image" +#: ../../addon/gravatar/gravatar.php:89 +msgid "" +"Libravatar addon is installed, too. Please disable Libravatar addon or this " +"Gravatar addon.
The Libravatar addon will fall back to Gravatar if " +"nothing was found at Libravatar." msgstr "" -#: ../../addon/gravatar/gravatar.php:87 +#: ../../addon/gravatar/gravatar.php:96 msgid "Select default avatar image if none was found at Gravatar. See README" msgstr "" -#: ../../addon/gravatar/gravatar.php:88 +#: ../../addon/gravatar/gravatar.php:97 msgid "Rating of images" msgstr "" -#: ../../addon/gravatar/gravatar.php:88 +#: ../../addon/gravatar/gravatar.php:97 msgid "Select the appropriate avatar rating for your site. See README" msgstr "" -#: ../../addon/gravatar/gravatar.php:102 +#: ../../addon/gravatar/gravatar.php:111 msgid "Gravatar settings updated." msgstr "" @@ -5796,7 +6427,7 @@ msgstr "" msgid "Clear OAuth configuration" msgstr "" -#: ../../addon/statusnet/statusnet.php:559 +#: ../../addon/statusnet/statusnet.php:568 msgid "API URL" msgstr "" @@ -5836,10 +6467,6 @@ msgstr "" msgid "Numfriends Settings" msgstr "" -#: ../../addon/numfriends/numfriends.php:79 -msgid "How many contacts to display on profile sidebar" -msgstr "" - #: ../../addon/gnot/gnot.php:48 msgid "Gnot settings updated." msgstr "" @@ -6013,11 +6640,11 @@ msgstr "" msgid "Send linked #-tags and @-names to Twitter" msgstr "" -#: ../../addon/twitter/twitter.php:389 +#: ../../addon/twitter/twitter.php:396 msgid "Consumer key" msgstr "" -#: ../../addon/twitter/twitter.php:390 +#: ../../addon/twitter/twitter.php:397 msgid "Consumer secret" msgstr "" @@ -6418,18 +7045,6 @@ msgstr "" msgid "Twice daily" msgstr "" -#: ../../include/contact_selectors.php:59 -msgid "Daily" -msgstr "" - -#: ../../include/contact_selectors.php:60 -msgid "Weekly" -msgstr "" - -#: ../../include/contact_selectors.php:61 -msgid "Monthly" -msgstr "" - #: ../../include/contact_selectors.php:77 msgid "OStatus" msgstr "" @@ -6686,11 +7301,11 @@ msgstr "" msgid "Ask me" msgstr "" -#: ../../include/event.php:20 ../../include/bb2diaspora.php:393 +#: ../../include/event.php:20 ../../include/bb2diaspora.php:431 msgid "Starts:" msgstr "" -#: ../../include/event.php:30 ../../include/bb2diaspora.php:401 +#: ../../include/event.php:30 ../../include/bb2diaspora.php:439 msgid "Finishes:" msgstr "" @@ -6698,11 +7313,6 @@ msgstr "" msgid "(no subject)" msgstr "" -#: ../../include/delivery.php:463 ../../include/enotify.php:26 -#: ../../include/notifier.php:685 -msgid "noreply" -msgstr "" - #: ../../include/Scrape.php:572 msgid " on Last.fm" msgstr "" @@ -6723,138 +7333,166 @@ msgstr "" msgid "next" msgstr "" -#: ../../include/text.php:568 +#: ../../include/text.php:295 +msgid "newer" +msgstr "" + +#: ../../include/text.php:299 +msgid "older" +msgstr "" + +#: ../../include/text.php:593 msgid "No contacts" msgstr "" -#: ../../include/text.php:577 +#: ../../include/text.php:602 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:839 -msgid "Monday" +#: ../../include/text.php:715 +msgid "poke" msgstr "" -#: ../../include/text.php:839 -msgid "Tuesday" +#: ../../include/text.php:715 ../../include/conversation.php:201 +msgid "poked" msgstr "" -#: ../../include/text.php:839 -msgid "Wednesday" +#: ../../include/text.php:716 +msgid "ping" msgstr "" -#: ../../include/text.php:839 -msgid "Thursday" +#: ../../include/text.php:716 +msgid "pinged" msgstr "" -#: ../../include/text.php:839 -msgid "Friday" +#: ../../include/text.php:717 +msgid "prod" msgstr "" -#: ../../include/text.php:839 -msgid "Saturday" +#: ../../include/text.php:717 +msgid "prodded" msgstr "" -#: ../../include/text.php:839 -msgid "Sunday" +#: ../../include/text.php:718 +msgid "slap" +msgstr "" + +#: ../../include/text.php:718 +msgid "slapped" msgstr "" -#: ../../include/text.php:843 +#: ../../include/text.php:719 +msgid "finger" +msgstr "" + +#: ../../include/text.php:719 +msgid "fingered" +msgstr "" + +#: ../../include/text.php:720 +msgid "rebuff" +msgstr "" + +#: ../../include/text.php:720 +msgid "rebuffed" +msgstr "" + +#: ../../include/text.php:884 msgid "January" msgstr "" -#: ../../include/text.php:843 +#: ../../include/text.php:884 msgid "February" msgstr "" -#: ../../include/text.php:843 +#: ../../include/text.php:884 msgid "March" msgstr "" -#: ../../include/text.php:843 +#: ../../include/text.php:884 msgid "April" msgstr "" -#: ../../include/text.php:843 +#: ../../include/text.php:884 msgid "May" msgstr "" -#: ../../include/text.php:843 +#: ../../include/text.php:884 msgid "June" msgstr "" -#: ../../include/text.php:843 +#: ../../include/text.php:884 msgid "July" msgstr "" -#: ../../include/text.php:843 +#: ../../include/text.php:884 msgid "August" msgstr "" -#: ../../include/text.php:843 +#: ../../include/text.php:884 msgid "September" msgstr "" -#: ../../include/text.php:843 +#: ../../include/text.php:884 msgid "October" msgstr "" -#: ../../include/text.php:843 +#: ../../include/text.php:884 msgid "November" msgstr "" -#: ../../include/text.php:843 +#: ../../include/text.php:884 msgid "December" msgstr "" -#: ../../include/text.php:929 +#: ../../include/text.php:970 msgid "bytes" msgstr "" -#: ../../include/text.php:949 ../../include/text.php:964 +#: ../../include/text.php:990 ../../include/text.php:1005 msgid "remove" msgstr "" -#: ../../include/text.php:949 ../../include/text.php:964 +#: ../../include/text.php:990 ../../include/text.php:1005 msgid "[remove]" msgstr "" -#: ../../include/text.php:952 +#: ../../include/text.php:993 msgid "Categories:" msgstr "" -#: ../../include/text.php:967 +#: ../../include/text.php:1008 msgid "Filed under:" msgstr "" -#: ../../include/text.php:983 ../../include/text.php:995 +#: ../../include/text.php:1024 ../../include/text.php:1036 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1101 ../../include/user.php:236 +#: ../../include/text.php:1142 ../../include/user.php:236 msgid "default" msgstr "" -#: ../../include/text.php:1113 +#: ../../include/text.php:1154 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1323 +#: ../../include/text.php:1364 msgid "activity" msgstr "" -#: ../../include/text.php:1325 +#: ../../include/text.php:1366 msgid "comment" msgstr "" -#: ../../include/text.php:1326 +#: ../../include/text.php:1367 msgid "post" msgstr "" -#: ../../include/text.php:1481 +#: ../../include/text.php:1522 msgid "Item filed" msgstr "" @@ -6862,11 +7500,11 @@ msgstr "" msgid "Sharing notification from Diaspora network" msgstr "" -#: ../../include/diaspora.php:2173 +#: ../../include/diaspora.php:2177 msgid "Attachments:" msgstr "" -#: ../../include/network.php:842 +#: ../../include/network.php:843 msgid "view full size" msgstr "" @@ -6913,7 +7551,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:884 +#: ../../include/nav.php:46 ../../boot.php:898 msgid "Logout" msgstr "" @@ -6921,7 +7559,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1574 +#: ../../include/nav.php:49 ../../boot.php:1610 msgid "Status" msgstr "" @@ -7001,11 +7639,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1132 +#: ../../include/nav.php:138 ../../boot.php:1146 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1132 +#: ../../include/nav.php:138 ../../boot.php:1146 msgid "Manage/edit profiles" msgstr "" @@ -7098,81 +7736,65 @@ msgstr "" msgid "Miscellaneous" msgstr "" -#: ../../include/datetime.php:131 ../../include/datetime.php:263 +#: ../../include/datetime.php:153 ../../include/datetime.php:285 msgid "year" msgstr "" -#: ../../include/datetime.php:136 ../../include/datetime.php:264 +#: ../../include/datetime.php:158 ../../include/datetime.php:286 msgid "month" msgstr "" -#: ../../include/datetime.php:141 ../../include/datetime.php:266 +#: ../../include/datetime.php:163 ../../include/datetime.php:288 msgid "day" msgstr "" -#: ../../include/datetime.php:254 +#: ../../include/datetime.php:276 msgid "never" msgstr "" -#: ../../include/datetime.php:260 +#: ../../include/datetime.php:282 msgid "less than a second ago" msgstr "" -#: ../../include/datetime.php:263 -msgid "years" -msgstr "" - -#: ../../include/datetime.php:264 -msgid "months" -msgstr "" - -#: ../../include/datetime.php:265 +#: ../../include/datetime.php:287 msgid "week" msgstr "" -#: ../../include/datetime.php:265 -msgid "weeks" -msgstr "" - -#: ../../include/datetime.php:266 -msgid "days" -msgstr "" - -#: ../../include/datetime.php:267 +#: ../../include/datetime.php:289 msgid "hour" msgstr "" -#: ../../include/datetime.php:267 +#: ../../include/datetime.php:289 msgid "hours" msgstr "" -#: ../../include/datetime.php:268 +#: ../../include/datetime.php:290 msgid "minute" msgstr "" -#: ../../include/datetime.php:268 +#: ../../include/datetime.php:290 msgid "minutes" msgstr "" -#: ../../include/datetime.php:269 +#: ../../include/datetime.php:291 msgid "second" msgstr "" -#: ../../include/datetime.php:269 +#: ../../include/datetime.php:291 msgid "seconds" msgstr "" -#: ../../include/datetime.php:278 +#: ../../include/datetime.php:300 #, php-format msgid "%1$d %2$s ago" msgstr "" -#: ../../include/datetime.php:450 ../../include/items.php:1553 +#: ../../include/datetime.php:472 ../../include/items.php:1620 #, php-format msgid "%s's birthday" msgstr "" -#: ../../include/datetime.php:451 ../../include/items.php:1554 +#: ../../include/datetime.php:473 ../../include/items.php:1621 #, php-format msgid "Happy Birthday %s" msgstr "" @@ -7181,11 +7803,11 @@ msgstr "" msgid "From: " msgstr "" -#: ../../include/bbcode.php:102 ../../include/bbcode.php:313 +#: ../../include/bbcode.php:102 ../../include/bbcode.php:317 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:278 ../../include/bbcode.php:298 +#: ../../include/bbcode.php:282 ../../include/bbcode.php:302 msgid "$1 wrote:" msgstr "" @@ -7270,7 +7892,8 @@ msgid "%s commented on an item/conversation you have been following." msgstr "" #: ../../include/enotify.php:116 ../../include/enotify.php:131 -#: ../../include/enotify.php:144 ../../include/enotify.php:157 +#: ../../include/enotify.php:144 ../../include/enotify.php:162 +#: ../../include/enotify.php:175 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" @@ -7287,7 +7910,7 @@ msgstr "" #: ../../include/enotify.php:127 #, php-format -msgid "%1$s posted to [url=%2s]your wall[/url]" +msgid "%1$s posted to [url=%2$s]your wall[/url]" msgstr "" #: ../../include/enotify.php:138 @@ -7305,68 +7928,83 @@ msgstr "" msgid "%1$s [url=%2$s]tagged you[/url]." msgstr "" -#: ../../include/enotify.php:151 +#: ../../include/enotify.php:152 +#, php-format +msgid "[Friendica:Notify] %1$s poked you" +msgstr "" + +#: ../../include/enotify.php:153 +#, php-format +msgid "%1$s poked you at %2$s" +msgstr "" + +#: ../../include/enotify.php:154 +#, php-format +msgid "%1$s [url=%2$s]poked you[/url]." +msgstr "" + +#: ../../include/enotify.php:169 #, php-format msgid "[Friendica:Notify] %s tagged your post" msgstr "" -#: ../../include/enotify.php:152 +#: ../../include/enotify.php:170 #, php-format msgid "%1$s tagged your post at %2$s" msgstr "" -#: ../../include/enotify.php:153 +#: ../../include/enotify.php:171 #, php-format msgid "%1$s tagged [url=%2$s]your post[/url]" msgstr "" -#: ../../include/enotify.php:164 +#: ../../include/enotify.php:182 msgid "[Friendica:Notify] Introduction received" msgstr "" -#: ../../include/enotify.php:165 +#: ../../include/enotify.php:183 #, php-format msgid "You've received an introduction from '%1$s' at %2$s" msgstr "" -#: ../../include/enotify.php:166 +#: ../../include/enotify.php:184 #, php-format msgid "You've received [url=%1$s]an introduction[/url] from %2$s." msgstr "" -#: ../../include/enotify.php:169 ../../include/enotify.php:187 +#: ../../include/enotify.php:187 ../../include/enotify.php:205 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: ../../include/enotify.php:171 +#: ../../include/enotify.php:189 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: ../../include/enotify.php:178 +#: ../../include/enotify.php:196 msgid "[Friendica:Notify] Friend suggestion received" msgstr "" -#: ../../include/enotify.php:179 +#: ../../include/enotify.php:197 #, php-format msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "" -#: ../../include/enotify.php:180 +#: ../../include/enotify.php:198 #, php-format msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s." msgstr "" -#: ../../include/enotify.php:185 +#: ../../include/enotify.php:203 msgid "Name:" msgstr "" -#: ../../include/enotify.php:186 +#: ../../include/enotify.php:204 msgid "Photo:" msgstr "" -#: ../../include/enotify.php:189 +#: ../../include/enotify.php:207 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" @@ -7426,23 +8064,18 @@ msgstr "" msgid "following" msgstr "" -#: ../../include/items.php:2983 +#: ../../include/items.php:3211 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:2983 +#: ../../include/items.php:3211 msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:3652 +#: ../../include/items.php:3880 msgid "Archives" msgstr "" -#: ../../include/bb2diaspora.php:226 ../../include/bb2diaspora.php:236 -#: ../../include/bb2diaspora.php:237 -msgid "image/photo" -msgstr "" - #: ../../include/user.php:38 msgid "An invitation is required." msgstr "" @@ -7533,247 +8166,256 @@ msgstr "" msgid "stopped following" msgstr "" -#: ../../include/Contact.php:218 ../../include/conversation.php:904 +#: ../../include/Contact.php:220 ../../include/conversation.php:966 +msgid "Poke" +msgstr "" + +#: ../../include/Contact.php:221 ../../include/conversation.php:960 msgid "View Status" msgstr "" -#: ../../include/Contact.php:219 ../../include/conversation.php:905 +#: ../../include/Contact.php:222 ../../include/conversation.php:961 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:220 ../../include/conversation.php:906 +#: ../../include/Contact.php:223 ../../include/conversation.php:962 msgid "View Photos" msgstr "" -#: ../../include/Contact.php:221 ../../include/Contact.php:234 -#: ../../include/conversation.php:907 +#: ../../include/Contact.php:224 ../../include/Contact.php:237 +#: ../../include/conversation.php:963 msgid "Network Posts" msgstr "" -#: ../../include/Contact.php:222 ../../include/Contact.php:234 -#: ../../include/conversation.php:908 +#: ../../include/Contact.php:225 ../../include/Contact.php:237 +#: ../../include/conversation.php:964 msgid "Edit Contact" msgstr "" -#: ../../include/Contact.php:223 ../../include/Contact.php:234 -#: ../../include/conversation.php:909 +#: ../../include/Contact.php:226 ../../include/Contact.php:237 +#: ../../include/conversation.php:965 msgid "Send PM" msgstr "" -#: ../../include/conversation.php:225 +#: ../../include/conversation.php:197 +#, php-format +msgid "%1$s poked %2$s" +msgstr "" + +#: ../../include/conversation.php:267 msgid "post/item" msgstr "" -#: ../../include/conversation.php:226 +#: ../../include/conversation.php:268 #, php-format msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:812 +#: ../../include/conversation.php:866 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:967 +#: ../../include/conversation.php:1024 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:967 +#: ../../include/conversation.php:1024 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:971 +#: ../../include/conversation.php:1028 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:973 +#: ../../include/conversation.php:1030 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:979 +#: ../../include/conversation.php:1036 msgid "and" msgstr "" -#: ../../include/conversation.php:982 +#: ../../include/conversation.php:1039 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:983 +#: ../../include/conversation.php:1040 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:983 +#: ../../include/conversation.php:1040 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1008 +#: ../../include/conversation.php:1064 ../../include/conversation.php:1081 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1010 +#: ../../include/conversation.php:1066 ../../include/conversation.php:1083 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1011 +#: ../../include/conversation.php:1067 ../../include/conversation.php:1084 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1012 +#: ../../include/conversation.php:1068 ../../include/conversation.php:1085 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1014 +#: ../../include/conversation.php:1070 ../../include/conversation.php:1087 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1057 +#: ../../include/conversation.php:1130 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1059 +#: ../../include/conversation.php:1132 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1061 +#: ../../include/conversation.php:1134 msgid "web link" msgstr "" -#: ../../include/conversation.php:1062 +#: ../../include/conversation.php:1135 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1063 +#: ../../include/conversation.php:1136 msgid "video link" msgstr "" -#: ../../include/conversation.php:1064 +#: ../../include/conversation.php:1137 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1065 +#: ../../include/conversation.php:1138 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1067 +#: ../../include/conversation.php:1140 msgid "set location" msgstr "" -#: ../../include/conversation.php:1069 +#: ../../include/conversation.php:1142 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1076 +#: ../../include/conversation.php:1149 msgid "permissions" msgstr "" -#: ../../include/plugin.php:388 ../../include/plugin.php:390 +#: ../../include/plugin.php:390 ../../include/plugin.php:392 msgid "Click here to upgrade." msgstr "" -#: ../../include/plugin.php:396 +#: ../../include/plugin.php:398 msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/plugin.php:401 +#: ../../include/plugin.php:403 msgid "This action is not available under your subscription plan." msgstr "" -#: ../../boot.php:563 +#: ../../boot.php:568 msgid "Delete this item?" msgstr "" -#: ../../boot.php:566 +#: ../../boot.php:571 msgid "show fewer" msgstr "" -#: ../../boot.php:761 +#: ../../boot.php:774 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:763 +#: ../../boot.php:776 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:863 +#: ../../boot.php:877 msgid "Create a New Account" msgstr "" -#: ../../boot.php:887 +#: ../../boot.php:901 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:888 +#: ../../boot.php:902 msgid "Password: " msgstr "" -#: ../../boot.php:891 +#: ../../boot.php:905 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:897 +#: ../../boot.php:911 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1064 +#: ../../boot.php:1078 msgid "Edit profile" msgstr "" -#: ../../boot.php:1124 +#: ../../boot.php:1138 msgid "Message" msgstr "" -#: ../../boot.php:1240 ../../boot.php:1319 +#: ../../boot.php:1260 ../../boot.php:1346 msgid "g A l F d" msgstr "" -#: ../../boot.php:1241 ../../boot.php:1320 +#: ../../boot.php:1261 ../../boot.php:1347 msgid "F d" msgstr "" -#: ../../boot.php:1286 ../../boot.php:1360 +#: ../../boot.php:1306 ../../boot.php:1387 msgid "[today]" msgstr "" -#: ../../boot.php:1298 +#: ../../boot.php:1318 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1299 +#: ../../boot.php:1319 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1353 +#: ../../boot.php:1380 msgid "[No description]" msgstr "" -#: ../../boot.php:1371 +#: ../../boot.php:1398 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1372 +#: ../../boot.php:1399 msgid "Events this week:" msgstr "" -#: ../../boot.php:1577 +#: ../../boot.php:1613 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1583 +#: ../../boot.php:1620 msgid "Profile Details" msgstr "" -#: ../../boot.php:1598 +#: ../../boot.php:1637 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1604 +#: ../../boot.php:1644 msgid "Only You Can See This" msgstr ""