diff --git a/include/diaspora.php b/include/diaspora.php index 92f3500f2f..5896f1bfd4 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1803,6 +1803,9 @@ function diaspora_profile($importer,$xml) { if(substr($birthday,5) === substr($contact['bd'],5)) $birthday = $contact['bd']; + // TODO: update name on item['author-name'] if the name changed. See consume_feed() + // Not doing this currently because D* protocol is scheduled for revision soon. + $r = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' , `bd` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", dbesc($name), dbesc(datetime_convert()), diff --git a/util/messages.po b/util/messages.po index 6e1652b393..1f25756039 100755 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1250\n" +"Project-Id-Version: 2.3.1262\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-12 17:14-0800\n" +"POT-Creation-Date: 2012-02-24 22:44-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../../mod/oexchange.php:27 +#: ../../mod/oexchange.php:25 msgid "Post successful." msgstr "" @@ -35,24 +35,24 @@ msgid "Contact update failed." msgstr "" #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43 -#: ../../mod/fsuggest.php:78 ../../mod/events.php:109 ../../mod/api.php:26 +#: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/photos.php:129 ../../mod/photos.php:865 #: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/notifications.php:62 ../../mod/contacts.php:125 #: ../../mod/settings.php:49 ../../mod/settings.php:404 #: ../../mod/settings.php:409 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19 -#: ../../mod/viewcontacts.php:21 ../../mod/register.php:36 -#: ../../mod/regmod.php:111 ../../mod/item.php:123 ../../mod/item.php:139 +#: ../../mod/viewcontacts.php:22 ../../mod/register.php:36 +#: ../../mod/regmod.php:111 ../../mod/item.php:124 ../../mod/item.php:140 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:137 #: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159 #: ../../mod/message.php:9 ../../mod/message.php:46 ../../mod/allfriends.php:9 #: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9 -#: ../../mod/display.php:112 ../../mod/profiles.php:7 +#: ../../mod/display.php:130 ../../mod/profiles.php:7 #: ../../mod/profiles.php:229 ../../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:331 -#: ../../include/items.php:2907 ../../index.php:288 +#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:332 +#: ../../include/items.php:2968 ../../index.php:288 msgid "Permission denied." msgstr "" @@ -82,7 +82,7 @@ msgid "Return to contact editor" msgstr "" #: ../../mod/crepair.php:148 ../../mod/settings.php:455 -#: ../../mod/settings.php:481 ../../mod/admin.php:464 ../../mod/admin.php:473 +#: ../../mod/settings.php:481 ../../mod/admin.php:480 ../../mod/admin.php:489 msgid "Name" msgstr "" @@ -119,33 +119,37 @@ msgid "New photo from this URL" msgstr "" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:333 ../../mod/photos.php:900 ../../mod/photos.php:958 +#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958 #: ../../mod/photos.php:1182 ../../mod/photos.php:1222 #: ../../mod/photos.php:1262 ../../mod/photos.php:1293 #: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/localtime.php:45 ../../mod/contacts.php:319 #: ../../mod/settings.php:453 ../../mod/settings.php:592 -#: ../../mod/settings.php:773 ../../mod/manage.php:109 ../../mod/group.php:84 -#: ../../mod/group.php:167 ../../mod/admin.php:296 ../../mod/admin.php:461 -#: ../../mod/admin.php:587 ../../mod/admin.php:652 ../../mod/profiles.php:375 -#: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:410 -#: ../../addon/yourls/yourls.php:76 ../../addon/nsfw/nsfw.php:57 +#: ../../mod/settings.php:786 ../../mod/manage.php:109 ../../mod/group.php:84 +#: ../../mod/group.php:167 ../../mod/admin.php:312 ../../mod/admin.php:477 +#: ../../mod/admin.php:603 ../../mod/admin.php:769 ../../mod/admin.php:847 +#: ../../mod/profiles.php:375 ../../mod/invite.php:106 +#: ../../addon/facebook/facebook.php:411 ../../addon/yourls/yourls.php:76 +#: ../../addon/nsfw/nsfw.php:57 #: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:179 ../../addon/drpost/drpost.php:110 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41 #: ../../addon/impressum/impressum.php:69 ../../addon/blockem/blockem.php:57 +#: ../../addon/qcomment/qcomment.php:60 +#: ../../addon/openstreetmap/openstreetmap.php:70 #: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94 #: ../../addon/pageheader/pageheader.php:52 -#: ../../addon/statusnet/statusnet.php:280 -#: ../../addon/statusnet/statusnet.php:294 +#: ../../addon/statusnet/statusnet.php:273 +#: ../../addon/statusnet/statusnet.php:287 +#: ../../addon/statusnet/statusnet.php:313 #: ../../addon/statusnet/statusnet.php:320 -#: ../../addon/statusnet/statusnet.php:327 -#: ../../addon/statusnet/statusnet.php:349 -#: ../../addon/statusnet/statusnet.php:495 ../../addon/tumblr/tumblr.php:90 +#: ../../addon/statusnet/statusnet.php:345 +#: ../../addon/statusnet/statusnet.php:532 ../../addon/tumblr/tumblr.php:90 #: ../../addon/numfriends/numfriends.php:85 ../../addon/wppost/wppost.php:102 -#: ../../addon/piwik/piwik.php:81 ../../addon/twitter/twitter.php:180 -#: ../../addon/twitter/twitter.php:203 ../../addon/twitter/twitter.php:315 -#: ../../addon/posterous/posterous.php:90 ../../include/conversation.php:515 +#: ../../addon/showmore/showmore.php:48 ../../addon/piwik/piwik.php:89 +#: ../../addon/twitter/twitter.php:175 ../../addon/twitter/twitter.php:201 +#: ../../addon/twitter/twitter.php:355 ../../addon/posterous/posterous.php:90 +#: ../../include/conversation.php:542 msgid "Submit" msgstr "" @@ -187,82 +191,82 @@ msgstr "" msgid "Suggest a friend for %s" msgstr "" -#: ../../mod/events.php:61 +#: ../../mod/events.php:62 msgid "Event description and start time are required." msgstr "" -#: ../../mod/events.php:117 ../../include/nav.php:50 ../../boot.php:1345 -msgid "Events" -msgstr "" - -#: ../../mod/events.php:207 -msgid "Create New Event" -msgstr "" - -#: ../../mod/events.php:210 -msgid "Previous" -msgstr "" - -#: ../../mod/events.php:213 ../../mod/install.php:210 -msgid "Next" -msgstr "" - -#: ../../mod/events.php:220 +#: ../../mod/events.php:230 msgid "l, F j" msgstr "" -#: ../../mod/events.php:235 +#: ../../mod/events.php:252 msgid "Edit event" msgstr "" -#: ../../mod/events.php:237 ../../include/text.php:883 +#: ../../mod/events.php:272 ../../include/text.php:964 msgid "link to source" msgstr "" -#: ../../mod/events.php:305 +#: ../../mod/events.php:296 ../../include/nav.php:50 ../../boot.php:1349 +msgid "Events" +msgstr "" + +#: ../../mod/events.php:297 +msgid "Create New Event" +msgstr "" + +#: ../../mod/events.php:298 +msgid "Previous" +msgstr "" + +#: ../../mod/events.php:299 ../../mod/install.php:210 +msgid "Next" +msgstr "" + +#: ../../mod/events.php:371 msgid "hour:minute" msgstr "" -#: ../../mod/events.php:314 +#: ../../mod/events.php:380 msgid "Event details" msgstr "" -#: ../../mod/events.php:315 +#: ../../mod/events.php:381 #, php-format msgid "Format is %s %s. Starting date and Description are required." msgstr "" -#: ../../mod/events.php:316 +#: ../../mod/events.php:383 msgid "Event Starts:" msgstr "" -#: ../../mod/events.php:319 +#: ../../mod/events.php:386 msgid "Finish date/time is not known or not relevant" msgstr "" -#: ../../mod/events.php:321 +#: ../../mod/events.php:388 msgid "Event Finishes:" msgstr "" -#: ../../mod/events.php:324 +#: ../../mod/events.php:391 msgid "Adjust for viewer timezone" msgstr "" -#: ../../mod/events.php:326 +#: ../../mod/events.php:393 msgid "Description:" msgstr "" -#: ../../mod/events.php:328 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:271 ../../boot.php:976 +#: ../../mod/events.php:395 ../../include/event.php:37 +#: ../../include/bb2diaspora.php:290 ../../boot.php:980 msgid "Location:" msgstr "" -#: ../../mod/events.php:330 +#: ../../mod/events.php:397 msgid "Share this event" msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:685 ../../mod/settings.php:454 +#: ../../mod/dfrn_request.php:686 ../../mod/settings.php:454 #: ../../mod/settings.php:480 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -306,24 +310,24 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/dfrn_request.php:675 +#: ../../mod/api.php:105 ../../mod/dfrn_request.php:676 #: ../../mod/settings.php:681 ../../mod/settings.php:687 #: ../../mod/settings.php:695 ../../mod/settings.php:699 #: ../../mod/settings.php:704 ../../mod/settings.php:710 -#: ../../mod/settings.php:716 ../../mod/settings.php:763 -#: ../../mod/settings.php:764 ../../mod/settings.php:765 -#: ../../mod/settings.php:766 ../../mod/register.php:524 +#: ../../mod/settings.php:716 ../../mod/settings.php:776 +#: ../../mod/settings.php:777 ../../mod/settings.php:778 +#: ../../mod/settings.php:779 ../../mod/register.php:524 #: ../../mod/profiles.php:357 msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/dfrn_request.php:676 +#: ../../mod/api.php:106 ../../mod/dfrn_request.php:677 #: ../../mod/settings.php:681 ../../mod/settings.php:687 #: ../../mod/settings.php:695 ../../mod/settings.php:699 #: ../../mod/settings.php:704 ../../mod/settings.php:710 -#: ../../mod/settings.php:716 ../../mod/settings.php:763 -#: ../../mod/settings.php:764 ../../mod/settings.php:765 -#: ../../mod/settings.php:766 ../../mod/register.php:525 +#: ../../mod/settings.php:716 ../../mod/settings.php:776 +#: ../../mod/settings.php:777 ../../mod/settings.php:778 +#: ../../mod/settings.php:779 ../../mod/register.php:525 #: ../../mod/profiles.php:358 msgid "No" msgstr "" @@ -378,8 +382,8 @@ msgstr "" #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../include/diaspora.php:1587 ../../include/conversation.php:31 -#: ../../include/conversation.php:104 +#: ../../include/diaspora.php:1600 ../../include/conversation.php:53 +#: ../../include/conversation.php:126 msgid "photo" msgstr "" @@ -387,7 +391,7 @@ msgstr "" msgid "by" msgstr "" -#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:312 +#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "" @@ -406,8 +410,8 @@ msgid "Image upload failed." msgstr "" #: ../../mod/photos.php:759 ../../mod/community.php:16 -#: ../../mod/dfrn_request.php:624 ../../mod/viewcontacts.php:16 -#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:31 +#: ../../mod/dfrn_request.php:625 ../../mod/viewcontacts.php:17 +#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:33 msgid "Public access denied." msgstr "" @@ -467,7 +471,7 @@ msgstr "" msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:1078 ../../include/conversation.php:450 +#: ../../mod/photos.php:1078 ../../include/conversation.php:472 msgid "Private Message" msgstr "" @@ -499,44 +503,44 @@ msgstr "" msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1200 ../../include/conversation.php:497 +#: ../../mod/photos.php:1200 ../../include/conversation.php:519 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1201 ../../include/conversation.php:498 +#: ../../mod/photos.php:1201 ../../include/conversation.php:520 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1202 ../../include/conversation.php:889 +#: ../../mod/photos.php:1202 ../../include/conversation.php:914 msgid "Share" msgstr "" -#: ../../mod/photos.php:1203 ../../mod/editpost.php:100 +#: ../../mod/photos.php:1203 ../../mod/editpost.php:104 #: ../../mod/message.php:155 ../../mod/message.php:296 -#: ../../include/conversation.php:321 ../../include/conversation.php:652 -#: ../../include/conversation.php:906 +#: ../../include/conversation.php:343 ../../include/conversation.php:677 +#: ../../include/conversation.php:931 msgid "Please wait" msgstr "" #: ../../mod/photos.php:1219 ../../mod/photos.php:1259 -#: ../../mod/photos.php:1290 ../../include/conversation.php:512 +#: ../../mod/photos.php:1290 ../../include/conversation.php:539 msgid "This is you" msgstr "" #: ../../mod/photos.php:1221 ../../mod/photos.php:1261 -#: ../../mod/photos.php:1292 ../../include/conversation.php:514 -#: ../../boot.php:443 +#: ../../mod/photos.php:1292 ../../include/conversation.php:541 +#: ../../boot.php:447 msgid "Comment" msgstr "" -#: ../../mod/photos.php:1223 ../../mod/editpost.php:119 -#: ../../include/conversation.php:516 ../../include/conversation.php:924 +#: ../../mod/photos.php:1223 ../../mod/editpost.php:123 +#: ../../include/conversation.php:543 ../../include/conversation.php:949 msgid "Preview" msgstr "" #: ../../mod/photos.php:1320 ../../mod/settings.php:513 -#: ../../mod/group.php:154 ../../mod/admin.php:468 -#: ../../include/conversation.php:280 ../../include/conversation.php:536 +#: ../../mod/group.php:154 ../../mod/admin.php:484 +#: ../../include/conversation.php:302 ../../include/conversation.php:563 msgid "Delete" msgstr "" @@ -596,70 +600,70 @@ msgstr "" msgid "Item not found" msgstr "" -#: ../../mod/editpost.php:32 +#: ../../mod/editpost.php:36 msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:76 ../../include/conversation.php:875 +#: ../../mod/editpost.php:80 ../../include/conversation.php:900 msgid "Post to Email" msgstr "" -#: ../../mod/editpost.php:91 ../../mod/settings.php:512 -#: ../../include/conversation.php:523 +#: ../../mod/editpost.php:95 ../../mod/settings.php:512 +#: ../../include/conversation.php:550 msgid "Edit" msgstr "" -#: ../../mod/editpost.php:92 ../../mod/message.php:153 -#: ../../mod/message.php:294 ../../include/conversation.php:890 +#: ../../mod/editpost.php:96 ../../mod/message.php:153 +#: ../../mod/message.php:294 ../../include/conversation.php:915 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:93 ../../include/conversation.php:892 +#: ../../mod/editpost.php:97 ../../include/conversation.php:917 msgid "Attach file" msgstr "" -#: ../../mod/editpost.php:94 ../../mod/message.php:154 -#: ../../mod/message.php:295 ../../include/conversation.php:894 +#: ../../mod/editpost.php:98 ../../mod/message.php:154 +#: ../../mod/message.php:295 ../../include/conversation.php:919 msgid "Insert web link" msgstr "" -#: ../../mod/editpost.php:95 +#: ../../mod/editpost.php:99 msgid "Insert YouTube video" msgstr "" -#: ../../mod/editpost.php:96 +#: ../../mod/editpost.php:100 msgid "Insert Vorbis [.ogg] video" msgstr "" -#: ../../mod/editpost.php:97 +#: ../../mod/editpost.php:101 msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/editpost.php:98 ../../include/conversation.php:900 +#: ../../mod/editpost.php:102 ../../include/conversation.php:925 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:99 ../../include/conversation.php:902 +#: ../../mod/editpost.php:103 ../../include/conversation.php:927 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:101 ../../include/conversation.php:907 +#: ../../mod/editpost.php:105 ../../include/conversation.php:932 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:109 ../../include/conversation.php:916 +#: ../../mod/editpost.php:113 ../../include/conversation.php:941 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:917 +#: ../../mod/editpost.php:114 ../../include/conversation.php:942 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:905 +#: ../../mod/editpost.php:117 ../../include/conversation.php:930 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:114 ../../include/conversation.php:919 +#: ../../mod/editpost.php:118 ../../include/conversation.php:944 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -768,68 +772,68 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:581 ../../include/items.php:2443 +#: ../../mod/dfrn_request.php:582 ../../include/items.php:2504 msgid "[Name Withheld]" msgstr "" -#: ../../mod/dfrn_request.php:665 +#: ../../mod/dfrn_request.php:666 #, php-format msgid "" "Diaspora members: Please do not use this form. Instead, enter \"%s\" into " "your Diaspora search bar." msgstr "" -#: ../../mod/dfrn_request.php:668 +#: ../../mod/dfrn_request.php:669 msgid "" "Please enter your 'Identity Address' from one of the following supported " "social networks:" msgstr "" -#: ../../mod/dfrn_request.php:671 +#: ../../mod/dfrn_request.php:672 msgid "Friend/Connection Request" msgstr "" -#: ../../mod/dfrn_request.php:672 +#: ../../mod/dfrn_request.php:673 msgid "" "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " "testuser@identi.ca" msgstr "" -#: ../../mod/dfrn_request.php:673 +#: ../../mod/dfrn_request.php:674 msgid "Please answer the following:" msgstr "" -#: ../../mod/dfrn_request.php:674 +#: ../../mod/dfrn_request.php:675 #, php-format msgid "Does %s know you?" msgstr "" -#: ../../mod/dfrn_request.php:677 +#: ../../mod/dfrn_request.php:678 msgid "Add a personal note:" msgstr "" -#: ../../mod/dfrn_request.php:679 ../../include/contact_selectors.php:76 +#: ../../mod/dfrn_request.php:680 ../../include/contact_selectors.php:76 msgid "Friendica" msgstr "" -#: ../../mod/dfrn_request.php:680 +#: ../../mod/dfrn_request.php:681 msgid "StatusNet/Federated Social Web" msgstr "" -#: ../../mod/dfrn_request.php:681 ../../mod/settings.php:548 +#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:548 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "" -#: ../../mod/dfrn_request.php:682 +#: ../../mod/dfrn_request.php:683 msgid "- please share from your own site as noted above" msgstr "" -#: ../../mod/dfrn_request.php:683 +#: ../../mod/dfrn_request.php:684 msgid "Your Identity Address:" msgstr "" -#: ../../mod/dfrn_request.php:684 +#: ../../mod/dfrn_request.php:685 msgid "Submit Request" msgstr "" @@ -1078,7 +1082,7 @@ msgid "Errors encountered creating database tables." msgstr "" #: ../../mod/localtime.php:12 ../../include/event.php:11 -#: ../../include/bb2diaspora.php:249 +#: ../../include/bb2diaspora.php:268 msgid "l F d, Y \\@ g:i A" msgstr "" @@ -1124,7 +1128,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:926 +#: ../../include/contact_widgets.php:9 ../../boot.php:930 msgid "Connect" msgstr "" @@ -1149,165 +1153,187 @@ msgstr "" msgid "Invalid request identifier." msgstr "" -#: ../../mod/notifications.php:35 ../../mod/notifications.php:152 -#: ../../mod/notifications.php:198 +#: ../../mod/notifications.php:35 ../../mod/notifications.php:157 +#: ../../mod/notifications.php:203 msgid "Discard" msgstr "" -#: ../../mod/notifications.php:47 ../../mod/notifications.php:151 -#: ../../mod/notifications.php:197 ../../mod/contacts.php:302 +#: ../../mod/notifications.php:47 ../../mod/notifications.php:156 +#: ../../mod/notifications.php:202 ../../mod/contacts.php:302 #: ../../mod/contacts.php:345 msgid "Ignore" msgstr "" -#: ../../mod/notifications.php:71 ../../include/nav.php:109 +#: ../../mod/notifications.php:71 +msgid "System" +msgstr "" + +#: ../../mod/notifications.php:76 ../../include/nav.php:109 msgid "Network" msgstr "" -#: ../../mod/notifications.php:76 ../../mod/network.php:177 +#: ../../mod/notifications.php:81 ../../mod/network.php:177 msgid "Personal" msgstr "" -#: ../../mod/notifications.php:81 ../../include/nav.php:73 +#: ../../mod/notifications.php:86 ../../include/nav.php:73 #: ../../include/nav.php:111 msgid "Home" msgstr "" -#: ../../mod/notifications.php:86 ../../include/nav.php:117 +#: ../../mod/notifications.php:91 ../../include/nav.php:117 msgid "Introductions" msgstr "" -#: ../../mod/notifications.php:91 ../../mod/message.php:76 -#: ../../include/nav.php:123 +#: ../../mod/notifications.php:96 ../../mod/message.php:76 +#: ../../include/nav.php:124 msgid "Messages" msgstr "" -#: ../../mod/notifications.php:110 +#: ../../mod/notifications.php:115 msgid "Show Ignored Requests" msgstr "" -#: ../../mod/notifications.php:110 +#: ../../mod/notifications.php:115 msgid "Hide Ignored Requests" msgstr "" -#: ../../mod/notifications.php:136 ../../mod/notifications.php:182 +#: ../../mod/notifications.php:141 ../../mod/notifications.php:187 msgid "Notification type: " msgstr "" -#: ../../mod/notifications.php:137 +#: ../../mod/notifications.php:142 msgid "Friend Suggestion" msgstr "" -#: ../../mod/notifications.php:139 +#: ../../mod/notifications.php:144 #, php-format msgid "suggested by %s" msgstr "" -#: ../../mod/notifications.php:144 ../../mod/notifications.php:191 +#: ../../mod/notifications.php:149 ../../mod/notifications.php:196 #: ../../mod/contacts.php:350 msgid "Hide this contact from others" msgstr "" -#: ../../mod/notifications.php:145 ../../mod/notifications.php:192 +#: ../../mod/notifications.php:150 ../../mod/notifications.php:197 msgid "Post a new friend activity" msgstr "" -#: ../../mod/notifications.php:145 ../../mod/notifications.php:192 +#: ../../mod/notifications.php:150 ../../mod/notifications.php:197 msgid "if applicable" msgstr "" -#: ../../mod/notifications.php:148 ../../mod/notifications.php:195 -#: ../../mod/admin.php:466 +#: ../../mod/notifications.php:153 ../../mod/notifications.php:200 +#: ../../mod/admin.php:482 msgid "Approve" msgstr "" -#: ../../mod/notifications.php:168 +#: ../../mod/notifications.php:173 msgid "Claims to be known to you: " msgstr "" -#: ../../mod/notifications.php:168 +#: ../../mod/notifications.php:173 msgid "yes" msgstr "" -#: ../../mod/notifications.php:168 +#: ../../mod/notifications.php:173 msgid "no" msgstr "" -#: ../../mod/notifications.php:175 +#: ../../mod/notifications.php:180 msgid "Approve as: " msgstr "" -#: ../../mod/notifications.php:176 +#: ../../mod/notifications.php:181 msgid "Friend" msgstr "" -#: ../../mod/notifications.php:177 +#: ../../mod/notifications.php:182 msgid "Sharer" msgstr "" -#: ../../mod/notifications.php:177 +#: ../../mod/notifications.php:182 msgid "Fan/Admirer" msgstr "" -#: ../../mod/notifications.php:183 +#: ../../mod/notifications.php:188 msgid "Friend/Connect Request" msgstr "" -#: ../../mod/notifications.php:183 +#: ../../mod/notifications.php:188 msgid "New Follower" msgstr "" -#: ../../mod/notifications.php:204 +#: ../../mod/notifications.php:209 msgid "No introductions." msgstr "" -#: ../../mod/notifications.php:207 ../../mod/notifications.php:293 -#: ../../mod/notifications.php:388 ../../mod/notifications.php:469 -#: ../../include/nav.php:118 +#: ../../mod/notifications.php:212 ../../include/nav.php:118 msgid "Notifications" msgstr "" -#: ../../mod/notifications.php:244 ../../mod/notifications.php:339 -#: ../../mod/notifications.php:426 +#: ../../mod/notifications.php:249 ../../mod/notifications.php:374 +#: ../../mod/notifications.php:461 #, php-format msgid "%s liked %s's post" msgstr "" -#: ../../mod/notifications.php:253 ../../mod/notifications.php:348 -#: ../../mod/notifications.php:435 +#: ../../mod/notifications.php:258 ../../mod/notifications.php:383 +#: ../../mod/notifications.php:470 #, php-format msgid "%s disliked %s's post" msgstr "" -#: ../../mod/notifications.php:267 ../../mod/notifications.php:362 -#: ../../mod/notifications.php:449 +#: ../../mod/notifications.php:272 ../../mod/notifications.php:397 +#: ../../mod/notifications.php:484 #, php-format msgid "%s is now friends with %s" msgstr "" -#: ../../mod/notifications.php:274 ../../mod/notifications.php:369 +#: ../../mod/notifications.php:279 ../../mod/notifications.php:404 #, php-format msgid "%s created a new post" msgstr "" -#: ../../mod/notifications.php:275 ../../mod/notifications.php:370 -#: ../../mod/notifications.php:458 +#: ../../mod/notifications.php:280 ../../mod/notifications.php:405 +#: ../../mod/notifications.php:493 #, php-format msgid "%s commented on %s's post" msgstr "" -#: ../../mod/notifications.php:289 +#: ../../mod/notifications.php:294 msgid "No more network notifications." msgstr "" -#: ../../mod/notifications.php:384 +#: ../../mod/notifications.php:298 +msgid "Network Notifications" +msgstr "" + +#: ../../mod/notifications.php:324 ../../mod/notify.php:59 +msgid "No more system notifications." +msgstr "" + +#: ../../mod/notifications.php:328 ../../mod/notify.php:63 +msgid "System Notifications" +msgstr "" + +#: ../../mod/notifications.php:419 msgid "No more personal notifications." msgstr "" -#: ../../mod/notifications.php:465 +#: ../../mod/notifications.php:423 +msgid "Personal Notifications" +msgstr "" + +#: ../../mod/notifications.php:500 msgid "No more home notifications." msgstr "" +#: ../../mod/notifications.php:504 +msgid "Home Notifications" +msgstr "" + #: ../../mod/contacts.php:63 ../../mod/contacts.php:143 msgid "Could not access contact record." msgstr "" @@ -1396,12 +1422,12 @@ msgid "View all contacts" msgstr "" #: ../../mod/contacts.php:297 ../../mod/contacts.php:344 -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:486 msgid "Unblock" msgstr "" #: ../../mod/contacts.php:297 ../../mod/contacts.php:344 -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:485 msgid "Block" msgstr "" @@ -1436,8 +1462,8 @@ msgstr "" msgid "Edit contact notes" msgstr "" -#: ../../mod/contacts.php:328 ../../mod/contacts.php:458 -#: ../../mod/viewcontacts.php:61 +#: ../../mod/contacts.php:328 ../../mod/contacts.php:497 +#: ../../mod/viewcontacts.php:60 #, php-format msgid "Visit %s's profile [%s]" msgstr "" @@ -1470,7 +1496,7 @@ msgstr "" msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:341 ../../mod/admin.php:701 +#: ../../mod/contacts.php:341 ../../mod/admin.php:896 msgid "Update now" msgstr "" @@ -1487,52 +1513,60 @@ msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/contacts.php:387 ../../include/nav.php:131 -msgid "Contacts" +#: ../../mod/contacts.php:399 ../../mod/group.php:194 +msgid "All Contacts" msgstr "" -#: ../../mod/contacts.php:389 -msgid "Show Unblocked Contacts" +#: ../../mod/contacts.php:404 +msgid "Unblocked Contacts" msgstr "" -#: ../../mod/contacts.php:389 -msgid "Show Blocked Contacts" +#: ../../mod/contacts.php:410 +msgid "Blocked Contacts" msgstr "" -#: ../../mod/contacts.php:391 -msgid "Show All Contacts" +#: ../../mod/contacts.php:416 +msgid "Ignored Contacts" msgstr "" -#: ../../mod/contacts.php:393 -msgid "Search your contacts" +#: ../../mod/contacts.php:422 +msgid "Hidden Contacts" msgstr "" -#: ../../mod/contacts.php:394 ../../mod/directory.php:65 -msgid "Finding: " -msgstr "" - -#: ../../mod/contacts.php:395 ../../mod/directory.php:67 -#: ../../include/contact_widgets.php:34 -msgid "Find" -msgstr "" - -#: ../../mod/contacts.php:434 +#: ../../mod/contacts.php:473 msgid "Mutual Friendship" msgstr "" -#: ../../mod/contacts.php:438 +#: ../../mod/contacts.php:477 msgid "is a fan of yours" msgstr "" -#: ../../mod/contacts.php:442 +#: ../../mod/contacts.php:481 msgid "you are a fan of" msgstr "" -#: ../../mod/contacts.php:459 ../../include/Contact.php:135 -#: ../../include/conversation.php:748 +#: ../../mod/contacts.php:498 ../../include/Contact.php:135 +#: ../../include/conversation.php:773 msgid "Edit contact" msgstr "" +#: ../../mod/contacts.php:518 ../../include/nav.php:132 +msgid "Contacts" +msgstr "" + +#: ../../mod/contacts.php:522 +msgid "Search your contacts" +msgstr "" + +#: ../../mod/contacts.php:523 ../../mod/directory.php:67 +msgid "Finding: " +msgstr "" + +#: ../../mod/contacts.php:524 ../../mod/directory.php:69 +#: ../../include/contact_widgets.php:34 +msgid "Find" +msgstr "" + #: ../../mod/lostpass.php:16 msgid "No valid account found." msgstr "" @@ -1549,7 +1583,7 @@ msgstr "" #: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106 #: ../../mod/register.php:380 ../../mod/register.php:434 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:716 -#: ../../include/items.php:2452 +#: ../../include/items.php:2513 msgid "Administrator" msgstr "" @@ -1559,7 +1593,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:82 ../../boot.php:719 +#: ../../mod/lostpass.php:82 ../../boot.php:723 msgid "Password Reset" msgstr "" @@ -1607,7 +1641,7 @@ msgstr "" msgid "Missing some important data!" msgstr "" -#: ../../mod/settings.php:73 ../../mod/settings.php:479 ../../mod/admin.php:62 +#: ../../mod/settings.php:73 ../../mod/settings.php:479 ../../mod/admin.php:75 msgid "Update" msgstr "" @@ -1651,13 +1685,14 @@ msgstr "" msgid " Cannot change to that email." msgstr "" -#: ../../mod/settings.php:351 ../../addon/facebook/facebook.php:320 -#: ../../addon/impressum/impressum.php:64 ../../addon/piwik/piwik.php:94 -#: ../../addon/twitter/twitter.php:310 +#: ../../mod/settings.php:351 ../../addon/facebook/facebook.php:321 +#: ../../addon/impressum/impressum.php:64 +#: ../../addon/openstreetmap/openstreetmap.php:80 +#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:415 ../../include/nav.php:129 +#: ../../mod/settings.php:415 ../../include/nav.php:130 msgid "Account settings" msgstr "" @@ -1683,12 +1718,12 @@ msgid "Add application" msgstr "" #: ../../mod/settings.php:456 ../../mod/settings.php:482 -#: ../../addon/statusnet/statusnet.php:489 +#: ../../addon/statusnet/statusnet.php:526 msgid "Consumer Key" msgstr "" #: ../../mod/settings.php:457 ../../mod/settings.php:483 -#: ../../addon/statusnet/statusnet.php:488 +#: ../../addon/statusnet/statusnet.php:525 msgid "Consumer Secret" msgstr "" @@ -1799,7 +1834,7 @@ msgstr "" msgid "Send public posts to all email contacts:" msgstr "" -#: ../../mod/settings.php:648 ../../mod/admin.php:126 ../../mod/admin.php:443 +#: ../../mod/settings.php:648 ../../mod/admin.php:142 ../../mod/admin.php:459 msgid "Normal Account" msgstr "" @@ -1807,7 +1842,7 @@ msgstr "" msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:652 ../../mod/admin.php:127 ../../mod/admin.php:444 +#: ../../mod/settings.php:652 ../../mod/admin.php:143 ../../mod/admin.php:460 msgid "Soapbox Account" msgstr "" @@ -1815,7 +1850,7 @@ msgstr "" msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:656 ../../mod/admin.php:128 ../../mod/admin.php:445 +#: ../../mod/settings.php:656 ../../mod/admin.php:144 ../../mod/admin.php:461 msgid "Community/Celebrity Account" msgstr "" @@ -1823,7 +1858,7 @@ msgstr "" msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:660 ../../mod/admin.php:129 ../../mod/admin.php:446 +#: ../../mod/settings.php:660 ../../mod/admin.php:145 ../../mod/admin.php:462 msgid "Automatic Friend Account" msgstr "" @@ -1871,159 +1906,159 @@ msgstr "" msgid "Profile is not published." msgstr "" -#: ../../mod/settings.php:744 ../../mod/profile_photo.php:206 +#: ../../mod/settings.php:757 ../../mod/profile_photo.php:206 msgid "or" msgstr "" -#: ../../mod/settings.php:749 +#: ../../mod/settings.php:762 msgid "Your Identity Address is" msgstr "" -#: ../../mod/settings.php:760 +#: ../../mod/settings.php:773 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:760 +#: ../../mod/settings.php:773 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:774 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:762 +#: ../../mod/settings.php:775 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:763 +#: ../../mod/settings.php:776 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:764 +#: ../../mod/settings.php:777 msgid "Expire personal notes:" msgstr "" -#: ../../mod/settings.php:765 +#: ../../mod/settings.php:778 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:766 +#: ../../mod/settings.php:779 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:771 +#: ../../mod/settings.php:784 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:779 +#: ../../mod/settings.php:792 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:780 +#: ../../mod/settings.php:793 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:781 +#: ../../mod/settings.php:794 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:781 +#: ../../mod/settings.php:794 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:785 +#: ../../mod/settings.php:798 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:786 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:799 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "" -#: ../../mod/settings.php:787 +#: ../../mod/settings.php:800 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:788 +#: ../../mod/settings.php:801 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:789 +#: ../../mod/settings.php:802 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:790 +#: ../../mod/settings.php:803 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:791 +#: ../../mod/settings.php:804 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:792 +#: ../../mod/settings.php:805 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:792 +#: ../../mod/settings.php:805 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:794 +#: ../../mod/settings.php:807 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:796 +#: ../../mod/settings.php:809 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:796 +#: ../../mod/settings.php:809 msgid "(to prevent spam abuse)" msgstr "" -#: ../../mod/settings.php:797 +#: ../../mod/settings.php:810 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:798 +#: ../../mod/settings.php:811 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:813 +#: ../../mod/settings.php:826 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:814 +#: ../../mod/settings.php:827 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:815 +#: ../../mod/settings.php:828 msgid "You receive an introduction" msgstr "" -#: ../../mod/settings.php:816 +#: ../../mod/settings.php:829 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:817 +#: ../../mod/settings.php:830 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:818 +#: ../../mod/settings.php:831 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:819 +#: ../../mod/settings.php:832 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:820 +#: ../../mod/settings.php:833 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:821 +#: ../../mod/settings.php:834 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:824 +#: ../../mod/settings.php:837 msgid "Advanced Page Settings" msgstr "" @@ -2089,31 +2124,31 @@ msgstr[1] "" msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:304 +#: ../../mod/network.php:300 msgid "No such group" msgstr "" -#: ../../mod/network.php:315 +#: ../../mod/network.php:311 msgid "Group is empty" msgstr "" -#: ../../mod/network.php:319 +#: ../../mod/network.php:315 msgid "Group: " msgstr "" -#: ../../mod/network.php:329 +#: ../../mod/network.php:325 msgid "Contact: " msgstr "" -#: ../../mod/network.php:331 +#: ../../mod/network.php:327 msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:336 +#: ../../mod/network.php:332 msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1350 +#: ../../mod/notes.php:44 ../../boot.php:1354 msgid "Personal Notes" msgstr "" @@ -2132,13 +2167,16 @@ msgstr "" #: ../../mod/newmember.php:12 msgid "" "We would like to offer some tips and links to help make your experience " -"enjoyable. Click any item to visit the relevant page." +"enjoyable. Click any item to visit the relevant page. A link to this page " +"will be visible from your home page for two weeks after your initial " +"registration and then will quietly disappear." msgstr "" #: ../../mod/newmember.php:16 msgid "" "On your Settings page - change your initial password. Also make a " -"note of your Identity Address. This will be useful in making friends." +"note of your Identity Address. This looks just like an email address - and " +"will be useful in making friends on the free social web." msgstr "" #: ../../mod/newmember.php:18 @@ -2162,49 +2200,64 @@ msgid "" "and we will (optionally) import all your Facebook friends and conversations." msgstr "" -#: ../../mod/newmember.php:28 +#: ../../mod/newmember.php:25 +msgid "" +"If this is your own personal server, installing the Facebook addon " +"may ease your transition to the free social web." +msgstr "" + +#: ../../mod/newmember.php:30 msgid "" "Enter your email access information on your Connector Settings page if you " "wish to import and interact with friends or mailing lists from your email " "INBOX" msgstr "" -#: ../../mod/newmember.php:30 +#: ../../mod/newmember.php:32 msgid "" "Edit your default profile to your liking. Review the " "settings for hiding your list of friends and hiding the profile from unknown " "visitors." msgstr "" -#: ../../mod/newmember.php:32 +#: ../../mod/newmember.php:34 msgid "" "Set some public keywords for your default profile which describe your " "interests. We may be able to find other people with similar interests and " "suggest friendships." msgstr "" -#: ../../mod/newmember.php:34 +#: ../../mod/newmember.php:36 msgid "" "Your Contacts page is your gateway to managing friendships and connecting " "with friends on other networks. Typically you enter their address or site " "URL in the Add New Contact dialog." msgstr "" -#: ../../mod/newmember.php:36 +#: ../../mod/newmember.php:38 msgid "" "The Directory page lets you find other people in this network or other " "federated sites. Look for a Connect or Follow link on " "their profile page. Provide your own Identity Address if requested." msgstr "" -#: ../../mod/newmember.php:38 +#: ../../mod/newmember.php:40 +msgid "" +"On the side panel of the Contacts page are several tools to find new " +"friends. We can match people by interest, look up people by name or " +"interest, and provide suggestions based on network relationships. On a brand " +"new site, friend suggestions will usually begin to be populated within 24 " +"hours." +msgstr "" + +#: ../../mod/newmember.php:42 msgid "" "Once you have made some friends, organize them into private conversation " "groups from the sidebar of your Contacts page and then you can interact with " "each group privately on your Network page." msgstr "" -#: ../../mod/newmember.php:40 +#: ../../mod/newmember.php:44 msgid "" "Our help pages may be consulted for detail on other program " "features and resources." @@ -2266,10 +2319,6 @@ msgstr "" msgid "Members" msgstr "" -#: ../../mod/group.php:194 -msgid "All Contacts" -msgstr "" - #: ../../mod/profperm.php:25 ../../mod/profperm.php:55 msgid "Invalid profile identifier." msgstr "" @@ -2280,7 +2329,7 @@ msgstr "" #: ../../mod/profperm.php:103 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:76 ../../include/nav.php:48 -#: ../../boot.php:1332 +#: ../../boot.php:1336 msgid "Profile" msgstr "" @@ -2292,12 +2341,12 @@ msgstr "" msgid "All Contacts (with secure profile access)" msgstr "" -#: ../../mod/viewcontacts.php:25 ../../include/text.php:578 -msgid "View Contacts" +#: ../../mod/viewcontacts.php:39 +msgid "No contacts." msgstr "" -#: ../../mod/viewcontacts.php:40 -msgid "No contacts." +#: ../../mod/viewcontacts.php:73 ../../include/text.php:578 +msgid "View Contacts" msgstr "" #: ../../mod/register.php:62 @@ -2423,7 +2472,7 @@ msgstr "" msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:540 ../../mod/admin.php:297 +#: ../../mod/register.php:540 ../../mod/admin.php:313 msgid "Registration" msgstr "" @@ -2446,7 +2495,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:689 +#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:693 msgid "Register" msgstr "" @@ -2455,30 +2504,31 @@ msgid "People Search" msgstr "" #: ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1091 +#: ../../addon/facebook/facebook.php:1092 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../include/diaspora.php:1587 ../../include/conversation.php:26 -#: ../../include/conversation.php:35 ../../include/conversation.php:99 -#: ../../include/conversation.php:108 +#: ../../include/diaspora.php:1600 ../../include/conversation.php:48 +#: ../../include/conversation.php:57 ../../include/conversation.php:121 +#: ../../include/conversation.php:130 msgid "status" msgstr "" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1095 +#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1096 #: ../../addon/communityhome/communityhome.php:172 -#: ../../include/diaspora.php:1603 ../../include/conversation.php:43 +#: ../../include/diaspora.php:1616 ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../mod/like.php:146 ../../include/conversation.php:46 +#: ../../mod/like.php:146 ../../include/conversation.php:68 #, 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:111 -#: ../../mod/admin.php:502 ../../mod/display.php:28 ../../mod/display.php:116 -#: ../../mod/viewd.php:14 ../../include/items.php:2819 +#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127 +#: ../../mod/admin.php:518 ../../mod/admin.php:694 ../../mod/display.php:29 +#: ../../mod/display.php:134 ../../mod/viewd.php:14 +#: ../../include/items.php:2880 msgid "Item not found." msgstr "" @@ -2499,42 +2549,42 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../mod/item.php:88 +#: ../../mod/item.php:89 msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:248 +#: ../../mod/item.php:249 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:350 ../../mod/wall_upload.php:81 +#: ../../mod/item.php:351 ../../mod/wall_upload.php:81 #: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97 #: ../../include/message.php:143 msgid "Wall Photos" msgstr "" -#: ../../mod/item.php:827 +#: ../../mod/item.php:830 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:852 +#: ../../mod/item.php:855 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social network." msgstr "" -#: ../../mod/item.php:854 +#: ../../mod/item.php:857 #, php-format msgid "You may visit them online at %s" msgstr "" -#: ../../mod/item.php:855 +#: ../../mod/item.php:858 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: ../../mod/item.php:857 +#: ../../mod/item.php:860 #, php-format msgid "%s posted an update." msgstr "" @@ -2658,7 +2708,7 @@ msgstr "" msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:137 ../../include/conversation.php:843 +#: ../../mod/message.php:137 ../../include/conversation.php:868 msgid "Please enter a link URL:" msgstr "" @@ -2712,348 +2762,357 @@ msgstr "" msgid "No friends to display." msgstr "" -#: ../../mod/admin.php:59 ../../mod/admin.php:295 +#: ../../mod/admin.php:71 ../../mod/admin.php:311 msgid "Site" msgstr "" -#: ../../mod/admin.php:60 ../../mod/admin.php:460 ../../mod/admin.php:472 +#: ../../mod/admin.php:72 ../../mod/admin.php:476 ../../mod/admin.php:488 msgid "Users" msgstr "" -#: ../../mod/admin.php:61 ../../mod/admin.php:549 ../../mod/admin.php:586 +#: ../../mod/admin.php:73 ../../mod/admin.php:565 ../../mod/admin.php:602 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:76 ../../mod/admin.php:651 +#: ../../mod/admin.php:74 ../../mod/admin.php:736 ../../mod/admin.php:768 +msgid "Themes" +msgstr "" + +#: ../../mod/admin.php:89 ../../mod/admin.php:846 msgid "Logs" msgstr "" -#: ../../mod/admin.php:81 +#: ../../mod/admin.php:94 msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:144 ../../mod/admin.php:294 ../../mod/admin.php:459 -#: ../../mod/admin.php:548 ../../mod/admin.php:585 ../../mod/admin.php:650 +#: ../../mod/admin.php:160 ../../mod/admin.php:310 ../../mod/admin.php:475 +#: ../../mod/admin.php:564 ../../mod/admin.php:601 ../../mod/admin.php:735 +#: ../../mod/admin.php:767 ../../mod/admin.php:845 msgid "Administration" msgstr "" -#: ../../mod/admin.php:145 +#: ../../mod/admin.php:161 msgid "Summary" msgstr "" -#: ../../mod/admin.php:146 +#: ../../mod/admin.php:162 msgid "Registered users" msgstr "" -#: ../../mod/admin.php:148 +#: ../../mod/admin.php:164 msgid "Pending registrations" msgstr "" -#: ../../mod/admin.php:149 +#: ../../mod/admin.php:165 msgid "Version" msgstr "" -#: ../../mod/admin.php:151 +#: ../../mod/admin.php:167 msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:243 +#: ../../mod/admin.php:259 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:287 +#: ../../mod/admin.php:303 msgid "Closed" msgstr "" -#: ../../mod/admin.php:288 +#: ../../mod/admin.php:304 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:289 +#: ../../mod/admin.php:305 msgid "Open" msgstr "" -#: ../../mod/admin.php:298 +#: ../../mod/admin.php:314 msgid "File upload" msgstr "" -#: ../../mod/admin.php:299 +#: ../../mod/admin.php:315 msgid "Policies" msgstr "" -#: ../../mod/admin.php:300 +#: ../../mod/admin.php:316 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:304 ../../addon/statusnet/statusnet.php:486 +#: ../../mod/admin.php:320 ../../addon/statusnet/statusnet.php:523 msgid "Site name" msgstr "" -#: ../../mod/admin.php:305 +#: ../../mod/admin.php:321 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:306 +#: ../../mod/admin.php:322 msgid "System language" msgstr "" -#: ../../mod/admin.php:307 +#: ../../mod/admin.php:323 msgid "System theme" msgstr "" -#: ../../mod/admin.php:309 +#: ../../mod/admin.php:325 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:311 +#: ../../mod/admin.php:327 msgid "Register policy" msgstr "" -#: ../../mod/admin.php:312 +#: ../../mod/admin.php:328 msgid "Register text" msgstr "" -#: ../../mod/admin.php:313 +#: ../../mod/admin.php:329 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:313 +#: ../../mod/admin.php:329 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:314 +#: ../../mod/admin.php:330 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:315 +#: ../../mod/admin.php:331 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:316 +#: ../../mod/admin.php:332 msgid "Block public" msgstr "" -#: ../../mod/admin.php:317 +#: ../../mod/admin.php:333 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:318 +#: ../../mod/admin.php:334 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:320 +#: ../../mod/admin.php:336 msgid "Block multiple registrations" msgstr "" -#: ../../mod/admin.php:321 +#: ../../mod/admin.php:337 msgid "OpenID support" msgstr "" -#: ../../mod/admin.php:322 +#: ../../mod/admin.php:338 msgid "Gravatar support" msgstr "" -#: ../../mod/admin.php:323 +#: ../../mod/admin.php:339 msgid "Fullname check" msgstr "" -#: ../../mod/admin.php:324 +#: ../../mod/admin.php:340 msgid "UTF-8 Regular expressions" msgstr "" -#: ../../mod/admin.php:325 +#: ../../mod/admin.php:341 msgid "Show Community Page" msgstr "" -#: ../../mod/admin.php:326 +#: ../../mod/admin.php:342 msgid "Enable OStatus support" msgstr "" -#: ../../mod/admin.php:327 +#: ../../mod/admin.php:343 msgid "Enable Diaspora support" msgstr "" -#: ../../mod/admin.php:328 +#: ../../mod/admin.php:344 msgid "Only allow Friendica contacts" msgstr "" -#: ../../mod/admin.php:329 +#: ../../mod/admin.php:345 msgid "Verify SSL" msgstr "" -#: ../../mod/admin.php:330 +#: ../../mod/admin.php:346 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:331 +#: ../../mod/admin.php:347 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:332 +#: ../../mod/admin.php:348 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:353 +#: ../../mod/admin.php:369 #, php-format msgid "%s user blocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:360 +#: ../../mod/admin.php:376 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:394 +#: ../../mod/admin.php:410 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:401 +#: ../../mod/admin.php:417 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:401 +#: ../../mod/admin.php:417 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:478 msgid "select all" msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:479 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:480 msgid "Request date" msgstr "" -#: ../../mod/admin.php:464 ../../mod/admin.php:473 +#: ../../mod/admin.php:480 ../../mod/admin.php:489 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:481 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:467 +#: ../../mod/admin.php:483 msgid "Deny" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:489 msgid "Register date" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:489 msgid "Last login" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:489 msgid "Last item" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:489 msgid "Account" msgstr "" -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:491 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:476 +#: ../../mod/admin.php:492 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:512 +#: ../../mod/admin.php:528 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:516 +#: ../../mod/admin.php:532 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:526 +#: ../../mod/admin.php:542 ../../mod/admin.php:718 msgid "Disable" msgstr "" -#: ../../mod/admin.php:528 +#: ../../mod/admin.php:544 ../../mod/admin.php:720 msgid "Enable" msgstr "" -#: ../../mod/admin.php:550 +#: ../../mod/admin.php:566 ../../mod/admin.php:737 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:551 ../../include/nav.php:129 +#: ../../mod/admin.php:567 ../../mod/admin.php:738 ../../include/nav.php:130 msgid "Settings" msgstr "" -#: ../../mod/admin.php:613 +#: ../../mod/admin.php:683 +msgid "No themes found." +msgstr "" + +#: ../../mod/admin.php:795 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:653 +#: ../../mod/admin.php:848 msgid "Clear" msgstr "" -#: ../../mod/admin.php:659 +#: ../../mod/admin.php:854 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:660 +#: ../../mod/admin.php:855 msgid "Log file" msgstr "" -#: ../../mod/admin.php:660 +#: ../../mod/admin.php:855 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:661 +#: ../../mod/admin.php:856 msgid "Log level" msgstr "" -#: ../../mod/admin.php:702 +#: ../../mod/admin.php:897 msgid "Close" msgstr "" -#: ../../mod/admin.php:708 +#: ../../mod/admin.php:903 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:709 +#: ../../mod/admin.php:904 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:710 +#: ../../mod/admin.php:905 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:711 +#: ../../mod/admin.php:906 msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:15 ../../boot.php:841 +#: ../../mod/profile.php:15 ../../boot.php:845 msgid "Requested profile is not available." msgstr "" -#: ../../mod/profile.php:111 ../../mod/display.php:66 +#: ../../mod/profile.php:111 ../../mod/display.php:67 msgid "Access to this profile has been restricted." msgstr "" @@ -3061,48 +3120,48 @@ msgstr "" msgid "Tips for New Members" msgstr "" -#: ../../mod/ping.php:148 +#: ../../mod/ping.php:146 msgid "{0} wants to be your friend" msgstr "" -#: ../../mod/ping.php:153 +#: ../../mod/ping.php:151 msgid "{0} sent you a message" msgstr "" -#: ../../mod/ping.php:158 +#: ../../mod/ping.php:156 msgid "{0} requested registration" msgstr "" -#: ../../mod/ping.php:164 +#: ../../mod/ping.php:162 #, php-format msgid "{0} commented %s's post" msgstr "" -#: ../../mod/ping.php:169 +#: ../../mod/ping.php:167 #, php-format msgid "{0} liked %s's post" msgstr "" -#: ../../mod/ping.php:174 +#: ../../mod/ping.php:172 #, php-format msgid "{0} disliked %s's post" msgstr "" -#: ../../mod/ping.php:179 +#: ../../mod/ping.php:177 #, php-format msgid "{0} is now friends with %s" msgstr "" -#: ../../mod/ping.php:184 +#: ../../mod/ping.php:182 msgid "{0} posted" msgstr "" -#: ../../mod/ping.php:189 +#: ../../mod/ping.php:187 #, php-format msgid "{0} tagged %s's post with #%s" msgstr "" -#: ../../mod/ping.php:195 +#: ../../mod/ping.php:193 msgid "{0} mentioned you in a post" msgstr "" @@ -3120,39 +3179,39 @@ msgid "" "This site is not configured to allow communications with other networks." msgstr "" -#: ../../mod/follow.php:48 ../../mod/follow.php:58 +#: ../../mod/follow.php:48 ../../mod/follow.php:63 msgid "No compatible communication protocols or feeds were discovered." msgstr "" -#: ../../mod/follow.php:56 +#: ../../mod/follow.php:61 msgid "The profile address specified does not provide adequate information." msgstr "" -#: ../../mod/follow.php:60 +#: ../../mod/follow.php:65 msgid "An author or name was not found." msgstr "" -#: ../../mod/follow.php:62 +#: ../../mod/follow.php:67 msgid "No browser URL could be matched to this address." msgstr "" -#: ../../mod/follow.php:69 +#: ../../mod/follow.php:74 msgid "" "The profile address specified belongs to a network which has been disabled " "on this site." msgstr "" -#: ../../mod/follow.php:74 +#: ../../mod/follow.php:79 msgid "" "Limited profile. This person will be unable to receive direct/personal " "notifications from you." msgstr "" -#: ../../mod/follow.php:144 +#: ../../mod/follow.php:149 msgid "Unable to retrieve contact information." msgstr "" -#: ../../mod/follow.php:190 +#: ../../mod/follow.php:195 msgid "following" msgstr "" @@ -3164,7 +3223,7 @@ msgstr "" msgid "No friends in common." msgstr "" -#: ../../mod/display.php:109 +#: ../../mod/display.php:127 msgid "Item has been removed." msgstr "" @@ -3368,7 +3427,7 @@ msgid "" "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:426 ../../mod/directory.php:122 +#: ../../mod/profiles.php:426 ../../mod/directory.php:124 msgid "Age: " msgstr "" @@ -3376,27 +3435,27 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:462 ../../boot.php:942 +#: ../../mod/profiles.php:462 ../../boot.php:946 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:463 ../../boot.php:943 +#: ../../mod/profiles.php:463 ../../boot.php:947 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:473 ../../boot.php:953 +#: ../../mod/profiles.php:473 ../../boot.php:957 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:475 ../../boot.php:956 +#: ../../mod/profiles.php:475 ../../boot.php:960 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:476 ../../boot.php:957 +#: ../../mod/profiles.php:476 ../../boot.php:961 msgid "Edit visibility" msgstr "" -#: ../../mod/tagger.php:103 ../../include/conversation.php:116 +#: ../../mod/tagger.php:103 ../../include/conversation.php:138 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" @@ -3450,31 +3509,31 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../mod/directory.php:49 +#: ../../mod/directory.php:51 msgid "Global Directory" msgstr "" -#: ../../mod/directory.php:55 +#: ../../mod/directory.php:57 msgid "Normal site view" msgstr "" -#: ../../mod/directory.php:57 +#: ../../mod/directory.php:59 msgid "Admin - View all site entries" msgstr "" -#: ../../mod/directory.php:63 +#: ../../mod/directory.php:65 msgid "Find on this site" msgstr "" -#: ../../mod/directory.php:66 +#: ../../mod/directory.php:68 msgid "Site Directory" msgstr "" -#: ../../mod/directory.php:125 +#: ../../mod/directory.php:127 msgid "Gender: " msgstr "" -#: ../../mod/directory.php:151 +#: ../../mod/directory.php:153 msgid "No entries (some entries may be hidden)." msgstr "" @@ -3560,7 +3619,7 @@ msgid "Unable to set contact photo." msgstr "" #: ../../mod/dfrn_confirm.php:473 ../../include/diaspora.php:495 -#: ../../include/conversation.php:79 +#: ../../include/conversation.php:101 #, php-format msgid "%1$s is now friends with %2$s" msgstr "" @@ -3606,71 +3665,71 @@ msgstr "" msgid "Connection accepted at %s" msgstr "" -#: ../../addon/facebook/facebook.php:337 +#: ../../addon/facebook/facebook.php:338 msgid "Facebook disabled" msgstr "" -#: ../../addon/facebook/facebook.php:342 +#: ../../addon/facebook/facebook.php:343 msgid "Updating contacts" msgstr "" -#: ../../addon/facebook/facebook.php:351 +#: ../../addon/facebook/facebook.php:352 msgid "Facebook API key is missing." msgstr "" -#: ../../addon/facebook/facebook.php:358 +#: ../../addon/facebook/facebook.php:359 msgid "Facebook Connect" msgstr "" -#: ../../addon/facebook/facebook.php:364 +#: ../../addon/facebook/facebook.php:365 msgid "Install Facebook connector for this account." msgstr "" -#: ../../addon/facebook/facebook.php:371 +#: ../../addon/facebook/facebook.php:372 msgid "Remove Facebook connector" msgstr "" -#: ../../addon/facebook/facebook.php:376 +#: ../../addon/facebook/facebook.php:377 msgid "" "Re-authenticate [This is necessary whenever your Facebook password is " "changed.]" msgstr "" -#: ../../addon/facebook/facebook.php:383 +#: ../../addon/facebook/facebook.php:384 msgid "Post to Facebook by default" msgstr "" -#: ../../addon/facebook/facebook.php:387 +#: ../../addon/facebook/facebook.php:388 msgid "Link all your Facebook friends and conversations on this website" msgstr "" -#: ../../addon/facebook/facebook.php:389 +#: ../../addon/facebook/facebook.php:390 msgid "" "Facebook conversations consist of your profile wall and your friend " "stream." msgstr "" -#: ../../addon/facebook/facebook.php:390 +#: ../../addon/facebook/facebook.php:391 msgid "On this website, your Facebook friend stream is only visible to you." msgstr "" -#: ../../addon/facebook/facebook.php:391 +#: ../../addon/facebook/facebook.php:392 msgid "" "The following settings determine the privacy of your Facebook profile wall " "on this website." msgstr "" -#: ../../addon/facebook/facebook.php:395 +#: ../../addon/facebook/facebook.php:396 msgid "" "On this website your Facebook profile wall conversations will only be " "visible to you" msgstr "" -#: ../../addon/facebook/facebook.php:400 +#: ../../addon/facebook/facebook.php:401 msgid "Do not import your Facebook profile wall conversations" msgstr "" -#: ../../addon/facebook/facebook.php:402 +#: ../../addon/facebook/facebook.php:403 msgid "" "If you choose to link conversations and leave both of these boxes unchecked, " "your Facebook profile wall will be merged with your profile wall on this " @@ -3678,43 +3737,43 @@ msgid "" "who may see the conversations." msgstr "" -#: ../../addon/facebook/facebook.php:407 +#: ../../addon/facebook/facebook.php:408 msgid "Comma separated applications to ignore" msgstr "" -#: ../../addon/facebook/facebook.php:475 +#: ../../addon/facebook/facebook.php:476 #: ../../include/contact_selectors.php:81 msgid "Facebook" msgstr "" -#: ../../addon/facebook/facebook.php:476 +#: ../../addon/facebook/facebook.php:477 msgid "Facebook Connector Settings" msgstr "" -#: ../../addon/facebook/facebook.php:490 +#: ../../addon/facebook/facebook.php:491 msgid "Post to Facebook" msgstr "" -#: ../../addon/facebook/facebook.php:581 +#: ../../addon/facebook/facebook.php:582 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "" -#: ../../addon/facebook/facebook.php:650 +#: ../../addon/facebook/facebook.php:651 msgid "Image: " msgstr "" -#: ../../addon/facebook/facebook.php:727 +#: ../../addon/facebook/facebook.php:728 msgid "View on Friendica" msgstr "" -#: ../../addon/facebook/facebook.php:751 +#: ../../addon/facebook/facebook.php:752 msgid "Facebook post failed. Queued for retry." msgstr "" -#: ../../addon/facebook/facebook.php:876 ../../addon/facebook/facebook.php:885 -#: ../../include/bb2diaspora.php:113 +#: ../../addon/facebook/facebook.php:877 ../../addon/facebook/facebook.php:886 +#: ../../include/bb2diaspora.php:132 msgid "link" msgstr "" @@ -3799,7 +3858,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:28 #: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:62 -#: ../../boot.php:706 +#: ../../boot.php:710 msgid "Login" msgstr "" @@ -3824,7 +3883,7 @@ msgid "Last likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../include/conversation.php:23 ../../include/conversation.php:96 +#: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -3979,19 +4038,19 @@ msgstr "" msgid "Failed" msgstr "" -#: ../../addon/js_upload/js_upload.php:294 +#: ../../addon/js_upload/js_upload.php:297 msgid "No files were uploaded." msgstr "" -#: ../../addon/js_upload/js_upload.php:300 +#: ../../addon/js_upload/js_upload.php:303 msgid "Uploaded file is empty" msgstr "" -#: ../../addon/js_upload/js_upload.php:323 +#: ../../addon/js_upload/js_upload.php:326 msgid "File has an invalid extension, it should be one of " msgstr "" -#: ../../addon/js_upload/js_upload.php:334 +#: ../../addon/js_upload/js_upload.php:337 msgid "Upload was cancelled, or server error encountered" msgstr "" @@ -4075,6 +4134,48 @@ msgstr "" msgid "blockem settings updated" msgstr "" +#: ../../addon/qcomment/qcomment.php:51 +msgid ":-)" +msgstr "" + +#: ../../addon/qcomment/qcomment.php:51 +msgid ":-(" +msgstr "" + +#: ../../addon/qcomment/qcomment.php:51 +msgid "lol" +msgstr "" + +#: ../../addon/qcomment/qcomment.php:54 +msgid "Quick Comment Settings" +msgstr "" + +#: ../../addon/qcomment/qcomment.php:56 +msgid "Enter quick comments, one per line" +msgstr "" + +#: ../../addon/qcomment/qcomment.php:74 +msgid "Quick Comment settings saved." +msgstr "" + +#: ../../addon/openstreetmap/openstreetmap.php:71 +msgid "Tile Server URL" +msgstr "" + +#: ../../addon/openstreetmap/openstreetmap.php:71 +msgid "" +"A list of public tile servers" +msgstr "" + +#: ../../addon/openstreetmap/openstreetmap.php:72 +msgid "Default zoom" +msgstr "" + +#: ../../addon/openstreetmap/openstreetmap.php:72 +msgid "The default zoom level. (1:world, 18:highest)" +msgstr "" + #: ../../addon/editplain/editplain.php:46 msgid "Editplain settings updated." msgstr "" @@ -4099,44 +4200,44 @@ msgstr "" msgid "View Source" msgstr "" -#: ../../addon/statusnet/statusnet.php:140 +#: ../../addon/statusnet/statusnet.php:134 msgid "Post to StatusNet" msgstr "" -#: ../../addon/statusnet/statusnet.php:182 +#: ../../addon/statusnet/statusnet.php:175 msgid "" "Please contact your site administrator.
The provided API URL is not " "valid." msgstr "" -#: ../../addon/statusnet/statusnet.php:210 +#: ../../addon/statusnet/statusnet.php:203 msgid "We could not contact the StatusNet API with the Path you entered." msgstr "" -#: ../../addon/statusnet/statusnet.php:236 +#: ../../addon/statusnet/statusnet.php:229 msgid "StatusNet settings updated." msgstr "" -#: ../../addon/statusnet/statusnet.php:259 +#: ../../addon/statusnet/statusnet.php:252 msgid "StatusNet Posting Settings" msgstr "" -#: ../../addon/statusnet/statusnet.php:273 +#: ../../addon/statusnet/statusnet.php:266 msgid "Globally Available StatusNet OAuthKeys" msgstr "" -#: ../../addon/statusnet/statusnet.php:274 +#: ../../addon/statusnet/statusnet.php:267 msgid "" "There are preconfigured OAuth key pairs for some StatusNet servers " "available. If you are useing one of them, please use these credentials. If " "not feel free to connect to any other StatusNet instance (see below)." msgstr "" -#: ../../addon/statusnet/statusnet.php:282 +#: ../../addon/statusnet/statusnet.php:275 msgid "Provide your own OAuth Credentials" msgstr "" -#: ../../addon/statusnet/statusnet.php:283 +#: ../../addon/statusnet/statusnet.php:276 msgid "" "No consumer key pair for StatusNet found. Register your Friendica Account as " "an desktop client on your StatusNet account, copy the consumer key pair here " @@ -4145,19 +4246,19 @@ msgid "" "installation at your favorited StatusNet installation." msgstr "" -#: ../../addon/statusnet/statusnet.php:285 +#: ../../addon/statusnet/statusnet.php:278 msgid "OAuth Consumer Key" msgstr "" -#: ../../addon/statusnet/statusnet.php:288 +#: ../../addon/statusnet/statusnet.php:281 msgid "OAuth Consumer Secret" msgstr "" -#: ../../addon/statusnet/statusnet.php:291 +#: ../../addon/statusnet/statusnet.php:284 msgid "Base API Path (remember the trailing /)" msgstr "" -#: ../../addon/statusnet/statusnet.php:312 +#: ../../addon/statusnet/statusnet.php:305 msgid "" "To connect to your StatusNet account click the button below to get a " "security code from StatusNet which you have to copy into the input box below " @@ -4165,50 +4266,58 @@ msgid "" "to StatusNet." msgstr "" -#: ../../addon/statusnet/statusnet.php:313 +#: ../../addon/statusnet/statusnet.php:306 msgid "Log in with StatusNet" msgstr "" -#: ../../addon/statusnet/statusnet.php:315 +#: ../../addon/statusnet/statusnet.php:308 msgid "Copy the security code from StatusNet here" msgstr "" -#: ../../addon/statusnet/statusnet.php:321 +#: ../../addon/statusnet/statusnet.php:314 msgid "Cancel Connection Process" msgstr "" -#: ../../addon/statusnet/statusnet.php:323 +#: ../../addon/statusnet/statusnet.php:316 msgid "Current StatusNet API is" msgstr "" -#: ../../addon/statusnet/statusnet.php:324 +#: ../../addon/statusnet/statusnet.php:317 msgid "Cancel StatusNet Connection" msgstr "" -#: ../../addon/statusnet/statusnet.php:335 ../../addon/twitter/twitter.php:189 +#: ../../addon/statusnet/statusnet.php:328 ../../addon/twitter/twitter.php:184 msgid "Currently connected to: " msgstr "" -#: ../../addon/statusnet/statusnet.php:336 +#: ../../addon/statusnet/statusnet.php:329 msgid "" "If enabled all your public postings can be posted to the " "associated StatusNet account. You can choose to do so by default (here) or " "for every posting separately in the posting options when writing the entry." msgstr "" -#: ../../addon/statusnet/statusnet.php:338 +#: ../../addon/statusnet/statusnet.php:331 +msgid "" +"Note: Due your privacy settings (Hide your profile " +"details from unknown viewers?) the link potentially included in public " +"postings relayed to StatusNet will lead the visitor to a blank page " +"informing the visitor that the access to your profile has been restricted." +msgstr "" + +#: ../../addon/statusnet/statusnet.php:334 msgid "Allow posting to StatusNet" msgstr "" -#: ../../addon/statusnet/statusnet.php:341 +#: ../../addon/statusnet/statusnet.php:337 msgid "Send public postings to StatusNet by default" msgstr "" -#: ../../addon/statusnet/statusnet.php:346 ../../addon/twitter/twitter.php:200 +#: ../../addon/statusnet/statusnet.php:342 ../../addon/twitter/twitter.php:198 msgid "Clear OAuth configuration" msgstr "" -#: ../../addon/statusnet/statusnet.php:487 +#: ../../addon/statusnet/statusnet.php:524 msgid "API URL" msgstr "" @@ -4276,13 +4385,33 @@ msgstr "" msgid "Post to WordPress by default" msgstr "" -#: ../../addon/piwik/piwik.php:70 +#: ../../addon/showmore/showmore.php:38 +msgid "\"Show more\" Settings" +msgstr "" + +#: ../../addon/showmore/showmore.php:41 +msgid "Enable Show More" +msgstr "" + +#: ../../addon/showmore/showmore.php:44 +msgid "Cutting posts after how much characters" +msgstr "" + +#: ../../addon/showmore/showmore.php:64 +msgid "Show More Settings saved." +msgstr "" + +#: ../../addon/showmore/showmore.php:86 +msgid "Show More" +msgstr "" + +#: ../../addon/piwik/piwik.php:79 msgid "" "This website is tracked using the Piwik " "analytics tool." msgstr "" -#: ../../addon/piwik/piwik.php:73 +#: ../../addon/piwik/piwik.php:82 #, php-format msgid "" "If you do not want that your visits are logged this way you can " @@ -4290,37 +4419,47 @@ msgid "" "(opt-out)." msgstr "" -#: ../../addon/piwik/piwik.php:82 +#: ../../addon/piwik/piwik.php:90 msgid "Piwik Base URL" msgstr "" -#: ../../addon/piwik/piwik.php:83 +#: ../../addon/piwik/piwik.php:90 +msgid "" +"Absolute path to your Piwik installation. (without protocol (http/s), with " +"trailing slash)" +msgstr "" + +#: ../../addon/piwik/piwik.php:91 msgid "Site ID" msgstr "" -#: ../../addon/piwik/piwik.php:84 +#: ../../addon/piwik/piwik.php:92 msgid "Show opt-out cookie link?" msgstr "" -#: ../../addon/twitter/twitter.php:78 +#: ../../addon/piwik/piwik.php:93 +msgid "Asynchronous tracking" +msgstr "" + +#: ../../addon/twitter/twitter.php:73 msgid "Post to Twitter" msgstr "" -#: ../../addon/twitter/twitter.php:124 +#: ../../addon/twitter/twitter.php:119 msgid "Twitter settings updated." msgstr "" -#: ../../addon/twitter/twitter.php:146 +#: ../../addon/twitter/twitter.php:141 msgid "Twitter Posting Settings" msgstr "" -#: ../../addon/twitter/twitter.php:153 +#: ../../addon/twitter/twitter.php:148 msgid "" "No consumer key pair for Twitter found. Please contact your site " "administrator." msgstr "" -#: ../../addon/twitter/twitter.php:172 +#: ../../addon/twitter/twitter.php:167 msgid "" "At this Friendica instance the Twitter plugin was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " @@ -4329,34 +4468,42 @@ msgid "" "be posted to Twitter." msgstr "" -#: ../../addon/twitter/twitter.php:173 +#: ../../addon/twitter/twitter.php:168 msgid "Log in with Twitter" msgstr "" -#: ../../addon/twitter/twitter.php:175 +#: ../../addon/twitter/twitter.php:170 msgid "Copy the PIN from Twitter here" msgstr "" -#: ../../addon/twitter/twitter.php:190 +#: ../../addon/twitter/twitter.php:185 msgid "" "If enabled all your public postings can be posted to the " "associated Twitter account. You can choose to do so by default (here) or for " "every posting separately in the posting options when writing the entry." msgstr "" -#: ../../addon/twitter/twitter.php:192 +#: ../../addon/twitter/twitter.php:187 +msgid "" +"Note: Due your privacy settings (Hide your profile " +"details from unknown viewers?) the link potentially included in public " +"postings relayed to Twitter will lead the visitor to a blank page informing " +"the visitor that the access to your profile has been restricted." +msgstr "" + +#: ../../addon/twitter/twitter.php:190 msgid "Allow posting to Twitter" msgstr "" -#: ../../addon/twitter/twitter.php:195 +#: ../../addon/twitter/twitter.php:193 msgid "Send public postings to Twitter by default" msgstr "" -#: ../../addon/twitter/twitter.php:317 +#: ../../addon/twitter/twitter.php:357 msgid "Consumer key" msgstr "" -#: ../../addon/twitter/twitter.php:318 +#: ../../addon/twitter/twitter.php:358 msgid "Consumer secret" msgstr "" @@ -4384,7 +4531,7 @@ msgstr "" msgid "Post to Posterous by default" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:978 +#: ../../include/profile_advanced.php:17 ../../boot.php:982 msgid "Gender:" msgstr "" @@ -4397,7 +4544,7 @@ msgid "j F" msgstr "" #: ../../include/profile_advanced.php:30 ../../include/datetime.php:438 -#: ../../include/items.php:1318 +#: ../../include/items.php:1349 msgid "Birthday:" msgstr "" @@ -4405,11 +4552,11 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:981 +#: ../../include/profile_advanced.php:37 ../../boot.php:985 msgid "Status:" msgstr "" -#: ../../include/profile_advanced.php:45 ../../boot.php:983 +#: ../../include/profile_advanced.php:45 ../../boot.php:987 msgid "Homepage:" msgstr "" @@ -4745,20 +4892,20 @@ msgstr "" msgid "Ask me" msgstr "" -#: ../../include/event.php:17 ../../include/bb2diaspora.php:255 +#: ../../include/event.php:17 ../../include/bb2diaspora.php:274 msgid "Starts:" msgstr "" -#: ../../include/event.php:27 ../../include/bb2diaspora.php:263 +#: ../../include/event.php:27 ../../include/bb2diaspora.php:282 msgid "Finishes:" msgstr "" -#: ../../include/delivery.php:416 ../../include/notifier.php:629 +#: ../../include/delivery.php:424 ../../include/notifier.php:637 msgid "(no subject)" msgstr "" -#: ../../include/delivery.php:423 ../../include/enotify.php:16 -#: ../../include/notifier.php:636 +#: ../../include/delivery.php:431 ../../include/enotify.php:16 +#: ../../include/notifier.php:644 msgid "noreply" msgstr "" @@ -4793,91 +4940,91 @@ msgstr[1] "" msgid "Search" msgstr "" -#: ../../include/text.php:735 +#: ../../include/text.php:813 msgid "Monday" msgstr "" -#: ../../include/text.php:735 +#: ../../include/text.php:813 msgid "Tuesday" msgstr "" -#: ../../include/text.php:735 +#: ../../include/text.php:813 msgid "Wednesday" msgstr "" -#: ../../include/text.php:735 +#: ../../include/text.php:813 msgid "Thursday" msgstr "" -#: ../../include/text.php:735 +#: ../../include/text.php:813 msgid "Friday" msgstr "" -#: ../../include/text.php:735 +#: ../../include/text.php:813 msgid "Saturday" msgstr "" -#: ../../include/text.php:735 +#: ../../include/text.php:813 msgid "Sunday" msgstr "" -#: ../../include/text.php:739 +#: ../../include/text.php:817 msgid "January" msgstr "" -#: ../../include/text.php:739 +#: ../../include/text.php:817 msgid "February" msgstr "" -#: ../../include/text.php:739 +#: ../../include/text.php:817 msgid "March" msgstr "" -#: ../../include/text.php:739 +#: ../../include/text.php:817 msgid "April" msgstr "" -#: ../../include/text.php:739 +#: ../../include/text.php:817 msgid "May" msgstr "" -#: ../../include/text.php:739 +#: ../../include/text.php:817 msgid "June" msgstr "" -#: ../../include/text.php:739 +#: ../../include/text.php:817 msgid "July" msgstr "" -#: ../../include/text.php:739 +#: ../../include/text.php:817 msgid "August" msgstr "" -#: ../../include/text.php:739 +#: ../../include/text.php:817 msgid "September" msgstr "" -#: ../../include/text.php:739 +#: ../../include/text.php:817 msgid "October" msgstr "" -#: ../../include/text.php:739 +#: ../../include/text.php:817 msgid "November" msgstr "" -#: ../../include/text.php:739 +#: ../../include/text.php:817 msgid "December" msgstr "" -#: ../../include/text.php:809 +#: ../../include/text.php:887 msgid "bytes" msgstr "" -#: ../../include/text.php:901 +#: ../../include/text.php:982 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:913 +#: ../../include/text.php:994 msgid "default" msgstr "" @@ -4885,11 +5032,11 @@ msgstr "" msgid "Sharing notification from Diaspora network" msgstr "" -#: ../../include/diaspora.php:1895 +#: ../../include/diaspora.php:1911 msgid "Attachments:" msgstr "" -#: ../../include/diaspora.php:2078 +#: ../../include/diaspora.php:2094 #, php-format msgid "[Relayed] Comment authored by %s from network %s" msgstr "" @@ -4929,7 +5076,7 @@ msgstr "" msgid "Create a new group" msgstr "" -#: ../../include/nav.php:44 ../../boot.php:705 +#: ../../include/nav.php:44 ../../boot.php:709 msgid "Logout" msgstr "" @@ -4937,7 +5084,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:47 ../../boot.php:1327 +#: ../../include/nav.php:47 ../../boot.php:1331 msgid "Status" msgstr "" @@ -4949,7 +5096,7 @@ msgstr "" msgid "Your profile page" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1337 +#: ../../include/nav.php:49 ../../boot.php:1341 msgid "Photos" msgstr "" @@ -5021,39 +5168,43 @@ msgstr "" msgid "See all notifications" msgstr "" -#: ../../include/nav.php:123 +#: ../../include/nav.php:120 +msgid "Mark all system notifications seen" +msgstr "" + +#: ../../include/nav.php:124 msgid "Private mail" msgstr "" -#: ../../include/nav.php:126 +#: ../../include/nav.php:127 msgid "Manage" msgstr "" -#: ../../include/nav.php:126 +#: ../../include/nav.php:127 msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:130 ../../boot.php:936 +#: ../../include/nav.php:131 ../../boot.php:940 msgid "Profiles" msgstr "" -#: ../../include/nav.php:130 ../../boot.php:936 +#: ../../include/nav.php:131 ../../boot.php:940 msgid "Manage/edit profiles" msgstr "" -#: ../../include/nav.php:131 +#: ../../include/nav.php:132 msgid "Manage/edit friends and contacts" msgstr "" -#: ../../include/nav.php:138 +#: ../../include/nav.php:139 msgid "Admin" msgstr "" -#: ../../include/nav.php:138 +#: ../../include/nav.php:139 msgid "Site setup and configuration" msgstr "" -#: ../../include/nav.php:161 +#: ../../include/nav.php:162 msgid "Nothing new here" msgstr "" @@ -5185,11 +5336,15 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/poller.php:459 +#: ../../include/poller.php:474 msgid "From: " msgstr "" -#: ../../include/bbcode.php:166 ../../include/bbcode.php:225 +#: ../../include/bbcode.php:202 +msgid "$1 wrote:" +msgstr "" + +#: ../../include/bbcode.php:216 ../../include/bbcode.php:282 msgid "Image/photo" msgstr "" @@ -5237,6 +5392,15 @@ msgstr "" msgid "%s sent you a new private message at %s." msgstr "" +#: ../../include/enotify.php:31 +#, php-format +msgid "%s sent you %s." +msgstr "" + +#: ../../include/enotify.php:31 +msgid "a private message" +msgstr "" + #: ../../include/enotify.php:32 #, php-format msgid "Please visit %s to view and/or reply to your private messages." @@ -5252,84 +5416,138 @@ msgstr "" msgid "%s commented on an item/conversation you have been following." msgstr "" -#: ../../include/enotify.php:42 ../../include/enotify.php:51 -#: ../../include/enotify.php:60 ../../include/enotify.php:69 +#: ../../include/enotify.php:42 +#, php-format +msgid "%s commented in %s." +msgstr "" + +#: ../../include/enotify.php:42 +msgid "a watched conversation" +msgstr "" + +#: ../../include/enotify.php:44 ../../include/enotify.php:54 +#: ../../include/enotify.php:64 ../../include/enotify.php:74 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: ../../include/enotify.php:49 +#: ../../include/enotify.php:51 #, php-format msgid "%s posted to your profile wall at %s" msgstr "" -#: ../../include/enotify.php:58 +#: ../../include/enotify.php:52 +#, php-format +msgid "%s posted to %s" +msgstr "" + +#: ../../include/enotify.php:52 +msgid "your profile wall." +msgstr "" + +#: ../../include/enotify.php:61 #, php-format msgid "%s tagged you at %s" msgstr "" -#: ../../include/enotify.php:67 +#: ../../include/enotify.php:62 +#, php-format +msgid "%s %s." +msgstr "" + +#: ../../include/enotify.php:62 +msgid "tagged you" +msgstr "" + +#: ../../include/enotify.php:71 #, php-format msgid "%s tagged your post at %s" msgstr "" -#: ../../include/enotify.php:76 +#: ../../include/enotify.php:72 +#, php-format +msgid "%s tagged %s" +msgstr "" + +#: ../../include/enotify.php:72 +msgid "your post" +msgstr "" + +#: ../../include/enotify.php:81 #, php-format msgid "Introduction received at %s" msgstr "" -#: ../../include/enotify.php:77 +#: ../../include/enotify.php:82 #, php-format msgid "You've received an introduction from '%s' at %s" msgstr "" -#: ../../include/enotify.php:78 ../../include/enotify.php:91 +#: ../../include/enotify.php:83 +#, php-format +msgid "You've received %s from %s." +msgstr "" + +#: ../../include/enotify.php:83 +msgid "an introduction" +msgstr "" + +#: ../../include/enotify.php:84 ../../include/enotify.php:101 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: ../../include/enotify.php:80 +#: ../../include/enotify.php:86 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: ../../include/enotify.php:87 +#: ../../include/enotify.php:93 #, php-format msgid "Friend suggestion received at %s" msgstr "" -#: ../../include/enotify.php:88 +#: ../../include/enotify.php:94 #, php-format msgid "You've received a friend suggestion from '%s' at %s" msgstr "" -#: ../../include/enotify.php:89 +#: ../../include/enotify.php:95 +#, php-format +msgid "You've received %s for %s from %s." +msgstr "" + +#: ../../include/enotify.php:96 +msgid "a friend suggestion" +msgstr "" + +#: ../../include/enotify.php:99 msgid "Name:" msgstr "" -#: ../../include/enotify.php:90 +#: ../../include/enotify.php:100 msgid "Photo:" msgstr "" -#: ../../include/enotify.php:93 +#: ../../include/enotify.php:103 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/items.php:2450 +#: ../../include/items.php:2511 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:2450 +#: ../../include/items.php:2511 msgid "You have a new follower at " msgstr "" -#: ../../include/bb2diaspora.php:64 +#: ../../include/bb2diaspora.php:83 msgid "view full size" msgstr "" -#: ../../include/bb2diaspora.php:113 ../../include/bb2diaspora.php:123 -#: ../../include/bb2diaspora.php:124 +#: ../../include/bb2diaspora.php:132 ../../include/bb2diaspora.php:142 +#: ../../include/bb2diaspora.php:143 msgid "image/photo" msgstr "" @@ -5345,282 +5563,282 @@ msgstr "" msgid "Welcome back " msgstr "" -#: ../../include/Contact.php:131 ../../include/conversation.php:744 +#: ../../include/Contact.php:131 ../../include/conversation.php:769 msgid "View status" msgstr "" -#: ../../include/Contact.php:132 ../../include/conversation.php:745 +#: ../../include/Contact.php:132 ../../include/conversation.php:770 msgid "View profile" msgstr "" -#: ../../include/Contact.php:133 ../../include/conversation.php:746 +#: ../../include/Contact.php:133 ../../include/conversation.php:771 msgid "View photos" msgstr "" #: ../../include/Contact.php:134 ../../include/Contact.php:147 -#: ../../include/conversation.php:747 +#: ../../include/conversation.php:772 msgid "View recent" msgstr "" #: ../../include/Contact.php:136 ../../include/Contact.php:147 -#: ../../include/conversation.php:749 +#: ../../include/conversation.php:774 msgid "Send PM" msgstr "" -#: ../../include/conversation.php:141 +#: ../../include/conversation.php:163 msgid "post/item" msgstr "" -#: ../../include/conversation.php:142 +#: ../../include/conversation.php:164 #, php-format msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:279 ../../include/conversation.php:535 +#: ../../include/conversation.php:301 ../../include/conversation.php:562 msgid "Select" msgstr "" -#: ../../include/conversation.php:294 ../../include/conversation.php:623 -#: ../../include/conversation.php:624 +#: ../../include/conversation.php:316 ../../include/conversation.php:648 +#: ../../include/conversation.php:649 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:303 ../../include/conversation.php:635 +#: ../../include/conversation.php:325 ../../include/conversation.php:660 #, php-format msgid "%s from %s" msgstr "" -#: ../../include/conversation.php:319 +#: ../../include/conversation.php:341 msgid "View in context" msgstr "" -#: ../../include/conversation.php:434 +#: ../../include/conversation.php:456 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:437 ../../boot.php:444 +#: ../../include/conversation.php:459 ../../boot.php:448 msgid "show more" msgstr "" -#: ../../include/conversation.php:497 +#: ../../include/conversation.php:519 msgid "like" msgstr "" -#: ../../include/conversation.php:498 +#: ../../include/conversation.php:520 msgid "dislike" msgstr "" -#: ../../include/conversation.php:500 +#: ../../include/conversation.php:522 msgid "Share this" msgstr "" -#: ../../include/conversation.php:500 +#: ../../include/conversation.php:522 msgid "share" msgstr "" -#: ../../include/conversation.php:545 +#: ../../include/conversation.php:572 msgid "add star" msgstr "" -#: ../../include/conversation.php:546 +#: ../../include/conversation.php:573 msgid "remove star" msgstr "" -#: ../../include/conversation.php:547 +#: ../../include/conversation.php:574 msgid "toggle star status" msgstr "" -#: ../../include/conversation.php:550 +#: ../../include/conversation.php:577 msgid "starred" msgstr "" -#: ../../include/conversation.php:551 +#: ../../include/conversation.php:578 msgid "add tag" msgstr "" -#: ../../include/conversation.php:625 +#: ../../include/conversation.php:650 msgid "to" msgstr "" -#: ../../include/conversation.php:626 +#: ../../include/conversation.php:651 msgid "Wall-to-Wall" msgstr "" -#: ../../include/conversation.php:627 +#: ../../include/conversation.php:652 msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/conversation.php:669 +#: ../../include/conversation.php:694 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:801 +#: ../../include/conversation.php:826 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:801 +#: ../../include/conversation.php:826 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:805 +#: ../../include/conversation.php:830 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:807 +#: ../../include/conversation.php:832 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:813 +#: ../../include/conversation.php:838 msgid "and" msgstr "" -#: ../../include/conversation.php:816 +#: ../../include/conversation.php:841 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:817 +#: ../../include/conversation.php:842 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:817 +#: ../../include/conversation.php:842 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:842 +#: ../../include/conversation.php:867 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:844 +#: ../../include/conversation.php:869 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:845 +#: ../../include/conversation.php:870 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:846 +#: ../../include/conversation.php:871 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:847 +#: ../../include/conversation.php:872 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:848 +#: ../../include/conversation.php:873 msgid "Enter a title for this item" msgstr "" -#: ../../include/conversation.php:891 +#: ../../include/conversation.php:916 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:893 +#: ../../include/conversation.php:918 msgid "attach file" msgstr "" -#: ../../include/conversation.php:895 +#: ../../include/conversation.php:920 msgid "web link" msgstr "" -#: ../../include/conversation.php:896 +#: ../../include/conversation.php:921 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:897 +#: ../../include/conversation.php:922 msgid "video link" msgstr "" -#: ../../include/conversation.php:898 +#: ../../include/conversation.php:923 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:899 +#: ../../include/conversation.php:924 msgid "audio link" msgstr "" -#: ../../include/conversation.php:901 +#: ../../include/conversation.php:926 msgid "set location" msgstr "" -#: ../../include/conversation.php:903 +#: ../../include/conversation.php:928 msgid "clear location" msgstr "" -#: ../../include/conversation.php:908 +#: ../../include/conversation.php:933 msgid "permissions" msgstr "" -#: ../../boot.php:442 +#: ../../boot.php:446 msgid "Delete this item?" msgstr "" -#: ../../boot.php:445 +#: ../../boot.php:449 msgid "show fewer" msgstr "" -#: ../../boot.php:688 +#: ../../boot.php:692 msgid "Create a New Account" msgstr "" -#: ../../boot.php:708 +#: ../../boot.php:712 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:709 +#: ../../boot.php:713 msgid "Password: " msgstr "" -#: ../../boot.php:712 +#: ../../boot.php:716 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:718 +#: ../../boot.php:722 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:875 +#: ../../boot.php:879 msgid "Edit profile" msgstr "" -#: ../../boot.php:1042 ../../boot.php:1113 +#: ../../boot.php:1046 ../../boot.php:1117 msgid "g A l F d" msgstr "" -#: ../../boot.php:1043 ../../boot.php:1114 +#: ../../boot.php:1047 ../../boot.php:1118 msgid "F d" msgstr "" -#: ../../boot.php:1068 +#: ../../boot.php:1072 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1069 +#: ../../boot.php:1073 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1092 ../../boot.php:1156 +#: ../../boot.php:1096 ../../boot.php:1160 msgid "[today]" msgstr "" -#: ../../boot.php:1137 +#: ../../boot.php:1141 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1138 +#: ../../boot.php:1142 msgid "Events this week:" msgstr "" -#: ../../boot.php:1150 +#: ../../boot.php:1154 msgid "[No description]" msgstr "" diff --git a/util/strings.php b/util/strings.php index d0e36217b1..0af841ce38 100755 --- a/util/strings.php +++ b/util/strings.php @@ -2,39 +2,42 @@ ; $a->strings["Post successful."] = ""; +$a->strings["[Embedded content - reload page to view]"] = ""; $a->strings["Contact settings applied."] = ""; $a->strings["Contact update failed."] = ""; $a->strings["Permission denied."] = ""; $a->strings["Contact not found."] = ""; $a->strings["Repair Contact Settings"] = ""; -$a->strings["WARNING: This is highly advanced and if you enter incorrect information your communications with this contact will stop working."] = ""; +$a->strings["WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working."] = ""; $a->strings["Please use your browser 'Back' button now if you are uncertain what to do on this page."] = ""; +$a->strings["Return to contact editor"] = ""; $a->strings["Name"] = ""; $a->strings["Account Nickname"] = ""; +$a->strings["@Tagname - overrides Name/Nickname"] = ""; $a->strings["Account URL"] = ""; $a->strings["Friend Request URL"] = ""; $a->strings["Friend Confirm URL"] = ""; $a->strings["Notification Endpoint URL"] = ""; $a->strings["Poll/Feed URL"] = ""; +$a->strings["New photo from this URL"] = ""; $a->strings["Submit"] = ""; $a->strings["Help:"] = ""; $a->strings["Help"] = ""; +$a->strings["Not Found"] = ""; +$a->strings["Page not found."] = ""; $a->strings["File exceeds size limit of %d"] = ""; $a->strings["File upload failed."] = ""; $a->strings["Friend suggestion sent."] = ""; $a->strings["Suggest Friends"] = ""; $a->strings["Suggest a friend for %s"] = ""; -$a->strings["Status"] = ""; -$a->strings["Profile"] = ""; -$a->strings["Photos"] = ""; -$a->strings["Events"] = ""; -$a->strings["Personal Notes"] = ""; -$a->strings["Create New Event"] = ""; -$a->strings["Previous"] = ""; -$a->strings["Next"] = ""; +$a->strings["Event description and start time are required."] = ""; $a->strings["l, F j"] = ""; $a->strings["Edit event"] = ""; $a->strings["link to source"] = ""; +$a->strings["Events"] = ""; +$a->strings["Create New Event"] = ""; +$a->strings["Previous"] = ""; +$a->strings["Next"] = ""; $a->strings["hour:minute"] = ""; $a->strings["Event details"] = ""; $a->strings["Format is %s %s. Starting date and Description are required."] = ""; @@ -51,8 +54,15 @@ $a->strings["Remove Item Tag"] = ""; $a->strings["Select a tag to remove: "] = ""; $a->strings["Remove"] = ""; $a->strings["%s welcomes %s"] = ""; +$a->strings["Authorize application connection"] = ""; +$a->strings["Return to your app and insert this Securty Code:"] = ""; +$a->strings["Please login to continue."] = ""; +$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = ""; +$a->strings["Yes"] = ""; +$a->strings["No"] = ""; $a->strings["Photo Albums"] = ""; $a->strings["Contact Photos"] = ""; +$a->strings["Upload New Photos"] = ""; $a->strings["everybody"] = ""; $a->strings["Contact information unavailable"] = ""; $a->strings["Profile Photos"] = ""; @@ -72,10 +82,13 @@ $a->strings["Access to this item is restricted."] = ""; $a->strings["Upload Photos"] = ""; $a->strings["New album name: "] = ""; $a->strings["or existing album name: "] = ""; +$a->strings["Do not show a status post for this upload"] = ""; $a->strings["Permissions"] = ""; $a->strings["Edit Album"] = ""; $a->strings["View Photo"] = ""; +$a->strings["Permission denied. Access to this item may be restricted."] = ""; $a->strings["Photo not available"] = ""; +$a->strings["View photo"] = ""; $a->strings["Edit photo"] = ""; $a->strings["Use as profile photo"] = ""; $a->strings["Private Message"] = ""; @@ -92,14 +105,20 @@ $a->strings["Share"] = ""; $a->strings["Please wait"] = ""; $a->strings["This is you"] = ""; $a->strings["Comment"] = ""; +$a->strings["Preview"] = ""; $a->strings["Delete"] = ""; -$a->strings["Recent Photos"] = ""; -$a->strings["Upload New Photos"] = ""; $a->strings["View Album"] = ""; +$a->strings["Recent Photos"] = ""; $a->strings["Not available."] = ""; $a->strings["Community"] = ""; $a->strings["No results."] = ""; -$a->strings["Shared content is covered by the Creative Commons Attribution 3.0 license."] = ""; +$a->strings["This is Friendica, version"] = ""; +$a->strings["running at web location"] = ""; +$a->strings["Please visit Friendica.com to learn more about the Friendica project."] = ""; +$a->strings["Bug reports and issues: please visit"] = ""; +$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = ""; +$a->strings["Installed plugins/addons/apps"] = ""; +$a->strings["No installed plugins/addons/apps"] = ""; $a->strings["Item not found"] = ""; $a->strings["Edit post"] = ""; $a->strings["Post to Email"] = ""; @@ -115,6 +134,7 @@ $a->strings["Clear browser location"] = ""; $a->strings["Permission settings"] = ""; $a->strings["CC: email addresses"] = ""; $a->strings["Public post"] = ""; +$a->strings["Set title"] = ""; $a->strings["Example: bob@example.com, mary@example.com"] = ""; $a->strings["This introduction has already been accepted."] = ""; $a->strings["Profile location is not valid or does not contain profile information."] = ""; @@ -144,49 +164,59 @@ $a->strings["Welcome home %s."] = ""; $a->strings["Please confirm your introduction/connection request to %s."] = ""; $a->strings["Confirm"] = ""; $a->strings["[Name Withheld]"] = ""; -$a->strings["Introduction received at "] = ""; -$a->strings["Administrator"] = ""; +$a->strings["Diaspora members: Please do not use this form. Instead, enter \"%s\" into your Diaspora search bar."] = ""; +$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = ""; $a->strings["Friend/Connection Request"] = ""; -$a->strings["Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca"] = ""; +$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = ""; $a->strings["Please answer the following:"] = ""; $a->strings["Does %s know you?"] = ""; -$a->strings["Yes"] = ""; -$a->strings["No"] = ""; $a->strings["Add a personal note:"] = ""; -$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = ""; -$a->strings["Friendika"] = ""; +$a->strings["Friendica"] = ""; $a->strings["StatusNet/Federated Social Web"] = ""; -$a->strings["Private (secure) network"] = ""; -$a->strings["Public (insecure) network"] = ""; +$a->strings["Diaspora"] = ""; +$a->strings["- please share from your own site as noted above"] = ""; $a->strings["Your Identity Address:"] = ""; $a->strings["Submit Request"] = ""; -$a->strings["Could not create/connect to database."] = ""; -$a->strings["Connected to database."] = ""; -$a->strings["Proceed with Installation"] = ""; -$a->strings["Your Friendika site database has been installed."] = ""; +$a->strings["Friendica Social Communications Server - Setup"] = ""; +$a->strings["Database connection"] = ""; +$a->strings["Could not connect to database."] = ""; +$a->strings["Could not create table."] = ""; +$a->strings["Your Friendica site database has been installed."] = ""; $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = ""; $a->strings["Please see the file \"INSTALL.txt\"."] = ""; $a->strings["Proceed to registration"] = ""; -$a->strings["Database import failed."] = ""; +$a->strings["Proceed with Installation"] = ""; $a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = ""; -$a->strings["Welcome to Friendika."] = ""; -$a->strings["Friendika Social Network"] = ""; -$a->strings["Installation"] = ""; -$a->strings["In order to install Friendika we need to know how to connect to your database."] = ""; +$a->strings["Database import failed."] = ""; +$a->strings["System check"] = ""; +$a->strings["Check again"] = ""; +$a->strings["In order to install Friendica we need to know how to connect to your database."] = ""; $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = ""; $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = ""; $a->strings["Database Server Name"] = ""; $a->strings["Database Login Name"] = ""; $a->strings["Database Login Password"] = ""; $a->strings["Database Name"] = ""; +$a->strings["Site administrator email address"] = ""; +$a->strings["Your account email address must match this in order to use the web admin panel."] = ""; $a->strings["Please select a default timezone for your website"] = ""; -$a->strings["Site administrator email address. Your account email address must match this in order to use the web admin panel."] = ""; +$a->strings["Site settings"] = ""; $a->strings["Could not find a command line version of PHP in the web server PATH."] = ""; -$a->strings["This is required. Please adjust the configuration file .htconfig.php accordingly."] = ""; +$a->strings["PHP executable path"] = ""; +$a->strings["Enter full path to php executable"] = ""; +$a->strings["Command line PHP"] = ""; $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = ""; $a->strings["This is required for message delivery to work."] = ""; +$a->strings["PHP \"register_argc_argv\"] = ""; $a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = ""; $a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = ""; +$a->strings["Generate encryption keys"] = ""; +$a->strings["libCurl PHP module"] = ""; +$a->strings["GD graphics PHP module"] = ""; +$a->strings["OpenSSL PHP module"] = ""; +$a->strings["mysqli PHP module"] = ""; +$a->strings["mb_string PHP module"] = ""; +$a->strings["Apace mod_rewrite module"] = ""; $a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = ""; $a->strings["Error: libCURL PHP module required but not installed."] = ""; $a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = ""; @@ -197,11 +227,20 @@ $a->strings["The web installer needs to be able to create a file called \".htcon $a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = ""; $a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = ""; $a->strings["If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = ""; +$a->strings[".htconfig.php is writable"] = ""; $a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = ""; $a->strings["Errors encountered creating database tables."] = ""; -$a->strings["[Embedded content - reload page to view]"] = ""; +$a->strings["l F d, Y \\@ g:i A"] = ""; +$a->strings["Time Conversion"] = ""; +$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = ""; +$a->strings["UTC time: %s"] = ""; +$a->strings["Current timezone: %s"] = ""; +$a->strings["Converted localtime: %s"] = ""; +$a->strings["Please select your timezone:"] = ""; $a->strings["Profile Match"] = ""; $a->strings["No keywords to match. Please add keywords to your default profile."] = ""; +$a->strings["is interested in:"] = ""; +$a->strings["Connect"] = ""; $a->strings["No matches"] = ""; $a->strings["Remote privacy information not available."] = ""; $a->strings["Visible to:"] = ""; @@ -209,31 +248,45 @@ $a->strings["Welcome to %s"] = ""; $a->strings["Invalid request identifier."] = ""; $a->strings["Discard"] = ""; $a->strings["Ignore"] = ""; -$a->strings["Pending Friend/Connect Notifications"] = ""; +$a->strings["System"] = ""; +$a->strings["Network"] = ""; +$a->strings["Personal"] = ""; +$a->strings["Home"] = ""; +$a->strings["Introductions"] = ""; +$a->strings["Messages"] = ""; $a->strings["Show Ignored Requests"] = ""; $a->strings["Hide Ignored Requests"] = ""; $a->strings["Notification type: "] = ""; $a->strings["Friend Suggestion"] = ""; $a->strings["suggested by %s"] = ""; +$a->strings["Hide this contact from others"] = ""; +$a->strings["Post a new friend activity"] = ""; +$a->strings["if applicable"] = ""; $a->strings["Approve"] = ""; $a->strings["Claims to be known to you: "] = ""; $a->strings["yes"] = ""; $a->strings["no"] = ""; $a->strings["Approve as: "] = ""; $a->strings["Friend"] = ""; +$a->strings["Sharer"] = ""; $a->strings["Fan/Admirer"] = ""; $a->strings["Friend/Connect Request"] = ""; $a->strings["New Follower"] = ""; -$a->strings["No notifications."] = ""; -$a->strings["Invite Friends"] = ""; -$a->strings["%d invitation available"] = array( - 0 => "", - 1 => "", -); -$a->strings["Find People With Shared Interests"] = ""; -$a->strings["Connect/Follow"] = ""; -$a->strings["Example: bob@example.com, http://example.com/barbara"] = ""; -$a->strings["Follow"] = ""; +$a->strings["No introductions."] = ""; +$a->strings["Notifications"] = ""; +$a->strings["%s liked %s's post"] = ""; +$a->strings["%s disliked %s's post"] = ""; +$a->strings["%s is now friends with %s"] = ""; +$a->strings["%s created a new post"] = ""; +$a->strings["%s commented on %s's post"] = ""; +$a->strings["No more network notifications."] = ""; +$a->strings["Network Notifications"] = ""; +$a->strings["No more system notifications."] = ""; +$a->strings["System Notifications"] = ""; +$a->strings["No more personal notifications."] = ""; +$a->strings["Personal Notifications"] = ""; +$a->strings["No more home notifications."] = ""; +$a->strings["Home Notifications"] = ""; $a->strings["Could not access contact record."] = ""; $a->strings["Could not locate selected profile."] = ""; $a->strings["Contact updated."] = ""; @@ -243,48 +296,58 @@ $a->strings["Contact has been ignored"] = ""; $a->strings["Contact has been unignored"] = ""; $a->strings["stopped following"] = ""; $a->strings["Contact has been removed."] = ""; -$a->strings["Mutual Friendship"] = ""; -$a->strings["is a fan of yours"] = ""; -$a->strings["you are a fan of"] = ""; -$a->strings["Privacy Unavailable"] = ""; +$a->strings["You are mutual friends with %s"] = ""; +$a->strings["You are sharing with %s"] = ""; +$a->strings["%s is sharing with you"] = ""; $a->strings["Private communications are not available for this contact."] = ""; $a->strings["Never"] = ""; $a->strings["(Update was successful)"] = ""; $a->strings["(Update was not successful)"] = ""; $a->strings["Suggest friends"] = ""; +$a->strings["Network type: %s"] = ""; +$a->strings["%d contact in common"] = array( + 0 => "", + 1 => "", +); +$a->strings["View all contacts"] = ""; +$a->strings["Unblock"] = ""; +$a->strings["Block"] = ""; +$a->strings["Unignore"] = ""; +$a->strings["Repair"] = ""; $a->strings["Contact Editor"] = ""; $a->strings["Profile Visibility"] = ""; $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = ""; $a->strings["Contact Information / Notes"] = ""; -$a->strings["Online Reputation"] = ""; -$a->strings["Occasionally your friends may wish to inquire about this person's online legitimacy."] = ""; -$a->strings["You may help them choose whether or not to interact with this person by providing a reputation to guide them."] = ""; -$a->strings["Please take a moment to elaborate on this selection if you feel it could be helpful to others."] = ""; +$a->strings["Edit contact notes"] = ""; $a->strings["Visit %s's profile [%s]"] = ""; $a->strings["Block/Unblock contact"] = ""; $a->strings["Ignore contact"] = ""; -$a->strings["Repair contact URL settings"] = ""; -$a->strings["Repair contact URL settings (WARNING: Advanced)"] = ""; +$a->strings["Repair URL settings"] = ""; $a->strings["View conversations"] = ""; $a->strings["Delete contact"] = ""; -$a->strings["Last updated: "] = ""; -$a->strings["Update public posts: "] = ""; +$a->strings["Last update:"] = ""; +$a->strings["Update public posts"] = ""; $a->strings["Update now"] = ""; -$a->strings["Unblock this contact"] = ""; -$a->strings["Block this contact"] = ""; -$a->strings["Unignore this contact"] = ""; -$a->strings["Ignore this contact"] = ""; $a->strings["Currently blocked"] = ""; $a->strings["Currently ignored"] = ""; +$a->strings["Replies/likes to your public posts may still be visible"] = ""; +$a->strings["All Contacts"] = ""; +$a->strings["Unblocked Contacts"] = ""; +$a->strings["Blocked Contacts"] = ""; +$a->strings["Ignored Contacts"] = ""; +$a->strings["Hidden Contacts"] = ""; +$a->strings["Mutual Friendship"] = ""; +$a->strings["is a fan of yours"] = ""; +$a->strings["you are a fan of"] = ""; +$a->strings["Edit contact"] = ""; $a->strings["Contacts"] = ""; -$a->strings["Show Blocked Connections"] = ""; -$a->strings["Hide Blocked Connections"] = ""; +$a->strings["Search your contacts"] = ""; $a->strings["Finding: "] = ""; $a->strings["Find"] = ""; -$a->strings["Edit contact"] = ""; $a->strings["No valid account found."] = ""; $a->strings["Password reset request issued. Check your email."] = ""; $a->strings["Password reset requested at %s"] = ""; +$a->strings["Administrator"] = ""; $a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = ""; $a->strings["Password Reset"] = ""; $a->strings["Your password has been reset as requested."] = ""; @@ -296,20 +359,53 @@ $a->strings["Forgot your Password?"] = ""; $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = ""; $a->strings["Nickname or Email: "] = ""; $a->strings["Reset"] = ""; +$a->strings["Missing some important data!"] = ""; +$a->strings["Update"] = ""; +$a->strings["Failed to connect with email account using the settings provided."] = ""; +$a->strings["Email settings updated."] = ""; $a->strings["Passwords do not match. Password unchanged."] = ""; $a->strings["Empty passwords are not allowed. Password unchanged."] = ""; $a->strings["Password changed."] = ""; $a->strings["Password update failed. Please try again."] = ""; -$a->strings["Failed to connect with email account using the settings provided."] = ""; $a->strings[" Please use a shorter name."] = ""; $a->strings[" Name too short."] = ""; $a->strings[" Not valid email."] = ""; $a->strings[" Cannot change to that email."] = ""; $a->strings["Settings updated."] = ""; $a->strings["Account settings"] = ""; +$a->strings["Connector settings"] = ""; $a->strings["Plugin settings"] = ""; +$a->strings["Connections"] = ""; +$a->strings["Export personal data"] = ""; +$a->strings["Add application"] = ""; +$a->strings["Consumer Key"] = ""; +$a->strings["Consumer Secret"] = ""; +$a->strings["Redirect"] = ""; +$a->strings["Icon url"] = ""; +$a->strings["You can't edit this application."] = ""; +$a->strings["Connected Apps"] = ""; +$a->strings["Client key starts with"] = ""; +$a->strings["No name"] = ""; +$a->strings["Remove authorization"] = ""; $a->strings["No Plugin settings configured"] = ""; $a->strings["Plugin Settings"] = ""; +$a->strings["Built-in support for %s connectivity is %s"] = ""; +$a->strings["enabled"] = ""; +$a->strings["disabled"] = ""; +$a->strings["StatusNet"] = ""; +$a->strings["Connector Settings"] = ""; +$a->strings["Email/Mailbox Setup"] = ""; +$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = ""; +$a->strings["Last successful email check:"] = ""; +$a->strings["Email access is disabled on this site."] = ""; +$a->strings["IMAP server name:"] = ""; +$a->strings["IMAP port:"] = ""; +$a->strings["Security:"] = ""; +$a->strings["None"] = ""; +$a->strings["Email login name:"] = ""; +$a->strings["Email password:"] = ""; +$a->strings["Reply-to address:"] = ""; +$a->strings["Send public posts to all email contacts:"] = ""; $a->strings["Normal Account"] = ""; $a->strings["This account is a normal personal profile"] = ""; $a->strings["Soapbox Account"] = ""; @@ -323,12 +419,22 @@ $a->strings["(Optional) Allow this OpenID to login to this account."] = ""; $a->strings["Publish your default profile in your local site directory?"] = ""; $a->strings["Publish your default profile in the global social directory?"] = ""; $a->strings["Hide your contact/friend list from viewers of your default profile?"] = ""; -$a->strings["Hide profile details and all your messages from unknown viewers?"] = ""; +$a->strings["Hide your profile details from unknown viewers?"] = ""; +$a->strings["Allow friends to post to your profile page?"] = ""; +$a->strings["Allow friends to tag your posts?"] = ""; +$a->strings["Allow us to suggest you as a potential friend to new members?"] = ""; $a->strings["Profile is not published."] = ""; $a->strings["or"] = ""; $a->strings["Your Identity Address is"] = ""; +$a->strings["Automatically expire posts after this many days:"] = ""; +$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = ""; +$a->strings["Advanced expiration settings"] = ""; +$a->strings["Advanced Expiration"] = ""; +$a->strings["Expire posts:"] = ""; +$a->strings["Expire personal notes:"] = ""; +$a->strings["Expire starred posts:"] = ""; +$a->strings["Expire photos:"] = ""; $a->strings["Account Settings"] = ""; -$a->strings["Export Personal Data"] = ""; $a->strings["Password Settings"] = ""; $a->strings["New Password:"] = ""; $a->strings["Confirm:"] = ""; @@ -340,14 +446,13 @@ $a->strings["Your Timezone:"] = ""; $a->strings["Default Post Location:"] = ""; $a->strings["Use Browser Location:"] = ""; $a->strings["Display Theme:"] = ""; +$a->strings["Update browser every xx seconds"] = ""; +$a->strings["Minimum of 10 seconds, no maximum"] = ""; $a->strings["Security and Privacy Settings"] = ""; $a->strings["Maximum Friend Requests/Day:"] = ""; $a->strings["(to prevent spam abuse)"] = ""; $a->strings["Default Post Permissions"] = ""; $a->strings["(click to open/close)"] = ""; -$a->strings["Allow friends to post to your profile page:"] = ""; -$a->strings["Automatically expire posts after days:"] = ""; -$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = ""; $a->strings["Notification Settings"] = ""; $a->strings["Send a notification email when:"] = ""; $a->strings["You receive an introduction"] = ""; @@ -355,27 +460,21 @@ $a->strings["Your introductions are confirmed"] = ""; $a->strings["Someone writes on your profile wall"] = ""; $a->strings["Someone writes a followup comment"] = ""; $a->strings["You receive a private message"] = ""; -$a->strings["Email/Mailbox Setup"] = ""; -$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = ""; -$a->strings["Last successful email check:"] = ""; -$a->strings["Email access is disabled on this site."] = ""; -$a->strings["IMAP server name:"] = ""; -$a->strings["IMAP port:"] = ""; -$a->strings["Security:"] = ""; -$a->strings["None"] = ""; -$a->strings["Email login name:"] = ""; -$a->strings["Email password:"] = ""; -$a->strings["Reply-to address:"] = ""; -$a->strings["Send public posts to all email contacts:"] = ""; +$a->strings["You receive a friend suggestion"] = ""; +$a->strings["You are tagged in a post"] = ""; $a->strings["Advanced Page Settings"] = ""; -$a->strings["Welcome back %s"] = ""; $a->strings["Manage Identities and/or Pages"] = ""; -$a->strings["(Toggle between different identities or community/group pages which share your account details.)"] = ""; +$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = ""; $a->strings["Select an identity to manage: "] = ""; -$a->strings["View Conversations"] = ""; -$a->strings["View New Items"] = ""; -$a->strings["View Any Items"] = ""; -$a->strings["View Starred Items"] = ""; +$a->strings["Search Results For:"] = ""; +$a->strings["Remove term"] = ""; +$a->strings["Saved Searches"] = ""; +$a->strings["add"] = ""; +$a->strings["Commented Order"] = ""; +$a->strings["Posted Order"] = ""; +$a->strings["New"] = ""; +$a->strings["Starred"] = ""; +$a->strings["Bookmarks"] = ""; $a->strings["Warning: This group contains %s member from an insecure network."] = array( 0 => "", 1 => "", @@ -387,19 +486,22 @@ $a->strings["Group: "] = ""; $a->strings["Contact: "] = ""; $a->strings["Private messages to this person are at risk of public disclosure."] = ""; $a->strings["Invalid contact."] = ""; +$a->strings["Personal Notes"] = ""; $a->strings["Save"] = ""; -$a->strings["Welcome to Friendika"] = ""; +$a->strings["Welcome to Friendica"] = ""; $a->strings["New Member Checklist"] = ""; -$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page."] = ""; -$a->strings["On your Settings page - change your initial password. Also make a note of your Identity Address. This will be useful in making friends."] = ""; +$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = ""; +$a->strings["On your Settings page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = ""; $a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = ""; $a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = ""; $a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = ""; -$a->strings["Enter your email access information on your Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = ""; +$a->strings["If this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = ""; +$a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = ""; $a->strings["Edit your default profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = ""; $a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = ""; -$a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the Connect dialog."] = ""; +$a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the Add New Contact dialog."] = ""; $a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a Connect or Follow link on their profile page. Provide your own Identity Address if requested."] = ""; +$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = ""; $a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = ""; $a->strings["Our help pages may be consulted for detail on other program features and resources."] = ""; $a->strings["Item not available."] = ""; @@ -416,13 +518,13 @@ $a->strings["Unable to remove group."] = ""; $a->strings["Click on a contact to add or remove."] = ""; $a->strings["Group Editor"] = ""; $a->strings["Members"] = ""; -$a->strings["All Contacts"] = ""; $a->strings["Invalid profile identifier."] = ""; $a->strings["Profile Visibility Editor"] = ""; +$a->strings["Profile"] = ""; $a->strings["Visible To"] = ""; $a->strings["All Contacts (with secure profile access)"] = ""; -$a->strings["View Contacts"] = ""; $a->strings["No contacts."] = ""; +$a->strings["View Contacts"] = ""; $a->strings["An invitation is required."] = ""; $a->strings["Invitation could not be verified."] = ""; $a->strings["Invalid OpenID url"] = ""; @@ -444,6 +546,7 @@ $a->strings["Failed to send email message. Here is the message that failed."] = $a->strings["Your registration can not be processed."] = ""; $a->strings["Registration request at %s"] = ""; $a->strings["Your registration is pending approval by the site owner."] = ""; +$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = ""; $a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = ""; $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = ""; $a->strings["Your OpenID (optional): "] = ""; @@ -456,34 +559,26 @@ $a->strings["Your Email Address: "] = ""; $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be 'nickname@\$sitename'."] = ""; $a->strings["Choose a nickname: "] = ""; $a->strings["Register"] = ""; +$a->strings["People Search"] = ""; $a->strings["status"] = ""; $a->strings["%1\$s likes %2\$s's %3\$s"] = ""; $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = ""; -$a->strings["This is Friendika version"] = ""; -$a->strings["running at web location"] = ""; -$a->strings["Shared content within the Friendika network is provided under the Creative Commons Attribution 3.0 license"] = ""; -$a->strings["Please visit Project.Friendika.com to learn more about the Friendika project."] = ""; -$a->strings["Bug reports and issues: please visit"] = ""; -$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - dot com"] = ""; -$a->strings["Installed plugins/addons/apps"] = ""; -$a->strings["No installed plugins/addons/apps"] = ""; +$a->strings["Item not found."] = ""; +$a->strings["Access denied."] = ""; $a->strings["Account approved."] = ""; $a->strings["Registration revoked for %s"] = ""; $a->strings["Please login."] = ""; $a->strings["Unable to locate original post."] = ""; $a->strings["Empty post discarded."] = ""; $a->strings["Wall Photos"] = ""; -$a->strings["noreply"] = ""; -$a->strings["Administrator@"] = ""; -$a->strings["%s commented on an item at %s"] = ""; -$a->strings["%s posted to your profile wall at %s"] = ""; $a->strings["System error. Post not saved."] = ""; -$a->strings["This message was sent to you by %s, a member of the Friendika social network."] = ""; +$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = ""; $a->strings["You may visit them online at %s"] = ""; $a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = ""; $a->strings["%s posted an update."] = ""; $a->strings["Image uploaded but image cropping failed."] = ""; $a->strings["Image size reduction [%s] failed."] = ""; +$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = ""; $a->strings["Unable to process image"] = ""; $a->strings["Image exceeds size limit of %d"] = ""; $a->strings["Upload File:"] = ""; @@ -500,11 +595,10 @@ $a->strings["Remove My Account"] = ""; $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = ""; $a->strings["Please enter your password for verification:"] = ""; $a->strings["No recipient selected."] = ""; -$a->strings["[no subject]"] = ""; $a->strings["Unable to locate contact information."] = ""; -$a->strings["Message sent."] = ""; $a->strings["Message could not be sent."] = ""; -$a->strings["Messages"] = ""; +$a->strings["Message collection failure."] = ""; +$a->strings["Message sent."] = ""; $a->strings["Inbox"] = ""; $a->strings["Outbox"] = ""; $a->strings["New Message"] = ""; @@ -521,13 +615,14 @@ $a->strings["D, d M Y - g:i A"] = ""; $a->strings["Message not available."] = ""; $a->strings["Delete message"] = ""; $a->strings["Send Reply"] = ""; +$a->strings["Friends of %s"] = ""; +$a->strings["No friends to display."] = ""; $a->strings["Site"] = ""; $a->strings["Users"] = ""; $a->strings["Plugins"] = ""; -$a->strings["Update"] = ""; +$a->strings["Themes"] = ""; $a->strings["Logs"] = ""; $a->strings["User registrations waiting for confirmation"] = ""; -$a->strings["Item not found."] = ""; $a->strings["Administration"] = ""; $a->strings["Summary"] = ""; $a->strings["Registered users"] = ""; @@ -548,6 +643,8 @@ $a->strings["System theme"] = ""; $a->strings["Maximum image size"] = ""; $a->strings["Register policy"] = ""; $a->strings["Register text"] = ""; +$a->strings["Accounts abandoned after x days"] = ""; +$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = ""; $a->strings["Allowed friend domains"] = ""; $a->strings["Allowed email domains"] = ""; $a->strings["Block public"] = ""; @@ -560,7 +657,8 @@ $a->strings["Fullname check"] = ""; $a->strings["UTF-8 Regular expressions"] = ""; $a->strings["Show Community Page"] = ""; $a->strings["Enable OStatus support"] = ""; -$a->strings["Only allow Friendika contacts"] = ""; +$a->strings["Enable Diaspora support"] = ""; +$a->strings["Only allow Friendica contacts"] = ""; $a->strings["Verify SSL"] = ""; $a->strings["Proxy user"] = ""; $a->strings["Proxy URL"] = ""; @@ -582,8 +680,6 @@ $a->strings["Request date"] = ""; $a->strings["Email"] = ""; $a->strings["No registrations."] = ""; $a->strings["Deny"] = ""; -$a->strings["Block"] = ""; -$a->strings["Unblock"] = ""; $a->strings["Register date"] = ""; $a->strings["Last login"] = ""; $a->strings["Last item"] = ""; @@ -596,23 +692,33 @@ $a->strings["Disable"] = ""; $a->strings["Enable"] = ""; $a->strings["Toggle"] = ""; $a->strings["Settings"] = ""; +$a->strings["No themes found."] = ""; $a->strings["Log settings updated."] = ""; $a->strings["Clear"] = ""; $a->strings["Debugging"] = ""; $a->strings["Log file"] = ""; -$a->strings["Must be writable by web server. Relative to your Friendika index.php."] = ""; +$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = ""; $a->strings["Log level"] = ""; $a->strings["Close"] = ""; $a->strings["FTP Host"] = ""; $a->strings["FTP Path"] = ""; $a->strings["FTP User"] = ""; $a->strings["FTP Password"] = ""; +$a->strings["Requested profile is not available."] = ""; $a->strings["Access to this profile has been restricted."] = ""; $a->strings["Tips for New Members"] = ""; +$a->strings["{0} wants to be your friend"] = ""; +$a->strings["{0} sent you a message"] = ""; +$a->strings["{0} requested registration"] = ""; +$a->strings["{0} commented %s's post"] = ""; +$a->strings["{0} liked %s's post"] = ""; +$a->strings["{0} disliked %s's post"] = ""; +$a->strings["{0} is now friends with %s"] = ""; +$a->strings["{0} posted"] = ""; +$a->strings["{0} tagged %s's post with #%s"] = ""; +$a->strings["{0} mentioned you in a post"] = ""; $a->strings["Login failed."] = ""; -$a->strings["Welcome "] = ""; -$a->strings["Please upload a profile photo."] = ""; -$a->strings["Welcome back "] = ""; +$a->strings["Connect URL missing."] = ""; $a->strings["This site is not configured to allow communications with other networks."] = ""; $a->strings["No compatible communication protocols or feeds were discovered."] = ""; $a->strings["The profile address specified does not provide adequate information."] = ""; @@ -622,11 +728,12 @@ $a->strings["The profile address specified belongs to a network which has been d $a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = ""; $a->strings["Unable to retrieve contact information."] = ""; $a->strings["following"] = ""; +$a->strings["Common Friends"] = ""; +$a->strings["No friends in common."] = ""; $a->strings["Item has been removed."] = ""; -$a->strings["New mail received at "] = ""; $a->strings["Applications"] = ""; $a->strings["No installed applications."] = ""; -$a->strings["Search"] = ""; +$a->strings["Search This Site"] = ""; $a->strings["Profile not found."] = ""; $a->strings["Profile Name is required."] = ""; $a->strings["Profile updated."] = ""; @@ -674,15 +781,28 @@ $a->strings["Work/employment"] = ""; $a->strings["School/education"] = ""; $a->strings["This is your public profile.
It may be visible to anybody using the internet."] = ""; $a->strings["Age: "] = ""; -$a->strings["Profiles"] = ""; +$a->strings["Edit/Manage Profiles"] = ""; $a->strings["Change profile photo"] = ""; $a->strings["Create New Profile"] = ""; $a->strings["Profile Image"] = ""; $a->strings["visible to everybody"] = ""; $a->strings["Edit visibility"] = ""; +$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = ""; +$a->strings["No potential page delegates located."] = ""; +$a->strings["Delegate Page Management"] = ""; +$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = ""; +$a->strings["Existing Page Managers"] = ""; +$a->strings["Existing Page Delegates"] = ""; +$a->strings["Potential Delegates"] = ""; +$a->strings["Add"] = ""; +$a->strings["No entries."] = ""; +$a->strings["Friend Suggestions"] = ""; +$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = ""; +$a->strings["Ignore/Hide"] = ""; $a->strings["Global Directory"] = ""; $a->strings["Normal site view"] = ""; -$a->strings["View all site entries"] = ""; +$a->strings["Admin - View all site entries"] = ""; +$a->strings["Find on this site"] = ""; $a->strings["Site Directory"] = ""; $a->strings["Gender: "] = ""; $a->strings["No entries (some entries may be hidden)."] = ""; @@ -712,6 +832,7 @@ $a->strings["No user record found for '%s' "] = ""; $a->strings["Our site encryption key is apparently messed up."] = ""; $a->strings["Empty site URL was provided or URL could not be decrypted by us."] = ""; $a->strings["Contact record was not found for you on our site."] = ""; +$a->strings["Site public key not available in contact record for URL %s."] = ""; $a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = ""; $a->strings["Unable to set your contact credentials on our system."] = ""; $a->strings["Unable to update your contact profile details on our system"] = ""; @@ -722,21 +843,60 @@ $a->strings["Facebook API key is missing."] = ""; $a->strings["Facebook Connect"] = ""; $a->strings["Install Facebook connector for this account."] = ""; $a->strings["Remove Facebook connector"] = ""; +$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = ""; $a->strings["Post to Facebook by default"] = ""; -$a->strings["Link all your Facebook friends and conversations"] = ""; -$a->strings["Warning: Your Facebook privacy settings can not be imported."] = ""; -$a->strings["Linked Facebook items may be publicly visible, depending on your privacy settings for this website/account."] = ""; +$a->strings["Link all your Facebook friends and conversations on this website"] = ""; +$a->strings["Facebook conversations consist of your profile wall and your friend stream."] = ""; +$a->strings["On this website, your Facebook friend stream is only visible to you."] = ""; +$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = ""; +$a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = ""; +$a->strings["Do not import your Facebook profile wall conversations"] = ""; +$a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = ""; +$a->strings["Comma separated applications to ignore"] = ""; $a->strings["Facebook"] = ""; $a->strings["Facebook Connector Settings"] = ""; $a->strings["Post to Facebook"] = ""; $a->strings["Post to Facebook cancelled because of multi-network access permission conflict."] = ""; $a->strings["Image: "] = ""; -$a->strings["View on Friendika"] = ""; +$a->strings["View on Friendica"] = ""; $a->strings["Facebook post failed. Queued for retry."] = ""; +$a->strings["link"] = ""; +$a->strings["%d person likes this"] = array( + 0 => "", + 1 => "", +); +$a->strings["%d person doesn't like this"] = array( + 0 => "", + 1 => "", +); $a->strings["Generate new key"] = ""; $a->strings["Widgets key"] = ""; $a->strings["Widgets available"] = ""; -$a->strings["Connect on Friendika!"] = ""; +$a->strings["Connect on Friendica!"] = ""; +$a->strings["YourLS Settings"] = ""; +$a->strings["URL: http://"] = ""; +$a->strings["Username:"] = ""; +$a->strings["Password:"] = ""; +$a->strings["Use SSL "] = ""; +$a->strings["yourls Settings saved."] = ""; +$a->strings["\"Not Safe For Work\" Settings"] = ""; +$a->strings["Enable NSFW filter"] = ""; +$a->strings["Comma separated words to treat as NSFW"] = ""; +$a->strings["Use /expression/ to provide regular expressions"] = ""; +$a->strings["NSFW Settings saved."] = ""; +$a->strings["%s - Click to open/close"] = ""; +$a->strings["Login"] = ""; +$a->strings["OpenID"] = ""; +$a->strings["Last users"] = ""; +$a->strings["Most active users"] = ""; +$a->strings["Last photos"] = ""; +$a->strings["Last likes"] = ""; +$a->strings["event"] = ""; +$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See RemoteStorage WebFinger"] = ""; +$a->strings["Template URL (with {category})"] = ""; +$a->strings["OAuth end-point"] = ""; +$a->strings["Api"] = ""; +$a->strings["Member since:"] = ""; $a->strings["Three Dimensional Tic-Tac-Toe"] = ""; $a->strings["3D Tic-Tac-Toe"] = ""; $a->strings["New game"] = ""; @@ -751,6 +911,19 @@ $a->strings["\"Cat\" game!"] = ""; $a->strings["I won!"] = ""; $a->strings["Randplace Settings"] = ""; $a->strings["Enable Randplace Plugin"] = ""; +$a->strings["Post to Drupal"] = ""; +$a->strings["Drupal Post Settings"] = ""; +$a->strings["Enable Drupal Post Plugin"] = ""; +$a->strings["Drupal username"] = ""; +$a->strings["Drupal password"] = ""; +$a->strings["Post Type - article,page,or blog"] = ""; +$a->strings["Drupal site URL"] = ""; +$a->strings["Drupal site uses clean URLS"] = ""; +$a->strings["Post to Drupal by default"] = ""; +$a->strings["Post from Friendica"] = ""; +$a->strings["Geonames settings updated."] = ""; +$a->strings["Geonames Settings"] = ""; +$a->strings["Enable Geonames Plugin"] = ""; $a->strings["Upload a file"] = ""; $a->strings["Drop files here to upload"] = ""; $a->strings["Failed"] = ""; @@ -758,6 +931,9 @@ $a->strings["No files were uploaded."] = ""; $a->strings["Uploaded file is empty"] = ""; $a->strings["File has an invalid extension, it should be one of "] = ""; $a->strings["Upload was cancelled, or server error encountered"] = ""; +$a->strings["OEmbed settings updated"] = ""; +$a->strings["Use OEmbed for YouTube videos"] = ""; +$a->strings["URL to embed:"] = ""; $a->strings["Impressum"] = ""; $a->strings["Site Owner"] = ""; $a->strings["Email Address"] = ""; @@ -765,9 +941,30 @@ $a->strings["Postal Address"] = ""; $a->strings["The impressum addon needs to be configured!
Please add at least the owner variable to your config file. For other variables please refer to the README file of the addon."] = ""; $a->strings["Site Owners Profile"] = ""; $a->strings["Notes"] = ""; -$a->strings["OEmbed settings updated"] = ""; -$a->strings["Use OEmbed for YouTube videos"] = ""; -$a->strings["URL to embed:"] = ""; +$a->strings["Report Bug"] = ""; +$a->strings["\"Blockem\" Settings"] = ""; +$a->strings["Comma separated profile URLS to block"] = ""; +$a->strings["BLOCKEM Settings saved."] = ""; +$a->strings["Blocked %s - Click to open/close"] = ""; +$a->strings["Unblock Author"] = ""; +$a->strings["Block Author"] = ""; +$a->strings["blockem settings updated"] = ""; +$a->strings[":-)"] = ""; +$a->strings[":-("] = ""; +$a->strings["lol"] = ""; +$a->strings["Quick Comment Settings"] = ""; +$a->strings["Enter quick comments, one per line"] = ""; +$a->strings["Quick Comment settings saved."] = ""; +$a->strings["Tile Server URL"] = ""; +$a->strings["A list of public tile servers"] = ""; +$a->strings["Default zoom"] = ""; +$a->strings["The default zoom level. (1:world, 18:highest)"] = ""; +$a->strings["Editplain settings updated."] = ""; +$a->strings["Editplain Settings"] = ""; +$a->strings["Disable richtext status editor"] = ""; +$a->strings["\"pageheader\" Settings"] = ""; +$a->strings["pageheader Settings saved."] = ""; +$a->strings["View Source"] = ""; $a->strings["Post to StatusNet"] = ""; $a->strings["Please contact your site administrator.
The provided API URL is not valid."] = ""; $a->strings["We could not contact the StatusNet API with the Path you entered."] = ""; @@ -776,7 +973,7 @@ $a->strings["StatusNet Posting Settings"] = ""; $a->strings["Globally Available StatusNet OAuthKeys"] = ""; $a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = ""; $a->strings["Provide your own OAuth Credentials"] = ""; -$a->strings["No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation."] = ""; +$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = ""; $a->strings["OAuth Consumer Key"] = ""; $a->strings["OAuth Consumer Secret"] = ""; $a->strings["Base API Path (remember the trailing /)"] = ""; @@ -788,34 +985,66 @@ $a->strings["Current StatusNet API is"] = ""; $a->strings["Cancel StatusNet Connection"] = ""; $a->strings["Currently connected to: "] = ""; $a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = ""; +$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; $a->strings["Allow posting to StatusNet"] = ""; $a->strings["Send public postings to StatusNet by default"] = ""; $a->strings["Clear OAuth configuration"] = ""; $a->strings["API URL"] = ""; -$a->strings["Consumer Secret"] = ""; -$a->strings["Consumer Key"] = ""; +$a->strings["Post to Tumblr"] = ""; +$a->strings["Tumblr Post Settings"] = ""; +$a->strings["Enable Tumblr Post Plugin"] = ""; +$a->strings["Tumblr login"] = ""; +$a->strings["Tumblr password"] = ""; +$a->strings["Post to Tumblr by default"] = ""; +$a->strings["Numfriends settings updated."] = ""; +$a->strings["Numfriends Settings"] = ""; +$a->strings["How many contacts to display on profile sidebar"] = ""; +$a->strings["Post to Wordpress"] = ""; +$a->strings["WordPress Post Settings"] = ""; +$a->strings["Enable WordPress Post Plugin"] = ""; +$a->strings["WordPress username"] = ""; +$a->strings["WordPress password"] = ""; +$a->strings["WordPress API URL"] = ""; +$a->strings["Post to WordPress by default"] = ""; +$a->strings["\"Show more\" Settings"] = ""; +$a->strings["Enable Show More"] = ""; +$a->strings["Cutting posts after how much characters"] = ""; +$a->strings["Show More Settings saved."] = ""; +$a->strings["Show More"] = ""; +$a->strings["This website is tracked using the Piwik analytics tool."] = ""; +$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = ""; $a->strings["Piwik Base URL"] = ""; +$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = ""; $a->strings["Site ID"] = ""; $a->strings["Show opt-out cookie link?"] = ""; +$a->strings["Asynchronous tracking"] = ""; $a->strings["Post to Twitter"] = ""; $a->strings["Twitter settings updated."] = ""; $a->strings["Twitter Posting Settings"] = ""; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = ""; -$a->strings["At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = ""; +$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = ""; $a->strings["Log in with Twitter"] = ""; $a->strings["Copy the PIN from Twitter here"] = ""; $a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = ""; +$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = ""; $a->strings["Allow posting to Twitter"] = ""; $a->strings["Send public postings to Twitter by default"] = ""; $a->strings["Consumer key"] = ""; $a->strings["Consumer secret"] = ""; +$a->strings["Post to Posterous"] = ""; +$a->strings["Posterous Post Settings"] = ""; +$a->strings["Enable Posterous Post Plugin"] = ""; +$a->strings["Posterous login"] = ""; +$a->strings["Posterous password"] = ""; +$a->strings["Post to Posterous by default"] = ""; $a->strings["Gender:"] = ""; -$a->strings["Birthday:"] = ""; $a->strings["j F, Y"] = ""; $a->strings["j F"] = ""; +$a->strings["Birthday:"] = ""; $a->strings["Age:"] = ""; -$a->strings["♥ Status:"] = ""; +$a->strings["Status:"] = ""; $a->strings["Homepage:"] = ""; +$a->strings["Tags:"] = ""; $a->strings["Religion:"] = ""; $a->strings["About:"] = ""; $a->strings["Hobbies/Interests:"] = ""; @@ -839,6 +1068,12 @@ $a->strings["Twice daily"] = ""; $a->strings["Daily"] = ""; $a->strings["Weekly"] = ""; $a->strings["Monthly"] = ""; +$a->strings["OStatus"] = ""; +$a->strings["RSS/Atom"] = ""; +$a->strings["Zot!"] = ""; +$a->strings["LinkedIn"] = ""; +$a->strings["XMPP/IM"] = ""; +$a->strings["MySpace"] = ""; $a->strings["Male"] = ""; $a->strings["Female"] = ""; $a->strings["Currently Male"] = ""; @@ -892,9 +1127,10 @@ $a->strings["Uncertain"] = ""; $a->strings["Complicated"] = ""; $a->strings["Don't care"] = ""; $a->strings["Ask me"] = ""; -$a->strings["l F d, Y \\@ g:i A"] = ""; $a->strings["Starts:"] = ""; $a->strings["Finishes:"] = ""; +$a->strings["(no subject)"] = ""; +$a->strings["noreply"] = ""; $a->strings["prev"] = ""; $a->strings["first"] = ""; $a->strings["last"] = ""; @@ -904,6 +1140,7 @@ $a->strings["%d Contact"] = array( 0 => "", 1 => "", ); +$a->strings["Search"] = ""; $a->strings["Monday"] = ""; $a->strings["Tuesday"] = ""; $a->strings["Wednesday"] = ""; @@ -925,15 +1162,29 @@ $a->strings["November"] = ""; $a->strings["December"] = ""; $a->strings["bytes"] = ""; $a->strings["Select an alternate language"] = ""; +$a->strings["default"] = ""; $a->strings["Sharing notification from Diaspora network"] = ""; +$a->strings["Attachments:"] = ""; +$a->strings["[Relayed] Comment authored by %s from network %s"] = ""; +$a->strings["Embedded content"] = ""; $a->strings["Embedding disabled"] = ""; -$a->strings["Create a new group"] = ""; +$a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = ""; $a->strings["Everybody"] = ""; +$a->strings["edit"] = ""; +$a->strings["Groups"] = ""; +$a->strings["Edit group"] = ""; +$a->strings["Create a new group"] = ""; $a->strings["Logout"] = ""; $a->strings["End this session"] = ""; -$a->strings["Login"] = ""; +$a->strings["Status"] = ""; +$a->strings["Your posts and conversations"] = ""; +$a->strings["Your profile page"] = ""; +$a->strings["Photos"] = ""; +$a->strings["Your photos"] = ""; +$a->strings["Your events"] = ""; +$a->strings["Personal notes"] = ""; +$a->strings["Your personal photos"] = ""; $a->strings["Sign in"] = ""; -$a->strings["Home"] = ""; $a->strings["Home Page"] = ""; $a->strings["Create an account"] = ""; $a->strings["Help and documentation"] = ""; @@ -943,18 +1194,34 @@ $a->strings["Search site content"] = ""; $a->strings["Conversations on this site"] = ""; $a->strings["Directory"] = ""; $a->strings["People directory"] = ""; -$a->strings["Network"] = ""; $a->strings["Conversations from your friends"] = ""; -$a->strings["Your posts and conversations"] = ""; -$a->strings["Notifications"] = ""; -$a->strings["Friend requests"] = ""; +$a->strings["Friend Requests"] = ""; +$a->strings["See all notifications"] = ""; +$a->strings["Mark all system notifications seen"] = ""; $a->strings["Private mail"] = ""; $a->strings["Manage"] = ""; $a->strings["Manage other pages"] = ""; +$a->strings["Profiles"] = ""; $a->strings["Manage/edit profiles"] = ""; $a->strings["Manage/edit friends and contacts"] = ""; $a->strings["Admin"] = ""; $a->strings["Site setup and configuration"] = ""; +$a->strings["Nothing new here"] = ""; +$a->strings["Add New Contact"] = ""; +$a->strings["Enter address or web location"] = ""; +$a->strings["Example: bob@example.com, http://example.com/barbara"] = ""; +$a->strings["Invite Friends"] = ""; +$a->strings["%d invitation available"] = array( + 0 => "", + 1 => "", +); +$a->strings["Find People"] = ""; +$a->strings["Enter name or interest"] = ""; +$a->strings["Connect/Follow"] = ""; +$a->strings["Examples: Robert Morgenstein, Fishing"] = ""; +$a->strings["Similar Interests"] = ""; +$a->strings["Networks"] = ""; +$a->strings["All Networks"] = ""; $a->strings["Logged out."] = ""; $a->strings["Miscellaneous"] = ""; $a->strings["year"] = ""; @@ -973,32 +1240,86 @@ $a->strings["minute"] = ""; $a->strings["minutes"] = ""; $a->strings["second"] = ""; $a->strings["seconds"] = ""; -$a->strings[" ago"] = ""; +$a->strings["%1\$d %2\$s ago"] = ""; $a->strings["From: "] = ""; +$a->strings["$1 wrote:"] = ""; $a->strings["Image/photo"] = ""; $a->strings["Cannot locate DNS info for database server '%s'"] = ""; +$a->strings["[no subject]"] = ""; $a->strings["Visible to everybody"] = ""; $a->strings["show"] = ""; $a->strings["don't show"] = ""; -$a->strings["(no subject)"] = ""; +$a->strings["Friendica Notification"] = ""; +$a->strings["Thank You,"] = ""; +$a->strings["%s Administrator"] = ""; +$a->strings["New mail received at %s"] = ""; +$a->strings["%s sent you a new private message at %s."] = ""; +$a->strings["%s sent you %s."] = ""; +$a->strings["a private message"] = ""; +$a->strings["Please visit %s to view and/or reply to your private messages."] = ""; +$a->strings["%s commented on an item at %s"] = ""; +$a->strings["%s commented on an item/conversation you have been following."] = ""; +$a->strings["%s commented in %s."] = ""; +$a->strings["a watched conversation"] = ""; +$a->strings["Please visit %s to view and/or reply to the conversation."] = ""; +$a->strings["%s posted to your profile wall at %s"] = ""; +$a->strings["%s posted to %s"] = ""; +$a->strings["your profile wall."] = ""; +$a->strings["%s tagged you at %s"] = ""; +$a->strings["%s %s."] = ""; +$a->strings["tagged you"] = ""; +$a->strings["%s tagged your post at %s"] = ""; +$a->strings["%s tagged %s"] = ""; +$a->strings["your post"] = ""; +$a->strings["Introduction received at %s"] = ""; +$a->strings["You've received an introduction from '%s' at %s"] = ""; +$a->strings["You've received %s from %s."] = ""; +$a->strings["an introduction"] = ""; +$a->strings["You may visit their profile at %s"] = ""; +$a->strings["Please visit %s to approve or reject the introduction."] = ""; +$a->strings["Friend suggestion received at %s"] = ""; +$a->strings["You've received a friend suggestion from '%s' at %s"] = ""; +$a->strings["You've received %s for %s from %s."] = ""; +$a->strings["a friend suggestion"] = ""; +$a->strings["Name:"] = ""; +$a->strings["Photo:"] = ""; +$a->strings["Please visit %s to approve or reject the suggestion."] = ""; +$a->strings["A new person is sharing with you at "] = ""; $a->strings["You have a new follower at "] = ""; -$a->strings["event"] = ""; -$a->strings["View %s's profile"] = ""; -$a->strings["%s from %s"] = ""; -$a->strings["View in context"] = ""; -$a->strings["See more posts like this"] = ""; -$a->strings["See all %d comments"] = ""; -$a->strings["Select"] = ""; -$a->strings["toggle star status"] = ""; -$a->strings["to"] = ""; -$a->strings["Wall-to-Wall"] = ""; -$a->strings["via Wall-To-Wall:"] = ""; -$a->strings["Delete Selected Items"] = ""; +$a->strings["view full size"] = ""; +$a->strings["image/photo"] = ""; +$a->strings["Welcome "] = ""; +$a->strings["Please upload a profile photo."] = ""; +$a->strings["Welcome back "] = ""; $a->strings["View status"] = ""; $a->strings["View profile"] = ""; $a->strings["View photos"] = ""; $a->strings["View recent"] = ""; $a->strings["Send PM"] = ""; +$a->strings["post/item"] = ""; +$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = ""; +$a->strings["Select"] = ""; +$a->strings["View %s's profile @ %s"] = ""; +$a->strings["%s from %s"] = ""; +$a->strings["View in context"] = ""; +$a->strings["%d comment"] = array( + 0 => "", + 1 => "", +); +$a->strings["show more"] = ""; +$a->strings["like"] = ""; +$a->strings["dislike"] = ""; +$a->strings["Share this"] = ""; +$a->strings["share"] = ""; +$a->strings["add star"] = ""; +$a->strings["remove star"] = ""; +$a->strings["toggle star status"] = ""; +$a->strings["starred"] = ""; +$a->strings["add tag"] = ""; +$a->strings["to"] = ""; +$a->strings["Wall-to-Wall"] = ""; +$a->strings["via Wall-To-Wall:"] = ""; +$a->strings["Delete Selected Items"] = ""; $a->strings["%s likes this."] = ""; $a->strings["%s doesn't like this."] = ""; $a->strings["%2\$d people like this."] = ""; @@ -1008,26 +1329,34 @@ $a->strings[", and %d other people"] = ""; $a->strings["%s like this."] = ""; $a->strings["%s don't like this."] = ""; $a->strings["Visible to everybody"] = ""; -$a->strings["Please enter a YouTube link:"] = ""; -$a->strings["Please enter a video(.ogg) link/URL:"] = ""; -$a->strings["Please enter an audio(.ogg) link/URL:"] = ""; +$a->strings["Please enter a video link/URL:"] = ""; +$a->strings["Please enter an audio link/URL:"] = ""; +$a->strings["Tag term:"] = ""; $a->strings["Where are you right now?"] = ""; $a->strings["Enter a title for this item"] = ""; -$a->strings["Set title"] = ""; +$a->strings["upload photo"] = ""; +$a->strings["attach file"] = ""; +$a->strings["web link"] = ""; +$a->strings["Insert video link"] = ""; +$a->strings["video link"] = ""; +$a->strings["Insert audio link"] = ""; +$a->strings["audio link"] = ""; +$a->strings["set location"] = ""; +$a->strings["clear location"] = ""; +$a->strings["permissions"] = ""; $a->strings["Delete this item?"] = ""; +$a->strings["show fewer"] = ""; $a->strings["Create a New Account"] = ""; $a->strings["Nickname or Email address: "] = ""; $a->strings["Password: "] = ""; -$a->strings["Nickname/Email/OpenID: "] = ""; -$a->strings["Password (if not OpenID): "] = ""; +$a->strings["Or login using OpenID: "] = ""; $a->strings["Forgot your password?"] = ""; -$a->strings["Connect"] = ""; -$a->strings[", "] = ""; -$a->strings["Status:"] = ""; +$a->strings["Edit profile"] = ""; $a->strings["g A l F d"] = ""; +$a->strings["F d"] = ""; $a->strings["Birthday Reminders"] = ""; $a->strings["Birthdays this week:"] = ""; -$a->strings["(Adjusted for local time)"] = ""; $a->strings["[today]"] = ""; -$a->strings["Not Found"] = ""; -$a->strings["Page not found."] = ""; +$a->strings["Event Reminders"] = ""; +$a->strings["Events this week:"] = ""; +$a->strings["[No description]"] = "";