From bb197eee2d4aaa815f7ef7f57079053fbee5969f Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 13 Aug 2015 11:58:41 +0200 Subject: [PATCH 1/3] base messages.po updated --- util/messages.po | 1485 ++++++++++++++++++++++++---------------------- 1 file changed, 761 insertions(+), 724 deletions(-) diff --git a/util/messages.po b/util/messages.po index b281d33f6c..9d0f1ae51a 100644 --- a/util/messages.po +++ b/util/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 3.4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-02 13:56+0200\n" +"POT-Creation-Date: 2015-08-13 09:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,11 +47,11 @@ msgstr "" #: mod/follow.php:42 mod/follow.php:81 mod/item.php:170 mod/item.php:186 #: mod/group.php:19 mod/dfrn_confirm.php:55 mod/fsuggest.php:78 #: mod/wall_upload.php:66 mod/viewcontacts.php:24 mod/notifications.php:66 -#: mod/message.php:38 mod/message.php:174 mod/crepair.php:120 +#: mod/message.php:39 mod/message.php:175 mod/crepair.php:120 #: mod/nogroup.php:25 mod/network.php:4 mod/allfriends.php:9 #: mod/events.php:164 mod/wallmessage.php:9 mod/wallmessage.php:33 #: mod/wallmessage.php:79 mod/wallmessage.php:103 mod/wall_attach.php:55 -#: mod/settings.php:20 mod/settings.php:107 mod/settings.php:609 +#: mod/settings.php:20 mod/settings.php:116 mod/settings.php:618 #: mod/register.php:42 mod/delegate.php:12 mod/mood.php:114 mod/suggest.php:58 #: mod/profiles.php:165 mod/profiles.php:615 mod/editpost.php:10 #: mod/api.php:26 mod/api.php:31 mod/notes.php:20 mod/poke.php:135 @@ -85,24 +85,24 @@ msgstr "" msgid "Contact has been unarchived" msgstr "" -#: mod/contacts.php:411 mod/contacts.php:756 +#: mod/contacts.php:411 mod/contacts.php:767 msgid "Do you really want to delete this contact?" msgstr "" -#: mod/contacts.php:413 mod/follow.php:57 mod/message.php:209 -#: mod/settings.php:1045 mod/settings.php:1051 mod/settings.php:1059 -#: mod/settings.php:1063 mod/settings.php:1068 mod/settings.php:1074 -#: mod/settings.php:1080 mod/settings.php:1086 mod/settings.php:1114 -#: mod/settings.php:1115 mod/settings.php:1116 mod/settings.php:1117 -#: mod/settings.php:1118 mod/dfrn_request.php:845 mod/register.php:235 +#: mod/contacts.php:413 mod/follow.php:57 mod/message.php:210 +#: mod/settings.php:1054 mod/settings.php:1060 mod/settings.php:1068 +#: mod/settings.php:1072 mod/settings.php:1077 mod/settings.php:1083 +#: mod/settings.php:1089 mod/settings.php:1095 mod/settings.php:1123 +#: mod/settings.php:1124 mod/settings.php:1125 mod/settings.php:1126 +#: mod/settings.php:1127 mod/dfrn_request.php:845 mod/register.php:235 #: mod/suggest.php:29 mod/profiles.php:658 mod/profiles.php:661 #: mod/api.php:105 include/items.php:4854 msgid "Yes" msgstr "" #: mod/contacts.php:416 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:68 -#: mod/videos.php:121 mod/message.php:212 mod/fbrowser.php:89 -#: mod/fbrowser.php:125 mod/settings.php:623 mod/settings.php:649 +#: mod/videos.php:121 mod/message.php:213 mod/fbrowser.php:89 +#: mod/fbrowser.php:125 mod/settings.php:632 mod/settings.php:658 #: mod/dfrn_request.php:859 mod/suggest.php:32 mod/editpost.php:148 #: mod/photos.php:225 mod/photos.php:314 include/conversation.php:1093 #: include/items.php:4857 @@ -132,7 +132,7 @@ msgstr "" msgid "Private communications are not available for this contact." msgstr "" -#: mod/contacts.php:498 mod/admin.php:585 +#: mod/contacts.php:498 mod/admin.php:613 msgid "Never" msgstr "" @@ -164,13 +164,13 @@ msgstr[1] "" msgid "View all contacts" msgstr "" -#: mod/contacts.php:521 mod/contacts.php:590 mod/contacts.php:759 -#: mod/admin.php:1047 +#: mod/contacts.php:521 mod/contacts.php:594 mod/contacts.php:770 +#: mod/admin.php:1075 msgid "Unblock" msgstr "" -#: mod/contacts.php:521 mod/contacts.php:590 mod/contacts.php:759 -#: mod/admin.php:1046 +#: mod/contacts.php:521 mod/contacts.php:594 mod/contacts.php:770 +#: mod/admin.php:1074 msgid "Block" msgstr "" @@ -178,66 +178,66 @@ msgstr "" msgid "Toggle Blocked status" msgstr "" -#: mod/contacts.php:527 mod/contacts.php:591 mod/contacts.php:760 +#: mod/contacts.php:528 mod/contacts.php:595 mod/contacts.php:771 msgid "Unignore" msgstr "" -#: mod/contacts.php:527 mod/contacts.php:591 mod/contacts.php:760 -#: mod/notifications.php:51 mod/notifications.php:164 -#: mod/notifications.php:214 +#: mod/contacts.php:528 mod/contacts.php:595 mod/contacts.php:771 +#: mod/notifications.php:51 mod/notifications.php:174 +#: mod/notifications.php:233 msgid "Ignore" msgstr "" -#: mod/contacts.php:530 +#: mod/contacts.php:531 msgid "Toggle Ignored status" msgstr "" -#: mod/contacts.php:534 mod/contacts.php:761 +#: mod/contacts.php:536 mod/contacts.php:772 msgid "Unarchive" msgstr "" -#: mod/contacts.php:534 mod/contacts.php:761 +#: mod/contacts.php:536 mod/contacts.php:772 msgid "Archive" msgstr "" -#: mod/contacts.php:537 +#: mod/contacts.php:539 msgid "Toggle Archive status" msgstr "" -#: mod/contacts.php:540 +#: mod/contacts.php:543 msgid "Repair" msgstr "" -#: mod/contacts.php:543 +#: mod/contacts.php:546 msgid "Advanced Contact Settings" msgstr "" -#: mod/contacts.php:549 +#: mod/contacts.php:553 msgid "Communications lost with this contact!" msgstr "" -#: mod/contacts.php:552 +#: mod/contacts.php:556 msgid "Fetch further information for feeds" msgstr "" -#: mod/contacts.php:553 mod/admin.php:594 +#: mod/contacts.php:557 mod/admin.php:622 msgid "Disabled" msgstr "" -#: mod/contacts.php:553 +#: mod/contacts.php:557 msgid "Fetch information" msgstr "" -#: mod/contacts.php:553 +#: mod/contacts.php:557 msgid "Fetch information and keywords" msgstr "" -#: mod/contacts.php:562 +#: mod/contacts.php:566 msgid "Contact Editor" msgstr "" -#: mod/contacts.php:564 mod/manage.php:110 mod/fsuggest.php:107 -#: mod/message.php:335 mod/message.php:564 mod/crepair.php:191 +#: mod/contacts.php:568 mod/manage.php:110 mod/fsuggest.php:107 +#: mod/message.php:336 mod/message.php:565 mod/crepair.php:191 #: mod/events.php:511 mod/content.php:712 mod/install.php:250 #: mod/install.php:288 mod/mood.php:137 mod/profiles.php:683 #: mod/localtime.php:45 mod/poke.php:199 mod/invite.php:140 @@ -250,201 +250,201 @@ msgstr "" msgid "Submit" msgstr "" -#: mod/contacts.php:565 +#: mod/contacts.php:569 msgid "Profile Visibility" msgstr "" -#: mod/contacts.php:566 +#: mod/contacts.php:570 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: mod/contacts.php:567 +#: mod/contacts.php:571 msgid "Contact Information / Notes" msgstr "" -#: mod/contacts.php:568 +#: mod/contacts.php:572 msgid "Edit contact notes" msgstr "" -#: mod/contacts.php:573 mod/contacts.php:799 mod/viewcontacts.php:64 +#: mod/contacts.php:577 mod/contacts.php:810 mod/viewcontacts.php:64 #: mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: mod/contacts.php:574 +#: mod/contacts.php:578 msgid "Block/Unblock contact" msgstr "" -#: mod/contacts.php:575 +#: mod/contacts.php:579 msgid "Ignore contact" msgstr "" -#: mod/contacts.php:576 +#: mod/contacts.php:580 msgid "Repair URL settings" msgstr "" -#: mod/contacts.php:577 +#: mod/contacts.php:581 msgid "View conversations" msgstr "" -#: mod/contacts.php:579 +#: mod/contacts.php:583 msgid "Delete contact" msgstr "" -#: mod/contacts.php:583 +#: mod/contacts.php:587 msgid "Last update:" msgstr "" -#: mod/contacts.php:585 +#: mod/contacts.php:589 msgid "Update public posts" msgstr "" -#: mod/contacts.php:587 mod/admin.php:1541 +#: mod/contacts.php:591 mod/admin.php:1569 msgid "Update now" msgstr "" -#: mod/contacts.php:594 +#: mod/contacts.php:598 msgid "Currently blocked" msgstr "" -#: mod/contacts.php:595 +#: mod/contacts.php:599 msgid "Currently ignored" msgstr "" -#: mod/contacts.php:596 +#: mod/contacts.php:600 msgid "Currently archived" msgstr "" -#: mod/contacts.php:597 mod/notifications.php:157 mod/notifications.php:208 +#: mod/contacts.php:601 mod/notifications.php:167 mod/notifications.php:227 msgid "Hide this contact from others" msgstr "" -#: mod/contacts.php:597 +#: mod/contacts.php:601 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: mod/contacts.php:598 +#: mod/contacts.php:602 msgid "Notification for new posts" msgstr "" -#: mod/contacts.php:598 +#: mod/contacts.php:602 msgid "Send a notification of every new post of this contact" msgstr "" -#: mod/contacts.php:601 +#: mod/contacts.php:605 msgid "Blacklisted keywords" msgstr "" -#: mod/contacts.php:601 +#: mod/contacts.php:605 msgid "" "Comma separated list of keywords that should not be converted to hashtags, " "when \"Fetch information and keywords\" is selected" msgstr "" -#: mod/contacts.php:608 +#: mod/contacts.php:612 msgid "Profile URL" msgstr "" -#: mod/contacts.php:654 +#: mod/contacts.php:658 msgid "Suggestions" msgstr "" -#: mod/contacts.php:657 +#: mod/contacts.php:661 msgid "Suggest potential friends" msgstr "" -#: mod/contacts.php:660 mod/group.php:192 +#: mod/contacts.php:665 mod/group.php:192 msgid "All Contacts" msgstr "" -#: mod/contacts.php:663 +#: mod/contacts.php:668 msgid "Show all contacts" msgstr "" -#: mod/contacts.php:666 +#: mod/contacts.php:672 msgid "Unblocked" msgstr "" -#: mod/contacts.php:669 +#: mod/contacts.php:675 msgid "Only show unblocked contacts" msgstr "" -#: mod/contacts.php:673 +#: mod/contacts.php:680 msgid "Blocked" msgstr "" -#: mod/contacts.php:676 +#: mod/contacts.php:683 msgid "Only show blocked contacts" msgstr "" -#: mod/contacts.php:680 +#: mod/contacts.php:688 msgid "Ignored" msgstr "" -#: mod/contacts.php:683 +#: mod/contacts.php:691 msgid "Only show ignored contacts" msgstr "" -#: mod/contacts.php:687 +#: mod/contacts.php:696 msgid "Archived" msgstr "" -#: mod/contacts.php:690 +#: mod/contacts.php:699 msgid "Only show archived contacts" msgstr "" -#: mod/contacts.php:694 +#: mod/contacts.php:704 msgid "Hidden" msgstr "" -#: mod/contacts.php:697 +#: mod/contacts.php:707 msgid "Only show hidden contacts" msgstr "" -#: mod/contacts.php:747 include/nav.php:178 view/theme/diabook/theme.php:125 +#: mod/contacts.php:758 include/nav.php:178 view/theme/diabook/theme.php:125 msgid "Contacts" msgstr "" -#: mod/contacts.php:751 +#: mod/contacts.php:762 msgid "Search your contacts" msgstr "" -#: mod/contacts.php:752 mod/directory.php:63 +#: mod/contacts.php:763 mod/directory.php:63 msgid "Finding: " msgstr "" -#: mod/contacts.php:753 mod/directory.php:65 include/contact_widgets.php:34 +#: mod/contacts.php:764 mod/directory.php:65 include/contact_widgets.php:34 msgid "Find" msgstr "" -#: mod/contacts.php:758 mod/settings.php:137 mod/settings.php:648 +#: mod/contacts.php:769 mod/settings.php:146 mod/settings.php:657 msgid "Update" msgstr "" -#: mod/contacts.php:762 mod/group.php:171 mod/admin.php:1045 -#: mod/content.php:440 mod/content.php:743 mod/settings.php:685 +#: mod/contacts.php:773 mod/group.php:171 mod/admin.php:1073 +#: mod/content.php:440 mod/content.php:743 mod/settings.php:694 #: mod/photos.php:1673 object/Item.php:131 include/conversation.php:613 msgid "Delete" msgstr "" -#: mod/contacts.php:775 +#: mod/contacts.php:786 msgid "Mutual Friendship" msgstr "" -#: mod/contacts.php:779 +#: mod/contacts.php:790 msgid "is a fan of yours" msgstr "" -#: mod/contacts.php:783 +#: mod/contacts.php:794 msgid "you are a fan of" msgstr "" -#: mod/contacts.php:800 mod/nogroup.php:41 +#: mod/contacts.php:811 mod/nogroup.php:41 msgid "Edit contact" msgstr "" @@ -483,7 +483,7 @@ msgid "Profile Visibility Editor" msgstr "" #: mod/profperm.php:104 mod/newmember.php:32 include/identity.php:529 -#: include/identity.php:610 include/identity.php:639 include/nav.php:77 +#: include/identity.php:610 include/identity.php:640 include/nav.php:77 #: view/theme/diabook/theme.php:124 msgid "Profile" msgstr "" @@ -501,7 +501,7 @@ msgid "All Contacts (with secure profile access)" msgstr "" #: mod/display.php:82 mod/display.php:295 mod/display.php:512 -#: mod/viewsrc.php:15 mod/admin.php:169 mod/admin.php:1090 mod/admin.php:1303 +#: mod/viewsrc.php:15 mod/admin.php:173 mod/admin.php:1118 mod/admin.php:1331 #: mod/notice.php:15 include/items.php:4813 msgid "Item not found." msgstr "" @@ -551,8 +551,8 @@ msgid "" "join." msgstr "" -#: mod/newmember.php:22 mod/admin.php:1142 mod/admin.php:1363 -#: mod/settings.php:90 include/nav.php:173 view/theme/diabook/theme.php:544 +#: mod/newmember.php:22 mod/admin.php:1170 mod/admin.php:1391 +#: mod/settings.php:99 include/nav.php:173 view/theme/diabook/theme.php:544 #: view/theme/diabook/theme.php:648 msgid "Settings" msgstr "" @@ -777,7 +777,7 @@ msgstr "" msgid "Upload" msgstr "" -#: mod/profile_photo.php:248 mod/settings.php:1097 +#: mod/profile_photo.php:248 mod/settings.php:1106 msgid "or" msgstr "" @@ -811,7 +811,7 @@ msgstr "" #: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:149 #: include/conversation.php:126 include/conversation.php:253 -#: include/text.php:2000 include/diaspora.php:2111 +#: include/text.php:2015 include/diaspora.php:2127 #: view/theme/diabook/theme.php:471 msgid "photo" msgstr "" @@ -819,7 +819,7 @@ msgstr "" #: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:149 mod/like.php:319 #: include/conversation.php:121 include/conversation.php:130 #: include/conversation.php:248 include/conversation.php:257 -#: include/diaspora.php:2111 view/theme/diabook/theme.php:466 +#: include/diaspora.php:2127 view/theme/diabook/theme.php:466 #: view/theme/diabook/theme.php:475 msgid "status" msgstr "" @@ -854,7 +854,7 @@ msgstr "" msgid "- select -" msgstr "" -#: mod/filer.php:31 mod/editpost.php:109 mod/notes.php:59 include/text.php:978 +#: mod/filer.php:31 mod/editpost.php:109 mod/notes.php:59 include/text.php:990 msgid "Save" msgstr "" @@ -871,11 +871,11 @@ msgstr "" msgid "Does %s know you?" msgstr "" -#: mod/follow.php:57 mod/settings.php:1045 mod/settings.php:1051 -#: mod/settings.php:1059 mod/settings.php:1063 mod/settings.php:1068 -#: mod/settings.php:1074 mod/settings.php:1080 mod/settings.php:1086 -#: mod/settings.php:1114 mod/settings.php:1115 mod/settings.php:1116 -#: mod/settings.php:1117 mod/settings.php:1118 mod/dfrn_request.php:845 +#: mod/follow.php:57 mod/settings.php:1054 mod/settings.php:1060 +#: mod/settings.php:1068 mod/settings.php:1072 mod/settings.php:1077 +#: mod/settings.php:1083 mod/settings.php:1089 mod/settings.php:1095 +#: mod/settings.php:1123 mod/settings.php:1124 mod/settings.php:1125 +#: mod/settings.php:1126 mod/settings.php:1127 mod/dfrn_request.php:845 #: mod/register.php:236 mod/profiles.php:658 mod/profiles.php:662 #: mod/api.php:106 msgid "No" @@ -1038,7 +1038,7 @@ msgid "Unable to set contact photo." msgstr "" #: mod/dfrn_confirm.php:487 include/conversation.php:172 -#: include/diaspora.php:627 +#: include/diaspora.php:634 #, php-format msgid "%1$s is now friends with %2$s" msgstr "" @@ -1112,7 +1112,7 @@ msgstr "" msgid "Access to this item is restricted." msgstr "" -#: mod/videos.php:373 include/text.php:1429 +#: mod/videos.php:373 include/text.php:1441 msgid "View Video" msgstr "" @@ -1276,7 +1276,7 @@ msgstr "" msgid "Reset" msgstr "" -#: mod/like.php:166 include/conversation.php:137 include/diaspora.php:2127 +#: mod/like.php:166 include/conversation.php:137 include/diaspora.php:2143 #: view/theme/diabook/theme.php:480 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -1303,7 +1303,7 @@ msgstr "" msgid "No contacts." msgstr "" -#: mod/viewcontacts.php:78 include/text.php:899 +#: mod/viewcontacts.php:78 include/text.php:911 msgid "View Contacts" msgstr "" @@ -1311,8 +1311,8 @@ msgstr "" msgid "Invalid request identifier." msgstr "" -#: mod/notifications.php:35 mod/notifications.php:165 -#: mod/notifications.php:215 +#: mod/notifications.php:35 mod/notifications.php:175 +#: mod/notifications.php:234 msgid "Discard" msgstr "" @@ -1320,168 +1320,188 @@ msgstr "" msgid "System" msgstr "" -#: mod/notifications.php:83 include/nav.php:145 +#: mod/notifications.php:84 mod/admin.php:205 include/nav.php:145 msgid "Network" msgstr "" -#: mod/notifications.php:88 mod/network.php:373 +#: mod/notifications.php:90 mod/network.php:375 msgid "Personal" msgstr "" -#: mod/notifications.php:93 include/nav.php:105 include/nav.php:148 +#: mod/notifications.php:96 include/nav.php:105 include/nav.php:148 #: view/theme/diabook/theme.php:123 msgid "Home" msgstr "" -#: mod/notifications.php:98 include/nav.php:153 +#: mod/notifications.php:102 include/nav.php:153 msgid "Introductions" msgstr "" -#: mod/notifications.php:122 +#: mod/notifications.php:127 msgid "Show Ignored Requests" msgstr "" -#: mod/notifications.php:122 +#: mod/notifications.php:127 msgid "Hide Ignored Requests" msgstr "" -#: mod/notifications.php:149 mod/notifications.php:199 +#: mod/notifications.php:159 mod/notifications.php:209 msgid "Notification type: " msgstr "" -#: mod/notifications.php:150 +#: mod/notifications.php:160 msgid "Friend Suggestion" msgstr "" -#: mod/notifications.php:152 +#: mod/notifications.php:162 #, php-format msgid "suggested by %s" msgstr "" -#: mod/notifications.php:158 mod/notifications.php:209 +#: mod/notifications.php:168 mod/notifications.php:228 msgid "Post a new friend activity" msgstr "" -#: mod/notifications.php:158 mod/notifications.php:209 +#: mod/notifications.php:168 mod/notifications.php:228 msgid "if applicable" msgstr "" -#: mod/notifications.php:161 mod/notifications.php:212 mod/admin.php:1043 +#: mod/notifications.php:171 mod/notifications.php:231 mod/admin.php:1071 msgid "Approve" msgstr "" -#: mod/notifications.php:181 +#: mod/notifications.php:191 msgid "Claims to be known to you: " msgstr "" -#: mod/notifications.php:181 +#: mod/notifications.php:191 msgid "yes" msgstr "" -#: mod/notifications.php:181 +#: mod/notifications.php:191 msgid "no" msgstr "" -#: mod/notifications.php:182 +#: mod/notifications.php:192 msgid "" "Shall your connection be bidirectional or not? \"Friend\" implies that you " "allow to read and you subscribe to their posts. \"Fan/Admirer\" means that " "you allow to read but you do not want to read theirs. Approve as: " msgstr "" -#: mod/notifications.php:185 +#: mod/notifications.php:195 msgid "" "Shall your connection be bidirectional or not? \"Friend\" implies that you " "allow to read and you subscribe to their posts. \"Sharer\" means that you " "allow to read but you do not want to read theirs. Approve as: " msgstr "" -#: mod/notifications.php:193 +#: mod/notifications.php:203 msgid "Friend" msgstr "" -#: mod/notifications.php:194 +#: mod/notifications.php:204 msgid "Sharer" msgstr "" -#: mod/notifications.php:194 +#: mod/notifications.php:204 msgid "Fan/Admirer" msgstr "" -#: mod/notifications.php:200 +#: mod/notifications.php:210 msgid "Friend/Connect Request" msgstr "" -#: mod/notifications.php:200 +#: mod/notifications.php:210 msgid "New Follower" msgstr "" -#: mod/notifications.php:221 +#: mod/notifications.php:218 mod/notifications.php:220 mod/events.php:503 +#: mod/directory.php:152 include/identity.php:268 include/bb2diaspora.php:170 +#: include/event.php:42 +msgid "Location:" +msgstr "" + +#: mod/notifications.php:222 mod/directory.php:160 include/identity.php:277 +#: include/identity.php:581 +msgid "About:" +msgstr "" + +#: mod/notifications.php:224 include/identity.php:575 +msgid "Tags:" +msgstr "" + +#: mod/notifications.php:226 mod/directory.php:154 include/identity.php:270 +#: include/identity.php:540 +msgid "Gender:" +msgstr "" + +#: mod/notifications.php:240 msgid "No introductions." msgstr "" -#: mod/notifications.php:224 include/nav.php:156 +#: mod/notifications.php:243 include/nav.php:156 msgid "Notifications" msgstr "" -#: mod/notifications.php:262 mod/notifications.php:391 -#: mod/notifications.php:482 +#: mod/notifications.php:281 mod/notifications.php:410 +#: mod/notifications.php:501 #, php-format msgid "%s liked %s's post" msgstr "" -#: mod/notifications.php:272 mod/notifications.php:401 -#: mod/notifications.php:492 +#: mod/notifications.php:291 mod/notifications.php:420 +#: mod/notifications.php:511 #, php-format msgid "%s disliked %s's post" msgstr "" -#: mod/notifications.php:287 mod/notifications.php:416 -#: mod/notifications.php:507 +#: mod/notifications.php:306 mod/notifications.php:435 +#: mod/notifications.php:526 #, php-format msgid "%s is now friends with %s" msgstr "" -#: mod/notifications.php:294 mod/notifications.php:423 +#: mod/notifications.php:313 mod/notifications.php:442 #, php-format msgid "%s created a new post" msgstr "" -#: mod/notifications.php:295 mod/notifications.php:424 -#: mod/notifications.php:517 +#: mod/notifications.php:314 mod/notifications.php:443 +#: mod/notifications.php:536 #, php-format msgid "%s commented on %s's post" msgstr "" -#: mod/notifications.php:310 +#: mod/notifications.php:329 msgid "No more network notifications." msgstr "" -#: mod/notifications.php:314 +#: mod/notifications.php:333 msgid "Network Notifications" msgstr "" -#: mod/notifications.php:340 mod/notify.php:72 +#: mod/notifications.php:359 mod/notify.php:72 msgid "No more system notifications." msgstr "" -#: mod/notifications.php:344 mod/notify.php:76 +#: mod/notifications.php:363 mod/notify.php:76 msgid "System Notifications" msgstr "" -#: mod/notifications.php:439 +#: mod/notifications.php:458 msgid "No more personal notifications." msgstr "" -#: mod/notifications.php:443 +#: mod/notifications.php:462 msgid "Personal Notifications" msgstr "" -#: mod/notifications.php:524 +#: mod/notifications.php:543 msgid "No more home notifications." msgstr "" -#: mod/notifications.php:528 +#: mod/notifications.php:547 msgid "Home Notifications" msgstr "" @@ -1545,131 +1565,131 @@ msgstr "" msgid "New Message" msgstr "" -#: mod/message.php:63 mod/wallmessage.php:56 +#: mod/message.php:64 mod/wallmessage.php:56 msgid "No recipient selected." msgstr "" -#: mod/message.php:67 +#: mod/message.php:68 msgid "Unable to locate contact information." msgstr "" -#: mod/message.php:70 mod/wallmessage.php:62 +#: mod/message.php:71 mod/wallmessage.php:62 msgid "Message could not be sent." msgstr "" -#: mod/message.php:73 mod/wallmessage.php:65 +#: mod/message.php:74 mod/wallmessage.php:65 msgid "Message collection failure." msgstr "" -#: mod/message.php:76 mod/wallmessage.php:68 +#: mod/message.php:77 mod/wallmessage.php:68 msgid "Message sent." msgstr "" -#: mod/message.php:182 include/nav.php:162 +#: mod/message.php:183 include/nav.php:162 msgid "Messages" msgstr "" -#: mod/message.php:207 +#: mod/message.php:208 msgid "Do you really want to delete this message?" msgstr "" -#: mod/message.php:227 +#: mod/message.php:228 msgid "Message deleted." msgstr "" -#: mod/message.php:258 +#: mod/message.php:259 msgid "Conversation removed." msgstr "" -#: mod/message.php:283 mod/message.php:291 mod/message.php:466 -#: mod/message.php:474 mod/wallmessage.php:127 mod/wallmessage.php:135 +#: mod/message.php:284 mod/message.php:292 mod/message.php:467 +#: mod/message.php:475 mod/wallmessage.php:127 mod/wallmessage.php:135 #: include/conversation.php:1001 include/conversation.php:1019 msgid "Please enter a link URL:" msgstr "" -#: mod/message.php:319 mod/wallmessage.php:142 +#: mod/message.php:320 mod/wallmessage.php:142 msgid "Send Private Message" msgstr "" -#: mod/message.php:320 mod/message.php:553 mod/wallmessage.php:144 +#: mod/message.php:321 mod/message.php:554 mod/wallmessage.php:144 msgid "To:" msgstr "" -#: mod/message.php:325 mod/message.php:555 mod/wallmessage.php:145 +#: mod/message.php:326 mod/message.php:556 mod/wallmessage.php:145 msgid "Subject:" msgstr "" -#: mod/message.php:329 mod/message.php:558 mod/wallmessage.php:151 +#: mod/message.php:330 mod/message.php:559 mod/wallmessage.php:151 #: mod/invite.php:134 msgid "Your message:" msgstr "" -#: mod/message.php:332 mod/message.php:562 mod/wallmessage.php:154 +#: mod/message.php:333 mod/message.php:563 mod/wallmessage.php:154 #: mod/editpost.php:110 include/conversation.php:1056 msgid "Upload photo" msgstr "" -#: mod/message.php:333 mod/message.php:563 mod/wallmessage.php:155 +#: mod/message.php:334 mod/message.php:564 mod/wallmessage.php:155 #: mod/editpost.php:114 include/conversation.php:1060 msgid "Insert web link" msgstr "" -#: mod/message.php:334 mod/message.php:565 mod/content.php:501 +#: mod/message.php:335 mod/message.php:566 mod/content.php:501 #: mod/content.php:885 mod/wallmessage.php:156 mod/editpost.php:124 #: mod/photos.php:1564 object/Item.php:366 include/conversation.php:691 #: include/conversation.php:1074 msgid "Please wait" msgstr "" -#: mod/message.php:371 +#: mod/message.php:372 msgid "No messages." msgstr "" -#: mod/message.php:378 +#: mod/message.php:379 #, php-format msgid "Unknown sender - %s" msgstr "" -#: mod/message.php:381 +#: mod/message.php:382 #, php-format msgid "You and %s" msgstr "" -#: mod/message.php:384 +#: mod/message.php:385 #, php-format msgid "%s and You" msgstr "" -#: mod/message.php:405 mod/message.php:546 +#: mod/message.php:406 mod/message.php:547 msgid "Delete conversation" msgstr "" -#: mod/message.php:408 +#: mod/message.php:409 msgid "D, d M Y - g:i A" msgstr "" -#: mod/message.php:411 +#: mod/message.php:412 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "" msgstr[1] "" -#: mod/message.php:450 +#: mod/message.php:451 msgid "Message not available." msgstr "" -#: mod/message.php:520 +#: mod/message.php:521 msgid "Delete message" msgstr "" -#: mod/message.php:548 +#: mod/message.php:549 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: mod/message.php:552 +#: mod/message.php:553 msgid "Send Reply" msgstr "" @@ -1722,9 +1742,9 @@ msgstr "" msgid "Refetch contact data" msgstr "" -#: mod/crepair.php:170 mod/admin.php:1041 mod/admin.php:1053 -#: mod/admin.php:1054 mod/admin.php:1067 mod/settings.php:624 -#: mod/settings.php:650 +#: mod/crepair.php:170 mod/admin.php:1069 mod/admin.php:1081 +#: mod/admin.php:1082 mod/admin.php:1095 mod/settings.php:633 +#: mod/settings.php:659 msgid "Name" msgstr "" @@ -1800,7 +1820,7 @@ msgstr "" msgid "No matches" msgstr "" -#: mod/fbrowser.php:32 include/identity.php:646 include/nav.php:78 +#: mod/fbrowser.php:32 include/identity.php:648 include/nav.php:78 #: view/theme/diabook/theme.php:126 msgid "Photos" msgstr "" @@ -1817,19 +1837,19 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: mod/admin.php:104 mod/admin.php:649 +#: mod/admin.php:104 mod/admin.php:677 msgid "Site" msgstr "" -#: mod/admin.php:105 mod/admin.php:595 mod/admin.php:1036 mod/admin.php:1051 +#: mod/admin.php:105 mod/admin.php:623 mod/admin.php:1064 mod/admin.php:1079 msgid "Users" msgstr "" -#: mod/admin.php:106 mod/admin.php:1140 mod/admin.php:1193 mod/settings.php:62 +#: mod/admin.php:106 mod/admin.php:1168 mod/admin.php:1221 mod/settings.php:66 msgid "Plugins" msgstr "" -#: mod/admin.php:107 mod/admin.php:1361 mod/admin.php:1395 +#: mod/admin.php:107 mod/admin.php:1389 mod/admin.php:1423 msgid "Themes" msgstr "" @@ -1837,664 +1857,696 @@ msgstr "" msgid "DB updates" msgstr "" -#: mod/admin.php:123 mod/admin.php:132 mod/admin.php:1482 +#: mod/admin.php:109 mod/admin.php:200 +msgid "Inspect Queue" +msgstr "" + +#: mod/admin.php:124 mod/admin.php:133 mod/admin.php:1510 msgid "Logs" msgstr "" -#: mod/admin.php:124 +#: mod/admin.php:125 msgid "probe address" msgstr "" -#: mod/admin.php:125 +#: mod/admin.php:126 msgid "check webfinger" msgstr "" -#: mod/admin.php:130 include/nav.php:185 +#: mod/admin.php:131 include/nav.php:185 msgid "Admin" msgstr "" -#: mod/admin.php:131 +#: mod/admin.php:132 msgid "Plugin Features" msgstr "" -#: mod/admin.php:133 +#: mod/admin.php:134 msgid "diagnostics" msgstr "" -#: mod/admin.php:134 +#: mod/admin.php:135 msgid "User registrations waiting for confirmation" msgstr "" -#: mod/admin.php:193 mod/admin.php:989 -msgid "Normal Account" -msgstr "" - -#: mod/admin.php:194 mod/admin.php:990 -msgid "Soapbox Account" -msgstr "" - -#: mod/admin.php:195 mod/admin.php:991 -msgid "Community/Celebrity Account" -msgstr "" - -#: mod/admin.php:196 mod/admin.php:992 -msgid "Automatic Friend Account" -msgstr "" - -#: mod/admin.php:197 -msgid "Blog Account" -msgstr "" - -#: mod/admin.php:198 -msgid "Private Forum" -msgstr "" - -#: mod/admin.php:217 -msgid "Message queues" -msgstr "" - -#: mod/admin.php:222 mod/admin.php:648 mod/admin.php:1035 mod/admin.php:1139 -#: mod/admin.php:1192 mod/admin.php:1360 mod/admin.php:1394 mod/admin.php:1481 +#: mod/admin.php:199 mod/admin.php:249 mod/admin.php:676 mod/admin.php:1063 +#: mod/admin.php:1167 mod/admin.php:1220 mod/admin.php:1388 mod/admin.php:1422 +#: mod/admin.php:1509 msgid "Administration" msgstr "" -#: mod/admin.php:223 -msgid "Summary" +#: mod/admin.php:202 +msgid "ID" +msgstr "" + +#: mod/admin.php:203 +msgid "Recipient Name" +msgstr "" + +#: mod/admin.php:204 +msgid "Recipient Profile" +msgstr "" + +#: mod/admin.php:206 +msgid "Created" +msgstr "" + +#: mod/admin.php:207 +msgid "Last Tried" +msgstr "" + +#: mod/admin.php:208 +msgid "" +"This page lists the content of the queue for outgoing postings. These are " +"postings the initial delivery failed for. They will be resend later and " +"eventually deleted if the delivery fails permanently." +msgstr "" + +#: mod/admin.php:220 mod/admin.php:1017 +msgid "Normal Account" +msgstr "" + +#: mod/admin.php:221 mod/admin.php:1018 +msgid "Soapbox Account" +msgstr "" + +#: mod/admin.php:222 mod/admin.php:1019 +msgid "Community/Celebrity Account" +msgstr "" + +#: mod/admin.php:223 mod/admin.php:1020 +msgid "Automatic Friend Account" +msgstr "" + +#: mod/admin.php:224 +msgid "Blog Account" msgstr "" #: mod/admin.php:225 +msgid "Private Forum" +msgstr "" + +#: mod/admin.php:244 +msgid "Message queues" +msgstr "" + +#: mod/admin.php:250 +msgid "Summary" +msgstr "" + +#: mod/admin.php:252 msgid "Registered users" msgstr "" -#: mod/admin.php:227 +#: mod/admin.php:254 msgid "Pending registrations" msgstr "" -#: mod/admin.php:228 +#: mod/admin.php:255 msgid "Version" msgstr "" -#: mod/admin.php:232 +#: mod/admin.php:260 msgid "Active plugins" msgstr "" -#: mod/admin.php:255 +#: mod/admin.php:283 msgid "Can not parse base url. Must have at least ://" msgstr "" -#: mod/admin.php:532 +#: mod/admin.php:560 msgid "Site settings updated." msgstr "" -#: mod/admin.php:561 mod/settings.php:862 +#: mod/admin.php:589 mod/settings.php:871 msgid "No special theme for mobile devices" msgstr "" -#: mod/admin.php:578 +#: mod/admin.php:606 msgid "No community page" msgstr "" -#: mod/admin.php:579 +#: mod/admin.php:607 msgid "Public postings from users of this site" msgstr "" -#: mod/admin.php:580 +#: mod/admin.php:608 msgid "Global community page" msgstr "" -#: mod/admin.php:586 +#: mod/admin.php:614 msgid "At post arrival" msgstr "" -#: mod/admin.php:587 include/contact_selectors.php:56 +#: mod/admin.php:615 include/contact_selectors.php:56 msgid "Frequently" msgstr "" -#: mod/admin.php:588 include/contact_selectors.php:57 +#: mod/admin.php:616 include/contact_selectors.php:57 msgid "Hourly" msgstr "" -#: mod/admin.php:589 include/contact_selectors.php:58 +#: mod/admin.php:617 include/contact_selectors.php:58 msgid "Twice daily" msgstr "" -#: mod/admin.php:590 include/contact_selectors.php:59 +#: mod/admin.php:618 include/contact_selectors.php:59 msgid "Daily" msgstr "" -#: mod/admin.php:596 +#: mod/admin.php:624 msgid "Users, Global Contacts" msgstr "" -#: mod/admin.php:597 +#: mod/admin.php:625 msgid "Users, Global Contacts/fallback" msgstr "" -#: mod/admin.php:601 +#: mod/admin.php:629 msgid "One month" msgstr "" -#: mod/admin.php:602 +#: mod/admin.php:630 msgid "Three months" msgstr "" -#: mod/admin.php:603 +#: mod/admin.php:631 msgid "Half a year" msgstr "" -#: mod/admin.php:604 +#: mod/admin.php:632 msgid "One year" msgstr "" -#: mod/admin.php:609 +#: mod/admin.php:637 msgid "Multi user instance" msgstr "" -#: mod/admin.php:632 +#: mod/admin.php:660 msgid "Closed" msgstr "" -#: mod/admin.php:633 +#: mod/admin.php:661 msgid "Requires approval" msgstr "" -#: mod/admin.php:634 +#: mod/admin.php:662 msgid "Open" msgstr "" -#: mod/admin.php:638 +#: mod/admin.php:666 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: mod/admin.php:639 +#: mod/admin.php:667 msgid "Force all links to use SSL" msgstr "" -#: mod/admin.php:640 +#: mod/admin.php:668 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: mod/admin.php:650 mod/admin.php:1194 mod/admin.php:1396 mod/admin.php:1483 -#: mod/settings.php:622 mod/settings.php:732 mod/settings.php:763 -#: mod/settings.php:832 mod/settings.php:914 mod/settings.php:1146 +#: mod/admin.php:678 mod/admin.php:1222 mod/admin.php:1424 mod/admin.php:1511 +#: mod/settings.php:631 mod/settings.php:741 mod/settings.php:772 +#: mod/settings.php:841 mod/settings.php:923 mod/settings.php:1155 msgid "Save Settings" msgstr "" -#: mod/admin.php:651 mod/register.php:260 +#: mod/admin.php:679 mod/register.php:260 msgid "Registration" msgstr "" -#: mod/admin.php:652 +#: mod/admin.php:680 msgid "File upload" msgstr "" -#: mod/admin.php:653 +#: mod/admin.php:681 msgid "Policies" msgstr "" -#: mod/admin.php:654 +#: mod/admin.php:682 msgid "Advanced" msgstr "" -#: mod/admin.php:655 +#: mod/admin.php:683 msgid "Auto Discovered Contact Directory" msgstr "" -#: mod/admin.php:656 +#: mod/admin.php:684 msgid "Performance" msgstr "" -#: mod/admin.php:657 +#: mod/admin.php:685 msgid "" "Relocate - WARNING: advanced function. Could make this server unreachable." msgstr "" -#: mod/admin.php:660 +#: mod/admin.php:688 msgid "Site name" msgstr "" -#: mod/admin.php:661 +#: mod/admin.php:689 msgid "Host name" msgstr "" -#: mod/admin.php:662 +#: mod/admin.php:690 msgid "Sender Email" msgstr "" -#: mod/admin.php:663 +#: mod/admin.php:691 msgid "Banner/Logo" msgstr "" -#: mod/admin.php:664 +#: mod/admin.php:692 msgid "Shortcut icon" msgstr "" -#: mod/admin.php:665 +#: mod/admin.php:693 msgid "Touch icon" msgstr "" -#: mod/admin.php:666 +#: mod/admin.php:694 msgid "Additional Info" msgstr "" -#: mod/admin.php:666 +#: mod/admin.php:694 msgid "" "For public servers: you can add additional information here that will be " "listed at dir.friendica.com/siteinfo." msgstr "" -#: mod/admin.php:667 +#: mod/admin.php:695 msgid "System language" msgstr "" -#: mod/admin.php:668 +#: mod/admin.php:696 msgid "System theme" msgstr "" -#: mod/admin.php:668 +#: mod/admin.php:696 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: mod/admin.php:669 +#: mod/admin.php:697 msgid "Mobile system theme" msgstr "" -#: mod/admin.php:669 +#: mod/admin.php:697 msgid "Theme for mobile devices" msgstr "" -#: mod/admin.php:670 +#: mod/admin.php:698 msgid "SSL link policy" msgstr "" -#: mod/admin.php:670 +#: mod/admin.php:698 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: mod/admin.php:671 +#: mod/admin.php:699 msgid "Force SSL" msgstr "" -#: mod/admin.php:671 +#: mod/admin.php:699 msgid "" "Force all Non-SSL requests to SSL - Attention: on some systems it could lead " "to endless loops." msgstr "" -#: mod/admin.php:672 +#: mod/admin.php:700 msgid "Old style 'Share'" msgstr "" -#: mod/admin.php:672 +#: mod/admin.php:700 msgid "Deactivates the bbcode element 'share' for repeating items." msgstr "" -#: mod/admin.php:673 +#: mod/admin.php:701 msgid "Hide help entry from navigation menu" msgstr "" -#: mod/admin.php:673 +#: mod/admin.php:701 msgid "" "Hides the menu entry for the Help pages from the navigation menu. You can " "still access it calling /help directly." msgstr "" -#: mod/admin.php:674 +#: mod/admin.php:702 msgid "Single user instance" msgstr "" -#: mod/admin.php:674 +#: mod/admin.php:702 msgid "Make this instance multi-user or single-user for the named user" msgstr "" -#: mod/admin.php:675 +#: mod/admin.php:703 msgid "Maximum image size" msgstr "" -#: mod/admin.php:675 +#: mod/admin.php:703 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: mod/admin.php:676 +#: mod/admin.php:704 msgid "Maximum image length" msgstr "" -#: mod/admin.php:676 +#: mod/admin.php:704 msgid "" "Maximum length in pixels of the longest side of uploaded images. Default is " "-1, which means no limits." msgstr "" -#: mod/admin.php:677 +#: mod/admin.php:705 msgid "JPEG image quality" msgstr "" -#: mod/admin.php:677 +#: mod/admin.php:705 msgid "" "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " "100, which is full quality." msgstr "" -#: mod/admin.php:679 +#: mod/admin.php:707 msgid "Register policy" msgstr "" -#: mod/admin.php:680 +#: mod/admin.php:708 msgid "Maximum Daily Registrations" msgstr "" -#: mod/admin.php:680 +#: mod/admin.php:708 msgid "" "If registration is permitted above, this sets the maximum number of new user " "registrations to accept per day. If register is set to closed, this setting " "has no effect." msgstr "" -#: mod/admin.php:681 +#: mod/admin.php:709 msgid "Register text" msgstr "" -#: mod/admin.php:681 +#: mod/admin.php:709 msgid "Will be displayed prominently on the registration page." msgstr "" -#: mod/admin.php:682 +#: mod/admin.php:710 msgid "Accounts abandoned after x days" msgstr "" -#: mod/admin.php:682 +#: mod/admin.php:710 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: mod/admin.php:683 +#: mod/admin.php:711 msgid "Allowed friend domains" msgstr "" -#: mod/admin.php:683 +#: mod/admin.php:711 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: mod/admin.php:684 +#: mod/admin.php:712 msgid "Allowed email domains" msgstr "" -#: mod/admin.php:684 +#: mod/admin.php:712 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: mod/admin.php:685 +#: mod/admin.php:713 msgid "Block public" msgstr "" -#: mod/admin.php:685 +#: mod/admin.php:713 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: mod/admin.php:686 +#: mod/admin.php:714 msgid "Force publish" msgstr "" -#: mod/admin.php:686 +#: mod/admin.php:714 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: mod/admin.php:687 +#: mod/admin.php:715 msgid "Global directory update URL" msgstr "" -#: mod/admin.php:687 +#: mod/admin.php:715 msgid "" "URL to update the global directory. If this is not set, the global directory " "is completely unavailable to the application." msgstr "" -#: mod/admin.php:688 +#: mod/admin.php:716 msgid "Allow threaded items" msgstr "" -#: mod/admin.php:688 +#: mod/admin.php:716 msgid "Allow infinite level threading for items on this site." msgstr "" -#: mod/admin.php:689 +#: mod/admin.php:717 msgid "Private posts by default for new users" msgstr "" -#: mod/admin.php:689 +#: mod/admin.php:717 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." msgstr "" -#: mod/admin.php:690 +#: mod/admin.php:718 msgid "Don't include post content in email notifications" msgstr "" -#: mod/admin.php:690 +#: mod/admin.php:718 msgid "" "Don't include the content of a post/comment/private message/etc. in the " "email notifications that are sent out from this site, as a privacy measure." msgstr "" -#: mod/admin.php:691 +#: mod/admin.php:719 msgid "Disallow public access to addons listed in the apps menu." msgstr "" -#: mod/admin.php:691 +#: mod/admin.php:719 msgid "" "Checking this box will restrict addons listed in the apps menu to members " "only." msgstr "" -#: mod/admin.php:692 +#: mod/admin.php:720 msgid "Don't embed private images in posts" msgstr "" -#: mod/admin.php:692 +#: mod/admin.php:720 msgid "" "Don't replace locally-hosted private photos in posts with an embedded copy " "of the image. This means that contacts who receive posts containing private " "photos will have to authenticate and load each image, which may take a while." msgstr "" -#: mod/admin.php:693 +#: mod/admin.php:721 msgid "Allow Users to set remote_self" msgstr "" -#: mod/admin.php:693 +#: mod/admin.php:721 msgid "" "With checking this, every user is allowed to mark every contact as a " "remote_self in the repair contact dialog. Setting this flag on a contact " "causes mirroring every posting of that contact in the users stream." msgstr "" -#: mod/admin.php:694 +#: mod/admin.php:722 msgid "Block multiple registrations" msgstr "" -#: mod/admin.php:694 +#: mod/admin.php:722 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: mod/admin.php:695 +#: mod/admin.php:723 msgid "OpenID support" msgstr "" -#: mod/admin.php:695 +#: mod/admin.php:723 msgid "OpenID support for registration and logins." msgstr "" -#: mod/admin.php:696 +#: mod/admin.php:724 msgid "Fullname check" msgstr "" -#: mod/admin.php:696 +#: mod/admin.php:724 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: mod/admin.php:697 +#: mod/admin.php:725 msgid "UTF-8 Regular expressions" msgstr "" -#: mod/admin.php:697 +#: mod/admin.php:725 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: mod/admin.php:698 +#: mod/admin.php:726 msgid "Community Page Style" msgstr "" -#: mod/admin.php:698 +#: mod/admin.php:726 msgid "" "Type of community page to show. 'Global community' shows every public " "posting from an open distributed network that arrived on this server." msgstr "" -#: mod/admin.php:699 +#: mod/admin.php:727 msgid "Posts per user on community page" msgstr "" -#: mod/admin.php:699 +#: mod/admin.php:727 msgid "" "The maximum number of posts per user on the community page. (Not valid for " "'Global Community')" msgstr "" -#: mod/admin.php:700 +#: mod/admin.php:728 msgid "Enable OStatus support" msgstr "" -#: mod/admin.php:700 +#: mod/admin.php:728 msgid "" "Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "" -#: mod/admin.php:701 +#: mod/admin.php:729 msgid "OStatus conversation completion interval" msgstr "" -#: mod/admin.php:701 +#: mod/admin.php:729 msgid "" "How often shall the poller check for new entries in OStatus conversations? " "This can be a very ressource task." msgstr "" -#: mod/admin.php:702 +#: mod/admin.php:730 msgid "Enable Diaspora support" msgstr "" -#: mod/admin.php:702 +#: mod/admin.php:730 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: mod/admin.php:703 +#: mod/admin.php:731 msgid "Only allow Friendica contacts" msgstr "" -#: mod/admin.php:703 +#: mod/admin.php:731 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: mod/admin.php:704 +#: mod/admin.php:732 msgid "Verify SSL" msgstr "" -#: mod/admin.php:704 +#: mod/admin.php:732 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: mod/admin.php:705 +#: mod/admin.php:733 msgid "Proxy user" msgstr "" -#: mod/admin.php:706 +#: mod/admin.php:734 msgid "Proxy URL" msgstr "" -#: mod/admin.php:707 +#: mod/admin.php:735 msgid "Network timeout" msgstr "" -#: mod/admin.php:707 +#: mod/admin.php:735 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: mod/admin.php:708 +#: mod/admin.php:736 msgid "Delivery interval" msgstr "" -#: mod/admin.php:708 +#: mod/admin.php:736 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: mod/admin.php:709 +#: mod/admin.php:737 msgid "Poll interval" msgstr "" -#: mod/admin.php:709 +#: mod/admin.php:737 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: mod/admin.php:710 +#: mod/admin.php:738 msgid "Maximum Load Average" msgstr "" -#: mod/admin.php:710 +#: mod/admin.php:738 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: mod/admin.php:711 +#: mod/admin.php:739 msgid "Maximum Load Average (Frontend)" msgstr "" -#: mod/admin.php:711 +#: mod/admin.php:739 msgid "Maximum system load before the frontend quits service - default 50." msgstr "" -#: mod/admin.php:713 +#: mod/admin.php:741 msgid "Periodical check of global contacts" msgstr "" -#: mod/admin.php:713 +#: mod/admin.php:741 msgid "" "If enabled, the global contacts are checked periodically for missing or " "outdated data and the vitality of the contacts and servers." msgstr "" -#: mod/admin.php:714 +#: mod/admin.php:742 msgid "Discover contacts from other servers" msgstr "" -#: mod/admin.php:714 +#: mod/admin.php:742 msgid "" "Periodically query other servers for contacts. You can choose between " "'users': the users on the remote system, 'Global Contacts': active contacts " @@ -2504,186 +2556,186 @@ msgid "" "Global Contacts'." msgstr "" -#: mod/admin.php:715 +#: mod/admin.php:743 msgid "Timeframe for fetching global contacts" msgstr "" -#: mod/admin.php:715 +#: mod/admin.php:743 msgid "" "When the discovery is activated, this value defines the timeframe for the " "activity of the global contacts that are fetched from other servers." msgstr "" -#: mod/admin.php:716 +#: mod/admin.php:744 msgid "Search the local directory" msgstr "" -#: mod/admin.php:716 +#: mod/admin.php:744 msgid "" "Search the local directory instead of the global directory. When searching " "locally, every search will be executed on the global directory in the " "background. This improves the search results when the search is repeated." msgstr "" -#: mod/admin.php:718 +#: mod/admin.php:746 msgid "Use MySQL full text engine" msgstr "" -#: mod/admin.php:718 +#: mod/admin.php:746 msgid "" "Activates the full text engine. Speeds up search - but can only search for " "four and more characters." msgstr "" -#: mod/admin.php:719 +#: mod/admin.php:747 msgid "Suppress Language" msgstr "" -#: mod/admin.php:719 +#: mod/admin.php:747 msgid "Suppress language information in meta information about a posting." msgstr "" -#: mod/admin.php:720 +#: mod/admin.php:748 msgid "Suppress Tags" msgstr "" -#: mod/admin.php:720 +#: mod/admin.php:748 msgid "Suppress showing a list of hashtags at the end of the posting." msgstr "" -#: mod/admin.php:721 +#: mod/admin.php:749 msgid "Path to item cache" msgstr "" -#: mod/admin.php:722 +#: mod/admin.php:750 msgid "Cache duration in seconds" msgstr "" -#: mod/admin.php:722 +#: mod/admin.php:750 msgid "" "How long should the cache files be hold? Default value is 86400 seconds (One " "day). To disable the item cache, set the value to -1." msgstr "" -#: mod/admin.php:723 +#: mod/admin.php:751 msgid "Maximum numbers of comments per post" msgstr "" -#: mod/admin.php:723 +#: mod/admin.php:751 msgid "How much comments should be shown for each post? Default value is 100." msgstr "" -#: mod/admin.php:724 +#: mod/admin.php:752 msgid "Path for lock file" msgstr "" -#: mod/admin.php:725 +#: mod/admin.php:753 msgid "Temp path" msgstr "" -#: mod/admin.php:726 +#: mod/admin.php:754 msgid "Base path to installation" msgstr "" -#: mod/admin.php:727 +#: mod/admin.php:755 msgid "Disable picture proxy" msgstr "" -#: mod/admin.php:727 +#: mod/admin.php:755 msgid "" "The picture proxy increases performance and privacy. It shouldn't be used on " "systems with very low bandwith." msgstr "" -#: mod/admin.php:728 +#: mod/admin.php:756 msgid "Enable old style pager" msgstr "" -#: mod/admin.php:728 +#: mod/admin.php:756 msgid "" "The old style pager has page numbers but slows down massively the page speed." msgstr "" -#: mod/admin.php:729 +#: mod/admin.php:757 msgid "Only search in tags" msgstr "" -#: mod/admin.php:729 +#: mod/admin.php:757 msgid "On large systems the text search can slow down the system extremely." msgstr "" -#: mod/admin.php:731 +#: mod/admin.php:759 msgid "New base url" msgstr "" -#: mod/admin.php:733 +#: mod/admin.php:761 msgid "RINO Encryption" msgstr "" -#: mod/admin.php:733 +#: mod/admin.php:761 msgid "Encryption layer between nodes." msgstr "" -#: mod/admin.php:751 +#: mod/admin.php:779 msgid "Update has been marked successful" msgstr "" -#: mod/admin.php:759 +#: mod/admin.php:787 #, php-format msgid "Database structure update %s was successfully applied." msgstr "" -#: mod/admin.php:762 +#: mod/admin.php:790 #, php-format msgid "Executing of database structure update %s failed with error: %s" msgstr "" -#: mod/admin.php:774 +#: mod/admin.php:802 #, php-format msgid "Executing %s failed with error: %s" msgstr "" -#: mod/admin.php:777 +#: mod/admin.php:805 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: mod/admin.php:781 +#: mod/admin.php:809 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: mod/admin.php:783 +#: mod/admin.php:811 #, php-format msgid "There was no additional update function %s that needed to be called." msgstr "" -#: mod/admin.php:802 +#: mod/admin.php:830 msgid "No failed updates." msgstr "" -#: mod/admin.php:803 +#: mod/admin.php:831 msgid "Check database structure" msgstr "" -#: mod/admin.php:808 +#: mod/admin.php:836 msgid "Failed Updates" msgstr "" -#: mod/admin.php:809 +#: mod/admin.php:837 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "" -#: mod/admin.php:810 +#: mod/admin.php:838 msgid "Mark success (if update was manually applied)" msgstr "" -#: mod/admin.php:811 +#: mod/admin.php:839 msgid "Attempt to execute this update step automatically" msgstr "" -#: mod/admin.php:843 +#: mod/admin.php:871 #, php-format msgid "" "\n" @@ -2691,7 +2743,7 @@ msgid "" "\t\t\t\tthe administrator of %2$s has set up an account for you." msgstr "" -#: mod/admin.php:846 +#: mod/admin.php:874 #, php-format msgid "" "\n" @@ -2727,222 +2779,222 @@ msgid "" "\t\t\tThank you and welcome to %4$s." msgstr "" -#: mod/admin.php:878 include/user.php:421 +#: mod/admin.php:906 include/user.php:421 #, php-format msgid "Registration details for %s" msgstr "" -#: mod/admin.php:890 +#: mod/admin.php:918 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: mod/admin.php:897 +#: mod/admin.php:925 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: mod/admin.php:936 +#: mod/admin.php:964 #, php-format msgid "User '%s' deleted" msgstr "" -#: mod/admin.php:944 +#: mod/admin.php:972 #, php-format msgid "User '%s' unblocked" msgstr "" -#: mod/admin.php:944 +#: mod/admin.php:972 #, php-format msgid "User '%s' blocked" msgstr "" -#: mod/admin.php:1037 +#: mod/admin.php:1065 msgid "Add User" msgstr "" -#: mod/admin.php:1038 +#: mod/admin.php:1066 msgid "select all" msgstr "" -#: mod/admin.php:1039 +#: mod/admin.php:1067 msgid "User registrations waiting for confirm" msgstr "" -#: mod/admin.php:1040 +#: mod/admin.php:1068 msgid "User waiting for permanent deletion" msgstr "" -#: mod/admin.php:1041 +#: mod/admin.php:1069 msgid "Request date" msgstr "" -#: mod/admin.php:1041 mod/admin.php:1053 mod/admin.php:1054 mod/admin.php:1069 +#: mod/admin.php:1069 mod/admin.php:1081 mod/admin.php:1082 mod/admin.php:1097 #: include/contact_selectors.php:79 include/contact_selectors.php:86 msgid "Email" msgstr "" -#: mod/admin.php:1042 +#: mod/admin.php:1070 msgid "No registrations." msgstr "" -#: mod/admin.php:1044 +#: mod/admin.php:1072 msgid "Deny" msgstr "" -#: mod/admin.php:1048 +#: mod/admin.php:1076 msgid "Site admin" msgstr "" -#: mod/admin.php:1049 +#: mod/admin.php:1077 msgid "Account expired" msgstr "" -#: mod/admin.php:1052 +#: mod/admin.php:1080 msgid "New User" msgstr "" -#: mod/admin.php:1053 mod/admin.php:1054 +#: mod/admin.php:1081 mod/admin.php:1082 msgid "Register date" msgstr "" -#: mod/admin.php:1053 mod/admin.php:1054 +#: mod/admin.php:1081 mod/admin.php:1082 msgid "Last login" msgstr "" -#: mod/admin.php:1053 mod/admin.php:1054 +#: mod/admin.php:1081 mod/admin.php:1082 msgid "Last item" msgstr "" -#: mod/admin.php:1053 +#: mod/admin.php:1081 msgid "Deleted since" msgstr "" -#: mod/admin.php:1054 mod/settings.php:41 +#: mod/admin.php:1082 mod/settings.php:41 msgid "Account" msgstr "" -#: mod/admin.php:1056 +#: mod/admin.php:1084 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:1057 +#: mod/admin.php:1085 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:1067 +#: mod/admin.php:1095 msgid "Name of the new user." msgstr "" -#: mod/admin.php:1068 +#: mod/admin.php:1096 msgid "Nickname" msgstr "" -#: mod/admin.php:1068 +#: mod/admin.php:1096 msgid "Nickname of the new user." msgstr "" -#: mod/admin.php:1069 +#: mod/admin.php:1097 msgid "Email address of the new user." msgstr "" -#: mod/admin.php:1102 +#: mod/admin.php:1130 #, php-format msgid "Plugin %s disabled." msgstr "" -#: mod/admin.php:1106 +#: mod/admin.php:1134 #, php-format msgid "Plugin %s enabled." msgstr "" -#: mod/admin.php:1116 mod/admin.php:1332 +#: mod/admin.php:1144 mod/admin.php:1360 msgid "Disable" msgstr "" -#: mod/admin.php:1118 mod/admin.php:1334 +#: mod/admin.php:1146 mod/admin.php:1362 msgid "Enable" msgstr "" -#: mod/admin.php:1141 mod/admin.php:1362 +#: mod/admin.php:1169 mod/admin.php:1390 msgid "Toggle" msgstr "" -#: mod/admin.php:1149 mod/admin.php:1372 +#: mod/admin.php:1177 mod/admin.php:1400 msgid "Author: " msgstr "" -#: mod/admin.php:1150 mod/admin.php:1373 +#: mod/admin.php:1178 mod/admin.php:1401 msgid "Maintainer: " msgstr "" -#: mod/admin.php:1292 +#: mod/admin.php:1320 msgid "No themes found." msgstr "" -#: mod/admin.php:1354 +#: mod/admin.php:1382 msgid "Screenshot" msgstr "" -#: mod/admin.php:1400 +#: mod/admin.php:1428 msgid "[Experimental]" msgstr "" -#: mod/admin.php:1401 +#: mod/admin.php:1429 msgid "[Unsupported]" msgstr "" -#: mod/admin.php:1428 +#: mod/admin.php:1456 msgid "Log settings updated." msgstr "" -#: mod/admin.php:1484 +#: mod/admin.php:1512 msgid "Clear" msgstr "" -#: mod/admin.php:1490 +#: mod/admin.php:1518 msgid "Enable Debugging" msgstr "" -#: mod/admin.php:1491 +#: mod/admin.php:1519 msgid "Log file" msgstr "" -#: mod/admin.php:1491 +#: mod/admin.php:1519 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: mod/admin.php:1492 +#: mod/admin.php:1520 msgid "Log level" msgstr "" -#: mod/admin.php:1542 include/acl_selectors.php:347 +#: mod/admin.php:1570 include/acl_selectors.php:347 msgid "Close" msgstr "" -#: mod/admin.php:1548 +#: mod/admin.php:1576 msgid "FTP Host" msgstr "" -#: mod/admin.php:1549 +#: mod/admin.php:1577 msgid "FTP Path" msgstr "" -#: mod/admin.php:1550 +#: mod/admin.php:1578 msgid "FTP User" msgstr "" -#: mod/admin.php:1551 +#: mod/admin.php:1579 msgid "FTP Password" msgstr "" @@ -2971,43 +3023,43 @@ msgstr "" msgid "Sort by Comment Date" msgstr "" -#: mod/network.php:364 +#: mod/network.php:365 msgid "Posted Order" msgstr "" -#: mod/network.php:367 +#: mod/network.php:368 msgid "Sort by Post Date" msgstr "" -#: mod/network.php:376 +#: mod/network.php:378 msgid "Posts that mention or involve you" msgstr "" -#: mod/network.php:382 +#: mod/network.php:385 msgid "New" msgstr "" -#: mod/network.php:385 +#: mod/network.php:388 msgid "Activity Stream - by date" msgstr "" -#: mod/network.php:391 +#: mod/network.php:395 msgid "Shared Links" msgstr "" -#: mod/network.php:394 +#: mod/network.php:398 msgid "Interesting Links" msgstr "" -#: mod/network.php:400 +#: mod/network.php:405 msgid "Starred" msgstr "" -#: mod/network.php:403 +#: mod/network.php:408 msgid "Favourite Posts" msgstr "" -#: mod/network.php:460 +#: mod/network.php:466 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -3015,33 +3067,33 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: mod/network.php:463 +#: mod/network.php:469 msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: mod/network.php:526 mod/content.php:119 +#: mod/network.php:532 mod/content.php:119 msgid "No such group" msgstr "" -#: mod/network.php:543 mod/content.php:130 +#: mod/network.php:549 mod/content.php:130 msgid "Group is empty" msgstr "" -#: mod/network.php:554 mod/content.php:135 +#: mod/network.php:560 mod/content.php:135 #, php-format msgid "Group: %s" msgstr "" -#: mod/network.php:572 +#: mod/network.php:578 #, php-format msgid "Contact: %s" msgstr "" -#: mod/network.php:576 +#: mod/network.php:582 msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: mod/network.php:581 +#: mod/network.php:587 msgid "Invalid contact." msgstr "" @@ -3070,11 +3122,11 @@ msgstr "" msgid "Edit event" msgstr "" -#: mod/events.php:361 include/text.php:1679 include/text.php:1689 +#: mod/events.php:361 include/text.php:1697 include/text.php:1704 msgid "link to source" msgstr "" -#: mod/events.php:396 include/identity.php:663 include/nav.php:80 +#: mod/events.php:396 include/identity.php:667 include/nav.php:80 #: view/theme/diabook/theme.php:127 msgid "Events" msgstr "" @@ -3123,11 +3175,6 @@ msgstr "" msgid "Description:" msgstr "" -#: mod/events.php:503 mod/directory.php:152 include/identity.php:268 -#: include/bb2diaspora.php:170 include/event.php:42 -msgid "Location:" -msgstr "" - #: mod/events.php:505 msgid "Title:" msgstr "" @@ -3171,7 +3218,7 @@ msgstr[0] "" msgstr[1] "" #: mod/content.php:607 object/Item.php:391 object/Item.php:404 -#: include/text.php:2004 +#: include/text.php:2019 msgid "comment" msgid_plural "comments" msgstr[0] "" @@ -3252,7 +3299,7 @@ msgstr "" msgid "Video" msgstr "" -#: mod/content.php:730 mod/settings.php:684 object/Item.php:121 +#: mod/content.php:730 mod/settings.php:693 object/Item.php:121 msgid "Edit" msgstr "" @@ -3695,664 +3742,664 @@ msgstr "" msgid "everybody" msgstr "" -#: mod/settings.php:46 +#: mod/settings.php:47 msgid "Additional features" msgstr "" -#: mod/settings.php:51 +#: mod/settings.php:53 msgid "Display" msgstr "" -#: mod/settings.php:57 mod/settings.php:814 +#: mod/settings.php:60 mod/settings.php:823 msgid "Social Networks" msgstr "" -#: mod/settings.php:67 include/nav.php:171 +#: mod/settings.php:72 include/nav.php:171 msgid "Delegations" msgstr "" -#: mod/settings.php:72 +#: mod/settings.php:78 msgid "Connected apps" msgstr "" -#: mod/settings.php:77 mod/uexport.php:85 +#: mod/settings.php:84 mod/uexport.php:85 msgid "Export personal data" msgstr "" -#: mod/settings.php:82 +#: mod/settings.php:90 msgid "Remove account" msgstr "" -#: mod/settings.php:134 +#: mod/settings.php:143 msgid "Missing some important data!" msgstr "" -#: mod/settings.php:246 +#: mod/settings.php:255 msgid "Failed to connect with email account using the settings provided." msgstr "" -#: mod/settings.php:251 +#: mod/settings.php:260 msgid "Email settings updated." msgstr "" -#: mod/settings.php:266 +#: mod/settings.php:275 msgid "Features updated" msgstr "" -#: mod/settings.php:329 +#: mod/settings.php:338 msgid "Relocate message has been send to your contacts" msgstr "" -#: mod/settings.php:343 include/user.php:39 +#: mod/settings.php:352 include/user.php:39 msgid "Passwords do not match. Password unchanged." msgstr "" -#: mod/settings.php:348 +#: mod/settings.php:357 msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: mod/settings.php:356 +#: mod/settings.php:365 msgid "Wrong password." msgstr "" -#: mod/settings.php:367 +#: mod/settings.php:376 msgid "Password changed." msgstr "" -#: mod/settings.php:369 +#: mod/settings.php:378 msgid "Password update failed. Please try again." msgstr "" -#: mod/settings.php:436 +#: mod/settings.php:445 msgid " Please use a shorter name." msgstr "" -#: mod/settings.php:438 +#: mod/settings.php:447 msgid " Name too short." msgstr "" -#: mod/settings.php:447 +#: mod/settings.php:456 msgid "Wrong Password" msgstr "" -#: mod/settings.php:452 +#: mod/settings.php:461 msgid " Not valid email." msgstr "" -#: mod/settings.php:458 +#: mod/settings.php:467 msgid " Cannot change to that email." msgstr "" -#: mod/settings.php:514 +#: mod/settings.php:523 msgid "Private forum has no privacy permissions. Using default privacy group." msgstr "" -#: mod/settings.php:518 +#: mod/settings.php:527 msgid "Private forum has no privacy permissions and no default privacy group." msgstr "" -#: mod/settings.php:548 +#: mod/settings.php:557 msgid "Settings updated." msgstr "" -#: mod/settings.php:621 mod/settings.php:647 mod/settings.php:683 +#: mod/settings.php:630 mod/settings.php:656 mod/settings.php:692 msgid "Add application" msgstr "" -#: mod/settings.php:625 mod/settings.php:651 +#: mod/settings.php:634 mod/settings.php:660 msgid "Consumer Key" msgstr "" -#: mod/settings.php:626 mod/settings.php:652 +#: mod/settings.php:635 mod/settings.php:661 msgid "Consumer Secret" msgstr "" -#: mod/settings.php:627 mod/settings.php:653 +#: mod/settings.php:636 mod/settings.php:662 msgid "Redirect" msgstr "" -#: mod/settings.php:628 mod/settings.php:654 +#: mod/settings.php:637 mod/settings.php:663 msgid "Icon url" msgstr "" -#: mod/settings.php:639 +#: mod/settings.php:648 msgid "You can't edit this application." msgstr "" -#: mod/settings.php:682 +#: mod/settings.php:691 msgid "Connected Apps" msgstr "" -#: mod/settings.php:686 +#: mod/settings.php:695 msgid "Client key starts with" msgstr "" -#: mod/settings.php:687 +#: mod/settings.php:696 msgid "No name" msgstr "" -#: mod/settings.php:688 +#: mod/settings.php:697 msgid "Remove authorization" msgstr "" -#: mod/settings.php:700 +#: mod/settings.php:709 msgid "No Plugin settings configured" msgstr "" -#: mod/settings.php:708 +#: mod/settings.php:717 msgid "Plugin Settings" msgstr "" -#: mod/settings.php:722 +#: mod/settings.php:731 msgid "Off" msgstr "" -#: mod/settings.php:722 +#: mod/settings.php:731 msgid "On" msgstr "" -#: mod/settings.php:730 +#: mod/settings.php:739 msgid "Additional Features" msgstr "" -#: mod/settings.php:740 mod/settings.php:744 +#: mod/settings.php:749 mod/settings.php:753 msgid "General Social Media Settings" msgstr "" -#: mod/settings.php:750 +#: mod/settings.php:759 msgid "Disable intelligent shortening" msgstr "" -#: mod/settings.php:752 +#: mod/settings.php:761 msgid "" "Normally the system tries to find the best link to add to shortened posts. " "If this option is enabled then every shortened post will always point to the " "original friendica post." msgstr "" -#: mod/settings.php:758 +#: mod/settings.php:767 msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" msgstr "" -#: mod/settings.php:760 +#: mod/settings.php:769 msgid "" "If you receive a message from an unknown OStatus user, this option decides " "what to do. If it is checked, a new contact will be created for every " "unknown user." msgstr "" -#: mod/settings.php:770 mod/settings.php:771 +#: mod/settings.php:779 mod/settings.php:780 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: mod/settings.php:770 mod/dfrn_request.php:853 +#: mod/settings.php:779 mod/dfrn_request.php:853 #: include/contact_selectors.php:80 msgid "Diaspora" msgstr "" -#: mod/settings.php:770 mod/settings.php:771 +#: mod/settings.php:779 mod/settings.php:780 msgid "enabled" msgstr "" -#: mod/settings.php:770 mod/settings.php:771 +#: mod/settings.php:779 mod/settings.php:780 msgid "disabled" msgstr "" -#: mod/settings.php:771 +#: mod/settings.php:780 msgid "GNU Social (OStatus)" msgstr "" -#: mod/settings.php:807 +#: mod/settings.php:816 msgid "Email access is disabled on this site." msgstr "" -#: mod/settings.php:819 +#: mod/settings.php:828 msgid "Email/Mailbox Setup" msgstr "" -#: mod/settings.php:820 +#: mod/settings.php:829 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "" -#: mod/settings.php:821 +#: mod/settings.php:830 msgid "Last successful email check:" msgstr "" -#: mod/settings.php:823 +#: mod/settings.php:832 msgid "IMAP server name:" msgstr "" -#: mod/settings.php:824 +#: mod/settings.php:833 msgid "IMAP port:" msgstr "" -#: mod/settings.php:825 +#: mod/settings.php:834 msgid "Security:" msgstr "" -#: mod/settings.php:825 mod/settings.php:830 +#: mod/settings.php:834 mod/settings.php:839 msgid "None" msgstr "" -#: mod/settings.php:826 +#: mod/settings.php:835 msgid "Email login name:" msgstr "" -#: mod/settings.php:827 +#: mod/settings.php:836 msgid "Email password:" msgstr "" -#: mod/settings.php:828 +#: mod/settings.php:837 msgid "Reply-to address:" msgstr "" -#: mod/settings.php:829 +#: mod/settings.php:838 msgid "Send public posts to all email contacts:" msgstr "" -#: mod/settings.php:830 +#: mod/settings.php:839 msgid "Action after import:" msgstr "" -#: mod/settings.php:830 +#: mod/settings.php:839 msgid "Mark as seen" msgstr "" -#: mod/settings.php:830 +#: mod/settings.php:839 msgid "Move to folder" msgstr "" -#: mod/settings.php:831 +#: mod/settings.php:840 msgid "Move to folder:" msgstr "" -#: mod/settings.php:912 +#: mod/settings.php:921 msgid "Display Settings" msgstr "" -#: mod/settings.php:918 mod/settings.php:934 +#: mod/settings.php:927 mod/settings.php:943 msgid "Display Theme:" msgstr "" -#: mod/settings.php:919 +#: mod/settings.php:928 msgid "Mobile Theme:" msgstr "" -#: mod/settings.php:920 +#: mod/settings.php:929 msgid "Update browser every xx seconds" msgstr "" -#: mod/settings.php:920 +#: mod/settings.php:929 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: mod/settings.php:921 +#: mod/settings.php:930 msgid "Number of items to display per page:" msgstr "" -#: mod/settings.php:921 mod/settings.php:922 +#: mod/settings.php:930 mod/settings.php:931 msgid "Maximum of 100 items" msgstr "" -#: mod/settings.php:922 +#: mod/settings.php:931 msgid "Number of items to display per page when viewed from mobile device:" msgstr "" -#: mod/settings.php:923 +#: mod/settings.php:932 msgid "Don't show emoticons" msgstr "" -#: mod/settings.php:924 +#: mod/settings.php:933 msgid "Don't show notices" msgstr "" -#: mod/settings.php:925 +#: mod/settings.php:934 msgid "Infinite scroll" msgstr "" -#: mod/settings.php:926 +#: mod/settings.php:935 msgid "Automatic updates only at the top of the network page" msgstr "" -#: mod/settings.php:928 view/theme/cleanzero/config.php:82 +#: mod/settings.php:937 view/theme/cleanzero/config.php:82 #: view/theme/dispy/config.php:72 view/theme/quattro/config.php:66 #: view/theme/diabook/config.php:150 view/theme/vier/config.php:58 #: view/theme/duepuntozero/config.php:61 msgid "Theme settings" msgstr "" -#: mod/settings.php:1004 +#: mod/settings.php:1013 msgid "User Types" msgstr "" -#: mod/settings.php:1005 +#: mod/settings.php:1014 msgid "Community Types" msgstr "" -#: mod/settings.php:1006 +#: mod/settings.php:1015 msgid "Normal Account Page" msgstr "" -#: mod/settings.php:1007 +#: mod/settings.php:1016 msgid "This account is a normal personal profile" msgstr "" -#: mod/settings.php:1010 +#: mod/settings.php:1019 msgid "Soapbox Page" msgstr "" -#: mod/settings.php:1011 +#: mod/settings.php:1020 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: mod/settings.php:1014 +#: mod/settings.php:1023 msgid "Community Forum/Celebrity Account" msgstr "" -#: mod/settings.php:1015 +#: mod/settings.php:1024 msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: mod/settings.php:1018 +#: mod/settings.php:1027 msgid "Automatic Friend Page" msgstr "" -#: mod/settings.php:1019 +#: mod/settings.php:1028 msgid "Automatically approve all connection/friend requests as friends" msgstr "" -#: mod/settings.php:1022 +#: mod/settings.php:1031 msgid "Private Forum [Experimental]" msgstr "" -#: mod/settings.php:1023 +#: mod/settings.php:1032 msgid "Private forum - approved members only" msgstr "" -#: mod/settings.php:1035 +#: mod/settings.php:1044 msgid "OpenID:" msgstr "" -#: mod/settings.php:1035 +#: mod/settings.php:1044 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: mod/settings.php:1045 +#: mod/settings.php:1054 msgid "Publish your default profile in your local site directory?" msgstr "" -#: mod/settings.php:1051 +#: mod/settings.php:1060 msgid "Publish your default profile in the global social directory?" msgstr "" -#: mod/settings.php:1059 +#: mod/settings.php:1068 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "" -#: mod/settings.php:1063 include/acl_selectors.php:330 +#: mod/settings.php:1072 include/acl_selectors.php:330 msgid "Hide your profile details from unknown viewers?" msgstr "" -#: mod/settings.php:1063 +#: mod/settings.php:1072 msgid "" "If enabled, posting public messages to Diaspora and other networks isn't " "possible." msgstr "" -#: mod/settings.php:1068 +#: mod/settings.php:1077 msgid "Allow friends to post to your profile page?" msgstr "" -#: mod/settings.php:1074 +#: mod/settings.php:1083 msgid "Allow friends to tag your posts?" msgstr "" -#: mod/settings.php:1080 +#: mod/settings.php:1089 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: mod/settings.php:1086 +#: mod/settings.php:1095 msgid "Permit unknown people to send you private mail?" msgstr "" -#: mod/settings.php:1094 +#: mod/settings.php:1103 msgid "Profile is not published." msgstr "" -#: mod/settings.php:1102 +#: mod/settings.php:1111 msgid "Your Identity Address is" msgstr "" -#: mod/settings.php:1111 +#: mod/settings.php:1120 msgid "Automatically expire posts after this many days:" msgstr "" -#: mod/settings.php:1111 +#: mod/settings.php:1120 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: mod/settings.php:1112 +#: mod/settings.php:1121 msgid "Advanced expiration settings" msgstr "" -#: mod/settings.php:1113 +#: mod/settings.php:1122 msgid "Advanced Expiration" msgstr "" -#: mod/settings.php:1114 +#: mod/settings.php:1123 msgid "Expire posts:" msgstr "" -#: mod/settings.php:1115 +#: mod/settings.php:1124 msgid "Expire personal notes:" msgstr "" -#: mod/settings.php:1116 +#: mod/settings.php:1125 msgid "Expire starred posts:" msgstr "" -#: mod/settings.php:1117 +#: mod/settings.php:1126 msgid "Expire photos:" msgstr "" -#: mod/settings.php:1118 +#: mod/settings.php:1127 msgid "Only expire posts by others:" msgstr "" -#: mod/settings.php:1144 +#: mod/settings.php:1153 msgid "Account Settings" msgstr "" -#: mod/settings.php:1152 +#: mod/settings.php:1161 msgid "Password Settings" msgstr "" -#: mod/settings.php:1153 mod/register.php:271 +#: mod/settings.php:1162 mod/register.php:271 msgid "New Password:" msgstr "" -#: mod/settings.php:1154 mod/register.php:272 +#: mod/settings.php:1163 mod/register.php:272 msgid "Confirm:" msgstr "" -#: mod/settings.php:1154 +#: mod/settings.php:1163 msgid "Leave password fields blank unless changing" msgstr "" -#: mod/settings.php:1155 +#: mod/settings.php:1164 msgid "Current Password:" msgstr "" -#: mod/settings.php:1155 mod/settings.php:1156 +#: mod/settings.php:1164 mod/settings.php:1165 msgid "Your current password to confirm the changes" msgstr "" -#: mod/settings.php:1156 +#: mod/settings.php:1165 msgid "Password:" msgstr "" -#: mod/settings.php:1160 +#: mod/settings.php:1169 msgid "Basic Settings" msgstr "" -#: mod/settings.php:1161 include/identity.php:538 +#: mod/settings.php:1170 include/identity.php:538 msgid "Full Name:" msgstr "" -#: mod/settings.php:1162 +#: mod/settings.php:1171 msgid "Email Address:" msgstr "" -#: mod/settings.php:1163 +#: mod/settings.php:1172 msgid "Your Timezone:" msgstr "" -#: mod/settings.php:1164 +#: mod/settings.php:1173 msgid "Default Post Location:" msgstr "" -#: mod/settings.php:1165 +#: mod/settings.php:1174 msgid "Use Browser Location:" msgstr "" -#: mod/settings.php:1168 +#: mod/settings.php:1177 msgid "Security and Privacy Settings" msgstr "" -#: mod/settings.php:1170 +#: mod/settings.php:1179 msgid "Maximum Friend Requests/Day:" msgstr "" -#: mod/settings.php:1170 mod/settings.php:1200 +#: mod/settings.php:1179 mod/settings.php:1209 msgid "(to prevent spam abuse)" msgstr "" -#: mod/settings.php:1171 +#: mod/settings.php:1180 msgid "Default Post Permissions" msgstr "" -#: mod/settings.php:1172 +#: mod/settings.php:1181 msgid "(click to open/close)" msgstr "" -#: mod/settings.php:1181 mod/photos.php:1166 mod/photos.php:1538 +#: mod/settings.php:1190 mod/photos.php:1166 mod/photos.php:1538 msgid "Show to Groups" msgstr "" -#: mod/settings.php:1182 mod/photos.php:1167 mod/photos.php:1539 +#: mod/settings.php:1191 mod/photos.php:1167 mod/photos.php:1539 msgid "Show to Contacts" msgstr "" -#: mod/settings.php:1183 +#: mod/settings.php:1192 msgid "Default Private Post" msgstr "" -#: mod/settings.php:1184 +#: mod/settings.php:1193 msgid "Default Public Post" msgstr "" -#: mod/settings.php:1188 +#: mod/settings.php:1197 msgid "Default Permissions for New Posts" msgstr "" -#: mod/settings.php:1200 +#: mod/settings.php:1209 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: mod/settings.php:1203 +#: mod/settings.php:1212 msgid "Notification Settings" msgstr "" -#: mod/settings.php:1204 +#: mod/settings.php:1213 msgid "By default post a status message when:" msgstr "" -#: mod/settings.php:1205 +#: mod/settings.php:1214 msgid "accepting a friend request" msgstr "" -#: mod/settings.php:1206 +#: mod/settings.php:1215 msgid "joining a forum/community" msgstr "" -#: mod/settings.php:1207 +#: mod/settings.php:1216 msgid "making an interesting profile change" msgstr "" -#: mod/settings.php:1208 +#: mod/settings.php:1217 msgid "Send a notification email when:" msgstr "" -#: mod/settings.php:1209 +#: mod/settings.php:1218 msgid "You receive an introduction" msgstr "" -#: mod/settings.php:1210 +#: mod/settings.php:1219 msgid "Your introductions are confirmed" msgstr "" -#: mod/settings.php:1211 +#: mod/settings.php:1220 msgid "Someone writes on your profile wall" msgstr "" -#: mod/settings.php:1212 +#: mod/settings.php:1221 msgid "Someone writes a followup comment" msgstr "" -#: mod/settings.php:1213 +#: mod/settings.php:1222 msgid "You receive a private message" msgstr "" -#: mod/settings.php:1214 +#: mod/settings.php:1223 msgid "You receive a friend suggestion" msgstr "" -#: mod/settings.php:1215 +#: mod/settings.php:1224 msgid "You are tagged in a post" msgstr "" -#: mod/settings.php:1216 +#: mod/settings.php:1225 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: mod/settings.php:1218 +#: mod/settings.php:1227 msgid "Activate desktop notifications" msgstr "" -#: mod/settings.php:1218 +#: mod/settings.php:1227 msgid "Show desktop popup on new notifications" msgstr "" -#: mod/settings.php:1220 +#: mod/settings.php:1229 msgid "Text-only notification emails" msgstr "" -#: mod/settings.php:1222 +#: mod/settings.php:1231 msgid "Send text only notification emails, without the html part" msgstr "" -#: mod/settings.php:1224 +#: mod/settings.php:1233 msgid "Advanced Account/Page Type Settings" msgstr "" -#: mod/settings.php:1225 +#: mod/settings.php:1234 msgid "Change the behaviour of this account for special situations" msgstr "" -#: mod/settings.php:1228 +#: mod/settings.php:1237 msgid "Relocate" msgstr "" -#: mod/settings.php:1229 +#: mod/settings.php:1238 msgid "" "If you have moved this profile from another server, and some of your " "contacts don't receive your updates, try pushing this button." msgstr "" -#: mod/settings.php:1230 +#: mod/settings.php:1239 msgid "Resend relocate message to contacts" msgstr "" @@ -4600,7 +4647,7 @@ msgstr "" msgid "System down for maintenance" msgstr "" -#: mod/search.php:99 include/text.php:977 include/nav.php:119 +#: mod/search.php:99 include/text.php:989 include/nav.php:119 msgid "Search" msgstr "" @@ -4634,10 +4681,6 @@ msgstr "" msgid "Gender: " msgstr "" -#: mod/directory.php:154 include/identity.php:270 include/identity.php:540 -msgid "Gender:" -msgstr "" - #: mod/directory.php:156 include/identity.php:273 include/identity.php:560 msgid "Status:" msgstr "" @@ -4646,10 +4689,6 @@ msgstr "" msgid "Homepage:" msgstr "" -#: mod/directory.php:160 include/identity.php:277 include/identity.php:581 -msgid "About:" -msgstr "" - #: mod/directory.php:205 msgid "No entries (some entries may be hidden)." msgstr "" @@ -5217,7 +5256,7 @@ msgstr "" msgid "Visible to:" msgstr "" -#: mod/notes.php:44 include/identity.php:670 +#: mod/notes.php:44 include/identity.php:675 msgid "Personal Notes" msgstr "" @@ -5372,7 +5411,7 @@ msgstr "" msgid "Contact Photos" msgstr "" -#: mod/photos.php:84 include/identity.php:649 +#: mod/photos.php:84 include/identity.php:651 msgid "Photo Albums" msgstr "" @@ -6213,10 +6252,6 @@ msgstr "" msgid "for %1$d %2$s" msgstr "" -#: include/identity.php:575 -msgid "Tags:" -msgstr "" - #: include/identity.php:579 msgid "Religion:" msgstr "" @@ -6265,19 +6300,19 @@ msgstr "" msgid "Status Messages and Posts" msgstr "" -#: include/identity.php:642 +#: include/identity.php:643 msgid "Profile Details" msgstr "" -#: include/identity.php:653 include/identity.php:656 include/nav.php:79 +#: include/identity.php:656 include/identity.php:659 include/nav.php:79 msgid "Videos" msgstr "" -#: include/identity.php:666 +#: include/identity.php:670 msgid "Events and Calendar" msgstr "" -#: include/identity.php:673 +#: include/identity.php:678 msgid "Only You Can See This" msgstr "" @@ -6366,7 +6401,7 @@ msgid "" msgstr "" #: include/conversation.php:118 include/conversation.php:245 -#: include/text.php:1998 view/theme/diabook/theme.php:463 +#: include/text.php:2013 view/theme/diabook/theme.php:463 msgid "event" msgstr "" @@ -6511,247 +6546,251 @@ msgstr "" msgid "The end" msgstr "" -#: include/text.php:878 +#: include/text.php:884 msgid "No contacts" msgstr "" -#: include/text.php:887 +#: include/text.php:899 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: include/text.php:1027 +#: include/text.php:1039 msgid "poke" msgstr "" -#: include/text.php:1027 +#: include/text.php:1039 msgid "poked" msgstr "" -#: include/text.php:1028 +#: include/text.php:1040 msgid "ping" msgstr "" -#: include/text.php:1028 +#: include/text.php:1040 msgid "pinged" msgstr "" -#: include/text.php:1029 +#: include/text.php:1041 msgid "prod" msgstr "" -#: include/text.php:1029 +#: include/text.php:1041 msgid "prodded" msgstr "" -#: include/text.php:1030 +#: include/text.php:1042 msgid "slap" msgstr "" -#: include/text.php:1030 +#: include/text.php:1042 msgid "slapped" msgstr "" -#: include/text.php:1031 +#: include/text.php:1043 msgid "finger" msgstr "" -#: include/text.php:1031 +#: include/text.php:1043 msgid "fingered" msgstr "" -#: include/text.php:1032 +#: include/text.php:1044 msgid "rebuff" msgstr "" -#: include/text.php:1032 +#: include/text.php:1044 msgid "rebuffed" msgstr "" -#: include/text.php:1046 +#: include/text.php:1058 msgid "happy" msgstr "" -#: include/text.php:1047 +#: include/text.php:1059 msgid "sad" msgstr "" -#: include/text.php:1048 +#: include/text.php:1060 msgid "mellow" msgstr "" -#: include/text.php:1049 +#: include/text.php:1061 msgid "tired" msgstr "" -#: include/text.php:1050 +#: include/text.php:1062 msgid "perky" msgstr "" -#: include/text.php:1051 +#: include/text.php:1063 msgid "angry" msgstr "" -#: include/text.php:1052 +#: include/text.php:1064 msgid "stupified" msgstr "" -#: include/text.php:1053 +#: include/text.php:1065 msgid "puzzled" msgstr "" -#: include/text.php:1054 +#: include/text.php:1066 msgid "interested" msgstr "" -#: include/text.php:1055 +#: include/text.php:1067 msgid "bitter" msgstr "" -#: include/text.php:1056 +#: include/text.php:1068 msgid "cheerful" msgstr "" -#: include/text.php:1057 +#: include/text.php:1069 msgid "alive" msgstr "" -#: include/text.php:1058 +#: include/text.php:1070 msgid "annoyed" msgstr "" -#: include/text.php:1059 +#: include/text.php:1071 msgid "anxious" msgstr "" -#: include/text.php:1060 +#: include/text.php:1072 msgid "cranky" msgstr "" -#: include/text.php:1061 +#: include/text.php:1073 msgid "disturbed" msgstr "" -#: include/text.php:1062 +#: include/text.php:1074 msgid "frustrated" msgstr "" -#: include/text.php:1063 +#: include/text.php:1075 msgid "motivated" msgstr "" -#: include/text.php:1064 +#: include/text.php:1076 msgid "relaxed" msgstr "" -#: include/text.php:1065 +#: include/text.php:1077 msgid "surprised" msgstr "" -#: include/text.php:1235 +#: include/text.php:1247 msgid "Monday" msgstr "" -#: include/text.php:1235 +#: include/text.php:1247 msgid "Tuesday" msgstr "" -#: include/text.php:1235 +#: include/text.php:1247 msgid "Wednesday" msgstr "" -#: include/text.php:1235 +#: include/text.php:1247 msgid "Thursday" msgstr "" -#: include/text.php:1235 +#: include/text.php:1247 msgid "Friday" msgstr "" -#: include/text.php:1235 +#: include/text.php:1247 msgid "Saturday" msgstr "" -#: include/text.php:1235 +#: include/text.php:1247 msgid "Sunday" msgstr "" -#: include/text.php:1239 +#: include/text.php:1251 msgid "January" msgstr "" -#: include/text.php:1239 +#: include/text.php:1251 msgid "February" msgstr "" -#: include/text.php:1239 +#: include/text.php:1251 msgid "March" msgstr "" -#: include/text.php:1239 +#: include/text.php:1251 msgid "April" msgstr "" -#: include/text.php:1239 +#: include/text.php:1251 msgid "May" msgstr "" -#: include/text.php:1239 +#: include/text.php:1251 msgid "June" msgstr "" -#: include/text.php:1239 +#: include/text.php:1251 msgid "July" msgstr "" -#: include/text.php:1239 +#: include/text.php:1251 msgid "August" msgstr "" -#: include/text.php:1239 +#: include/text.php:1251 msgid "September" msgstr "" -#: include/text.php:1239 +#: include/text.php:1251 msgid "October" msgstr "" -#: include/text.php:1239 +#: include/text.php:1251 msgid "November" msgstr "" -#: include/text.php:1239 +#: include/text.php:1251 msgid "December" msgstr "" -#: include/text.php:1461 +#: include/text.php:1473 msgid "bytes" msgstr "" -#: include/text.php:1493 include/text.php:1505 +#: include/text.php:1505 include/text.php:1517 msgid "Click to open/close" msgstr "" -#: include/text.php:1734 include/user.php:255 +#: include/text.php:1691 include/text.php:1692 +msgid "local thread" +msgstr "" + +#: include/text.php:1749 include/user.php:255 #: view/theme/duepuntozero/config.php:44 msgid "default" msgstr "" -#: include/text.php:1746 +#: include/text.php:1761 msgid "Select an alternate language" msgstr "" -#: include/text.php:2002 +#: include/text.php:2017 msgid "activity" msgstr "" -#: include/text.php:2005 +#: include/text.php:2020 msgid "post" msgstr "" -#: include/text.php:2173 +#: include/text.php:2188 msgid "Item filed" msgstr "" @@ -6779,11 +6818,11 @@ msgstr "" msgid "Encrypted content" msgstr "" -#: include/notifier.php:829 include/delivery.php:456 +#: include/notifier.php:830 include/delivery.php:456 msgid "(no subject)" msgstr "" -#: include/notifier.php:839 include/delivery.php:467 include/enotify.php:33 +#: include/notifier.php:840 include/delivery.php:467 include/enotify.php:33 msgid "noreply" msgstr "" @@ -6888,15 +6927,15 @@ msgstr "" msgid "Finishes:" msgstr "" -#: include/plugin.php:455 include/plugin.php:457 +#: include/plugin.php:458 include/plugin.php:460 msgid "Click here to upgrade." msgstr "" -#: include/plugin.php:463 +#: include/plugin.php:466 msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: include/plugin.php:468 +#: include/plugin.php:471 msgid "This action is not available under your subscription plan." msgstr "" @@ -7137,9 +7176,7 @@ msgid "Cannot use that email." msgstr "" #: include/user.php:140 -msgid "" -"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and " -"must also begin with a letter." +msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." msgstr "" #: include/user.php:146 include/user.php:244 @@ -7212,11 +7249,11 @@ msgid "" "\t\tThank you and welcome to %2$s." msgstr "" -#: include/diaspora.php:710 +#: include/diaspora.php:717 msgid "Sharing notification from Diaspora network" msgstr "" -#: include/diaspora.php:2544 +#: include/diaspora.php:2560 msgid "Attachments:" msgstr "" @@ -7768,18 +7805,18 @@ msgstr "" msgid "User creation error" msgstr "" -#: include/uimport.php:171 +#: include/uimport.php:173 msgid "User profile creation error" msgstr "" -#: include/uimport.php:220 +#: include/uimport.php:222 #, php-format msgid "%d contact not imported" msgid_plural "%d contacts not imported" msgstr[0] "" msgstr[1] "" -#: include/uimport.php:290 +#: include/uimport.php:292 msgid "Done. You can now login with your username and password" msgstr "" From 887372a0d777774b4e1b446f28c250949c6b50ed Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 13 Aug 2015 22:49:57 +0200 Subject: [PATCH 2/3] Bugfix: Conversations with Diaspora now work reliable --- include/diaspora.php | 6 ++-- include/message.php | 51 +++++++++++++++-------------- view/templates/diaspora_message.tpl | 3 ++ 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 3640c74959..5b242fe3b8 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1791,7 +1791,7 @@ function diaspora_message($importer,$xml,$msg) { $msg_diaspora_handle = notags(unxmlify($xml->diaspora_handle)); $msg_conversation_guid = notags(unxmlify($xml->conversation_guid)); - $parent_uri = $diaspora_handle . ':' . $msg_parent_guid; + $parent_uri = $msg_diaspora_handle . ':' . $msg_parent_guid; $contact = diaspora_get_contact_by_handle($importer['uid'],$msg_diaspora_handle); if(! $contact) { @@ -2991,7 +2991,7 @@ function diaspora_send_mail($item,$owner,$contact) { $body = bb2diaspora($item['body']); $created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d H:i:s \U\T\C'); - $signed_text = $item['guid'] . ';' . $cnv['guid'] . ';' . $body . ';' + $signed_text = $item['guid'] . ';' . $cnv['guid'] . ';' . $body . ';' . $created . ';' . $myaddr . ';' . $cnv['guid']; $sig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256')); @@ -2999,7 +2999,7 @@ function diaspora_send_mail($item,$owner,$contact) { $msg = array( 'guid' => xmlify($item['guid']), 'parent_guid' => xmlify($cnv['guid']), - 'parent_author_signature' => (($item['reply']) ? null : xmlify($sig)), + 'parent_author_signature' => xmlify($sig), 'author_signature' => xmlify($sig), 'text' => xmlify($body), 'created_at' => xmlify($created), diff --git a/include/message.php b/include/message.php index 07e90fa2df..ac14571721 100644 --- a/include/message.php +++ b/include/message.php @@ -1,16 +1,16 @@ get_baseurl() . ':' . local_user() . ':' . $hash ; - $convid = 0; $reply = false; @@ -43,19 +40,23 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){ ); if(count($r)) $convid = $r[0]['convid']; - } + } + + $recip_host = substr($contact[0]['url'],strpos($contact[0]['url'],'://')+3); + $recip_host = substr($recip_host,0,strpos($recip_host,'/')); + + $recip_handle = (($contact[0]['addr']) ? $contact[0]['addr'] : $contact[0]['nick'] . '@' . $recip_host); + $sender_handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + + $msg_guid = get_guid(32); + $uri = $recip_handle.':'.$msg_guid; if(! $convid) { // create a new conversation - $conv_guid = get_guid(); - - $recip_host = substr($contact[0]['url'],strpos($contact[0]['url'],'://')+3); - $recip_host = substr($recip_host,0,strpos($recip_host,'/')); - - $recip_handle = (($contact[0]['addr']) ? $contact[0]['addr'] : $contact[0]['nick'] . '@' . $recip_host); - $sender_handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + $conv_guid = get_guid(32); + $convuri = $recip_handle.':'.$conv_guid; $handles = $recip_handle . ';' . $sender_handle; @@ -83,15 +84,15 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){ } if(! strlen($replyto)) { - $replyto = $uri; + $replyto = $convuri; } - $r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`, + $r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`, `contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`) VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s' )", intval(local_user()), - dbesc(get_guid()), + dbesc($msg_guid), intval($convid), dbesc($me[0]['name']), dbesc($me[0]['thumb']), @@ -117,7 +118,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){ /** * - * When a photo was uploaded into the message using the (profile wall) ajax + * When a photo was uploaded into the message using the (profile wall) ajax * uploader, The permissions are initially set to disallow anybody but the * owner from seeing it. This is because the permissions may not yet have been * set for the post. If it's private, the photo permissions should be set @@ -143,11 +144,11 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){ dbesc($image_uri), dbesc( t('Wall Photos')), intval(local_user()) - ); + ); } } } - + if($post_id) { proc_run('php',"include/notifier.php","mail","$post_id"); return intval($post_id); @@ -161,13 +162,13 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){ -function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){ +function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){ $a = get_app(); if(! $recipient) return -1; - + if(! strlen($subject)) $subject = t('[no subject]'); @@ -184,7 +185,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){ if(! $me['name']) return -2; - $conv_guid = get_guid(); + $conv_guid = get_guid(32); $recip_handle = $recipient['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); @@ -217,11 +218,11 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){ return -4; } - $r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`, + $r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`, `contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`, `unknown`) VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d )", intval($recipient['uid']), - dbesc(get_guid()), + dbesc(get_guid(32)), intval($convid), dbesc($me['name']), dbesc($me['photo']), diff --git a/view/templates/diaspora_message.tpl b/view/templates/diaspora_message.tpl index fe0ab4b5f4..f9adb833b6 100644 --- a/view/templates/diaspora_message.tpl +++ b/view/templates/diaspora_message.tpl @@ -4,6 +4,9 @@ {{$msg.guid}} {{$msg.parent_guid}} + {{if $msg.parent_author_signature}} + {{$msg.parent_author_signature}} + {{/if}} {{$msg.author_signature}} {{$msg.text}} {{$msg.created_at}} From 0e9b2c132a4396144dbcf1dda4160973c56e5237 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 14 Aug 2015 00:13:23 +0200 Subject: [PATCH 3/3] Bugfix: There are some problems with Friendica installed in subdirectories --- mod/admin.php | 2 +- mod/regmod.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 21a1c00303..ad6460d9c3 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -857,7 +857,7 @@ function admin_page_users_post(&$a){ $nu_nickname = ( x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); $nu_email = ( x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); - check_form_security_token_redirectOnErr($a->get_baseurl().'/admin/users', 'admin_users'); + check_form_security_token_redirectOnErr('/admin/users', 'admin_users'); if (!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) { require_once('include/user.php'); diff --git a/mod/regmod.php b/mod/regmod.php index 53e6716f26..3ab43b105c 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -121,13 +121,13 @@ function regmod_content(&$a) { if($cmd === 'deny') { user_deny($hash); - goaway("/admin/users/"); + goaway($a->get_baseurl()."/admin/users/"); killme(); } if($cmd === 'allow') { user_allow($hash); - goaway("/admin/users/"); + goaway($a->get_baseurl()."/admin/users/"); killme(); } }