From beccd12a2bcd282a7854f6b0c4b53c0558b3470a Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 23 Feb 2021 09:57:33 +0100 Subject: [PATCH 1/2] Issue 9064: referring INSTALL.txt now points to doc/INSTALL.md --- src/Core/Installer.php | 2 +- src/Module/Install.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Core/Installer.php b/src/Core/Installer.php index 85538d579..2824b072c 100644 --- a/src/Core/Installer.php +++ b/src/Core/Installer.php @@ -505,7 +505,7 @@ class Installer $help = DI::l10n()->t('The web installer needs to be able to create a file called "local.config.php" in the "config" folder of your web server and it is unable to do so.') . EOL; $help .= DI::l10n()->t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.') . EOL; $help .= DI::l10n()->t('At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica "config" folder.') . EOL; - $help .= DI::l10n()->t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.') . EOL; + $help .= DI::l10n()->t('You can alternatively skip this procedure and perform a manual installation. Please see the file "doc/INSTALL.md" for instructions.') . EOL; } $this->addCheck(DI::l10n()->t('config/local.config.php is writable'), $status, false, $help); diff --git a/src/Module/Install.php b/src/Module/Install.php index 3ad38041e..95644ae62 100644 --- a/src/Module/Install.php +++ b/src/Module/Install.php @@ -351,7 +351,7 @@ class Install extends BaseModule return DI::l10n()->t('

What next

') . "

" . DI::l10n()->t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.') - . DI::l10n()->t('Please see the file "INSTALL.txt".') + . DI::l10n()->t('Please see the file "doc/INSTALL.md".') . "

" . DI::l10n()->t('Go to your new Friendica node registration page and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.', $baseurl) . "

"; From 61ff7fc53286e9a4fbd6c67b7cfb6fd03859f0f8 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 23 Feb 2021 10:08:30 +0100 Subject: [PATCH 2/2] regen messages.po --- view/lang/C/messages.po | 2230 ++++++++++++++++++++------------------- 1 file changed, 1153 insertions(+), 1077 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index e080c5ff9..7a3197f17 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2021.03-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-01-23 05:36-0500\n" +"POT-Creation-Date: 2021-02-23 10:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,28 +18,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" -#: include/api.php:1129 +#: include/api.php:1127 #, php-format msgid "Daily posting limit of %d post reached. The post was rejected." msgid_plural "Daily posting limit of %d posts reached. The post was rejected." msgstr[0] "" msgstr[1] "" -#: include/api.php:1143 +#: include/api.php:1141 #, php-format msgid "Weekly posting limit of %d post reached. The post was rejected." msgid_plural "Weekly posting limit of %d posts reached. The post was rejected." msgstr[0] "" msgstr[1] "" -#: include/api.php:1157 +#: include/api.php:1155 #, php-format msgid "Monthly posting limit of %d post reached. The post was rejected." msgstr "" -#: include/api.php:4454 mod/photos.php:107 mod/photos.php:211 +#: include/api.php:4452 mod/photos.php:107 mod/photos.php:211 #: mod/photos.php:639 mod/photos.php:1043 mod/photos.php:1060 -#: mod/photos.php:1607 src/Model/User.php:1045 src/Model/User.php:1053 +#: mod/photos.php:1609 src/Model/User.php:1045 src/Model/User.php:1053 #: src/Model/User.php:1061 src/Module/Settings/Profile/Photo/Crop.php:97 #: src/Module/Settings/Profile/Photo/Crop.php:113 #: src/Module/Settings/Profile/Photo/Crop.php:129 @@ -49,178 +49,178 @@ msgstr "" msgid "Profile Photos" msgstr "" -#: include/conversation.php:190 +#: include/conversation.php:195 #, php-format msgid "%1$s poked %2$s" msgstr "" -#: include/conversation.php:222 src/Model/Item.php:2763 +#: include/conversation.php:227 src/Model/Item.php:2484 msgid "event" msgstr "" -#: include/conversation.php:225 include/conversation.php:234 mod/tagger.php:90 +#: include/conversation.php:230 include/conversation.php:239 mod/tagger.php:90 msgid "status" msgstr "" -#: include/conversation.php:230 mod/tagger.php:90 src/Model/Item.php:2765 +#: include/conversation.php:235 mod/tagger.php:90 src/Model/Item.php:2486 msgid "photo" msgstr "" -#: include/conversation.php:244 mod/tagger.php:123 +#: include/conversation.php:249 mod/tagger.php:123 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: include/conversation.php:560 mod/photos.php:1468 src/Object/Post.php:238 +#: include/conversation.php:564 mod/photos.php:1470 src/Object/Post.php:231 msgid "Select" msgstr "" -#: include/conversation.php:561 mod/photos.php:1469 mod/settings.php:564 -#: mod/settings.php:706 src/Module/Admin/Users/Active.php:139 +#: include/conversation.php:565 mod/photos.php:1471 mod/settings.php:567 +#: mod/settings.php:709 src/Module/Admin/Users/Active.php:139 #: src/Module/Admin/Users/Blocked.php:140 src/Module/Admin/Users/Index.php:153 #: src/Module/Contact.php:886 src/Module/Contact.php:1190 msgid "Delete" msgstr "" -#: include/conversation.php:596 src/Object/Post.php:457 src/Object/Post.php:458 +#: include/conversation.php:600 src/Object/Post.php:447 src/Object/Post.php:448 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: include/conversation.php:609 src/Object/Post.php:445 +#: include/conversation.php:613 src/Object/Post.php:435 msgid "Categories:" msgstr "" -#: include/conversation.php:610 src/Object/Post.php:446 +#: include/conversation.php:614 src/Object/Post.php:436 msgid "Filed under:" msgstr "" -#: include/conversation.php:617 src/Object/Post.php:471 +#: include/conversation.php:621 src/Object/Post.php:461 #, php-format msgid "%s from %s" msgstr "" -#: include/conversation.php:632 +#: include/conversation.php:636 msgid "View in context" msgstr "" -#: include/conversation.php:634 include/conversation.php:1216 -#: mod/editpost.php:104 mod/message.php:205 mod/message.php:375 -#: mod/photos.php:1534 mod/wallmessage.php:155 src/Module/Item/Compose.php:159 -#: src/Object/Post.php:505 +#: include/conversation.php:638 include/conversation.php:1222 +#: mod/editpost.php:104 mod/message.php:204 mod/message.php:374 +#: mod/photos.php:1536 mod/wallmessage.php:155 src/Module/Item/Compose.php:159 +#: src/Object/Post.php:495 msgid "Please wait" msgstr "" -#: include/conversation.php:698 +#: include/conversation.php:702 msgid "remove" msgstr "" -#: include/conversation.php:703 +#: include/conversation.php:707 msgid "Delete Selected Items" msgstr "" -#: include/conversation.php:740 include/conversation.php:743 -#: include/conversation.php:746 include/conversation.php:749 +#: include/conversation.php:744 include/conversation.php:747 +#: include/conversation.php:750 include/conversation.php:753 #, php-format msgid "You had been addressed (%s)." msgstr "" -#: include/conversation.php:752 +#: include/conversation.php:756 #, php-format msgid "You are following %s." msgstr "" -#: include/conversation.php:755 +#: include/conversation.php:759 msgid "Tagged" msgstr "" -#: include/conversation.php:766 include/conversation.php:1109 -#: include/conversation.php:1147 +#: include/conversation.php:772 include/conversation.php:1115 +#: include/conversation.php:1153 #, php-format msgid "%s reshared this." msgstr "" -#: include/conversation.php:768 +#: include/conversation.php:774 msgid "Reshared" msgstr "" -#: include/conversation.php:768 +#: include/conversation.php:774 #, php-format msgid "Reshared by %s" msgstr "" -#: include/conversation.php:771 +#: include/conversation.php:777 #, php-format msgid "%s is participating in this thread." msgstr "" -#: include/conversation.php:774 +#: include/conversation.php:780 msgid "Stored" msgstr "" -#: include/conversation.php:777 +#: include/conversation.php:783 msgid "Global" msgstr "" -#: include/conversation.php:780 +#: include/conversation.php:786 msgid "Relayed" msgstr "" -#: include/conversation.php:780 +#: include/conversation.php:786 #, php-format msgid "Relayed by %s." msgstr "" -#: include/conversation.php:783 +#: include/conversation.php:789 msgid "Fetched" msgstr "" -#: include/conversation.php:783 +#: include/conversation.php:789 #, php-format msgid "Fetched because of %s" msgstr "" -#: include/conversation.php:942 view/theme/frio/theme.php:321 +#: include/conversation.php:948 view/theme/frio/theme.php:321 msgid "Follow Thread" msgstr "" -#: include/conversation.php:943 src/Model/Contact.php:984 +#: include/conversation.php:949 src/Model/Contact.php:983 msgid "View Status" msgstr "" -#: include/conversation.php:944 include/conversation.php:966 -#: src/Model/Contact.php:910 src/Model/Contact.php:976 -#: src/Model/Contact.php:985 src/Module/Directory.php:166 +#: include/conversation.php:950 include/conversation.php:972 +#: src/Model/Contact.php:909 src/Model/Contact.php:975 +#: src/Model/Contact.php:984 src/Module/Directory.php:166 #: src/Module/Settings/Profile/Index.php:240 msgid "View Profile" msgstr "" -#: include/conversation.php:945 src/Model/Contact.php:986 +#: include/conversation.php:951 src/Model/Contact.php:985 msgid "View Photos" msgstr "" -#: include/conversation.php:946 src/Model/Contact.php:977 -#: src/Model/Contact.php:987 +#: include/conversation.php:952 src/Model/Contact.php:976 +#: src/Model/Contact.php:986 msgid "Network Posts" msgstr "" -#: include/conversation.php:947 src/Model/Contact.php:978 -#: src/Model/Contact.php:988 +#: include/conversation.php:953 src/Model/Contact.php:977 +#: src/Model/Contact.php:987 msgid "View Contact" msgstr "" -#: include/conversation.php:948 src/Model/Contact.php:990 +#: include/conversation.php:954 src/Model/Contact.php:989 msgid "Send PM" msgstr "" -#: include/conversation.php:949 src/Module/Admin/Blocklist/Contact.php:84 +#: include/conversation.php:955 src/Module/Admin/Blocklist/Contact.php:84 #: src/Module/Admin/Users/Active.php:140 src/Module/Admin/Users/Index.php:154 #: src/Module/Contact.php:625 src/Module/Contact.php:883 #: src/Module/Contact.php:1165 msgid "Block" msgstr "" -#: include/conversation.php:950 src/Module/Contact.php:626 +#: include/conversation.php:956 src/Module/Contact.php:626 #: src/Module/Contact.php:884 src/Module/Contact.php:1173 #: src/Module/Notifications/Introductions.php:113 #: src/Module/Notifications/Introductions.php:191 @@ -228,545 +228,546 @@ msgstr "" msgid "Ignore" msgstr "" -#: include/conversation.php:954 src/Object/Post.php:434 +#: include/conversation.php:960 src/Object/Post.php:424 msgid "Languages" msgstr "" -#: include/conversation.php:958 src/Model/Contact.php:991 +#: include/conversation.php:964 src/Model/Contact.php:990 msgid "Poke" msgstr "" -#: include/conversation.php:963 mod/follow.php:146 src/Content/Widget.php:75 -#: src/Model/Contact.php:979 src/Model/Contact.php:992 +#: include/conversation.php:969 mod/follow.php:146 src/Content/Widget.php:76 +#: src/Model/Contact.php:978 src/Model/Contact.php:991 #: view/theme/vier/theme.php:172 msgid "Connect/Follow" msgstr "" -#: include/conversation.php:1094 +#: include/conversation.php:1100 #, php-format msgid "%s likes this." msgstr "" -#: include/conversation.php:1097 +#: include/conversation.php:1103 #, php-format msgid "%s doesn't like this." msgstr "" -#: include/conversation.php:1100 +#: include/conversation.php:1106 #, php-format msgid "%s attends." msgstr "" -#: include/conversation.php:1103 +#: include/conversation.php:1109 #, php-format msgid "%s doesn't attend." msgstr "" -#: include/conversation.php:1106 +#: include/conversation.php:1112 #, php-format msgid "%s attends maybe." msgstr "" -#: include/conversation.php:1115 +#: include/conversation.php:1121 msgid "and" msgstr "" -#: include/conversation.php:1118 +#: include/conversation.php:1124 #, php-format msgid "and %d other people" msgstr "" -#: include/conversation.php:1126 +#: include/conversation.php:1132 #, php-format msgid "%2$d people like this" msgstr "" -#: include/conversation.php:1127 +#: include/conversation.php:1133 #, php-format msgid "%s like this." msgstr "" -#: include/conversation.php:1130 +#: include/conversation.php:1136 #, php-format msgid "%2$d people don't like this" msgstr "" -#: include/conversation.php:1131 +#: include/conversation.php:1137 #, php-format msgid "%s don't like this." msgstr "" -#: include/conversation.php:1134 +#: include/conversation.php:1140 #, php-format msgid "%2$d people attend" msgstr "" -#: include/conversation.php:1135 +#: include/conversation.php:1141 #, php-format msgid "%s attend." msgstr "" -#: include/conversation.php:1138 +#: include/conversation.php:1144 #, php-format msgid "%2$d people don't attend" msgstr "" -#: include/conversation.php:1139 +#: include/conversation.php:1145 #, php-format msgid "%s don't attend." msgstr "" -#: include/conversation.php:1142 +#: include/conversation.php:1148 #, php-format msgid "%2$d people attend maybe" msgstr "" -#: include/conversation.php:1143 +#: include/conversation.php:1149 #, php-format msgid "%s attend maybe." msgstr "" -#: include/conversation.php:1146 +#: include/conversation.php:1152 #, php-format msgid "%2$d people reshared this" msgstr "" -#: include/conversation.php:1176 +#: include/conversation.php:1182 msgid "Visible to everybody" msgstr "" -#: include/conversation.php:1177 src/Module/Item/Compose.php:153 -#: src/Object/Post.php:972 +#: include/conversation.php:1183 src/Module/Item/Compose.php:153 +#: src/Object/Post.php:962 msgid "Please enter a image/video/audio/webpage URL:" msgstr "" -#: include/conversation.php:1178 +#: include/conversation.php:1184 msgid "Tag term:" msgstr "" -#: include/conversation.php:1179 src/Module/Filer/SaveTag.php:69 +#: include/conversation.php:1185 src/Module/Filer/SaveTag.php:69 msgid "Save to Folder:" msgstr "" -#: include/conversation.php:1180 +#: include/conversation.php:1186 msgid "Where are you right now?" msgstr "" -#: include/conversation.php:1181 +#: include/conversation.php:1187 msgid "Delete item(s)?" msgstr "" -#: include/conversation.php:1191 +#: include/conversation.php:1197 msgid "New Post" msgstr "" -#: include/conversation.php:1194 +#: include/conversation.php:1200 msgid "Share" msgstr "" -#: include/conversation.php:1195 mod/editpost.php:89 mod/photos.php:1382 -#: src/Module/Contact/Poke.php:154 src/Object/Post.php:963 +#: include/conversation.php:1201 mod/editpost.php:89 mod/photos.php:1382 +#: src/Module/Contact/Poke.php:154 src/Object/Post.php:953 msgid "Loading..." msgstr "" -#: include/conversation.php:1196 mod/editpost.php:90 mod/message.php:203 -#: mod/message.php:372 mod/wallmessage.php:153 +#: include/conversation.php:1202 mod/editpost.php:90 mod/message.php:202 +#: mod/message.php:371 mod/wallmessage.php:153 msgid "Upload photo" msgstr "" -#: include/conversation.php:1197 mod/editpost.php:91 +#: include/conversation.php:1203 mod/editpost.php:91 msgid "upload photo" msgstr "" -#: include/conversation.php:1198 mod/editpost.php:92 +#: include/conversation.php:1204 mod/editpost.php:92 msgid "Attach file" msgstr "" -#: include/conversation.php:1199 mod/editpost.php:93 +#: include/conversation.php:1205 mod/editpost.php:93 msgid "attach file" msgstr "" -#: include/conversation.php:1200 src/Module/Item/Compose.php:145 -#: src/Object/Post.php:964 +#: include/conversation.php:1206 src/Module/Item/Compose.php:145 +#: src/Object/Post.php:954 msgid "Bold" msgstr "" -#: include/conversation.php:1201 src/Module/Item/Compose.php:146 -#: src/Object/Post.php:965 +#: include/conversation.php:1207 src/Module/Item/Compose.php:146 +#: src/Object/Post.php:955 msgid "Italic" msgstr "" -#: include/conversation.php:1202 src/Module/Item/Compose.php:147 -#: src/Object/Post.php:966 +#: include/conversation.php:1208 src/Module/Item/Compose.php:147 +#: src/Object/Post.php:956 msgid "Underline" msgstr "" -#: include/conversation.php:1203 src/Module/Item/Compose.php:148 -#: src/Object/Post.php:967 +#: include/conversation.php:1209 src/Module/Item/Compose.php:148 +#: src/Object/Post.php:957 msgid "Quote" msgstr "" -#: include/conversation.php:1204 src/Module/Item/Compose.php:149 -#: src/Object/Post.php:968 +#: include/conversation.php:1210 src/Module/Item/Compose.php:149 +#: src/Object/Post.php:958 msgid "Code" msgstr "" -#: include/conversation.php:1205 src/Module/Item/Compose.php:150 -#: src/Object/Post.php:969 +#: include/conversation.php:1211 src/Module/Item/Compose.php:150 +#: src/Object/Post.php:959 msgid "Image" msgstr "" -#: include/conversation.php:1206 src/Module/Item/Compose.php:151 -#: src/Object/Post.php:970 +#: include/conversation.php:1212 src/Module/Item/Compose.php:151 +#: src/Object/Post.php:960 msgid "Link" msgstr "" -#: include/conversation.php:1207 src/Module/Item/Compose.php:152 -#: src/Object/Post.php:971 +#: include/conversation.php:1213 src/Module/Item/Compose.php:152 +#: src/Object/Post.php:961 msgid "Link or Media" msgstr "" -#: include/conversation.php:1208 mod/editpost.php:100 +#: include/conversation.php:1214 mod/editpost.php:100 #: src/Module/Item/Compose.php:155 msgid "Set your location" msgstr "" -#: include/conversation.php:1209 mod/editpost.php:101 +#: include/conversation.php:1215 mod/editpost.php:101 msgid "set location" msgstr "" -#: include/conversation.php:1210 mod/editpost.php:102 +#: include/conversation.php:1216 mod/editpost.php:102 msgid "Clear browser location" msgstr "" -#: include/conversation.php:1211 mod/editpost.php:103 +#: include/conversation.php:1217 mod/editpost.php:103 msgid "clear location" msgstr "" -#: include/conversation.php:1213 mod/editpost.php:117 +#: include/conversation.php:1219 mod/editpost.php:117 #: src/Module/Item/Compose.php:160 msgid "Set title" msgstr "" -#: include/conversation.php:1215 mod/editpost.php:119 +#: include/conversation.php:1221 mod/editpost.php:119 #: src/Module/Item/Compose.php:161 msgid "Categories (comma-separated list)" msgstr "" -#: include/conversation.php:1217 mod/editpost.php:105 +#: include/conversation.php:1223 mod/editpost.php:105 msgid "Permission settings" msgstr "" -#: include/conversation.php:1218 mod/editpost.php:134 mod/events.php:578 +#: include/conversation.php:1224 mod/editpost.php:134 mod/events.php:578 #: mod/photos.php:969 mod/photos.php:1335 msgid "Permissions" msgstr "" -#: include/conversation.php:1227 mod/editpost.php:114 +#: include/conversation.php:1233 mod/editpost.php:114 msgid "Public post" msgstr "" -#: include/conversation.php:1231 mod/editpost.php:125 mod/events.php:573 -#: mod/photos.php:1381 mod/photos.php:1438 mod/photos.php:1511 -#: src/Module/Item/Compose.php:154 src/Object/Post.php:973 +#: include/conversation.php:1237 mod/editpost.php:125 mod/events.php:573 +#: mod/photos.php:1381 mod/photos.php:1438 mod/photos.php:1513 +#: src/Module/Item/Compose.php:154 src/Object/Post.php:963 msgid "Preview" msgstr "" -#: include/conversation.php:1235 mod/dfrn_request.php:643 mod/editpost.php:128 +#: include/conversation.php:1241 mod/dfrn_request.php:642 mod/editpost.php:128 #: mod/fbrowser.php:105 mod/fbrowser.php:134 mod/follow.php:152 -#: mod/photos.php:1037 mod/photos.php:1143 mod/settings.php:504 -#: mod/settings.php:530 mod/tagrm.php:37 mod/tagrm.php:127 mod/unfollow.php:100 +#: mod/photos.php:1037 mod/photos.php:1143 mod/settings.php:507 +#: mod/settings.php:533 mod/tagrm.php:37 mod/tagrm.php:127 mod/unfollow.php:100 #: src/Module/Contact.php:459 src/Module/RemoteFollow.php:110 msgid "Cancel" msgstr "" -#: include/conversation.php:1242 mod/editpost.php:132 src/Model/Profile.php:445 +#: include/conversation.php:1248 mod/editpost.php:132 src/Model/Profile.php:445 #: src/Module/Contact.php:344 msgid "Message" msgstr "" -#: include/conversation.php:1243 mod/editpost.php:133 +#: include/conversation.php:1249 mod/editpost.php:133 +#: src/Module/Settings/TwoFactor/Trusted.php:101 msgid "Browser" msgstr "" -#: include/conversation.php:1245 mod/editpost.php:136 +#: include/conversation.php:1251 mod/editpost.php:136 msgid "Open Compose page" msgstr "" -#: include/enotify.php:52 +#: include/enotify.php:51 msgid "[Friendica:Notify]" msgstr "" -#: include/enotify.php:138 +#: include/enotify.php:137 #, php-format msgid "%s New mail received at %s" msgstr "" -#: include/enotify.php:140 +#: include/enotify.php:139 #, php-format msgid "%1$s sent you a new private message at %2$s." msgstr "" -#: include/enotify.php:141 +#: include/enotify.php:140 msgid "a private message" msgstr "" -#: include/enotify.php:141 +#: include/enotify.php:140 #, php-format msgid "%1$s sent you %2$s." msgstr "" -#: include/enotify.php:143 +#: include/enotify.php:142 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: include/enotify.php:190 +#: include/enotify.php:188 #, php-format msgid "%1$s replied to you on %2$s's %3$s %4$s" msgstr "" -#: include/enotify.php:192 +#: include/enotify.php:190 #, php-format msgid "%1$s tagged you on %2$s's %3$s %4$s" msgstr "" -#: include/enotify.php:194 +#: include/enotify.php:192 #, php-format msgid "%1$s commented on %2$s's %3$s %4$s" msgstr "" -#: include/enotify.php:204 +#: include/enotify.php:202 #, php-format msgid "%1$s replied to you on your %2$s %3$s" msgstr "" -#: include/enotify.php:206 +#: include/enotify.php:204 #, php-format msgid "%1$s tagged you on your %2$s %3$s" msgstr "" -#: include/enotify.php:208 +#: include/enotify.php:206 #, php-format msgid "%1$s commented on your %2$s %3$s" msgstr "" -#: include/enotify.php:215 +#: include/enotify.php:213 #, php-format msgid "%1$s replied to you on their %2$s %3$s" msgstr "" -#: include/enotify.php:217 +#: include/enotify.php:215 #, php-format msgid "%1$s tagged you on their %2$s %3$s" msgstr "" -#: include/enotify.php:219 +#: include/enotify.php:217 #, php-format msgid "%1$s commented on their %2$s %3$s" msgstr "" -#: include/enotify.php:230 +#: include/enotify.php:228 #, php-format msgid "%s %s tagged you" msgstr "" -#: include/enotify.php:232 +#: include/enotify.php:230 #, php-format msgid "%1$s tagged you at %2$s" msgstr "" -#: include/enotify.php:234 +#: include/enotify.php:232 #, php-format msgid "%1$s Comment to conversation #%2$d by %3$s" msgstr "" -#: include/enotify.php:236 +#: include/enotify.php:234 #, php-format msgid "%s commented on an item/conversation you have been following." msgstr "" -#: include/enotify.php:241 include/enotify.php:256 include/enotify.php:281 -#: include/enotify.php:300 include/enotify.php:316 +#: include/enotify.php:239 include/enotify.php:254 include/enotify.php:279 +#: include/enotify.php:298 include/enotify.php:314 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: include/enotify.php:248 +#: include/enotify.php:246 #, php-format msgid "%s %s posted to your profile wall" msgstr "" -#: include/enotify.php:250 +#: include/enotify.php:248 #, php-format msgid "%1$s posted to your profile wall at %2$s" msgstr "" -#: include/enotify.php:251 +#: include/enotify.php:249 #, php-format msgid "%1$s posted to [url=%2$s]your wall[/url]" msgstr "" -#: include/enotify.php:264 +#: include/enotify.php:262 #, php-format msgid "%s %s shared a new post" msgstr "" -#: include/enotify.php:266 +#: include/enotify.php:264 #, php-format msgid "%1$s shared a new post at %2$s" msgstr "" -#: include/enotify.php:267 +#: include/enotify.php:265 #, php-format msgid "%1$s [url=%2$s]shared a post[/url]." msgstr "" -#: include/enotify.php:272 +#: include/enotify.php:270 #, php-format msgid "%s %s shared a post from %s" msgstr "" -#: include/enotify.php:274 +#: include/enotify.php:272 #, php-format msgid "%1$s shared a post from %2$s at %3$s" msgstr "" -#: include/enotify.php:275 +#: include/enotify.php:273 #, php-format msgid "%1$s [url=%2$s]shared a post[/url] from %3$s." msgstr "" -#: include/enotify.php:288 +#: include/enotify.php:286 #, php-format msgid "%1$s %2$s poked you" msgstr "" -#: include/enotify.php:290 +#: include/enotify.php:288 #, php-format msgid "%1$s poked you at %2$s" msgstr "" -#: include/enotify.php:291 +#: include/enotify.php:289 #, php-format msgid "%1$s [url=%2$s]poked you[/url]." msgstr "" -#: include/enotify.php:308 +#: include/enotify.php:306 #, php-format msgid "%s %s tagged your post" msgstr "" -#: include/enotify.php:310 +#: include/enotify.php:308 #, php-format msgid "%1$s tagged your post at %2$s" msgstr "" -#: include/enotify.php:311 +#: include/enotify.php:309 #, php-format msgid "%1$s tagged [url=%2$s]your post[/url]" msgstr "" -#: include/enotify.php:323 +#: include/enotify.php:321 #, php-format msgid "%s Introduction received" msgstr "" -#: include/enotify.php:325 +#: include/enotify.php:323 #, php-format msgid "You've received an introduction from '%1$s' at %2$s" msgstr "" -#: include/enotify.php:326 +#: include/enotify.php:324 #, php-format msgid "You've received [url=%1$s]an introduction[/url] from %2$s." msgstr "" -#: include/enotify.php:331 include/enotify.php:377 +#: include/enotify.php:329 include/enotify.php:375 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: include/enotify.php:333 +#: include/enotify.php:331 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: include/enotify.php:340 +#: include/enotify.php:338 #, php-format msgid "%s A new person is sharing with you" msgstr "" -#: include/enotify.php:342 include/enotify.php:343 +#: include/enotify.php:340 include/enotify.php:341 #, php-format msgid "%1$s is sharing with you at %2$s" msgstr "" -#: include/enotify.php:350 +#: include/enotify.php:348 #, php-format msgid "%s You have a new follower" msgstr "" -#: include/enotify.php:352 include/enotify.php:353 +#: include/enotify.php:350 include/enotify.php:351 #, php-format msgid "You have a new follower at %2$s : %1$s" msgstr "" -#: include/enotify.php:366 +#: include/enotify.php:364 #, php-format msgid "%s Friend suggestion received" msgstr "" -#: include/enotify.php:368 +#: include/enotify.php:366 #, php-format msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "" -#: include/enotify.php:369 +#: include/enotify.php:367 #, php-format msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s." msgstr "" -#: include/enotify.php:375 +#: include/enotify.php:373 msgid "Name:" msgstr "" -#: include/enotify.php:376 +#: include/enotify.php:374 msgid "Photo:" msgstr "" -#: include/enotify.php:379 +#: include/enotify.php:377 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: include/enotify.php:387 include/enotify.php:402 +#: include/enotify.php:385 include/enotify.php:400 #, php-format msgid "%s Connection accepted" msgstr "" -#: include/enotify.php:389 include/enotify.php:404 +#: include/enotify.php:387 include/enotify.php:402 #, php-format msgid "'%1$s' has accepted your connection request at %2$s" msgstr "" -#: include/enotify.php:390 include/enotify.php:405 +#: include/enotify.php:388 include/enotify.php:403 #, php-format msgid "%2$s has accepted your [url=%1$s]connection request[/url]." msgstr "" -#: include/enotify.php:395 +#: include/enotify.php:393 msgid "" "You are now mutual friends and may exchange status updates, photos, and " "email without restriction." msgstr "" -#: include/enotify.php:397 +#: include/enotify.php:395 #, php-format msgid "Please visit %s if you wish to make any changes to this relationship." msgstr "" -#: include/enotify.php:410 +#: include/enotify.php:408 #, php-format msgid "" "'%1$s' has chosen to accept you a fan, which restricts some forms of " @@ -775,37 +776,37 @@ msgid "" "automatically." msgstr "" -#: include/enotify.php:412 +#: include/enotify.php:410 #, php-format msgid "" "'%1$s' may choose to extend this into a two-way or more permissive " "relationship in the future." msgstr "" -#: include/enotify.php:414 +#: include/enotify.php:412 #, php-format msgid "Please visit %s if you wish to make any changes to this relationship." msgstr "" -#: include/enotify.php:424 mod/removeme.php:63 +#: include/enotify.php:422 mod/removeme.php:63 msgid "[Friendica System Notify]" msgstr "" -#: include/enotify.php:424 +#: include/enotify.php:422 msgid "registration request" msgstr "" -#: include/enotify.php:426 +#: include/enotify.php:424 #, php-format msgid "You've received a registration request from '%1$s' at %2$s" msgstr "" -#: include/enotify.php:427 +#: include/enotify.php:425 #, php-format msgid "You've received a [url=%1$s]registration request[/url] from %2$s." msgstr "" -#: include/enotify.php:432 +#: include/enotify.php:430 #, php-format msgid "" "Full Name:\t%s\n" @@ -813,24 +814,24 @@ msgid "" "Login Name:\t%s (%s)" msgstr "" -#: include/enotify.php:438 +#: include/enotify.php:436 #, php-format msgid "Please visit %s to approve or reject the request." msgstr "" -#: mod/api.php:52 mod/api.php:57 mod/dfrn_confirm.php:79 mod/editpost.php:37 -#: mod/events.php:231 mod/follow.php:55 mod/follow.php:135 mod/item.php:183 -#: mod/item.php:188 mod/item.php:905 mod/message.php:70 mod/message.php:113 +#: mod/api.php:52 mod/api.php:57 mod/dfrn_confirm.php:78 mod/editpost.php:37 +#: mod/events.php:231 mod/follow.php:55 mod/follow.php:135 mod/item.php:182 +#: mod/item.php:187 mod/item.php:898 mod/message.php:69 mod/message.php:112 #: mod/notes.php:44 mod/ostatus_subscribe.php:30 mod/photos.php:176 #: mod/photos.php:922 mod/repair_ostatus.php:31 mod/settings.php:47 -#: mod/settings.php:65 mod/settings.php:493 mod/suggest.php:34 +#: mod/settings.php:65 mod/settings.php:496 mod/suggest.php:34 #: mod/uimport.php:32 mod/unfollow.php:35 mod/unfollow.php:50 -#: mod/unfollow.php:82 mod/wallmessage.php:35 mod/wallmessage.php:59 -#: mod/wallmessage.php:96 mod/wallmessage.php:120 mod/wall_attach.php:78 -#: mod/wall_attach.php:81 mod/wall_upload.php:99 mod/wall_upload.php:102 +#: mod/unfollow.php:82 mod/wall_attach.php:78 mod/wall_attach.php:81 +#: mod/wall_upload.php:99 mod/wall_upload.php:102 mod/wallmessage.php:35 +#: mod/wallmessage.php:59 mod/wallmessage.php:96 mod/wallmessage.php:120 #: src/Module/Attach.php:56 src/Module/BaseApi.php:59 src/Module/BaseApi.php:65 -#: src/Module/BaseNotifications.php:88 src/Module/Contact/Advanced.php:43 -#: src/Module/Contact.php:385 src/Module/Delegation.php:118 +#: src/Module/BaseNotifications.php:88 src/Module/Contact.php:385 +#: src/Module/Contact/Advanced.php:43 src/Module/Delegation.php:118 #: src/Module/FollowConfirm.php:16 src/Module/FriendSuggest.php:44 #: src/Module/Group.php:45 src/Module/Group.php:90 src/Module/Invite.php:40 #: src/Module/Invite.php:128 src/Module/Notifications/Notification.php:47 @@ -877,7 +878,9 @@ msgstr "" #: mod/cal.php:46 mod/cal.php:50 mod/follow.php:38 mod/redir.php:34 #: mod/redir.php:203 src/Module/Conversation/Community.php:194 #: src/Module/Debug/ItemBody.php:38 src/Module/Diaspora/Receive.php:51 -#: src/Module/Item/Ignore.php:41 +#: src/Module/Item/Follow.php:42 src/Module/Item/Ignore.php:41 +#: src/Module/Item/Pin.php:42 src/Module/Item/Pin.php:57 +#: src/Module/Item/Star.php:42 msgid "Access denied." msgstr "" @@ -888,7 +891,7 @@ msgstr "" msgid "User not found." msgstr "" -#: mod/cal.php:143 mod/display.php:287 src/Module/Profile/Profile.php:94 +#: mod/cal.php:143 mod/display.php:281 src/Module/Profile/Profile.php:94 #: src/Module/Profile/Profile.php:109 src/Module/Profile/Status.php:109 #: src/Module/Update/Profile.php:55 msgid "Access to this profile has been restricted." @@ -913,21 +916,21 @@ msgstr "" msgid "Next" msgstr "" -#: mod/cal.php:280 mod/events.php:426 src/Model/Event.php:460 +#: mod/cal.php:280 mod/events.php:426 src/Model/Event.php:463 msgid "today" msgstr "" -#: mod/cal.php:281 mod/events.php:427 src/Model/Event.php:461 +#: mod/cal.php:281 mod/events.php:427 src/Model/Event.php:464 #: src/Util/Temporal.php:330 msgid "month" msgstr "" -#: mod/cal.php:282 mod/events.php:428 src/Model/Event.php:462 +#: mod/cal.php:282 mod/events.php:428 src/Model/Event.php:465 #: src/Util/Temporal.php:331 msgid "week" msgstr "" -#: mod/cal.php:283 mod/events.php:429 src/Model/Event.php:463 +#: mod/cal.php:283 mod/events.php:429 src/Model/Event.php:466 #: src/Util/Temporal.php:332 msgid "day" msgstr "" @@ -956,80 +959,80 @@ msgstr "" msgid "calendar" msgstr "" -#: mod/dfrn_confirm.php:85 src/Module/Profile/Profile.php:82 +#: mod/dfrn_confirm.php:84 src/Module/Profile/Profile.php:82 msgid "Profile not found." msgstr "" -#: mod/dfrn_confirm.php:140 mod/redir.php:56 mod/redir.php:157 +#: mod/dfrn_confirm.php:139 mod/redir.php:56 mod/redir.php:157 #: src/Module/Contact/Advanced.php:53 src/Module/Contact/Advanced.php:104 #: src/Module/Contact/Contacts.php:36 src/Module/FriendSuggest.php:54 #: src/Module/FriendSuggest.php:93 src/Module/Group.php:105 msgid "Contact not found." msgstr "" -#: mod/dfrn_confirm.php:141 +#: mod/dfrn_confirm.php:140 msgid "" "This may occasionally happen if contact was requested by both persons and it " "has already been approved." msgstr "" -#: mod/dfrn_confirm.php:242 +#: mod/dfrn_confirm.php:241 msgid "Response from remote site was not understood." msgstr "" -#: mod/dfrn_confirm.php:249 mod/dfrn_confirm.php:255 +#: mod/dfrn_confirm.php:248 mod/dfrn_confirm.php:254 msgid "Unexpected response from remote site: " msgstr "" -#: mod/dfrn_confirm.php:264 +#: mod/dfrn_confirm.php:263 msgid "Confirmation completed successfully." msgstr "" -#: mod/dfrn_confirm.php:276 +#: mod/dfrn_confirm.php:275 msgid "Temporary failure. Please wait and try again." msgstr "" -#: mod/dfrn_confirm.php:279 +#: mod/dfrn_confirm.php:278 msgid "Introduction failed or was revoked." msgstr "" -#: mod/dfrn_confirm.php:284 +#: mod/dfrn_confirm.php:283 msgid "Remote site reported: " msgstr "" -#: mod/dfrn_confirm.php:389 +#: mod/dfrn_confirm.php:388 #, php-format msgid "No user record found for '%s' " msgstr "" -#: mod/dfrn_confirm.php:399 +#: mod/dfrn_confirm.php:398 msgid "Our site encryption key is apparently messed up." msgstr "" -#: mod/dfrn_confirm.php:410 +#: mod/dfrn_confirm.php:409 msgid "Empty site URL was provided or URL could not be decrypted by us." msgstr "" -#: mod/dfrn_confirm.php:426 +#: mod/dfrn_confirm.php:425 msgid "Contact record was not found for you on our site." msgstr "" -#: mod/dfrn_confirm.php:440 +#: mod/dfrn_confirm.php:439 #, php-format msgid "Site public key not available in contact record for URL %s." msgstr "" -#: mod/dfrn_confirm.php:456 +#: mod/dfrn_confirm.php:455 msgid "" "The ID provided by your system is a duplicate on our system. It should work " "if you try again." msgstr "" -#: mod/dfrn_confirm.php:467 +#: mod/dfrn_confirm.php:466 msgid "Unable to set your contact credentials on our system." msgstr "" -#: mod/dfrn_confirm.php:523 +#: mod/dfrn_confirm.php:522 msgid "Unable to update your contact profile details on our system" msgstr "" @@ -1038,123 +1041,123 @@ msgstr "" msgid "%1$s welcomes %2$s" msgstr "" -#: mod/dfrn_request.php:114 +#: mod/dfrn_request.php:113 msgid "This introduction has already been accepted." msgstr "" -#: mod/dfrn_request.php:132 mod/dfrn_request.php:370 +#: mod/dfrn_request.php:131 mod/dfrn_request.php:369 msgid "Profile location is not valid or does not contain profile information." msgstr "" -#: mod/dfrn_request.php:136 mod/dfrn_request.php:374 +#: mod/dfrn_request.php:135 mod/dfrn_request.php:373 msgid "Warning: profile location has no identifiable owner name." msgstr "" -#: mod/dfrn_request.php:139 mod/dfrn_request.php:377 +#: mod/dfrn_request.php:138 mod/dfrn_request.php:376 msgid "Warning: profile location has no profile photo." msgstr "" -#: mod/dfrn_request.php:143 mod/dfrn_request.php:381 +#: mod/dfrn_request.php:142 mod/dfrn_request.php:380 #, php-format msgid "%d required parameter was not found at the given location" msgid_plural "%d required parameters were not found at the given location" msgstr[0] "" msgstr[1] "" -#: mod/dfrn_request.php:181 +#: mod/dfrn_request.php:180 msgid "Introduction complete." msgstr "" -#: mod/dfrn_request.php:217 +#: mod/dfrn_request.php:216 msgid "Unrecoverable protocol error." msgstr "" -#: mod/dfrn_request.php:244 src/Module/RemoteFollow.php:54 +#: mod/dfrn_request.php:243 src/Module/RemoteFollow.php:54 msgid "Profile unavailable." msgstr "" -#: mod/dfrn_request.php:265 +#: mod/dfrn_request.php:264 #, php-format msgid "%s has received too many connection requests today." msgstr "" -#: mod/dfrn_request.php:266 +#: mod/dfrn_request.php:265 msgid "Spam protection measures have been invoked." msgstr "" -#: mod/dfrn_request.php:267 +#: mod/dfrn_request.php:266 msgid "Friends are advised to please try again in 24 hours." msgstr "" -#: mod/dfrn_request.php:291 src/Module/RemoteFollow.php:60 +#: mod/dfrn_request.php:290 src/Module/RemoteFollow.php:60 msgid "Invalid locator" msgstr "" -#: mod/dfrn_request.php:327 +#: mod/dfrn_request.php:326 msgid "You have already introduced yourself here." msgstr "" -#: mod/dfrn_request.php:330 +#: mod/dfrn_request.php:329 #, php-format msgid "Apparently you are already friends with %s." msgstr "" -#: mod/dfrn_request.php:350 +#: mod/dfrn_request.php:349 msgid "Invalid profile URL." msgstr "" -#: mod/dfrn_request.php:356 src/Model/Contact.php:2136 +#: mod/dfrn_request.php:355 src/Model/Contact.php:2135 msgid "Disallowed profile URL." msgstr "" -#: mod/dfrn_request.php:362 src/Model/Contact.php:2141 +#: mod/dfrn_request.php:361 src/Model/Contact.php:2140 #: src/Module/Friendica.php:80 msgid "Blocked domain" msgstr "" -#: mod/dfrn_request.php:429 src/Module/Contact.php:157 +#: mod/dfrn_request.php:428 src/Module/Contact.php:157 msgid "Failed to update contact record." msgstr "" -#: mod/dfrn_request.php:449 +#: mod/dfrn_request.php:448 msgid "Your introduction has been sent." msgstr "" -#: mod/dfrn_request.php:481 src/Module/RemoteFollow.php:72 +#: mod/dfrn_request.php:480 src/Module/RemoteFollow.php:72 msgid "" "Remote subscription can't be done for your network. Please subscribe " "directly on your system." msgstr "" -#: mod/dfrn_request.php:497 +#: mod/dfrn_request.php:496 msgid "Please login to confirm introduction." msgstr "" -#: mod/dfrn_request.php:505 +#: mod/dfrn_request.php:504 msgid "" "Incorrect identity currently logged in. Please login to this profile." msgstr "" -#: mod/dfrn_request.php:519 mod/dfrn_request.php:534 +#: mod/dfrn_request.php:518 mod/dfrn_request.php:533 msgid "Confirm" msgstr "" -#: mod/dfrn_request.php:530 +#: mod/dfrn_request.php:529 msgid "Hide this contact" msgstr "" -#: mod/dfrn_request.php:532 +#: mod/dfrn_request.php:531 #, php-format msgid "Welcome home %s." msgstr "" -#: mod/dfrn_request.php:533 +#: mod/dfrn_request.php:532 #, php-format msgid "Please confirm your introduction/connection request to %s." msgstr "" -#: mod/dfrn_request.php:601 mod/display.php:180 mod/photos.php:836 +#: mod/dfrn_request.php:600 mod/display.php:179 mod/photos.php:836 #: mod/videos.php:129 src/Module/Conversation/Community.php:188 #: src/Module/Debug/Probe.php:39 src/Module/Debug/WebFinger.php:38 #: src/Module/Directory.php:49 src/Module/Search/Index.php:51 @@ -1162,11 +1165,11 @@ msgstr "" msgid "Public access denied." msgstr "" -#: mod/dfrn_request.php:637 src/Module/RemoteFollow.php:104 +#: mod/dfrn_request.php:636 src/Module/RemoteFollow.php:104 msgid "Friend/Connection Request" msgstr "" -#: mod/dfrn_request.php:638 +#: mod/dfrn_request.php:637 #, php-format msgid "" "Enter your Webfinger address (user@domain.tld) or profile URL here. If this " @@ -1174,40 +1177,40 @@ msgid "" "you have to subscribe to %s directly on your system" msgstr "" -#: mod/dfrn_request.php:639 src/Module/RemoteFollow.php:106 +#: mod/dfrn_request.php:638 src/Module/RemoteFollow.php:106 #, php-format msgid "" "If you are not yet a member of the free social web, follow " "this link to find a public Friendica node and join us today." msgstr "" -#: mod/dfrn_request.php:640 src/Module/RemoteFollow.php:107 +#: mod/dfrn_request.php:639 src/Module/RemoteFollow.php:107 msgid "Your Webfinger address or profile URL:" msgstr "" -#: mod/dfrn_request.php:641 mod/follow.php:147 src/Module/RemoteFollow.php:108 +#: mod/dfrn_request.php:640 mod/follow.php:147 src/Module/RemoteFollow.php:108 msgid "Please answer the following:" msgstr "" -#: mod/dfrn_request.php:642 mod/follow.php:74 mod/unfollow.php:99 +#: mod/dfrn_request.php:641 mod/follow.php:74 mod/unfollow.php:99 #: src/Module/RemoteFollow.php:109 msgid "Submit Request" msgstr "" -#: mod/dfrn_request.php:649 mod/follow.php:161 +#: mod/dfrn_request.php:648 mod/follow.php:161 #, php-format msgid "%s knows you" msgstr "" -#: mod/dfrn_request.php:650 mod/follow.php:162 +#: mod/dfrn_request.php:649 mod/follow.php:162 msgid "Add a personal note:" msgstr "" -#: mod/display.php:239 mod/display.php:323 +#: mod/display.php:233 mod/display.php:317 msgid "The requested item doesn't exist or has been deleted." msgstr "" -#: mod/display.php:403 +#: mod/display.php:397 msgid "The feed for this item is unavailable." msgstr "" @@ -1224,7 +1227,7 @@ msgstr "" msgid "Save" msgstr "" -#: mod/editpost.php:94 mod/message.php:204 mod/message.php:373 +#: mod/editpost.php:94 mod/message.php:203 mod/message.php:372 #: mod/wallmessage.php:154 msgid "Insert web link" msgstr "" @@ -1249,11 +1252,11 @@ msgstr "" msgid "audio link" msgstr "" -#: mod/editpost.php:113 src/Core/ACL.php:312 +#: mod/editpost.php:113 src/Core/ACL.php:313 msgid "CC: email addresses" msgstr "" -#: mod/editpost.php:120 src/Core/ACL.php:313 +#: mod/editpost.php:120 src/Core/ACL.php:314 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -1293,8 +1296,8 @@ msgstr "" #: src/Module/Install.php:268 src/Module/Install.php:273 #: src/Module/Install.php:287 src/Module/Install.php:302 #: src/Module/Install.php:329 src/Module/Register.php:135 -#: src/Module/Security/TwoFactor/Verify.php:85 -#: src/Module/Settings/TwoFactor/Index.php:128 +#: src/Module/Security/TwoFactor/Verify.php:99 +#: src/Module/Settings/TwoFactor/Index.php:133 #: src/Module/Settings/TwoFactor/Verify.php:141 msgid "Required" msgstr "" @@ -1317,7 +1320,7 @@ msgid "Description:" msgstr "" #: mod/events.php:563 src/Model/Event.php:84 src/Model/Event.php:111 -#: src/Model/Event.php:469 src/Model/Event.php:954 src/Model/Profile.php:358 +#: src/Model/Event.php:472 src/Model/Event.php:959 src/Model/Profile.php:358 #: src/Module/Contact.php:646 src/Module/Directory.php:156 #: src/Module/Notifications/Introductions.php:172 #: src/Module/Profile/Profile.php:190 @@ -1332,27 +1335,27 @@ msgstr "" msgid "Share this event" msgstr "" -#: mod/events.php:575 mod/message.php:206 mod/message.php:374 +#: mod/events.php:575 mod/message.php:205 mod/message.php:373 #: mod/photos.php:951 mod/photos.php:1054 mod/photos.php:1339 -#: mod/photos.php:1380 mod/photos.php:1437 mod/photos.php:1510 -#: src/Module/Contact/Advanced.php:132 src/Module/Contact/Poke.php:155 -#: src/Module/Contact.php:604 src/Module/Debug/Localtime.php:64 +#: mod/photos.php:1380 mod/photos.php:1437 mod/photos.php:1512 +#: src/Module/Contact.php:604 src/Module/Contact/Advanced.php:132 +#: src/Module/Contact/Poke.php:155 src/Module/Debug/Localtime.php:64 #: src/Module/Delegation.php:152 src/Module/FriendSuggest.php:129 #: src/Module/Install.php:234 src/Module/Install.php:276 #: src/Module/Install.php:313 src/Module/Invite.php:175 -#: src/Module/Item/Compose.php:144 src/Module/Profile/Profile.php:242 -#: src/Module/Settings/Profile/Index.php:237 src/Object/Post.php:962 +#: src/Module/Item/Compose.php:144 src/Module/Profile/Profile.php:243 +#: src/Module/Settings/Profile/Index.php:237 src/Object/Post.php:952 #: view/theme/duepuntozero/config.php:69 view/theme/frio/config.php:160 #: view/theme/quattro/config.php:71 view/theme/vier/config.php:119 msgid "Submit" msgstr "" -#: mod/events.php:576 src/Module/Profile/Profile.php:243 +#: mod/events.php:576 src/Module/Profile/Profile.php:244 msgid "Basic" msgstr "" #: mod/events.php:577 src/Module/Admin/Site.php:587 src/Module/Contact.php:953 -#: src/Module/Profile/Profile.php:244 +#: src/Module/Profile/Profile.php:245 msgid "Advanced" msgstr "" @@ -1403,7 +1406,7 @@ msgstr "" #: mod/follow.php:150 src/Module/Contact.php:652 #: src/Module/Notifications/Introductions.php:176 -#: src/Module/Profile/Profile.php:202 +#: src/Module/Profile/Profile.php:203 msgid "Tags:" msgstr "" @@ -1416,32 +1419,27 @@ msgstr "" msgid "The contact could not be added." msgstr "" -#: mod/item.php:134 mod/item.php:138 +#: mod/item.php:133 mod/item.php:137 msgid "Unable to locate original post." msgstr "" -#: mod/item.php:333 mod/item.php:338 +#: mod/item.php:332 mod/item.php:337 msgid "Empty post discarded." msgstr "" -#: mod/item.php:700 +#: mod/item.php:698 msgid "Post updated." msgstr "" -#: mod/item.php:717 mod/item.php:722 +#: mod/item.php:715 mod/item.php:720 msgid "Item wasn't stored." msgstr "" -#: mod/item.php:733 +#: mod/item.php:731 msgid "Item couldn't be fetched." msgstr "" -#: mod/item.php:857 -#, php-format -msgid "Blocked on item with guid %s" -msgstr "" - -#: mod/item.php:884 src/Module/Admin/Themes/Details.php:39 +#: mod/item.php:877 src/Module/Admin/Themes/Details.php:39 #: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:47 #: src/Module/Debug/ItemBody.php:60 msgid "Item not found." @@ -1605,115 +1603,115 @@ msgstr "" msgid "Profile Match" msgstr "" -#: mod/message.php:47 mod/message.php:128 src/Content/Nav.php:276 +#: mod/message.php:46 mod/message.php:127 src/Content/Nav.php:276 msgid "New Message" msgstr "" -#: mod/message.php:84 mod/wallmessage.php:76 +#: mod/message.php:83 mod/wallmessage.php:76 msgid "No recipient selected." msgstr "" -#: mod/message.php:88 +#: mod/message.php:87 msgid "Unable to locate contact information." msgstr "" -#: mod/message.php:91 mod/wallmessage.php:82 +#: mod/message.php:90 mod/wallmessage.php:82 msgid "Message could not be sent." msgstr "" -#: mod/message.php:94 mod/wallmessage.php:85 +#: mod/message.php:93 mod/wallmessage.php:85 msgid "Message collection failure." msgstr "" -#: mod/message.php:122 src/Module/Notifications/Introductions.php:114 +#: mod/message.php:121 src/Module/Notifications/Introductions.php:114 #: src/Module/Notifications/Introductions.php:155 #: src/Module/Notifications/Notification.php:56 msgid "Discard" msgstr "" -#: mod/message.php:135 src/Content/Nav.php:273 view/theme/frio/theme.php:234 +#: mod/message.php:134 src/Content/Nav.php:273 view/theme/frio/theme.php:234 msgid "Messages" msgstr "" -#: mod/message.php:148 +#: mod/message.php:147 msgid "Conversation not found." msgstr "" -#: mod/message.php:153 +#: mod/message.php:152 msgid "Message was not deleted." msgstr "" -#: mod/message.php:171 +#: mod/message.php:170 msgid "Conversation was not removed." msgstr "" -#: mod/message.php:185 mod/message.php:298 mod/wallmessage.php:137 +#: mod/message.php:184 mod/message.php:297 mod/wallmessage.php:137 msgid "Please enter a link URL:" msgstr "" -#: mod/message.php:194 mod/wallmessage.php:142 +#: mod/message.php:193 mod/wallmessage.php:142 msgid "Send Private Message" msgstr "" -#: mod/message.php:195 mod/message.php:364 mod/wallmessage.php:144 +#: mod/message.php:194 mod/message.php:363 mod/wallmessage.php:144 msgid "To:" msgstr "" -#: mod/message.php:196 mod/message.php:365 mod/wallmessage.php:145 +#: mod/message.php:195 mod/message.php:364 mod/wallmessage.php:145 msgid "Subject:" msgstr "" -#: mod/message.php:200 mod/message.php:368 mod/wallmessage.php:151 +#: mod/message.php:199 mod/message.php:367 mod/wallmessage.php:151 #: src/Module/Invite.php:168 msgid "Your message:" msgstr "" -#: mod/message.php:234 +#: mod/message.php:233 msgid "No messages." msgstr "" -#: mod/message.php:290 +#: mod/message.php:289 msgid "Message not available." msgstr "" -#: mod/message.php:340 +#: mod/message.php:339 msgid "Delete message" msgstr "" -#: mod/message.php:342 mod/message.php:469 +#: mod/message.php:341 mod/message.php:468 msgid "D, d M Y - g:i A" msgstr "" -#: mod/message.php:357 mod/message.php:466 +#: mod/message.php:356 mod/message.php:465 msgid "Delete conversation" msgstr "" -#: mod/message.php:359 +#: mod/message.php:358 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: mod/message.php:363 +#: mod/message.php:362 msgid "Send Reply" msgstr "" -#: mod/message.php:445 +#: mod/message.php:444 #, php-format msgid "Unknown sender - %s" msgstr "" -#: mod/message.php:447 +#: mod/message.php:446 #, php-format msgid "You and %s" msgstr "" -#: mod/message.php:449 +#: mod/message.php:448 #, php-format msgid "%s and You" msgstr "" -#: mod/message.php:472 +#: mod/message.php:471 #, php-format msgid "%d message" msgid_plural "%d messages" @@ -1756,7 +1754,7 @@ msgstr "" msgid "failed" msgstr "" -#: mod/ostatus_subscribe.php:98 src/Object/Post.php:318 +#: mod/ostatus_subscribe.php:98 src/Object/Post.php:309 msgid "ignored" msgstr "" @@ -1768,11 +1766,11 @@ msgstr "" msgid "Photo Albums" msgstr "" -#: mod/photos.php:130 mod/photos.php:1636 +#: mod/photos.php:130 mod/photos.php:1638 msgid "Recent Photos" msgstr "" -#: mod/photos.php:132 mod/photos.php:1105 mod/photos.php:1638 +#: mod/photos.php:132 mod/photos.php:1105 mod/photos.php:1640 msgid "Upload New Photos" msgstr "" @@ -1891,7 +1889,7 @@ msgstr "" msgid "Show Oldest First" msgstr "" -#: mod/photos.php:1090 mod/photos.php:1621 +#: mod/photos.php:1090 mod/photos.php:1623 msgid "View Photo" msgstr "" @@ -1971,38 +1969,38 @@ msgstr "" msgid "Rotate CCW (left)" msgstr "" -#: mod/photos.php:1377 mod/photos.php:1434 mod/photos.php:1507 +#: mod/photos.php:1377 mod/photos.php:1434 mod/photos.php:1509 #: src/Module/Contact.php:1096 src/Module/Item/Compose.php:142 -#: src/Object/Post.php:959 +#: src/Object/Post.php:949 msgid "This is you" msgstr "" -#: mod/photos.php:1379 mod/photos.php:1436 mod/photos.php:1509 -#: src/Object/Post.php:499 src/Object/Post.php:961 +#: mod/photos.php:1379 mod/photos.php:1436 mod/photos.php:1511 +#: src/Object/Post.php:489 src/Object/Post.php:951 msgid "Comment" msgstr "" -#: mod/photos.php:1531 +#: mod/photos.php:1533 msgid "Like" msgstr "" -#: mod/photos.php:1532 src/Object/Post.php:358 +#: mod/photos.php:1534 src/Object/Post.php:348 msgid "I like this (toggle)" msgstr "" -#: mod/photos.php:1533 +#: mod/photos.php:1535 msgid "Dislike" msgstr "" -#: mod/photos.php:1535 src/Object/Post.php:359 +#: mod/photos.php:1537 src/Object/Post.php:349 msgid "I don't like this (toggle)" msgstr "" -#: mod/photos.php:1557 +#: mod/photos.php:1559 msgid "Map" msgstr "" -#: mod/photos.php:1627 mod/videos.php:259 +#: mod/photos.php:1629 mod/videos.php:259 msgid "View Album" msgstr "" @@ -2057,7 +2055,7 @@ msgid "Resubscribing to OStatus contacts" msgstr "" #: mod/repair_ostatus.php:50 src/Module/Debug/ActivityPubConversion.php:130 -#: src/Module/Debug/Babel.php:293 src/Module/Security/TwoFactor/Verify.php:82 +#: src/Module/Debug/Babel.php:298 src/Module/Security/TwoFactor/Verify.php:96 msgid "Error" msgid_plural "Errors" msgstr[0] "" @@ -2067,7 +2065,7 @@ msgstr[1] "" msgid "Missing some important data!" msgstr "" -#: mod/settings.php:92 mod/settings.php:529 src/Module/Contact.php:882 +#: mod/settings.php:92 mod/settings.php:532 src/Module/Contact.php:882 msgid "Update" msgstr "" @@ -2103,44 +2101,44 @@ msgstr "" msgid "Password unchanged." msgstr "" -#: mod/settings.php:368 +#: mod/settings.php:370 msgid "Please use a shorter name." msgstr "" -#: mod/settings.php:371 +#: mod/settings.php:373 msgid "Name too short." msgstr "" -#: mod/settings.php:378 +#: mod/settings.php:380 msgid "Wrong Password." msgstr "" -#: mod/settings.php:383 +#: mod/settings.php:385 msgid "Invalid email." msgstr "" -#: mod/settings.php:389 +#: mod/settings.php:391 msgid "Cannot change to that email." msgstr "" -#: mod/settings.php:426 +#: mod/settings.php:429 msgid "Private forum has no privacy permissions. Using default privacy group." msgstr "" -#: mod/settings.php:429 +#: mod/settings.php:432 msgid "Private forum has no privacy permissions and no default privacy group." msgstr "" -#: mod/settings.php:446 +#: mod/settings.php:449 msgid "Settings were not updated." msgstr "" -#: mod/settings.php:502 mod/settings.php:528 mod/settings.php:562 +#: mod/settings.php:505 mod/settings.php:531 mod/settings.php:565 msgid "Add application" msgstr "" -#: mod/settings.php:503 mod/settings.php:610 mod/settings.php:708 -#: mod/settings.php:843 src/Module/Admin/Addons/Index.php:69 +#: mod/settings.php:506 mod/settings.php:613 mod/settings.php:711 +#: mod/settings.php:846 src/Module/Admin/Addons/Index.php:69 #: src/Module/Admin/Features.php:87 src/Module/Admin/Logs/Settings.php:82 #: src/Module/Admin/Site.php:582 src/Module/Admin/Themes/Index.php:113 #: src/Module/Admin/Tos.php:66 src/Module/Settings/Delegation.php:170 @@ -2148,7 +2146,7 @@ msgstr "" msgid "Save Settings" msgstr "" -#: mod/settings.php:505 mod/settings.php:531 +#: mod/settings.php:508 mod/settings.php:534 #: src/Module/Admin/Blocklist/Contact.php:90 #: src/Module/Admin/Users/Active.php:129 src/Module/Admin/Users/Blocked.php:130 #: src/Module/Admin/Users/Create.php:71 src/Module/Admin/Users/Deleted.php:88 @@ -2157,100 +2155,100 @@ msgstr "" msgid "Name" msgstr "" -#: mod/settings.php:506 mod/settings.php:532 +#: mod/settings.php:509 mod/settings.php:535 msgid "Consumer Key" msgstr "" -#: mod/settings.php:507 mod/settings.php:533 +#: mod/settings.php:510 mod/settings.php:536 msgid "Consumer Secret" msgstr "" -#: mod/settings.php:508 mod/settings.php:534 +#: mod/settings.php:511 mod/settings.php:537 msgid "Redirect" msgstr "" -#: mod/settings.php:509 mod/settings.php:535 +#: mod/settings.php:512 mod/settings.php:538 msgid "Icon url" msgstr "" -#: mod/settings.php:520 +#: mod/settings.php:523 msgid "You can't edit this application." msgstr "" -#: mod/settings.php:561 +#: mod/settings.php:564 msgid "Connected Apps" msgstr "" -#: mod/settings.php:563 src/Object/Post.php:192 src/Object/Post.php:194 +#: mod/settings.php:566 src/Object/Post.php:192 src/Object/Post.php:194 msgid "Edit" msgstr "" -#: mod/settings.php:565 +#: mod/settings.php:568 msgid "Client key starts with" msgstr "" -#: mod/settings.php:566 +#: mod/settings.php:569 msgid "No name" msgstr "" -#: mod/settings.php:567 +#: mod/settings.php:570 msgid "Remove authorization" msgstr "" -#: mod/settings.php:578 +#: mod/settings.php:581 msgid "No Addon settings configured" msgstr "" -#: mod/settings.php:587 +#: mod/settings.php:590 msgid "Addon Settings" msgstr "" -#: mod/settings.php:608 +#: mod/settings.php:611 msgid "Additional Features" msgstr "" -#: mod/settings.php:633 +#: mod/settings.php:636 msgid "Diaspora (Socialhome, Hubzilla)" msgstr "" -#: mod/settings.php:633 mod/settings.php:634 +#: mod/settings.php:636 mod/settings.php:637 msgid "enabled" msgstr "" -#: mod/settings.php:633 mod/settings.php:634 +#: mod/settings.php:636 mod/settings.php:637 msgid "disabled" msgstr "" -#: mod/settings.php:633 mod/settings.php:634 +#: mod/settings.php:636 mod/settings.php:637 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: mod/settings.php:634 +#: mod/settings.php:637 msgid "OStatus (GNU Social)" msgstr "" -#: mod/settings.php:665 +#: mod/settings.php:668 msgid "Email access is disabled on this site." msgstr "" -#: mod/settings.php:670 mod/settings.php:706 +#: mod/settings.php:673 mod/settings.php:709 msgid "None" msgstr "" -#: mod/settings.php:676 src/Module/BaseSettings.php:80 +#: mod/settings.php:679 src/Module/BaseSettings.php:80 msgid "Social Networks" msgstr "" -#: mod/settings.php:681 +#: mod/settings.php:684 msgid "General Social Media Settings" msgstr "" -#: mod/settings.php:682 +#: mod/settings.php:685 msgid "Accept only top level posts by contacts you follow" msgstr "" -#: mod/settings.php:682 +#: mod/settings.php:685 msgid "" "The system does an auto completion of threads when a comment arrives. This " "has got the side effect that you can receive posts that had been started by " @@ -2259,11 +2257,11 @@ msgid "" "posts from people you really do follow." msgstr "" -#: mod/settings.php:683 +#: mod/settings.php:686 msgid "Disable Content Warning" msgstr "" -#: mod/settings.php:683 +#: mod/settings.php:686 msgid "" "Users on networks like Mastodon or Pleroma are able to set a content warning " "field which collapse their post by default. This disables the automatic " @@ -2271,227 +2269,227 @@ msgid "" "any other content filtering you eventually set up." msgstr "" -#: mod/settings.php:684 +#: mod/settings.php:687 msgid "Disable intelligent shortening" msgstr "" -#: mod/settings.php:684 +#: mod/settings.php:687 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:685 +#: mod/settings.php:688 msgid "Attach the link title" msgstr "" -#: mod/settings.php:685 +#: mod/settings.php:688 msgid "" "When activated, the title of the attached link will be added as a title on " "posts to Diaspora. This is mostly helpful with \"remote-self\" contacts that " "share feed content." msgstr "" -#: mod/settings.php:686 +#: mod/settings.php:689 msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" msgstr "" -#: mod/settings.php:686 +#: mod/settings.php:689 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:687 +#: mod/settings.php:690 msgid "Default group for OStatus contacts" msgstr "" -#: mod/settings.php:688 +#: mod/settings.php:691 msgid "Your legacy GNU Social account" msgstr "" -#: mod/settings.php:688 +#: mod/settings.php:691 msgid "" "If you enter your old GNU Social/Statusnet account name here (in the format " "user@domain.tld), your contacts will be added automatically. The field will " "be emptied when done." msgstr "" -#: mod/settings.php:691 +#: mod/settings.php:694 msgid "Repair OStatus subscriptions" msgstr "" -#: mod/settings.php:695 +#: mod/settings.php:698 msgid "Email/Mailbox Setup" msgstr "" -#: mod/settings.php:696 +#: mod/settings.php:699 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:697 +#: mod/settings.php:700 msgid "Last successful email check:" msgstr "" -#: mod/settings.php:699 +#: mod/settings.php:702 msgid "IMAP server name:" msgstr "" -#: mod/settings.php:700 +#: mod/settings.php:703 msgid "IMAP port:" msgstr "" -#: mod/settings.php:701 +#: mod/settings.php:704 msgid "Security:" msgstr "" -#: mod/settings.php:702 +#: mod/settings.php:705 msgid "Email login name:" msgstr "" -#: mod/settings.php:703 +#: mod/settings.php:706 msgid "Email password:" msgstr "" -#: mod/settings.php:704 +#: mod/settings.php:707 msgid "Reply-to address:" msgstr "" -#: mod/settings.php:705 +#: mod/settings.php:708 msgid "Send public posts to all email contacts:" msgstr "" -#: mod/settings.php:706 +#: mod/settings.php:709 msgid "Action after import:" msgstr "" -#: mod/settings.php:706 src/Content/Nav.php:270 +#: mod/settings.php:709 src/Content/Nav.php:270 msgid "Mark as seen" msgstr "" -#: mod/settings.php:706 +#: mod/settings.php:709 msgid "Move to folder" msgstr "" -#: mod/settings.php:707 +#: mod/settings.php:710 msgid "Move to folder:" msgstr "" -#: mod/settings.php:721 +#: mod/settings.php:724 msgid "Unable to find your profile. Please contact your admin." msgstr "" -#: mod/settings.php:757 src/Content/Widget.php:529 +#: mod/settings.php:760 src/Content/Widget.php:536 msgid "Account Types" msgstr "" -#: mod/settings.php:758 +#: mod/settings.php:761 msgid "Personal Page Subtypes" msgstr "" -#: mod/settings.php:759 +#: mod/settings.php:762 msgid "Community Forum Subtypes" msgstr "" -#: mod/settings.php:766 src/Module/Admin/BaseUsers.php:106 +#: mod/settings.php:769 src/Module/Admin/BaseUsers.php:106 msgid "Personal Page" msgstr "" -#: mod/settings.php:767 +#: mod/settings.php:770 msgid "Account for a personal profile." msgstr "" -#: mod/settings.php:770 src/Module/Admin/BaseUsers.php:107 +#: mod/settings.php:773 src/Module/Admin/BaseUsers.php:107 msgid "Organisation Page" msgstr "" -#: mod/settings.php:771 +#: mod/settings.php:774 msgid "" "Account for an organisation that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: mod/settings.php:774 src/Module/Admin/BaseUsers.php:108 +#: mod/settings.php:777 src/Module/Admin/BaseUsers.php:108 msgid "News Page" msgstr "" -#: mod/settings.php:775 +#: mod/settings.php:778 msgid "" "Account for a news reflector that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: mod/settings.php:778 src/Module/Admin/BaseUsers.php:109 +#: mod/settings.php:781 src/Module/Admin/BaseUsers.php:109 msgid "Community Forum" msgstr "" -#: mod/settings.php:779 +#: mod/settings.php:782 msgid "Account for community discussions." msgstr "" -#: mod/settings.php:782 src/Module/Admin/BaseUsers.php:99 +#: mod/settings.php:785 src/Module/Admin/BaseUsers.php:99 msgid "Normal Account Page" msgstr "" -#: mod/settings.php:783 +#: mod/settings.php:786 msgid "" "Account for a regular personal profile that requires manual approval of " "\"Friends\" and \"Followers\"." msgstr "" -#: mod/settings.php:786 src/Module/Admin/BaseUsers.php:100 +#: mod/settings.php:789 src/Module/Admin/BaseUsers.php:100 msgid "Soapbox Page" msgstr "" -#: mod/settings.php:787 +#: mod/settings.php:790 msgid "" "Account for a public profile that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: mod/settings.php:790 src/Module/Admin/BaseUsers.php:101 +#: mod/settings.php:793 src/Module/Admin/BaseUsers.php:101 msgid "Public Forum" msgstr "" -#: mod/settings.php:791 +#: mod/settings.php:794 msgid "Automatically approves all contact requests." msgstr "" -#: mod/settings.php:794 src/Module/Admin/BaseUsers.php:102 +#: mod/settings.php:797 src/Module/Admin/BaseUsers.php:102 msgid "Automatic Friend Page" msgstr "" -#: mod/settings.php:795 +#: mod/settings.php:798 msgid "" "Account for a popular profile that automatically approves contact requests " "as \"Friends\"." msgstr "" -#: mod/settings.php:798 +#: mod/settings.php:801 msgid "Private Forum [Experimental]" msgstr "" -#: mod/settings.php:799 +#: mod/settings.php:802 msgid "Requires manual approval of contact requests." msgstr "" -#: mod/settings.php:810 +#: mod/settings.php:813 msgid "OpenID:" msgstr "" -#: mod/settings.php:810 +#: mod/settings.php:813 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: mod/settings.php:818 +#: mod/settings.php:821 msgid "Publish your profile in your local site directory?" msgstr "" -#: mod/settings.php:818 +#: mod/settings.php:821 #, php-format msgid "" "Your profile will be published in this node's local " @@ -2499,115 +2497,115 @@ msgid "" "system settings." msgstr "" -#: mod/settings.php:824 +#: mod/settings.php:827 #, php-format msgid "" "Your profile will also be published in the global friendica directories (e." "g. %s)." msgstr "" -#: mod/settings.php:830 +#: mod/settings.php:833 #, php-format msgid "Your Identity Address is '%s' or '%s'." msgstr "" -#: mod/settings.php:841 +#: mod/settings.php:844 msgid "Account Settings" msgstr "" -#: mod/settings.php:849 +#: mod/settings.php:852 msgid "Password Settings" msgstr "" -#: mod/settings.php:850 src/Module/Register.php:149 +#: mod/settings.php:853 src/Module/Register.php:149 msgid "New Password:" msgstr "" -#: mod/settings.php:850 +#: mod/settings.php:853 msgid "" "Allowed characters are a-z, A-Z, 0-9 and special characters except white " "spaces, accentuated letters and colon (:)." msgstr "" -#: mod/settings.php:851 src/Module/Register.php:150 +#: mod/settings.php:854 src/Module/Register.php:150 msgid "Confirm:" msgstr "" -#: mod/settings.php:851 +#: mod/settings.php:854 msgid "Leave password fields blank unless changing" msgstr "" -#: mod/settings.php:852 +#: mod/settings.php:855 msgid "Current Password:" msgstr "" -#: mod/settings.php:852 +#: mod/settings.php:855 msgid "Your current password to confirm the changes" msgstr "" -#: mod/settings.php:853 +#: mod/settings.php:856 msgid "Password:" msgstr "" -#: mod/settings.php:853 +#: mod/settings.php:856 msgid "Your current password to confirm the changes of the email address" msgstr "" -#: mod/settings.php:856 +#: mod/settings.php:859 msgid "Delete OpenID URL" msgstr "" -#: mod/settings.php:858 +#: mod/settings.php:861 msgid "Basic Settings" msgstr "" -#: mod/settings.php:859 src/Module/Profile/Profile.php:144 +#: mod/settings.php:862 src/Module/Profile/Profile.php:144 msgid "Full Name:" msgstr "" -#: mod/settings.php:860 +#: mod/settings.php:863 msgid "Email Address:" msgstr "" -#: mod/settings.php:861 +#: mod/settings.php:864 msgid "Your Timezone:" msgstr "" -#: mod/settings.php:862 +#: mod/settings.php:865 msgid "Your Language:" msgstr "" -#: mod/settings.php:862 +#: mod/settings.php:865 msgid "" "Set the language we use to show you friendica interface and to send you " "emails" msgstr "" -#: mod/settings.php:863 +#: mod/settings.php:866 msgid "Default Post Location:" msgstr "" -#: mod/settings.php:864 +#: mod/settings.php:867 msgid "Use Browser Location:" msgstr "" -#: mod/settings.php:866 +#: mod/settings.php:869 msgid "Security and Privacy Settings" msgstr "" -#: mod/settings.php:868 +#: mod/settings.php:871 msgid "Maximum Friend Requests/Day:" msgstr "" -#: mod/settings.php:868 mod/settings.php:878 +#: mod/settings.php:871 mod/settings.php:881 msgid "(to prevent spam abuse)" msgstr "" -#: mod/settings.php:870 +#: mod/settings.php:873 msgid "Allow your profile to be searchable globally?" msgstr "" -#: mod/settings.php:870 +#: mod/settings.php:873 msgid "" "Activate this setting if you want others to easily find and follow you. Your " "profile will be searchable on remote systems. This setting also determines " @@ -2615,43 +2613,43 @@ msgid "" "indexed or not." msgstr "" -#: mod/settings.php:871 +#: mod/settings.php:874 msgid "Hide your contact/friend list from viewers of your profile?" msgstr "" -#: mod/settings.php:871 +#: mod/settings.php:874 msgid "" "A list of your contacts is displayed on your profile page. Activate this " "option to disable the display of your contact list." msgstr "" -#: mod/settings.php:872 +#: mod/settings.php:875 msgid "Hide your profile details from anonymous viewers?" msgstr "" -#: mod/settings.php:872 +#: mod/settings.php:875 msgid "" "Anonymous visitors will only see your profile picture, your display name and " "the nickname you are using on your profile page. Your public posts and " "replies will still be accessible by other means." msgstr "" -#: mod/settings.php:873 +#: mod/settings.php:876 msgid "Make public posts unlisted" msgstr "" -#: mod/settings.php:873 +#: mod/settings.php:876 msgid "" "Your public posts will not appear on the community pages or in search " "results, nor be sent to relay servers. However they can still appear on " "public feeds on remote servers." msgstr "" -#: mod/settings.php:874 +#: mod/settings.php:877 msgid "Make all posted pictures accessible" msgstr "" -#: mod/settings.php:874 +#: mod/settings.php:877 msgid "" "This option makes every posted picture accessible via the direct link. This " "is a workaround for the problem that most other networks can't handle " @@ -2659,198 +2657,209 @@ msgid "" "public on your photo albums though." msgstr "" -#: mod/settings.php:875 +#: mod/settings.php:878 msgid "Allow friends to post to your profile page?" msgstr "" -#: mod/settings.php:875 +#: mod/settings.php:878 msgid "" "Your contacts may write posts on your profile wall. These posts will be " "distributed to your contacts" msgstr "" -#: mod/settings.php:876 +#: mod/settings.php:879 msgid "Allow friends to tag your posts?" msgstr "" -#: mod/settings.php:876 +#: mod/settings.php:879 msgid "Your contacts can add additional tags to your posts." msgstr "" -#: mod/settings.php:877 +#: mod/settings.php:880 msgid "Permit unknown people to send you private mail?" msgstr "" -#: mod/settings.php:877 +#: mod/settings.php:880 msgid "" "Friendica network users may send you private messages even if they are not " "in your contact list." msgstr "" -#: mod/settings.php:878 +#: mod/settings.php:881 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: mod/settings.php:880 +#: mod/settings.php:883 msgid "Default Post Permissions" msgstr "" -#: mod/settings.php:884 +#: mod/settings.php:887 msgid "Expiration settings" msgstr "" -#: mod/settings.php:885 +#: mod/settings.php:888 msgid "Automatically expire posts after this many days:" msgstr "" -#: mod/settings.php:885 +#: mod/settings.php:888 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: mod/settings.php:886 +#: mod/settings.php:889 msgid "Expire posts" msgstr "" -#: mod/settings.php:886 +#: mod/settings.php:889 msgid "When activated, posts and comments will be expired." msgstr "" -#: mod/settings.php:887 +#: mod/settings.php:890 msgid "Expire personal notes" msgstr "" -#: mod/settings.php:887 +#: mod/settings.php:890 msgid "" "When activated, the personal notes on your profile page will be expired." msgstr "" -#: mod/settings.php:888 +#: mod/settings.php:891 msgid "Expire starred posts" msgstr "" -#: mod/settings.php:888 +#: mod/settings.php:891 msgid "" "Starring posts keeps them from being expired. That behaviour is overwritten " "by this setting." msgstr "" -#: mod/settings.php:889 +#: mod/settings.php:892 msgid "Expire photos" msgstr "" -#: mod/settings.php:889 +#: mod/settings.php:892 msgid "When activated, photos will be expired." msgstr "" -#: mod/settings.php:890 +#: mod/settings.php:893 msgid "Only expire posts by others" msgstr "" -#: mod/settings.php:890 +#: mod/settings.php:893 msgid "" "When activated, your own posts never expire. Then the settings above are " "only valid for posts you received." msgstr "" -#: mod/settings.php:893 +#: mod/settings.php:896 msgid "Notification Settings" msgstr "" -#: mod/settings.php:894 +#: mod/settings.php:897 msgid "Send a notification email when:" msgstr "" -#: mod/settings.php:895 +#: mod/settings.php:898 msgid "You receive an introduction" msgstr "" -#: mod/settings.php:896 +#: mod/settings.php:899 msgid "Your introductions are confirmed" msgstr "" -#: mod/settings.php:897 +#: mod/settings.php:900 msgid "Someone writes on your profile wall" msgstr "" -#: mod/settings.php:898 +#: mod/settings.php:901 msgid "Someone writes a followup comment" msgstr "" -#: mod/settings.php:899 +#: mod/settings.php:902 msgid "You receive a private message" msgstr "" -#: mod/settings.php:900 +#: mod/settings.php:903 msgid "You receive a friend suggestion" msgstr "" -#: mod/settings.php:901 +#: mod/settings.php:904 msgid "You are tagged in a post" msgstr "" -#: mod/settings.php:902 +#: mod/settings.php:905 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: mod/settings.php:904 +#: mod/settings.php:907 msgid "Activate desktop notifications" msgstr "" -#: mod/settings.php:904 +#: mod/settings.php:907 msgid "Show desktop popup on new notifications" msgstr "" -#: mod/settings.php:906 +#: mod/settings.php:909 msgid "Text-only notification emails" msgstr "" -#: mod/settings.php:908 +#: mod/settings.php:911 msgid "Send text only notification emails, without the html part" msgstr "" -#: mod/settings.php:910 +#: mod/settings.php:913 msgid "Show detailled notifications" msgstr "" -#: mod/settings.php:912 +#: mod/settings.php:915 msgid "" "Per default, notifications are condensed to a single notification per item. " "When enabled every notification is displayed." msgstr "" -#: mod/settings.php:914 -msgid "Advanced Account/Page Type Settings" -msgstr "" - -#: mod/settings.php:915 -msgid "Change the behaviour of this account for special situations" -msgstr "" - -#: mod/settings.php:918 -msgid "Import Contacts" +#: mod/settings.php:917 +msgid "Show notifications of ignored contacts" msgstr "" #: mod/settings.php:919 msgid "" +"You don't see posts from ignored contacts. But you still see their comments. " +"This setting controls if you want to still receive regular notifications " +"that are caused by ignored contacts or not." +msgstr "" + +#: mod/settings.php:921 +msgid "Advanced Account/Page Type Settings" +msgstr "" + +#: mod/settings.php:922 +msgid "Change the behaviour of this account for special situations" +msgstr "" + +#: mod/settings.php:925 +msgid "Import Contacts" +msgstr "" + +#: mod/settings.php:926 +msgid "" "Upload a CSV file that contains the handle of your followed accounts in the " "first column you exported from the old account." msgstr "" -#: mod/settings.php:920 +#: mod/settings.php:927 msgid "Upload File" msgstr "" -#: mod/settings.php:922 +#: mod/settings.php:929 msgid "Relocate" msgstr "" -#: mod/settings.php:923 +#: mod/settings.php:930 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:924 +#: mod/settings.php:931 msgid "Resend relocate message to contacts" msgstr "" @@ -2860,7 +2869,7 @@ msgid "" "hours." msgstr "" -#: mod/suggest.php:55 src/Content/Widget.php:78 view/theme/vier/theme.php:175 +#: mod/suggest.php:55 src/Content/Widget.php:79 view/theme/vier/theme.php:175 msgid "Friend Suggestions" msgstr "" @@ -2873,6 +2882,7 @@ msgid "Select a tag to remove: " msgstr "" #: mod/tagrm.php:126 src/Module/Settings/Delegation.php:179 +#: src/Module/Settings/TwoFactor/Trusted.php:104 msgid "Remove" msgstr "" @@ -2937,7 +2947,7 @@ msgstr "" msgid "No videos selected" msgstr "" -#: mod/videos.php:252 src/Model/Item.php:2952 +#: mod/videos.php:252 src/Model/Item.php:2657 msgid "View Video" msgstr "" @@ -2949,26 +2959,6 @@ msgstr "" msgid "Upload New Videos" msgstr "" -#: mod/wallmessage.php:68 mod/wallmessage.php:129 -#, php-format -msgid "Number of daily wall messages for %s exceeded. Message failed." -msgstr "" - -#: mod/wallmessage.php:79 -msgid "Unable to check your home location." -msgstr "" - -#: mod/wallmessage.php:103 mod/wallmessage.php:112 -msgid "No recipient." -msgstr "" - -#: mod/wallmessage.php:143 -#, php-format -msgid "" -"If you wish for %s to respond, please check that the privacy settings on " -"your site allow private mail from unknown senders." -msgstr "" - #: mod/wall_attach.php:42 mod/wall_attach.php:49 mod/wall_attach.php:87 #: mod/wall_upload.php:52 mod/wall_upload.php:63 mod/wall_upload.php:108 #: mod/wall_upload.php:159 mod/wall_upload.php:162 @@ -2996,6 +2986,30 @@ msgstr "" msgid "Wall Photos" msgstr "" +#: mod/wallmessage.php:68 mod/wallmessage.php:129 +#, php-format +msgid "Number of daily wall messages for %s exceeded. Message failed." +msgstr "" + +#: mod/wallmessage.php:79 +msgid "Unable to check your home location." +msgstr "" + +#: mod/wallmessage.php:103 mod/wallmessage.php:112 +msgid "No recipient." +msgstr "" + +#: mod/wallmessage.php:143 +#, php-format +msgid "" +"If you wish for %s to respond, please check that the privacy settings on " +"your site allow private mail from unknown senders." +msgstr "" + +#: src/App.php:309 +msgid "No system theme config value set." +msgstr "" + #: src/App/Module.php:241 msgid "You must be logged in to use addons. " msgstr "" @@ -3023,10 +3037,6 @@ msgstr "" msgid "Page not found." msgstr "" -#: src/App.php:309 -msgid "No system theme config value set." -msgstr "" - #: src/BaseModule.php:150 msgid "" "The form security token was not correct. This probably happened because the " @@ -3037,17 +3047,17 @@ msgstr "" msgid "All contacts" msgstr "" -#: src/BaseModule.php:184 src/Content/Widget.php:237 src/Core/ACL.php:182 +#: src/BaseModule.php:184 src/Content/Widget.php:238 src/Core/ACL.php:183 #: src/Module/Contact.php:852 src/Module/PermissionTooltip.php:77 #: src/Module/PermissionTooltip.php:99 msgid "Followers" msgstr "" -#: src/BaseModule.php:189 src/Content/Widget.php:238 src/Module/Contact.php:853 +#: src/BaseModule.php:189 src/Content/Widget.php:239 src/Module/Contact.php:853 msgid "Following" msgstr "" -#: src/BaseModule.php:194 src/Content/Widget.php:239 src/Module/Contact.php:854 +#: src/BaseModule.php:194 src/Content/Widget.php:240 src/Module/Contact.php:854 msgid "Mutual friends" msgstr "" @@ -3142,102 +3152,102 @@ msgstr "" msgid "older" msgstr "" -#: src/Content/ContactSelector.php:48 +#: src/Content/ContactSelector.php:51 msgid "Frequently" msgstr "" -#: src/Content/ContactSelector.php:49 +#: src/Content/ContactSelector.php:52 msgid "Hourly" msgstr "" -#: src/Content/ContactSelector.php:50 +#: src/Content/ContactSelector.php:53 msgid "Twice daily" msgstr "" -#: src/Content/ContactSelector.php:51 +#: src/Content/ContactSelector.php:54 msgid "Daily" msgstr "" -#: src/Content/ContactSelector.php:52 +#: src/Content/ContactSelector.php:55 msgid "Weekly" msgstr "" -#: src/Content/ContactSelector.php:53 +#: src/Content/ContactSelector.php:56 msgid "Monthly" msgstr "" -#: src/Content/ContactSelector.php:99 +#: src/Content/ContactSelector.php:123 msgid "DFRN" msgstr "" -#: src/Content/ContactSelector.php:100 +#: src/Content/ContactSelector.php:124 msgid "OStatus" msgstr "" -#: src/Content/ContactSelector.php:101 +#: src/Content/ContactSelector.php:125 msgid "RSS/Atom" msgstr "" -#: src/Content/ContactSelector.php:102 src/Module/Admin/Users/Active.php:129 +#: src/Content/ContactSelector.php:126 src/Module/Admin/Users/Active.php:129 #: src/Module/Admin/Users/Blocked.php:130 src/Module/Admin/Users/Create.php:73 #: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:142 #: src/Module/Admin/Users/Index.php:162 src/Module/Admin/Users/Pending.php:104 msgid "Email" msgstr "" -#: src/Content/ContactSelector.php:103 src/Module/Debug/Babel.php:306 +#: src/Content/ContactSelector.php:127 src/Module/Debug/Babel.php:311 msgid "Diaspora" msgstr "" -#: src/Content/ContactSelector.php:104 +#: src/Content/ContactSelector.php:128 msgid "Zot!" msgstr "" -#: src/Content/ContactSelector.php:105 +#: src/Content/ContactSelector.php:129 msgid "LinkedIn" msgstr "" -#: src/Content/ContactSelector.php:106 +#: src/Content/ContactSelector.php:130 msgid "XMPP/IM" msgstr "" -#: src/Content/ContactSelector.php:107 +#: src/Content/ContactSelector.php:131 msgid "MySpace" msgstr "" -#: src/Content/ContactSelector.php:108 +#: src/Content/ContactSelector.php:132 msgid "Google+" msgstr "" -#: src/Content/ContactSelector.php:109 +#: src/Content/ContactSelector.php:133 msgid "pump.io" msgstr "" -#: src/Content/ContactSelector.php:110 +#: src/Content/ContactSelector.php:134 msgid "Twitter" msgstr "" -#: src/Content/ContactSelector.php:111 +#: src/Content/ContactSelector.php:135 msgid "Discourse" msgstr "" -#: src/Content/ContactSelector.php:112 +#: src/Content/ContactSelector.php:136 msgid "Diaspora Connector" msgstr "" -#: src/Content/ContactSelector.php:113 +#: src/Content/ContactSelector.php:137 msgid "GNU Social Connector" msgstr "" -#: src/Content/ContactSelector.php:114 +#: src/Content/ContactSelector.php:138 msgid "ActivityPub" msgstr "" -#: src/Content/ContactSelector.php:115 +#: src/Content/ContactSelector.php:139 msgid "pnut" msgstr "" -#: src/Content/ContactSelector.php:149 +#: src/Content/ContactSelector.php:168 #, php-format msgid "%s (via %s)" msgstr "" @@ -3330,7 +3340,7 @@ msgid "Display membership date in profile" msgstr "" #: src/Content/ForumManager.php:145 src/Content/Nav.php:229 -#: src/Content/Text/HTML.php:902 src/Content/Widget.php:526 +#: src/Content/Text/HTML.php:902 src/Content/Widget.php:533 msgid "Forums" msgstr "" @@ -3338,12 +3348,12 @@ msgstr "" msgid "External link to forum" msgstr "" -#: src/Content/ForumManager.php:150 src/Content/Widget.php:505 +#: src/Content/ForumManager.php:150 src/Content/Widget.php:512 msgid "show less" msgstr "" -#: src/Content/ForumManager.php:151 src/Content/Widget.php:410 -#: src/Content/Widget.php:506 +#: src/Content/ForumManager.php:151 src/Content/Widget.php:411 +#: src/Content/Widget.php:513 msgid "show more" msgstr "" @@ -3382,7 +3392,7 @@ msgstr "" #: src/Content/Nav.php:177 src/Module/BaseProfile.php:60 #: src/Module/Contact.php:655 src/Module/Contact.php:920 -#: src/Module/Settings/TwoFactor/Index.php:107 view/theme/frio/theme.php:225 +#: src/Module/Settings/TwoFactor/Index.php:112 view/theme/frio/theme.php:225 msgid "Status" msgstr "" @@ -3393,7 +3403,7 @@ msgstr "" #: src/Content/Nav.php:178 src/Module/BaseProfile.php:52 #: src/Module/BaseSettings.php:57 src/Module/Contact.php:657 -#: src/Module/Contact.php:936 src/Module/Profile/Profile.php:236 +#: src/Module/Contact.php:936 src/Module/Profile/Profile.php:237 #: src/Module/Welcome.php:57 view/theme/frio/theme.php:226 msgid "Profile" msgstr "" @@ -3446,7 +3456,7 @@ msgstr "" #: src/Content/Nav.php:212 src/Module/Help.php:69 #: src/Module/Settings/TwoFactor/AppSpecific.php:115 -#: src/Module/Settings/TwoFactor/Index.php:106 +#: src/Module/Settings/TwoFactor/Index.php:111 #: src/Module/Settings/TwoFactor/Recovery.php:93 #: src/Module/Settings/TwoFactor/Verify.php:132 view/theme/vier/theme.php:217 msgid "Help" @@ -3607,11 +3617,11 @@ msgstr "" msgid "Site map" msgstr "" -#: src/Content/OEmbed.php:267 +#: src/Content/OEmbed.php:269 msgid "Embedding disabled" msgstr "" -#: src/Content/OEmbed.php:389 +#: src/Content/OEmbed.php:387 msgid "Embedded content" msgstr "" @@ -3623,39 +3633,39 @@ msgstr "" msgid "last" msgstr "" -#: src/Content/Text/BBCode.php:961 src/Content/Text/BBCode.php:1605 -#: src/Content/Text/BBCode.php:1606 +#: src/Content/Text/BBCode.php:962 src/Content/Text/BBCode.php:1606 +#: src/Content/Text/BBCode.php:1607 msgid "Image/photo" msgstr "" -#: src/Content/Text/BBCode.php:1063 +#: src/Content/Text/BBCode.php:1064 #, php-format msgid "" "%2$s %3$s" msgstr "" -#: src/Content/Text/BBCode.php:1088 src/Model/Item.php:3020 -#: src/Model/Item.php:3026 +#: src/Content/Text/BBCode.php:1089 src/Model/Item.php:2725 +#: src/Model/Item.php:2731 msgid "link to source" msgstr "" -#: src/Content/Text/BBCode.php:1523 src/Content/Text/HTML.php:939 +#: src/Content/Text/BBCode.php:1524 src/Content/Text/HTML.php:939 msgid "Click to open/close" msgstr "" -#: src/Content/Text/BBCode.php:1554 +#: src/Content/Text/BBCode.php:1555 msgid "$1 wrote:" msgstr "" -#: src/Content/Text/BBCode.php:1608 src/Content/Text/BBCode.php:1609 +#: src/Content/Text/BBCode.php:1609 src/Content/Text/BBCode.php:1610 msgid "Encrypted content" msgstr "" -#: src/Content/Text/BBCode.php:1821 +#: src/Content/Text/BBCode.php:1823 msgid "Invalid source protocol" msgstr "" -#: src/Content/Text/BBCode.php:1836 +#: src/Content/Text/BBCode.php:1838 msgid "Invalid link protocol" msgstr "" @@ -3672,6 +3682,132 @@ msgstr "" msgid "Follow" msgstr "" +#: src/Content/Widget.php:49 +msgid "Add New Contact" +msgstr "" + +#: src/Content/Widget.php:50 +msgid "Enter address or web location" +msgstr "" + +#: src/Content/Widget.php:51 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "" + +#: src/Content/Widget.php:53 +msgid "Connect" +msgstr "" + +#: src/Content/Widget.php:68 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" + +#: src/Content/Widget.php:74 view/theme/vier/theme.php:170 +msgid "Find People" +msgstr "" + +#: src/Content/Widget.php:75 view/theme/vier/theme.php:171 +msgid "Enter name or interest" +msgstr "" + +#: src/Content/Widget.php:77 view/theme/vier/theme.php:173 +msgid "Examples: Robert Morgenstein, Fishing" +msgstr "" + +#: src/Content/Widget.php:78 src/Module/Contact.php:876 +#: src/Module/Directory.php:105 view/theme/vier/theme.php:174 +msgid "Find" +msgstr "" + +#: src/Content/Widget.php:80 view/theme/vier/theme.php:176 +msgid "Similar Interests" +msgstr "" + +#: src/Content/Widget.php:81 view/theme/vier/theme.php:177 +msgid "Random Profile" +msgstr "" + +#: src/Content/Widget.php:82 view/theme/vier/theme.php:178 +msgid "Invite Friends" +msgstr "" + +#: src/Content/Widget.php:83 src/Module/Directory.php:97 +#: view/theme/vier/theme.php:179 +msgid "Global Directory" +msgstr "" + +#: src/Content/Widget.php:85 view/theme/vier/theme.php:181 +msgid "Local Directory" +msgstr "" + +#: src/Content/Widget.php:214 src/Model/Group.php:535 +#: src/Module/Contact.php:839 src/Module/Welcome.php:76 +msgid "Groups" +msgstr "" + +#: src/Content/Widget.php:216 +msgid "Everyone" +msgstr "" + +#: src/Content/Widget.php:245 +msgid "Relationships" +msgstr "" + +#: src/Content/Widget.php:247 src/Module/Contact.php:791 +#: src/Module/Group.php:292 +msgid "All Contacts" +msgstr "" + +#: src/Content/Widget.php:286 +msgid "Protocols" +msgstr "" + +#: src/Content/Widget.php:288 +msgid "All Protocols" +msgstr "" + +#: src/Content/Widget.php:316 +msgid "Saved Folders" +msgstr "" + +#: src/Content/Widget.php:318 src/Content/Widget.php:352 +msgid "Everything" +msgstr "" + +#: src/Content/Widget.php:350 +msgid "Categories" +msgstr "" + +#: src/Content/Widget.php:407 +#, php-format +msgid "%d contact in common" +msgid_plural "%d contacts in common" +msgstr[0] "" +msgstr[1] "" + +#: src/Content/Widget.php:506 +msgid "Archives" +msgstr "" + +#: src/Content/Widget.php:530 +msgid "Persons" +msgstr "" + +#: src/Content/Widget.php:531 +msgid "Organisations" +msgstr "" + +#: src/Content/Widget.php:532 src/Model/Contact.php:1401 +msgid "News" +msgstr "" + +#: src/Content/Widget.php:537 src/Module/Admin/BaseUsers.php:50 +msgid "All" +msgstr "" + #: src/Content/Widget/CalendarExport.php:63 msgid "Export" msgstr "" @@ -3718,175 +3854,49 @@ msgstr[1] "" msgid "More Trending Tags" msgstr "" -#: src/Content/Widget.php:48 -msgid "Add New Contact" -msgstr "" - -#: src/Content/Widget.php:49 -msgid "Enter address or web location" -msgstr "" - -#: src/Content/Widget.php:50 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "" - -#: src/Content/Widget.php:52 -msgid "Connect" -msgstr "" - -#: src/Content/Widget.php:67 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" - -#: src/Content/Widget.php:73 view/theme/vier/theme.php:170 -msgid "Find People" -msgstr "" - -#: src/Content/Widget.php:74 view/theme/vier/theme.php:171 -msgid "Enter name or interest" -msgstr "" - -#: src/Content/Widget.php:76 view/theme/vier/theme.php:173 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "" - -#: src/Content/Widget.php:77 src/Module/Contact.php:876 -#: src/Module/Directory.php:105 view/theme/vier/theme.php:174 -msgid "Find" -msgstr "" - -#: src/Content/Widget.php:79 view/theme/vier/theme.php:176 -msgid "Similar Interests" -msgstr "" - -#: src/Content/Widget.php:80 view/theme/vier/theme.php:177 -msgid "Random Profile" -msgstr "" - -#: src/Content/Widget.php:81 view/theme/vier/theme.php:178 -msgid "Invite Friends" -msgstr "" - -#: src/Content/Widget.php:82 src/Module/Directory.php:97 -#: view/theme/vier/theme.php:179 -msgid "Global Directory" -msgstr "" - -#: src/Content/Widget.php:84 view/theme/vier/theme.php:181 -msgid "Local Directory" -msgstr "" - -#: src/Content/Widget.php:213 src/Model/Group.php:535 -#: src/Module/Contact.php:839 src/Module/Welcome.php:76 -msgid "Groups" -msgstr "" - -#: src/Content/Widget.php:215 -msgid "Everyone" -msgstr "" - -#: src/Content/Widget.php:244 -msgid "Relationships" -msgstr "" - -#: src/Content/Widget.php:246 src/Module/Contact.php:791 -#: src/Module/Group.php:292 -msgid "All Contacts" -msgstr "" - -#: src/Content/Widget.php:285 -msgid "Protocols" -msgstr "" - -#: src/Content/Widget.php:287 -msgid "All Protocols" -msgstr "" - -#: src/Content/Widget.php:315 -msgid "Saved Folders" -msgstr "" - -#: src/Content/Widget.php:317 src/Content/Widget.php:351 -msgid "Everything" -msgstr "" - -#: src/Content/Widget.php:349 -msgid "Categories" -msgstr "" - -#: src/Content/Widget.php:406 -#, php-format -msgid "%d contact in common" -msgid_plural "%d contacts in common" -msgstr[0] "" -msgstr[1] "" - -#: src/Content/Widget.php:499 -msgid "Archives" -msgstr "" - -#: src/Content/Widget.php:523 -msgid "Persons" -msgstr "" - -#: src/Content/Widget.php:524 -msgid "Organisations" -msgstr "" - -#: src/Content/Widget.php:525 src/Model/Contact.php:1402 -msgid "News" -msgstr "" - -#: src/Content/Widget.php:530 src/Module/Admin/BaseUsers.php:50 -msgid "All" -msgstr "" - -#: src/Core/ACL.php:153 src/Module/Profile/Profile.php:237 +#: src/Core/ACL.php:154 src/Module/Profile/Profile.php:238 msgid "Yourself" msgstr "" -#: src/Core/ACL.php:189 src/Module/PermissionTooltip.php:83 +#: src/Core/ACL.php:190 src/Module/PermissionTooltip.php:83 #: src/Module/PermissionTooltip.php:105 msgid "Mutuals" msgstr "" -#: src/Core/ACL.php:279 +#: src/Core/ACL.php:280 msgid "Post to Email" msgstr "" -#: src/Core/ACL.php:306 +#: src/Core/ACL.php:307 msgid "Public" msgstr "" -#: src/Core/ACL.php:307 +#: src/Core/ACL.php:308 msgid "" "This content will be shown to all your followers and can be seen in the " "community pages and by anyone with its link." msgstr "" -#: src/Core/ACL.php:308 +#: src/Core/ACL.php:309 msgid "Limited/Private" msgstr "" -#: src/Core/ACL.php:309 +#: src/Core/ACL.php:310 msgid "" "This content will be shown only to the people in the first box, to the " "exception of the people mentioned in the second box. It won't appear " "anywhere public." msgstr "" -#: src/Core/ACL.php:310 +#: src/Core/ACL.php:311 msgid "Show to:" msgstr "" -#: src/Core/ACL.php:311 +#: src/Core/ACL.php:312 msgid "Except to:" msgstr "" -#: src/Core/ACL.php:314 +#: src/Core/ACL.php:315 msgid "Connectors" msgstr "" @@ -3904,6 +3914,7 @@ msgid "" msgstr "" #: src/Core/Installer.php:199 src/Module/Install.php:195 +#: src/Module/Install.php:354 msgid "Please see the file \"doc/INSTALL.md\"." msgstr "" @@ -4098,7 +4109,7 @@ msgstr "" #: src/Core/Installer.php:508 msgid "" "You can alternatively skip this procedure and perform a manual installation. " -"Please see the file \"INSTALL.txt\" for instructions." +"Please see the file \"doc/INSTALL.md\" for instructions." msgstr "" #: src/Core/Installer.php:511 @@ -4168,137 +4179,137 @@ msgstr "" msgid "Could not connect to database." msgstr "" -#: src/Core/L10n.php:371 src/Model/Event.php:428 +#: src/Core/L10n.php:371 src/Model/Event.php:431 #: src/Module/Settings/Display.php:178 msgid "Monday" msgstr "" -#: src/Core/L10n.php:371 src/Model/Event.php:429 +#: src/Core/L10n.php:371 src/Model/Event.php:432 msgid "Tuesday" msgstr "" -#: src/Core/L10n.php:371 src/Model/Event.php:430 +#: src/Core/L10n.php:371 src/Model/Event.php:433 msgid "Wednesday" msgstr "" -#: src/Core/L10n.php:371 src/Model/Event.php:431 +#: src/Core/L10n.php:371 src/Model/Event.php:434 msgid "Thursday" msgstr "" -#: src/Core/L10n.php:371 src/Model/Event.php:432 +#: src/Core/L10n.php:371 src/Model/Event.php:435 msgid "Friday" msgstr "" -#: src/Core/L10n.php:371 src/Model/Event.php:433 +#: src/Core/L10n.php:371 src/Model/Event.php:436 msgid "Saturday" msgstr "" -#: src/Core/L10n.php:371 src/Model/Event.php:427 +#: src/Core/L10n.php:371 src/Model/Event.php:430 #: src/Module/Settings/Display.php:178 msgid "Sunday" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:448 +#: src/Core/L10n.php:375 src/Model/Event.php:451 msgid "January" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:449 +#: src/Core/L10n.php:375 src/Model/Event.php:452 msgid "February" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:450 +#: src/Core/L10n.php:375 src/Model/Event.php:453 msgid "March" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:451 +#: src/Core/L10n.php:375 src/Model/Event.php:454 msgid "April" msgstr "" -#: src/Core/L10n.php:375 src/Core/L10n.php:395 src/Model/Event.php:439 +#: src/Core/L10n.php:375 src/Core/L10n.php:395 src/Model/Event.php:442 msgid "May" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:452 +#: src/Core/L10n.php:375 src/Model/Event.php:455 msgid "June" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:453 +#: src/Core/L10n.php:375 src/Model/Event.php:456 msgid "July" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:454 +#: src/Core/L10n.php:375 src/Model/Event.php:457 msgid "August" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:455 +#: src/Core/L10n.php:375 src/Model/Event.php:458 msgid "September" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:456 +#: src/Core/L10n.php:375 src/Model/Event.php:459 msgid "October" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:457 +#: src/Core/L10n.php:375 src/Model/Event.php:460 msgid "November" msgstr "" -#: src/Core/L10n.php:375 src/Model/Event.php:458 +#: src/Core/L10n.php:375 src/Model/Event.php:461 msgid "December" msgstr "" -#: src/Core/L10n.php:391 src/Model/Event.php:420 +#: src/Core/L10n.php:391 src/Model/Event.php:423 msgid "Mon" msgstr "" -#: src/Core/L10n.php:391 src/Model/Event.php:421 +#: src/Core/L10n.php:391 src/Model/Event.php:424 msgid "Tue" msgstr "" -#: src/Core/L10n.php:391 src/Model/Event.php:422 +#: src/Core/L10n.php:391 src/Model/Event.php:425 msgid "Wed" msgstr "" -#: src/Core/L10n.php:391 src/Model/Event.php:423 +#: src/Core/L10n.php:391 src/Model/Event.php:426 msgid "Thu" msgstr "" -#: src/Core/L10n.php:391 src/Model/Event.php:424 +#: src/Core/L10n.php:391 src/Model/Event.php:427 msgid "Fri" msgstr "" -#: src/Core/L10n.php:391 src/Model/Event.php:425 +#: src/Core/L10n.php:391 src/Model/Event.php:428 msgid "Sat" msgstr "" -#: src/Core/L10n.php:391 src/Model/Event.php:419 +#: src/Core/L10n.php:391 src/Model/Event.php:422 msgid "Sun" msgstr "" -#: src/Core/L10n.php:395 src/Model/Event.php:435 +#: src/Core/L10n.php:395 src/Model/Event.php:438 msgid "Jan" msgstr "" -#: src/Core/L10n.php:395 src/Model/Event.php:436 +#: src/Core/L10n.php:395 src/Model/Event.php:439 msgid "Feb" msgstr "" -#: src/Core/L10n.php:395 src/Model/Event.php:437 +#: src/Core/L10n.php:395 src/Model/Event.php:440 msgid "Mar" msgstr "" -#: src/Core/L10n.php:395 src/Model/Event.php:438 +#: src/Core/L10n.php:395 src/Model/Event.php:441 msgid "Apr" msgstr "" -#: src/Core/L10n.php:395 src/Model/Event.php:440 +#: src/Core/L10n.php:395 src/Model/Event.php:443 msgid "Jun" msgstr "" -#: src/Core/L10n.php:395 src/Model/Event.php:441 +#: src/Core/L10n.php:395 src/Model/Event.php:444 msgid "Jul" msgstr "" -#: src/Core/L10n.php:395 src/Model/Event.php:442 +#: src/Core/L10n.php:395 src/Model/Event.php:445 msgid "Aug" msgstr "" @@ -4306,15 +4317,15 @@ msgstr "" msgid "Sep" msgstr "" -#: src/Core/L10n.php:395 src/Model/Event.php:444 +#: src/Core/L10n.php:395 src/Model/Event.php:447 msgid "Oct" msgstr "" -#: src/Core/L10n.php:395 src/Model/Event.php:445 +#: src/Core/L10n.php:395 src/Model/Event.php:448 msgid "Nov" msgstr "" -#: src/Core/L10n.php:395 src/Model/Event.php:446 +#: src/Core/L10n.php:395 src/Model/Event.php:449 msgid "Dec" msgstr "" @@ -4381,26 +4392,36 @@ msgstr "" msgid "template engine is not registered!" msgstr "" -#: src/Core/Update.php:66 +#: src/Core/Update.php:67 #, php-format msgid "" "Updates from version %s are not supported. Please update at least to version " "2021.01 and wait until the postupdate finished version 1383." msgstr "" -#: src/Core/Update.php:77 +#: src/Core/Update.php:78 #, php-format msgid "" "Updates from postupdate version %s are not supported. Please update at least " "to version 2021.01 and wait until the postupdate finished version 1383." msgstr "" -#: src/Core/Update.php:244 +#: src/Core/Update.php:152 +#, php-format +msgid "%s: executing pre update %d" +msgstr "" + +#: src/Core/Update.php:190 +#, php-format +msgid "%s: executing post update %d" +msgstr "" + +#: src/Core/Update.php:259 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: src/Core/Update.php:297 +#: src/Core/Update.php:312 #, php-format msgid "" "\n" @@ -4412,16 +4433,16 @@ msgid "" "might be invalid." msgstr "" -#: src/Core/Update.php:303 +#: src/Core/Update.php:318 #, php-format msgid "The error message is\\n[pre]%s[/pre]" msgstr "" -#: src/Core/Update.php:307 src/Core/Update.php:349 +#: src/Core/Update.php:322 src/Core/Update.php:364 msgid "[Friendica Notify] Database update" msgstr "" -#: src/Core/Update.php:343 +#: src/Core/Update.php:358 #, php-format msgid "" "\n" @@ -4465,21 +4486,28 @@ msgstr "" msgid "The database version had been set to %s." msgstr "" -#: src/Database/DBStructure.php:82 +#: src/Database/DBStructure.php:77 +#, php-format +msgid "" +"The post update is at version %d, it has to be at %d to safely drop the " +"tables." +msgstr "" + +#: src/Database/DBStructure.php:89 msgid "No unused tables found." msgstr "" -#: src/Database/DBStructure.php:87 +#: src/Database/DBStructure.php:94 msgid "" "These tables are not used for friendica and will be deleted when you execute " "\"dbstructure drop -e\":" msgstr "" -#: src/Database/DBStructure.php:125 +#: src/Database/DBStructure.php:132 msgid "There are no tables on MyISAM or InnoDB with the Antelope file format." msgstr "" -#: src/Database/DBStructure.php:149 +#: src/Database/DBStructure.php:156 #, php-format msgid "" "\n" @@ -4487,20 +4515,20 @@ msgid "" "%s\n" msgstr "" -#: src/Database/DBStructure.php:152 +#: src/Database/DBStructure.php:159 msgid "Errors encountered performing database changes: " msgstr "" -#: src/Database/DBStructure.php:380 +#: src/Database/DBStructure.php:436 msgid "Another database update is currently running." msgstr "" -#: src/Database/DBStructure.php:384 +#: src/Database/DBStructure.php:440 #, php-format msgid "%s: Database update" msgstr "" -#: src/Database/DBStructure.php:684 +#: src/Database/DBStructure.php:740 #, php-format msgid "%s: updating %s table." msgstr "" @@ -4567,150 +4595,150 @@ msgstr "" msgid "Legacy module file not found: %s" msgstr "" -#: src/Model/Contact.php:980 src/Model/Contact.php:993 +#: src/Model/Contact.php:979 src/Model/Contact.php:992 msgid "UnFollow" msgstr "" -#: src/Model/Contact.php:989 +#: src/Model/Contact.php:988 msgid "Drop Contact" msgstr "" -#: src/Model/Contact.php:999 src/Module/Admin/Users/Pending.php:107 +#: src/Model/Contact.php:998 src/Module/Admin/Users/Pending.php:107 #: src/Module/Notifications/Introductions.php:111 #: src/Module/Notifications/Introductions.php:189 msgid "Approve" msgstr "" -#: src/Model/Contact.php:1398 +#: src/Model/Contact.php:1397 msgid "Organisation" msgstr "" -#: src/Model/Contact.php:1406 +#: src/Model/Contact.php:1405 msgid "Forum" msgstr "" -#: src/Model/Contact.php:2146 +#: src/Model/Contact.php:2145 msgid "Connect URL missing." msgstr "" -#: src/Model/Contact.php:2155 +#: src/Model/Contact.php:2154 msgid "" "The contact could not be added. Please check the relevant network " "credentials in your Settings -> Social Networks page." msgstr "" -#: src/Model/Contact.php:2196 +#: src/Model/Contact.php:2195 msgid "" "This site is not configured to allow communications with other networks." msgstr "" -#: src/Model/Contact.php:2197 src/Model/Contact.php:2210 +#: src/Model/Contact.php:2196 src/Model/Contact.php:2209 msgid "No compatible communication protocols or feeds were discovered." msgstr "" -#: src/Model/Contact.php:2208 +#: src/Model/Contact.php:2207 msgid "The profile address specified does not provide adequate information." msgstr "" -#: src/Model/Contact.php:2213 +#: src/Model/Contact.php:2212 msgid "An author or name was not found." msgstr "" -#: src/Model/Contact.php:2216 +#: src/Model/Contact.php:2215 msgid "No browser URL could be matched to this address." msgstr "" -#: src/Model/Contact.php:2219 +#: src/Model/Contact.php:2218 msgid "" "Unable to match @-style Identity Address with a known protocol or email " "contact." msgstr "" -#: src/Model/Contact.php:2220 +#: src/Model/Contact.php:2219 msgid "Use mailto: in front of address to force email check." msgstr "" -#: src/Model/Contact.php:2226 +#: src/Model/Contact.php:2225 msgid "" "The profile address specified belongs to a network which has been disabled " "on this site." msgstr "" -#: src/Model/Contact.php:2231 +#: src/Model/Contact.php:2230 msgid "" "Limited profile. This person will be unable to receive direct/personal " "notifications from you." msgstr "" -#: src/Model/Contact.php:2290 +#: src/Model/Contact.php:2289 msgid "Unable to retrieve contact information." msgstr "" -#: src/Model/Event.php:50 src/Model/Event.php:868 +#: src/Model/Event.php:50 src/Model/Event.php:871 #: src/Module/Debug/Localtime.php:36 msgid "l F d, Y \\@ g:i A" msgstr "" -#: src/Model/Event.php:77 src/Model/Event.php:94 src/Model/Event.php:467 -#: src/Model/Event.php:936 +#: src/Model/Event.php:77 src/Model/Event.php:94 src/Model/Event.php:470 +#: src/Model/Event.php:941 msgid "Starts:" msgstr "" -#: src/Model/Event.php:80 src/Model/Event.php:100 src/Model/Event.php:468 -#: src/Model/Event.php:940 +#: src/Model/Event.php:80 src/Model/Event.php:100 src/Model/Event.php:471 +#: src/Model/Event.php:945 msgid "Finishes:" msgstr "" -#: src/Model/Event.php:417 +#: src/Model/Event.php:420 msgid "all-day" msgstr "" -#: src/Model/Event.php:443 +#: src/Model/Event.php:446 msgid "Sept" msgstr "" -#: src/Model/Event.php:465 +#: src/Model/Event.php:468 msgid "No events to display" msgstr "" -#: src/Model/Event.php:584 +#: src/Model/Event.php:587 msgid "l, F j" msgstr "" -#: src/Model/Event.php:615 +#: src/Model/Event.php:618 msgid "Edit event" msgstr "" -#: src/Model/Event.php:616 +#: src/Model/Event.php:619 msgid "Duplicate event" msgstr "" -#: src/Model/Event.php:617 +#: src/Model/Event.php:620 msgid "Delete event" msgstr "" -#: src/Model/Event.php:869 +#: src/Model/Event.php:872 msgid "D g:i A" msgstr "" -#: src/Model/Event.php:870 +#: src/Model/Event.php:873 msgid "g:i A" msgstr "" -#: src/Model/Event.php:955 src/Model/Event.php:957 +#: src/Model/Event.php:960 src/Model/Event.php:962 msgid "Show map" msgstr "" -#: src/Model/Event.php:956 +#: src/Model/Event.php:961 msgid "Hide map" msgstr "" -#: src/Model/Event.php:1048 +#: src/Model/Event.php:1053 #, php-format msgid "%s's birthday" msgstr "" -#: src/Model/Event.php:1049 +#: src/Model/Event.php:1054 #, php-format msgid "Happy Birthday %s" msgstr "" @@ -4759,48 +4787,48 @@ msgstr "" msgid "Edit groups" msgstr "" -#: src/Model/Item.php:1760 +#: src/Model/Item.php:1550 #, php-format msgid "Detected languages in this post:\\n%s" msgstr "" -#: src/Model/Item.php:2767 +#: src/Model/Item.php:2488 msgid "activity" msgstr "" -#: src/Model/Item.php:2769 src/Object/Post.php:558 +#: src/Model/Item.php:2490 src/Object/Post.php:548 msgid "comment" msgid_plural "comments" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:2772 +#: src/Model/Item.php:2493 msgid "post" msgstr "" -#: src/Model/Item.php:2896 +#: src/Model/Item.php:2607 #, php-format msgid "Content warning: %s" msgstr "" -#: src/Model/Item.php:2969 +#: src/Model/Item.php:2674 msgid "bytes" msgstr "" -#: src/Model/Item.php:3014 +#: src/Model/Item.php:2719 msgid "View on separate page" msgstr "" -#: src/Model/Item.php:3015 +#: src/Model/Item.php:2720 msgid "view on separate page" msgstr "" -#: src/Model/Mail.php:121 src/Model/Mail.php:259 +#: src/Model/Mail.php:120 src/Model/Mail.php:258 msgid "[no subject]" msgstr "" -#: src/Model/Profile.php:346 src/Module/Profile/Profile.php:251 -#: src/Module/Profile/Profile.php:253 +#: src/Model/Profile.php:346 src/Module/Profile/Profile.php:252 +#: src/Module/Profile/Profile.php:254 msgid "Edit profile" msgstr "" @@ -4956,13 +4984,13 @@ msgstr "" msgid "Invalid OpenID url" msgstr "" -#: src/Model/User.php:843 src/Security/Authentication.php:224 +#: src/Model/User.php:843 src/Security/Authentication.php:223 msgid "" "We encountered a problem while logging in with the OpenID you provided. " "Please check the correct spelling of the ID." msgstr "" -#: src/Model/User.php:843 src/Security/Authentication.php:224 +#: src/Model/User.php:843 src/Security/Authentication.php:223 msgid "The error message was:" msgstr "" @@ -6548,7 +6576,7 @@ msgid "Encryption layer between nodes." msgstr "" #: src/Module/Admin/Site.php:686 src/Module/Admin/Site.php:694 -#: src/Module/Contact.php:554 src/Module/Settings/TwoFactor/Index.php:113 +#: src/Module/Contact.php:554 src/Module/Settings/TwoFactor/Index.php:118 msgid "Disabled" msgstr "" @@ -7252,8 +7280,8 @@ msgstr "" msgid "Account" msgstr "" -#: src/Module/BaseSettings.php:50 src/Module/Security/TwoFactor/Verify.php:80 -#: src/Module/Settings/TwoFactor/Index.php:105 +#: src/Module/BaseSettings.php:50 src/Module/Security/TwoFactor/Verify.php:94 +#: src/Module/Settings/TwoFactor/Index.php:110 msgid "Two-factor authentication" msgstr "" @@ -7285,145 +7313,6 @@ msgstr "" msgid "The post was created" msgstr "" -#: src/Module/Contact/Advanced.php:92 -msgid "Contact update failed." -msgstr "" - -#: src/Module/Contact/Advanced.php:109 -msgid "" -"WARNING: This is highly advanced and if you enter incorrect " -"information your communications with this contact may stop working." -msgstr "" - -#: src/Module/Contact/Advanced.php:110 -msgid "" -"Please use your browser 'Back' button now if you are " -"uncertain what to do on this page." -msgstr "" - -#: src/Module/Contact/Advanced.php:130 -msgid "Return to contact editor" -msgstr "" - -#: src/Module/Contact/Advanced.php:135 -msgid "Account Nickname" -msgstr "" - -#: src/Module/Contact/Advanced.php:136 -msgid "@Tagname - overrides Name/Nickname" -msgstr "" - -#: src/Module/Contact/Advanced.php:137 -msgid "Account URL" -msgstr "" - -#: src/Module/Contact/Advanced.php:138 -msgid "Account URL Alias" -msgstr "" - -#: src/Module/Contact/Advanced.php:139 -msgid "Friend Request URL" -msgstr "" - -#: src/Module/Contact/Advanced.php:140 -msgid "Friend Confirm URL" -msgstr "" - -#: src/Module/Contact/Advanced.php:141 -msgid "Notification Endpoint URL" -msgstr "" - -#: src/Module/Contact/Advanced.php:142 -msgid "Poll/Feed URL" -msgstr "" - -#: src/Module/Contact/Advanced.php:143 -msgid "New photo from this URL" -msgstr "" - -#: src/Module/Contact/Contacts.php:31 src/Module/Conversation/Network.php:175 -msgid "Invalid contact." -msgstr "" - -#: src/Module/Contact/Contacts.php:54 -msgid "No known contacts." -msgstr "" - -#: src/Module/Contact/Contacts.php:68 src/Module/Profile/Common.php:99 -msgid "No common contacts." -msgstr "" - -#: src/Module/Contact/Contacts.php:80 src/Module/Profile/Contacts.php:97 -#, php-format -msgid "Follower (%s)" -msgid_plural "Followers (%s)" -msgstr[0] "" -msgstr[1] "" - -#: src/Module/Contact/Contacts.php:84 src/Module/Profile/Contacts.php:100 -#, php-format -msgid "Following (%s)" -msgid_plural "Following (%s)" -msgstr[0] "" -msgstr[1] "" - -#: src/Module/Contact/Contacts.php:88 src/Module/Profile/Contacts.php:103 -#, php-format -msgid "Mutual friend (%s)" -msgid_plural "Mutual friends (%s)" -msgstr[0] "" -msgstr[1] "" - -#: src/Module/Contact/Contacts.php:90 src/Module/Profile/Contacts.php:105 -#, php-format -msgid "These contacts both follow and are followed by %s." -msgstr "" - -#: src/Module/Contact/Contacts.php:96 src/Module/Profile/Common.php:87 -#, php-format -msgid "Common contact (%s)" -msgid_plural "Common contacts (%s)" -msgstr[0] "" -msgstr[1] "" - -#: src/Module/Contact/Contacts.php:98 src/Module/Profile/Common.php:89 -#, php-format -msgid "" -"Both %s and yourself have publicly interacted with these " -"contacts (follow, comment or likes on public posts)." -msgstr "" - -#: src/Module/Contact/Contacts.php:104 src/Module/Profile/Contacts.php:111 -#, php-format -msgid "Contact (%s)" -msgid_plural "Contacts (%s)" -msgstr[0] "" -msgstr[1] "" - -#: src/Module/Contact/Poke.php:113 -msgid "Error while sending poke, please retry." -msgstr "" - -#: src/Module/Contact/Poke.php:126 src/Module/Search/Acl.php:56 -msgid "You must be logged in to use this module." -msgstr "" - -#: src/Module/Contact/Poke.php:149 -msgid "Poke/Prod" -msgstr "" - -#: src/Module/Contact/Poke.php:150 -msgid "poke, prod or do other things to somebody" -msgstr "" - -#: src/Module/Contact/Poke.php:152 -msgid "Choose what you wish to do to recipient" -msgstr "" - -#: src/Module/Contact/Poke.php:153 -msgid "Make this post private" -msgstr "" - #: src/Module/Contact.php:94 #, php-format msgid "%d contact edited." @@ -7653,7 +7542,7 @@ msgid "" "when \"Fetch information and keywords\" is selected" msgstr "" -#: src/Module/Contact.php:653 src/Module/Settings/TwoFactor/Index.php:127 +#: src/Module/Contact.php:653 src/Module/Settings/TwoFactor/Index.php:132 msgid "Actions" msgstr "" @@ -7784,6 +7673,145 @@ msgstr "" msgid "Delete contact" msgstr "" +#: src/Module/Contact/Advanced.php:92 +msgid "Contact update failed." +msgstr "" + +#: src/Module/Contact/Advanced.php:109 +msgid "" +"WARNING: This is highly advanced and if you enter incorrect " +"information your communications with this contact may stop working." +msgstr "" + +#: src/Module/Contact/Advanced.php:110 +msgid "" +"Please use your browser 'Back' button now if you are " +"uncertain what to do on this page." +msgstr "" + +#: src/Module/Contact/Advanced.php:130 +msgid "Return to contact editor" +msgstr "" + +#: src/Module/Contact/Advanced.php:135 +msgid "Account Nickname" +msgstr "" + +#: src/Module/Contact/Advanced.php:136 +msgid "@Tagname - overrides Name/Nickname" +msgstr "" + +#: src/Module/Contact/Advanced.php:137 +msgid "Account URL" +msgstr "" + +#: src/Module/Contact/Advanced.php:138 +msgid "Account URL Alias" +msgstr "" + +#: src/Module/Contact/Advanced.php:139 +msgid "Friend Request URL" +msgstr "" + +#: src/Module/Contact/Advanced.php:140 +msgid "Friend Confirm URL" +msgstr "" + +#: src/Module/Contact/Advanced.php:141 +msgid "Notification Endpoint URL" +msgstr "" + +#: src/Module/Contact/Advanced.php:142 +msgid "Poll/Feed URL" +msgstr "" + +#: src/Module/Contact/Advanced.php:143 +msgid "New photo from this URL" +msgstr "" + +#: src/Module/Contact/Contacts.php:31 src/Module/Conversation/Network.php:175 +msgid "Invalid contact." +msgstr "" + +#: src/Module/Contact/Contacts.php:54 +msgid "No known contacts." +msgstr "" + +#: src/Module/Contact/Contacts.php:68 src/Module/Profile/Common.php:99 +msgid "No common contacts." +msgstr "" + +#: src/Module/Contact/Contacts.php:80 src/Module/Profile/Contacts.php:97 +#, php-format +msgid "Follower (%s)" +msgid_plural "Followers (%s)" +msgstr[0] "" +msgstr[1] "" + +#: src/Module/Contact/Contacts.php:84 src/Module/Profile/Contacts.php:100 +#, php-format +msgid "Following (%s)" +msgid_plural "Following (%s)" +msgstr[0] "" +msgstr[1] "" + +#: src/Module/Contact/Contacts.php:88 src/Module/Profile/Contacts.php:103 +#, php-format +msgid "Mutual friend (%s)" +msgid_plural "Mutual friends (%s)" +msgstr[0] "" +msgstr[1] "" + +#: src/Module/Contact/Contacts.php:90 src/Module/Profile/Contacts.php:105 +#, php-format +msgid "These contacts both follow and are followed by %s." +msgstr "" + +#: src/Module/Contact/Contacts.php:96 src/Module/Profile/Common.php:87 +#, php-format +msgid "Common contact (%s)" +msgid_plural "Common contacts (%s)" +msgstr[0] "" +msgstr[1] "" + +#: src/Module/Contact/Contacts.php:98 src/Module/Profile/Common.php:89 +#, php-format +msgid "" +"Both %s and yourself have publicly interacted with these " +"contacts (follow, comment or likes on public posts)." +msgstr "" + +#: src/Module/Contact/Contacts.php:104 src/Module/Profile/Contacts.php:111 +#, php-format +msgid "Contact (%s)" +msgid_plural "Contacts (%s)" +msgstr[0] "" +msgstr[1] "" + +#: src/Module/Contact/Poke.php:113 +msgid "Error while sending poke, please retry." +msgstr "" + +#: src/Module/Contact/Poke.php:126 src/Module/Search/Acl.php:56 +msgid "You must be logged in to use this module." +msgstr "" + +#: src/Module/Contact/Poke.php:149 +msgid "Poke/Prod" +msgstr "" + +#: src/Module/Contact/Poke.php:150 +msgid "poke, prod or do other things to somebody" +msgstr "" + +#: src/Module/Contact/Poke.php:152 +msgid "Choose what you wish to do to recipient" +msgstr "" + +#: src/Module/Contact/Poke.php:153 +msgid "Make this post private" +msgstr "" + #: src/Module/Conversation/Community.php:69 msgid "Local Community" msgstr "" @@ -8040,44 +8068,44 @@ msgstr "" msgid "HTML::toPlaintext (compact)" msgstr "" -#: src/Module/Debug/Babel.php:252 +#: src/Module/Debug/Babel.php:260 msgid "Decoded post" msgstr "" -#: src/Module/Debug/Babel.php:276 +#: src/Module/Debug/Babel.php:281 msgid "Post array before expand entities" msgstr "" -#: src/Module/Debug/Babel.php:283 +#: src/Module/Debug/Babel.php:288 msgid "Post converted" msgstr "" -#: src/Module/Debug/Babel.php:288 +#: src/Module/Debug/Babel.php:293 msgid "Converted body" msgstr "" -#: src/Module/Debug/Babel.php:294 +#: src/Module/Debug/Babel.php:299 msgid "Twitter addon is absent from the addon/ folder." msgstr "" -#: src/Module/Debug/Babel.php:304 +#: src/Module/Debug/Babel.php:309 msgid "Source text" msgstr "" -#: src/Module/Debug/Babel.php:305 +#: src/Module/Debug/Babel.php:310 msgid "BBCode" msgstr "" -#: src/Module/Debug/Babel.php:307 +#: src/Module/Debug/Babel.php:312 msgid "Markdown" msgstr "" -#: src/Module/Debug/Babel.php:308 +#: src/Module/Debug/Babel.php:313 msgid "HTML" msgstr "" -#: src/Module/Debug/Babel.php:310 -msgid "Twitter Source" +#: src/Module/Debug/Babel.php:315 +msgid "Twitter Source / Tweet URL (requires API key)" msgstr "" #: src/Module/Debug/Feed.php:38 src/Module/Filer/SaveTag.php:40 @@ -8172,6 +8200,23 @@ msgstr "" msgid "- select -" msgstr "" +#: src/Module/FriendSuggest.php:65 +msgid "Suggested contact not found." +msgstr "" + +#: src/Module/FriendSuggest.php:84 +msgid "Friend suggestion sent." +msgstr "" + +#: src/Module/FriendSuggest.php:121 +msgid "Suggest Friends" +msgstr "" + +#: src/Module/FriendSuggest.php:124 +#, php-format +msgid "Suggest a friend for %s" +msgstr "" + #: src/Module/Friendica.php:61 msgid "Installed addons/apps:" msgstr "" @@ -8215,23 +8260,6 @@ msgid "" "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca" msgstr "" -#: src/Module/FriendSuggest.php:65 -msgid "Suggested contact not found." -msgstr "" - -#: src/Module/FriendSuggest.php:84 -msgid "Friend suggestion sent." -msgstr "" - -#: src/Module/FriendSuggest.php:121 -msgid "Suggest Friends" -msgstr "" - -#: src/Module/FriendSuggest.php:124 -#, php-format -msgid "Suggest a friend for %s" -msgstr "" - #: src/Module/Group.php:61 msgid "Could not create group." msgstr "" @@ -8320,6 +8348,10 @@ msgstr "" msgid "Add contact to group" msgstr "" +#: src/Module/HTTPException/MethodNotAllowed.php:32 +msgid "Method Not Allowed." +msgstr "" + #: src/Module/Help.php:62 msgid "Help:" msgstr "" @@ -8333,10 +8365,6 @@ msgstr "" msgid "No profile" msgstr "" -#: src/Module/HTTPException/MethodNotAllowed.php:32 -msgid "Method Not Allowed." -msgstr "" - #: src/Module/Install.php:177 msgid "Friendica Communications Server - Setup" msgstr "" @@ -8485,10 +8513,6 @@ msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the worker." msgstr "" -#: src/Module/Install.php:354 -msgid "Please see the file \"INSTALL.txt\"." -msgstr "" - #: src/Module/Install.php:356 #, php-format msgid "" @@ -8635,6 +8659,10 @@ msgid "" "your device" msgstr "" +#: src/Module/Item/Follow.php:52 +msgid "Unable to follow this item." +msgstr "" + #: src/Module/Maintenance.php:46 msgid "System down for maintenance" msgstr "" @@ -8795,32 +8823,32 @@ msgid_plural "%d years old" msgstr[0] "" msgstr[1] "" -#: src/Module/Profile/Profile.php:229 +#: src/Module/Profile/Profile.php:230 msgid "Forums:" msgstr "" -#: src/Module/Profile/Profile.php:241 +#: src/Module/Profile/Profile.php:242 msgid "View profile as:" msgstr "" -#: src/Module/Profile/Profile.php:258 +#: src/Module/Profile/Profile.php:259 msgid "View as" msgstr "" -#: src/Module/Profile/Profile.php:321 src/Module/Profile/Profile.php:324 +#: src/Module/Profile/Profile.php:322 src/Module/Profile/Profile.php:325 #: src/Module/Profile/Status.php:65 src/Module/Profile/Status.php:68 #: src/Protocol/Feed.php:940 src/Protocol/OStatus.php:1258 #, php-format msgid "%s's timeline" msgstr "" -#: src/Module/Profile/Profile.php:322 src/Module/Profile/Status.php:66 +#: src/Module/Profile/Profile.php:323 src/Module/Profile/Status.php:66 #: src/Protocol/Feed.php:944 src/Protocol/OStatus.php:1262 #, php-format msgid "%s's posts" msgstr "" -#: src/Module/Profile/Profile.php:323 src/Module/Profile/Status.php:67 +#: src/Module/Profile/Profile.php:324 src/Module/Profile/Status.php:67 #: src/Protocol/Feed.php:947 src/Protocol/OStatus.php:1265 #, php-format msgid "%s's comments" @@ -9043,7 +9071,7 @@ msgstr "" msgid "privacy policy" msgstr "" -#: src/Module/Security/Logout.php:53 +#: src/Module/Security/Logout.php:61 msgid "Logged out." msgstr "" @@ -9069,7 +9097,7 @@ msgid "Remaining recovery codes: %d" msgstr "" #: src/Module/Security/TwoFactor/Recovery.php:64 -#: src/Module/Security/TwoFactor/Verify.php:61 +#: src/Module/Security/TwoFactor/Verify.php:75 #: src/Module/Settings/TwoFactor/Verify.php:82 msgid "Invalid code, please retry." msgstr "" @@ -9085,7 +9113,7 @@ msgid "" msgstr "" #: src/Module/Security/TwoFactor/Recovery.php:85 -#: src/Module/Security/TwoFactor/Verify.php:84 +#: src/Module/Security/TwoFactor/Verify.php:98 #, php-format msgid "" "Don’t have your phone? Enter a two-factor recovery code" @@ -9099,18 +9127,22 @@ msgstr "" msgid "Submit recovery code and complete login" msgstr "" -#: src/Module/Security/TwoFactor/Verify.php:81 +#: src/Module/Security/TwoFactor/Verify.php:95 msgid "" "

Open the two-factor authentication app on your device to get an " "authentication code and verify your identity.

" msgstr "" -#: src/Module/Security/TwoFactor/Verify.php:85 +#: src/Module/Security/TwoFactor/Verify.php:99 #: src/Module/Settings/TwoFactor/Verify.php:141 msgid "Please enter a code from your authentication app" msgstr "" -#: src/Module/Security/TwoFactor/Verify.php:86 +#: src/Module/Security/TwoFactor/Verify.php:100 +msgid "This is my two-factor authenticator app device" +msgstr "" + +#: src/Module/Security/TwoFactor/Verify.php:101 msgid "Verify code and complete login" msgstr "" @@ -9522,6 +9554,7 @@ msgstr "" #: src/Module/Settings/TwoFactor/AppSpecific.php:52 #: src/Module/Settings/TwoFactor/Recovery.php:50 +#: src/Module/Settings/TwoFactor/Trusted.php:30 #: src/Module/Settings/TwoFactor/Verify.php:56 msgid "Please enter your password to access this page." msgstr "" @@ -9602,91 +9635,95 @@ msgstr "" msgid "Two-factor authentication successfully disabled." msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:88 +#: src/Module/Settings/TwoFactor/Index.php:93 msgid "Wrong Password" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:108 +#: src/Module/Settings/TwoFactor/Index.php:113 msgid "" "

Use an application on a mobile device to get two-factor authentication " "codes when prompted on login.

" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:112 +#: src/Module/Settings/TwoFactor/Index.php:117 msgid "Authenticator app" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:113 +#: src/Module/Settings/TwoFactor/Index.php:118 msgid "Configured" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:113 +#: src/Module/Settings/TwoFactor/Index.php:118 msgid "Not Configured" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:114 +#: src/Module/Settings/TwoFactor/Index.php:119 msgid "

You haven't finished configuring your authenticator app.

" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:115 +#: src/Module/Settings/TwoFactor/Index.php:120 msgid "

Your authenticator app is correctly configured.

" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:117 +#: src/Module/Settings/TwoFactor/Index.php:122 msgid "Recovery codes" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:118 +#: src/Module/Settings/TwoFactor/Index.php:123 msgid "Remaining valid codes" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:120 +#: src/Module/Settings/TwoFactor/Index.php:125 msgid "" "

These one-use codes can replace an authenticator app code in case you " "have lost access to it.

" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:122 +#: src/Module/Settings/TwoFactor/Index.php:127 msgid "App-specific passwords" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:123 +#: src/Module/Settings/TwoFactor/Index.php:128 msgid "Generated app-specific passwords" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:125 +#: src/Module/Settings/TwoFactor/Index.php:130 msgid "" "

These randomly generated passwords allow you to authenticate on apps not " "supporting two-factor authentication.

" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:128 +#: src/Module/Settings/TwoFactor/Index.php:133 msgid "Current password:" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:128 +#: src/Module/Settings/TwoFactor/Index.php:133 msgid "" "You need to provide your current password to change two-factor " "authentication settings." msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:129 +#: src/Module/Settings/TwoFactor/Index.php:134 msgid "Enable two-factor authentication" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:130 +#: src/Module/Settings/TwoFactor/Index.php:135 msgid "Disable two-factor authentication" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:131 +#: src/Module/Settings/TwoFactor/Index.php:136 msgid "Show recovery codes" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:132 +#: src/Module/Settings/TwoFactor/Index.php:137 msgid "Manage app-specific passwords" msgstr "" -#: src/Module/Settings/TwoFactor/Index.php:133 +#: src/Module/Settings/TwoFactor/Index.php:138 +msgid "Manage trusted browsers" +msgstr "" + +#: src/Module/Settings/TwoFactor/Index.php:139 msgid "Finish app configuration" msgstr "" @@ -9720,6 +9757,45 @@ msgstr "" msgid "Next: Verification" msgstr "" +#: src/Module/Settings/TwoFactor/Trusted.php:49 +msgid "Trusted browsers successfully removed." +msgstr "" + +#: src/Module/Settings/TwoFactor/Trusted.php:59 +msgid "Trusted browser successfully removed." +msgstr "" + +#: src/Module/Settings/TwoFactor/Trusted.php:97 +msgid "Two-factor Trusted Browsers" +msgstr "" + +#: src/Module/Settings/TwoFactor/Trusted.php:98 +msgid "" +"Trusted browsers are individual browsers you chose to skip two-factor " +"authentication to access Friendica. Please use this feature sparingly, as it " +"can negate the benefit of two-factor authentication." +msgstr "" + +#: src/Module/Settings/TwoFactor/Trusted.php:99 +msgid "Device" +msgstr "" + +#: src/Module/Settings/TwoFactor/Trusted.php:100 +msgid "OS" +msgstr "" + +#: src/Module/Settings/TwoFactor/Trusted.php:102 +msgid "Trusted" +msgstr "" + +#: src/Module/Settings/TwoFactor/Trusted.php:103 +msgid "Last Use" +msgstr "" + +#: src/Module/Settings/TwoFactor/Trusted.php:105 +msgid "Remove All" +msgstr "" + #: src/Module/Settings/TwoFactor/Verify.php:78 msgid "Two-factor authentication successfully activated." msgstr "" @@ -10091,205 +10167,205 @@ msgstr "" msgid "Private Message" msgstr "" -#: src/Object/Post.php:221 +#: src/Object/Post.php:214 msgid "pinned item" msgstr "" -#: src/Object/Post.php:226 +#: src/Object/Post.php:219 msgid "Delete locally" msgstr "" -#: src/Object/Post.php:229 +#: src/Object/Post.php:222 msgid "Delete globally" msgstr "" -#: src/Object/Post.php:229 +#: src/Object/Post.php:222 msgid "Remove locally" msgstr "" -#: src/Object/Post.php:243 +#: src/Object/Post.php:236 #, php-format msgid "Block %s" msgstr "" -#: src/Object/Post.php:248 +#: src/Object/Post.php:241 msgid "save to folder" msgstr "" -#: src/Object/Post.php:283 +#: src/Object/Post.php:275 msgid "I will attend" msgstr "" -#: src/Object/Post.php:283 +#: src/Object/Post.php:275 msgid "I will not attend" msgstr "" -#: src/Object/Post.php:283 +#: src/Object/Post.php:275 msgid "I might attend" msgstr "" -#: src/Object/Post.php:313 +#: src/Object/Post.php:304 msgid "ignore thread" msgstr "" -#: src/Object/Post.php:314 +#: src/Object/Post.php:305 msgid "unignore thread" msgstr "" -#: src/Object/Post.php:315 +#: src/Object/Post.php:306 msgid "toggle ignore status" msgstr "" -#: src/Object/Post.php:327 +#: src/Object/Post.php:317 msgid "pin" msgstr "" -#: src/Object/Post.php:328 +#: src/Object/Post.php:318 msgid "unpin" msgstr "" -#: src/Object/Post.php:329 +#: src/Object/Post.php:319 msgid "toggle pin status" msgstr "" -#: src/Object/Post.php:332 +#: src/Object/Post.php:322 msgid "pinned" msgstr "" -#: src/Object/Post.php:339 +#: src/Object/Post.php:329 msgid "add star" msgstr "" -#: src/Object/Post.php:340 +#: src/Object/Post.php:330 msgid "remove star" msgstr "" -#: src/Object/Post.php:341 +#: src/Object/Post.php:331 msgid "toggle star status" msgstr "" -#: src/Object/Post.php:344 +#: src/Object/Post.php:334 msgid "starred" msgstr "" -#: src/Object/Post.php:348 +#: src/Object/Post.php:338 msgid "add tag" msgstr "" -#: src/Object/Post.php:358 +#: src/Object/Post.php:348 msgid "like" msgstr "" -#: src/Object/Post.php:359 +#: src/Object/Post.php:349 msgid "dislike" msgstr "" -#: src/Object/Post.php:361 +#: src/Object/Post.php:351 msgid "Quote share this" msgstr "" -#: src/Object/Post.php:361 +#: src/Object/Post.php:351 msgid "Quote Share" msgstr "" -#: src/Object/Post.php:364 +#: src/Object/Post.php:354 msgid "Reshare this" msgstr "" -#: src/Object/Post.php:364 +#: src/Object/Post.php:354 msgid "Reshare" msgstr "" -#: src/Object/Post.php:365 +#: src/Object/Post.php:355 msgid "Cancel your Reshare" msgstr "" -#: src/Object/Post.php:365 +#: src/Object/Post.php:355 msgid "Unshare" msgstr "" -#: src/Object/Post.php:410 +#: src/Object/Post.php:400 #, php-format msgid "%s (Received %s)" msgstr "" -#: src/Object/Post.php:415 +#: src/Object/Post.php:405 msgid "Comment this item on your system" msgstr "" -#: src/Object/Post.php:415 +#: src/Object/Post.php:405 msgid "remote comment" msgstr "" -#: src/Object/Post.php:427 +#: src/Object/Post.php:417 msgid "Pushed" msgstr "" -#: src/Object/Post.php:427 +#: src/Object/Post.php:417 msgid "Pulled" msgstr "" -#: src/Object/Post.php:459 +#: src/Object/Post.php:449 msgid "to" msgstr "" -#: src/Object/Post.php:460 +#: src/Object/Post.php:450 msgid "via" msgstr "" -#: src/Object/Post.php:461 +#: src/Object/Post.php:451 msgid "Wall-to-Wall" msgstr "" -#: src/Object/Post.php:462 +#: src/Object/Post.php:452 msgid "via Wall-To-Wall:" msgstr "" -#: src/Object/Post.php:500 +#: src/Object/Post.php:490 #, php-format msgid "Reply to %s" msgstr "" -#: src/Object/Post.php:503 +#: src/Object/Post.php:493 msgid "More" msgstr "" -#: src/Object/Post.php:521 +#: src/Object/Post.php:511 msgid "Notifier task is pending" msgstr "" -#: src/Object/Post.php:522 +#: src/Object/Post.php:512 msgid "Delivery to remote servers is pending" msgstr "" -#: src/Object/Post.php:523 +#: src/Object/Post.php:513 msgid "Delivery to remote servers is underway" msgstr "" -#: src/Object/Post.php:524 +#: src/Object/Post.php:514 msgid "Delivery to remote servers is mostly done" msgstr "" -#: src/Object/Post.php:525 +#: src/Object/Post.php:515 msgid "Delivery to remote servers is done" msgstr "" -#: src/Object/Post.php:545 +#: src/Object/Post.php:535 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: src/Object/Post.php:546 +#: src/Object/Post.php:536 msgid "Show more" msgstr "" -#: src/Object/Post.php:547 +#: src/Object/Post.php:537 msgid "Show fewer" msgstr "" -#: src/Protocol/Diaspora.php:3424 +#: src/Protocol/Diaspora.php:3414 msgid "Attachments:" msgstr "" @@ -10391,20 +10467,20 @@ msgstr "" msgid "Contact information and Social Networks" msgstr "" -#: src/Security/Authentication.php:210 src/Security/Authentication.php:262 +#: src/Security/Authentication.php:209 src/Security/Authentication.php:261 msgid "Login failed." msgstr "" -#: src/Security/Authentication.php:273 +#: src/Security/Authentication.php:272 msgid "Login failed. Please check your credentials." msgstr "" -#: src/Security/Authentication.php:389 +#: src/Security/Authentication.php:391 #, php-format msgid "Welcome %s" msgstr "" -#: src/Security/Authentication.php:390 +#: src/Security/Authentication.php:392 msgid "Please upload a profile photo." msgstr "" @@ -10497,7 +10573,7 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: src/Worker/Delivery.php:566 +#: src/Worker/Delivery.php:570 msgid "(no subject)" msgstr "" @@ -10643,10 +10719,6 @@ msgstr "" msgid "Leave background image and color empty for theme defaults" msgstr "" -#: view/theme/frio/php/default.php:81 view/theme/frio/php/standard.php:38 -msgid "Skip to main content" -msgstr "" - #: view/theme/frio/php/Image.php:40 msgid "Top Banner" msgstr "" @@ -10683,6 +10755,10 @@ msgstr "" msgid "Repeat image to fill the screen." msgstr "" +#: view/theme/frio/php/default.php:81 view/theme/frio/php/standard.php:38 +msgid "Skip to main content" +msgstr "" + #: view/theme/frio/theme.php:207 msgid "Guest" msgstr ""