From 64fac441a6c358434c75fa9af784b5e4d4946bb6 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 7 Jun 2022 06:31:13 +0200 Subject: [PATCH 1/4] =?UTF-8?q?HU=20translation=20update=20THX=20Bal=C3=A1?= =?UTF-8?q?zs=20=C3=9Ar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/lang/hu/messages.po | 541 +++++++++++++++++++++------------------ view/lang/hu/strings.php | 10 +- 2 files changed, 292 insertions(+), 259 deletions(-) diff --git a/view/lang/hu/messages.po b/view/lang/hu/messages.po index afebda606..84dbda24a 100644 --- a/view/lang/hu/messages.po +++ b/view/lang/hu/messages.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-01 22:09+0000\n" +"POT-Creation-Date: 2022-06-06 07:33+0000\n" "PO-Revision-Date: 2011-05-05 10:19+0000\n" "Last-Translator: Balázs Úr, 2020-2022\n" "Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n" @@ -32,7 +32,7 @@ msgid "Access denied." msgstr "Hozzáférés megtagadva." #: mod/cal.php:63 mod/cal.php:80 mod/photos.php:69 mod/photos.php:140 -#: mod/photos.php:804 src/Model/Profile.php:231 src/Module/Feed.php:72 +#: mod/photos.php:798 src/Model/Profile.php:231 src/Module/Feed.php:72 #: src/Module/HCard.php:52 src/Module/Profile/Common.php:41 #: src/Module/Profile/Common.php:52 src/Module/Profile/Contacts.php:40 #: src/Module/Profile/Contacts.php:50 src/Module/Profile/Media.php:38 @@ -41,7 +41,7 @@ msgstr "Hozzáférés megtagadva." msgid "User not found." msgstr "A felhasználó nem található." -#: mod/cal.php:122 mod/display.php:246 src/Module/Profile/Profile.php:94 +#: mod/cal.php:122 mod/display.php:247 src/Module/Profile/Profile.php:94 #: src/Module/Profile/Profile.php:109 src/Module/Profile/Status.php:110 #: src/Module/Update/Profile.php:56 msgid "Access to this profile has been restricted." @@ -108,24 +108,24 @@ msgstr "Nem található exportálható adat" msgid "calendar" msgstr "naptár" -#: mod/display.php:141 mod/photos.php:808 +#: mod/display.php:142 mod/photos.php:802 #: src/Module/Conversation/Community.php:175 src/Module/Directory.php:49 #: src/Module/Search/Index.php:50 msgid "Public access denied." msgstr "Nyilvános hozzáférés megtagadva." -#: mod/display.php:197 mod/display.php:271 +#: mod/display.php:198 mod/display.php:272 msgid "The requested item doesn't exist or has been deleted." msgstr "A kért elem nem létezik vagy törölték." -#: mod/display.php:351 +#: mod/display.php:352 msgid "The feed for this item is unavailable." msgstr "Ennek az elemnek a hírforrása nem érhető el." #: mod/editpost.php:38 mod/events.php:217 mod/follow.php:56 mod/follow.php:130 #: mod/item.php:181 mod/item.php:186 mod/item.php:875 mod/message.php:69 #: mod/message.php:111 mod/notes.php:44 mod/ostatus_subscribe.php:33 -#: mod/photos.php:160 mod/photos.php:897 mod/repair_ostatus.php:31 +#: mod/photos.php:160 mod/photos.php:891 mod/repair_ostatus.php:31 #: mod/settings.php:40 mod/settings.php:50 mod/settings.php:156 #: mod/suggest.php:34 mod/uimport.php:33 mod/unfollow.php:35 #: mod/unfollow.php:50 mod/unfollow.php:82 mod/wall_attach.php:67 @@ -142,8 +142,8 @@ msgstr "Ennek az elemnek a hírforrása nem érhető el." #: src/Module/Profile/Schedule.php:39 src/Module/Profile/Schedule.php:56 #: src/Module/Register.php:77 src/Module/Register.php:90 #: src/Module/Register.php:206 src/Module/Register.php:245 -#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:48 -#: src/Module/Settings/Account.php:384 src/Module/Settings/Delegation.php:42 +#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:49 +#: src/Module/Settings/Account.php:409 src/Module/Settings/Delegation.php:42 #: src/Module/Settings/Delegation.php:70 src/Module/Settings/Display.php:42 #: src/Module/Settings/Display.php:120 #: src/Module/Settings/Profile/Photo/Crop.php:166 @@ -168,7 +168,7 @@ msgstr "Bejegyzés szerkesztése" msgid "Save" msgstr "Mentés" -#: mod/editpost.php:92 mod/photos.php:1344 src/Content/Conversation.php:338 +#: mod/editpost.php:92 mod/photos.php:1338 src/Content/Conversation.php:338 #: src/Module/Contact/Poke.php:176 src/Object/Post.php:989 msgid "Loading..." msgstr "Betöltés…" @@ -233,7 +233,7 @@ msgid "clear location" msgstr "hely törlése" #: mod/editpost.php:107 mod/message.php:200 mod/message.php:358 -#: mod/photos.php:1495 mod/wallmessage.php:142 +#: mod/photos.php:1489 mod/wallmessage.php:142 #: src/Content/Conversation.php:368 src/Content/Conversation.php:712 #: src/Module/Item/Compose.php:177 src/Object/Post.php:528 msgid "Please wait" @@ -265,14 +265,14 @@ msgstr "Kategóriák (vesszővel elválasztott lista)" msgid "Example: bob@example.com, mary@example.com" msgstr "Példa: bob@example.com, mary@example.com" -#: mod/editpost.php:128 mod/events.php:513 mod/photos.php:1343 -#: mod/photos.php:1399 mod/photos.php:1473 src/Content/Conversation.php:383 +#: mod/editpost.php:128 mod/events.php:513 mod/photos.php:1337 +#: mod/photos.php:1393 mod/photos.php:1467 src/Content/Conversation.php:383 #: src/Module/Item/Compose.php:172 src/Object/Post.php:999 msgid "Preview" msgstr "Előnézet" #: mod/editpost.php:130 mod/fbrowser.php:118 mod/fbrowser.php:145 -#: mod/follow.php:144 mod/photos.php:1010 mod/photos.php:1111 mod/tagrm.php:35 +#: mod/follow.php:144 mod/photos.php:1004 mod/photos.php:1105 mod/tagrm.php:35 #: mod/tagrm.php:127 mod/unfollow.php:97 src/Content/Conversation.php:386 #: src/Module/Contact/Revoke.php:108 src/Module/RemoteFollow.php:127 msgid "Cancel" @@ -314,7 +314,7 @@ msgid "Link or Media" msgstr "Hivatkozás vagy média" #: mod/editpost.php:143 src/Content/Conversation.php:393 -#: src/Content/Widget/VCard.php:107 src/Model/Profile.php:462 +#: src/Content/Widget/VCard.php:113 src/Model/Profile.php:462 #: src/Module/Admin/Logs/View.php:93 msgid "Message" msgstr "Üzenet" @@ -324,8 +324,8 @@ msgstr "Üzenet" msgid "Browser" msgstr "Böngésző" -#: mod/editpost.php:145 mod/events.php:518 mod/photos.php:945 -#: mod/photos.php:1297 src/Content/Conversation.php:370 +#: mod/editpost.php:145 mod/events.php:518 mod/photos.php:939 +#: mod/photos.php:1291 src/Content/Conversation.php:370 msgid "Permissions" msgstr "Jogosultságok" @@ -389,7 +389,7 @@ msgstr "Esemény befejezése:" msgid "Description:" msgstr "Leírás:" -#: mod/events.php:504 src/Content/Widget/VCard.php:98 src/Model/Event.php:80 +#: mod/events.php:504 src/Content/Widget/VCard.php:104 src/Model/Event.php:80 #: src/Model/Event.php:107 src/Model/Event.php:466 src/Model/Event.php:915 #: src/Model/Profile.php:370 src/Module/Contact/Profile.php:369 #: src/Module/Directory.php:148 src/Module/Notifications/Introductions.php:185 @@ -406,8 +406,8 @@ msgid "Share this event" msgstr "Az esemény megosztása" #: mod/events.php:515 mod/message.php:201 mod/message.php:357 -#: mod/photos.php:927 mod/photos.php:1031 mod/photos.php:1301 -#: mod/photos.php:1342 mod/photos.php:1398 mod/photos.php:1472 +#: mod/photos.php:921 mod/photos.php:1025 mod/photos.php:1295 +#: mod/photos.php:1336 mod/photos.php:1392 mod/photos.php:1466 #: src/Module/Admin/Item/Source.php:65 src/Module/Contact/Advanced.php:132 #: src/Module/Contact/Poke.php:177 src/Module/Contact/Profile.php:327 #: src/Module/Debug/ActivityPubConversion.php:145 @@ -863,11 +863,11 @@ msgstr "Tartsa nyitva ezt az ablakot, amíg el nem készül." msgid "Photo Albums" msgstr "Fényképalbumok" -#: mod/photos.php:109 mod/photos.php:1590 +#: mod/photos.php:109 mod/photos.php:1584 msgid "Recent Photos" msgstr "Legutóbbi fényképek" -#: mod/photos.php:111 mod/photos.php:1079 mod/photos.php:1592 +#: mod/photos.php:111 mod/photos.php:1073 mod/photos.php:1586 msgid "Upload New Photos" msgstr "Új fényképek feltöltése" @@ -895,221 +895,221 @@ msgstr "Az album üres volt." msgid "Failed to delete the photo." msgstr "Nem sikerült törölni a fényképet." -#: mod/photos.php:559 +#: mod/photos.php:553 msgid "a photo" msgstr "egy fényképen" -#: mod/photos.php:559 +#: mod/photos.php:553 #, php-format msgid "%1$s was tagged in %2$s by %3$s" msgstr "%1$s meg lett jelölve %2$s %3$s által" -#: mod/photos.php:642 mod/photos.php:645 mod/photos.php:672 +#: mod/photos.php:636 mod/photos.php:639 mod/photos.php:666 #: mod/wall_upload.php:201 src/Module/Settings/Profile/Photo/Index.php:60 #, php-format msgid "Image exceeds size limit of %s" msgstr "A kép meghaladja a beállított %s méretkorlátot" -#: mod/photos.php:648 +#: mod/photos.php:642 msgid "Image upload didn't complete, please try again" msgstr "A kép feltöltése nem fejeződött be, próbálja újra" -#: mod/photos.php:651 +#: mod/photos.php:645 msgid "Image file is missing" msgstr "A képfájl hiányzik" -#: mod/photos.php:656 +#: mod/photos.php:650 msgid "" "Server can't accept new file upload at this time, please contact your " "administrator" msgstr "A kiszolgáló jelenleg nem tud új fájlfeltöltést fogadni, vegye fel a kapcsolatot a rendszergazdával" -#: mod/photos.php:680 +#: mod/photos.php:674 msgid "Image file is empty." msgstr "A képfájl üres." -#: mod/photos.php:695 mod/wall_upload.php:163 +#: mod/photos.php:689 mod/wall_upload.php:163 #: src/Module/Settings/Profile/Photo/Index.php:69 msgid "Unable to process image." msgstr "Nem lehet feldolgozni a képet." -#: mod/photos.php:721 mod/wall_upload.php:226 +#: mod/photos.php:715 mod/wall_upload.php:226 #: src/Module/Settings/Profile/Photo/Index.php:96 msgid "Image upload failed." msgstr "A kép feltöltése sikertelen." -#: mod/photos.php:813 +#: mod/photos.php:807 msgid "No photos selected" msgstr "Nincsenek fényképek kijelölve" -#: mod/photos.php:882 +#: mod/photos.php:876 msgid "Access to this item is restricted." msgstr "Az elemhez való hozzáférés korlátozott." -#: mod/photos.php:937 +#: mod/photos.php:931 msgid "Upload Photos" msgstr "Fényképek feltöltése" -#: mod/photos.php:941 mod/photos.php:1027 +#: mod/photos.php:935 mod/photos.php:1021 msgid "New album name: " msgstr "Új album neve: " -#: mod/photos.php:942 +#: mod/photos.php:936 msgid "or select existing album:" msgstr "vagy meglévő album kiválasztása:" -#: mod/photos.php:943 +#: mod/photos.php:937 msgid "Do not show a status post for this upload" msgstr "Ne jelenítsen meg állapotbejegyzést ehhez a feltöltéshez" -#: mod/photos.php:1008 +#: mod/photos.php:1002 msgid "Do you really want to delete this photo album and all its photos?" msgstr "Valóban törölni szeretné ezt a fényképalbumot és az összes fényképét?" -#: mod/photos.php:1009 mod/photos.php:1032 +#: mod/photos.php:1003 mod/photos.php:1026 msgid "Delete Album" msgstr "Album törlése" -#: mod/photos.php:1036 +#: mod/photos.php:1030 msgid "Edit Album" msgstr "Album szerkesztése" -#: mod/photos.php:1037 +#: mod/photos.php:1031 msgid "Drop Album" msgstr "Album eldobása" -#: mod/photos.php:1041 +#: mod/photos.php:1035 msgid "Show Newest First" msgstr "Legújabb megjelenítése először" -#: mod/photos.php:1043 +#: mod/photos.php:1037 msgid "Show Oldest First" msgstr "Legrégebbi megjelenítése először" -#: mod/photos.php:1064 mod/photos.php:1575 +#: mod/photos.php:1058 mod/photos.php:1569 msgid "View Photo" msgstr "Fénykép megtekintése" -#: mod/photos.php:1097 +#: mod/photos.php:1091 msgid "Permission denied. Access to this item may be restricted." msgstr "Hozzáférés megtagadva. Az elemhez való hozzáférés korlátozva lehet." -#: mod/photos.php:1099 +#: mod/photos.php:1093 msgid "Photo not available" msgstr "A fénykép nem érhető el" -#: mod/photos.php:1109 +#: mod/photos.php:1103 msgid "Do you really want to delete this photo?" msgstr "Valóban törölni szeretné ezt a fényképet?" -#: mod/photos.php:1110 mod/photos.php:1302 +#: mod/photos.php:1104 mod/photos.php:1296 msgid "Delete Photo" msgstr "Fénykép törlése" -#: mod/photos.php:1202 +#: mod/photos.php:1196 msgid "View photo" msgstr "Fénykép megtekintése" -#: mod/photos.php:1204 +#: mod/photos.php:1198 msgid "Edit photo" msgstr "Fénykép szerkesztése" -#: mod/photos.php:1205 +#: mod/photos.php:1199 msgid "Delete photo" msgstr "Fénykép törlése" -#: mod/photos.php:1206 +#: mod/photos.php:1200 msgid "Use as profile photo" msgstr "Használat profilfényképként" -#: mod/photos.php:1213 +#: mod/photos.php:1207 msgid "Private Photo" msgstr "Személyes fénykép" -#: mod/photos.php:1219 +#: mod/photos.php:1213 msgid "View Full Size" msgstr "Teljes méret megtekintése" -#: mod/photos.php:1270 +#: mod/photos.php:1264 msgid "Tags: " msgstr "Címkék: " -#: mod/photos.php:1273 +#: mod/photos.php:1267 msgid "[Select tags to remove]" msgstr "[Eltávolítandó címkék kiválasztása]" -#: mod/photos.php:1288 +#: mod/photos.php:1282 msgid "New album name" msgstr "Új album neve" -#: mod/photos.php:1289 +#: mod/photos.php:1283 msgid "Caption" msgstr "Felirat" -#: mod/photos.php:1290 +#: mod/photos.php:1284 msgid "Add a Tag" msgstr "Címke hozzáadása" -#: mod/photos.php:1290 +#: mod/photos.php:1284 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Példa: @bob, @Barbara_Jensen, @jim@example.com, #Budapest, #kemping" -#: mod/photos.php:1291 +#: mod/photos.php:1285 msgid "Do not rotate" msgstr "Ne forgassa el" -#: mod/photos.php:1292 +#: mod/photos.php:1286 msgid "Rotate CW (right)" msgstr "Forgatás jobbra" -#: mod/photos.php:1293 +#: mod/photos.php:1287 msgid "Rotate CCW (left)" msgstr "Forgatás balra" -#: mod/photos.php:1339 mod/photos.php:1395 mod/photos.php:1469 +#: mod/photos.php:1333 mod/photos.php:1389 mod/photos.php:1463 #: src/Module/Contact.php:544 src/Module/Item/Compose.php:160 #: src/Object/Post.php:985 msgid "This is you" msgstr "Ez Ön" -#: mod/photos.php:1341 mod/photos.php:1397 mod/photos.php:1471 +#: mod/photos.php:1335 mod/photos.php:1391 mod/photos.php:1465 #: src/Object/Post.php:522 src/Object/Post.php:987 msgid "Comment" msgstr "Hozzászólás" -#: mod/photos.php:1430 src/Content/Conversation.php:628 +#: mod/photos.php:1424 src/Content/Conversation.php:628 #: src/Object/Post.php:247 msgid "Select" msgstr "Kiválasztás" -#: mod/photos.php:1431 mod/settings.php:350 src/Content/Conversation.php:629 +#: mod/photos.php:1425 mod/settings.php:350 src/Content/Conversation.php:629 #: src/Module/Admin/Users/Active.php:139 #: src/Module/Admin/Users/Blocked.php:140 src/Module/Admin/Users/Index.php:153 msgid "Delete" msgstr "Törlés" -#: mod/photos.php:1492 src/Object/Post.php:369 +#: mod/photos.php:1486 src/Object/Post.php:369 msgid "Like" msgstr "Tetszik" -#: mod/photos.php:1493 src/Object/Post.php:369 +#: mod/photos.php:1487 src/Object/Post.php:369 msgid "I like this (toggle)" msgstr "Ezt kedvelem (átváltás)" -#: mod/photos.php:1494 src/Object/Post.php:370 +#: mod/photos.php:1488 src/Object/Post.php:370 msgid "Dislike" msgstr "Nem tetszik" -#: mod/photos.php:1496 src/Object/Post.php:370 +#: mod/photos.php:1490 src/Object/Post.php:370 msgid "I don't like this (toggle)" msgstr "Ezt nem kedvelem (átváltás)" -#: mod/photos.php:1518 +#: mod/photos.php:1512 msgid "Map" msgstr "Térkép" -#: mod/photos.php:1581 +#: mod/photos.php:1575 msgid "View Album" msgstr "Album megtekintése" @@ -1130,36 +1130,36 @@ msgstr "Hibás kérés." msgid "Contact not found." msgstr "A partner nem található." -#: mod/removeme.php:63 src/Navigation/Notifications/Repository/Notify.php:482 +#: mod/removeme.php:65 src/Navigation/Notifications/Repository/Notify.php:482 msgid "[Friendica System Notify]" msgstr "[Friendica rendszerértesítés]" -#: mod/removeme.php:63 +#: mod/removeme.php:65 msgid "User deleted their account" msgstr "A felhasználó törölte a fiókját" -#: mod/removeme.php:64 +#: mod/removeme.php:66 msgid "" "On your Friendica node an user deleted their account. Please ensure that " "their data is removed from the backups." msgstr "Az Ön Friendica csomópontján egy felhasználó törölte a fiókját. Győződjön meg arról, hogy az adatai el lettek-e távolítva a biztonsági mentésekből." -#: mod/removeme.php:65 +#: mod/removeme.php:67 #, php-format msgid "The user id is %d" msgstr "A felhasználó-azonosító %d" -#: mod/removeme.php:99 mod/removeme.php:102 +#: mod/removeme.php:101 mod/removeme.php:104 msgid "Remove My Account" msgstr "Saját fiók eltávolítása" -#: mod/removeme.php:100 +#: mod/removeme.php:102 msgid "" "This will completely remove your account. Once this has been done it is not " "recoverable." msgstr "Ez teljesen el fogja távolítani a fiókját. Miután ez megtörtént, nem lesz visszaállítható." -#: mod/removeme.php:101 +#: mod/removeme.php:103 msgid "Please enter your password for verification:" msgstr "Adja meg a jelszavát az ellenőrzéshez:" @@ -1207,7 +1207,7 @@ msgstr "Felhatalmazás eltávolítása" #: mod/settings.php:352 src/Module/Admin/Addons/Index.php:69 #: src/Module/Admin/Features.php:87 src/Module/Admin/Logs/Settings.php:81 #: src/Module/Admin/Site.php:434 src/Module/Admin/Themes/Index.php:113 -#: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:532 +#: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:559 #: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:193 msgid "Save Settings" msgstr "Beállítások mentése" @@ -1652,53 +1652,58 @@ msgstr "A partner tiltva lett a csomópontról" msgid "%d %s, %d duplicates." msgstr "%d %s, %d kettőzés." -#: src/Console/MergeContacts.php:86 +#: src/Console/MergeContacts.php:77 +#, php-format +msgid "uri-id is empty for contact %s." +msgstr "Az URI-azonosító üres %s partnernél." + +#: src/Console/MergeContacts.php:90 #, php-format msgid "No valid first countact found for uri-id %d." msgstr "Nem található érvényes első partner a(z) %d. URI-azonosítóhoz." -#: src/Console/MergeContacts.php:97 +#: src/Console/MergeContacts.php:101 #, php-format msgid "Wrong duplicate found for uri-id %d in %d (url: %s != %s)." msgstr "Hibás kettőzés található a(z) %d. URI-azonosítónál ebben: %d (URL: %s != %s)." -#: src/Console/MergeContacts.php:101 +#: src/Console/MergeContacts.php:105 #, php-format msgid "Wrong duplicate found for uri-id %d in %d (nurl: %s != %s)." msgstr "Hibás kettőzés található a(z) %d. URI-azonosítónál ebben: %d (NURL: %s != %s)." -#: src/Console/MergeContacts.php:137 +#: src/Console/MergeContacts.php:141 #, php-format msgid "Deletion of id %d failed" msgstr "A(z) %d. azonosító törlése sikertelen" -#: src/Console/MergeContacts.php:139 +#: src/Console/MergeContacts.php:143 #, php-format msgid "Deletion of id %d was successful" msgstr "A(z) %d. azonosító törlése sikeres volt" -#: src/Console/MergeContacts.php:145 +#: src/Console/MergeContacts.php:149 #, php-format msgid "Updating \"%s\" in \"%s\" from %d to %d" msgstr "„%s” frissítése ebben: „%s”, %d. értéktől %d. értékig" -#: src/Console/MergeContacts.php:147 +#: src/Console/MergeContacts.php:151 msgid " - found" msgstr " – megtalálva" -#: src/Console/MergeContacts.php:154 +#: src/Console/MergeContacts.php:158 msgid " - failed" msgstr " – sikertelen" -#: src/Console/MergeContacts.php:156 +#: src/Console/MergeContacts.php:160 msgid " - success" msgstr " – sikeres" -#: src/Console/MergeContacts.php:160 +#: src/Console/MergeContacts.php:164 msgid " - deleted" msgstr " – törölve" -#: src/Console/MergeContacts.php:163 +#: src/Console/MergeContacts.php:167 msgid " - done" msgstr " – kész" @@ -1760,11 +1765,11 @@ msgstr "Felhasználó becenevének megadása: " msgid "Enter new password: " msgstr "Új jelszó megadása: " -#: src/Console/User.php:210 src/Module/Settings/Account.php:73 +#: src/Console/User.php:210 src/Module/Settings/Account.php:74 msgid "Password update failed. Please try again." msgstr "A jelszó frissítése sikertelen. Próbálja újra." -#: src/Console/User.php:213 src/Module/Settings/Account.php:76 +#: src/Console/User.php:213 src/Module/Settings/Account.php:77 msgid "Password changed." msgstr "A jelszó megváltoztatva." @@ -2657,7 +2662,7 @@ msgstr "További bejegyzések betöltése…" msgid "The end" msgstr "Vége" -#: src/Content/Text/HTML.php:875 src/Content/Widget/VCard.php:103 +#: src/Content/Text/HTML.php:875 src/Content/Widget/VCard.php:109 #: src/Model/Profile.php:456 msgid "Follow" msgstr "Követés" @@ -2784,7 +2789,7 @@ msgstr "Szervezetek" msgid "News" msgstr "Hírek" -#: src/Content/Widget.php:525 src/Module/Settings/Account.php:430 +#: src/Content/Widget.php:525 src/Module/Settings/Account.php:455 msgid "Account Types" msgstr "Fióktípusok" @@ -2838,22 +2843,22 @@ msgstr[1] "Népszerű címkék (legutóbbi %d óra)" msgid "More Trending Tags" msgstr "További népszerű címkék" -#: src/Content/Widget/VCard.php:96 src/Model/Profile.php:375 +#: src/Content/Widget/VCard.php:102 src/Model/Profile.php:375 #: src/Module/Contact/Profile.php:371 src/Module/Profile/Profile.php:176 msgid "XMPP:" msgstr "XMPP:" -#: src/Content/Widget/VCard.php:97 src/Model/Profile.php:376 +#: src/Content/Widget/VCard.php:103 src/Model/Profile.php:376 #: src/Module/Contact/Profile.php:373 src/Module/Profile/Profile.php:180 msgid "Matrix:" msgstr "Mátrix:" -#: src/Content/Widget/VCard.php:101 src/Model/Profile.php:468 +#: src/Content/Widget/VCard.php:107 src/Model/Profile.php:468 #: src/Module/Notifications/Introductions.php:199 msgid "Network:" msgstr "Hálózat:" -#: src/Content/Widget/VCard.php:105 src/Model/Profile.php:458 +#: src/Content/Widget/VCard.php:111 src/Model/Profile.php:458 msgid "Unfollow" msgstr "Követés megszüntetése" @@ -4364,19 +4369,19 @@ msgstr "Törölve" msgid "List of pending user deletions" msgstr "Függőben lévő felhasználó-törlések listája" -#: src/Module/Admin/BaseUsers.php:100 src/Module/Settings/Account.php:468 +#: src/Module/Admin/BaseUsers.php:100 src/Module/Settings/Account.php:493 msgid "Normal Account Page" msgstr "Normál fiókoldal" -#: src/Module/Admin/BaseUsers.php:101 src/Module/Settings/Account.php:475 +#: src/Module/Admin/BaseUsers.php:101 src/Module/Settings/Account.php:500 msgid "Soapbox Page" msgstr "Szappantartó oldal" -#: src/Module/Admin/BaseUsers.php:102 src/Module/Settings/Account.php:482 +#: src/Module/Admin/BaseUsers.php:102 src/Module/Settings/Account.php:507 msgid "Public Forum" msgstr "Nyilvános fórum" -#: src/Module/Admin/BaseUsers.php:103 src/Module/Settings/Account.php:489 +#: src/Module/Admin/BaseUsers.php:103 src/Module/Settings/Account.php:514 msgid "Automatic Friend Page" msgstr "Automatikus ismerős oldal" @@ -4384,19 +4389,19 @@ msgstr "Automatikus ismerős oldal" msgid "Private Forum" msgstr "Személyes fórum" -#: src/Module/Admin/BaseUsers.php:107 src/Module/Settings/Account.php:440 +#: src/Module/Admin/BaseUsers.php:107 src/Module/Settings/Account.php:465 msgid "Personal Page" msgstr "Személyes oldal" -#: src/Module/Admin/BaseUsers.php:108 src/Module/Settings/Account.php:447 +#: src/Module/Admin/BaseUsers.php:108 src/Module/Settings/Account.php:472 msgid "Organisation Page" msgstr "Szervezeti oldal" -#: src/Module/Admin/BaseUsers.php:109 src/Module/Settings/Account.php:454 +#: src/Module/Admin/BaseUsers.php:109 src/Module/Settings/Account.php:479 msgid "News Page" msgstr "Hírek oldal" -#: src/Module/Admin/BaseUsers.php:110 src/Module/Settings/Account.php:461 +#: src/Module/Admin/BaseUsers.php:110 src/Module/Settings/Account.php:486 msgid "Community Forum" msgstr "Közösségi fórum" @@ -8243,7 +8248,7 @@ msgid "" "class=\"btn btn-sm pull-right\">Cancel" msgstr "A profilját jelenleg %s nevében nézi Mégse" -#: src/Module/Profile/Profile.php:144 src/Module/Settings/Account.php:548 +#: src/Module/Profile/Profile.php:144 src/Module/Settings/Account.php:575 msgid "Full Name:" msgstr "Teljes név:" @@ -8373,7 +8378,7 @@ msgstr "Az e-mail-címe (a kezdeti információk ide lesznek elküldve, szóval msgid "Please repeat your e-mail address:" msgstr "Ismételje meg az e-mail-címét:" -#: src/Module/Register.php:162 src/Module/Settings/Account.php:539 +#: src/Module/Register.php:162 src/Module/Settings/Account.php:566 msgid "New Password:" msgstr "Új jelszó:" @@ -8381,7 +8386,7 @@ msgstr "Új jelszó:" msgid "Leave empty for an auto generated password." msgstr "Hagyja üresen egy automatikusan előállított jelszóhoz." -#: src/Module/Register.php:163 src/Module/Settings/Account.php:540 +#: src/Module/Register.php:163 src/Module/Settings/Account.php:567 msgid "Confirm:" msgstr "Megerősítés:" @@ -8647,127 +8652,127 @@ msgstr "Ez az én kétlépcsős hitelesítő alkalmazás eszközöm" msgid "Verify code and complete login" msgstr "Kód ellenőrzése és a bejelentkezés befejezése" -#: src/Module/Settings/Account.php:65 +#: src/Module/Settings/Account.php:66 msgid "Passwords do not match." msgstr "A jelszavak nem egyeznek." -#: src/Module/Settings/Account.php:79 +#: src/Module/Settings/Account.php:80 msgid "Password unchanged." msgstr "A jelszó nincs megváltoztatva." -#: src/Module/Settings/Account.php:94 +#: src/Module/Settings/Account.php:95 msgid "Please use a shorter name." msgstr "Használjon rövidebb nevet." -#: src/Module/Settings/Account.php:97 +#: src/Module/Settings/Account.php:98 msgid "Name too short." msgstr "A név túl rövid." -#: src/Module/Settings/Account.php:106 +#: src/Module/Settings/Account.php:107 msgid "Wrong Password." msgstr "Hibás jelszó." -#: src/Module/Settings/Account.php:111 +#: src/Module/Settings/Account.php:112 msgid "Invalid email." msgstr "Érvénytelen e-mail-cím." -#: src/Module/Settings/Account.php:117 +#: src/Module/Settings/Account.php:118 msgid "Cannot change to that email." msgstr "Nem lehet megváltoztatni arra az e-mail-címre." -#: src/Module/Settings/Account.php:147 src/Module/Settings/Account.php:199 -#: src/Module/Settings/Account.php:219 src/Module/Settings/Account.php:279 -#: src/Module/Settings/Account.php:328 +#: src/Module/Settings/Account.php:148 src/Module/Settings/Account.php:200 +#: src/Module/Settings/Account.php:220 src/Module/Settings/Account.php:304 +#: src/Module/Settings/Account.php:353 msgid "Settings were not updated." msgstr "A beállítások nem lettek frissítve." -#: src/Module/Settings/Account.php:340 +#: src/Module/Settings/Account.php:365 msgid "Contact CSV file upload error" msgstr "Partner CSV-fájl feltöltési hiba" -#: src/Module/Settings/Account.php:359 +#: src/Module/Settings/Account.php:384 msgid "Importing Contacts done" msgstr "A partnerek importálása kész" -#: src/Module/Settings/Account.php:372 +#: src/Module/Settings/Account.php:397 msgid "Relocate message has been send to your contacts" msgstr "Az áthelyezési üzenet el lett küldve a partnereknek" -#: src/Module/Settings/Account.php:389 +#: src/Module/Settings/Account.php:414 msgid "Unable to find your profile. Please contact your admin." msgstr "Nem található a profilja. Vegye fel a kapcsolatot a rendszergazdával." -#: src/Module/Settings/Account.php:431 +#: src/Module/Settings/Account.php:456 msgid "Personal Page Subtypes" msgstr "Személyes oldal altípusai" -#: src/Module/Settings/Account.php:432 +#: src/Module/Settings/Account.php:457 msgid "Community Forum Subtypes" msgstr "Közösségi fórum altípusai" -#: src/Module/Settings/Account.php:442 +#: src/Module/Settings/Account.php:467 msgid "Account for a personal profile." msgstr "Egy személyes profil fiókja." -#: src/Module/Settings/Account.php:449 +#: src/Module/Settings/Account.php:474 msgid "" "Account for an organisation that automatically approves contact requests as " "\"Followers\"." msgstr "Egy szervezet fiókja, amely automatikusan jóváhagyja a partnerkéréseket, mint például a „követőket”." -#: src/Module/Settings/Account.php:456 +#: src/Module/Settings/Account.php:481 msgid "" "Account for a news reflector that automatically approves contact requests as" " \"Followers\"." msgstr "Egy hírportál fiókja, amely automatikusan jóváhagyja a partnerkéréseket, mint például a „követőket”." -#: src/Module/Settings/Account.php:463 +#: src/Module/Settings/Account.php:488 msgid "Account for community discussions." msgstr "Közösségi beszélgetések fiókja." -#: src/Module/Settings/Account.php:470 +#: src/Module/Settings/Account.php:495 msgid "" "Account for a regular personal profile that requires manual approval of " "\"Friends\" and \"Followers\"." msgstr "Egy szokásos személyes profil fiókja, amely az „ismerősök” és a „követők” kézi jóváhagyását igényli." -#: src/Module/Settings/Account.php:477 +#: src/Module/Settings/Account.php:502 msgid "" "Account for a public profile that automatically approves contact requests as" " \"Followers\"." msgstr "Egy nyilvános profil fiókja, amely automatikusan jóváhagyja a partnerkéréseket, mint például a „követőket”." -#: src/Module/Settings/Account.php:484 +#: src/Module/Settings/Account.php:509 msgid "Automatically approves all contact requests." msgstr "Automatikusan jóváhagyja az összes partnerkérést." -#: src/Module/Settings/Account.php:491 +#: src/Module/Settings/Account.php:516 msgid "" "Account for a popular profile that automatically approves contact requests " "as \"Friends\"." msgstr "Egy népszerű profil fiókja, amely automatikusan jóváhagyja a partnerkéréseket, mint például az „ismerősöket”." -#: src/Module/Settings/Account.php:496 +#: src/Module/Settings/Account.php:521 msgid "Private Forum [Experimental]" msgstr "Személyes fórum [kísérleti]" -#: src/Module/Settings/Account.php:498 +#: src/Module/Settings/Account.php:523 msgid "Requires manual approval of contact requests." msgstr "A partnerkérések kézi jóváhagyását igényli." -#: src/Module/Settings/Account.php:507 +#: src/Module/Settings/Account.php:532 msgid "OpenID:" msgstr "OpenID:" -#: src/Module/Settings/Account.php:507 +#: src/Module/Settings/Account.php:532 msgid "(Optional) Allow this OpenID to login to this account." msgstr "(Kihagyható) Lehetővé teszi ezen OpenID számára, hogy bejelentkezzen ebbe a fiókba." -#: src/Module/Settings/Account.php:515 +#: src/Module/Settings/Account.php:540 msgid "Publish your profile in your local site directory?" msgstr "Közzéteszi a profilját a helyi oldal könyvtárában?" -#: src/Module/Settings/Account.php:515 +#: src/Module/Settings/Account.php:540 #, php-format msgid "" "Your profile will be published in this node's local " @@ -8775,103 +8780,103 @@ msgid "" " system settings." msgstr "A profilja közzé lesz téve ennek a csomópontnak a helyi könyvtárában. A profilrészletei esetleg nyilvánosan láthatóak lehetnek a rendszerbeállításoktól függően." -#: src/Module/Settings/Account.php:521 +#: src/Module/Settings/Account.php:546 #, php-format msgid "" "Your profile will also be published in the global friendica directories " "(e.g. %s)." msgstr "A profilja közzé lesz téve a globális Friendica könyvtárakban is (például itt: %s)." -#: src/Module/Settings/Account.php:529 +#: src/Module/Settings/Account.php:556 msgid "Account Settings" msgstr "Fiókbeállítások" -#: src/Module/Settings/Account.php:530 +#: src/Module/Settings/Account.php:557 #, php-format msgid "Your Identity Address is '%s' or '%s'." msgstr "Az Ön személyazonosság-címe „%s” vagy „%s”." -#: src/Module/Settings/Account.php:538 +#: src/Module/Settings/Account.php:565 msgid "Password Settings" msgstr "Jelszóbeállítások" -#: src/Module/Settings/Account.php:539 +#: src/Module/Settings/Account.php:566 msgid "" "Allowed characters are a-z, A-Z, 0-9 and special characters except white " "spaces, accentuated letters and colon (:)." msgstr "Az engedélyezett karakterek az a-z, A-Z, 0-9 tartományokban lévők és a különleges karakterek, kivéve az üres karaktereket, ékezetes betűket és a kettőspontot (:)." -#: src/Module/Settings/Account.php:540 +#: src/Module/Settings/Account.php:567 msgid "Leave password fields blank unless changing" msgstr "Hagyja üresen a jelszómezőket, különben megváltozik" -#: src/Module/Settings/Account.php:541 +#: src/Module/Settings/Account.php:568 msgid "Current Password:" msgstr "Jelenlegi jelszó:" -#: src/Module/Settings/Account.php:541 +#: src/Module/Settings/Account.php:568 msgid "Your current password to confirm the changes" msgstr "A jelenlegi jelszava a változtatások megerősítéséhez" -#: src/Module/Settings/Account.php:542 +#: src/Module/Settings/Account.php:569 msgid "Password:" msgstr "Jelszó:" -#: src/Module/Settings/Account.php:542 +#: src/Module/Settings/Account.php:569 msgid "Your current password to confirm the changes of the email address" msgstr "A jelenlegi jelszava az e-mail-címe megváltoztatásának megerősítéséhez" -#: src/Module/Settings/Account.php:545 +#: src/Module/Settings/Account.php:572 msgid "Delete OpenID URL" msgstr "OpenID URL törlése" -#: src/Module/Settings/Account.php:547 +#: src/Module/Settings/Account.php:574 msgid "Basic Settings" msgstr "Alapvető beállítások" -#: src/Module/Settings/Account.php:549 +#: src/Module/Settings/Account.php:576 msgid "Email Address:" msgstr "E-mail-cím:" -#: src/Module/Settings/Account.php:550 +#: src/Module/Settings/Account.php:577 msgid "Your Timezone:" msgstr "Az Ön időzónája:" -#: src/Module/Settings/Account.php:551 +#: src/Module/Settings/Account.php:578 msgid "Your Language:" msgstr "Az Ön nyelve:" -#: src/Module/Settings/Account.php:551 +#: src/Module/Settings/Account.php:578 msgid "" "Set the language we use to show you friendica interface and to send you " "emails" msgstr "Annak a nyelvnek a beállítása, amelyet a Friendica felületének megjelenítéséhez és a levelek küldéséhez használunk" -#: src/Module/Settings/Account.php:552 +#: src/Module/Settings/Account.php:579 msgid "Default Post Location:" msgstr "Alapértelmezett bejegyzésküldési hely:" -#: src/Module/Settings/Account.php:553 +#: src/Module/Settings/Account.php:580 msgid "Use Browser Location:" msgstr "Böngésző helyének használata:" -#: src/Module/Settings/Account.php:555 +#: src/Module/Settings/Account.php:582 msgid "Security and Privacy Settings" msgstr "Biztonsági és adatvédelmi beállítások" -#: src/Module/Settings/Account.php:557 +#: src/Module/Settings/Account.php:584 msgid "Maximum Friend Requests/Day:" msgstr "Legtöbb ismerőskérés naponta:" -#: src/Module/Settings/Account.php:557 src/Module/Settings/Account.php:567 +#: src/Module/Settings/Account.php:584 src/Module/Settings/Account.php:594 msgid "(to prevent spam abuse)" msgstr "(a levélszeméttel való visszaélés elkerüléséhez)" -#: src/Module/Settings/Account.php:559 +#: src/Module/Settings/Account.php:586 msgid "Allow your profile to be searchable globally?" msgstr "Engedélyezi, hogy a profilja globálisan kereshető legyen?" -#: src/Module/Settings/Account.php:559 +#: src/Module/Settings/Account.php:586 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 " @@ -8879,43 +8884,43 @@ msgid "" "indexed or not." msgstr "Akkor kapcsolja be ezt a beállítást, ha azt szeretné, hogy mások egyszerűen megtalálják és kövessék Önt. A profilja kereshető lesz a távoli rendszereken. Ez a beállítás azt is meghatározza, hogy a Friendica tájékoztatja-e a keresőmotorokat arról, hogy a profilját indexelni kell-e vagy sem." -#: src/Module/Settings/Account.php:560 +#: src/Module/Settings/Account.php:587 msgid "Hide your contact/friend list from viewers of your profile?" msgstr "Elrejti a partnerlistáját vagy ismerőslistáját a profilja megtekintői elől?" -#: src/Module/Settings/Account.php:560 +#: src/Module/Settings/Account.php:587 msgid "" "A list of your contacts is displayed on your profile page. Activate this " "option to disable the display of your contact list." msgstr "A partnereinek listája a profiloldalán van megjelenítve. Kapcsolja be ezt a beállítást, hogy letiltsa a partnerlistája megjelenítését." -#: src/Module/Settings/Account.php:561 +#: src/Module/Settings/Account.php:588 msgid "Hide your profile details from anonymous viewers?" msgstr "Elrejti a profilja részleteit a névtelen megtekintők elől?" -#: src/Module/Settings/Account.php:561 +#: src/Module/Settings/Account.php:588 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 "A névtelen látogatók csak azt profilfényképét, megjelenített nevét és becenevét láthatják, amelyet a profiloldalán használ. A nyilvános bejegyzései és válaszai továbbra is elérhetők lesznek más eszközökkel." -#: src/Module/Settings/Account.php:562 +#: src/Module/Settings/Account.php:589 msgid "Make public posts unlisted" msgstr "Nyilvános bejegyzések felsorolatlanná tétele" -#: src/Module/Settings/Account.php:562 +#: src/Module/Settings/Account.php:589 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 "A nyilvános bejegyzései nem fognak megjelenni a közösségi oldalakon vagy a keresési találatokban, és nem lesznek elküldve az átjátszó kiszolgálóknak. Azonban továbbra is megjelenhetnek a nyilvános hírforrásokban a távoli kiszolgálókon." -#: src/Module/Settings/Account.php:563 +#: src/Module/Settings/Account.php:590 msgid "Make all posted pictures accessible" msgstr "Az összes beküldött fénykép elérhetővé tétele" -#: src/Module/Settings/Account.php:563 +#: src/Module/Settings/Account.php:590 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 " @@ -8923,213 +8928,237 @@ msgid "" "public on your photo albums though." msgstr "Ez a beállítás elérhetővé tesz minden egyes beküldött fényképet a közvetlen hivatkozáson keresztül. Ez egy kerülőmegoldás arra a problémára, hogy a legtöbb más hálózat nem tudja kezelni a fényképek jogosultságait. A nem nyilvános fényképek továbbra sem lesznek láthatóak a nyilvánosság számára a fényképalbumán keresztül." -#: src/Module/Settings/Account.php:564 +#: src/Module/Settings/Account.php:591 msgid "Allow friends to post to your profile page?" msgstr "Engedélyezi az ismerősöknek, hogy beküldjenek a profiloldalára?" -#: src/Module/Settings/Account.php:564 +#: src/Module/Settings/Account.php:591 msgid "" "Your contacts may write posts on your profile wall. These posts will be " "distributed to your contacts" msgstr "A partnerei bejegyzéseket írhatnak az Ön profilfalára. Ezek a bejegyzések továbbítva lesznek a partnereinek." -#: src/Module/Settings/Account.php:565 +#: src/Module/Settings/Account.php:592 msgid "Allow friends to tag your posts?" msgstr "Engedélyezi az ismerőseinek, hogy címkézzék a bejegyzéseit?" -#: src/Module/Settings/Account.php:565 +#: src/Module/Settings/Account.php:592 msgid "Your contacts can add additional tags to your posts." msgstr "A partnerei további címkéket adhatnak a bejegyzéseihez." -#: src/Module/Settings/Account.php:566 +#: src/Module/Settings/Account.php:593 msgid "Permit unknown people to send you private mail?" msgstr "Engedélyt ad ismeretlen embereknek, hogy személyes levelet küldjenek Önnek?" -#: src/Module/Settings/Account.php:566 +#: src/Module/Settings/Account.php:593 msgid "" "Friendica network users may send you private messages even if they are not " "in your contact list." msgstr "A Friendica hálózat felhasználói akkor is küldhetnek Önnek személyes üzeneteket, ha nincsenek a partnerlistáján." -#: src/Module/Settings/Account.php:567 +#: src/Module/Settings/Account.php:594 msgid "Maximum private messages per day from unknown people:" msgstr "Legtöbb személyes üzenet naponta az ismeretlen emberektől:" -#: src/Module/Settings/Account.php:569 +#: src/Module/Settings/Account.php:596 msgid "Default Post Permissions" msgstr "Alapértelmezett bejegyzés-jogosultságok" -#: src/Module/Settings/Account.php:573 +#: src/Module/Settings/Account.php:600 msgid "Expiration settings" msgstr "Lejárati jogosultságok" -#: src/Module/Settings/Account.php:574 +#: src/Module/Settings/Account.php:601 msgid "Automatically expire posts after this many days:" msgstr "Bejegyzések automatikus lejárata ennyi nap után:" -#: src/Module/Settings/Account.php:574 +#: src/Module/Settings/Account.php:601 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "Ha üres, akkor a bejegyzések nem járnak le. A lejárt bejegyzések törölve lesznek." -#: src/Module/Settings/Account.php:575 +#: src/Module/Settings/Account.php:602 msgid "Expire posts" msgstr "Bejegyzések lejárata" -#: src/Module/Settings/Account.php:575 +#: src/Module/Settings/Account.php:602 msgid "When activated, posts and comments will be expired." msgstr "Ha be van kapcsolva, akkor a bejegyzések és a hozzászólások le fognak járni." -#: src/Module/Settings/Account.php:576 +#: src/Module/Settings/Account.php:603 msgid "Expire personal notes" msgstr "Személyes jegyzetek lejárata" -#: src/Module/Settings/Account.php:576 +#: src/Module/Settings/Account.php:603 msgid "" "When activated, the personal notes on your profile page will be expired." msgstr "Ha be van kapcsolva, akkor a profiloldalán lévő személyes jegyzetek le fognak járni." -#: src/Module/Settings/Account.php:577 +#: src/Module/Settings/Account.php:604 msgid "Expire starred posts" msgstr "Csillagozott bejegyzések lejárata" -#: src/Module/Settings/Account.php:577 +#: src/Module/Settings/Account.php:604 msgid "" "Starring posts keeps them from being expired. That behaviour is overwritten " "by this setting." msgstr "A bejegyzések csillagozása megakadályozza azok lejáratát. Ez a viselkedés felülírható ezzel a beállítással." -#: src/Module/Settings/Account.php:578 +#: src/Module/Settings/Account.php:605 msgid "Only expire posts by others" msgstr "Csak a másoktól származó bejegyzések lejárata" -#: src/Module/Settings/Account.php:578 +#: src/Module/Settings/Account.php:605 msgid "" "When activated, your own posts never expire. Then the settings above are " "only valid for posts you received." msgstr "Ha be van kapcsolva, akkor a saját bejegyzései sosem járnak le. Ekkor a fenti beállítás csak azokra a bejegyzésekre érvényes, amelyeket megkap." -#: src/Module/Settings/Account.php:581 +#: src/Module/Settings/Account.php:608 msgid "Notification Settings" msgstr "Értesítési beállítások" -#: src/Module/Settings/Account.php:582 +#: src/Module/Settings/Account.php:609 msgid "Send a notification email when:" msgstr "Értesítési e-mail küldése a következő esetekben:" -#: src/Module/Settings/Account.php:583 +#: src/Module/Settings/Account.php:610 msgid "You receive an introduction" msgstr "Egy bemutatkozást fogad" -#: src/Module/Settings/Account.php:584 +#: src/Module/Settings/Account.php:611 msgid "Your introductions are confirmed" msgstr "A bemutatkozásait jóváhagyták" -#: src/Module/Settings/Account.php:585 +#: src/Module/Settings/Account.php:612 msgid "Someone writes on your profile wall" msgstr "Valaki ír a profilfalára" -#: src/Module/Settings/Account.php:586 +#: src/Module/Settings/Account.php:613 msgid "Someone writes a followup comment" msgstr "Valaki egy követő hozzászólást ír" -#: src/Module/Settings/Account.php:587 +#: src/Module/Settings/Account.php:614 msgid "You receive a private message" msgstr "Személyes üzenetet kap" -#: src/Module/Settings/Account.php:588 +#: src/Module/Settings/Account.php:615 msgid "You receive a friend suggestion" msgstr "Ismerősajánlást kap" -#: src/Module/Settings/Account.php:589 +#: src/Module/Settings/Account.php:616 msgid "You are tagged in a post" -msgstr "Bejelölték egy bejegyzésben" +msgstr "Megjelölték egy bejegyzésben" -#: src/Module/Settings/Account.php:590 +#: src/Module/Settings/Account.php:617 msgid "You are poked/prodded/etc. in a post" msgstr "Megbökték, megdöfték, stb. egy bejegyzésben" -#: src/Module/Settings/Account.php:592 +#: src/Module/Settings/Account.php:619 msgid "Create a desktop notification when:" msgstr "Asztali értesítés létrehozása ekkor:" -#: src/Module/Settings/Account.php:593 +#: src/Module/Settings/Account.php:620 +msgid "Someone tagged you" +msgstr "Valaki megjelölte Önt" + +#: src/Module/Settings/Account.php:621 +msgid "Someone directly commented on your post" +msgstr "Valaki közvetlenül hozzászólt a bejegyzéséhez" + +#: src/Module/Settings/Account.php:622 msgid "Someone liked your content" msgstr "Valaki kedvelte az Ön tartalmát" -#: src/Module/Settings/Account.php:594 +#: src/Module/Settings/Account.php:622 src/Module/Settings/Account.php:623 +msgid "Can only be enabled, when the direct comment notification is enabled." +msgstr "" + +#: src/Module/Settings/Account.php:623 msgid "Someone shared your content" msgstr "Valaki megosztotta az Ön tartalmát" -#: src/Module/Settings/Account.php:596 +#: src/Module/Settings/Account.php:624 +msgid "Someone commented in your thread" +msgstr "" + +#: src/Module/Settings/Account.php:625 +msgid "Someone commented in a thread where you commented" +msgstr "Valaki hozzászólt egy olyan szálban, ahol Ön hozzászólt" + +#: src/Module/Settings/Account.php:626 +msgid "Someone commented in a thread where you interacted" +msgstr "" + +#: src/Module/Settings/Account.php:628 msgid "Activate desktop notifications" msgstr "Asztali értesítések bekapcsolása" -#: src/Module/Settings/Account.php:596 +#: src/Module/Settings/Account.php:628 msgid "Show desktop popup on new notifications" msgstr "Felugró üzenet megjelenítése az asztalon új értesítések esetén." -#: src/Module/Settings/Account.php:600 +#: src/Module/Settings/Account.php:632 msgid "Text-only notification emails" msgstr "Csak szöveges értesítési e-mailek" -#: src/Module/Settings/Account.php:602 +#: src/Module/Settings/Account.php:634 msgid "Send text only notification emails, without the html part" msgstr "Csak szöveges értesítési e-mailek küldése a HTML rész nélkül." -#: src/Module/Settings/Account.php:606 +#: src/Module/Settings/Account.php:638 msgid "Show detailled notifications" msgstr "Részletes értesítések megjelenítése" -#: src/Module/Settings/Account.php:608 +#: src/Module/Settings/Account.php:640 msgid "" "Per default, notifications are condensed to a single notification per item. " "When enabled every notification is displayed." msgstr "Alapértelmezetten az értesítések elemenként egyetlen értesítésbe vannak összevonva. Ha engedélyezve van, akkor minden értesítés megjelenik." -#: src/Module/Settings/Account.php:612 +#: src/Module/Settings/Account.php:644 msgid "Show notifications of ignored contacts" msgstr "Figyelmen kívül hagyott partnerek értesítéseinek megjelenítése" -#: src/Module/Settings/Account.php:614 +#: src/Module/Settings/Account.php:646 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 "Nem látja a figyelmen kívül hagyott partnerektől érkező bejegyzéseket. Viszont továbbra is látja a hozzászólásaikat. Ez a beállítás azt vezérli, hogy továbbra is szeretne-e olyan normál értesítéseket kapni vagy sem, amelyeket figyelmen kívül hagyott partnerek okoznak." -#: src/Module/Settings/Account.php:617 +#: src/Module/Settings/Account.php:649 msgid "Advanced Account/Page Type Settings" msgstr "Speciális fióktípus vagy oldaltípus beállítások" -#: src/Module/Settings/Account.php:618 +#: src/Module/Settings/Account.php:650 msgid "Change the behaviour of this account for special situations" msgstr "A fiók viselkedésének megváltoztatása bizonyos helyzetekre." -#: src/Module/Settings/Account.php:621 +#: src/Module/Settings/Account.php:653 msgid "Import Contacts" msgstr "Partnerek importálása" -#: src/Module/Settings/Account.php:622 +#: src/Module/Settings/Account.php:654 msgid "" "Upload a CSV file that contains the handle of your followed accounts in the " "first column you exported from the old account." msgstr "Töltsön fel egy olyan CSV-fájlt, amely a követett fiókok kezelőjét tartalmazza az első oszlopban, ahogy a régi fiókból exportálta." -#: src/Module/Settings/Account.php:623 +#: src/Module/Settings/Account.php:655 msgid "Upload File" msgstr "Fájl feltöltése" -#: src/Module/Settings/Account.php:626 +#: src/Module/Settings/Account.php:658 msgid "Relocate" msgstr "Áthelyezés" -#: src/Module/Settings/Account.php:627 +#: src/Module/Settings/Account.php:659 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 "Ha áthelyezte ezt a profilt egy másik kiszolgálóról, és néhány partnere nem kapta meg a frissítéseket, akkor próbálja meg megnyomni ezt a gombot." -#: src/Module/Settings/Account.php:628 +#: src/Module/Settings/Account.php:660 msgid "Resend relocate message to contacts" msgstr "Áthelyezési üzenet küldése a partnereknek" @@ -10137,132 +10166,132 @@ msgstr "Ismerős vagy kapcsolódási kérés" msgid "New Follower" msgstr "Új követő" -#: src/Navigation/Notifications/Factory/Notification.php:130 +#: src/Navigation/Notifications/Factory/Notification.php:134 #, php-format msgid "%1$s wants to follow you" msgstr "%1$s követni szeretné Önt" -#: src/Navigation/Notifications/Factory/Notification.php:132 +#: src/Navigation/Notifications/Factory/Notification.php:136 #, php-format msgid "%1$s has started following you" msgstr "%1$s elkezdte követni Önt" -#: src/Navigation/Notifications/Factory/Notification.php:196 +#: src/Navigation/Notifications/Factory/Notification.php:200 #, php-format msgid "%1$s liked your comment on %2$s" msgstr "%1$s kedvelte az Ön hozzászólását ehhez: %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:199 +#: src/Navigation/Notifications/Factory/Notification.php:203 #, php-format msgid "%1$s liked your post %2$s" msgstr "%1$s kedvelte az Ön %2$s bejegyzését" -#: src/Navigation/Notifications/Factory/Notification.php:206 +#: src/Navigation/Notifications/Factory/Notification.php:210 #, php-format msgid "%1$s disliked your comment on %2$s" msgstr "%1$s nem kedvelte az Ön hozzászólását ehhez: %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:209 +#: src/Navigation/Notifications/Factory/Notification.php:213 #, php-format msgid "%1$s disliked your post %2$s" msgstr "%1$s nem kedvelte az Ön %2$s bejegyzését" -#: src/Navigation/Notifications/Factory/Notification.php:216 +#: src/Navigation/Notifications/Factory/Notification.php:220 #, php-format msgid "%1$s shared your comment %2$s" msgstr "%1$s megosztotta az Ön %2$s hozzászólását" -#: src/Navigation/Notifications/Factory/Notification.php:219 +#: src/Navigation/Notifications/Factory/Notification.php:223 #, php-format msgid "%1$s shared your post %2$s" msgstr "%1$s megosztotta az Ön %2$s bejegyzését" -#: src/Navigation/Notifications/Factory/Notification.php:223 -#: src/Navigation/Notifications/Factory/Notification.php:292 +#: src/Navigation/Notifications/Factory/Notification.php:227 +#: src/Navigation/Notifications/Factory/Notification.php:297 #, php-format msgid "%1$s shared the post %2$s from %3$s" msgstr "%1$s megosztott egy %3$s által közzétett %2$s bejegyzést" -#: src/Navigation/Notifications/Factory/Notification.php:225 -#: src/Navigation/Notifications/Factory/Notification.php:294 +#: src/Navigation/Notifications/Factory/Notification.php:229 +#: src/Navigation/Notifications/Factory/Notification.php:299 #, php-format msgid "%1$s shared a post from %3$s" msgstr "%1$s megosztott egy %3$s által közzétett bejegyzést" -#: src/Navigation/Notifications/Factory/Notification.php:227 -#: src/Navigation/Notifications/Factory/Notification.php:296 +#: src/Navigation/Notifications/Factory/Notification.php:231 +#: src/Navigation/Notifications/Factory/Notification.php:301 #, php-format msgid "%1$s shared the post %2$s" msgstr "%1$s megosztotta a(z) %2$s bejegyzést" -#: src/Navigation/Notifications/Factory/Notification.php:229 -#: src/Navigation/Notifications/Factory/Notification.php:298 +#: src/Navigation/Notifications/Factory/Notification.php:233 +#: src/Navigation/Notifications/Factory/Notification.php:303 #, php-format msgid "%1$s shared a post" msgstr "%1$s megosztott egy bejegyzést" -#: src/Navigation/Notifications/Factory/Notification.php:237 +#: src/Navigation/Notifications/Factory/Notification.php:241 #, php-format msgid "%1$s wants to attend your event %2$s" msgstr "%1$s szeretne részt venni az Ön %2$s eseményén" -#: src/Navigation/Notifications/Factory/Notification.php:244 +#: src/Navigation/Notifications/Factory/Notification.php:248 #, php-format msgid "%1$s does not want to attend your event %2$s" msgstr "%1$s nem szeretne részt venni az Ön %2$s eseményén" -#: src/Navigation/Notifications/Factory/Notification.php:251 +#: src/Navigation/Notifications/Factory/Notification.php:255 #, php-format msgid "%1$s maybe wants to attend your event %2$s" msgstr "%1$s talán szeretne részt venni az Ön %2$s eseményén" -#: src/Navigation/Notifications/Factory/Notification.php:258 +#: src/Navigation/Notifications/Factory/Notification.php:262 #, php-format msgid "%1$s tagged you on %2$s" -msgstr "%1$s bejelölte Önt ezen: %2$s" +msgstr "%1$s megjelölte Önt ezen: %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:262 +#: src/Navigation/Notifications/Factory/Notification.php:266 #, php-format msgid "%1$s replied to you on %2$s" msgstr "%1$s válaszolt Önnek ezen: %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:266 +#: src/Navigation/Notifications/Factory/Notification.php:270 #, php-format msgid "%1$s commented in your thread %2$s" msgstr "%1$s hozzászólt az Ön %2$s szálában" -#: src/Navigation/Notifications/Factory/Notification.php:270 +#: src/Navigation/Notifications/Factory/Notification.php:274 #, php-format msgid "%1$s commented on your comment %2$s" msgstr "%1$s hozzászólt az Ön %2$s hozzászólásánál" -#: src/Navigation/Notifications/Factory/Notification.php:276 +#: src/Navigation/Notifications/Factory/Notification.php:281 #, php-format msgid "%1$s commented in their thread %2$s" msgstr "%1$s hozzászólt az ő %2$s szálában" -#: src/Navigation/Notifications/Factory/Notification.php:278 +#: src/Navigation/Notifications/Factory/Notification.php:283 #, php-format msgid "%1$s commented in their thread" msgstr "%1$s hozzászólt az ő szálában" -#: src/Navigation/Notifications/Factory/Notification.php:280 +#: src/Navigation/Notifications/Factory/Notification.php:285 #, php-format msgid "%1$s commented in the thread %2$s from %3$s" msgstr "%1$s hozzászólt egy %3$s által közzétett %2$s szálában" -#: src/Navigation/Notifications/Factory/Notification.php:282 +#: src/Navigation/Notifications/Factory/Notification.php:287 #, php-format msgid "%1$s commented in the thread from %3$s" msgstr "%1$s hozzászólt egy %3$s által közzétett szálában" -#: src/Navigation/Notifications/Factory/Notification.php:287 +#: src/Navigation/Notifications/Factory/Notification.php:292 #, php-format msgid "%1$s commented on your thread %2$s" msgstr "%1$s hozzászólt az Ön %2$s szálánál" #: src/Navigation/Notifications/Repository/Notify.php:221 -#: src/Navigation/Notifications/Repository/Notify.php:724 +#: src/Navigation/Notifications/Repository/Notify.php:735 msgid "[Friendica:Notify]" msgstr "[Friendica: értesítés]" @@ -10306,7 +10335,7 @@ msgid "%1$s commented on their %2$s %3$s" msgstr "%1$s hozzászólt egy saját %2$s kapcsán: %3$s" #: src/Navigation/Notifications/Repository/Notify.php:333 -#: src/Navigation/Notifications/Repository/Notify.php:758 +#: src/Navigation/Notifications/Repository/Notify.php:769 #, php-format msgid "%1$s Comment to conversation #%2$d by %3$s" msgstr "%1$s Hozzászólás a #%2$d beszélgetéshez %3$s által" @@ -10319,7 +10348,7 @@ msgstr "%s hozzászólt egy olyan elemhez vagy beszélgetéshez, amelyet Ön kö #: src/Navigation/Notifications/Repository/Notify.php:339 #: src/Navigation/Notifications/Repository/Notify.php:354 #: src/Navigation/Notifications/Repository/Notify.php:373 -#: src/Navigation/Notifications/Repository/Notify.php:773 +#: src/Navigation/Notifications/Repository/Notify.php:784 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Látogassa meg a %s oldalt a beszélgetés megtekintéséhez és/vagy megválaszolásához." @@ -10508,12 +10537,12 @@ msgstr "Teljes név:\t%s\nOldal címe:\t%s\nBejelentkezési név:\t%s (%s)" msgid "Please visit %s to approve or reject the request." msgstr "Látogassa meg a(z) %s oldalt a kérés jóváhagyásához vagy visszautasításához." -#: src/Navigation/Notifications/Repository/Notify.php:752 +#: src/Navigation/Notifications/Repository/Notify.php:763 #, php-format msgid "%s %s tagged you" -msgstr "%s %s bejelölte Önt" +msgstr "%s %s megjelölte Önt" -#: src/Navigation/Notifications/Repository/Notify.php:755 +#: src/Navigation/Notifications/Repository/Notify.php:766 #, php-format msgid "%s %s shared a new post" msgstr "%s %s megosztott egy új bejegyzést" diff --git a/view/lang/hu/strings.php b/view/lang/hu/strings.php index 4ab934327..02b1c2c49 100644 --- a/view/lang/hu/strings.php +++ b/view/lang/hu/strings.php @@ -416,6 +416,7 @@ $a->strings['The contact entries have been archived'] = 'A partnerbejegyzések a $a->strings['Could not find any contact entry for this URL (%s)'] = 'Nem sikerült találni egyetlen partnerbejegyzést sem erről az URL-ről (%s)'; $a->strings['The contact has been blocked from the node'] = 'A partner tiltva lett a csomópontról'; $a->strings['%d %s, %d duplicates.'] = '%d %s, %d kettőzés.'; +$a->strings['uri-id is empty for contact %s.'] = 'Az URI-azonosító üres %s partnernél.'; $a->strings['No valid first countact found for uri-id %d.'] = 'Nem található érvényes első partner a(z) %d. URI-azonosítóhoz.'; $a->strings['Wrong duplicate found for uri-id %d in %d (url: %s != %s).'] = 'Hibás kettőzés található a(z) %d. URI-azonosítónál ebben: %d (URL: %s != %s).'; $a->strings['Wrong duplicate found for uri-id %d in %d (nurl: %s != %s).'] = 'Hibás kettőzés található a(z) %d. URI-azonosítónál ebben: %d (NURL: %s != %s).'; @@ -2256,11 +2257,14 @@ $a->strings['Someone writes on your profile wall'] = 'Valaki ír a profilfalára $a->strings['Someone writes a followup comment'] = 'Valaki egy követő hozzászólást ír'; $a->strings['You receive a private message'] = 'Személyes üzenetet kap'; $a->strings['You receive a friend suggestion'] = 'Ismerősajánlást kap'; -$a->strings['You are tagged in a post'] = 'Bejelölték egy bejegyzésben'; +$a->strings['You are tagged in a post'] = 'Megjelölték egy bejegyzésben'; $a->strings['You are poked/prodded/etc. in a post'] = 'Megbökték, megdöfték, stb. egy bejegyzésben'; $a->strings['Create a desktop notification when:'] = 'Asztali értesítés létrehozása ekkor:'; +$a->strings['Someone tagged you'] = 'Valaki megjelölte Önt'; +$a->strings['Someone directly commented on your post'] = 'Valaki közvetlenül hozzászólt a bejegyzéséhez'; $a->strings['Someone liked your content'] = 'Valaki kedvelte az Ön tartalmát'; $a->strings['Someone shared your content'] = 'Valaki megosztotta az Ön tartalmát'; +$a->strings['Someone commented in a thread where you commented'] = 'Valaki hozzászólt egy olyan szálban, ahol Ön hozzászólt'; $a->strings['Activate desktop notifications'] = 'Asztali értesítések bekapcsolása'; $a->strings['Show desktop popup on new notifications'] = 'Felugró üzenet megjelenítése az asztalon új értesítések esetén.'; $a->strings['Text-only notification emails'] = 'Csak szöveges értesítési e-mailek'; @@ -2537,7 +2541,7 @@ $a->strings['%1$s shared a post'] = '%1$s megosztott egy bejegyzést'; $a->strings['%1$s wants to attend your event %2$s'] = '%1$s szeretne részt venni az Ön %2$s eseményén'; $a->strings['%1$s does not want to attend your event %2$s'] = '%1$s nem szeretne részt venni az Ön %2$s eseményén'; $a->strings['%1$s maybe wants to attend your event %2$s'] = '%1$s talán szeretne részt venni az Ön %2$s eseményén'; -$a->strings['%1$s tagged you on %2$s'] = '%1$s bejelölte Önt ezen: %2$s'; +$a->strings['%1$s tagged you on %2$s'] = '%1$s megjelölte Önt ezen: %2$s'; $a->strings['%1$s replied to you on %2$s'] = '%1$s válaszolt Önnek ezen: %2$s'; $a->strings['%1$s commented in your thread %2$s'] = '%1$s hozzászólt az Ön %2$s szálában'; $a->strings['%1$s commented on your comment %2$s'] = '%1$s hozzászólt az Ön %2$s hozzászólásánál'; @@ -2596,7 +2600,7 @@ Login Name: %s (%s)'] = 'Teljes név: %s Oldal címe: %s Bejelentkezési név: %s (%s)'; $a->strings['Please visit %s to approve or reject the request.'] = 'Látogassa meg a(z) %s oldalt a kérés jóváhagyásához vagy visszautasításához.'; -$a->strings['%s %s tagged you'] = '%s %s bejelölte Önt'; +$a->strings['%s %s tagged you'] = '%s %s megjelölte Önt'; $a->strings['%s %s shared a new post'] = '%s %s megosztott egy új bejegyzést'; $a->strings['This message was sent to you by %s, a member of the Friendica social network.'] = 'Ezt az üzenetet %s, a Friendica közösségi hálózatának tagja küldte Önnek.'; $a->strings['You may visit them online at %s'] = 'Meglátogathatja őket az interneten ezen a címen: %s'; From 579a23ba6e021fb433cd5281cf16b5adfbc281bf Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 7 Jun 2022 06:31:35 +0200 Subject: [PATCH 2/4] RU translations THX Alexander An --- view/lang/ru/messages.po | 570 ++++++++++++++++++++++----------------- view/lang/ru/strings.php | 7 + 2 files changed, 334 insertions(+), 243 deletions(-) diff --git a/view/lang/ru/messages.po b/view/lang/ru/messages.po index 7e0d91c76..9726321f3 100644 --- a/view/lang/ru/messages.po +++ b/view/lang/ru/messages.po @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-31 13:27+0000\n" +"POT-Creation-Date: 2022-06-06 07:33+0000\n" "PO-Revision-Date: 2011-05-05 10:19+0000\n" "Last-Translator: Alexander An , 2020-2022\n" "Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n" @@ -44,7 +44,7 @@ msgid "Access denied." msgstr "Доступ запрещен." #: mod/cal.php:63 mod/cal.php:80 mod/photos.php:69 mod/photos.php:140 -#: mod/photos.php:804 src/Model/Profile.php:231 src/Module/Feed.php:72 +#: mod/photos.php:798 src/Model/Profile.php:231 src/Module/Feed.php:72 #: src/Module/HCard.php:52 src/Module/Profile/Common.php:41 #: src/Module/Profile/Common.php:52 src/Module/Profile/Contacts.php:40 #: src/Module/Profile/Contacts.php:50 src/Module/Profile/Media.php:38 @@ -53,7 +53,7 @@ msgstr "Доступ запрещен." msgid "User not found." msgstr "Пользователь не найден." -#: mod/cal.php:122 mod/display.php:246 src/Module/Profile/Profile.php:94 +#: mod/cal.php:122 mod/display.php:247 src/Module/Profile/Profile.php:94 #: src/Module/Profile/Profile.php:109 src/Module/Profile/Status.php:110 #: src/Module/Update/Profile.php:56 msgid "Access to this profile has been restricted." @@ -120,24 +120,24 @@ msgstr "Нет данных для экспорта" msgid "calendar" msgstr "календарь" -#: mod/display.php:141 mod/photos.php:808 +#: mod/display.php:142 mod/photos.php:802 #: src/Module/Conversation/Community.php:175 src/Module/Directory.php:49 #: src/Module/Search/Index.php:50 msgid "Public access denied." msgstr "Свободный доступ закрыт." -#: mod/display.php:197 mod/display.php:271 +#: mod/display.php:198 mod/display.php:272 msgid "The requested item doesn't exist or has been deleted." msgstr "Запрошенная запись не существует или была удалена." -#: mod/display.php:351 +#: mod/display.php:352 msgid "The feed for this item is unavailable." msgstr "Лента недоступна для этого объекта." #: mod/editpost.php:38 mod/events.php:217 mod/follow.php:56 mod/follow.php:130 #: mod/item.php:181 mod/item.php:186 mod/item.php:875 mod/message.php:69 #: mod/message.php:111 mod/notes.php:44 mod/ostatus_subscribe.php:33 -#: mod/photos.php:160 mod/photos.php:897 mod/repair_ostatus.php:31 +#: mod/photos.php:160 mod/photos.php:891 mod/repair_ostatus.php:31 #: mod/settings.php:40 mod/settings.php:50 mod/settings.php:156 #: mod/suggest.php:34 mod/uimport.php:33 mod/unfollow.php:35 #: mod/unfollow.php:50 mod/unfollow.php:82 mod/wall_attach.php:67 @@ -154,8 +154,8 @@ msgstr "Лента недоступна для этого объекта." #: src/Module/Profile/Schedule.php:39 src/Module/Profile/Schedule.php:56 #: src/Module/Register.php:77 src/Module/Register.php:90 #: src/Module/Register.php:206 src/Module/Register.php:245 -#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:48 -#: src/Module/Settings/Account.php:384 src/Module/Settings/Delegation.php:42 +#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:49 +#: src/Module/Settings/Account.php:409 src/Module/Settings/Delegation.php:42 #: src/Module/Settings/Delegation.php:70 src/Module/Settings/Display.php:42 #: src/Module/Settings/Display.php:120 #: src/Module/Settings/Profile/Photo/Crop.php:166 @@ -180,7 +180,7 @@ msgstr "Редактировать запись" msgid "Save" msgstr "Сохранить" -#: mod/editpost.php:92 mod/photos.php:1344 src/Content/Conversation.php:338 +#: mod/editpost.php:92 mod/photos.php:1338 src/Content/Conversation.php:338 #: src/Module/Contact/Poke.php:176 src/Object/Post.php:989 msgid "Loading..." msgstr "Загрузка..." @@ -245,7 +245,7 @@ msgid "clear location" msgstr "убрать местонахождение" #: mod/editpost.php:107 mod/message.php:200 mod/message.php:358 -#: mod/photos.php:1495 mod/wallmessage.php:142 +#: mod/photos.php:1489 mod/wallmessage.php:142 #: src/Content/Conversation.php:368 src/Content/Conversation.php:712 #: src/Module/Item/Compose.php:177 src/Object/Post.php:528 msgid "Please wait" @@ -277,14 +277,14 @@ msgstr "Категории (список через запятую)" msgid "Example: bob@example.com, mary@example.com" msgstr "Пример: bob@example.com, mary@example.com" -#: mod/editpost.php:128 mod/events.php:513 mod/photos.php:1343 -#: mod/photos.php:1399 mod/photos.php:1473 src/Content/Conversation.php:383 +#: mod/editpost.php:128 mod/events.php:513 mod/photos.php:1337 +#: mod/photos.php:1393 mod/photos.php:1467 src/Content/Conversation.php:383 #: src/Module/Item/Compose.php:172 src/Object/Post.php:999 msgid "Preview" msgstr "Просмотр" #: mod/editpost.php:130 mod/fbrowser.php:118 mod/fbrowser.php:145 -#: mod/follow.php:144 mod/photos.php:1010 mod/photos.php:1111 mod/tagrm.php:35 +#: mod/follow.php:144 mod/photos.php:1004 mod/photos.php:1105 mod/tagrm.php:35 #: mod/tagrm.php:127 mod/unfollow.php:97 src/Content/Conversation.php:386 #: src/Module/Contact/Revoke.php:108 src/Module/RemoteFollow.php:127 msgid "Cancel" @@ -326,7 +326,7 @@ msgid "Link or Media" msgstr "Ссылка или медиа" #: mod/editpost.php:143 src/Content/Conversation.php:393 -#: src/Content/Widget/VCard.php:107 src/Model/Profile.php:462 +#: src/Content/Widget/VCard.php:113 src/Model/Profile.php:462 #: src/Module/Admin/Logs/View.php:93 msgid "Message" msgstr "Сообщение" @@ -336,8 +336,8 @@ msgstr "Сообщение" msgid "Browser" msgstr "Браузер" -#: mod/editpost.php:145 mod/events.php:518 mod/photos.php:945 -#: mod/photos.php:1297 src/Content/Conversation.php:370 +#: mod/editpost.php:145 mod/events.php:518 mod/photos.php:939 +#: mod/photos.php:1291 src/Content/Conversation.php:370 msgid "Permissions" msgstr "Разрешения" @@ -401,7 +401,7 @@ msgstr "Окончание мероприятия:" msgid "Description:" msgstr "Описание:" -#: mod/events.php:504 src/Content/Widget/VCard.php:98 src/Model/Event.php:80 +#: mod/events.php:504 src/Content/Widget/VCard.php:104 src/Model/Event.php:80 #: src/Model/Event.php:107 src/Model/Event.php:466 src/Model/Event.php:915 #: src/Model/Profile.php:370 src/Module/Contact/Profile.php:369 #: src/Module/Directory.php:148 src/Module/Notifications/Introductions.php:185 @@ -418,8 +418,8 @@ msgid "Share this event" msgstr "Поделиться этим мероприятием" #: mod/events.php:515 mod/message.php:201 mod/message.php:357 -#: mod/photos.php:927 mod/photos.php:1031 mod/photos.php:1301 -#: mod/photos.php:1342 mod/photos.php:1398 mod/photos.php:1472 +#: mod/photos.php:921 mod/photos.php:1025 mod/photos.php:1295 +#: mod/photos.php:1336 mod/photos.php:1392 mod/photos.php:1466 #: src/Module/Admin/Item/Source.php:65 src/Module/Contact/Advanced.php:132 #: src/Module/Contact/Poke.php:177 src/Module/Contact/Profile.php:327 #: src/Module/Debug/ActivityPubConversion.php:145 @@ -877,11 +877,11 @@ msgstr "Держать окно открытым до завершения." msgid "Photo Albums" msgstr "Фотоальбомы" -#: mod/photos.php:109 mod/photos.php:1590 +#: mod/photos.php:109 mod/photos.php:1584 msgid "Recent Photos" msgstr "Последние фото" -#: mod/photos.php:111 mod/photos.php:1079 mod/photos.php:1592 +#: mod/photos.php:111 mod/photos.php:1073 mod/photos.php:1586 msgid "Upload New Photos" msgstr "Загрузить новые фото" @@ -909,221 +909,221 @@ msgstr "Альбом был пуст." msgid "Failed to delete the photo." msgstr "Не получилось удалить фото." -#: mod/photos.php:559 +#: mod/photos.php:553 msgid "a photo" msgstr "фото" -#: mod/photos.php:559 +#: mod/photos.php:553 #, php-format msgid "%1$s was tagged in %2$s by %3$s" msgstr "%1$s отмечен/а/ в %2$s by %3$s" -#: mod/photos.php:642 mod/photos.php:645 mod/photos.php:672 +#: mod/photos.php:636 mod/photos.php:639 mod/photos.php:666 #: mod/wall_upload.php:201 src/Module/Settings/Profile/Photo/Index.php:60 #, php-format msgid "Image exceeds size limit of %s" msgstr "Изображение превышает лимит размера в %s" -#: mod/photos.php:648 +#: mod/photos.php:642 msgid "Image upload didn't complete, please try again" msgstr "Не получилось загрузить изображение, попробуйте снова" -#: mod/photos.php:651 +#: mod/photos.php:645 msgid "Image file is missing" msgstr "Файл изображения не найден" -#: mod/photos.php:656 +#: mod/photos.php:650 msgid "" "Server can't accept new file upload at this time, please contact your " "administrator" msgstr "Сервер не принимает новые файлы для загрузки в настоящий момент, пожалуйста, свяжитесь с администратором" -#: mod/photos.php:680 +#: mod/photos.php:674 msgid "Image file is empty." msgstr "Файл изображения пуст." -#: mod/photos.php:695 mod/wall_upload.php:163 +#: mod/photos.php:689 mod/wall_upload.php:163 #: src/Module/Settings/Profile/Photo/Index.php:69 msgid "Unable to process image." msgstr "Невозможно обработать фото." -#: mod/photos.php:721 mod/wall_upload.php:226 +#: mod/photos.php:715 mod/wall_upload.php:226 #: src/Module/Settings/Profile/Photo/Index.php:96 msgid "Image upload failed." msgstr "Загрузка фото неудачная." -#: mod/photos.php:813 +#: mod/photos.php:807 msgid "No photos selected" msgstr "Не выбрано фото." -#: mod/photos.php:882 +#: mod/photos.php:876 msgid "Access to this item is restricted." msgstr "Доступ к этому пункту ограничен." -#: mod/photos.php:937 +#: mod/photos.php:931 msgid "Upload Photos" msgstr "Загрузить фото" -#: mod/photos.php:941 mod/photos.php:1027 +#: mod/photos.php:935 mod/photos.php:1021 msgid "New album name: " msgstr "Название нового альбома: " -#: mod/photos.php:942 +#: mod/photos.php:936 msgid "or select existing album:" msgstr "или выберите имеющийся альбом:" -#: mod/photos.php:943 +#: mod/photos.php:937 msgid "Do not show a status post for this upload" msgstr "Не показывать статус-сообщение для этой закачки" -#: mod/photos.php:1008 +#: mod/photos.php:1002 msgid "Do you really want to delete this photo album and all its photos?" msgstr "Вы действительно хотите удалить этот альбом и все его фотографии?" -#: mod/photos.php:1009 mod/photos.php:1032 +#: mod/photos.php:1003 mod/photos.php:1026 msgid "Delete Album" msgstr "Удалить альбом" -#: mod/photos.php:1036 +#: mod/photos.php:1030 msgid "Edit Album" msgstr "Редактировать альбом" -#: mod/photos.php:1037 +#: mod/photos.php:1031 msgid "Drop Album" msgstr "Удалить альбом" -#: mod/photos.php:1041 +#: mod/photos.php:1035 msgid "Show Newest First" msgstr "Показать новые первыми" -#: mod/photos.php:1043 +#: mod/photos.php:1037 msgid "Show Oldest First" msgstr "Показать старые первыми" -#: mod/photos.php:1064 mod/photos.php:1575 +#: mod/photos.php:1058 mod/photos.php:1569 msgid "View Photo" msgstr "Просмотр фото" -#: mod/photos.php:1097 +#: mod/photos.php:1091 msgid "Permission denied. Access to this item may be restricted." msgstr "Нет разрешения. Доступ к этому элементу ограничен." -#: mod/photos.php:1099 +#: mod/photos.php:1093 msgid "Photo not available" msgstr "Фото недоступно" -#: mod/photos.php:1109 +#: mod/photos.php:1103 msgid "Do you really want to delete this photo?" msgstr "Вы действительно хотите удалить эту фотографию?" -#: mod/photos.php:1110 mod/photos.php:1302 +#: mod/photos.php:1104 mod/photos.php:1296 msgid "Delete Photo" msgstr "Удалить фото" -#: mod/photos.php:1202 +#: mod/photos.php:1196 msgid "View photo" msgstr "Просмотр фото" -#: mod/photos.php:1204 +#: mod/photos.php:1198 msgid "Edit photo" msgstr "Редактировать фото" -#: mod/photos.php:1205 +#: mod/photos.php:1199 msgid "Delete photo" msgstr "Удалить фото" -#: mod/photos.php:1206 +#: mod/photos.php:1200 msgid "Use as profile photo" msgstr "Использовать как фото профиля" -#: mod/photos.php:1213 +#: mod/photos.php:1207 msgid "Private Photo" msgstr "Закрытое фото" -#: mod/photos.php:1219 +#: mod/photos.php:1213 msgid "View Full Size" msgstr "Просмотреть полный размер" -#: mod/photos.php:1270 +#: mod/photos.php:1264 msgid "Tags: " msgstr "Ключевые слова: " -#: mod/photos.php:1273 +#: mod/photos.php:1267 msgid "[Select tags to remove]" msgstr "[выберите тэги для удаления]" -#: mod/photos.php:1288 +#: mod/photos.php:1282 msgid "New album name" msgstr "Название нового альбома" -#: mod/photos.php:1289 +#: mod/photos.php:1283 msgid "Caption" msgstr "Подпись" -#: mod/photos.php:1290 +#: mod/photos.php:1284 msgid "Add a Tag" msgstr "Добавить тег" -#: mod/photos.php:1290 +#: mod/photos.php:1284 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Пример: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: mod/photos.php:1291 +#: mod/photos.php:1285 msgid "Do not rotate" msgstr "Не поворачивать" -#: mod/photos.php:1292 +#: mod/photos.php:1286 msgid "Rotate CW (right)" msgstr "Поворот по часовой стрелке (направо)" -#: mod/photos.php:1293 +#: mod/photos.php:1287 msgid "Rotate CCW (left)" msgstr "Поворот против часовой стрелки (налево)" -#: mod/photos.php:1339 mod/photos.php:1395 mod/photos.php:1469 +#: mod/photos.php:1333 mod/photos.php:1389 mod/photos.php:1463 #: src/Module/Contact.php:544 src/Module/Item/Compose.php:160 #: src/Object/Post.php:985 msgid "This is you" msgstr "Это вы" -#: mod/photos.php:1341 mod/photos.php:1397 mod/photos.php:1471 +#: mod/photos.php:1335 mod/photos.php:1391 mod/photos.php:1465 #: src/Object/Post.php:522 src/Object/Post.php:987 msgid "Comment" msgstr "Комментировать" -#: mod/photos.php:1430 src/Content/Conversation.php:628 +#: mod/photos.php:1424 src/Content/Conversation.php:628 #: src/Object/Post.php:247 msgid "Select" msgstr "Выберите" -#: mod/photos.php:1431 mod/settings.php:350 src/Content/Conversation.php:629 +#: mod/photos.php:1425 mod/settings.php:350 src/Content/Conversation.php:629 #: src/Module/Admin/Users/Active.php:139 #: src/Module/Admin/Users/Blocked.php:140 src/Module/Admin/Users/Index.php:153 msgid "Delete" msgstr "Удалить" -#: mod/photos.php:1492 src/Object/Post.php:369 +#: mod/photos.php:1486 src/Object/Post.php:369 msgid "Like" msgstr "Нравится" -#: mod/photos.php:1493 src/Object/Post.php:369 +#: mod/photos.php:1487 src/Object/Post.php:369 msgid "I like this (toggle)" msgstr "Нравится" -#: mod/photos.php:1494 src/Object/Post.php:370 +#: mod/photos.php:1488 src/Object/Post.php:370 msgid "Dislike" msgstr "Не нравится" -#: mod/photos.php:1496 src/Object/Post.php:370 +#: mod/photos.php:1490 src/Object/Post.php:370 msgid "I don't like this (toggle)" msgstr "Не нравится" -#: mod/photos.php:1518 +#: mod/photos.php:1512 msgid "Map" msgstr "Карта" -#: mod/photos.php:1581 +#: mod/photos.php:1575 msgid "View Album" msgstr "Просмотреть альбом" @@ -1144,36 +1144,36 @@ msgstr "Ошибочный запрос." msgid "Contact not found." msgstr "Контакт не найден." -#: mod/removeme.php:63 src/Navigation/Notifications/Repository/Notify.php:482 +#: mod/removeme.php:65 src/Navigation/Notifications/Repository/Notify.php:482 msgid "[Friendica System Notify]" msgstr "[Системное уведомление Friendica]" -#: mod/removeme.php:63 +#: mod/removeme.php:65 msgid "User deleted their account" msgstr "Пользователь удалил свою учётную запись" -#: mod/removeme.php:64 +#: mod/removeme.php:66 msgid "" "On your Friendica node an user deleted their account. Please ensure that " "their data is removed from the backups." msgstr "Пользователь удалил свою учётную запись на вашем сервере Friendica. Пожалуйста, убедитесь, что их данные будут удалены из резервных копий." -#: mod/removeme.php:65 +#: mod/removeme.php:67 #, php-format msgid "The user id is %d" msgstr "id пользователя: %d" -#: mod/removeme.php:99 mod/removeme.php:102 +#: mod/removeme.php:101 mod/removeme.php:104 msgid "Remove My Account" msgstr "Удалить мой аккаунт" -#: mod/removeme.php:100 +#: mod/removeme.php:102 msgid "" "This will completely remove your account. Once this has been done it is not " "recoverable." msgstr "Это позволит полностью удалить ваш аккаунт. Как только это будет сделано, аккаунт восстановлению не подлежит." -#: mod/removeme.php:101 +#: mod/removeme.php:103 msgid "Please enter your password for verification:" msgstr "Пожалуйста, введите свой пароль для проверки:" @@ -1223,7 +1223,7 @@ msgstr "Удалить авторизацию" #: mod/settings.php:352 src/Module/Admin/Addons/Index.php:69 #: src/Module/Admin/Features.php:87 src/Module/Admin/Logs/Settings.php:81 #: src/Module/Admin/Site.php:434 src/Module/Admin/Themes/Index.php:113 -#: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:532 +#: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:559 #: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:193 msgid "Save Settings" msgstr "Сохранить настройки" @@ -1663,6 +1663,66 @@ msgstr "Не удалось найти контактных данных по э msgid "The contact has been blocked from the node" msgstr "Контакт был заблокирован на узле." +#: src/Console/MergeContacts.php:74 +#, php-format +msgid "%d %s, %d duplicates." +msgstr "" + +#: src/Console/MergeContacts.php:77 +#, php-format +msgid "uri-id is empty for contact %s." +msgstr "" + +#: src/Console/MergeContacts.php:90 +#, php-format +msgid "No valid first countact found for uri-id %d." +msgstr "" + +#: src/Console/MergeContacts.php:101 +#, php-format +msgid "Wrong duplicate found for uri-id %d in %d (url: %s != %s)." +msgstr "" + +#: src/Console/MergeContacts.php:105 +#, php-format +msgid "Wrong duplicate found for uri-id %d in %d (nurl: %s != %s)." +msgstr "" + +#: src/Console/MergeContacts.php:141 +#, php-format +msgid "Deletion of id %d failed" +msgstr "" + +#: src/Console/MergeContacts.php:143 +#, php-format +msgid "Deletion of id %d was successful" +msgstr "" + +#: src/Console/MergeContacts.php:149 +#, php-format +msgid "Updating \"%s\" in \"%s\" from %d to %d" +msgstr "" + +#: src/Console/MergeContacts.php:151 +msgid " - found" +msgstr "" + +#: src/Console/MergeContacts.php:158 +msgid " - failed" +msgstr "" + +#: src/Console/MergeContacts.php:160 +msgid " - success" +msgstr "" + +#: src/Console/MergeContacts.php:164 +msgid " - deleted" +msgstr "" + +#: src/Console/MergeContacts.php:167 +msgid " - done" +msgstr "" + #: src/Console/MoveToAvatarCache.php:91 msgid "The avatar cache needs to be enabled to use this command." msgstr "Кэширование аватаров должно быть включено для использования этой команды." @@ -1721,11 +1781,11 @@ msgstr "Введите ник пользователя:" msgid "Enter new password: " msgstr "Введите новый пароль:" -#: src/Console/User.php:210 src/Module/Settings/Account.php:73 +#: src/Console/User.php:210 src/Module/Settings/Account.php:74 msgid "Password update failed. Please try again." msgstr "Обновление пароля не удалось. Пожалуйста, попробуйте еще раз." -#: src/Console/User.php:213 src/Module/Settings/Account.php:76 +#: src/Console/User.php:213 src/Module/Settings/Account.php:77 msgid "Password changed." msgstr "Пароль изменен." @@ -2618,7 +2678,7 @@ msgstr "Загружаю больше сообщений..." msgid "The end" msgstr "Конец" -#: src/Content/Text/HTML.php:875 src/Content/Widget/VCard.php:103 +#: src/Content/Text/HTML.php:875 src/Content/Widget/VCard.php:109 #: src/Model/Profile.php:456 msgid "Follow" msgstr "Подписаться" @@ -2749,7 +2809,7 @@ msgstr "Организации" msgid "News" msgstr "Новости" -#: src/Content/Widget.php:525 src/Module/Settings/Account.php:430 +#: src/Content/Widget.php:525 src/Module/Settings/Account.php:455 msgid "Account Types" msgstr "Тип учетной записи" @@ -2807,22 +2867,22 @@ msgstr[3] "Популярные тэги (за %d часов)" msgid "More Trending Tags" msgstr "Больше популярных тэгов" -#: src/Content/Widget/VCard.php:96 src/Model/Profile.php:375 +#: src/Content/Widget/VCard.php:102 src/Model/Profile.php:375 #: src/Module/Contact/Profile.php:371 src/Module/Profile/Profile.php:176 msgid "XMPP:" msgstr "XMPP:" -#: src/Content/Widget/VCard.php:97 src/Model/Profile.php:376 +#: src/Content/Widget/VCard.php:103 src/Model/Profile.php:376 #: src/Module/Contact/Profile.php:373 src/Module/Profile/Profile.php:180 msgid "Matrix:" msgstr "Matrix:" -#: src/Content/Widget/VCard.php:101 src/Model/Profile.php:468 +#: src/Content/Widget/VCard.php:107 src/Model/Profile.php:468 #: src/Module/Notifications/Introductions.php:199 msgid "Network:" msgstr "Сеть:" -#: src/Content/Widget/VCard.php:105 src/Model/Profile.php:458 +#: src/Content/Widget/VCard.php:111 src/Model/Profile.php:458 msgid "Unfollow" msgstr "Отписаться" @@ -4339,19 +4399,19 @@ msgstr "Удалённые" msgid "List of pending user deletions" msgstr "Список ожидающих удаления" -#: src/Module/Admin/BaseUsers.php:100 src/Module/Settings/Account.php:468 +#: src/Module/Admin/BaseUsers.php:100 src/Module/Settings/Account.php:493 msgid "Normal Account Page" msgstr "Стандартная страница аккаунта" -#: src/Module/Admin/BaseUsers.php:101 src/Module/Settings/Account.php:475 +#: src/Module/Admin/BaseUsers.php:101 src/Module/Settings/Account.php:500 msgid "Soapbox Page" msgstr "Публичная страница" -#: src/Module/Admin/BaseUsers.php:102 src/Module/Settings/Account.php:482 +#: src/Module/Admin/BaseUsers.php:102 src/Module/Settings/Account.php:507 msgid "Public Forum" msgstr "Публичный форум" -#: src/Module/Admin/BaseUsers.php:103 src/Module/Settings/Account.php:489 +#: src/Module/Admin/BaseUsers.php:103 src/Module/Settings/Account.php:514 msgid "Automatic Friend Page" msgstr "\"Автоматический друг\" страница" @@ -4359,19 +4419,19 @@ msgstr "\"Автоматический друг\" страница" msgid "Private Forum" msgstr "Закрытый форум" -#: src/Module/Admin/BaseUsers.php:107 src/Module/Settings/Account.php:440 +#: src/Module/Admin/BaseUsers.php:107 src/Module/Settings/Account.php:465 msgid "Personal Page" msgstr "Личная страница" -#: src/Module/Admin/BaseUsers.php:108 src/Module/Settings/Account.php:447 +#: src/Module/Admin/BaseUsers.php:108 src/Module/Settings/Account.php:472 msgid "Organisation Page" msgstr "Организационная страница" -#: src/Module/Admin/BaseUsers.php:109 src/Module/Settings/Account.php:454 +#: src/Module/Admin/BaseUsers.php:109 src/Module/Settings/Account.php:479 msgid "News Page" msgstr "Новостная страница" -#: src/Module/Admin/BaseUsers.php:110 src/Module/Settings/Account.php:461 +#: src/Module/Admin/BaseUsers.php:110 src/Module/Settings/Account.php:486 msgid "Community Forum" msgstr "Форум сообщества" @@ -8256,7 +8316,7 @@ msgid "" "class=\"btn btn-sm pull-right\">Cancel" msgstr "Сейчас вы видите свой профиль как %s Отмена" -#: src/Module/Profile/Profile.php:144 src/Module/Settings/Account.php:548 +#: src/Module/Profile/Profile.php:144 src/Module/Settings/Account.php:575 msgid "Full Name:" msgstr "Полное имя:" @@ -8388,7 +8448,7 @@ msgstr "Ваш адрес электронной почты: (Информаци msgid "Please repeat your e-mail address:" msgstr "Пожалуйста, введите адрес электронной почты ещё раз:" -#: src/Module/Register.php:162 src/Module/Settings/Account.php:539 +#: src/Module/Register.php:162 src/Module/Settings/Account.php:566 msgid "New Password:" msgstr "Новый пароль:" @@ -8396,7 +8456,7 @@ msgstr "Новый пароль:" msgid "Leave empty for an auto generated password." msgstr "Оставьте пустым для автоматической генерации пароля." -#: src/Module/Register.php:163 src/Module/Settings/Account.php:540 +#: src/Module/Register.php:163 src/Module/Settings/Account.php:567 msgid "Confirm:" msgstr "Подтвердите:" @@ -8662,127 +8722,127 @@ msgstr "" msgid "Verify code and complete login" msgstr "Введите код для завершения входа" -#: src/Module/Settings/Account.php:65 +#: src/Module/Settings/Account.php:66 msgid "Passwords do not match." msgstr "Пароли не совпадают" -#: src/Module/Settings/Account.php:79 +#: src/Module/Settings/Account.php:80 msgid "Password unchanged." msgstr "Пароль не поменялся" -#: src/Module/Settings/Account.php:94 +#: src/Module/Settings/Account.php:95 msgid "Please use a shorter name." msgstr "Пожалуйста, выберите имя короче." -#: src/Module/Settings/Account.php:97 +#: src/Module/Settings/Account.php:98 msgid "Name too short." msgstr "Имя слишком короткое" -#: src/Module/Settings/Account.php:106 +#: src/Module/Settings/Account.php:107 msgid "Wrong Password." msgstr "Неправильный пароль" -#: src/Module/Settings/Account.php:111 +#: src/Module/Settings/Account.php:112 msgid "Invalid email." msgstr "Неправильный адрес почты" -#: src/Module/Settings/Account.php:117 +#: src/Module/Settings/Account.php:118 msgid "Cannot change to that email." msgstr "Нельзя установить этот адрес почты" -#: src/Module/Settings/Account.php:147 src/Module/Settings/Account.php:199 -#: src/Module/Settings/Account.php:219 src/Module/Settings/Account.php:279 -#: src/Module/Settings/Account.php:328 +#: src/Module/Settings/Account.php:148 src/Module/Settings/Account.php:200 +#: src/Module/Settings/Account.php:220 src/Module/Settings/Account.php:304 +#: src/Module/Settings/Account.php:353 msgid "Settings were not updated." msgstr "Настройки не были изменены." -#: src/Module/Settings/Account.php:340 +#: src/Module/Settings/Account.php:365 msgid "Contact CSV file upload error" msgstr "Ошибка загрузки CSV с контактами" -#: src/Module/Settings/Account.php:359 +#: src/Module/Settings/Account.php:384 msgid "Importing Contacts done" msgstr "Импорт контактов завершён" -#: src/Module/Settings/Account.php:372 +#: src/Module/Settings/Account.php:397 msgid "Relocate message has been send to your contacts" msgstr "Перемещённое сообщение было отправлено списку контактов" -#: src/Module/Settings/Account.php:389 +#: src/Module/Settings/Account.php:414 msgid "Unable to find your profile. Please contact your admin." msgstr "Не получается найти ваш профиль. Пожалуйста свяжитесь с администратором." -#: src/Module/Settings/Account.php:431 +#: src/Module/Settings/Account.php:456 msgid "Personal Page Subtypes" msgstr "Подтипы личной страницы" -#: src/Module/Settings/Account.php:432 +#: src/Module/Settings/Account.php:457 msgid "Community Forum Subtypes" msgstr "Подтипы форума сообщества" -#: src/Module/Settings/Account.php:442 +#: src/Module/Settings/Account.php:467 msgid "Account for a personal profile." msgstr "Личная учётная запись" -#: src/Module/Settings/Account.php:449 +#: src/Module/Settings/Account.php:474 msgid "" "Account for an organisation that automatically approves contact requests as " "\"Followers\"." msgstr "Учётная запись организации, которая автоматически одобряет новых подписчиков." -#: src/Module/Settings/Account.php:456 +#: src/Module/Settings/Account.php:481 msgid "" "Account for a news reflector that automatically approves contact requests as" " \"Followers\"." msgstr "Учётная запись новостной ленты, которая автоматически одобряет новых подписчиков." -#: src/Module/Settings/Account.php:463 +#: src/Module/Settings/Account.php:488 msgid "Account for community discussions." msgstr "Учётная запись для совместных обсуждений." -#: src/Module/Settings/Account.php:470 +#: src/Module/Settings/Account.php:495 msgid "" "Account for a regular personal profile that requires manual approval of " "\"Friends\" and \"Followers\"." msgstr "Личная учётная запись, которая требует ручного одобрения для новых подписчиков и друзей." -#: src/Module/Settings/Account.php:477 +#: src/Module/Settings/Account.php:502 msgid "" "Account for a public profile that automatically approves contact requests as" " \"Followers\"." msgstr "Учётная запись для публичного профиля, которая автоматически одобряет новых подписчиков." -#: src/Module/Settings/Account.php:484 +#: src/Module/Settings/Account.php:509 msgid "Automatically approves all contact requests." msgstr "Автоматически одобряет все запросы на подписку." -#: src/Module/Settings/Account.php:491 +#: src/Module/Settings/Account.php:516 msgid "" "Account for a popular profile that automatically approves contact requests " "as \"Friends\"." msgstr "Учётная запись для публичной личности, которая автоматически добавляет все новые контакты в друзья." -#: src/Module/Settings/Account.php:496 +#: src/Module/Settings/Account.php:521 msgid "Private Forum [Experimental]" msgstr "Личный форум [экспериментально]" -#: src/Module/Settings/Account.php:498 +#: src/Module/Settings/Account.php:523 msgid "Requires manual approval of contact requests." msgstr "Требует ручного одобрения запросов на подписку." -#: src/Module/Settings/Account.php:507 +#: src/Module/Settings/Account.php:532 msgid "OpenID:" msgstr "OpenID:" -#: src/Module/Settings/Account.php:507 +#: src/Module/Settings/Account.php:532 msgid "(Optional) Allow this OpenID to login to this account." msgstr "(Необязательно) Разрешить этому OpenID входить в этот аккаунт" -#: src/Module/Settings/Account.php:515 +#: src/Module/Settings/Account.php:540 msgid "Publish your profile in your local site directory?" msgstr "Опубликовать ваш профиль в каталоге вашего сервера?" -#: src/Module/Settings/Account.php:515 +#: src/Module/Settings/Account.php:540 #, php-format msgid "" "Your profile will be published in this node's local " @@ -8790,103 +8850,103 @@ msgid "" " system settings." msgstr "Ваш профиль будет опубликован в локальном каталоге этого сервера. Данные вашего профиля могут быть доступны публично в зависимости от настроек." -#: src/Module/Settings/Account.php:521 +#: src/Module/Settings/Account.php:546 #, php-format msgid "" "Your profile will also be published in the global friendica directories " "(e.g. %s)." msgstr "Ваш профиль так же будет опубликован в глобальных каталогах Френдики (напр. %s)." -#: src/Module/Settings/Account.php:529 +#: src/Module/Settings/Account.php:556 msgid "Account Settings" msgstr "Настройки аккаунта" -#: src/Module/Settings/Account.php:530 +#: src/Module/Settings/Account.php:557 #, php-format msgid "Your Identity Address is '%s' or '%s'." msgstr "Ваш адрес: '%s' или '%s'." -#: src/Module/Settings/Account.php:538 +#: src/Module/Settings/Account.php:565 msgid "Password Settings" msgstr "Смена пароля" -#: src/Module/Settings/Account.php:539 +#: src/Module/Settings/Account.php:566 msgid "" "Allowed characters are a-z, A-Z, 0-9 and special characters except white " "spaces, accentuated letters and colon (:)." msgstr "Разрешенные символы: a-z, A-Z, 0-9 специальные символы за исключением пробелов, букв с акцентами и двоеточия (:)." -#: src/Module/Settings/Account.php:540 +#: src/Module/Settings/Account.php:567 msgid "Leave password fields blank unless changing" msgstr "Оставьте поля пароля пустыми, если он не изменяется" -#: src/Module/Settings/Account.php:541 +#: src/Module/Settings/Account.php:568 msgid "Current Password:" msgstr "Текущий пароль:" -#: src/Module/Settings/Account.php:541 +#: src/Module/Settings/Account.php:568 msgid "Your current password to confirm the changes" msgstr "Ваш текущий пароль, для подтверждения изменений" -#: src/Module/Settings/Account.php:542 +#: src/Module/Settings/Account.php:569 msgid "Password:" msgstr "Пароль:" -#: src/Module/Settings/Account.php:542 +#: src/Module/Settings/Account.php:569 msgid "Your current password to confirm the changes of the email address" msgstr "Ваш текущий пароль для подтверждения смены адреса почты" -#: src/Module/Settings/Account.php:545 +#: src/Module/Settings/Account.php:572 msgid "Delete OpenID URL" msgstr "Удалить ссылку OpenID" -#: src/Module/Settings/Account.php:547 +#: src/Module/Settings/Account.php:574 msgid "Basic Settings" msgstr "Основные параметры" -#: src/Module/Settings/Account.php:549 +#: src/Module/Settings/Account.php:576 msgid "Email Address:" msgstr "Адрес электронной почты:" -#: src/Module/Settings/Account.php:550 +#: src/Module/Settings/Account.php:577 msgid "Your Timezone:" msgstr "Ваш часовой пояс:" -#: src/Module/Settings/Account.php:551 +#: src/Module/Settings/Account.php:578 msgid "Your Language:" msgstr "Ваш язык:" -#: src/Module/Settings/Account.php:551 +#: src/Module/Settings/Account.php:578 msgid "" "Set the language we use to show you friendica interface and to send you " "emails" msgstr "Выберите язык, на котором вы будете видеть интерфейс Friendica и на котором вы будете получать письма" -#: src/Module/Settings/Account.php:552 +#: src/Module/Settings/Account.php:579 msgid "Default Post Location:" msgstr "Местонахождение по умолчанию:" -#: src/Module/Settings/Account.php:553 +#: src/Module/Settings/Account.php:580 msgid "Use Browser Location:" msgstr "Использовать определение местоположения браузером:" -#: src/Module/Settings/Account.php:555 +#: src/Module/Settings/Account.php:582 msgid "Security and Privacy Settings" msgstr "Параметры безопасности и конфиденциальности" -#: src/Module/Settings/Account.php:557 +#: src/Module/Settings/Account.php:584 msgid "Maximum Friend Requests/Day:" msgstr "Максимум запросов в друзья в день:" -#: src/Module/Settings/Account.php:557 src/Module/Settings/Account.php:567 +#: src/Module/Settings/Account.php:584 src/Module/Settings/Account.php:594 msgid "(to prevent spam abuse)" msgstr "(для предотвращения спама)" -#: src/Module/Settings/Account.php:559 +#: src/Module/Settings/Account.php:586 msgid "Allow your profile to be searchable globally?" msgstr "Сделать ваш профиль доступным для поиска глобально?" -#: src/Module/Settings/Account.php:559 +#: src/Module/Settings/Account.php:586 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 " @@ -8894,43 +8954,43 @@ msgid "" "indexed or not." msgstr "Включите эту настройку, если вы хотите, чтобы другие люди могли легко вас находить. Ваш профиль станет доступным для поиска на других узлах. Так же эта настройка разрешает поисковым системам индексировать ваш профиль." -#: src/Module/Settings/Account.php:560 +#: src/Module/Settings/Account.php:587 msgid "Hide your contact/friend list from viewers of your profile?" msgstr "Скрыть список ваших контактов/друзей от просмотра в вашем профиле?" -#: src/Module/Settings/Account.php:560 +#: src/Module/Settings/Account.php:587 msgid "" "A list of your contacts is displayed on your profile page. Activate this " "option to disable the display of your contact list." msgstr "Список ваших контактов отображается на вашей странице профиля. Включите эту настройку, чтобы скрыть отображение вашего списка контактов." -#: src/Module/Settings/Account.php:561 +#: src/Module/Settings/Account.php:588 msgid "Hide your profile details from anonymous viewers?" msgstr "Скрыть данные профиля от анонимных посетителей?" -#: src/Module/Settings/Account.php:561 +#: src/Module/Settings/Account.php:588 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 "Анонимные посетители будут видеть только вашу картинку, ваше имя и и ник. Публичные записи и комментарии могут быть доступны другими способами." -#: src/Module/Settings/Account.php:562 +#: src/Module/Settings/Account.php:589 msgid "Make public posts unlisted" msgstr "Скрыть публичные записи из общих лент" -#: src/Module/Settings/Account.php:562 +#: src/Module/Settings/Account.php:589 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 "Ваши публичные записи не будут отражаться в общей ленте сервера или в результатах поиска, так же они не будут отправляться на ретранслтяторы. Тем не менее, они всё равно могут быть доступны в публичных лентах других серверов." -#: src/Module/Settings/Account.php:563 +#: src/Module/Settings/Account.php:590 msgid "Make all posted pictures accessible" msgstr "Сделать все опубликованные изображения доступными" -#: src/Module/Settings/Account.php:563 +#: src/Module/Settings/Account.php:590 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 " @@ -8938,213 +8998,237 @@ msgid "" "public on your photo albums though." msgstr "Эта настройка делает все опубликованные изображения доступными по прямой ссылке. Это можно применить для решения проблем с другими социальными сетями, которые не умеют работать с разрешениями доступа для изображений. Непубличные изображения в любом случае не будут доступны для просмотра публично в ваших альбомах." -#: src/Module/Settings/Account.php:564 +#: src/Module/Settings/Account.php:591 msgid "Allow friends to post to your profile page?" msgstr "Разрешить друзьям оставлять сообщения на страницу вашего профиля?" -#: src/Module/Settings/Account.php:564 +#: src/Module/Settings/Account.php:591 msgid "" "Your contacts may write posts on your profile wall. These posts will be " "distributed to your contacts" msgstr "Ваши контакты могут оставлять записи на стене вашего профиля. Эти записи будут распространены вашим подписчикам." -#: src/Module/Settings/Account.php:565 +#: src/Module/Settings/Account.php:592 msgid "Allow friends to tag your posts?" msgstr "Разрешить друзьям отмечать ваши сообщения?" -#: src/Module/Settings/Account.php:565 +#: src/Module/Settings/Account.php:592 msgid "Your contacts can add additional tags to your posts." msgstr "Ваши контакты могут добавлять дополнительные теги к вашим записям." -#: src/Module/Settings/Account.php:566 +#: src/Module/Settings/Account.php:593 msgid "Permit unknown people to send you private mail?" msgstr "Разрешить незнакомым людям отправлять вам личные сообщения?" -#: src/Module/Settings/Account.php:566 +#: src/Module/Settings/Account.php:593 msgid "" "Friendica network users may send you private messages even if they are not " "in your contact list." msgstr "Пользователи Френдики могут отправлять вам личные сообщения даже если их нет в вашем списке контактов." -#: src/Module/Settings/Account.php:567 +#: src/Module/Settings/Account.php:594 msgid "Maximum private messages per day from unknown people:" msgstr "Максимальное количество личных сообщений от незнакомых людей в день:" -#: src/Module/Settings/Account.php:569 +#: src/Module/Settings/Account.php:596 msgid "Default Post Permissions" msgstr "Разрешение на сообщения по умолчанию" -#: src/Module/Settings/Account.php:573 +#: src/Module/Settings/Account.php:600 msgid "Expiration settings" msgstr "Очистка старых записей" -#: src/Module/Settings/Account.php:574 +#: src/Module/Settings/Account.php:601 msgid "Automatically expire posts after this many days:" msgstr "Автоматическое истекание срока действия сообщения после стольких дней:" -#: src/Module/Settings/Account.php:574 +#: src/Module/Settings/Account.php:601 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "Если пусто, срок действия сообщений не будет ограничен. Сообщения с истекшим сроком действия будут удалены" -#: src/Module/Settings/Account.php:575 +#: src/Module/Settings/Account.php:602 msgid "Expire posts" msgstr "Удалять старые записи" -#: src/Module/Settings/Account.php:575 +#: src/Module/Settings/Account.php:602 msgid "When activated, posts and comments will be expired." msgstr "Если включено, то старые записи и комментарии будут удаляться." -#: src/Module/Settings/Account.php:576 +#: src/Module/Settings/Account.php:603 msgid "Expire personal notes" msgstr "Удалять персональные заметки" -#: src/Module/Settings/Account.php:576 +#: src/Module/Settings/Account.php:603 msgid "" "When activated, the personal notes on your profile page will be expired." msgstr "Если включено, старые личные заметки из вашего профиля будут удаляться." -#: src/Module/Settings/Account.php:577 +#: src/Module/Settings/Account.php:604 msgid "Expire starred posts" msgstr "Удалять избранные записи" -#: src/Module/Settings/Account.php:577 +#: src/Module/Settings/Account.php:604 msgid "" "Starring posts keeps them from being expired. That behaviour is overwritten " "by this setting." msgstr "Добавление записи в избранные защищает её от удаления. Эта настройка выключает эту защиту." -#: src/Module/Settings/Account.php:578 +#: src/Module/Settings/Account.php:605 msgid "Only expire posts by others" msgstr "Удалять только записи других людей" -#: src/Module/Settings/Account.php:578 +#: src/Module/Settings/Account.php:605 msgid "" "When activated, your own posts never expire. Then the settings above are " "only valid for posts you received." msgstr "Если включено, ваши собственные записи никогда не удаляются. В этом случае все настройки выше применяются только к записям, которые вы получаете от других." -#: src/Module/Settings/Account.php:581 +#: src/Module/Settings/Account.php:608 msgid "Notification Settings" msgstr "Настройка уведомлений" -#: src/Module/Settings/Account.php:582 +#: src/Module/Settings/Account.php:609 msgid "Send a notification email when:" msgstr "Отправлять уведомление по электронной почте, когда:" -#: src/Module/Settings/Account.php:583 +#: src/Module/Settings/Account.php:610 msgid "You receive an introduction" msgstr "Вы получили запрос" -#: src/Module/Settings/Account.php:584 +#: src/Module/Settings/Account.php:611 msgid "Your introductions are confirmed" msgstr "Ваши запросы подтверждены" -#: src/Module/Settings/Account.php:585 +#: src/Module/Settings/Account.php:612 msgid "Someone writes on your profile wall" msgstr "Кто-то пишет на стене вашего профиля" -#: src/Module/Settings/Account.php:586 +#: src/Module/Settings/Account.php:613 msgid "Someone writes a followup comment" msgstr "Кто-то пишет последующий комментарий" -#: src/Module/Settings/Account.php:587 +#: src/Module/Settings/Account.php:614 msgid "You receive a private message" msgstr "Вы получаете личное сообщение" -#: src/Module/Settings/Account.php:588 +#: src/Module/Settings/Account.php:615 msgid "You receive a friend suggestion" msgstr "Вы полулили предложение о добавлении в друзья" -#: src/Module/Settings/Account.php:589 +#: src/Module/Settings/Account.php:616 msgid "You are tagged in a post" msgstr "Вы отмечены в записи" -#: src/Module/Settings/Account.php:590 +#: src/Module/Settings/Account.php:617 msgid "You are poked/prodded/etc. in a post" msgstr "Вас потыкали/подтолкнули/и т.д. в записи" -#: src/Module/Settings/Account.php:592 +#: src/Module/Settings/Account.php:619 msgid "Create a desktop notification when:" msgstr "Показывать уведомление при:" -#: src/Module/Settings/Account.php:593 +#: src/Module/Settings/Account.php:620 +msgid "Someone tagged you" +msgstr "Вас отметили" + +#: src/Module/Settings/Account.php:621 +msgid "Someone directly commented on your post" +msgstr "На вашу запись написали комментарий" + +#: src/Module/Settings/Account.php:622 msgid "Someone liked your content" msgstr "Ваша запись кому-то понравилась" -#: src/Module/Settings/Account.php:594 +#: src/Module/Settings/Account.php:622 src/Module/Settings/Account.php:623 +msgid "Can only be enabled, when the direct comment notification is enabled." +msgstr "Может быть включено только при включении уведомлений о комментариях к вашим записям." + +#: src/Module/Settings/Account.php:623 msgid "Someone shared your content" msgstr "Вашей записью поделились" -#: src/Module/Settings/Account.php:596 +#: src/Module/Settings/Account.php:624 +msgid "Someone commented in your thread" +msgstr "В обсуждении вашей записи написали комментарий" + +#: src/Module/Settings/Account.php:625 +msgid "Someone commented in a thread where you commented" +msgstr "Написали в диалоге, где вы оставляли комментарии" + +#: src/Module/Settings/Account.php:626 +msgid "Someone commented in a thread where you interacted" +msgstr "Написали в диалоге, где вы принимали любое участие" + +#: src/Module/Settings/Account.php:628 msgid "Activate desktop notifications" msgstr "Активировать уведомления на рабочем столе" -#: src/Module/Settings/Account.php:596 +#: src/Module/Settings/Account.php:628 msgid "Show desktop popup on new notifications" msgstr "Показывать уведомления на рабочем столе" -#: src/Module/Settings/Account.php:600 +#: src/Module/Settings/Account.php:632 msgid "Text-only notification emails" msgstr "Только текстовые письма" -#: src/Module/Settings/Account.php:602 +#: src/Module/Settings/Account.php:634 msgid "Send text only notification emails, without the html part" msgstr "Отправлять только текстовые уведомления, без HTML" -#: src/Module/Settings/Account.php:606 +#: src/Module/Settings/Account.php:638 msgid "Show detailled notifications" msgstr "Показывать подробные уведомления" -#: src/Module/Settings/Account.php:608 +#: src/Module/Settings/Account.php:640 msgid "" "Per default, notifications are condensed to a single notification per item. " "When enabled every notification is displayed." msgstr "По-умолчанию уведомления группируются в одно для каждой записи. Эта настройка показывает все уведомления по отдельности." -#: src/Module/Settings/Account.php:612 +#: src/Module/Settings/Account.php:644 msgid "Show notifications of ignored contacts" msgstr "Показывать уведомления игнорируемых контактов" -#: src/Module/Settings/Account.php:614 +#: src/Module/Settings/Account.php:646 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 "Вы не видите записи от игнорируемых контактов, но вы видите их комментарии. Эта настройка определяет, хотите ли вы получать уведомления от действий игнорируемых контактов или нет." -#: src/Module/Settings/Account.php:617 +#: src/Module/Settings/Account.php:649 msgid "Advanced Account/Page Type Settings" msgstr "Расширенные настройки учётной записи" -#: src/Module/Settings/Account.php:618 +#: src/Module/Settings/Account.php:650 msgid "Change the behaviour of this account for special situations" msgstr "Измените поведение этого аккаунта в специальных ситуациях" -#: src/Module/Settings/Account.php:621 +#: src/Module/Settings/Account.php:653 msgid "Import Contacts" msgstr "Импорт контактов" -#: src/Module/Settings/Account.php:622 +#: src/Module/Settings/Account.php:654 msgid "" "Upload a CSV file that contains the handle of your followed accounts in the " "first column you exported from the old account." msgstr "Загрузите файл CSV, который содержит адреса ваших контактов в первой колонке. Вы можете экспортировать его из вашей старой учётной записи." -#: src/Module/Settings/Account.php:623 +#: src/Module/Settings/Account.php:655 msgid "Upload File" msgstr "Загрузить файл" -#: src/Module/Settings/Account.php:626 +#: src/Module/Settings/Account.php:658 msgid "Relocate" msgstr "Перемещение" -#: src/Module/Settings/Account.php:627 +#: src/Module/Settings/Account.php:659 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 "Если вы переместили эту анкету с другого сервера, и некоторые из ваших контактов не получили ваши обновления, попробуйте нажать эту кнопку." -#: src/Module/Settings/Account.php:628 +#: src/Module/Settings/Account.php:660 msgid "Resend relocate message to contacts" msgstr "Отправить перемещённые сообщения контактам" @@ -10097,7 +10181,7 @@ msgstr "{0} хочет подписаться на вас" #: src/Navigation/Notifications/Factory/FormattedNavNotification.php:136 msgid "{0} has started following you" -msgstr "" +msgstr "{0} подписался на вас" #: src/Navigation/Notifications/Factory/FormattedNotify.php:91 #, php-format @@ -10152,132 +10236,132 @@ msgstr "Запрос в друзья / на подключение" msgid "New Follower" msgstr "Новый подписчик" -#: src/Navigation/Notifications/Factory/Notification.php:130 +#: src/Navigation/Notifications/Factory/Notification.php:134 #, php-format msgid "%1$s wants to follow you" msgstr "%1$s хочет подписаться на вас." -#: src/Navigation/Notifications/Factory/Notification.php:132 +#: src/Navigation/Notifications/Factory/Notification.php:136 #, php-format msgid "%1$s has started following you" msgstr "%1$s подписался на вас" -#: src/Navigation/Notifications/Factory/Notification.php:196 +#: src/Navigation/Notifications/Factory/Notification.php:200 #, php-format msgid "%1$s liked your comment on %2$s" msgstr "%1$s нравится ваш комментарий %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:199 +#: src/Navigation/Notifications/Factory/Notification.php:203 #, php-format msgid "%1$s liked your post %2$s" msgstr "%1$s нравится ваша запись %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:206 +#: src/Navigation/Notifications/Factory/Notification.php:210 #, php-format msgid "%1$s disliked your comment on %2$s" msgstr "%1$s не нравится ваш комментарий %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:209 +#: src/Navigation/Notifications/Factory/Notification.php:213 #, php-format msgid "%1$s disliked your post %2$s" msgstr "%1$s не нравится ваша запись %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:216 +#: src/Navigation/Notifications/Factory/Notification.php:220 #, php-format msgid "%1$s shared your comment %2$s" msgstr "%1$s поделился вашим комментарием %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:219 +#: src/Navigation/Notifications/Factory/Notification.php:223 #, php-format msgid "%1$s shared your post %2$s" msgstr "%1$s поделился вашей записью %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:223 -#: src/Navigation/Notifications/Factory/Notification.php:292 +#: src/Navigation/Notifications/Factory/Notification.php:227 +#: src/Navigation/Notifications/Factory/Notification.php:297 #, php-format msgid "%1$s shared the post %2$s from %3$s" msgstr "%1$s поделился записью %2$s от %3$s" -#: src/Navigation/Notifications/Factory/Notification.php:225 -#: src/Navigation/Notifications/Factory/Notification.php:294 +#: src/Navigation/Notifications/Factory/Notification.php:229 +#: src/Navigation/Notifications/Factory/Notification.php:299 #, php-format msgid "%1$s shared a post from %3$s" msgstr "%1$s поделился записью от %3$s" -#: src/Navigation/Notifications/Factory/Notification.php:227 -#: src/Navigation/Notifications/Factory/Notification.php:296 +#: src/Navigation/Notifications/Factory/Notification.php:231 +#: src/Navigation/Notifications/Factory/Notification.php:301 #, php-format msgid "%1$s shared the post %2$s" msgstr "%1$s поделился записью %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:229 -#: src/Navigation/Notifications/Factory/Notification.php:298 +#: src/Navigation/Notifications/Factory/Notification.php:233 +#: src/Navigation/Notifications/Factory/Notification.php:303 #, php-format msgid "%1$s shared a post" msgstr "%1$s поделился записью" -#: src/Navigation/Notifications/Factory/Notification.php:237 +#: src/Navigation/Notifications/Factory/Notification.php:241 #, php-format msgid "%1$s wants to attend your event %2$s" msgstr "%1$s хочет прийти на ваше событие %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:244 +#: src/Navigation/Notifications/Factory/Notification.php:248 #, php-format msgid "%1$s does not want to attend your event %2$s" msgstr "%1$s не хочет приходить на ваше событие %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:251 +#: src/Navigation/Notifications/Factory/Notification.php:255 #, php-format msgid "%1$s maybe wants to attend your event %2$s" msgstr "%1$s возможно захочет прийти на в ваше событие %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:258 +#: src/Navigation/Notifications/Factory/Notification.php:262 #, php-format msgid "%1$s tagged you on %2$s" msgstr "%1$s отметил(а) вас в %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:262 +#: src/Navigation/Notifications/Factory/Notification.php:266 #, php-format msgid "%1$s replied to you on %2$s" msgstr "%1$s ответил(а) на %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:266 +#: src/Navigation/Notifications/Factory/Notification.php:270 #, php-format msgid "%1$s commented in your thread %2$s" msgstr "%1$s ответил(а) в вашем обсуждении %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:270 +#: src/Navigation/Notifications/Factory/Notification.php:274 #, php-format msgid "%1$s commented on your comment %2$s" msgstr "%1$s ответил(а) на ваш комментарий %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:276 +#: src/Navigation/Notifications/Factory/Notification.php:281 #, php-format msgid "%1$s commented in their thread %2$s" msgstr "%1$s ответил(а) в своём обсуждении %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:278 +#: src/Navigation/Notifications/Factory/Notification.php:283 #, php-format msgid "%1$s commented in their thread" msgstr "%1$s ответил(а) в своём обсуждении" -#: src/Navigation/Notifications/Factory/Notification.php:280 +#: src/Navigation/Notifications/Factory/Notification.php:285 #, php-format msgid "%1$s commented in the thread %2$s from %3$s" msgstr "%1$s ответил(а) в обсуждении %2$s от %3$s" -#: src/Navigation/Notifications/Factory/Notification.php:282 +#: src/Navigation/Notifications/Factory/Notification.php:287 #, php-format msgid "%1$s commented in the thread from %3$s" msgstr "%1$s ответил(а) в обсуждении от %3$s" -#: src/Navigation/Notifications/Factory/Notification.php:287 +#: src/Navigation/Notifications/Factory/Notification.php:292 #, php-format msgid "%1$s commented on your thread %2$s" msgstr "%1$s ответил(а) в вашем обсуждении %2$s" #: src/Navigation/Notifications/Repository/Notify.php:221 -#: src/Navigation/Notifications/Repository/Notify.php:724 +#: src/Navigation/Notifications/Repository/Notify.php:735 msgid "[Friendica:Notify]" msgstr "[Friendica]" @@ -10321,7 +10405,7 @@ msgid "%1$s commented on their %2$s %3$s" msgstr "%1$s прокомментировал(а) свой %2$s %3$s" #: src/Navigation/Notifications/Repository/Notify.php:333 -#: src/Navigation/Notifications/Repository/Notify.php:758 +#: src/Navigation/Notifications/Repository/Notify.php:769 #, php-format msgid "%1$s Comment to conversation #%2$d by %3$s" msgstr "%1$s Комментариев к разговору #%2$d от %3$s" @@ -10334,7 +10418,7 @@ msgstr "%s оставил комментарий к элементу/бесед #: src/Navigation/Notifications/Repository/Notify.php:339 #: src/Navigation/Notifications/Repository/Notify.php:354 #: src/Navigation/Notifications/Repository/Notify.php:373 -#: src/Navigation/Notifications/Repository/Notify.php:773 +#: src/Navigation/Notifications/Repository/Notify.php:784 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Пожалуйста посетите %s для просмотра и/или ответа в беседу." @@ -10523,12 +10607,12 @@ msgstr "Полное имя:\t%s\nРасположение:\t%s\nИмя для msgid "Please visit %s to approve or reject the request." msgstr "Пожалуйста, посетите %s чтобы подтвердить или отвергнуть запрос." -#: src/Navigation/Notifications/Repository/Notify.php:752 +#: src/Navigation/Notifications/Repository/Notify.php:763 #, php-format msgid "%s %s tagged you" msgstr "%s %s отметил(и) Вас" -#: src/Navigation/Notifications/Repository/Notify.php:755 +#: src/Navigation/Notifications/Repository/Notify.php:766 #, php-format msgid "%s %s shared a new post" msgstr "%s %s поделился(-ась) новым сообщением" diff --git a/view/lang/ru/strings.php b/view/lang/ru/strings.php index a0f6ad0b3..f02d93ba1 100644 --- a/view/lang/ru/strings.php +++ b/view/lang/ru/strings.php @@ -2130,8 +2130,14 @@ $a->strings['You receive a friend suggestion'] = 'Вы полулили пред $a->strings['You are tagged in a post'] = 'Вы отмечены в записи'; $a->strings['You are poked/prodded/etc. in a post'] = 'Вас потыкали/подтолкнули/и т.д. в записи'; $a->strings['Create a desktop notification when:'] = 'Показывать уведомление при:'; +$a->strings['Someone tagged you'] = 'Вас отметили'; +$a->strings['Someone directly commented on your post'] = 'На вашу запись написали комментарий'; $a->strings['Someone liked your content'] = 'Ваша запись кому-то понравилась'; +$a->strings['Can only be enabled, when the direct comment notification is enabled.'] = 'Может быть включено только при включении уведомлений о комментариях к вашим записям.'; $a->strings['Someone shared your content'] = 'Вашей записью поделились'; +$a->strings['Someone commented in your thread'] = 'В обсуждении вашей записи написали комментарий'; +$a->strings['Someone commented in a thread where you commented'] = 'Написали в диалоге, где вы оставляли комментарии'; +$a->strings['Someone commented in a thread where you interacted'] = 'Написали в диалоге, где вы принимали любое участие'; $a->strings['Activate desktop notifications'] = 'Активировать уведомления на рабочем столе'; $a->strings['Show desktop popup on new notifications'] = 'Показывать уведомления на рабочем столе'; $a->strings['Text-only notification emails'] = 'Только текстовые письма'; @@ -2301,6 +2307,7 @@ $a->strings['Getting Help'] = 'Получить помощь'; $a->strings['Go to the Help Section'] = 'Перейти в раздел справки'; $a->strings['Our help pages may be consulted for detail on other program features and resources.'] = 'Наши страницы помощи могут проконсультировать о подробностях и возможностях программы и ресурса.'; $a->strings['{0} wants to follow you'] = '{0} хочет подписаться на вас'; +$a->strings['{0} has started following you'] = '{0} подписался на вас'; $a->strings['%s liked %s\'s post'] = '%s нравится %s сообшение'; $a->strings['%s disliked %s\'s post'] = '%s не нравится сообщение %s'; $a->strings['%s is attending %s\'s event'] = '%s будет присутствовать на событии %s'; From e3183cb4b4348ecc3961359ebdb0d74f87d7c39a Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 7 Jun 2022 06:31:52 +0200 Subject: [PATCH 3/4] DE translation updats --- view/lang/de/messages.po | 539 +++++++++++++++++++++------------------ view/lang/de/strings.php | 8 +- 2 files changed, 290 insertions(+), 257 deletions(-) diff --git a/view/lang/de/messages.po b/view/lang/de/messages.po index b29eba588..a6bd7533b 100644 --- a/view/lang/de/messages.po +++ b/view/lang/de/messages.po @@ -49,7 +49,7 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-01 22:09+0000\n" +"POT-Creation-Date: 2022-06-06 07:33+0000\n" "PO-Revision-Date: 2011-05-05 10:19+0000\n" "Last-Translator: Tobias Diekershoff , 2016-2022\n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" @@ -69,7 +69,7 @@ msgid "Access denied." msgstr "Zugriff verweigert." #: mod/cal.php:63 mod/cal.php:80 mod/photos.php:69 mod/photos.php:140 -#: mod/photos.php:804 src/Model/Profile.php:231 src/Module/Feed.php:72 +#: mod/photos.php:798 src/Model/Profile.php:231 src/Module/Feed.php:72 #: src/Module/HCard.php:52 src/Module/Profile/Common.php:41 #: src/Module/Profile/Common.php:52 src/Module/Profile/Contacts.php:40 #: src/Module/Profile/Contacts.php:50 src/Module/Profile/Media.php:38 @@ -78,7 +78,7 @@ msgstr "Zugriff verweigert." msgid "User not found." msgstr "Benutzer nicht gefunden." -#: mod/cal.php:122 mod/display.php:246 src/Module/Profile/Profile.php:94 +#: mod/cal.php:122 mod/display.php:247 src/Module/Profile/Profile.php:94 #: src/Module/Profile/Profile.php:109 src/Module/Profile/Status.php:110 #: src/Module/Update/Profile.php:56 msgid "Access to this profile has been restricted." @@ -145,24 +145,24 @@ msgstr "Keine exportierbaren Daten gefunden" msgid "calendar" msgstr "Kalender" -#: mod/display.php:141 mod/photos.php:808 +#: mod/display.php:142 mod/photos.php:802 #: src/Module/Conversation/Community.php:175 src/Module/Directory.php:49 #: src/Module/Search/Index.php:50 msgid "Public access denied." msgstr "Öffentlicher Zugriff verweigert." -#: mod/display.php:197 mod/display.php:271 +#: mod/display.php:198 mod/display.php:272 msgid "The requested item doesn't exist or has been deleted." msgstr "Der angeforderte Beitrag existiert nicht oder wurde gelöscht." -#: mod/display.php:351 +#: mod/display.php:352 msgid "The feed for this item is unavailable." msgstr "Der Feed für diesen Beitrag ist nicht verfügbar." #: mod/editpost.php:38 mod/events.php:217 mod/follow.php:56 mod/follow.php:130 #: mod/item.php:181 mod/item.php:186 mod/item.php:875 mod/message.php:69 #: mod/message.php:111 mod/notes.php:44 mod/ostatus_subscribe.php:33 -#: mod/photos.php:160 mod/photos.php:897 mod/repair_ostatus.php:31 +#: mod/photos.php:160 mod/photos.php:891 mod/repair_ostatus.php:31 #: mod/settings.php:40 mod/settings.php:50 mod/settings.php:156 #: mod/suggest.php:34 mod/uimport.php:33 mod/unfollow.php:35 #: mod/unfollow.php:50 mod/unfollow.php:82 mod/wall_attach.php:67 @@ -179,8 +179,8 @@ msgstr "Der Feed für diesen Beitrag ist nicht verfügbar." #: src/Module/Profile/Schedule.php:39 src/Module/Profile/Schedule.php:56 #: src/Module/Register.php:77 src/Module/Register.php:90 #: src/Module/Register.php:206 src/Module/Register.php:245 -#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:48 -#: src/Module/Settings/Account.php:384 src/Module/Settings/Delegation.php:42 +#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:49 +#: src/Module/Settings/Account.php:409 src/Module/Settings/Delegation.php:42 #: src/Module/Settings/Delegation.php:70 src/Module/Settings/Display.php:42 #: src/Module/Settings/Display.php:120 #: src/Module/Settings/Profile/Photo/Crop.php:166 @@ -205,7 +205,7 @@ msgstr "Beitrag bearbeiten" msgid "Save" msgstr "Speichern" -#: mod/editpost.php:92 mod/photos.php:1344 src/Content/Conversation.php:338 +#: mod/editpost.php:92 mod/photos.php:1338 src/Content/Conversation.php:338 #: src/Module/Contact/Poke.php:176 src/Object/Post.php:989 msgid "Loading..." msgstr "lädt..." @@ -270,7 +270,7 @@ msgid "clear location" msgstr "Ort löschen" #: mod/editpost.php:107 mod/message.php:200 mod/message.php:358 -#: mod/photos.php:1495 mod/wallmessage.php:142 +#: mod/photos.php:1489 mod/wallmessage.php:142 #: src/Content/Conversation.php:368 src/Content/Conversation.php:712 #: src/Module/Item/Compose.php:177 src/Object/Post.php:528 msgid "Please wait" @@ -302,14 +302,14 @@ msgstr "Kategorien (kommasepariert)" msgid "Example: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com" -#: mod/editpost.php:128 mod/events.php:513 mod/photos.php:1343 -#: mod/photos.php:1399 mod/photos.php:1473 src/Content/Conversation.php:383 +#: mod/editpost.php:128 mod/events.php:513 mod/photos.php:1337 +#: mod/photos.php:1393 mod/photos.php:1467 src/Content/Conversation.php:383 #: src/Module/Item/Compose.php:172 src/Object/Post.php:999 msgid "Preview" msgstr "Vorschau" #: mod/editpost.php:130 mod/fbrowser.php:118 mod/fbrowser.php:145 -#: mod/follow.php:144 mod/photos.php:1010 mod/photos.php:1111 mod/tagrm.php:35 +#: mod/follow.php:144 mod/photos.php:1004 mod/photos.php:1105 mod/tagrm.php:35 #: mod/tagrm.php:127 mod/unfollow.php:97 src/Content/Conversation.php:386 #: src/Module/Contact/Revoke.php:108 src/Module/RemoteFollow.php:127 msgid "Cancel" @@ -351,7 +351,7 @@ msgid "Link or Media" msgstr "Link oder Mediendatei" #: mod/editpost.php:143 src/Content/Conversation.php:393 -#: src/Content/Widget/VCard.php:107 src/Model/Profile.php:462 +#: src/Content/Widget/VCard.php:113 src/Model/Profile.php:462 #: src/Module/Admin/Logs/View.php:93 msgid "Message" msgstr "Nachricht" @@ -361,8 +361,8 @@ msgstr "Nachricht" msgid "Browser" msgstr "Browser" -#: mod/editpost.php:145 mod/events.php:518 mod/photos.php:945 -#: mod/photos.php:1297 src/Content/Conversation.php:370 +#: mod/editpost.php:145 mod/events.php:518 mod/photos.php:939 +#: mod/photos.php:1291 src/Content/Conversation.php:370 msgid "Permissions" msgstr "Berechtigungen" @@ -426,7 +426,7 @@ msgstr "Veranstaltungsende:" msgid "Description:" msgstr "Beschreibung" -#: mod/events.php:504 src/Content/Widget/VCard.php:98 src/Model/Event.php:80 +#: mod/events.php:504 src/Content/Widget/VCard.php:104 src/Model/Event.php:80 #: src/Model/Event.php:107 src/Model/Event.php:466 src/Model/Event.php:915 #: src/Model/Profile.php:370 src/Module/Contact/Profile.php:369 #: src/Module/Directory.php:148 src/Module/Notifications/Introductions.php:185 @@ -443,8 +443,8 @@ msgid "Share this event" msgstr "Veranstaltung teilen" #: mod/events.php:515 mod/message.php:201 mod/message.php:357 -#: mod/photos.php:927 mod/photos.php:1031 mod/photos.php:1301 -#: mod/photos.php:1342 mod/photos.php:1398 mod/photos.php:1472 +#: mod/photos.php:921 mod/photos.php:1025 mod/photos.php:1295 +#: mod/photos.php:1336 mod/photos.php:1392 mod/photos.php:1466 #: src/Module/Admin/Item/Source.php:65 src/Module/Contact/Advanced.php:132 #: src/Module/Contact/Poke.php:177 src/Module/Contact/Profile.php:327 #: src/Module/Debug/ActivityPubConversion.php:145 @@ -900,11 +900,11 @@ msgstr "Lasse dieses Fenster offen, bis der Vorgang abgeschlossen ist." msgid "Photo Albums" msgstr "Fotoalben" -#: mod/photos.php:109 mod/photos.php:1590 +#: mod/photos.php:109 mod/photos.php:1584 msgid "Recent Photos" msgstr "Neueste Fotos" -#: mod/photos.php:111 mod/photos.php:1079 mod/photos.php:1592 +#: mod/photos.php:111 mod/photos.php:1073 mod/photos.php:1586 msgid "Upload New Photos" msgstr "Neue Fotos hochladen" @@ -932,221 +932,221 @@ msgstr "Album ist leer." msgid "Failed to delete the photo." msgstr "Das Foto konnte nicht gelöscht werden." -#: mod/photos.php:559 +#: mod/photos.php:553 msgid "a photo" msgstr "einem Foto" -#: mod/photos.php:559 +#: mod/photos.php:553 #, php-format msgid "%1$s was tagged in %2$s by %3$s" msgstr "%1$s wurde von %3$s in %2$s getaggt" -#: mod/photos.php:642 mod/photos.php:645 mod/photos.php:672 +#: mod/photos.php:636 mod/photos.php:639 mod/photos.php:666 #: mod/wall_upload.php:201 src/Module/Settings/Profile/Photo/Index.php:60 #, php-format msgid "Image exceeds size limit of %s" msgstr "Bildgröße überschreitet das Limit von %s" -#: mod/photos.php:648 +#: mod/photos.php:642 msgid "Image upload didn't complete, please try again" msgstr "Der Upload des Bildes war nicht vollständig. Bitte versuche es erneut." -#: mod/photos.php:651 +#: mod/photos.php:645 msgid "Image file is missing" msgstr "Bilddatei konnte nicht gefunden werden." -#: mod/photos.php:656 +#: mod/photos.php:650 msgid "" "Server can't accept new file upload at this time, please contact your " "administrator" msgstr "Der Server kann derzeit keine neuen Datei-Uploads akzeptieren. Bitte kontaktiere deinen Administrator." -#: mod/photos.php:680 +#: mod/photos.php:674 msgid "Image file is empty." msgstr "Bilddatei ist leer." -#: mod/photos.php:695 mod/wall_upload.php:163 +#: mod/photos.php:689 mod/wall_upload.php:163 #: src/Module/Settings/Profile/Photo/Index.php:69 msgid "Unable to process image." msgstr "Konnte das Bild nicht bearbeiten." -#: mod/photos.php:721 mod/wall_upload.php:226 +#: mod/photos.php:715 mod/wall_upload.php:226 #: src/Module/Settings/Profile/Photo/Index.php:96 msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." -#: mod/photos.php:813 +#: mod/photos.php:807 msgid "No photos selected" msgstr "Keine Bilder ausgewählt" -#: mod/photos.php:882 +#: mod/photos.php:876 msgid "Access to this item is restricted." msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt." -#: mod/photos.php:937 +#: mod/photos.php:931 msgid "Upload Photos" msgstr "Bilder hochladen" -#: mod/photos.php:941 mod/photos.php:1027 +#: mod/photos.php:935 mod/photos.php:1021 msgid "New album name: " msgstr "Name des neuen Albums: " -#: mod/photos.php:942 +#: mod/photos.php:936 msgid "or select existing album:" msgstr "oder wähle ein bestehendes Album:" -#: mod/photos.php:943 +#: mod/photos.php:937 msgid "Do not show a status post for this upload" msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" -#: mod/photos.php:1008 +#: mod/photos.php:1002 msgid "Do you really want to delete this photo album and all its photos?" msgstr "Möchtest du wirklich dieses Foto-Album und all seine Foto löschen?" -#: mod/photos.php:1009 mod/photos.php:1032 +#: mod/photos.php:1003 mod/photos.php:1026 msgid "Delete Album" msgstr "Album löschen" -#: mod/photos.php:1036 +#: mod/photos.php:1030 msgid "Edit Album" msgstr "Album bearbeiten" -#: mod/photos.php:1037 +#: mod/photos.php:1031 msgid "Drop Album" msgstr "Album löschen" -#: mod/photos.php:1041 +#: mod/photos.php:1035 msgid "Show Newest First" msgstr "Zeige neueste zuerst" -#: mod/photos.php:1043 +#: mod/photos.php:1037 msgid "Show Oldest First" msgstr "Zeige älteste zuerst" -#: mod/photos.php:1064 mod/photos.php:1575 +#: mod/photos.php:1058 mod/photos.php:1569 msgid "View Photo" msgstr "Foto betrachten" -#: mod/photos.php:1097 +#: mod/photos.php:1091 msgid "Permission denied. Access to this item may be restricted." msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein." -#: mod/photos.php:1099 +#: mod/photos.php:1093 msgid "Photo not available" msgstr "Foto nicht verfügbar" -#: mod/photos.php:1109 +#: mod/photos.php:1103 msgid "Do you really want to delete this photo?" msgstr "Möchtest du wirklich dieses Foto löschen?" -#: mod/photos.php:1110 mod/photos.php:1302 +#: mod/photos.php:1104 mod/photos.php:1296 msgid "Delete Photo" msgstr "Foto löschen" -#: mod/photos.php:1202 +#: mod/photos.php:1196 msgid "View photo" msgstr "Fotos ansehen" -#: mod/photos.php:1204 +#: mod/photos.php:1198 msgid "Edit photo" msgstr "Foto bearbeiten" -#: mod/photos.php:1205 +#: mod/photos.php:1199 msgid "Delete photo" msgstr "Foto löschen" -#: mod/photos.php:1206 +#: mod/photos.php:1200 msgid "Use as profile photo" msgstr "Als Profilbild verwenden" -#: mod/photos.php:1213 +#: mod/photos.php:1207 msgid "Private Photo" msgstr "Privates Foto" -#: mod/photos.php:1219 +#: mod/photos.php:1213 msgid "View Full Size" msgstr "Betrachte Originalgröße" -#: mod/photos.php:1270 +#: mod/photos.php:1264 msgid "Tags: " msgstr "Tags: " -#: mod/photos.php:1273 +#: mod/photos.php:1267 msgid "[Select tags to remove]" msgstr "[Zu entfernende Tags auswählen]" -#: mod/photos.php:1288 +#: mod/photos.php:1282 msgid "New album name" msgstr "Name des neuen Albums" -#: mod/photos.php:1289 +#: mod/photos.php:1283 msgid "Caption" msgstr "Bildunterschrift" -#: mod/photos.php:1290 +#: mod/photos.php:1284 msgid "Add a Tag" msgstr "Tag hinzufügen" -#: mod/photos.php:1290 +#: mod/photos.php:1284 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: mod/photos.php:1291 +#: mod/photos.php:1285 msgid "Do not rotate" msgstr "Nicht rotieren" -#: mod/photos.php:1292 +#: mod/photos.php:1286 msgid "Rotate CW (right)" msgstr "Drehen US (rechts)" -#: mod/photos.php:1293 +#: mod/photos.php:1287 msgid "Rotate CCW (left)" msgstr "Drehen EUS (links)" -#: mod/photos.php:1339 mod/photos.php:1395 mod/photos.php:1469 +#: mod/photos.php:1333 mod/photos.php:1389 mod/photos.php:1463 #: src/Module/Contact.php:544 src/Module/Item/Compose.php:160 #: src/Object/Post.php:985 msgid "This is you" msgstr "Das bist du" -#: mod/photos.php:1341 mod/photos.php:1397 mod/photos.php:1471 +#: mod/photos.php:1335 mod/photos.php:1391 mod/photos.php:1465 #: src/Object/Post.php:522 src/Object/Post.php:987 msgid "Comment" msgstr "Kommentar" -#: mod/photos.php:1430 src/Content/Conversation.php:628 +#: mod/photos.php:1424 src/Content/Conversation.php:628 #: src/Object/Post.php:247 msgid "Select" msgstr "Auswählen" -#: mod/photos.php:1431 mod/settings.php:350 src/Content/Conversation.php:629 +#: mod/photos.php:1425 mod/settings.php:350 src/Content/Conversation.php:629 #: src/Module/Admin/Users/Active.php:139 #: src/Module/Admin/Users/Blocked.php:140 src/Module/Admin/Users/Index.php:153 msgid "Delete" msgstr "Löschen" -#: mod/photos.php:1492 src/Object/Post.php:369 +#: mod/photos.php:1486 src/Object/Post.php:369 msgid "Like" msgstr "Mag ich" -#: mod/photos.php:1493 src/Object/Post.php:369 +#: mod/photos.php:1487 src/Object/Post.php:369 msgid "I like this (toggle)" msgstr "Ich mag das (toggle)" -#: mod/photos.php:1494 src/Object/Post.php:370 +#: mod/photos.php:1488 src/Object/Post.php:370 msgid "Dislike" msgstr "Mag ich nicht" -#: mod/photos.php:1496 src/Object/Post.php:370 +#: mod/photos.php:1490 src/Object/Post.php:370 msgid "I don't like this (toggle)" msgstr "Ich mag das nicht (toggle)" -#: mod/photos.php:1518 +#: mod/photos.php:1512 msgid "Map" msgstr "Karte" -#: mod/photos.php:1581 +#: mod/photos.php:1575 msgid "View Album" msgstr "Album betrachten" @@ -1167,36 +1167,36 @@ msgstr "Ungültige Anfrage." msgid "Contact not found." msgstr "Kontakt nicht gefunden." -#: mod/removeme.php:63 src/Navigation/Notifications/Repository/Notify.php:482 +#: mod/removeme.php:65 src/Navigation/Notifications/Repository/Notify.php:482 msgid "[Friendica System Notify]" msgstr "[Friendica-Systembenachrichtigung]" -#: mod/removeme.php:63 +#: mod/removeme.php:65 msgid "User deleted their account" msgstr "Gelöschter Nutzeraccount" -#: mod/removeme.php:64 +#: mod/removeme.php:66 msgid "" "On your Friendica node an user deleted their account. Please ensure that " "their data is removed from the backups." msgstr "Ein Nutzer deiner Friendica-Instanz hat seinen Account gelöscht. Bitte stelle sicher, dass dessen Daten aus deinen Backups entfernt werden." -#: mod/removeme.php:65 +#: mod/removeme.php:67 #, php-format msgid "The user id is %d" msgstr "Die ID des Users lautet %d" -#: mod/removeme.php:99 mod/removeme.php:102 +#: mod/removeme.php:101 mod/removeme.php:104 msgid "Remove My Account" msgstr "Konto löschen" -#: mod/removeme.php:100 +#: mod/removeme.php:102 msgid "" "This will completely remove your account. Once this has been done it is not " "recoverable." msgstr "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen." -#: mod/removeme.php:101 +#: mod/removeme.php:103 msgid "Please enter your password for verification:" msgstr "Bitte gib dein Passwort zur Verifikation ein:" @@ -1244,7 +1244,7 @@ msgstr "Autorisierung entziehen" #: mod/settings.php:352 src/Module/Admin/Addons/Index.php:69 #: src/Module/Admin/Features.php:87 src/Module/Admin/Logs/Settings.php:81 #: src/Module/Admin/Site.php:434 src/Module/Admin/Themes/Index.php:113 -#: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:532 +#: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:559 #: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:193 msgid "Save Settings" msgstr "Einstellungen speichern" @@ -1689,53 +1689,58 @@ msgstr "Der Kontakt wurde von diesem Knoten geblockt" msgid "%d %s, %d duplicates." msgstr "%d %s, Duplikat %d." -#: src/Console/MergeContacts.php:86 +#: src/Console/MergeContacts.php:77 +#, php-format +msgid "uri-id is empty for contact %s." +msgstr "URI-ID ist leer für den Kontakt %s." + +#: src/Console/MergeContacts.php:90 #, php-format msgid "No valid first countact found for uri-id %d." msgstr "Es wurde kein gültiger erster Kontakt für die URI-ID %d gefunden." -#: src/Console/MergeContacts.php:97 +#: src/Console/MergeContacts.php:101 #, php-format msgid "Wrong duplicate found for uri-id %d in %d (url: %s != %s)." -msgstr "Falsches Dublikat for die URI-ID %d in %d gefunden (URI: %s != %s)." +msgstr "Falsches Dublikat für die URI-ID %d in %d gefunden (URI: %s != %s)." -#: src/Console/MergeContacts.php:101 +#: src/Console/MergeContacts.php:105 #, php-format msgid "Wrong duplicate found for uri-id %d in %d (nurl: %s != %s)." msgstr "Falsches Dublikat für die URI-ID %d in %d (nurl: %s != %s)." -#: src/Console/MergeContacts.php:137 +#: src/Console/MergeContacts.php:141 #, php-format msgid "Deletion of id %d failed" msgstr "Löschung der ID %d fehlgeschlagen" -#: src/Console/MergeContacts.php:139 +#: src/Console/MergeContacts.php:143 #, php-format msgid "Deletion of id %d was successful" msgstr "Löschug der ID %d war erfolgreich" -#: src/Console/MergeContacts.php:145 +#: src/Console/MergeContacts.php:149 #, php-format msgid "Updating \"%s\" in \"%s\" from %d to %d" msgstr "Aktualisieren \"%s\" nach \"%s\" von %d nach %d" -#: src/Console/MergeContacts.php:147 +#: src/Console/MergeContacts.php:151 msgid " - found" msgstr "- gefunden" -#: src/Console/MergeContacts.php:154 +#: src/Console/MergeContacts.php:158 msgid " - failed" msgstr "- fehlgeschlagen" -#: src/Console/MergeContacts.php:156 +#: src/Console/MergeContacts.php:160 msgid " - success" msgstr "- Erfolg" -#: src/Console/MergeContacts.php:160 +#: src/Console/MergeContacts.php:164 msgid " - deleted" msgstr "- gelöscht" -#: src/Console/MergeContacts.php:163 +#: src/Console/MergeContacts.php:167 msgid " - done" msgstr "- erledigt" @@ -1797,11 +1802,11 @@ msgstr "Spitzname angeben:" msgid "Enter new password: " msgstr "Neues Passwort eingeben:" -#: src/Console/User.php:210 src/Module/Settings/Account.php:73 +#: src/Console/User.php:210 src/Module/Settings/Account.php:74 msgid "Password update failed. Please try again." msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal." -#: src/Console/User.php:213 src/Module/Settings/Account.php:76 +#: src/Console/User.php:213 src/Module/Settings/Account.php:77 msgid "Password changed." msgstr "Passwort geändert." @@ -2694,7 +2699,7 @@ msgstr "lade weitere Einträge..." msgid "The end" msgstr "Das Ende" -#: src/Content/Text/HTML.php:875 src/Content/Widget/VCard.php:103 +#: src/Content/Text/HTML.php:875 src/Content/Widget/VCard.php:109 #: src/Model/Profile.php:456 msgid "Follow" msgstr "Folge" @@ -2821,7 +2826,7 @@ msgstr "Organisationen" msgid "News" msgstr "Nachrichten" -#: src/Content/Widget.php:525 src/Module/Settings/Account.php:430 +#: src/Content/Widget.php:525 src/Module/Settings/Account.php:455 msgid "Account Types" msgstr "Kontenarten" @@ -2875,22 +2880,22 @@ msgstr[1] "Trending Tags (%d Stunden)" msgid "More Trending Tags" msgstr "mehr Trending Tags" -#: src/Content/Widget/VCard.php:96 src/Model/Profile.php:375 +#: src/Content/Widget/VCard.php:102 src/Model/Profile.php:375 #: src/Module/Contact/Profile.php:371 src/Module/Profile/Profile.php:176 msgid "XMPP:" msgstr "XMPP:" -#: src/Content/Widget/VCard.php:97 src/Model/Profile.php:376 +#: src/Content/Widget/VCard.php:103 src/Model/Profile.php:376 #: src/Module/Contact/Profile.php:373 src/Module/Profile/Profile.php:180 msgid "Matrix:" msgstr "Matrix:" -#: src/Content/Widget/VCard.php:101 src/Model/Profile.php:468 +#: src/Content/Widget/VCard.php:107 src/Model/Profile.php:468 #: src/Module/Notifications/Introductions.php:199 msgid "Network:" msgstr "Netzwerk:" -#: src/Content/Widget/VCard.php:105 src/Model/Profile.php:458 +#: src/Content/Widget/VCard.php:111 src/Model/Profile.php:458 msgid "Unfollow" msgstr "Entfolgen" @@ -3878,7 +3883,7 @@ msgstr "%s (%d Stimmen)" #: src/Model/Item.php:3221 #, php-format msgid "%d voters. Poll end: %s" -msgstr "%d Wähler, Abstimmung endet: %s" +msgstr "%d Stimmen, Abstimmung endet: %s" #: src/Model/Item.php:3223 #, php-format @@ -4401,19 +4406,19 @@ msgstr "Gelöscht" msgid "List of pending user deletions" msgstr "Liste der auf Löschung wartenden Benutzer" -#: src/Module/Admin/BaseUsers.php:100 src/Module/Settings/Account.php:468 +#: src/Module/Admin/BaseUsers.php:100 src/Module/Settings/Account.php:493 msgid "Normal Account Page" msgstr "Normales Konto" -#: src/Module/Admin/BaseUsers.php:101 src/Module/Settings/Account.php:475 +#: src/Module/Admin/BaseUsers.php:101 src/Module/Settings/Account.php:500 msgid "Soapbox Page" msgstr "Marktschreier-Konto" -#: src/Module/Admin/BaseUsers.php:102 src/Module/Settings/Account.php:482 +#: src/Module/Admin/BaseUsers.php:102 src/Module/Settings/Account.php:507 msgid "Public Forum" msgstr "Öffentliches Forum" -#: src/Module/Admin/BaseUsers.php:103 src/Module/Settings/Account.php:489 +#: src/Module/Admin/BaseUsers.php:103 src/Module/Settings/Account.php:514 msgid "Automatic Friend Page" msgstr "Automatische Freunde-Seite" @@ -4421,19 +4426,19 @@ msgstr "Automatische Freunde-Seite" msgid "Private Forum" msgstr "Privates Forum" -#: src/Module/Admin/BaseUsers.php:107 src/Module/Settings/Account.php:440 +#: src/Module/Admin/BaseUsers.php:107 src/Module/Settings/Account.php:465 msgid "Personal Page" msgstr "Persönliche Seite" -#: src/Module/Admin/BaseUsers.php:108 src/Module/Settings/Account.php:447 +#: src/Module/Admin/BaseUsers.php:108 src/Module/Settings/Account.php:472 msgid "Organisation Page" msgstr "Organisationsseite" -#: src/Module/Admin/BaseUsers.php:109 src/Module/Settings/Account.php:454 +#: src/Module/Admin/BaseUsers.php:109 src/Module/Settings/Account.php:479 msgid "News Page" msgstr "Nachrichtenseite" -#: src/Module/Admin/BaseUsers.php:110 src/Module/Settings/Account.php:461 +#: src/Module/Admin/BaseUsers.php:110 src/Module/Settings/Account.php:486 msgid "Community Forum" msgstr "Gemeinschaftsforum" @@ -8280,7 +8285,7 @@ msgid "" "class=\"btn btn-sm pull-right\">Cancel" msgstr "Du betrachtest dein Profil gerade als %s Abbrechen" -#: src/Module/Profile/Profile.php:144 src/Module/Settings/Account.php:548 +#: src/Module/Profile/Profile.php:144 src/Module/Settings/Account.php:575 msgid "Full Name:" msgstr "Kompletter Name:" @@ -8410,7 +8415,7 @@ msgstr "Deine E-Mail Adresse (Informationen zur Registrierung werden an diese Ad msgid "Please repeat your e-mail address:" msgstr "Bitte wiederhole deine E-Mail Adresse" -#: src/Module/Register.php:162 src/Module/Settings/Account.php:539 +#: src/Module/Register.php:162 src/Module/Settings/Account.php:566 msgid "New Password:" msgstr "Neues Passwort:" @@ -8418,7 +8423,7 @@ msgstr "Neues Passwort:" msgid "Leave empty for an auto generated password." msgstr "Leer lassen, um das Passwort automatisch zu generieren." -#: src/Module/Register.php:163 src/Module/Settings/Account.php:540 +#: src/Module/Register.php:163 src/Module/Settings/Account.php:567 msgid "Confirm:" msgstr "Bestätigen:" @@ -8684,127 +8689,127 @@ msgstr "Dies ist das Gerät auf dem meine 2FA Authentifizierungs-App läuft." msgid "Verify code and complete login" msgstr "Code überprüfen und Anmeldung abschließen" -#: src/Module/Settings/Account.php:65 +#: src/Module/Settings/Account.php:66 msgid "Passwords do not match." msgstr "Die Passwörter stimmen nicht überein." -#: src/Module/Settings/Account.php:79 +#: src/Module/Settings/Account.php:80 msgid "Password unchanged." msgstr "Passwort unverändert." -#: src/Module/Settings/Account.php:94 +#: src/Module/Settings/Account.php:95 msgid "Please use a shorter name." msgstr "Bitte verwende einen kürzeren Namen." -#: src/Module/Settings/Account.php:97 +#: src/Module/Settings/Account.php:98 msgid "Name too short." msgstr "Der Name ist zu kurz." -#: src/Module/Settings/Account.php:106 +#: src/Module/Settings/Account.php:107 msgid "Wrong Password." msgstr "Falsches Passwort" -#: src/Module/Settings/Account.php:111 +#: src/Module/Settings/Account.php:112 msgid "Invalid email." msgstr "Ungültige E-Mail-Adresse." -#: src/Module/Settings/Account.php:117 +#: src/Module/Settings/Account.php:118 msgid "Cannot change to that email." msgstr "Ändern der E-Mail nicht möglich. " -#: src/Module/Settings/Account.php:147 src/Module/Settings/Account.php:199 -#: src/Module/Settings/Account.php:219 src/Module/Settings/Account.php:279 -#: src/Module/Settings/Account.php:328 +#: src/Module/Settings/Account.php:148 src/Module/Settings/Account.php:200 +#: src/Module/Settings/Account.php:220 src/Module/Settings/Account.php:304 +#: src/Module/Settings/Account.php:353 msgid "Settings were not updated." msgstr "Einstellungen nicht aktualisiert" -#: src/Module/Settings/Account.php:340 +#: src/Module/Settings/Account.php:365 msgid "Contact CSV file upload error" msgstr "Fehler beim Hochladen der Kontakt CSV Datei" -#: src/Module/Settings/Account.php:359 +#: src/Module/Settings/Account.php:384 msgid "Importing Contacts done" msgstr "Kontakte wurden importiert." -#: src/Module/Settings/Account.php:372 +#: src/Module/Settings/Account.php:397 msgid "Relocate message has been send to your contacts" msgstr "Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet." -#: src/Module/Settings/Account.php:389 +#: src/Module/Settings/Account.php:414 msgid "Unable to find your profile. Please contact your admin." msgstr "Konnte dein Profil nicht finden. Bitte kontaktiere den Admin." -#: src/Module/Settings/Account.php:431 +#: src/Module/Settings/Account.php:456 msgid "Personal Page Subtypes" msgstr "Unterarten der persönlichen Seite" -#: src/Module/Settings/Account.php:432 +#: src/Module/Settings/Account.php:457 msgid "Community Forum Subtypes" msgstr "Unterarten des Gemeinschaftsforums" -#: src/Module/Settings/Account.php:442 +#: src/Module/Settings/Account.php:467 msgid "Account for a personal profile." msgstr "Konto für ein persönliches Profil." -#: src/Module/Settings/Account.php:449 +#: src/Module/Settings/Account.php:474 msgid "" "Account for an organisation that automatically approves contact requests as " "\"Followers\"." msgstr "Konto für eine Organisation, das Kontaktanfragen automatisch als \"Follower\" annimmt." -#: src/Module/Settings/Account.php:456 +#: src/Module/Settings/Account.php:481 msgid "" "Account for a news reflector that automatically approves contact requests as" " \"Followers\"." msgstr "Konto für einen Feedspiegel, das Kontaktanfragen automatisch als \"Follower\" annimmt." -#: src/Module/Settings/Account.php:463 +#: src/Module/Settings/Account.php:488 msgid "Account for community discussions." msgstr "Konto für Diskussionsforen. " -#: src/Module/Settings/Account.php:470 +#: src/Module/Settings/Account.php:495 msgid "" "Account for a regular personal profile that requires manual approval of " "\"Friends\" and \"Followers\"." msgstr "Konto für ein normales, persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden." -#: src/Module/Settings/Account.php:477 +#: src/Module/Settings/Account.php:502 msgid "" "Account for a public profile that automatically approves contact requests as" " \"Followers\"." msgstr "Konto für ein öffentliches Profil, das Kontaktanfragen automatisch als \"Follower\" annimmt." -#: src/Module/Settings/Account.php:484 +#: src/Module/Settings/Account.php:509 msgid "Automatically approves all contact requests." msgstr "Bestätigt alle Kontaktanfragen automatisch." -#: src/Module/Settings/Account.php:491 +#: src/Module/Settings/Account.php:516 msgid "" "Account for a popular profile that automatically approves contact requests " "as \"Friends\"." msgstr "Konto für ein gefragtes Profil, das Kontaktanfragen automatisch als \"Friend\" annimmt." -#: src/Module/Settings/Account.php:496 +#: src/Module/Settings/Account.php:521 msgid "Private Forum [Experimental]" msgstr "Privates Forum [Versuchsstadium]" -#: src/Module/Settings/Account.php:498 +#: src/Module/Settings/Account.php:523 msgid "Requires manual approval of contact requests." msgstr "Kontaktanfragen müssen manuell bestätigt werden." -#: src/Module/Settings/Account.php:507 +#: src/Module/Settings/Account.php:532 msgid "OpenID:" msgstr "OpenID:" -#: src/Module/Settings/Account.php:507 +#: src/Module/Settings/Account.php:532 msgid "(Optional) Allow this OpenID to login to this account." msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID." -#: src/Module/Settings/Account.php:515 +#: src/Module/Settings/Account.php:540 msgid "Publish your profile in your local site directory?" msgstr "Darf dein Profil im lokalen Verzeichnis dieses Servers veröffentlicht werden?" -#: src/Module/Settings/Account.php:515 +#: src/Module/Settings/Account.php:540 #, php-format msgid "" "Your profile will be published in this node's local " @@ -8812,103 +8817,103 @@ msgid "" " system settings." msgstr "Dein Profil wird im lokalen Verzeichnis dieses Knotens veröffentlicht. Je nach Systemeinstellungen kann es öffentlich auffindbar sein." -#: src/Module/Settings/Account.php:521 +#: src/Module/Settings/Account.php:546 #, php-format msgid "" "Your profile will also be published in the global friendica directories " "(e.g. %s)." msgstr "Dein Profil wird auch in den globalen Friendica Verzeichnissen (z.B. %s) veröffentlicht werden." -#: src/Module/Settings/Account.php:529 +#: src/Module/Settings/Account.php:556 msgid "Account Settings" msgstr "Kontoeinstellungen" -#: src/Module/Settings/Account.php:530 +#: src/Module/Settings/Account.php:557 #, php-format msgid "Your Identity Address is '%s' or '%s'." msgstr "Die Adresse deines Profils lautet '%s' oder '%s'." -#: src/Module/Settings/Account.php:538 +#: src/Module/Settings/Account.php:565 msgid "Password Settings" msgstr "Passwort-Einstellungen" -#: src/Module/Settings/Account.php:539 +#: src/Module/Settings/Account.php:566 msgid "" "Allowed characters are a-z, A-Z, 0-9 and special characters except white " "spaces, accentuated letters and colon (:)." msgstr "Erlaubte Zeichen sind a-z, A-Z, 0-9 und Sonderzeichen, abgesehen von Leerzeichen, Doppelpunkten (:) und akzentuierten Buchstaben." -#: src/Module/Settings/Account.php:540 +#: src/Module/Settings/Account.php:567 msgid "Leave password fields blank unless changing" msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern" -#: src/Module/Settings/Account.php:541 +#: src/Module/Settings/Account.php:568 msgid "Current Password:" msgstr "Aktuelles Passwort:" -#: src/Module/Settings/Account.php:541 +#: src/Module/Settings/Account.php:568 msgid "Your current password to confirm the changes" msgstr "Dein aktuelles Passwort um die Änderungen zu bestätigen" -#: src/Module/Settings/Account.php:542 +#: src/Module/Settings/Account.php:569 msgid "Password:" msgstr "Passwort:" -#: src/Module/Settings/Account.php:542 +#: src/Module/Settings/Account.php:569 msgid "Your current password to confirm the changes of the email address" msgstr "Dein aktuelles Passwort um die Änderungen deiner E-Mail Adresse zu bestätigen" -#: src/Module/Settings/Account.php:545 +#: src/Module/Settings/Account.php:572 msgid "Delete OpenID URL" msgstr "OpenID URL löschen" -#: src/Module/Settings/Account.php:547 +#: src/Module/Settings/Account.php:574 msgid "Basic Settings" msgstr "Grundeinstellungen" -#: src/Module/Settings/Account.php:549 +#: src/Module/Settings/Account.php:576 msgid "Email Address:" msgstr "E-Mail-Adresse:" -#: src/Module/Settings/Account.php:550 +#: src/Module/Settings/Account.php:577 msgid "Your Timezone:" msgstr "Deine Zeitzone:" -#: src/Module/Settings/Account.php:551 +#: src/Module/Settings/Account.php:578 msgid "Your Language:" msgstr "Deine Sprache:" -#: src/Module/Settings/Account.php:551 +#: src/Module/Settings/Account.php:578 msgid "" "Set the language we use to show you friendica interface and to send you " "emails" msgstr "Wähle die Sprache, in der wir dir die Friendica-Oberfläche präsentieren sollen und dir E-Mail schicken" -#: src/Module/Settings/Account.php:552 +#: src/Module/Settings/Account.php:579 msgid "Default Post Location:" msgstr "Standardstandort:" -#: src/Module/Settings/Account.php:553 +#: src/Module/Settings/Account.php:580 msgid "Use Browser Location:" msgstr "Standort des Browsers verwenden:" -#: src/Module/Settings/Account.php:555 +#: src/Module/Settings/Account.php:582 msgid "Security and Privacy Settings" msgstr "Sicherheits- und Privatsphäre-Einstellungen" -#: src/Module/Settings/Account.php:557 +#: src/Module/Settings/Account.php:584 msgid "Maximum Friend Requests/Day:" msgstr "Maximale Anzahl von Kontaktanfragen/Tag:" -#: src/Module/Settings/Account.php:557 src/Module/Settings/Account.php:567 +#: src/Module/Settings/Account.php:584 src/Module/Settings/Account.php:594 msgid "(to prevent spam abuse)" msgstr "(um SPAM zu vermeiden)" -#: src/Module/Settings/Account.php:559 +#: src/Module/Settings/Account.php:586 msgid "Allow your profile to be searchable globally?" msgstr "Darf dein Profil bei Suchanfragen gefunden werden?" -#: src/Module/Settings/Account.php:559 +#: src/Module/Settings/Account.php:586 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 " @@ -8916,43 +8921,43 @@ msgid "" "indexed or not." msgstr "Aktiviere diese Einstellung, wenn du von anderen einfach gefunden und gefolgt werden möchtest. Dei Profil wird dann auf anderen Systemen leicht durchsuchbar. Außerdem regelt diese Einstellung ob Friendica Suchmaschinen mitteilen soll, ob dein Profil indiziert werden soll oder nicht." -#: src/Module/Settings/Account.php:560 +#: src/Module/Settings/Account.php:587 msgid "Hide your contact/friend list from viewers of your profile?" msgstr "Liste der Kontakte vor Betrachtern des Profil verbergen?" -#: src/Module/Settings/Account.php:560 +#: src/Module/Settings/Account.php:587 msgid "" "A list of your contacts is displayed on your profile page. Activate this " "option to disable the display of your contact list." msgstr "Auf deiner Profilseite wird eine Liste deiner Kontakte angezeigt. Aktiviere diese Option wenn du das nicht möchtest." -#: src/Module/Settings/Account.php:561 +#: src/Module/Settings/Account.php:588 msgid "Hide your profile details from anonymous viewers?" msgstr "Profil-Details vor unbekannten Betrachtern verbergen?" -#: src/Module/Settings/Account.php:561 +#: src/Module/Settings/Account.php:588 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 "Anonyme Besucher deines Profils werden ausschließlich dein Profilbild, deinen Namen sowie deinen Spitznamen sehen. Deine öffentlichen Beiträge und Kommentare werden weiterhin sichtbar sein." -#: src/Module/Settings/Account.php:562 +#: src/Module/Settings/Account.php:589 msgid "Make public posts unlisted" msgstr "Öffentliche Beiträge nicht listen" -#: src/Module/Settings/Account.php:562 +#: src/Module/Settings/Account.php:589 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 "Deine öffentlichen Beiträge werden nicht auf der Gemeinschaftsseite oder in den Suchergebnissen erscheinen, außerdem werden sie nicht an Relay-Server geschickt. Sie werden aber weiterhin in allen öffentlichen Feeds, auch auf entfernten Servern, erscheinen." -#: src/Module/Settings/Account.php:563 +#: src/Module/Settings/Account.php:590 msgid "Make all posted pictures accessible" msgstr "Alle geposteten Bilder zugreifbar machen" -#: src/Module/Settings/Account.php:563 +#: src/Module/Settings/Account.php:590 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 " @@ -8960,213 +8965,237 @@ msgid "" "public on your photo albums though." msgstr "Diese Option macht jedes veröffentlichte Bild über den direkten Link zugänglich. Dies ist eine Problemumgehung für das Problem, dass die meisten anderen Netzwerke keine Berechtigungen für Bilder verarbeiten können. Nicht öffentliche Bilder sind in Ihren Fotoalben jedoch immer noch nicht für die Öffentlichkeit sichtbar." -#: src/Module/Settings/Account.php:564 +#: src/Module/Settings/Account.php:591 msgid "Allow friends to post to your profile page?" msgstr "Dürfen deine Kontakte auf deine Pinnwand schreiben?" -#: src/Module/Settings/Account.php:564 +#: src/Module/Settings/Account.php:591 msgid "" "Your contacts may write posts on your profile wall. These posts will be " "distributed to your contacts" msgstr "Deine Kontakte können Beiträge auf deiner Pinnwand hinterlassen. Diese werden an deine Kontakte verteilt." -#: src/Module/Settings/Account.php:565 +#: src/Module/Settings/Account.php:592 msgid "Allow friends to tag your posts?" msgstr "Dürfen deine Kontakte deine Beiträge mit Schlagwörtern versehen?" -#: src/Module/Settings/Account.php:565 +#: src/Module/Settings/Account.php:592 msgid "Your contacts can add additional tags to your posts." msgstr "Deine Kontakte dürfen deine Beiträge mit zusätzlichen Schlagworten versehen." -#: src/Module/Settings/Account.php:566 +#: src/Module/Settings/Account.php:593 msgid "Permit unknown people to send you private mail?" msgstr "Dürfen dir Unbekannte private Nachrichten schicken?" -#: src/Module/Settings/Account.php:566 +#: src/Module/Settings/Account.php:593 msgid "" "Friendica network users may send you private messages even if they are not " "in your contact list." msgstr "Nutzer des Friendica Netzwerks können dir private Nachrichten senden, selbst wenn sie nicht in deine Kontaktliste sind." -#: src/Module/Settings/Account.php:567 +#: src/Module/Settings/Account.php:594 msgid "Maximum private messages per day from unknown people:" msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:" -#: src/Module/Settings/Account.php:569 +#: src/Module/Settings/Account.php:596 msgid "Default Post Permissions" msgstr "Standard-Zugriffsrechte für Beiträge" -#: src/Module/Settings/Account.php:573 +#: src/Module/Settings/Account.php:600 msgid "Expiration settings" msgstr "Verfalls-Einstellungen" -#: src/Module/Settings/Account.php:574 +#: src/Module/Settings/Account.php:601 msgid "Automatically expire posts after this many days:" msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:" -#: src/Module/Settings/Account.php:574 +#: src/Module/Settings/Account.php:601 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "Wenn leer, verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht." -#: src/Module/Settings/Account.php:575 +#: src/Module/Settings/Account.php:602 msgid "Expire posts" msgstr "Beiträge verfallen lassen" -#: src/Module/Settings/Account.php:575 +#: src/Module/Settings/Account.php:602 msgid "When activated, posts and comments will be expired." msgstr "Ist dies aktiviert, werden Beiträge und Kommentare verfallen." -#: src/Module/Settings/Account.php:576 +#: src/Module/Settings/Account.php:603 msgid "Expire personal notes" msgstr "Persönliche Notizen verfallen lassen" -#: src/Module/Settings/Account.php:576 +#: src/Module/Settings/Account.php:603 msgid "" "When activated, the personal notes on your profile page will be expired." msgstr "Ist dies aktiviert, werden persönliche Notizen auf deiner Pinnwand verfallen." -#: src/Module/Settings/Account.php:577 +#: src/Module/Settings/Account.php:604 msgid "Expire starred posts" msgstr "Markierte Beiträge verfallen lassen" -#: src/Module/Settings/Account.php:577 +#: src/Module/Settings/Account.php:604 msgid "" "Starring posts keeps them from being expired. That behaviour is overwritten " "by this setting." msgstr "Markierte Beiträge verfallen eigentlich nicht. Mit dieser Option kannst du sie verfallen lassen." -#: src/Module/Settings/Account.php:578 +#: src/Module/Settings/Account.php:605 msgid "Only expire posts by others" msgstr "Nur Beiträge anderer verfallen lassen." -#: src/Module/Settings/Account.php:578 +#: src/Module/Settings/Account.php:605 msgid "" "When activated, your own posts never expire. Then the settings above are " "only valid for posts you received." msgstr "Wenn aktiviert werden deine eigenen Beiträge niemals verfallen. Die obigen Einstellungen betreffen dann ausschließlich die Beiträge von anderen Accounts." -#: src/Module/Settings/Account.php:581 +#: src/Module/Settings/Account.php:608 msgid "Notification Settings" msgstr "Benachrichtigungseinstellungen" -#: src/Module/Settings/Account.php:582 +#: src/Module/Settings/Account.php:609 msgid "Send a notification email when:" msgstr "Benachrichtigungs-E-Mail senden, wenn:" -#: src/Module/Settings/Account.php:583 +#: src/Module/Settings/Account.php:610 msgid "You receive an introduction" msgstr "– du eine Kontaktanfrage erhältst" -#: src/Module/Settings/Account.php:584 +#: src/Module/Settings/Account.php:611 msgid "Your introductions are confirmed" msgstr "– eine Deiner Kontaktanfragen akzeptiert wurde" -#: src/Module/Settings/Account.php:585 +#: src/Module/Settings/Account.php:612 msgid "Someone writes on your profile wall" msgstr "– jemand etwas auf Deine Pinnwand schreibt" -#: src/Module/Settings/Account.php:586 +#: src/Module/Settings/Account.php:613 msgid "Someone writes a followup comment" msgstr "– jemand auch einen Kommentar verfasst" -#: src/Module/Settings/Account.php:587 +#: src/Module/Settings/Account.php:614 msgid "You receive a private message" msgstr "– du eine private Nachricht erhältst" -#: src/Module/Settings/Account.php:588 +#: src/Module/Settings/Account.php:615 msgid "You receive a friend suggestion" msgstr "– du eine Empfehlung erhältst" -#: src/Module/Settings/Account.php:589 +#: src/Module/Settings/Account.php:616 msgid "You are tagged in a post" msgstr "– du in einem Beitrag erwähnt wirst" -#: src/Module/Settings/Account.php:590 +#: src/Module/Settings/Account.php:617 msgid "You are poked/prodded/etc. in a post" msgstr "– du von jemandem angestupst oder sonstwie behandelt wirst" -#: src/Module/Settings/Account.php:592 +#: src/Module/Settings/Account.php:619 msgid "Create a desktop notification when:" msgstr "Benachrichtigungen anzeigen wenn:" -#: src/Module/Settings/Account.php:593 +#: src/Module/Settings/Account.php:620 +msgid "Someone tagged you" +msgstr "Dich jemand erwähnt" + +#: src/Module/Settings/Account.php:621 +msgid "Someone directly commented on your post" +msgstr "Jemand einen Beitrag von dir kommentiert hat" + +#: src/Module/Settings/Account.php:622 msgid "Someone liked your content" msgstr "Einer deiner Beiträge gemocht wurde" -#: src/Module/Settings/Account.php:594 +#: src/Module/Settings/Account.php:622 src/Module/Settings/Account.php:623 +msgid "Can only be enabled, when the direct comment notification is enabled." +msgstr "" + +#: src/Module/Settings/Account.php:623 msgid "Someone shared your content" msgstr "Einer deiner Beiträge geteilt wurde" -#: src/Module/Settings/Account.php:596 +#: src/Module/Settings/Account.php:624 +msgid "Someone commented in your thread" +msgstr "" + +#: src/Module/Settings/Account.php:625 +msgid "Someone commented in a thread where you commented" +msgstr "Jemand in einer Unterhaltung kommentiert hat, in der du auch kommentiert hast" + +#: src/Module/Settings/Account.php:626 +msgid "Someone commented in a thread where you interacted" +msgstr "" + +#: src/Module/Settings/Account.php:628 msgid "Activate desktop notifications" msgstr "Desktop-Benachrichtigungen einschalten" -#: src/Module/Settings/Account.php:596 +#: src/Module/Settings/Account.php:628 msgid "Show desktop popup on new notifications" msgstr "Desktop-Benachrichtigungen einschalten" -#: src/Module/Settings/Account.php:600 +#: src/Module/Settings/Account.php:632 msgid "Text-only notification emails" msgstr "Benachrichtigungs-E-Mail als Rein-Text." -#: src/Module/Settings/Account.php:602 +#: src/Module/Settings/Account.php:634 msgid "Send text only notification emails, without the html part" msgstr "Sende Benachrichtigungs-E-Mail als Rein-Text - ohne HTML-Teil" -#: src/Module/Settings/Account.php:606 +#: src/Module/Settings/Account.php:638 msgid "Show detailled notifications" msgstr "Detaillierte Benachrichtigungen anzeigen" -#: src/Module/Settings/Account.php:608 +#: src/Module/Settings/Account.php:640 msgid "" "Per default, notifications are condensed to a single notification per item. " "When enabled every notification is displayed." msgstr "Normalerweise werden alle Benachrichtigungen zu einem Thema in einer einzigen Benachrichtigung zusammengefasst. Wenn diese Option aktiviert ist, wird jede Benachrichtigung einzeln angezeigt." -#: src/Module/Settings/Account.php:612 +#: src/Module/Settings/Account.php:644 msgid "Show notifications of ignored contacts" msgstr "Zeige Benachrichtigungen von ignorierten Kontakten" -#: src/Module/Settings/Account.php:614 +#: src/Module/Settings/Account.php:646 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 "Beiträge von ignorierten Kontakten werden dir nicht angezeigt. Aber du siehst immer noch ihre Kommentare. Diese Einstellung legt fest, ob du dazu weiterhin Benachrichtigungen erhalten willst oder ob diese einfach verworfen werden sollen." -#: src/Module/Settings/Account.php:617 +#: src/Module/Settings/Account.php:649 msgid "Advanced Account/Page Type Settings" msgstr "Erweiterte Konto-/Seitentyp-Einstellungen" -#: src/Module/Settings/Account.php:618 +#: src/Module/Settings/Account.php:650 msgid "Change the behaviour of this account for special situations" msgstr "Verhalten dieses Kontos in bestimmten Situationen:" -#: src/Module/Settings/Account.php:621 +#: src/Module/Settings/Account.php:653 msgid "Import Contacts" msgstr "Kontakte Importieren" -#: src/Module/Settings/Account.php:622 +#: src/Module/Settings/Account.php:654 msgid "" "Upload a CSV file that contains the handle of your followed accounts in the " "first column you exported from the old account." msgstr "Lade eine CSV Datei hoch, die das Handle der Kontakte deines alten Nutzerkontos in der ersten Spalte enthält." -#: src/Module/Settings/Account.php:623 +#: src/Module/Settings/Account.php:655 msgid "Upload File" msgstr "Datei hochladen" -#: src/Module/Settings/Account.php:626 +#: src/Module/Settings/Account.php:658 msgid "Relocate" msgstr "Umziehen" -#: src/Module/Settings/Account.php:627 +#: src/Module/Settings/Account.php:659 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 "Wenn du dein Profil von einem anderen Server umgezogen hast und einige deiner Kontakte deine Beiträge nicht erhalten, verwende diesen Button." -#: src/Module/Settings/Account.php:628 +#: src/Module/Settings/Account.php:660 msgid "Resend relocate message to contacts" msgstr "Umzugsbenachrichtigung erneut an Kontakte senden" @@ -10174,132 +10203,132 @@ msgstr "Kontakt-/Freundschaftsanfrage" msgid "New Follower" msgstr "Neuer Bewunderer" -#: src/Navigation/Notifications/Factory/Notification.php:130 +#: src/Navigation/Notifications/Factory/Notification.php:134 #, php-format msgid "%1$s wants to follow you" msgstr "%1$s möchte dir folgen" -#: src/Navigation/Notifications/Factory/Notification.php:132 +#: src/Navigation/Notifications/Factory/Notification.php:136 #, php-format msgid "%1$s has started following you" msgstr "%1$s hat angefangen dir zu folgen" -#: src/Navigation/Notifications/Factory/Notification.php:196 +#: src/Navigation/Notifications/Factory/Notification.php:200 #, php-format msgid "%1$s liked your comment on %2$s" msgstr "%1$s mag deinen Kommentar %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:199 +#: src/Navigation/Notifications/Factory/Notification.php:203 #, php-format msgid "%1$s liked your post %2$s" msgstr "%1$s mag deinen Beitrag %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:206 +#: src/Navigation/Notifications/Factory/Notification.php:210 #, php-format msgid "%1$s disliked your comment on %2$s" msgstr "%1$s mag deinen Kommentar %2$s nicht" -#: src/Navigation/Notifications/Factory/Notification.php:209 +#: src/Navigation/Notifications/Factory/Notification.php:213 #, php-format msgid "%1$s disliked your post %2$s" msgstr "%1$s mag deinen Beitrag %2$s nicht" -#: src/Navigation/Notifications/Factory/Notification.php:216 +#: src/Navigation/Notifications/Factory/Notification.php:220 #, php-format msgid "%1$s shared your comment %2$s" msgstr "%1$s hat deinen Kommentar %2$s geteilt" -#: src/Navigation/Notifications/Factory/Notification.php:219 +#: src/Navigation/Notifications/Factory/Notification.php:223 #, php-format msgid "%1$s shared your post %2$s" msgstr "%1$s hat deinen Beitrag %2$s geteilt" -#: src/Navigation/Notifications/Factory/Notification.php:223 -#: src/Navigation/Notifications/Factory/Notification.php:292 +#: src/Navigation/Notifications/Factory/Notification.php:227 +#: src/Navigation/Notifications/Factory/Notification.php:297 #, php-format msgid "%1$s shared the post %2$s from %3$s" msgstr "%1$s hat den Beitrag %2$s von %3$s geteilt" -#: src/Navigation/Notifications/Factory/Notification.php:225 -#: src/Navigation/Notifications/Factory/Notification.php:294 +#: src/Navigation/Notifications/Factory/Notification.php:229 +#: src/Navigation/Notifications/Factory/Notification.php:299 #, php-format msgid "%1$s shared a post from %3$s" msgstr "%1$s hat einen Beitrag von %3$s geteilt" -#: src/Navigation/Notifications/Factory/Notification.php:227 -#: src/Navigation/Notifications/Factory/Notification.php:296 +#: src/Navigation/Notifications/Factory/Notification.php:231 +#: src/Navigation/Notifications/Factory/Notification.php:301 #, php-format msgid "%1$s shared the post %2$s" msgstr "%1$s hat den Beitrag %2$s geteilt" -#: src/Navigation/Notifications/Factory/Notification.php:229 -#: src/Navigation/Notifications/Factory/Notification.php:298 +#: src/Navigation/Notifications/Factory/Notification.php:233 +#: src/Navigation/Notifications/Factory/Notification.php:303 #, php-format msgid "%1$s shared a post" msgstr "%1$s hat einen Beitrag geteilt" -#: src/Navigation/Notifications/Factory/Notification.php:237 +#: src/Navigation/Notifications/Factory/Notification.php:241 #, php-format msgid "%1$s wants to attend your event %2$s" msgstr "%1$s möchte an deiner Veranstaltung %2$s teilnehmen" -#: src/Navigation/Notifications/Factory/Notification.php:244 +#: src/Navigation/Notifications/Factory/Notification.php:248 #, php-format msgid "%1$s does not want to attend your event %2$s" msgstr "%1$s möchte nicht an deiner Veranstaltung %2$s teilnehmen" -#: src/Navigation/Notifications/Factory/Notification.php:251 +#: src/Navigation/Notifications/Factory/Notification.php:255 #, php-format msgid "%1$s maybe wants to attend your event %2$s" msgstr "%1$s nimmt eventuell an deiner Veranstaltung %2$s teil" -#: src/Navigation/Notifications/Factory/Notification.php:258 +#: src/Navigation/Notifications/Factory/Notification.php:262 #, php-format msgid "%1$s tagged you on %2$s" msgstr "%1$s erwähnte dich auf %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:262 +#: src/Navigation/Notifications/Factory/Notification.php:266 #, php-format msgid "%1$s replied to you on %2$s" msgstr "%1$s hat dir auf %2$s geantwortet" -#: src/Navigation/Notifications/Factory/Notification.php:266 +#: src/Navigation/Notifications/Factory/Notification.php:270 #, php-format msgid "%1$s commented in your thread %2$s" msgstr "%1$s hat deine Unterhaltung %2$s kommentiert" -#: src/Navigation/Notifications/Factory/Notification.php:270 +#: src/Navigation/Notifications/Factory/Notification.php:274 #, php-format msgid "%1$s commented on your comment %2$s" msgstr "%1$s hat deinen Kommentar %2$s kommentiert" -#: src/Navigation/Notifications/Factory/Notification.php:276 +#: src/Navigation/Notifications/Factory/Notification.php:281 #, php-format msgid "%1$s commented in their thread %2$s" msgstr "%1$s hat in der eigenen Unterhaltung %2$s kommentiert" -#: src/Navigation/Notifications/Factory/Notification.php:278 +#: src/Navigation/Notifications/Factory/Notification.php:283 #, php-format msgid "%1$s commented in their thread" msgstr "%1$s kommentierte in der eigenen Unterhaltung" -#: src/Navigation/Notifications/Factory/Notification.php:280 +#: src/Navigation/Notifications/Factory/Notification.php:285 #, php-format msgid "%1$s commented in the thread %2$s from %3$s" msgstr "%1$s hat in der Unterhaltung %2$s von %3$s kommentiert" -#: src/Navigation/Notifications/Factory/Notification.php:282 +#: src/Navigation/Notifications/Factory/Notification.php:287 #, php-format msgid "%1$s commented in the thread from %3$s" msgstr "%1$s hat in der Unterhaltung von %3$s kommentiert" -#: src/Navigation/Notifications/Factory/Notification.php:287 +#: src/Navigation/Notifications/Factory/Notification.php:292 #, php-format msgid "%1$s commented on your thread %2$s" msgstr "%1$s hat in deiner Unterhaltung %2$s kommentiert" #: src/Navigation/Notifications/Repository/Notify.php:221 -#: src/Navigation/Notifications/Repository/Notify.php:724 +#: src/Navigation/Notifications/Repository/Notify.php:735 msgid "[Friendica:Notify]" msgstr "[Friendica Meldung]" @@ -10343,7 +10372,7 @@ msgid "%1$s commented on their %2$s %3$s" msgstr "%1$s hat den eigenen %2$s %3$s kommentiert" #: src/Navigation/Notifications/Repository/Notify.php:333 -#: src/Navigation/Notifications/Repository/Notify.php:758 +#: src/Navigation/Notifications/Repository/Notify.php:769 #, php-format msgid "%1$s Comment to conversation #%2$d by %3$s" msgstr "%1$sKommentar von %3$s auf Unterhaltung %2$d" @@ -10356,7 +10385,7 @@ msgstr "%s hat einen Beitrag kommentiert, dem du folgst." #: src/Navigation/Notifications/Repository/Notify.php:339 #: src/Navigation/Notifications/Repository/Notify.php:354 #: src/Navigation/Notifications/Repository/Notify.php:373 -#: src/Navigation/Notifications/Repository/Notify.php:773 +#: src/Navigation/Notifications/Repository/Notify.php:784 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren." @@ -10545,12 +10574,12 @@ msgstr "Kompletter Name: %s\nURL der Seite: %s\nLogin Name: %s(%s)" msgid "Please visit %s to approve or reject the request." msgstr "Bitte besuche %s, um die Anfrage zu bearbeiten." -#: src/Navigation/Notifications/Repository/Notify.php:752 +#: src/Navigation/Notifications/Repository/Notify.php:763 #, php-format msgid "%s %s tagged you" msgstr "%s %s hat dich erwähnt" -#: src/Navigation/Notifications/Repository/Notify.php:755 +#: src/Navigation/Notifications/Repository/Notify.php:766 #, php-format msgid "%s %s shared a new post" msgstr "%s%shat einen Beitrag geteilt" diff --git a/view/lang/de/strings.php b/view/lang/de/strings.php index 4300d9e1f..7c581c2df 100644 --- a/view/lang/de/strings.php +++ b/view/lang/de/strings.php @@ -413,8 +413,9 @@ $a->strings['The contact entries have been archived'] = 'Die Kontakteinträge wu $a->strings['Could not find any contact entry for this URL (%s)'] = 'Für die URL (%s) konnte kein Kontakt gefunden werden'; $a->strings['The contact has been blocked from the node'] = 'Der Kontakt wurde von diesem Knoten geblockt'; $a->strings['%d %s, %d duplicates.'] = '%d %s, Duplikat %d.'; +$a->strings['uri-id is empty for contact %s.'] = 'URI-ID ist leer für den Kontakt %s.'; $a->strings['No valid first countact found for uri-id %d.'] = 'Es wurde kein gültiger erster Kontakt für die URI-ID %d gefunden.'; -$a->strings['Wrong duplicate found for uri-id %d in %d (url: %s != %s).'] = 'Falsches Dublikat for die URI-ID %d in %d gefunden (URI: %s != %s).'; +$a->strings['Wrong duplicate found for uri-id %d in %d (url: %s != %s).'] = 'Falsches Dublikat für die URI-ID %d in %d gefunden (URI: %s != %s).'; $a->strings['Wrong duplicate found for uri-id %d in %d (nurl: %s != %s).'] = 'Falsches Dublikat für die URI-ID %d in %d (nurl: %s != %s).'; $a->strings['Deletion of id %d failed'] = 'Löschung der ID %d fehlgeschlagen'; $a->strings['Deletion of id %d was successful'] = 'Löschug der ID %d war erfolgreich'; @@ -929,7 +930,7 @@ $a->strings['Content warning: %s'] = 'Inhaltswarnung: %s'; $a->strings['bytes'] = 'Byte'; $a->strings['%s (%d%s, %d votes)'] = '%s (%d%s, %d Stimmen)'; $a->strings['%s (%d votes)'] = '%s (%d Stimmen)'; -$a->strings['%d voters. Poll end: %s'] = '%d Wähler, Abstimmung endet: %s'; +$a->strings['%d voters. Poll end: %s'] = '%d Stimmen, Abstimmung endet: %s'; $a->strings['%d voters.'] = '%d Stimmen.'; $a->strings['Poll end: %s'] = 'Abstimmung endet: %s'; $a->strings['View on separate page'] = 'Auf separater Seite ansehen'; @@ -2239,8 +2240,11 @@ $a->strings['You receive a friend suggestion'] = '– du eine Empfehlung erhält $a->strings['You are tagged in a post'] = '– du in einem Beitrag erwähnt wirst'; $a->strings['You are poked/prodded/etc. in a post'] = '– du von jemandem angestupst oder sonstwie behandelt wirst'; $a->strings['Create a desktop notification when:'] = 'Benachrichtigungen anzeigen wenn:'; +$a->strings['Someone tagged you'] = 'Dich jemand erwähnt'; +$a->strings['Someone directly commented on your post'] = 'Jemand einen Beitrag von dir kommentiert hat'; $a->strings['Someone liked your content'] = 'Einer deiner Beiträge gemocht wurde'; $a->strings['Someone shared your content'] = 'Einer deiner Beiträge geteilt wurde'; +$a->strings['Someone commented in a thread where you commented'] = 'Jemand in einer Unterhaltung kommentiert hat, in der du auch kommentiert hast'; $a->strings['Activate desktop notifications'] = 'Desktop-Benachrichtigungen einschalten'; $a->strings['Show desktop popup on new notifications'] = 'Desktop-Benachrichtigungen einschalten'; $a->strings['Text-only notification emails'] = 'Benachrichtigungs-E-Mail als Rein-Text.'; From 17877d9fd727322ec28d48cdb3452ae277263d9b Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 7 Jun 2022 06:32:01 +0200 Subject: [PATCH 4/4] update FR translations THX kalon33 --- view/lang/fr/messages.po | 568 ++++++++++++++++++++++----------------- view/lang/fr/strings.php | 19 ++ 2 files changed, 345 insertions(+), 242 deletions(-) diff --git a/view/lang/fr/messages.po b/view/lang/fr/messages.po index c44906639..dcdc7fdee 100644 --- a/view/lang/fr/messages.po +++ b/view/lang/fr/messages.po @@ -34,7 +34,7 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-31 13:27+0000\n" +"POT-Creation-Date: 2022-06-06 07:33+0000\n" "PO-Revision-Date: 2011-05-05 10:19+0000\n" "Last-Translator: Nicolas Derive, 2022\n" "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n" @@ -54,7 +54,7 @@ msgid "Access denied." msgstr "Accès refusé." #: mod/cal.php:63 mod/cal.php:80 mod/photos.php:69 mod/photos.php:140 -#: mod/photos.php:804 src/Model/Profile.php:231 src/Module/Feed.php:72 +#: mod/photos.php:798 src/Model/Profile.php:231 src/Module/Feed.php:72 #: src/Module/HCard.php:52 src/Module/Profile/Common.php:41 #: src/Module/Profile/Common.php:52 src/Module/Profile/Contacts.php:40 #: src/Module/Profile/Contacts.php:50 src/Module/Profile/Media.php:38 @@ -63,7 +63,7 @@ msgstr "Accès refusé." msgid "User not found." msgstr "Utilisateur introuvable." -#: mod/cal.php:122 mod/display.php:246 src/Module/Profile/Profile.php:94 +#: mod/cal.php:122 mod/display.php:247 src/Module/Profile/Profile.php:94 #: src/Module/Profile/Profile.php:109 src/Module/Profile/Status.php:110 #: src/Module/Update/Profile.php:56 msgid "Access to this profile has been restricted." @@ -130,24 +130,24 @@ msgstr "Rien à exporter" msgid "calendar" msgstr "calendrier" -#: mod/display.php:141 mod/photos.php:808 +#: mod/display.php:142 mod/photos.php:802 #: src/Module/Conversation/Community.php:175 src/Module/Directory.php:49 #: src/Module/Search/Index.php:50 msgid "Public access denied." msgstr "Accès public refusé." -#: mod/display.php:197 mod/display.php:271 +#: mod/display.php:198 mod/display.php:272 msgid "The requested item doesn't exist or has been deleted." msgstr "L'objet recherché n'existe pas ou a été supprimé." -#: mod/display.php:351 +#: mod/display.php:352 msgid "The feed for this item is unavailable." msgstr "Le flux pour cet objet n'est pas disponible." #: mod/editpost.php:38 mod/events.php:217 mod/follow.php:56 mod/follow.php:130 #: mod/item.php:181 mod/item.php:186 mod/item.php:875 mod/message.php:69 #: mod/message.php:111 mod/notes.php:44 mod/ostatus_subscribe.php:33 -#: mod/photos.php:160 mod/photos.php:897 mod/repair_ostatus.php:31 +#: mod/photos.php:160 mod/photos.php:891 mod/repair_ostatus.php:31 #: mod/settings.php:40 mod/settings.php:50 mod/settings.php:156 #: mod/suggest.php:34 mod/uimport.php:33 mod/unfollow.php:35 #: mod/unfollow.php:50 mod/unfollow.php:82 mod/wall_attach.php:67 @@ -164,8 +164,8 @@ msgstr "Le flux pour cet objet n'est pas disponible." #: src/Module/Profile/Schedule.php:39 src/Module/Profile/Schedule.php:56 #: src/Module/Register.php:77 src/Module/Register.php:90 #: src/Module/Register.php:206 src/Module/Register.php:245 -#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:48 -#: src/Module/Settings/Account.php:384 src/Module/Settings/Delegation.php:42 +#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:49 +#: src/Module/Settings/Account.php:409 src/Module/Settings/Delegation.php:42 #: src/Module/Settings/Delegation.php:70 src/Module/Settings/Display.php:42 #: src/Module/Settings/Display.php:120 #: src/Module/Settings/Profile/Photo/Crop.php:166 @@ -190,7 +190,7 @@ msgstr "Éditer la publication" msgid "Save" msgstr "Sauver" -#: mod/editpost.php:92 mod/photos.php:1344 src/Content/Conversation.php:338 +#: mod/editpost.php:92 mod/photos.php:1338 src/Content/Conversation.php:338 #: src/Module/Contact/Poke.php:176 src/Object/Post.php:989 msgid "Loading..." msgstr "Chargement en cours..." @@ -255,7 +255,7 @@ msgid "clear location" msgstr "supp. localisation" #: mod/editpost.php:107 mod/message.php:200 mod/message.php:358 -#: mod/photos.php:1495 mod/wallmessage.php:142 +#: mod/photos.php:1489 mod/wallmessage.php:142 #: src/Content/Conversation.php:368 src/Content/Conversation.php:712 #: src/Module/Item/Compose.php:177 src/Object/Post.php:528 msgid "Please wait" @@ -287,14 +287,14 @@ msgstr "Catégories (séparées par des virgules)" msgid "Example: bob@example.com, mary@example.com" msgstr "Exemple : bob@exemple.com, mary@exemple.com" -#: mod/editpost.php:128 mod/events.php:513 mod/photos.php:1343 -#: mod/photos.php:1399 mod/photos.php:1473 src/Content/Conversation.php:383 +#: mod/editpost.php:128 mod/events.php:513 mod/photos.php:1337 +#: mod/photos.php:1393 mod/photos.php:1467 src/Content/Conversation.php:383 #: src/Module/Item/Compose.php:172 src/Object/Post.php:999 msgid "Preview" msgstr "Aperçu" #: mod/editpost.php:130 mod/fbrowser.php:118 mod/fbrowser.php:145 -#: mod/follow.php:144 mod/photos.php:1010 mod/photos.php:1111 mod/tagrm.php:35 +#: mod/follow.php:144 mod/photos.php:1004 mod/photos.php:1105 mod/tagrm.php:35 #: mod/tagrm.php:127 mod/unfollow.php:97 src/Content/Conversation.php:386 #: src/Module/Contact/Revoke.php:108 src/Module/RemoteFollow.php:127 msgid "Cancel" @@ -336,7 +336,7 @@ msgid "Link or Media" msgstr "Lien ou média" #: mod/editpost.php:143 src/Content/Conversation.php:393 -#: src/Content/Widget/VCard.php:107 src/Model/Profile.php:462 +#: src/Content/Widget/VCard.php:113 src/Model/Profile.php:462 #: src/Module/Admin/Logs/View.php:93 msgid "Message" msgstr "Message" @@ -346,8 +346,8 @@ msgstr "Message" msgid "Browser" msgstr "Navigateur" -#: mod/editpost.php:145 mod/events.php:518 mod/photos.php:945 -#: mod/photos.php:1297 src/Content/Conversation.php:370 +#: mod/editpost.php:145 mod/events.php:518 mod/photos.php:939 +#: mod/photos.php:1291 src/Content/Conversation.php:370 msgid "Permissions" msgstr "Permissions" @@ -411,7 +411,7 @@ msgstr "Fin de l'évènement :" msgid "Description:" msgstr "Description :" -#: mod/events.php:504 src/Content/Widget/VCard.php:98 src/Model/Event.php:80 +#: mod/events.php:504 src/Content/Widget/VCard.php:104 src/Model/Event.php:80 #: src/Model/Event.php:107 src/Model/Event.php:466 src/Model/Event.php:915 #: src/Model/Profile.php:370 src/Module/Contact/Profile.php:369 #: src/Module/Directory.php:148 src/Module/Notifications/Introductions.php:185 @@ -428,8 +428,8 @@ msgid "Share this event" msgstr "Partager cet évènement" #: mod/events.php:515 mod/message.php:201 mod/message.php:357 -#: mod/photos.php:927 mod/photos.php:1031 mod/photos.php:1301 -#: mod/photos.php:1342 mod/photos.php:1398 mod/photos.php:1472 +#: mod/photos.php:921 mod/photos.php:1025 mod/photos.php:1295 +#: mod/photos.php:1336 mod/photos.php:1392 mod/photos.php:1466 #: src/Module/Admin/Item/Source.php:65 src/Module/Contact/Advanced.php:132 #: src/Module/Contact/Poke.php:177 src/Module/Contact/Profile.php:327 #: src/Module/Debug/ActivityPubConversion.php:145 @@ -886,11 +886,11 @@ msgstr "Veuillez garder cette fenêtre ouverte jusqu'à la fin." msgid "Photo Albums" msgstr "Albums photo" -#: mod/photos.php:109 mod/photos.php:1590 +#: mod/photos.php:109 mod/photos.php:1584 msgid "Recent Photos" msgstr "Photos récentes" -#: mod/photos.php:111 mod/photos.php:1079 mod/photos.php:1592 +#: mod/photos.php:111 mod/photos.php:1073 mod/photos.php:1586 msgid "Upload New Photos" msgstr "Téléverser de nouvelles photos" @@ -918,221 +918,221 @@ msgstr "L'album était vide" msgid "Failed to delete the photo." msgstr "La suppression de la photo a échoué." -#: mod/photos.php:559 +#: mod/photos.php:553 msgid "a photo" msgstr "une photo" -#: mod/photos.php:559 +#: mod/photos.php:553 #, php-format msgid "%1$s was tagged in %2$s by %3$s" msgstr "%1$s a été mentionné•e dans %2$s par %3$s" -#: mod/photos.php:642 mod/photos.php:645 mod/photos.php:672 +#: mod/photos.php:636 mod/photos.php:639 mod/photos.php:666 #: mod/wall_upload.php:201 src/Module/Settings/Profile/Photo/Index.php:60 #, php-format msgid "Image exceeds size limit of %s" msgstr "L'image dépasse la taille limite de %s" -#: mod/photos.php:648 +#: mod/photos.php:642 msgid "Image upload didn't complete, please try again" msgstr "La mise en ligne de l'image ne s'est pas terminée, veuillez réessayer" -#: mod/photos.php:651 +#: mod/photos.php:645 msgid "Image file is missing" msgstr "Fichier image manquant" -#: mod/photos.php:656 +#: mod/photos.php:650 msgid "" "Server can't accept new file upload at this time, please contact your " "administrator" msgstr "Le serveur ne peut pas accepter la mise en ligne d'un nouveau fichier en ce moment, veuillez contacter un administrateur" -#: mod/photos.php:680 +#: mod/photos.php:674 msgid "Image file is empty." msgstr "Fichier image vide." -#: mod/photos.php:695 mod/wall_upload.php:163 +#: mod/photos.php:689 mod/wall_upload.php:163 #: src/Module/Settings/Profile/Photo/Index.php:69 msgid "Unable to process image." msgstr "Impossible de traiter l'image." -#: mod/photos.php:721 mod/wall_upload.php:226 +#: mod/photos.php:715 mod/wall_upload.php:226 #: src/Module/Settings/Profile/Photo/Index.php:96 msgid "Image upload failed." msgstr "Le téléversement de l'image a échoué." -#: mod/photos.php:813 +#: mod/photos.php:807 msgid "No photos selected" msgstr "Aucune photo sélectionnée" -#: mod/photos.php:882 +#: mod/photos.php:876 msgid "Access to this item is restricted." msgstr "Accès restreint à cet élément." -#: mod/photos.php:937 +#: mod/photos.php:931 msgid "Upload Photos" msgstr "Téléverser des photos" -#: mod/photos.php:941 mod/photos.php:1027 +#: mod/photos.php:935 mod/photos.php:1021 msgid "New album name: " msgstr "Nom du nouvel album : " -#: mod/photos.php:942 +#: mod/photos.php:936 msgid "or select existing album:" msgstr "ou sélectionner un album existant" -#: mod/photos.php:943 +#: mod/photos.php:937 msgid "Do not show a status post for this upload" msgstr "Ne pas publier de notice de statut pour cet envoi" -#: mod/photos.php:1008 +#: mod/photos.php:1002 msgid "Do you really want to delete this photo album and all its photos?" msgstr "Voulez-vous vraiment supprimer cet album photo et toutes ses photos ?" -#: mod/photos.php:1009 mod/photos.php:1032 +#: mod/photos.php:1003 mod/photos.php:1026 msgid "Delete Album" msgstr "Effacer l'album" -#: mod/photos.php:1036 +#: mod/photos.php:1030 msgid "Edit Album" msgstr "Éditer l'album" -#: mod/photos.php:1037 +#: mod/photos.php:1031 msgid "Drop Album" msgstr "Supprimer l'album" -#: mod/photos.php:1041 +#: mod/photos.php:1035 msgid "Show Newest First" msgstr "Plus récent d'abord" -#: mod/photos.php:1043 +#: mod/photos.php:1037 msgid "Show Oldest First" msgstr "Plus ancien d'abord" -#: mod/photos.php:1064 mod/photos.php:1575 +#: mod/photos.php:1058 mod/photos.php:1569 msgid "View Photo" msgstr "Voir la photo" -#: mod/photos.php:1097 +#: mod/photos.php:1091 msgid "Permission denied. Access to this item may be restricted." msgstr "Interdit. L'accès à cet élément peut avoir été restreint." -#: mod/photos.php:1099 +#: mod/photos.php:1093 msgid "Photo not available" msgstr "Photo indisponible" -#: mod/photos.php:1109 +#: mod/photos.php:1103 msgid "Do you really want to delete this photo?" msgstr "Voulez-vous vraiment supprimer cette photo ?" -#: mod/photos.php:1110 mod/photos.php:1302 +#: mod/photos.php:1104 mod/photos.php:1296 msgid "Delete Photo" msgstr "Effacer la photo" -#: mod/photos.php:1202 +#: mod/photos.php:1196 msgid "View photo" msgstr "Voir photo" -#: mod/photos.php:1204 +#: mod/photos.php:1198 msgid "Edit photo" msgstr "Éditer la photo" -#: mod/photos.php:1205 +#: mod/photos.php:1199 msgid "Delete photo" msgstr "Effacer la photo" -#: mod/photos.php:1206 +#: mod/photos.php:1200 msgid "Use as profile photo" msgstr "Utiliser comme photo de profil" -#: mod/photos.php:1213 +#: mod/photos.php:1207 msgid "Private Photo" msgstr "Photo privée" -#: mod/photos.php:1219 +#: mod/photos.php:1213 msgid "View Full Size" msgstr "Voir en taille réelle" -#: mod/photos.php:1270 +#: mod/photos.php:1264 msgid "Tags: " msgstr "Étiquettes :" -#: mod/photos.php:1273 +#: mod/photos.php:1267 msgid "[Select tags to remove]" msgstr "[Sélectionner les étiquettes à supprimer]" -#: mod/photos.php:1288 +#: mod/photos.php:1282 msgid "New album name" msgstr "Nom du nouvel album" -#: mod/photos.php:1289 +#: mod/photos.php:1283 msgid "Caption" msgstr "Titre" -#: mod/photos.php:1290 +#: mod/photos.php:1284 msgid "Add a Tag" msgstr "Ajouter une étiquette" -#: mod/photos.php:1290 +#: mod/photos.php:1284 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Exemples : @bob, @Barbara_Jensen, @jim@example.com, #Californie, #vacances" -#: mod/photos.php:1291 +#: mod/photos.php:1285 msgid "Do not rotate" msgstr "Pas de rotation" -#: mod/photos.php:1292 +#: mod/photos.php:1286 msgid "Rotate CW (right)" msgstr "Tourner dans le sens des aiguilles d'une montre (vers la droite)" -#: mod/photos.php:1293 +#: mod/photos.php:1287 msgid "Rotate CCW (left)" msgstr "Tourner dans le sens contraire des aiguilles d'une montre (vers la gauche)" -#: mod/photos.php:1339 mod/photos.php:1395 mod/photos.php:1469 +#: mod/photos.php:1333 mod/photos.php:1389 mod/photos.php:1463 #: src/Module/Contact.php:544 src/Module/Item/Compose.php:160 #: src/Object/Post.php:985 msgid "This is you" msgstr "C'est vous" -#: mod/photos.php:1341 mod/photos.php:1397 mod/photos.php:1471 +#: mod/photos.php:1335 mod/photos.php:1391 mod/photos.php:1465 #: src/Object/Post.php:522 src/Object/Post.php:987 msgid "Comment" msgstr "Commenter" -#: mod/photos.php:1430 src/Content/Conversation.php:628 +#: mod/photos.php:1424 src/Content/Conversation.php:628 #: src/Object/Post.php:247 msgid "Select" msgstr "Sélectionner" -#: mod/photos.php:1431 mod/settings.php:350 src/Content/Conversation.php:629 +#: mod/photos.php:1425 mod/settings.php:350 src/Content/Conversation.php:629 #: src/Module/Admin/Users/Active.php:139 #: src/Module/Admin/Users/Blocked.php:140 src/Module/Admin/Users/Index.php:153 msgid "Delete" msgstr "Supprimer" -#: mod/photos.php:1492 src/Object/Post.php:369 +#: mod/photos.php:1486 src/Object/Post.php:369 msgid "Like" msgstr "Aime" -#: mod/photos.php:1493 src/Object/Post.php:369 +#: mod/photos.php:1487 src/Object/Post.php:369 msgid "I like this (toggle)" msgstr "J'aime" -#: mod/photos.php:1494 src/Object/Post.php:370 +#: mod/photos.php:1488 src/Object/Post.php:370 msgid "Dislike" msgstr "N'aime pas" -#: mod/photos.php:1496 src/Object/Post.php:370 +#: mod/photos.php:1490 src/Object/Post.php:370 msgid "I don't like this (toggle)" msgstr "Je n'aime pas" -#: mod/photos.php:1518 +#: mod/photos.php:1512 msgid "Map" msgstr "Carte" -#: mod/photos.php:1581 +#: mod/photos.php:1575 msgid "View Album" msgstr "Voir l'album" @@ -1153,36 +1153,36 @@ msgstr "Mauvaise requête." msgid "Contact not found." msgstr "Contact introuvable." -#: mod/removeme.php:63 src/Navigation/Notifications/Repository/Notify.php:482 +#: mod/removeme.php:65 src/Navigation/Notifications/Repository/Notify.php:482 msgid "[Friendica System Notify]" msgstr "[Notification Système de Friendica]" -#: mod/removeme.php:63 +#: mod/removeme.php:65 msgid "User deleted their account" msgstr "L'utilisateur a supprimé son compte" -#: mod/removeme.php:64 +#: mod/removeme.php:66 msgid "" "On your Friendica node an user deleted their account. Please ensure that " "their data is removed from the backups." msgstr "Sur votre nœud Friendica, un utilisateur a supprimé son compte. Veuillez vous assurer que ses données sont supprimées des sauvegardes." -#: mod/removeme.php:65 +#: mod/removeme.php:67 #, php-format msgid "The user id is %d" msgstr "L'identifiant d'utilisateur est %d" -#: mod/removeme.php:99 mod/removeme.php:102 +#: mod/removeme.php:101 mod/removeme.php:104 msgid "Remove My Account" msgstr "Supprimer mon compte" -#: mod/removeme.php:100 +#: mod/removeme.php:102 msgid "" "This will completely remove your account. Once this has been done it is not " "recoverable." msgstr "Ceci supprimera totalement votre compte. Cette opération est irréversible." -#: mod/removeme.php:101 +#: mod/removeme.php:103 msgid "Please enter your password for verification:" msgstr "Merci de saisir votre mot de passe pour vérification :" @@ -1231,7 +1231,7 @@ msgstr "Révoquer l'autorisation" #: mod/settings.php:352 src/Module/Admin/Addons/Index.php:69 #: src/Module/Admin/Features.php:87 src/Module/Admin/Logs/Settings.php:81 #: src/Module/Admin/Site.php:434 src/Module/Admin/Themes/Index.php:113 -#: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:532 +#: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:559 #: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:193 msgid "Save Settings" msgstr "Sauvegarder les paramètres" @@ -1671,6 +1671,66 @@ msgstr "Aucun profil distant n'a été trouvé à cette URL (%s)" msgid "The contact has been blocked from the node" msgstr "Le profile distant a été bloqué" +#: src/Console/MergeContacts.php:74 +#, php-format +msgid "%d %s, %d duplicates." +msgstr "%d%s, %d duplications." + +#: src/Console/MergeContacts.php:77 +#, php-format +msgid "uri-id is empty for contact %s." +msgstr "l'uri-id est vide pour le contact %s." + +#: src/Console/MergeContacts.php:90 +#, php-format +msgid "No valid first countact found for uri-id %d." +msgstr "Aucun premier contact valide trouvé pour l'uri-id %d." + +#: src/Console/MergeContacts.php:101 +#, php-format +msgid "Wrong duplicate found for uri-id %d in %d (url: %s != %s)." +msgstr "Mauvaise duplication trouvée pour l'uri-id %d dans %d (url : %s != %s)." + +#: src/Console/MergeContacts.php:105 +#, php-format +msgid "Wrong duplicate found for uri-id %d in %d (nurl: %s != %s)." +msgstr "Mauvaise duplication trouvée pour l'uri-id %d dans %d (nurl : %s != %s)." + +#: src/Console/MergeContacts.php:141 +#, php-format +msgid "Deletion of id %d failed" +msgstr "La suppression de l'id %d a échoué." + +#: src/Console/MergeContacts.php:143 +#, php-format +msgid "Deletion of id %d was successful" +msgstr "id %d supprimé avec succès." + +#: src/Console/MergeContacts.php:149 +#, php-format +msgid "Updating \"%s\" in \"%s\" from %d to %d" +msgstr "Mise à jour de \"%s\" dans \"%s\" depuis %d vers %d" + +#: src/Console/MergeContacts.php:151 +msgid " - found" +msgstr "- trouvé(s)" + +#: src/Console/MergeContacts.php:158 +msgid " - failed" +msgstr "- échoué(s)" + +#: src/Console/MergeContacts.php:160 +msgid " - success" +msgstr "- succès" + +#: src/Console/MergeContacts.php:164 +msgid " - deleted" +msgstr "- supprimé(s)" + +#: src/Console/MergeContacts.php:167 +msgid " - done" +msgstr "- fait(s)" + #: src/Console/MoveToAvatarCache.php:91 msgid "The avatar cache needs to be enabled to use this command." msgstr "Le cache des avatars doit être activé pour pouvoir utiliser cette commande." @@ -1729,11 +1789,11 @@ msgstr "Entrer un pseudo :" msgid "Enter new password: " msgstr "Entrer le nouveau mot de passe :" -#: src/Console/User.php:210 src/Module/Settings/Account.php:73 +#: src/Console/User.php:210 src/Module/Settings/Account.php:74 msgid "Password update failed. Please try again." msgstr "Le changement de mot de passe a échoué. Merci de recommencer." -#: src/Console/User.php:213 src/Module/Settings/Account.php:76 +#: src/Console/User.php:213 src/Module/Settings/Account.php:77 msgid "Password changed." msgstr "Mot de passe changé." @@ -2626,7 +2686,7 @@ msgstr "Chargement de résultats supplémentaires..." msgid "The end" msgstr "Fin" -#: src/Content/Text/HTML.php:875 src/Content/Widget/VCard.php:103 +#: src/Content/Text/HTML.php:875 src/Content/Widget/VCard.php:109 #: src/Model/Profile.php:456 msgid "Follow" msgstr "S'abonner" @@ -2755,7 +2815,7 @@ msgstr "Organisations" msgid "News" msgstr "Nouvelles" -#: src/Content/Widget.php:525 src/Module/Settings/Account.php:430 +#: src/Content/Widget.php:525 src/Module/Settings/Account.php:455 msgid "Account Types" msgstr "Type de compte" @@ -2811,22 +2871,22 @@ msgstr[2] "Tendances (dernières %d heures)" msgid "More Trending Tags" msgstr "Plus de tedances" -#: src/Content/Widget/VCard.php:96 src/Model/Profile.php:375 +#: src/Content/Widget/VCard.php:102 src/Model/Profile.php:375 #: src/Module/Contact/Profile.php:371 src/Module/Profile/Profile.php:176 msgid "XMPP:" msgstr "XMPP" -#: src/Content/Widget/VCard.php:97 src/Model/Profile.php:376 +#: src/Content/Widget/VCard.php:103 src/Model/Profile.php:376 #: src/Module/Contact/Profile.php:373 src/Module/Profile/Profile.php:180 msgid "Matrix:" msgstr "Matrix :" -#: src/Content/Widget/VCard.php:101 src/Model/Profile.php:468 +#: src/Content/Widget/VCard.php:107 src/Model/Profile.php:468 #: src/Module/Notifications/Introductions.php:199 msgid "Network:" msgstr "Réseau" -#: src/Content/Widget/VCard.php:105 src/Model/Profile.php:458 +#: src/Content/Widget/VCard.php:111 src/Model/Profile.php:458 msgid "Unfollow" msgstr "Se désabonner" @@ -4340,19 +4400,19 @@ msgstr "Supprimé" msgid "List of pending user deletions" msgstr "Liste des utilisateurs en attente de suppression" -#: src/Module/Admin/BaseUsers.php:100 src/Module/Settings/Account.php:468 +#: src/Module/Admin/BaseUsers.php:100 src/Module/Settings/Account.php:493 msgid "Normal Account Page" msgstr "Compte normal" -#: src/Module/Admin/BaseUsers.php:101 src/Module/Settings/Account.php:475 +#: src/Module/Admin/BaseUsers.php:101 src/Module/Settings/Account.php:500 msgid "Soapbox Page" msgstr "Compte \"boîte à savon\"" -#: src/Module/Admin/BaseUsers.php:102 src/Module/Settings/Account.php:482 +#: src/Module/Admin/BaseUsers.php:102 src/Module/Settings/Account.php:507 msgid "Public Forum" msgstr "Forum public" -#: src/Module/Admin/BaseUsers.php:103 src/Module/Settings/Account.php:489 +#: src/Module/Admin/BaseUsers.php:103 src/Module/Settings/Account.php:514 msgid "Automatic Friend Page" msgstr "Abonnement réciproque" @@ -4360,19 +4420,19 @@ msgstr "Abonnement réciproque" msgid "Private Forum" msgstr "Forum Privé" -#: src/Module/Admin/BaseUsers.php:107 src/Module/Settings/Account.php:440 +#: src/Module/Admin/BaseUsers.php:107 src/Module/Settings/Account.php:465 msgid "Personal Page" msgstr "Page personnelle" -#: src/Module/Admin/BaseUsers.php:108 src/Module/Settings/Account.php:447 +#: src/Module/Admin/BaseUsers.php:108 src/Module/Settings/Account.php:472 msgid "Organisation Page" msgstr "Page Associative" -#: src/Module/Admin/BaseUsers.php:109 src/Module/Settings/Account.php:454 +#: src/Module/Admin/BaseUsers.php:109 src/Module/Settings/Account.php:479 msgid "News Page" msgstr "Page d'informations" -#: src/Module/Admin/BaseUsers.php:110 src/Module/Settings/Account.php:461 +#: src/Module/Admin/BaseUsers.php:110 src/Module/Settings/Account.php:486 msgid "Community Forum" msgstr "Forum Communautaire" @@ -8238,7 +8298,7 @@ msgid "" "class=\"btn btn-sm pull-right\">Cancel" msgstr "Vous êtes en train de consulter votre profil en tant que %s Annuler" -#: src/Module/Profile/Profile.php:144 src/Module/Settings/Account.php:548 +#: src/Module/Profile/Profile.php:144 src/Module/Settings/Account.php:575 msgid "Full Name:" msgstr "Nom complet :" @@ -8369,7 +8429,7 @@ msgstr "Votre courriel : (Des informations de connexion vont être envoyées à msgid "Please repeat your e-mail address:" msgstr "Veuillez répéter votre adresse e-mail :" -#: src/Module/Register.php:162 src/Module/Settings/Account.php:539 +#: src/Module/Register.php:162 src/Module/Settings/Account.php:566 msgid "New Password:" msgstr "Nouveau mot de passe :" @@ -8377,7 +8437,7 @@ msgstr "Nouveau mot de passe :" msgid "Leave empty for an auto generated password." msgstr "Laisser ce champ libre pour obtenir un mot de passe généré automatiquement." -#: src/Module/Register.php:163 src/Module/Settings/Account.php:540 +#: src/Module/Register.php:163 src/Module/Settings/Account.php:567 msgid "Confirm:" msgstr "Confirmer :" @@ -8643,127 +8703,127 @@ msgstr "C'est mon appareil portant l'application d'identification à deux facteu msgid "Verify code and complete login" msgstr "Vérifier le code de récupération et compléter l'identification" -#: src/Module/Settings/Account.php:65 +#: src/Module/Settings/Account.php:66 msgid "Passwords do not match." msgstr "Les mots de passe ne correspondent pas." -#: src/Module/Settings/Account.php:79 +#: src/Module/Settings/Account.php:80 msgid "Password unchanged." msgstr "Mot de passe non changé." -#: src/Module/Settings/Account.php:94 +#: src/Module/Settings/Account.php:95 msgid "Please use a shorter name." msgstr "Veuillez saisir un nom plus court." -#: src/Module/Settings/Account.php:97 +#: src/Module/Settings/Account.php:98 msgid "Name too short." msgstr "Le nom est trop court." -#: src/Module/Settings/Account.php:106 +#: src/Module/Settings/Account.php:107 msgid "Wrong Password." msgstr "Mot de passe erroné." -#: src/Module/Settings/Account.php:111 +#: src/Module/Settings/Account.php:112 msgid "Invalid email." msgstr "Courriel invalide." -#: src/Module/Settings/Account.php:117 +#: src/Module/Settings/Account.php:118 msgid "Cannot change to that email." msgstr "Ne peut pas changer vers ce courriel." -#: src/Module/Settings/Account.php:147 src/Module/Settings/Account.php:199 -#: src/Module/Settings/Account.php:219 src/Module/Settings/Account.php:279 -#: src/Module/Settings/Account.php:328 +#: src/Module/Settings/Account.php:148 src/Module/Settings/Account.php:200 +#: src/Module/Settings/Account.php:220 src/Module/Settings/Account.php:304 +#: src/Module/Settings/Account.php:353 msgid "Settings were not updated." msgstr "Les paramètres n'ont pas été mis à jour." -#: src/Module/Settings/Account.php:340 +#: src/Module/Settings/Account.php:365 msgid "Contact CSV file upload error" msgstr "Erreur de téléversement du fichier de contact CSV" -#: src/Module/Settings/Account.php:359 +#: src/Module/Settings/Account.php:384 msgid "Importing Contacts done" msgstr "Import des contacts effectué" -#: src/Module/Settings/Account.php:372 +#: src/Module/Settings/Account.php:397 msgid "Relocate message has been send to your contacts" msgstr "Un message de relocalisation a été envoyé à vos contacts." -#: src/Module/Settings/Account.php:389 +#: src/Module/Settings/Account.php:414 msgid "Unable to find your profile. Please contact your admin." msgstr "Impossible de trouver votre profile. Merci de contacter votre administrateur." -#: src/Module/Settings/Account.php:431 +#: src/Module/Settings/Account.php:456 msgid "Personal Page Subtypes" msgstr "Sous-catégories de page personnelle" -#: src/Module/Settings/Account.php:432 +#: src/Module/Settings/Account.php:457 msgid "Community Forum Subtypes" msgstr "Sous-catégories de forums communautaires" -#: src/Module/Settings/Account.php:442 +#: src/Module/Settings/Account.php:467 msgid "Account for a personal profile." msgstr "Compte pour profil personnel." -#: src/Module/Settings/Account.php:449 +#: src/Module/Settings/Account.php:474 msgid "" "Account for an organisation that automatically approves contact requests as " "\"Followers\"." msgstr "Compte pour une organisation qui accepte les demandes comme \"Abonnés\"." -#: src/Module/Settings/Account.php:456 +#: src/Module/Settings/Account.php:481 msgid "" "Account for a news reflector that automatically approves contact requests as" " \"Followers\"." msgstr "Compte pour les miroirs de nouvelles qui accepte automatiquement les de contact comme \"Abonnés\"." -#: src/Module/Settings/Account.php:463 +#: src/Module/Settings/Account.php:488 msgid "Account for community discussions." msgstr "Compte pour des discussions communautaires." -#: src/Module/Settings/Account.php:470 +#: src/Module/Settings/Account.php:495 msgid "" "Account for a regular personal profile that requires manual approval of " "\"Friends\" and \"Followers\"." msgstr "Les demandes d'abonnement doivent être acceptées manuellement." -#: src/Module/Settings/Account.php:477 +#: src/Module/Settings/Account.php:502 msgid "" "Account for a public profile that automatically approves contact requests as" " \"Followers\"." msgstr "Compte pour un profil public qui accepte les demandes de contact comme \"Abonnés\"." -#: src/Module/Settings/Account.php:484 +#: src/Module/Settings/Account.php:509 msgid "Automatically approves all contact requests." msgstr "Les demandes de participation au forum sont automatiquement acceptées." -#: src/Module/Settings/Account.php:491 +#: src/Module/Settings/Account.php:516 msgid "" "Account for a popular profile that automatically approves contact requests " "as \"Friends\"." msgstr "Les demandes d'abonnement sont automatiquement acceptées." -#: src/Module/Settings/Account.php:496 +#: src/Module/Settings/Account.php:521 msgid "Private Forum [Experimental]" msgstr "Forum privé [expérimental]" -#: src/Module/Settings/Account.php:498 +#: src/Module/Settings/Account.php:523 msgid "Requires manual approval of contact requests." msgstr "Les demandes de participation au forum nécessitent une approbation." -#: src/Module/Settings/Account.php:507 +#: src/Module/Settings/Account.php:532 msgid "OpenID:" msgstr "OpenID:" -#: src/Module/Settings/Account.php:507 +#: src/Module/Settings/Account.php:532 msgid "(Optional) Allow this OpenID to login to this account." msgstr " (Facultatif) Autoriser cet OpenID à se connecter à ce compte." -#: src/Module/Settings/Account.php:515 +#: src/Module/Settings/Account.php:540 msgid "Publish your profile in your local site directory?" msgstr "Publier votre profil dans le répertoire local" -#: src/Module/Settings/Account.php:515 +#: src/Module/Settings/Account.php:540 #, php-format msgid "" "Your profile will be published in this node's local " @@ -8771,103 +8831,103 @@ msgid "" " system settings." msgstr "Votre profil sera public sur l'annuaire local de cette instance. Les détails de votre profil pourront être visible publiquement selon les paramètres de votre système." -#: src/Module/Settings/Account.php:521 +#: src/Module/Settings/Account.php:546 #, php-format msgid "" "Your profile will also be published in the global friendica directories " "(e.g. %s)." msgstr "Votre profil sera aussi publié dans le répertoire Friendica global (%s)." -#: src/Module/Settings/Account.php:529 +#: src/Module/Settings/Account.php:556 msgid "Account Settings" msgstr "Compte" -#: src/Module/Settings/Account.php:530 +#: src/Module/Settings/Account.php:557 #, php-format msgid "Your Identity Address is '%s' or '%s'." msgstr "L’adresse de votre profil est '%s' ou '%s'." -#: src/Module/Settings/Account.php:538 +#: src/Module/Settings/Account.php:565 msgid "Password Settings" msgstr "Réglages de mot de passe" -#: src/Module/Settings/Account.php:539 +#: src/Module/Settings/Account.php:566 msgid "" "Allowed characters are a-z, A-Z, 0-9 and special characters except white " "spaces, accentuated letters and colon (:)." msgstr "Les caractères permis sont a-z, A-Z, 0-9 et les caractères de ponctuation sauf les espaces et les deux-points (:)." -#: src/Module/Settings/Account.php:540 +#: src/Module/Settings/Account.php:567 msgid "Leave password fields blank unless changing" msgstr "Laissez les champs de mot de passe vierges, sauf si vous désirez les changer" -#: src/Module/Settings/Account.php:541 +#: src/Module/Settings/Account.php:568 msgid "Current Password:" msgstr "Mot de passe actuel :" -#: src/Module/Settings/Account.php:541 +#: src/Module/Settings/Account.php:568 msgid "Your current password to confirm the changes" msgstr "Votre mot de passe actuel pour confirmer les modifications" -#: src/Module/Settings/Account.php:542 +#: src/Module/Settings/Account.php:569 msgid "Password:" msgstr "Mot de passe :" -#: src/Module/Settings/Account.php:542 +#: src/Module/Settings/Account.php:569 msgid "Your current password to confirm the changes of the email address" msgstr "Votre mot de passe actuel pour confirmer les modifications de votre adresse email." -#: src/Module/Settings/Account.php:545 +#: src/Module/Settings/Account.php:572 msgid "Delete OpenID URL" msgstr "Supprimer l'URL OpenID" -#: src/Module/Settings/Account.php:547 +#: src/Module/Settings/Account.php:574 msgid "Basic Settings" msgstr "Réglages de base" -#: src/Module/Settings/Account.php:549 +#: src/Module/Settings/Account.php:576 msgid "Email Address:" msgstr "Adresse courriel :" -#: src/Module/Settings/Account.php:550 +#: src/Module/Settings/Account.php:577 msgid "Your Timezone:" msgstr "Votre fuseau horaire :" -#: src/Module/Settings/Account.php:551 +#: src/Module/Settings/Account.php:578 msgid "Your Language:" msgstr "Votre langue :" -#: src/Module/Settings/Account.php:551 +#: src/Module/Settings/Account.php:578 msgid "" "Set the language we use to show you friendica interface and to send you " "emails" msgstr "Détermine la langue que nous utilisons pour afficher votre interface Friendica et pour vous envoyer des courriels" -#: src/Module/Settings/Account.php:552 +#: src/Module/Settings/Account.php:579 msgid "Default Post Location:" msgstr "Emplacement de publication par défaut:" -#: src/Module/Settings/Account.php:553 +#: src/Module/Settings/Account.php:580 msgid "Use Browser Location:" msgstr "Utiliser la localisation géographique du navigateur:" -#: src/Module/Settings/Account.php:555 +#: src/Module/Settings/Account.php:582 msgid "Security and Privacy Settings" msgstr "Réglages de sécurité et vie privée" -#: src/Module/Settings/Account.php:557 +#: src/Module/Settings/Account.php:584 msgid "Maximum Friend Requests/Day:" msgstr "Nombre maximal de demandes d'abonnement par jour :" -#: src/Module/Settings/Account.php:557 src/Module/Settings/Account.php:567 +#: src/Module/Settings/Account.php:584 src/Module/Settings/Account.php:594 msgid "(to prevent spam abuse)" msgstr "(pour limiter l'impact du spam)" -#: src/Module/Settings/Account.php:559 +#: src/Module/Settings/Account.php:586 msgid "Allow your profile to be searchable globally?" msgstr "Publier votre profil publiquement" -#: src/Module/Settings/Account.php:559 +#: src/Module/Settings/Account.php:586 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 " @@ -8875,43 +8935,43 @@ msgid "" "indexed or not." msgstr "Permet à quiconque de trouver votre profil via une recherche sur n'importe quel site compatible ou un moteur de recherche." -#: src/Module/Settings/Account.php:560 +#: src/Module/Settings/Account.php:587 msgid "Hide your contact/friend list from viewers of your profile?" msgstr "Cacher votre liste de contacts/amis des visiteurs de votre profil?" -#: src/Module/Settings/Account.php:560 +#: src/Module/Settings/Account.php:587 msgid "" "A list of your contacts is displayed on your profile page. Activate this " "option to disable the display of your contact list." msgstr "La liste de vos contacts est affichée sur votre profil. Activer cette option pour désactiver son affichage." -#: src/Module/Settings/Account.php:561 +#: src/Module/Settings/Account.php:588 msgid "Hide your profile details from anonymous viewers?" msgstr "Cacher les détails de votre profil pour les lecteurs anonymes." -#: src/Module/Settings/Account.php:561 +#: src/Module/Settings/Account.php:588 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 "Les visiteurs anonymes ne verront que votre image de profil, votre nom affiché, et le surnom que vous utilisez sur votre page de profil. Vos publications publics et réponses seront toujours accessibles par d'autres moyens." -#: src/Module/Settings/Account.php:562 +#: src/Module/Settings/Account.php:589 msgid "Make public posts unlisted" msgstr "Délister vos publications publiques" -#: src/Module/Settings/Account.php:562 +#: src/Module/Settings/Account.php:589 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 "Vos publications publiques n'apparaîtront pas dans les pages communautaires ni les résultats de recherche de ce site et ne seront pas diffusées via les serveurs de relai. Cependant, elles pourront quand même apparaître dans les fils publics de sites distants." -#: src/Module/Settings/Account.php:563 +#: src/Module/Settings/Account.php:590 msgid "Make all posted pictures accessible" msgstr "Rendre toutes les images envoyées accessibles." -#: src/Module/Settings/Account.php:563 +#: src/Module/Settings/Account.php:590 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 " @@ -8919,213 +8979,237 @@ msgid "" "public on your photo albums though." msgstr "Cette option rend chaque image envoyée accessible par un lien direct. C'est un contournement pour prendre en compte que la pluplart des autres réseaux ne gèrent pas les droits sur les images. Cependant les images non publiques ne seront pas visibles sur votre album photo." -#: src/Module/Settings/Account.php:564 +#: src/Module/Settings/Account.php:591 msgid "Allow friends to post to your profile page?" msgstr "Autoriser vos contacts à publier sur votre profil ?" -#: src/Module/Settings/Account.php:564 +#: src/Module/Settings/Account.php:591 msgid "" "Your contacts may write posts on your profile wall. These posts will be " "distributed to your contacts" msgstr "Vos contacts peuvent partager des publications sur votre mur. Ces publication seront visibles par vos abonnés." -#: src/Module/Settings/Account.php:565 +#: src/Module/Settings/Account.php:592 msgid "Allow friends to tag your posts?" msgstr "Autoriser vos contacts à ajouter des tags à vos publications?" -#: src/Module/Settings/Account.php:565 +#: src/Module/Settings/Account.php:592 msgid "Your contacts can add additional tags to your posts." msgstr "Vos contacts peuvent ajouter des tag à vos publications." -#: src/Module/Settings/Account.php:566 +#: src/Module/Settings/Account.php:593 msgid "Permit unknown people to send you private mail?" msgstr "Autoriser les messages privés d'inconnus?" -#: src/Module/Settings/Account.php:566 +#: src/Module/Settings/Account.php:593 msgid "" "Friendica network users may send you private messages even if they are not " "in your contact list." msgstr "Les utilisateurs de Friendica peuvent vous envoyer des messages privés même s'ils ne sont pas dans vos contacts." -#: src/Module/Settings/Account.php:567 +#: src/Module/Settings/Account.php:594 msgid "Maximum private messages per day from unknown people:" msgstr "Maximum de messages privés d'inconnus par jour :" -#: src/Module/Settings/Account.php:569 +#: src/Module/Settings/Account.php:596 msgid "Default Post Permissions" msgstr "Permissions de publication par défaut" -#: src/Module/Settings/Account.php:573 +#: src/Module/Settings/Account.php:600 msgid "Expiration settings" msgstr "Réglages d'expiration" -#: src/Module/Settings/Account.php:574 +#: src/Module/Settings/Account.php:601 msgid "Automatically expire posts after this many days:" msgstr "Les publications expirent automatiquement après (en jours) :" -#: src/Module/Settings/Account.php:574 +#: src/Module/Settings/Account.php:601 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "Si ce champ est vide, les publications n'expireront pas. Les publications expirées seront supprimées" -#: src/Module/Settings/Account.php:575 +#: src/Module/Settings/Account.php:602 msgid "Expire posts" msgstr "Faire expirer les publications" -#: src/Module/Settings/Account.php:575 +#: src/Module/Settings/Account.php:602 msgid "When activated, posts and comments will be expired." msgstr "Les publications originales et commentaires expireront." -#: src/Module/Settings/Account.php:576 +#: src/Module/Settings/Account.php:603 msgid "Expire personal notes" msgstr "Faire expirer les notes personnelles" -#: src/Module/Settings/Account.php:576 +#: src/Module/Settings/Account.php:603 msgid "" "When activated, the personal notes on your profile page will be expired." msgstr " " -#: src/Module/Settings/Account.php:577 +#: src/Module/Settings/Account.php:604 msgid "Expire starred posts" msgstr "Faire expirer les publications marquées" -#: src/Module/Settings/Account.php:577 +#: src/Module/Settings/Account.php:604 msgid "" "Starring posts keeps them from being expired. That behaviour is overwritten " "by this setting." msgstr "Par défaut, marquer une publication empêche leur expiration." -#: src/Module/Settings/Account.php:578 +#: src/Module/Settings/Account.php:605 msgid "Only expire posts by others" msgstr "Faire expirer uniquement les contenu reçus" -#: src/Module/Settings/Account.php:578 +#: src/Module/Settings/Account.php:605 msgid "" "When activated, your own posts never expire. Then the settings above are " "only valid for posts you received." msgstr "Empêche vos propres publications d'expirer. S'applique à tous les choix précédents." -#: src/Module/Settings/Account.php:581 +#: src/Module/Settings/Account.php:608 msgid "Notification Settings" msgstr "Réglages de notification" -#: src/Module/Settings/Account.php:582 +#: src/Module/Settings/Account.php:609 msgid "Send a notification email when:" msgstr "Envoyer un courriel de notification quand:" -#: src/Module/Settings/Account.php:583 +#: src/Module/Settings/Account.php:610 msgid "You receive an introduction" msgstr "Vous recevez une introduction" -#: src/Module/Settings/Account.php:584 +#: src/Module/Settings/Account.php:611 msgid "Your introductions are confirmed" msgstr "Vos introductions sont confirmées" -#: src/Module/Settings/Account.php:585 +#: src/Module/Settings/Account.php:612 msgid "Someone writes on your profile wall" msgstr "Quelqu'un écrit sur votre mur" -#: src/Module/Settings/Account.php:586 +#: src/Module/Settings/Account.php:613 msgid "Someone writes a followup comment" msgstr "Quelqu'un vous commente" -#: src/Module/Settings/Account.php:587 +#: src/Module/Settings/Account.php:614 msgid "You receive a private message" msgstr "Vous recevez un message privé" -#: src/Module/Settings/Account.php:588 +#: src/Module/Settings/Account.php:615 msgid "You receive a friend suggestion" msgstr "Vous avez reçu une suggestion d'abonnement" -#: src/Module/Settings/Account.php:589 +#: src/Module/Settings/Account.php:616 msgid "You are tagged in a post" msgstr "Vous avez été mentionné•e dans une publication" -#: src/Module/Settings/Account.php:590 +#: src/Module/Settings/Account.php:617 msgid "You are poked/prodded/etc. in a post" msgstr "Vous avez été sollicité•e dans une publication" -#: src/Module/Settings/Account.php:592 +#: src/Module/Settings/Account.php:619 msgid "Create a desktop notification when:" msgstr "Créer une notification de bureau quand :" -#: src/Module/Settings/Account.php:593 +#: src/Module/Settings/Account.php:620 +msgid "Someone tagged you" +msgstr "Quelqu'un vous a mentionné" + +#: src/Module/Settings/Account.php:621 +msgid "Someone directly commented on your post" +msgstr "Quelqu'un a commenté directement sur votre publication" + +#: src/Module/Settings/Account.php:622 msgid "Someone liked your content" msgstr "Quelqu'un a aimé votre contenu" -#: src/Module/Settings/Account.php:594 +#: src/Module/Settings/Account.php:622 src/Module/Settings/Account.php:623 +msgid "Can only be enabled, when the direct comment notification is enabled." +msgstr "Peut uniquement être activé quand la notification des commentaires directs est activée." + +#: src/Module/Settings/Account.php:623 msgid "Someone shared your content" msgstr "Quelqu'un a partagé votre contenu" -#: src/Module/Settings/Account.php:596 +#: src/Module/Settings/Account.php:624 +msgid "Someone commented in your thread" +msgstr "Quelqu'un a commenté dans votre conversation" + +#: src/Module/Settings/Account.php:625 +msgid "Someone commented in a thread where you commented" +msgstr "Quelqu'un a commenté dans une conversation où vous avez commenté" + +#: src/Module/Settings/Account.php:626 +msgid "Someone commented in a thread where you interacted" +msgstr "Quelqu'un a commenté dans une conversation avec laquelle vous avez interagi" + +#: src/Module/Settings/Account.php:628 msgid "Activate desktop notifications" msgstr "Activer les notifications de bureau" -#: src/Module/Settings/Account.php:596 +#: src/Module/Settings/Account.php:628 msgid "Show desktop popup on new notifications" msgstr "Afficher dans des pop-ups les nouvelles notifications" -#: src/Module/Settings/Account.php:600 +#: src/Module/Settings/Account.php:632 msgid "Text-only notification emails" msgstr "Courriels de notification en format texte" -#: src/Module/Settings/Account.php:602 +#: src/Module/Settings/Account.php:634 msgid "Send text only notification emails, without the html part" msgstr "Envoyer le texte des courriels de notification, sans la composante html" -#: src/Module/Settings/Account.php:606 +#: src/Module/Settings/Account.php:638 msgid "Show detailled notifications" msgstr "Notifications détaillées" -#: src/Module/Settings/Account.php:608 +#: src/Module/Settings/Account.php:640 msgid "" "Per default, notifications are condensed to a single notification per item. " "When enabled every notification is displayed." msgstr "Par défaut seule la notification la plus récente par conversation est affichée. Ce réglage affiche toutes les notifications." -#: src/Module/Settings/Account.php:612 +#: src/Module/Settings/Account.php:644 msgid "Show notifications of ignored contacts" msgstr "Montrer les notifications des contacts ignorés" -#: src/Module/Settings/Account.php:614 +#: src/Module/Settings/Account.php:646 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 "Par défaut les notifications de vos contacts ignorés sont également ignorées." -#: src/Module/Settings/Account.php:617 +#: src/Module/Settings/Account.php:649 msgid "Advanced Account/Page Type Settings" msgstr "Paramètres avancés de compte/page" -#: src/Module/Settings/Account.php:618 +#: src/Module/Settings/Account.php:650 msgid "Change the behaviour of this account for special situations" msgstr "Modifier le comportement de ce compte dans certaines situations" -#: src/Module/Settings/Account.php:621 +#: src/Module/Settings/Account.php:653 msgid "Import Contacts" msgstr "Importer des contacts" -#: src/Module/Settings/Account.php:622 +#: src/Module/Settings/Account.php:654 msgid "" "Upload a CSV file that contains the handle of your followed accounts in the " "first column you exported from the old account." msgstr "Téléversez un fichier CSV contenant des identifiants de contacts dans la première colonne." -#: src/Module/Settings/Account.php:623 +#: src/Module/Settings/Account.php:655 msgid "Upload File" msgstr "Téléverser le fichier" -#: src/Module/Settings/Account.php:626 +#: src/Module/Settings/Account.php:658 msgid "Relocate" msgstr "Relocaliser" -#: src/Module/Settings/Account.php:627 +#: src/Module/Settings/Account.php:659 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 "Si vous avez migré ce profil depuis un autre serveur et que vos contacts ne reçoivent plus vos mises à jour, essayez ce bouton." -#: src/Module/Settings/Account.php:628 +#: src/Module/Settings/Account.php:660 msgid "Resend relocate message to contacts" msgstr "Renvoyer un message de relocalisation aux contacts." @@ -10133,132 +10217,132 @@ msgstr "Demande de connexion/relation" msgid "New Follower" msgstr "Nouvel abonné" -#: src/Navigation/Notifications/Factory/Notification.php:130 +#: src/Navigation/Notifications/Factory/Notification.php:134 #, php-format msgid "%1$s wants to follow you" msgstr "%1$s veut s'abonner à votre contenu" -#: src/Navigation/Notifications/Factory/Notification.php:132 +#: src/Navigation/Notifications/Factory/Notification.php:136 #, php-format msgid "%1$s has started following you" msgstr "%1$s a commencé à vous suivre" -#: src/Navigation/Notifications/Factory/Notification.php:196 +#: src/Navigation/Notifications/Factory/Notification.php:200 #, php-format msgid "%1$s liked your comment on %2$s" msgstr "%1$s a aimé votre commentaire sur %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:199 +#: src/Navigation/Notifications/Factory/Notification.php:203 #, php-format msgid "%1$s liked your post %2$s" msgstr "%1$s a aimé votre publication %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:206 +#: src/Navigation/Notifications/Factory/Notification.php:210 #, php-format msgid "%1$s disliked your comment on %2$s" msgstr "%1$s n'a pas aimé votre commentaire sur %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:209 +#: src/Navigation/Notifications/Factory/Notification.php:213 #, php-format msgid "%1$s disliked your post %2$s" msgstr "%1$s n'a pas aimé votre publication %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:216 +#: src/Navigation/Notifications/Factory/Notification.php:220 #, php-format msgid "%1$s shared your comment %2$s" msgstr "%1$s a partagé votre commentaire %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:219 +#: src/Navigation/Notifications/Factory/Notification.php:223 #, php-format msgid "%1$s shared your post %2$s" msgstr "%1$s a partagé votre publication %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:223 -#: src/Navigation/Notifications/Factory/Notification.php:292 +#: src/Navigation/Notifications/Factory/Notification.php:227 +#: src/Navigation/Notifications/Factory/Notification.php:297 #, php-format msgid "%1$s shared the post %2$s from %3$s" msgstr "%1$s a partagé la publication %2$s de %3$s" -#: src/Navigation/Notifications/Factory/Notification.php:225 -#: src/Navigation/Notifications/Factory/Notification.php:294 +#: src/Navigation/Notifications/Factory/Notification.php:229 +#: src/Navigation/Notifications/Factory/Notification.php:299 #, php-format msgid "%1$s shared a post from %3$s" msgstr "%1$s a partagé une publication de %3$s" -#: src/Navigation/Notifications/Factory/Notification.php:227 -#: src/Navigation/Notifications/Factory/Notification.php:296 +#: src/Navigation/Notifications/Factory/Notification.php:231 +#: src/Navigation/Notifications/Factory/Notification.php:301 #, php-format msgid "%1$s shared the post %2$s" msgstr "%1$s a partagé la publication %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:229 -#: src/Navigation/Notifications/Factory/Notification.php:298 +#: src/Navigation/Notifications/Factory/Notification.php:233 +#: src/Navigation/Notifications/Factory/Notification.php:303 #, php-format msgid "%1$s shared a post" msgstr "%1$s a partagé une publication" -#: src/Navigation/Notifications/Factory/Notification.php:237 +#: src/Navigation/Notifications/Factory/Notification.php:241 #, php-format msgid "%1$s wants to attend your event %2$s" msgstr "%1$s souhaite participer à votre évènement %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:244 +#: src/Navigation/Notifications/Factory/Notification.php:248 #, php-format msgid "%1$s does not want to attend your event %2$s" msgstr "%1$s ne souhaite pas participer à votre évènement %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:251 +#: src/Navigation/Notifications/Factory/Notification.php:255 #, php-format msgid "%1$s maybe wants to attend your event %2$s" msgstr "%1$s souhaite peut-être participer à votre évènement %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:258 +#: src/Navigation/Notifications/Factory/Notification.php:262 #, php-format msgid "%1$s tagged you on %2$s" msgstr "%1$s vous a mentionné•e dans %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:262 +#: src/Navigation/Notifications/Factory/Notification.php:266 #, php-format msgid "%1$s replied to you on %2$s" msgstr "%1$s vous a répondu dans %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:266 +#: src/Navigation/Notifications/Factory/Notification.php:270 #, php-format msgid "%1$s commented in your thread %2$s" msgstr "%1$s a commenté dans votre conversation %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:270 +#: src/Navigation/Notifications/Factory/Notification.php:274 #, php-format msgid "%1$s commented on your comment %2$s" msgstr "%1$s a répondu à votre commentaire %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:276 +#: src/Navigation/Notifications/Factory/Notification.php:281 #, php-format msgid "%1$s commented in their thread %2$s" msgstr "%1$s a commenté dans leur conversation %2$s" -#: src/Navigation/Notifications/Factory/Notification.php:278 +#: src/Navigation/Notifications/Factory/Notification.php:283 #, php-format msgid "%1$s commented in their thread" msgstr "%1$s a commenté dans leur conversation" -#: src/Navigation/Notifications/Factory/Notification.php:280 +#: src/Navigation/Notifications/Factory/Notification.php:285 #, php-format msgid "%1$s commented in the thread %2$s from %3$s" msgstr "%1$s a commenté dans la conversation %2$s de %3$s" -#: src/Navigation/Notifications/Factory/Notification.php:282 +#: src/Navigation/Notifications/Factory/Notification.php:287 #, php-format msgid "%1$s commented in the thread from %3$s" msgstr "%1$s a commenté dans la conversation de %3$s" -#: src/Navigation/Notifications/Factory/Notification.php:287 +#: src/Navigation/Notifications/Factory/Notification.php:292 #, php-format msgid "%1$s commented on your thread %2$s" msgstr "%1$s a commenté dans votre conversation %2$s" #: src/Navigation/Notifications/Repository/Notify.php:221 -#: src/Navigation/Notifications/Repository/Notify.php:724 +#: src/Navigation/Notifications/Repository/Notify.php:735 msgid "[Friendica:Notify]" msgstr "[Friendica:Notification]" @@ -10302,7 +10386,7 @@ msgid "%1$s commented on their %2$s %3$s" msgstr "%1$s a commenté sur son %2$s %3$s" #: src/Navigation/Notifications/Repository/Notify.php:333 -#: src/Navigation/Notifications/Repository/Notify.php:758 +#: src/Navigation/Notifications/Repository/Notify.php:769 #, php-format msgid "%1$s Comment to conversation #%2$d by %3$s" msgstr "%1$s Nouveau commentaire dans la conversation #%2$d par %3$s" @@ -10315,7 +10399,7 @@ msgstr "%s a commenté un élément que vous suivez." #: src/Navigation/Notifications/Repository/Notify.php:339 #: src/Navigation/Notifications/Repository/Notify.php:354 #: src/Navigation/Notifications/Repository/Notify.php:373 -#: src/Navigation/Notifications/Repository/Notify.php:773 +#: src/Navigation/Notifications/Repository/Notify.php:784 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Merci de visiter %s pour voir la conversation et/ou y répondre." @@ -10504,12 +10588,12 @@ msgstr "Nom complet :\t%s\nAdresse du site :\t%s\nIdentifiant :\t%s (%s)" msgid "Please visit %s to approve or reject the request." msgstr "Veuillez visiter %s pour approuver ou rejeter la demande." -#: src/Navigation/Notifications/Repository/Notify.php:752 +#: src/Navigation/Notifications/Repository/Notify.php:763 #, php-format msgid "%s %s tagged you" msgstr "%s%s vous a mentionné•e" -#: src/Navigation/Notifications/Repository/Notify.php:755 +#: src/Navigation/Notifications/Repository/Notify.php:766 #, php-format msgid "%s %s shared a new post" msgstr "%s %s a partagé une nouvelle publication" diff --git a/view/lang/fr/strings.php b/view/lang/fr/strings.php index bacc33f42..3da00ac15 100644 --- a/view/lang/fr/strings.php +++ b/view/lang/fr/strings.php @@ -413,6 +413,19 @@ $a->strings['Could not find any unarchived contact entry for this URL (%s)'] = ' $a->strings['The contact entries have been archived'] = 'Les contacts ont été archivés'; $a->strings['Could not find any contact entry for this URL (%s)'] = 'Aucun profil distant n\'a été trouvé à cette URL (%s)'; $a->strings['The contact has been blocked from the node'] = 'Le profile distant a été bloqué'; +$a->strings['%d %s, %d duplicates.'] = '%d%s, %d duplications.'; +$a->strings['uri-id is empty for contact %s.'] = 'l\'uri-id est vide pour le contact %s.'; +$a->strings['No valid first countact found for uri-id %d.'] = 'Aucun premier contact valide trouvé pour l\'uri-id %d.'; +$a->strings['Wrong duplicate found for uri-id %d in %d (url: %s != %s).'] = 'Mauvaise duplication trouvée pour l\'uri-id %d dans %d (url : %s != %s).'; +$a->strings['Wrong duplicate found for uri-id %d in %d (nurl: %s != %s).'] = 'Mauvaise duplication trouvée pour l\'uri-id %d dans %d (nurl : %s != %s).'; +$a->strings['Deletion of id %d failed'] = 'La suppression de l\'id %d a échoué.'; +$a->strings['Deletion of id %d was successful'] = 'id %d supprimé avec succès.'; +$a->strings['Updating "%s" in "%s" from %d to %d'] = 'Mise à jour de "%s" dans "%s" depuis %d vers %d'; +$a->strings[' - found'] = '- trouvé(s)'; +$a->strings[' - failed'] = '- échoué(s)'; +$a->strings[' - success'] = '- succès'; +$a->strings[' - deleted'] = '- supprimé(s)'; +$a->strings[' - done'] = '- fait(s)'; $a->strings['The avatar cache needs to be enabled to use this command.'] = 'Le cache des avatars doit être activé pour pouvoir utiliser cette commande.'; $a->strings['no resource in photo %s'] = 'Aucune ressource dans la photo %s'; $a->strings['no photo with id %s'] = 'aucune photo avec l\'id %s'; @@ -2262,8 +2275,14 @@ $a->strings['You receive a friend suggestion'] = 'Vous avez reçu une suggestion $a->strings['You are tagged in a post'] = 'Vous avez été mentionné•e dans une publication'; $a->strings['You are poked/prodded/etc. in a post'] = 'Vous avez été sollicité•e dans une publication'; $a->strings['Create a desktop notification when:'] = 'Créer une notification de bureau quand :'; +$a->strings['Someone tagged you'] = 'Quelqu\'un vous a mentionné'; +$a->strings['Someone directly commented on your post'] = 'Quelqu\'un a commenté directement sur votre publication'; $a->strings['Someone liked your content'] = 'Quelqu\'un a aimé votre contenu'; +$a->strings['Can only be enabled, when the direct comment notification is enabled.'] = 'Peut uniquement être activé quand la notification des commentaires directs est activée.'; $a->strings['Someone shared your content'] = 'Quelqu\'un a partagé votre contenu'; +$a->strings['Someone commented in your thread'] = 'Quelqu\'un a commenté dans votre conversation'; +$a->strings['Someone commented in a thread where you commented'] = 'Quelqu\'un a commenté dans une conversation où vous avez commenté'; +$a->strings['Someone commented in a thread where you interacted'] = 'Quelqu\'un a commenté dans une conversation avec laquelle vous avez interagi'; $a->strings['Activate desktop notifications'] = 'Activer les notifications de bureau'; $a->strings['Show desktop popup on new notifications'] = 'Afficher dans des pop-ups les nouvelles notifications'; $a->strings['Text-only notification emails'] = 'Courriels de notification en format texte';