From 8e50b3f9ce3b9a8e3d8a7a584dcaf20e38a99e2c Mon Sep 17 00:00:00 2001 From: Domovoy Date: Tue, 2 Oct 2012 16:03:20 +0200 Subject: [PATCH 01/74] Use saved_searches_aside.tpl in search.php --- mod/search.php | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/mod/search.php b/mod/search.php index 300eb912..87c72367 100644 --- a/mod/search.php +++ b/mod/search.php @@ -9,13 +9,26 @@ function search_saved_searches() { ); if(count($r)) { - $o .= '
'; - $o .= '

' . t('Saved Searches') . '

' . "\r\n"; - $o .= '
' . "\r\n"; + + + $tpl = get_markup_template("saved_searches_aside.tpl"); + + $o .= replace_macros($tpl, array( + '$title' => t('Saved Searches'), + '$add' => '', + '$searchbox' => '', + '$saved' => $saved, + )); } return $o; From 44acbb25e40c088d8e29dd0eaae0443d870e442e Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Tue, 2 Oct 2012 21:29:00 +0200 Subject: [PATCH 02/74] Bring back BB-Code in comments --- view/theme/cleanzero/theme.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/view/theme/cleanzero/theme.php b/view/theme/cleanzero/theme.php index c9936199..f65890f3 100644 --- a/view/theme/cleanzero/theme.php +++ b/view/theme/cleanzero/theme.php @@ -42,13 +42,22 @@ function insertFormatting(comment,BBcode,id) { return true; } -function cmtBbOpen(id) { - $(".comment-edit-bb-" + id).show(); +function cmtBbOpen(comment, id) { + if($(comment).hasClass('comment-edit-text-full')) { + $(".comment-edit-bb-" + id).show(); + return true; + } + return false; } function cmtBbClose(comment, id) { - $(".comment-edit-bb-" + id).hide(); +// if($(comment).hasClass('comment-edit-text-empty')) { +// $(".comment-edit-bb-" + id).hide(); +// return true; +// } + return false; } + $(document).ready(function() { $('.group-edit-icon').hover( From d651291916e0073bcc22cc219670c079e3aef3b7 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 3 Oct 2012 07:56:12 +0200 Subject: [PATCH 03/74] DE: update to the strings --- view/de/messages.po | 217 +++++++++++++++++++++++--------------------- view/de/strings.php | 2 + 2 files changed, 115 insertions(+), 104 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index 2e6c566a..20aa52a4 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-09-27 10:00-0700\n" -"PO-Revision-Date: 2012-09-30 06:05+0000\n" +"POT-Creation-Date: 2012-09-29 10:00-0700\n" +"PO-Revision-Date: 2012-10-03 05:50+0000\n" "Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -142,9 +142,9 @@ msgstr "Neues Foto von dieser URL" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 #: ../../mod/events.php:455 ../../mod/photos.php:1005 -#: ../../mod/photos.php:1081 ../../mod/photos.php:1338 -#: ../../mod/photos.php:1378 ../../mod/photos.php:1419 -#: ../../mod/photos.php:1451 ../../mod/install.php:246 +#: ../../mod/photos.php:1081 ../../mod/photos.php:1344 +#: ../../mod/photos.php:1384 ../../mod/photos.php:1427 +#: ../../mod/photos.php:1459 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 #: ../../mod/content.php:693 ../../mod/contacts.php:348 #: ../../mod/settings.php:543 ../../mod/settings.php:697 @@ -191,7 +191,7 @@ msgstr "Neues Foto von dieser URL" #: ../../view/theme/diabook/theme.php:757 #: ../../view/theme/diabook/config.php:190 #: ../../view/theme/quattro/config.php:53 ../../view/theme/dispy/config.php:70 -#: ../../object/Item.php:560 +#: ../../object/Item.php:558 msgid "Submit" msgstr "Senden" @@ -322,7 +322,7 @@ msgstr "Veranstaltung teilen" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:136 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:935 +#: ../../include/conversation.php:948 msgid "Cancel" msgstr "Abbrechen" @@ -396,13 +396,13 @@ msgstr "Fotoalben" #: ../../mod/photos.php:54 ../../mod/photos.php:149 ../../mod/photos.php:986 #: ../../mod/photos.php:1073 ../../mod/photos.php:1088 -#: ../../mod/photos.php:1530 ../../mod/photos.php:1542 +#: ../../mod/photos.php:1538 ../../mod/photos.php:1550 #: ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:598 msgid "Contact Photos" msgstr "Kontaktbilder" -#: ../../mod/photos.php:61 ../../mod/photos.php:1104 ../../mod/photos.php:1580 +#: ../../mod/photos.php:61 ../../mod/photos.php:1104 ../../mod/photos.php:1588 msgid "Upload New Photos" msgstr "Weitere Fotos hochladen" @@ -433,7 +433,7 @@ msgstr "Album nicht gefunden." msgid "Delete Album" msgstr "Album löschen" -#: ../../mod/photos.php:240 ../../mod/photos.php:1339 +#: ../../mod/photos.php:240 ../../mod/photos.php:1345 msgid "Delete Photo" msgstr "Foto löschen" @@ -441,8 +441,8 @@ msgstr "Foto löschen" msgid "was tagged in a" msgstr "wurde getaggt in einem" -#: ../../mod/photos.php:584 ../../mod/like.php:145 ../../mod/tagger.php:62 -#: ../../addon/communityhome/communityhome.php:163 +#: ../../mod/photos.php:584 ../../mod/like.php:145 ../../mod/subthread.php:87 +#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1439 #: ../../include/diaspora.php:1824 ../../include/conversation.php:125 #: ../../include/conversation.php:253 @@ -511,7 +511,7 @@ msgstr "oder existierender Albumname: " msgid "Do not show a status post for this upload" msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" -#: ../../mod/photos.php:1032 ../../mod/photos.php:1334 +#: ../../mod/photos.php:1032 ../../mod/photos.php:1340 msgid "Permissions" msgstr "Berechtigungen" @@ -527,7 +527,7 @@ msgstr "Zeige neueste zuerst" msgid "Show Oldest First" msgstr "Zeige älteste zuerst" -#: ../../mod/photos.php:1124 ../../mod/photos.php:1563 +#: ../../mod/photos.php:1124 ../../mod/photos.php:1571 msgid "View Photo" msgstr "Fotos betrachten" @@ -560,91 +560,91 @@ msgstr "Private Nachricht" msgid "View Full Size" msgstr "Betrachte Originalgröße" -#: ../../mod/photos.php:1311 +#: ../../mod/photos.php:1317 msgid "Tags: " msgstr "Tags: " -#: ../../mod/photos.php:1314 +#: ../../mod/photos.php:1320 msgid "[Remove any tag]" msgstr "[Tag entfernen]" -#: ../../mod/photos.php:1324 +#: ../../mod/photos.php:1330 msgid "Rotate CW (right)" msgstr "Drehen US (rechts)" -#: ../../mod/photos.php:1325 +#: ../../mod/photos.php:1331 msgid "Rotate CCW (left)" msgstr "Drehen EUS (links)" -#: ../../mod/photos.php:1327 +#: ../../mod/photos.php:1333 msgid "New album name" msgstr "Name des neuen Albums" -#: ../../mod/photos.php:1330 +#: ../../mod/photos.php:1336 msgid "Caption" msgstr "Bildunterschrift" -#: ../../mod/photos.php:1332 +#: ../../mod/photos.php:1338 msgid "Add a Tag" msgstr "Tag hinzufügen" -#: ../../mod/photos.php:1336 +#: ../../mod/photos.php:1342 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1356 ../../mod/content.php:667 +#: ../../mod/photos.php:1362 ../../mod/content.php:667 #: ../../object/Item.php:196 msgid "I like this (toggle)" msgstr "Ich mag das (toggle)" -#: ../../mod/photos.php:1357 ../../mod/content.php:668 +#: ../../mod/photos.php:1363 ../../mod/content.php:668 #: ../../object/Item.php:197 msgid "I don't like this (toggle)" msgstr "Ich mag das nicht (toggle)" -#: ../../mod/photos.php:1358 ../../include/conversation.php:896 +#: ../../mod/photos.php:1364 ../../include/conversation.php:909 msgid "Share" msgstr "Teilen" -#: ../../mod/photos.php:1359 ../../mod/editpost.php:112 +#: ../../mod/photos.php:1365 ../../mod/editpost.php:112 #: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:570 -#: ../../include/conversation.php:915 ../../object/Item.php:258 +#: ../../mod/message.php:481 ../../include/conversation.php:573 +#: ../../include/conversation.php:928 ../../object/Item.php:258 msgid "Please wait" msgstr "Bitte warten" -#: ../../mod/photos.php:1375 ../../mod/photos.php:1416 -#: ../../mod/photos.php:1448 ../../mod/content.php:690 -#: ../../object/Item.php:557 +#: ../../mod/photos.php:1381 ../../mod/photos.php:1424 +#: ../../mod/photos.php:1456 ../../mod/content.php:690 +#: ../../object/Item.php:555 msgid "This is you" msgstr "Das bist du" -#: ../../mod/photos.php:1377 ../../mod/photos.php:1418 -#: ../../mod/photos.php:1450 ../../mod/content.php:692 ../../boot.php:574 -#: ../../object/Item.php:559 +#: ../../mod/photos.php:1383 ../../mod/photos.php:1426 +#: ../../mod/photos.php:1458 ../../mod/content.php:692 ../../boot.php:574 +#: ../../object/Item.php:557 msgid "Comment" msgstr "Kommentar" -#: ../../mod/photos.php:1379 ../../mod/editpost.php:133 -#: ../../mod/content.php:702 ../../include/conversation.php:933 -#: ../../object/Item.php:569 +#: ../../mod/photos.php:1385 ../../mod/editpost.php:133 +#: ../../mod/content.php:702 ../../include/conversation.php:946 +#: ../../object/Item.php:567 msgid "Preview" msgstr "Vorschau" -#: ../../mod/photos.php:1479 ../../mod/content.php:439 +#: ../../mod/photos.php:1487 ../../mod/content.php:439 #: ../../mod/content.php:723 ../../mod/settings.php:606 #: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:515 ../../object/Item.php:117 +#: ../../include/conversation.php:518 ../../object/Item.php:117 msgid "Delete" msgstr "Löschen" -#: ../../mod/photos.php:1569 +#: ../../mod/photos.php:1577 msgid "View Album" msgstr "Album betrachten" -#: ../../mod/photos.php:1578 +#: ../../mod/photos.php:1586 msgid "Recent Photos" msgstr "Neueste Fotos" @@ -702,7 +702,7 @@ msgstr "Beitrag nicht gefunden" msgid "Edit post" msgstr "Beitrag bearbeiten" -#: ../../mod/editpost.php:88 ../../include/conversation.php:882 +#: ../../mod/editpost.php:88 ../../include/conversation.php:895 msgid "Post to Email" msgstr "An E-Mail senden" @@ -713,17 +713,17 @@ msgstr "Bearbeiten" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:897 +#: ../../include/conversation.php:910 msgid "Upload photo" msgstr "Foto hochladen" -#: ../../mod/editpost.php:105 ../../include/conversation.php:899 +#: ../../mod/editpost.php:105 ../../include/conversation.php:912 msgid "Attach file" msgstr "Datei anhängen" #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:901 +#: ../../include/conversation.php:914 msgid "Insert web link" msgstr "einen Link einfügen" @@ -739,35 +739,35 @@ msgstr "Vorbis [.ogg] Video einfügen" msgid "Insert Vorbis [.ogg] audio" msgstr "Vorbis [.ogg] Audio einfügen" -#: ../../mod/editpost.php:110 ../../include/conversation.php:907 +#: ../../mod/editpost.php:110 ../../include/conversation.php:920 msgid "Set your location" msgstr "Deinen Standort festlegen" -#: ../../mod/editpost.php:111 ../../include/conversation.php:909 +#: ../../mod/editpost.php:111 ../../include/conversation.php:922 msgid "Clear browser location" msgstr "Browser-Standort leeren" -#: ../../mod/editpost.php:113 ../../include/conversation.php:916 +#: ../../mod/editpost.php:113 ../../include/conversation.php:929 msgid "Permission settings" msgstr "Berechtigungseinstellungen" -#: ../../mod/editpost.php:121 ../../include/conversation.php:925 +#: ../../mod/editpost.php:121 ../../include/conversation.php:938 msgid "CC: email addresses" msgstr "Cc:-E-Mail-Addressen" -#: ../../mod/editpost.php:122 ../../include/conversation.php:926 +#: ../../mod/editpost.php:122 ../../include/conversation.php:939 msgid "Public post" msgstr "Öffentlicher Beitrag" -#: ../../mod/editpost.php:125 ../../include/conversation.php:912 +#: ../../mod/editpost.php:125 ../../include/conversation.php:925 msgid "Set title" msgstr "Titel setzen" -#: ../../mod/editpost.php:127 ../../include/conversation.php:914 +#: ../../mod/editpost.php:127 ../../include/conversation.php:927 msgid "Categories (comma-separated list)" msgstr "Kategorien (kommasepariert)" -#: ../../mod/editpost.php:128 ../../include/conversation.php:928 +#: ../../mod/editpost.php:128 ../../include/conversation.php:941 msgid "Example: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com" @@ -1310,24 +1310,24 @@ msgid "Group: " msgstr "Gruppe: " #: ../../mod/content.php:438 ../../mod/content.php:722 -#: ../../include/conversation.php:514 ../../object/Item.php:116 +#: ../../include/conversation.php:517 ../../object/Item.php:116 msgid "Select" msgstr "Auswählen" #: ../../mod/content.php:455 ../../mod/content.php:815 -#: ../../mod/content.php:816 ../../include/conversation.php:533 +#: ../../mod/content.php:816 ../../include/conversation.php:536 #: ../../object/Item.php:227 ../../object/Item.php:228 #, php-format msgid "View %s's profile @ %s" msgstr "Das Profil von %s auf %s betrachten." #: ../../mod/content.php:465 ../../mod/content.php:827 -#: ../../include/conversation.php:553 ../../object/Item.php:240 +#: ../../include/conversation.php:556 ../../object/Item.php:240 #, php-format msgid "%s from %s" msgstr "%s von %s" -#: ../../mod/content.php:480 ../../include/conversation.php:568 +#: ../../mod/content.php:480 ../../include/conversation.php:571 msgid "View in context" msgstr "Im Zusammenhang betrachten" @@ -1368,35 +1368,35 @@ msgstr "Weitersagen" msgid "share" msgstr "Teilen" -#: ../../mod/content.php:694 ../../object/Item.php:561 +#: ../../mod/content.php:694 ../../object/Item.php:559 msgid "Bold" msgstr "Fett" -#: ../../mod/content.php:695 ../../object/Item.php:562 +#: ../../mod/content.php:695 ../../object/Item.php:560 msgid "Italic" msgstr "Kursiv" -#: ../../mod/content.php:696 ../../object/Item.php:563 +#: ../../mod/content.php:696 ../../object/Item.php:561 msgid "Underline" msgstr "Unterstrichen" -#: ../../mod/content.php:697 ../../object/Item.php:564 +#: ../../mod/content.php:697 ../../object/Item.php:562 msgid "Quote" msgstr "Zitat" -#: ../../mod/content.php:698 ../../object/Item.php:565 +#: ../../mod/content.php:698 ../../object/Item.php:563 msgid "Code" msgstr "Code" -#: ../../mod/content.php:699 ../../object/Item.php:566 +#: ../../mod/content.php:699 ../../object/Item.php:564 msgid "Image" msgstr "Bild" -#: ../../mod/content.php:700 ../../object/Item.php:567 +#: ../../mod/content.php:700 ../../object/Item.php:565 msgid "Link" msgstr "Verweis" -#: ../../mod/content.php:701 ../../object/Item.php:568 +#: ../../mod/content.php:701 ../../object/Item.php:566 msgid "Video" msgstr "Video" @@ -2683,7 +2683,7 @@ msgstr "Kein Empfänger." #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:833 ../../include/conversation.php:850 +#: ../../include/conversation.php:846 ../../include/conversation.php:863 msgid "Please enter a link URL:" msgstr "Bitte gib die URL des Links ein:" @@ -3083,8 +3083,8 @@ msgstr "Registrieren" msgid "People Search" msgstr "Personensuche" -#: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/tagger.php:62 -#: ../../addon/facebook/facebook.php:1598 +#: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87 +#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:565 @@ -4081,6 +4081,11 @@ msgstr "Gemeinsame Freunde" msgid "No contacts in common." msgstr "Keine gemeinsamen Kontakte." +#: ../../mod/subthread.php:103 +#, php-format +msgid "%1$s is following %2$s's %3$s" +msgstr "%1$s folgt %2$s %3$s" + #: ../../mod/share.php:28 msgid "link" msgstr "Link" @@ -4409,8 +4414,8 @@ msgstr "sichtbar für jeden" msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" -#: ../../mod/filer.php:29 ../../include/conversation.php:837 -#: ../../include/conversation.php:854 +#: ../../mod/filer.php:29 ../../include/conversation.php:850 +#: ../../include/conversation.php:867 msgid "Save to Folder:" msgstr "In diesen Ordner verschieben:" @@ -8508,34 +8513,34 @@ msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das msgid "stopped following" msgstr "wird nicht mehr gefolgt" -#: ../../include/Contact.php:220 ../../include/conversation.php:734 +#: ../../include/Contact.php:220 ../../include/conversation.php:743 msgid "Poke" msgstr "Anstupsen" -#: ../../include/Contact.php:221 ../../include/conversation.php:728 +#: ../../include/Contact.php:221 ../../include/conversation.php:737 msgid "View Status" msgstr "Pinnwand anschauen" -#: ../../include/Contact.php:222 ../../include/conversation.php:729 +#: ../../include/Contact.php:222 ../../include/conversation.php:738 msgid "View Profile" msgstr "Profil anschauen" -#: ../../include/Contact.php:223 ../../include/conversation.php:730 +#: ../../include/Contact.php:223 ../../include/conversation.php:739 msgid "View Photos" msgstr "Bilder anschauen" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:731 +#: ../../include/conversation.php:740 msgid "Network Posts" msgstr "Netzwerkbeiträge" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:732 +#: ../../include/conversation.php:741 msgid "Edit Contact" msgstr "Kontakt bearbeiten" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:733 +#: ../../include/conversation.php:742 msgid "Send PM" msgstr "Private Nachricht senden" @@ -8553,118 +8558,122 @@ msgstr "Nachricht/Beitrag" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert" -#: ../../include/conversation.php:545 ../../object/Item.php:218 +#: ../../include/conversation.php:548 ../../object/Item.php:218 msgid "Categories:" msgstr "Kategorien" -#: ../../include/conversation.php:546 ../../object/Item.php:219 +#: ../../include/conversation.php:549 ../../object/Item.php:219 msgid "Filed under:" msgstr "Abgelegt unter:" -#: ../../include/conversation.php:630 +#: ../../include/conversation.php:633 msgid "remove" msgstr "löschen" -#: ../../include/conversation.php:634 +#: ../../include/conversation.php:637 msgid "Delete Selected Items" msgstr "Lösche die markierten Beiträge" -#: ../../include/conversation.php:792 +#: ../../include/conversation.php:736 +msgid "Follow Thread" +msgstr "Folge der Unterhaltung" + +#: ../../include/conversation.php:805 #, php-format msgid "%s likes this." msgstr "%s mag das." -#: ../../include/conversation.php:792 +#: ../../include/conversation.php:805 #, php-format msgid "%s doesn't like this." msgstr "%s mag das nicht." -#: ../../include/conversation.php:796 +#: ../../include/conversation.php:809 #, php-format msgid "%2$d people like this." msgstr "%2$d Leute mögen das." -#: ../../include/conversation.php:798 +#: ../../include/conversation.php:811 #, php-format msgid "%2$d people don't like this." msgstr "%2$d Leute mögen das nicht." -#: ../../include/conversation.php:804 +#: ../../include/conversation.php:817 msgid "and" msgstr "und" -#: ../../include/conversation.php:807 +#: ../../include/conversation.php:820 #, php-format msgid ", and %d other people" msgstr " und %d andere" -#: ../../include/conversation.php:808 +#: ../../include/conversation.php:821 #, php-format msgid "%s like this." msgstr "%s mögen das." -#: ../../include/conversation.php:808 +#: ../../include/conversation.php:821 #, php-format msgid "%s don't like this." msgstr "%s mögen das nicht." -#: ../../include/conversation.php:832 ../../include/conversation.php:849 +#: ../../include/conversation.php:845 ../../include/conversation.php:862 msgid "Visible to everybody" msgstr "Für jedermann sichtbar" -#: ../../include/conversation.php:834 ../../include/conversation.php:851 +#: ../../include/conversation.php:847 ../../include/conversation.php:864 msgid "Please enter a video link/URL:" msgstr "Bitte Link/URL zum Video einfügen:" -#: ../../include/conversation.php:835 ../../include/conversation.php:852 +#: ../../include/conversation.php:848 ../../include/conversation.php:865 msgid "Please enter an audio link/URL:" msgstr "Bitte Link/URL zum Audio einfügen:" -#: ../../include/conversation.php:836 ../../include/conversation.php:853 +#: ../../include/conversation.php:849 ../../include/conversation.php:866 msgid "Tag term:" msgstr "Tag:" -#: ../../include/conversation.php:838 ../../include/conversation.php:855 +#: ../../include/conversation.php:851 ../../include/conversation.php:868 msgid "Where are you right now?" msgstr "Wo hältst du dich jetzt gerade auf?" -#: ../../include/conversation.php:898 +#: ../../include/conversation.php:911 msgid "upload photo" msgstr "Bild hochladen" -#: ../../include/conversation.php:900 +#: ../../include/conversation.php:913 msgid "attach file" msgstr "Datei anhängen" -#: ../../include/conversation.php:902 +#: ../../include/conversation.php:915 msgid "web link" msgstr "Weblink" -#: ../../include/conversation.php:903 +#: ../../include/conversation.php:916 msgid "Insert video link" msgstr "Video-Adresse einfügen" -#: ../../include/conversation.php:904 +#: ../../include/conversation.php:917 msgid "video link" msgstr "Video-Link" -#: ../../include/conversation.php:905 +#: ../../include/conversation.php:918 msgid "Insert audio link" msgstr "Audio-Adresse einfügen" -#: ../../include/conversation.php:906 +#: ../../include/conversation.php:919 msgid "audio link" msgstr "Audio-Link" -#: ../../include/conversation.php:908 +#: ../../include/conversation.php:921 msgid "set location" msgstr "Ort setzen" -#: ../../include/conversation.php:910 +#: ../../include/conversation.php:923 msgid "clear location" msgstr "Ort löschen" -#: ../../include/conversation.php:917 +#: ../../include/conversation.php:930 msgid "permissions" msgstr "Zugriffsrechte" diff --git a/view/de/strings.php b/view/de/strings.php index 8b58fccf..b172ff9c 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -913,6 +913,7 @@ $a->strings["Login failed."] = "Anmeldung fehlgeschlagen."; $a->strings["Contact added"] = "Kontakt hinzugefügt"; $a->strings["Common Friends"] = "Gemeinsame Freunde"; $a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte."; +$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt %2\$s %3\$s"; $a->strings["link"] = "Link"; $a->strings["Item has been removed."] = "Eintrag wurde entfernt."; $a->strings["Applications"] = "Anwendungen"; @@ -1954,6 +1955,7 @@ $a->strings["Categories:"] = "Kategorien"; $a->strings["Filed under:"] = "Abgelegt unter:"; $a->strings["remove"] = "löschen"; $a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge"; +$a->strings["Follow Thread"] = "Folge der Unterhaltung"; $a->strings["%s likes this."] = "%s mag das."; $a->strings["%s doesn't like this."] = "%s mag das nicht."; $a->strings["%2\$d people like this."] = "%2\$d Leute mögen das."; From 122cf96ffdbe1f7ad781116eb7ca568c637cfc79 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 3 Oct 2012 07:56:29 +0200 Subject: [PATCH 04/74] FR: update to the strings --- view/fr/messages.po | 231 +++++++++++++++++++++++--------------------- view/fr/strings.php | 16 +-- 2 files changed, 129 insertions(+), 118 deletions(-) diff --git a/view/fr/messages.po b/view/fr/messages.po index df6288b4..d7a85b31 100644 --- a/view/fr/messages.po +++ b/view/fr/messages.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-09-27 10:00-0700\n" -"PO-Revision-Date: 2012-09-28 14:23+0000\n" +"POT-Creation-Date: 2012-09-29 10:00-0700\n" +"PO-Revision-Date: 2012-10-01 11:39+0000\n" "Last-Translator: Olivier \n" "Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n" "MIME-Version: 1.0\n" @@ -129,9 +129,9 @@ msgstr "Nouvelle photo depuis cette URL" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 #: ../../mod/events.php:455 ../../mod/photos.php:1005 -#: ../../mod/photos.php:1081 ../../mod/photos.php:1338 -#: ../../mod/photos.php:1378 ../../mod/photos.php:1419 -#: ../../mod/photos.php:1451 ../../mod/install.php:246 +#: ../../mod/photos.php:1081 ../../mod/photos.php:1344 +#: ../../mod/photos.php:1384 ../../mod/photos.php:1427 +#: ../../mod/photos.php:1459 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 #: ../../mod/content.php:693 ../../mod/contacts.php:348 #: ../../mod/settings.php:543 ../../mod/settings.php:697 @@ -178,7 +178,7 @@ msgstr "Nouvelle photo depuis cette URL" #: ../../view/theme/diabook/theme.php:757 #: ../../view/theme/diabook/config.php:190 #: ../../view/theme/quattro/config.php:53 ../../view/theme/dispy/config.php:70 -#: ../../object/Item.php:560 +#: ../../object/Item.php:558 msgid "Submit" msgstr "Envoyer" @@ -309,7 +309,7 @@ msgstr "Partager cet événement" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:136 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:935 +#: ../../include/conversation.php:948 msgid "Cancel" msgstr "Annuler" @@ -383,13 +383,13 @@ msgstr "Albums photo" #: ../../mod/photos.php:54 ../../mod/photos.php:149 ../../mod/photos.php:986 #: ../../mod/photos.php:1073 ../../mod/photos.php:1088 -#: ../../mod/photos.php:1530 ../../mod/photos.php:1542 +#: ../../mod/photos.php:1538 ../../mod/photos.php:1550 #: ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:598 msgid "Contact Photos" msgstr "Photos du contact" -#: ../../mod/photos.php:61 ../../mod/photos.php:1104 ../../mod/photos.php:1580 +#: ../../mod/photos.php:61 ../../mod/photos.php:1104 ../../mod/photos.php:1588 msgid "Upload New Photos" msgstr "Téléverser de nouvelles photos" @@ -420,7 +420,7 @@ msgstr "Album introuvable." msgid "Delete Album" msgstr "Effacer l'album" -#: ../../mod/photos.php:240 ../../mod/photos.php:1339 +#: ../../mod/photos.php:240 ../../mod/photos.php:1345 msgid "Delete Photo" msgstr "Effacer la photo" @@ -428,8 +428,8 @@ msgstr "Effacer la photo" msgid "was tagged in a" msgstr "a été identifié dans" -#: ../../mod/photos.php:584 ../../mod/like.php:145 ../../mod/tagger.php:62 -#: ../../addon/communityhome/communityhome.php:163 +#: ../../mod/photos.php:584 ../../mod/like.php:145 ../../mod/subthread.php:87 +#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1439 #: ../../include/diaspora.php:1824 ../../include/conversation.php:125 #: ../../include/conversation.php:253 @@ -498,7 +498,7 @@ msgstr "ou nom d'un album existant: " msgid "Do not show a status post for this upload" msgstr "Ne pas publier de notice pour cet envoi" -#: ../../mod/photos.php:1032 ../../mod/photos.php:1334 +#: ../../mod/photos.php:1032 ../../mod/photos.php:1340 msgid "Permissions" msgstr "Permissions" @@ -514,7 +514,7 @@ msgstr "Plus récent d'abord" msgid "Show Oldest First" msgstr "Plus ancien d'abord" -#: ../../mod/photos.php:1124 ../../mod/photos.php:1563 +#: ../../mod/photos.php:1124 ../../mod/photos.php:1571 msgid "View Photo" msgstr "Voir la photo" @@ -547,91 +547,91 @@ msgstr "Message privé" msgid "View Full Size" msgstr "Voir en taille réelle" -#: ../../mod/photos.php:1311 +#: ../../mod/photos.php:1317 msgid "Tags: " msgstr "Étiquettes: " -#: ../../mod/photos.php:1314 +#: ../../mod/photos.php:1320 msgid "[Remove any tag]" msgstr "[Retirer toutes les étiquettes]" -#: ../../mod/photos.php:1324 +#: ../../mod/photos.php:1330 msgid "Rotate CW (right)" msgstr "Tourner dans le sens des aiguilles d'une montre (vers la droite)" -#: ../../mod/photos.php:1325 +#: ../../mod/photos.php:1331 msgid "Rotate CCW (left)" msgstr "Tourner dans le sens contraire des aiguilles d'une montre (vers la gauche)" -#: ../../mod/photos.php:1327 +#: ../../mod/photos.php:1333 msgid "New album name" msgstr "Nom du nouvel album" -#: ../../mod/photos.php:1330 +#: ../../mod/photos.php:1336 msgid "Caption" msgstr "Titre" -#: ../../mod/photos.php:1332 +#: ../../mod/photos.php:1338 msgid "Add a Tag" msgstr "Ajouter une étiquette" -#: ../../mod/photos.php:1336 +#: ../../mod/photos.php:1342 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Exemples: @bob, @Barbara_Jensen, @jim@example.com, #Californie, #vacances" -#: ../../mod/photos.php:1356 ../../mod/content.php:667 +#: ../../mod/photos.php:1362 ../../mod/content.php:667 #: ../../object/Item.php:196 msgid "I like this (toggle)" msgstr "J'aime (bascule)" -#: ../../mod/photos.php:1357 ../../mod/content.php:668 +#: ../../mod/photos.php:1363 ../../mod/content.php:668 #: ../../object/Item.php:197 msgid "I don't like this (toggle)" msgstr "Je n'aime pas (bascule)" -#: ../../mod/photos.php:1358 ../../include/conversation.php:896 +#: ../../mod/photos.php:1364 ../../include/conversation.php:909 msgid "Share" msgstr "Partager" -#: ../../mod/photos.php:1359 ../../mod/editpost.php:112 +#: ../../mod/photos.php:1365 ../../mod/editpost.php:112 #: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:570 -#: ../../include/conversation.php:915 ../../object/Item.php:258 +#: ../../mod/message.php:481 ../../include/conversation.php:573 +#: ../../include/conversation.php:928 ../../object/Item.php:258 msgid "Please wait" msgstr "Patientez" -#: ../../mod/photos.php:1375 ../../mod/photos.php:1416 -#: ../../mod/photos.php:1448 ../../mod/content.php:690 -#: ../../object/Item.php:557 +#: ../../mod/photos.php:1381 ../../mod/photos.php:1424 +#: ../../mod/photos.php:1456 ../../mod/content.php:690 +#: ../../object/Item.php:555 msgid "This is you" msgstr "C'est vous" -#: ../../mod/photos.php:1377 ../../mod/photos.php:1418 -#: ../../mod/photos.php:1450 ../../mod/content.php:692 ../../boot.php:574 -#: ../../object/Item.php:559 +#: ../../mod/photos.php:1383 ../../mod/photos.php:1426 +#: ../../mod/photos.php:1458 ../../mod/content.php:692 ../../boot.php:574 +#: ../../object/Item.php:557 msgid "Comment" msgstr "Commenter" -#: ../../mod/photos.php:1379 ../../mod/editpost.php:133 -#: ../../mod/content.php:702 ../../include/conversation.php:933 -#: ../../object/Item.php:569 +#: ../../mod/photos.php:1385 ../../mod/editpost.php:133 +#: ../../mod/content.php:702 ../../include/conversation.php:946 +#: ../../object/Item.php:567 msgid "Preview" msgstr "Aperçu" -#: ../../mod/photos.php:1479 ../../mod/content.php:439 +#: ../../mod/photos.php:1487 ../../mod/content.php:439 #: ../../mod/content.php:723 ../../mod/settings.php:606 #: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:515 ../../object/Item.php:117 +#: ../../include/conversation.php:518 ../../object/Item.php:117 msgid "Delete" msgstr "Supprimer" -#: ../../mod/photos.php:1569 +#: ../../mod/photos.php:1577 msgid "View Album" msgstr "Voir l'album" -#: ../../mod/photos.php:1578 +#: ../../mod/photos.php:1586 msgid "Recent Photos" msgstr "Photos récentes" @@ -689,7 +689,7 @@ msgstr "Élément introuvable" msgid "Edit post" msgstr "Éditer la publication" -#: ../../mod/editpost.php:88 ../../include/conversation.php:882 +#: ../../mod/editpost.php:88 ../../include/conversation.php:895 msgid "Post to Email" msgstr "Publier aussi par courriel" @@ -700,17 +700,17 @@ msgstr "Éditer" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:897 +#: ../../include/conversation.php:910 msgid "Upload photo" msgstr "Joindre photo" -#: ../../mod/editpost.php:105 ../../include/conversation.php:899 +#: ../../mod/editpost.php:105 ../../include/conversation.php:912 msgid "Attach file" msgstr "Joindre fichier" #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:901 +#: ../../include/conversation.php:914 msgid "Insert web link" msgstr "Insérer lien web" @@ -726,35 +726,35 @@ msgstr "Insérer un lien vidéo Vorbis [.ogg]" msgid "Insert Vorbis [.ogg] audio" msgstr "Insérer un lien audio Vorbis [.ogg]" -#: ../../mod/editpost.php:110 ../../include/conversation.php:907 +#: ../../mod/editpost.php:110 ../../include/conversation.php:920 msgid "Set your location" msgstr "Définir votre localisation" -#: ../../mod/editpost.php:111 ../../include/conversation.php:909 +#: ../../mod/editpost.php:111 ../../include/conversation.php:922 msgid "Clear browser location" msgstr "Effacer la localisation du navigateur" -#: ../../mod/editpost.php:113 ../../include/conversation.php:916 +#: ../../mod/editpost.php:113 ../../include/conversation.php:929 msgid "Permission settings" msgstr "Réglages des permissions" -#: ../../mod/editpost.php:121 ../../include/conversation.php:925 +#: ../../mod/editpost.php:121 ../../include/conversation.php:938 msgid "CC: email addresses" msgstr "CC: adresses de courriel" -#: ../../mod/editpost.php:122 ../../include/conversation.php:926 +#: ../../mod/editpost.php:122 ../../include/conversation.php:939 msgid "Public post" msgstr "Notice publique" -#: ../../mod/editpost.php:125 ../../include/conversation.php:912 +#: ../../mod/editpost.php:125 ../../include/conversation.php:925 msgid "Set title" msgstr "Définir un titre" -#: ../../mod/editpost.php:127 ../../include/conversation.php:914 +#: ../../mod/editpost.php:127 ../../include/conversation.php:927 msgid "Categories (comma-separated list)" msgstr "Catégories (séparées par des virgules)" -#: ../../mod/editpost.php:128 ../../include/conversation.php:928 +#: ../../mod/editpost.php:128 ../../include/conversation.php:941 msgid "Example: bob@example.com, mary@example.com" msgstr "Exemple: bob@exemple.com, mary@exemple.com" @@ -1297,24 +1297,24 @@ msgid "Group: " msgstr "Groupe: " #: ../../mod/content.php:438 ../../mod/content.php:722 -#: ../../include/conversation.php:514 ../../object/Item.php:116 +#: ../../include/conversation.php:517 ../../object/Item.php:116 msgid "Select" msgstr "Sélectionner" #: ../../mod/content.php:455 ../../mod/content.php:815 -#: ../../mod/content.php:816 ../../include/conversation.php:533 +#: ../../mod/content.php:816 ../../include/conversation.php:536 #: ../../object/Item.php:227 ../../object/Item.php:228 #, php-format msgid "View %s's profile @ %s" msgstr "Voir le profil de %s @ %s" #: ../../mod/content.php:465 ../../mod/content.php:827 -#: ../../include/conversation.php:553 ../../object/Item.php:240 +#: ../../include/conversation.php:556 ../../object/Item.php:240 #, php-format msgid "%s from %s" msgstr "%s de %s" -#: ../../mod/content.php:480 ../../include/conversation.php:568 +#: ../../mod/content.php:480 ../../include/conversation.php:571 msgid "View in context" msgstr "Voir dans le contexte" @@ -1355,35 +1355,35 @@ msgstr "Partager" msgid "share" msgstr "partager" -#: ../../mod/content.php:694 ../../object/Item.php:561 +#: ../../mod/content.php:694 ../../object/Item.php:559 msgid "Bold" msgstr "Gras" -#: ../../mod/content.php:695 ../../object/Item.php:562 +#: ../../mod/content.php:695 ../../object/Item.php:560 msgid "Italic" msgstr "Italique" -#: ../../mod/content.php:696 ../../object/Item.php:563 +#: ../../mod/content.php:696 ../../object/Item.php:561 msgid "Underline" msgstr "Souligné" -#: ../../mod/content.php:697 ../../object/Item.php:564 +#: ../../mod/content.php:697 ../../object/Item.php:562 msgid "Quote" msgstr "Citation" -#: ../../mod/content.php:698 ../../object/Item.php:565 +#: ../../mod/content.php:698 ../../object/Item.php:563 msgid "Code" msgstr "Code" -#: ../../mod/content.php:699 ../../object/Item.php:566 +#: ../../mod/content.php:699 ../../object/Item.php:564 msgid "Image" msgstr "Image" -#: ../../mod/content.php:700 ../../object/Item.php:567 +#: ../../mod/content.php:700 ../../object/Item.php:565 msgid "Link" msgstr "Lien" -#: ../../mod/content.php:701 ../../object/Item.php:568 +#: ../../mod/content.php:701 ../../object/Item.php:566 msgid "Video" msgstr "Vidéo" @@ -2560,7 +2560,7 @@ msgstr "ajouter" #: ../../mod/network.php:287 msgid "Commented Order" -msgstr "Dans l'ordre des commentaires" +msgstr "Tri par commentaires" #: ../../mod/network.php:290 msgid "Sort by Comment Date" @@ -2568,7 +2568,7 @@ msgstr "Trier par date de commentaire" #: ../../mod/network.php:293 msgid "Posted Order" -msgstr "Dans l'ordre des notices" +msgstr "Tri par publications" #: ../../mod/network.php:296 msgid "Sort by Post Date" @@ -2670,7 +2670,7 @@ msgstr "Pas de destinataire." #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:833 ../../include/conversation.php:850 +#: ../../include/conversation.php:846 ../../include/conversation.php:863 msgid "Please enter a link URL:" msgstr "Entrez un lien web:" @@ -3070,8 +3070,8 @@ msgstr "S'inscrire" msgid "People Search" msgstr "Recherche de personnes" -#: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/tagger.php:62 -#: ../../addon/facebook/facebook.php:1598 +#: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87 +#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:565 @@ -3621,13 +3621,13 @@ msgstr "Permettre une imbrication infinie des commentaires." #: ../../mod/admin.php:470 msgid "Private posts by default for new users" -msgstr "" +msgstr "Publications privées par défaut pour les nouveaux utilisateurs" #: ../../mod/admin.php:470 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." -msgstr "" +msgstr "Rendre les posts de tous les nouveaux utilisateurs accessibles seulement par le groupe de contacts par défaut, et non par tout le monde." #: ../../mod/admin.php:472 msgid "Block multiple registrations" @@ -3859,7 +3859,7 @@ msgstr "Rejetter" #: ../../mod/admin.php:699 msgid "Site admin" -msgstr "" +msgstr "Administration du Site" #: ../../mod/admin.php:702 msgid "Register date" @@ -4068,6 +4068,11 @@ msgstr "Amis communs" msgid "No contacts in common." msgstr "Pas de contacts en commun." +#: ../../mod/subthread.php:103 +#, php-format +msgid "%1$s is following %2$s's %3$s" +msgstr "" + #: ../../mod/share.php:28 msgid "link" msgstr "lien" @@ -4396,8 +4401,8 @@ msgstr "visible par tous" msgid "Edit visibility" msgstr "Changer la visibilité" -#: ../../mod/filer.php:29 ../../include/conversation.php:837 -#: ../../include/conversation.php:854 +#: ../../mod/filer.php:29 ../../include/conversation.php:850 +#: ../../include/conversation.php:867 msgid "Save to Folder:" msgstr "Sauver dans le Dossier:" @@ -6127,11 +6132,11 @@ msgstr "Paramètres de la liste des forums" #: ../../addon/forumlist/forumlist.php:152 msgid "Randomise forum list" -msgstr "" +msgstr "Mélanger la liste de forums" #: ../../addon/forumlist/forumlist.php:155 msgid "Show forums on profile page" -msgstr "" +msgstr "Montrer les forums sur le profil" #: ../../addon/impressum/impressum.php:37 msgid "Impressum" @@ -8495,34 +8500,34 @@ msgstr "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probab msgid "stopped following" msgstr "retiré de la liste de suivi" -#: ../../include/Contact.php:220 ../../include/conversation.php:734 +#: ../../include/Contact.php:220 ../../include/conversation.php:743 msgid "Poke" msgstr "" -#: ../../include/Contact.php:221 ../../include/conversation.php:728 +#: ../../include/Contact.php:221 ../../include/conversation.php:737 msgid "View Status" msgstr "Voir les statuts" -#: ../../include/Contact.php:222 ../../include/conversation.php:729 +#: ../../include/Contact.php:222 ../../include/conversation.php:738 msgid "View Profile" msgstr "Voir le profil" -#: ../../include/Contact.php:223 ../../include/conversation.php:730 +#: ../../include/Contact.php:223 ../../include/conversation.php:739 msgid "View Photos" msgstr "Voir les photos" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:731 +#: ../../include/conversation.php:740 msgid "Network Posts" msgstr "Posts du Réseau" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:732 +#: ../../include/conversation.php:741 msgid "Edit Contact" msgstr "Éditer le contact" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:733 +#: ../../include/conversation.php:742 msgid "Send PM" msgstr "Message privé" @@ -8540,118 +8545,122 @@ msgstr "publication/élément" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "%1$s a marqué le %3$s de %2$s comme favori" -#: ../../include/conversation.php:545 ../../object/Item.php:218 +#: ../../include/conversation.php:548 ../../object/Item.php:218 msgid "Categories:" msgstr "Catégories:" -#: ../../include/conversation.php:546 ../../object/Item.php:219 +#: ../../include/conversation.php:549 ../../object/Item.php:219 msgid "Filed under:" msgstr "Rangé sous:" -#: ../../include/conversation.php:630 +#: ../../include/conversation.php:633 msgid "remove" msgstr "enlever" -#: ../../include/conversation.php:634 +#: ../../include/conversation.php:637 msgid "Delete Selected Items" msgstr "Supprimer les éléments sélectionnés" -#: ../../include/conversation.php:792 +#: ../../include/conversation.php:736 +msgid "Follow Thread" +msgstr "Suivre le fil" + +#: ../../include/conversation.php:805 #, php-format msgid "%s likes this." msgstr "%s aime ça." -#: ../../include/conversation.php:792 +#: ../../include/conversation.php:805 #, php-format msgid "%s doesn't like this." msgstr "%s n'aime pas ça." -#: ../../include/conversation.php:796 +#: ../../include/conversation.php:809 #, php-format msgid "%2$d people like this." msgstr "%2$d personnes aiment ça." -#: ../../include/conversation.php:798 +#: ../../include/conversation.php:811 #, php-format msgid "%2$d people don't like this." msgstr "%2$d personnes n'aiment pas ça." -#: ../../include/conversation.php:804 +#: ../../include/conversation.php:817 msgid "and" msgstr "et" -#: ../../include/conversation.php:807 +#: ../../include/conversation.php:820 #, php-format msgid ", and %d other people" msgstr ", et %d autres personnes" -#: ../../include/conversation.php:808 +#: ../../include/conversation.php:821 #, php-format msgid "%s like this." msgstr "%s aiment ça." -#: ../../include/conversation.php:808 +#: ../../include/conversation.php:821 #, php-format msgid "%s don't like this." msgstr "%s n'aiment pas ça." -#: ../../include/conversation.php:832 ../../include/conversation.php:849 +#: ../../include/conversation.php:845 ../../include/conversation.php:862 msgid "Visible to everybody" msgstr "Visible par tout le monde" -#: ../../include/conversation.php:834 ../../include/conversation.php:851 +#: ../../include/conversation.php:847 ../../include/conversation.php:864 msgid "Please enter a video link/URL:" msgstr "Entrez un lien/URL video :" -#: ../../include/conversation.php:835 ../../include/conversation.php:852 +#: ../../include/conversation.php:848 ../../include/conversation.php:865 msgid "Please enter an audio link/URL:" msgstr "Entrez un lien/URL audio :" -#: ../../include/conversation.php:836 ../../include/conversation.php:853 +#: ../../include/conversation.php:849 ../../include/conversation.php:866 msgid "Tag term:" msgstr "Tag : " -#: ../../include/conversation.php:838 ../../include/conversation.php:855 +#: ../../include/conversation.php:851 ../../include/conversation.php:868 msgid "Where are you right now?" msgstr "Où êtes-vous présentemment?" -#: ../../include/conversation.php:898 +#: ../../include/conversation.php:911 msgid "upload photo" msgstr "envoi image" -#: ../../include/conversation.php:900 +#: ../../include/conversation.php:913 msgid "attach file" msgstr "ajout fichier" -#: ../../include/conversation.php:902 +#: ../../include/conversation.php:915 msgid "web link" msgstr "lien web" -#: ../../include/conversation.php:903 +#: ../../include/conversation.php:916 msgid "Insert video link" msgstr "Insérer un lien video" -#: ../../include/conversation.php:904 +#: ../../include/conversation.php:917 msgid "video link" msgstr "lien vidéo" -#: ../../include/conversation.php:905 +#: ../../include/conversation.php:918 msgid "Insert audio link" msgstr "Insérer un lien audio" -#: ../../include/conversation.php:906 +#: ../../include/conversation.php:919 msgid "audio link" msgstr "lien audio" -#: ../../include/conversation.php:908 +#: ../../include/conversation.php:921 msgid "set location" msgstr "spéc. localisation" -#: ../../include/conversation.php:910 +#: ../../include/conversation.php:923 msgid "clear location" msgstr "supp. localisation" -#: ../../include/conversation.php:917 +#: ../../include/conversation.php:930 msgid "permissions" msgstr "permissions" diff --git a/view/fr/strings.php b/view/fr/strings.php index b9dedf68..bf75ad72 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -573,9 +573,9 @@ $a->strings["Search Results For:"] = "Résultats pour:"; $a->strings["Remove term"] = "Retirer le terme"; $a->strings["Saved Searches"] = "Recherches"; $a->strings["add"] = "ajouter"; -$a->strings["Commented Order"] = "Dans l'ordre des commentaires"; +$a->strings["Commented Order"] = "Tri par commentaires"; $a->strings["Sort by Comment Date"] = "Trier par date de commentaire"; -$a->strings["Posted Order"] = "Dans l'ordre des notices"; +$a->strings["Posted Order"] = "Tri par publications"; $a->strings["Sort by Post Date"] = "Trier par date de publication"; $a->strings["Posts that mention or involve you"] = "Publications qui vous concernent"; $a->strings["New"] = "Nouveau"; @@ -807,8 +807,8 @@ $a->strings["Global directory update URL"] = "URL de mise-à-jour de l'annuaire $a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL de mise-à-jour de l'annuaire global. Si vide, l'annuaire global sera complètement indisponible."; $a->strings["Allow threaded items"] = "Activer les commentaires imbriqués"; $a->strings["Allow infinite level threading for items on this site."] = "Permettre une imbrication infinie des commentaires."; -$a->strings["Private posts by default for new users"] = ""; -$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = ""; +$a->strings["Private posts by default for new users"] = "Publications privées par défaut pour les nouveaux utilisateurs"; +$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Rendre les posts de tous les nouveaux utilisateurs accessibles seulement par le groupe de contacts par défaut, et non par tout le monde."; $a->strings["Block multiple registrations"] = "Interdire les inscriptions multiples"; $a->strings["Disallow users to register additional accounts for use as pages."] = "Ne pas permettre l'inscription de comptes multiples comme des pages."; $a->strings["OpenID support"] = "Support OpenID"; @@ -864,7 +864,7 @@ $a->strings["Request date"] = "Date de la demande"; $a->strings["Email"] = "Courriel"; $a->strings["No registrations."] = "Pas d'inscriptions."; $a->strings["Deny"] = "Rejetter"; -$a->strings["Site admin"] = ""; +$a->strings["Site admin"] = "Administration du Site"; $a->strings["Register date"] = "Date d'inscription"; $a->strings["Last login"] = "Dernière connexion"; $a->strings["Last item"] = "Dernier élément"; @@ -913,6 +913,7 @@ $a->strings["Login failed."] = "Échec de connexion."; $a->strings["Contact added"] = "Contact ajouté"; $a->strings["Common Friends"] = "Amis communs"; $a->strings["No contacts in common."] = "Pas de contacts en commun."; +$a->strings["%1\$s is following %2\$s's %3\$s"] = ""; $a->strings["link"] = "lien"; $a->strings["Item has been removed."] = "Cet élément a été enlevé."; $a->strings["Applications"] = "Applications"; @@ -1391,8 +1392,8 @@ $a->strings["show/hide"] = "Montrer/cacher"; $a->strings["No forum subscriptions"] = "Pas d'abonnement au forum"; $a->strings["Forumlist settings updated."] = "Paramètres de la liste des forums mis à jour."; $a->strings["Forumlist Settings"] = "Paramètres de la liste des forums"; -$a->strings["Randomise forum list"] = ""; -$a->strings["Show forums on profile page"] = ""; +$a->strings["Randomise forum list"] = "Mélanger la liste de forums"; +$a->strings["Show forums on profile page"] = "Montrer les forums sur le profil"; $a->strings["Impressum"] = "Impressum"; $a->strings["Site Owner"] = "Propriétaire du site"; $a->strings["Email Address"] = "Adresse courriel"; @@ -1954,6 +1955,7 @@ $a->strings["Categories:"] = "Catégories:"; $a->strings["Filed under:"] = "Rangé sous:"; $a->strings["remove"] = "enlever"; $a->strings["Delete Selected Items"] = "Supprimer les éléments sélectionnés"; +$a->strings["Follow Thread"] = "Suivre le fil"; $a->strings["%s likes this."] = "%s aime ça."; $a->strings["%s doesn't like this."] = "%s n'aime pas ça."; $a->strings["%2\$d people like this."] = "%2\$d personnes aiment ça."; From 65b52878c4d779ee05304ed7699edba05eff030c Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 3 Oct 2012 09:00:59 +0200 Subject: [PATCH 05/74] CS: update to the strings --- view/cs/messages.po | 391 +++++++++++++++++++++----------------------- view/cs/strings.php | 40 ++--- 2 files changed, 205 insertions(+), 226 deletions(-) diff --git a/view/cs/messages.po b/view/cs/messages.po index 971d2177..6a239d3e 100644 --- a/view/cs/messages.po +++ b/view/cs/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-09-25 10:00-0700\n" -"PO-Revision-Date: 2012-09-26 08:15+0000\n" +"POT-Creation-Date: 2012-09-29 10:00-0700\n" +"PO-Revision-Date: 2012-10-02 20:11+0000\n" "Last-Translator: Michal Šupler \n" "Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n" "MIME-Version: 1.0\n" @@ -59,7 +59,7 @@ msgstr "Aktualizace kontaktu selhala." #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3908 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913 #: ../../index.php:317 msgid "Permission denied." msgstr "Přístup odmítnut." @@ -128,9 +128,9 @@ msgstr "Nové foto z této URL adresy" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 #: ../../mod/events.php:455 ../../mod/photos.php:1005 -#: ../../mod/photos.php:1081 ../../mod/photos.php:1338 -#: ../../mod/photos.php:1378 ../../mod/photos.php:1419 -#: ../../mod/photos.php:1451 ../../mod/install.php:246 +#: ../../mod/photos.php:1081 ../../mod/photos.php:1344 +#: ../../mod/photos.php:1384 ../../mod/photos.php:1427 +#: ../../mod/photos.php:1459 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 #: ../../mod/content.php:693 ../../mod/contacts.php:348 #: ../../mod/settings.php:543 ../../mod/settings.php:697 @@ -149,7 +149,7 @@ msgstr "Nové foto z této URL adresy" #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41 -#: ../../addon/forumlist/forumlist.php:169 +#: ../../addon/forumlist/forumlist.php:163 #: ../../addon/impressum/impressum.php:83 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57 #: ../../addon/qcomment/qcomment.php:61 @@ -177,7 +177,7 @@ msgstr "Nové foto z této URL adresy" #: ../../view/theme/diabook/theme.php:757 #: ../../view/theme/diabook/config.php:190 #: ../../view/theme/quattro/config.php:53 ../../view/theme/dispy/config.php:70 -#: ../../include/conversation.php:607 ../../object/Item.php:559 +#: ../../object/Item.php:558 msgid "Submit" msgstr "Odeslat" @@ -308,7 +308,7 @@ msgstr "Sdílet tuto událost" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:136 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:1307 +#: ../../include/conversation.php:948 msgid "Cancel" msgstr "Zrušit" @@ -382,13 +382,13 @@ msgstr "Fotoalba" #: ../../mod/photos.php:54 ../../mod/photos.php:149 ../../mod/photos.php:986 #: ../../mod/photos.php:1073 ../../mod/photos.php:1088 -#: ../../mod/photos.php:1530 ../../mod/photos.php:1542 +#: ../../mod/photos.php:1538 ../../mod/photos.php:1550 #: ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:598 msgid "Contact Photos" msgstr "Fotogalerie kontaktu" -#: ../../mod/photos.php:61 ../../mod/photos.php:1104 ../../mod/photos.php:1580 +#: ../../mod/photos.php:61 ../../mod/photos.php:1104 ../../mod/photos.php:1588 msgid "Upload New Photos" msgstr "Nahrát nové fotografie" @@ -419,7 +419,7 @@ msgstr "Album nenalezeno." msgid "Delete Album" msgstr "Smazat album" -#: ../../mod/photos.php:240 ../../mod/photos.php:1339 +#: ../../mod/photos.php:240 ../../mod/photos.php:1345 msgid "Delete Photo" msgstr "Smazat fotografii" @@ -427,8 +427,8 @@ msgstr "Smazat fotografii" msgid "was tagged in a" msgstr "štítek byl přidán v" -#: ../../mod/photos.php:584 ../../mod/like.php:145 ../../mod/tagger.php:62 -#: ../../addon/communityhome/communityhome.php:163 +#: ../../mod/photos.php:584 ../../mod/like.php:145 ../../mod/subthread.php:87 +#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1439 #: ../../include/diaspora.php:1824 ../../include/conversation.php:125 #: ../../include/conversation.php:253 @@ -497,7 +497,7 @@ msgstr "nebo stávající název alba: " msgid "Do not show a status post for this upload" msgstr "Nezobrazovat stav pro tento upload" -#: ../../mod/photos.php:1032 ../../mod/photos.php:1334 +#: ../../mod/photos.php:1032 ../../mod/photos.php:1340 msgid "Permissions" msgstr "Oprávnění:" @@ -513,7 +513,7 @@ msgstr "Zobrazit nejprve nejnovější:" msgid "Show Oldest First" msgstr "Zobrazit nejprve nejstarší:" -#: ../../mod/photos.php:1124 ../../mod/photos.php:1563 +#: ../../mod/photos.php:1124 ../../mod/photos.php:1571 msgid "View Photo" msgstr "Zobraz fotografii" @@ -538,7 +538,7 @@ msgid "Use as profile photo" msgstr "Použít jako profilovou fotografii" #: ../../mod/photos.php:1224 ../../mod/content.php:603 -#: ../../include/conversation.php:436 ../../object/Item.php:103 +#: ../../object/Item.php:103 msgid "Private Message" msgstr "Soukromá zpráva" @@ -546,94 +546,91 @@ msgstr "Soukromá zpráva" msgid "View Full Size" msgstr "Zobrazit v plné velikosti" -#: ../../mod/photos.php:1311 +#: ../../mod/photos.php:1317 msgid "Tags: " msgstr "Štítky: " -#: ../../mod/photos.php:1314 +#: ../../mod/photos.php:1320 msgid "[Remove any tag]" msgstr "[Odstranit všechny štítky]" -#: ../../mod/photos.php:1324 +#: ../../mod/photos.php:1330 msgid "Rotate CW (right)" msgstr "Rotovat po směru hodinových ručiček (doprava)" -#: ../../mod/photos.php:1325 +#: ../../mod/photos.php:1331 msgid "Rotate CCW (left)" msgstr "Rotovat proti směru hodinových ručiček (doleva)" -#: ../../mod/photos.php:1327 +#: ../../mod/photos.php:1333 msgid "New album name" msgstr "Nové jméno alba" -#: ../../mod/photos.php:1330 +#: ../../mod/photos.php:1336 msgid "Caption" msgstr "Titulek" -#: ../../mod/photos.php:1332 +#: ../../mod/photos.php:1338 msgid "Add a Tag" msgstr "Přidat štítek" -#: ../../mod/photos.php:1336 +#: ../../mod/photos.php:1342 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Příklad: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1356 ../../mod/content.php:667 -#: ../../include/conversation.php:581 ../../object/Item.php:195 +#: ../../mod/photos.php:1362 ../../mod/content.php:667 +#: ../../object/Item.php:196 msgid "I like this (toggle)" msgstr "Líbí se mi to (přepínač)" -#: ../../mod/photos.php:1357 ../../mod/content.php:668 -#: ../../include/conversation.php:582 ../../object/Item.php:196 +#: ../../mod/photos.php:1363 ../../mod/content.php:668 +#: ../../object/Item.php:197 msgid "I don't like this (toggle)" msgstr "Nelíbí se mi to (přepínač)" -#: ../../mod/photos.php:1358 ../../include/conversation.php:1268 +#: ../../mod/photos.php:1364 ../../include/conversation.php:909 msgid "Share" msgstr "Sdílet" -#: ../../mod/photos.php:1359 ../../mod/editpost.php:112 +#: ../../mod/photos.php:1365 ../../mod/editpost.php:112 #: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:686 -#: ../../include/conversation.php:944 ../../include/conversation.php:1287 -#: ../../object/Item.php:257 +#: ../../mod/message.php:481 ../../include/conversation.php:573 +#: ../../include/conversation.php:928 ../../object/Item.php:258 msgid "Please wait" msgstr "Čekejte prosím" -#: ../../mod/photos.php:1375 ../../mod/photos.php:1416 -#: ../../mod/photos.php:1448 ../../mod/content.php:690 -#: ../../include/conversation.php:604 ../../object/Item.php:556 +#: ../../mod/photos.php:1381 ../../mod/photos.php:1424 +#: ../../mod/photos.php:1456 ../../mod/content.php:690 +#: ../../object/Item.php:555 msgid "This is you" msgstr "Nastavte Vaši polohu" -#: ../../mod/photos.php:1377 ../../mod/photos.php:1418 -#: ../../mod/photos.php:1450 ../../mod/content.php:692 -#: ../../include/conversation.php:606 ../../boot.php:574 -#: ../../object/Item.php:558 +#: ../../mod/photos.php:1383 ../../mod/photos.php:1426 +#: ../../mod/photos.php:1458 ../../mod/content.php:692 ../../boot.php:574 +#: ../../object/Item.php:557 msgid "Comment" msgstr "Okomentovat" -#: ../../mod/photos.php:1379 ../../mod/editpost.php:133 -#: ../../mod/content.php:702 ../../include/conversation.php:616 -#: ../../include/conversation.php:1305 ../../object/Item.php:568 +#: ../../mod/photos.php:1385 ../../mod/editpost.php:133 +#: ../../mod/content.php:702 ../../include/conversation.php:946 +#: ../../object/Item.php:567 msgid "Preview" msgstr "Náhled" -#: ../../mod/photos.php:1479 ../../mod/content.php:439 +#: ../../mod/photos.php:1487 ../../mod/content.php:439 #: ../../mod/content.php:723 ../../mod/settings.php:606 #: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:448 ../../include/conversation.php:889 -#: ../../object/Item.php:116 +#: ../../include/conversation.php:518 ../../object/Item.php:117 msgid "Delete" msgstr "Odstranit" -#: ../../mod/photos.php:1569 +#: ../../mod/photos.php:1577 msgid "View Album" msgstr "Zobrazit album" -#: ../../mod/photos.php:1578 +#: ../../mod/photos.php:1586 msgid "Recent Photos" msgstr "Aktuální fotografie" @@ -691,29 +688,28 @@ msgstr "Položka nenalezena" msgid "Edit post" msgstr "Upravit příspěvek" -#: ../../mod/editpost.php:88 ../../include/conversation.php:1254 +#: ../../mod/editpost.php:88 ../../include/conversation.php:895 msgid "Post to Email" msgstr "Poslat příspěvek na e-mail" #: ../../mod/editpost.php:103 ../../mod/content.php:710 -#: ../../mod/settings.php:605 ../../include/conversation.php:441 -#: ../../object/Item.php:107 +#: ../../mod/settings.php:605 ../../object/Item.php:107 msgid "Edit" msgstr "Upravit" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:1269 +#: ../../include/conversation.php:910 msgid "Upload photo" msgstr "Nahrát fotografii" -#: ../../mod/editpost.php:105 ../../include/conversation.php:1271 +#: ../../mod/editpost.php:105 ../../include/conversation.php:912 msgid "Attach file" msgstr "Přiložit soubor" #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:1273 +#: ../../include/conversation.php:914 msgid "Insert web link" msgstr "Vložit webový odkaz" @@ -729,35 +725,35 @@ msgstr "Vložit Vorbis [.ogg] video" msgid "Insert Vorbis [.ogg] audio" msgstr "Vložit Vorbis [.ogg] audio" -#: ../../mod/editpost.php:110 ../../include/conversation.php:1279 +#: ../../mod/editpost.php:110 ../../include/conversation.php:920 msgid "Set your location" msgstr "Nastavte vaši polohu" -#: ../../mod/editpost.php:111 ../../include/conversation.php:1281 +#: ../../mod/editpost.php:111 ../../include/conversation.php:922 msgid "Clear browser location" msgstr "Odstranit adresu v prohlížeči" -#: ../../mod/editpost.php:113 ../../include/conversation.php:1288 +#: ../../mod/editpost.php:113 ../../include/conversation.php:929 msgid "Permission settings" msgstr "Nastavení oprávnění" -#: ../../mod/editpost.php:121 ../../include/conversation.php:1297 +#: ../../mod/editpost.php:121 ../../include/conversation.php:938 msgid "CC: email addresses" msgstr "skrytá kopie: e-mailové adresy" -#: ../../mod/editpost.php:122 ../../include/conversation.php:1298 +#: ../../mod/editpost.php:122 ../../include/conversation.php:939 msgid "Public post" msgstr "Veřejný příspěvek" -#: ../../mod/editpost.php:125 ../../include/conversation.php:1284 +#: ../../mod/editpost.php:125 ../../include/conversation.php:925 msgid "Set title" msgstr "Nastavit titulek" -#: ../../mod/editpost.php:127 ../../include/conversation.php:1286 +#: ../../mod/editpost.php:127 ../../include/conversation.php:927 msgid "Categories (comma-separated list)" msgstr "Kategorie (čárkou oddělený seznam)" -#: ../../mod/editpost.php:128 ../../include/conversation.php:1300 +#: ../../mod/editpost.php:128 ../../include/conversation.php:941 msgid "Example: bob@example.com, mary@example.com" msgstr "Příklad: bob@example.com, mary@example.com" @@ -879,7 +875,7 @@ msgstr "Prosím potvrďte Vaši žádost o propojení %s." msgid "Confirm" msgstr "Potvrdit" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3287 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292 msgid "[Name Withheld]" msgstr "[Jméno odepřeno]" @@ -1301,32 +1297,28 @@ msgid "Group: " msgstr "Skupina: " #: ../../mod/content.php:438 ../../mod/content.php:722 -#: ../../include/conversation.php:447 ../../include/conversation.php:888 -#: ../../object/Item.php:115 +#: ../../include/conversation.php:517 ../../object/Item.php:116 msgid "Select" msgstr "Vybrat" #: ../../mod/content.php:455 ../../mod/content.php:815 -#: ../../mod/content.php:816 ../../include/conversation.php:654 -#: ../../include/conversation.php:655 ../../include/conversation.php:907 -#: ../../object/Item.php:226 ../../object/Item.php:227 +#: ../../mod/content.php:816 ../../include/conversation.php:536 +#: ../../object/Item.php:227 ../../object/Item.php:228 #, php-format msgid "View %s's profile @ %s" msgstr "Zobrazit profil uživatele %s na %s" #: ../../mod/content.php:465 ../../mod/content.php:827 -#: ../../include/conversation.php:668 ../../include/conversation.php:927 -#: ../../object/Item.php:239 +#: ../../include/conversation.php:556 ../../object/Item.php:240 #, php-format msgid "%s from %s" msgstr "%s od %s" -#: ../../mod/content.php:480 ../../include/conversation.php:942 +#: ../../mod/content.php:480 ../../include/conversation.php:571 msgid "View in context" msgstr "Pohled v kontextu" -#: ../../mod/content.php:586 ../../include/conversation.php:695 -#: ../../object/Item.php:276 +#: ../../mod/content.php:586 ../../object/Item.php:277 #, php-format msgid "%d comment" msgid_plural "%d comments" @@ -1335,8 +1327,7 @@ msgstr[1] "%d komentářů" msgstr[2] "%d komentářů" #: ../../mod/content.php:588 ../../include/text.php:1443 -#: ../../include/conversation.php:697 ../../object/Item.php:278 -#: ../../object/Item.php:291 +#: ../../object/Item.php:279 ../../object/Item.php:292 msgid "comment" msgid_plural "comments" msgstr[0] "" @@ -1345,113 +1336,92 @@ msgstr[2] "komentář" #: ../../mod/content.php:589 ../../addon/page/page.php:76 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:195 ../../include/conversation.php:698 -#: ../../boot.php:575 ../../object/Item.php:279 +#: ../../include/contact_widgets.php:195 ../../boot.php:575 +#: ../../object/Item.php:280 msgid "show more" msgstr "zobrazit více" -#: ../../mod/content.php:667 ../../include/conversation.php:581 -#: ../../object/Item.php:195 +#: ../../mod/content.php:667 ../../object/Item.php:196 msgid "like" msgstr "má rád" -#: ../../mod/content.php:668 ../../include/conversation.php:582 -#: ../../object/Item.php:196 +#: ../../mod/content.php:668 ../../object/Item.php:197 msgid "dislike" msgstr "nemá rád" -#: ../../mod/content.php:670 ../../include/conversation.php:584 -#: ../../object/Item.php:198 +#: ../../mod/content.php:670 ../../object/Item.php:199 msgid "Share this" msgstr "Sdílet toto" -#: ../../mod/content.php:670 ../../include/conversation.php:584 -#: ../../object/Item.php:198 +#: ../../mod/content.php:670 ../../object/Item.php:199 msgid "share" msgstr "sdílí" -#: ../../mod/content.php:694 ../../include/conversation.php:608 -#: ../../object/Item.php:560 +#: ../../mod/content.php:694 ../../object/Item.php:559 msgid "Bold" msgstr "Tučné" -#: ../../mod/content.php:695 ../../include/conversation.php:609 -#: ../../object/Item.php:561 +#: ../../mod/content.php:695 ../../object/Item.php:560 msgid "Italic" msgstr "Kurzíva" -#: ../../mod/content.php:696 ../../include/conversation.php:610 -#: ../../object/Item.php:562 +#: ../../mod/content.php:696 ../../object/Item.php:561 msgid "Underline" msgstr "Podrtžené" -#: ../../mod/content.php:697 ../../include/conversation.php:611 -#: ../../object/Item.php:563 +#: ../../mod/content.php:697 ../../object/Item.php:562 msgid "Quote" msgstr "Citovat" -#: ../../mod/content.php:698 ../../include/conversation.php:612 -#: ../../object/Item.php:564 +#: ../../mod/content.php:698 ../../object/Item.php:563 msgid "Code" msgstr "Kód" -#: ../../mod/content.php:699 ../../include/conversation.php:613 -#: ../../object/Item.php:565 +#: ../../mod/content.php:699 ../../object/Item.php:564 msgid "Image" msgstr "Obrázek" -#: ../../mod/content.php:700 ../../include/conversation.php:614 -#: ../../object/Item.php:566 +#: ../../mod/content.php:700 ../../object/Item.php:565 msgid "Link" msgstr "Odkaz" -#: ../../mod/content.php:701 ../../include/conversation.php:615 -#: ../../object/Item.php:567 +#: ../../mod/content.php:701 ../../object/Item.php:566 msgid "Video" msgstr "Video" -#: ../../mod/content.php:735 ../../include/conversation.php:545 -#: ../../object/Item.php:179 +#: ../../mod/content.php:735 ../../object/Item.php:180 msgid "add star" msgstr "přidat hvězdu" -#: ../../mod/content.php:736 ../../include/conversation.php:546 -#: ../../object/Item.php:180 +#: ../../mod/content.php:736 ../../object/Item.php:181 msgid "remove star" msgstr "odebrat hvězdu" -#: ../../mod/content.php:737 ../../include/conversation.php:547 -#: ../../object/Item.php:181 +#: ../../mod/content.php:737 ../../object/Item.php:182 msgid "toggle star status" msgstr "přepnout hvězdu" -#: ../../mod/content.php:740 ../../include/conversation.php:550 -#: ../../object/Item.php:184 +#: ../../mod/content.php:740 ../../object/Item.php:185 msgid "starred" msgstr "označeno hvězdou" -#: ../../mod/content.php:741 ../../include/conversation.php:551 -#: ../../object/Item.php:185 +#: ../../mod/content.php:741 ../../object/Item.php:186 msgid "add tag" msgstr "přidat štítek" -#: ../../mod/content.php:745 ../../include/conversation.php:451 -#: ../../object/Item.php:119 +#: ../../mod/content.php:745 ../../object/Item.php:120 msgid "save to folder" msgstr "uložit do složky" -#: ../../mod/content.php:817 ../../include/conversation.php:656 -#: ../../object/Item.php:228 +#: ../../mod/content.php:817 ../../object/Item.php:229 msgid "to" msgstr "pro" -#: ../../mod/content.php:818 ../../include/conversation.php:657 -#: ../../object/Item.php:229 +#: ../../mod/content.php:818 ../../object/Item.php:230 msgid "Wall-to-Wall" msgstr "Zeď-na-Zeď" -#: ../../mod/content.php:819 ../../include/conversation.php:658 -#: ../../object/Item.php:230 +#: ../../mod/content.php:819 ../../object/Item.php:231 msgid "via Wall-To-Wall:" msgstr "přes Zeď-na-Zeď " @@ -1970,7 +1940,7 @@ msgstr "Na %s bylo zažádáno o resetování hesla" #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3296 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301 #: ../../boot.php:788 msgid "Administrator" msgstr "Administrátor" @@ -2290,7 +2260,7 @@ msgstr "Minimum 10 sekund, žádné maximum." #: ../../mod/settings.php:776 msgid "Number of items to display per page:" -msgstr "" +msgstr "Počet položek zobrazených na stránce:" #: ../../mod/settings.php:776 msgid "Maximum of 100 items" @@ -2704,7 +2674,7 @@ msgstr "Žádný příjemce." #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:1205 ../../include/conversation.php:1222 +#: ../../include/conversation.php:846 ../../include/conversation.php:863 msgid "Please enter a link URL:" msgstr "Zadejte prosím URL odkaz:" @@ -3104,8 +3074,8 @@ msgstr "Registrovat" msgid "People Search" msgstr "Vyhledávání lidí" -#: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/tagger.php:62 -#: ../../addon/facebook/facebook.php:1598 +#: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87 +#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:565 @@ -3130,7 +3100,7 @@ msgstr "%1$s nemá rád %2$s na %3$s" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 -#: ../../mod/display.php:145 ../../include/items.php:3774 +#: ../../mod/display.php:145 ../../include/items.php:3779 msgid "Item not found." msgstr "Položka nenalezena." @@ -3204,7 +3174,7 @@ msgstr "%s poslal aktualizaci." #: ../../mod/mood.php:62 ../../include/conversation.php:226 #, php-format msgid "%1$s is currently %2$s" -msgstr "" +msgstr "%1$s je právě %2$s" #: ../../mod/mood.php:133 msgid "Mood" @@ -3656,13 +3626,13 @@ msgstr "Povolit zpracování obsahu tohoto webu neomezeným počtem paralelních #: ../../mod/admin.php:470 msgid "Private posts by default for new users" -msgstr "" +msgstr "Nastavit pro nové uživatele příspěvky jako soukromé" #: ../../mod/admin.php:470 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." -msgstr "" +msgstr "Nastavit defaultní práva pro příspěvky od všech nových členů na výchozí soukromou skupinu raději než jako veřejné." #: ../../mod/admin.php:472 msgid "Block multiple registrations" @@ -4030,48 +4000,48 @@ msgstr "Přístup na tento profil byl omezen." msgid "Tips for New Members" msgstr "Tipy pro nové členy" -#: ../../mod/ping.php:235 +#: ../../mod/ping.php:238 msgid "{0} wants to be your friend" msgstr "{0} chce být Vaším přítelem" -#: ../../mod/ping.php:240 +#: ../../mod/ping.php:243 msgid "{0} sent you a message" msgstr "{0} vám poslal zprávu" -#: ../../mod/ping.php:245 +#: ../../mod/ping.php:248 msgid "{0} requested registration" msgstr "{0} požaduje registraci" -#: ../../mod/ping.php:251 +#: ../../mod/ping.php:254 #, php-format msgid "{0} commented %s's post" msgstr "{0} komentoval příspěvek uživatele %s" -#: ../../mod/ping.php:256 +#: ../../mod/ping.php:259 #, php-format msgid "{0} liked %s's post" msgstr "{0} má rád příspěvek uživatele %s" -#: ../../mod/ping.php:261 +#: ../../mod/ping.php:264 #, php-format msgid "{0} disliked %s's post" msgstr "{0} nemá rád příspěvek uživatele %s" -#: ../../mod/ping.php:266 +#: ../../mod/ping.php:269 #, php-format msgid "{0} is now friends with %s" msgstr "{0} se skamarádil s %s" -#: ../../mod/ping.php:271 +#: ../../mod/ping.php:274 msgid "{0} posted" msgstr "{0} zasláno" -#: ../../mod/ping.php:276 +#: ../../mod/ping.php:279 #, php-format msgid "{0} tagged %s's post with #%s" msgstr "{0} označen %s' příspěvek s #%s" -#: ../../mod/ping.php:282 +#: ../../mod/ping.php:285 msgid "{0} mentioned you in a post" msgstr "{0} vás zmínil v příspěvku" @@ -4105,6 +4075,11 @@ msgstr "Společní přátelé" msgid "No contacts in common." msgstr "Žádné společné kontakty." +#: ../../mod/subthread.php:103 +#, php-format +msgid "%1$s is following %2$s's %3$s" +msgstr "%1$s následuje %3$s uživatele %2$s" + #: ../../mod/share.php:28 msgid "link" msgstr "odkaz" @@ -4433,8 +4408,8 @@ msgstr "viditelné pro všechny" msgid "Edit visibility" msgstr "Upravit viditelnost" -#: ../../mod/filer.php:29 ../../include/conversation.php:1209 -#: ../../include/conversation.php:1226 +#: ../../mod/filer.php:29 ../../include/conversation.php:850 +#: ../../include/conversation.php:867 msgid "Save to Folder:" msgstr "Uložit do složky:" @@ -5095,11 +5070,11 @@ msgstr "" #: ../../addon/morepokes/morepokes.php:22 msgid "point out the poke feature to" -msgstr "" +msgstr "upozornit na poke funkci uživatele" #: ../../addon/morepokes/morepokes.php:22 msgid "pointed out the poke feature to" -msgstr "" +msgstr "upozorněn na poke funkci " #: ../../addon/morepokes/morepokes.php:23 msgid "declare undying love for" @@ -5300,11 +5275,11 @@ msgid "%s - Click to open/close" msgstr "%s - Klikněte pro otevření/zavření" #: ../../addon/page/page.php:61 ../../addon/page/page.php:91 -#: ../../addon/forumlist/forumlist.php:54 +#: ../../addon/forumlist/forumlist.php:55 msgid "Forums" msgstr "Fóra" -#: ../../addon/page/page.php:129 ../../addon/forumlist/forumlist.php:88 +#: ../../addon/page/page.php:129 ../../addon/forumlist/forumlist.php:89 msgid "Forums:" msgstr "Fóra:" @@ -5316,7 +5291,7 @@ msgstr "Nastavení stránky aktualizováno." msgid "Page Settings" msgstr "Nastavení stránky" -#: ../../addon/page/page.php:196 ../../addon/forumlist/forumlist.php:155 +#: ../../addon/page/page.php:196 msgid "How many forums to display on sidebar without paging" msgstr "Kolik diskuzních fór zobrazit v bočním panelu bez použití stránkování" @@ -6149,7 +6124,7 @@ msgstr "Použití OEmbed pro videa na YouTube" msgid "URL to embed:" msgstr "URL adresa k vložení:" -#: ../../addon/forumlist/forumlist.php:57 +#: ../../addon/forumlist/forumlist.php:58 msgid "show/hide" msgstr "zobrazit/skrýt" @@ -6157,21 +6132,21 @@ msgstr "zobrazit/skrýt" msgid "No forum subscriptions" msgstr "Žádné registrace k fórům" -#: ../../addon/forumlist/forumlist.php:124 +#: ../../addon/forumlist/forumlist.php:125 msgid "Forumlist settings updated." msgstr "Nastavení Forumlist aktualizováno." -#: ../../addon/forumlist/forumlist.php:153 +#: ../../addon/forumlist/forumlist.php:150 msgid "Forumlist Settings" msgstr "Nastavení Forumlist" -#: ../../addon/forumlist/forumlist.php:158 -msgid "Randomise Forumlist/Forum list" -msgstr "Náhodně rozdělit seznam Forumlist/Forum" +#: ../../addon/forumlist/forumlist.php:152 +msgid "Randomise forum list" +msgstr "Zamíchat list fór" -#: ../../addon/forumlist/forumlist.php:161 -msgid "Show forumlists/forums on profile forumlist" -msgstr "Zobrazit forumlists/forums na profilu forumlist" +#: ../../addon/forumlist/forumlist.php:155 +msgid "Show forums on profile page" +msgstr "Zobrazit fóra na profilové stránce" #: ../../addon/impressum/impressum.php:37 msgid "Impressum" @@ -6562,15 +6537,15 @@ msgstr "Jabber server" #: ../../addon/jappixmini/jappixmini.php:281 msgid "Jabber BOSH host" -msgstr "" +msgstr "Jabber BOSH host" #: ../../addon/jappixmini/jappixmini.php:285 msgid "Jabber password" -msgstr "" +msgstr "Jabber heslo" #: ../../addon/jappixmini/jappixmini.php:290 msgid "Encrypt Jabber password with Friendica password (recommended)" -msgstr "" +msgstr "Zašifrovat Jabber heslo s heslem Friendica (doporučeno)" #: ../../addon/jappixmini/jappixmini.php:293 msgid "Friendica password" @@ -6578,11 +6553,11 @@ msgstr "Friendica heslo" #: ../../addon/jappixmini/jappixmini.php:296 msgid "Approve subscription requests from Friendica contacts automatically" -msgstr "" +msgstr "Automaticky schválit požadavek na členství od Friedica kontaktů." #: ../../addon/jappixmini/jappixmini.php:299 msgid "Subscribe to Friendica contacts automatically" -msgstr "" +msgstr "Automaticky zaslat požadavek na členství Friedica kontaktům." #: ../../addon/jappixmini/jappixmini.php:302 msgid "Purge internal list of jabber addresses of contacts" @@ -6964,20 +6939,20 @@ msgstr "Oblíbené kanály" #: ../../addon/fromapp/fromapp.php:38 msgid "Fromapp settings updated." -msgstr "" +msgstr "Fromapp nastavení aktualizováno." #: ../../addon/fromapp/fromapp.php:64 msgid "FromApp Settings" -msgstr "" +msgstr "FromApp nastavení" #: ../../addon/fromapp/fromapp.php:66 msgid "" "The application name you would like to show your posts originating from." -msgstr "" +msgstr "Jméno aplikace, které chcete aby bylo jako zdroj u vašich příspěvků" #: ../../addon/fromapp/fromapp.php:70 msgid "Use this application name even if another application was used." -msgstr "" +msgstr "Použij toto jméno aplikace i když byla použita jiná aplikace" #: ../../addon/blogger/blogger.php:42 msgid "Post to blogger" @@ -8155,12 +8130,12 @@ msgstr "sekund" msgid "%1$d %2$s ago" msgstr "před %1$d %2$s" -#: ../../include/datetime.php:472 ../../include/items.php:1683 +#: ../../include/datetime.php:472 ../../include/items.php:1688 #, php-format msgid "%s's birthday" msgstr "%s má narozeniny" -#: ../../include/datetime.php:473 ../../include/items.php:1684 +#: ../../include/datetime.php:473 ../../include/items.php:1689 #, php-format msgid "Happy Birthday %s" msgstr "Veselé narozeniny %s" @@ -8435,15 +8410,15 @@ msgstr "Nepodařilo se získat kontaktní informace." msgid "following" msgstr "následující" -#: ../../include/items.php:3294 +#: ../../include/items.php:3299 msgid "A new person is sharing with you at " msgstr "Nový člověk si s vámi sdílí na" -#: ../../include/items.php:3294 +#: ../../include/items.php:3299 msgid "You have a new follower at " msgstr "Máte nového následovníka na" -#: ../../include/items.php:3975 +#: ../../include/items.php:3980 msgid "Archives" msgstr "Archív" @@ -8537,34 +8512,34 @@ msgstr "Formulářový bezpečnostní token nebyl správný. To pravděpodobně msgid "stopped following" msgstr "následování zastaveno" -#: ../../include/Contact.php:220 ../../include/conversation.php:1106 +#: ../../include/Contact.php:220 ../../include/conversation.php:743 msgid "Poke" msgstr "Šťouchnout" -#: ../../include/Contact.php:221 ../../include/conversation.php:1100 +#: ../../include/Contact.php:221 ../../include/conversation.php:737 msgid "View Status" msgstr "Zobrazit Status" -#: ../../include/Contact.php:222 ../../include/conversation.php:1101 +#: ../../include/Contact.php:222 ../../include/conversation.php:738 msgid "View Profile" msgstr "Zobrazit Profil" -#: ../../include/Contact.php:223 ../../include/conversation.php:1102 +#: ../../include/Contact.php:223 ../../include/conversation.php:739 msgid "View Photos" msgstr "Zobrazit Fotky" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:1103 +#: ../../include/conversation.php:740 msgid "Network Posts" msgstr "Zobrazit Příspěvky sítě" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:1104 +#: ../../include/conversation.php:741 msgid "Edit Contact" msgstr "Editovat Kontakty" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:1105 +#: ../../include/conversation.php:742 msgid "Send PM" msgstr "Poslat soukromou zprávu" @@ -8582,120 +8557,122 @@ msgstr "příspěvek/položka" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "uživatel %1$s označil %2$s's %3$s jako oblíbeného" -#: ../../include/conversation.php:645 ../../include/conversation.php:919 -#: ../../object/Item.php:217 +#: ../../include/conversation.php:548 ../../object/Item.php:218 msgid "Categories:" -msgstr "" +msgstr "Kategorie:" -#: ../../include/conversation.php:646 ../../include/conversation.php:920 -#: ../../object/Item.php:218 +#: ../../include/conversation.php:549 ../../object/Item.php:219 msgid "Filed under:" -msgstr "" +msgstr "Vyplněn pod:" -#: ../../include/conversation.php:1002 +#: ../../include/conversation.php:633 msgid "remove" msgstr "odstranit" -#: ../../include/conversation.php:1006 +#: ../../include/conversation.php:637 msgid "Delete Selected Items" msgstr "Smazat vybrané položky" -#: ../../include/conversation.php:1164 +#: ../../include/conversation.php:736 +msgid "Follow Thread" +msgstr "Následovat vlákno" + +#: ../../include/conversation.php:805 #, php-format msgid "%s likes this." msgstr "%s se to líbí." -#: ../../include/conversation.php:1164 +#: ../../include/conversation.php:805 #, php-format msgid "%s doesn't like this." msgstr "%s se to nelíbí." -#: ../../include/conversation.php:1168 +#: ../../include/conversation.php:809 #, php-format msgid "%2$d people like this." msgstr "%2$d lidem se to líbí." -#: ../../include/conversation.php:1170 +#: ../../include/conversation.php:811 #, php-format msgid "%2$d people don't like this." msgstr "%2$d lidem se to nelíbí." -#: ../../include/conversation.php:1176 +#: ../../include/conversation.php:817 msgid "and" msgstr "a" -#: ../../include/conversation.php:1179 +#: ../../include/conversation.php:820 #, php-format msgid ", and %d other people" msgstr ", a %d dalších lidí" -#: ../../include/conversation.php:1180 +#: ../../include/conversation.php:821 #, php-format msgid "%s like this." msgstr "%s se to líbí." -#: ../../include/conversation.php:1180 +#: ../../include/conversation.php:821 #, php-format msgid "%s don't like this." msgstr "%s se to nelíbí." -#: ../../include/conversation.php:1204 ../../include/conversation.php:1221 +#: ../../include/conversation.php:845 ../../include/conversation.php:862 msgid "Visible to everybody" msgstr "Viditelné pro všechny" -#: ../../include/conversation.php:1206 ../../include/conversation.php:1223 +#: ../../include/conversation.php:847 ../../include/conversation.php:864 msgid "Please enter a video link/URL:" msgstr "Prosím zadejte URL adresu videa:" -#: ../../include/conversation.php:1207 ../../include/conversation.php:1224 +#: ../../include/conversation.php:848 ../../include/conversation.php:865 msgid "Please enter an audio link/URL:" msgstr "Prosím zadejte URL adresu zvukového záznamu:" -#: ../../include/conversation.php:1208 ../../include/conversation.php:1225 +#: ../../include/conversation.php:849 ../../include/conversation.php:866 msgid "Tag term:" msgstr "Štítek:" -#: ../../include/conversation.php:1210 ../../include/conversation.php:1227 +#: ../../include/conversation.php:851 ../../include/conversation.php:868 msgid "Where are you right now?" msgstr "Kde právě jste?" -#: ../../include/conversation.php:1270 +#: ../../include/conversation.php:911 msgid "upload photo" msgstr "nahrát fotky" -#: ../../include/conversation.php:1272 +#: ../../include/conversation.php:913 msgid "attach file" msgstr "přidat soubor" -#: ../../include/conversation.php:1274 +#: ../../include/conversation.php:915 msgid "web link" msgstr "webový odkaz" -#: ../../include/conversation.php:1275 +#: ../../include/conversation.php:916 msgid "Insert video link" msgstr "Zadejte odkaz na video" -#: ../../include/conversation.php:1276 +#: ../../include/conversation.php:917 msgid "video link" msgstr "odkaz na video" -#: ../../include/conversation.php:1277 +#: ../../include/conversation.php:918 msgid "Insert audio link" msgstr "Zadejte odkaz na zvukový záznam" -#: ../../include/conversation.php:1278 +#: ../../include/conversation.php:919 msgid "audio link" msgstr "odkaz na audio" -#: ../../include/conversation.php:1280 +#: ../../include/conversation.php:921 msgid "set location" msgstr "nastavit místo" -#: ../../include/conversation.php:1282 +#: ../../include/conversation.php:923 msgid "clear location" msgstr "vymazat místo" -#: ../../include/conversation.php:1289 +#: ../../include/conversation.php:930 msgid "permissions" msgstr "oprávnění" diff --git a/view/cs/strings.php b/view/cs/strings.php index c4ad3036..e8484b92 100644 --- a/view/cs/strings.php +++ b/view/cs/strings.php @@ -502,7 +502,7 @@ $a->strings["Display Theme:"] = "Vybrat grafickou šablonu:"; $a->strings["Mobile Theme:"] = "Téma pro mobilní zařízení:"; $a->strings["Update browser every xx seconds"] = "Aktualizovat prohlížeč každých xx sekund"; $a->strings["Minimum of 10 seconds, no maximum"] = "Minimum 10 sekund, žádné maximum."; -$a->strings["Number of items to display per page:"] = ""; +$a->strings["Number of items to display per page:"] = "Počet položek zobrazených na stránce:"; $a->strings["Maximum of 100 items"] = "Maximum 100 položek"; $a->strings["Don't show emoticons"] = "Nezobrazovat emotikony"; $a->strings["Normal Account Page"] = "Normální stránka účtu"; @@ -706,7 +706,7 @@ $a->strings["This message was sent to you by %s, a member of the Friendica socia $a->strings["You may visit them online at %s"] = "Můžete je navštívit online na adrese %s"; $a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Pokud nechcete dostávat tyto zprávy, kontaktujte prosím odesilatele odpovědí na tento záznam."; $a->strings["%s posted an update."] = "%s poslal aktualizaci."; -$a->strings["%1\$s is currently %2\$s"] = ""; +$a->strings["%1\$s is currently %2\$s"] = "%1\$s je právě %2\$s"; $a->strings["Mood"] = "Nálada"; $a->strings["Set your current mood and tell your friends"] = "Nastavte svou aktuální náladu a řekněte to Vašim přátelům"; $a->strings["Image uploaded but image cropping failed."] = "Obrázek byl odeslán, ale jeho oříznutí se nesdařilo."; @@ -813,8 +813,8 @@ $a->strings["Global directory update URL"] = "aktualizace URL adresy Globálníh $a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL adresa k aktualizaci globálního adresáře. Pokud není zadáno, funkce globálního adresáře není dostupná žádné aplikaci."; $a->strings["Allow threaded items"] = "Povolit vícevláknové zpracování obsahu"; $a->strings["Allow infinite level threading for items on this site."] = "Povolit zpracování obsahu tohoto webu neomezeným počtem paralelních vláken."; -$a->strings["Private posts by default for new users"] = ""; -$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = ""; +$a->strings["Private posts by default for new users"] = "Nastavit pro nové uživatele příspěvky jako soukromé"; +$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Nastavit defaultní práva pro příspěvky od všech nových členů na výchozí soukromou skupinu raději než jako veřejné."; $a->strings["Block multiple registrations"] = "Blokovat více registrací"; $a->strings["Disallow users to register additional accounts for use as pages."] = "Znemožnit uživatelům registraci dodatečných účtů k použití jako stránky."; $a->strings["OpenID support"] = "podpora OpenID"; @@ -921,6 +921,7 @@ $a->strings["Login failed."] = "Přihlášení se nezdařilo."; $a->strings["Contact added"] = "Kontakt přidán"; $a->strings["Common Friends"] = "Společní přátelé"; $a->strings["No contacts in common."] = "Žádné společné kontakty."; +$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s následuje %3\$s uživatele %2\$s"; $a->strings["link"] = "odkaz"; $a->strings["Item has been removed."] = "Položka byla odstraněna."; $a->strings["Applications"] = "Aplikace"; @@ -1156,8 +1157,8 @@ $a->strings["shag"] = ""; $a->strings["shagged"] = ""; $a->strings["do something obscenely biological to"] = ""; $a->strings["did something obscenely biological to"] = ""; -$a->strings["point out the poke feature to"] = ""; -$a->strings["pointed out the poke feature to"] = ""; +$a->strings["point out the poke feature to"] = "upozornit na poke funkci uživatele"; +$a->strings["pointed out the poke feature to"] = "upozorněn na poke funkci "; $a->strings["declare undying love for"] = "vyjadřit nehynoucí lásku ke"; $a->strings["declared undying love for"] = "vyjadřil nehynoucí lásku ke"; $a->strings["patent"] = "patentovat"; @@ -1402,8 +1403,8 @@ $a->strings["show/hide"] = "zobrazit/skrýt"; $a->strings["No forum subscriptions"] = "Žádné registrace k fórům"; $a->strings["Forumlist settings updated."] = "Nastavení Forumlist aktualizováno."; $a->strings["Forumlist Settings"] = "Nastavení Forumlist"; -$a->strings["Randomise Forumlist/Forum list"] = "Náhodně rozdělit seznam Forumlist/Forum"; -$a->strings["Show forumlists/forums on profile forumlist"] = "Zobrazit forumlists/forums na profilu forumlist"; +$a->strings["Randomise forum list"] = "Zamíchat list fór"; +$a->strings["Show forums on profile page"] = "Zobrazit fóra na profilové stránce"; $a->strings["Impressum"] = "Impressum"; $a->strings["Site Owner"] = "Vlastník webu"; $a->strings["Email Address"] = "E-mailová adresa"; @@ -1491,12 +1492,12 @@ $a->strings["Activate addon"] = "Aktivovat rozšíření"; $a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "Nevlkádejte Jappixmini Chat-Widget do webového rozhraní"; $a->strings["Jabber username"] = "Jabber uživatelské jméno"; $a->strings["Jabber server"] = "Jabber server"; -$a->strings["Jabber BOSH host"] = ""; -$a->strings["Jabber password"] = ""; -$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = ""; +$a->strings["Jabber BOSH host"] = "Jabber BOSH host"; +$a->strings["Jabber password"] = "Jabber heslo"; +$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Zašifrovat Jabber heslo s heslem Friendica (doporučeno)"; $a->strings["Friendica password"] = "Friendica heslo"; -$a->strings["Approve subscription requests from Friendica contacts automatically"] = ""; -$a->strings["Subscribe to Friendica contacts automatically"] = ""; +$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Automaticky schválit požadavek na členství od Friedica kontaktů."; +$a->strings["Subscribe to Friendica contacts automatically"] = "Automaticky zaslat požadavek na členství Friedica kontaktům."; $a->strings["Purge internal list of jabber addresses of contacts"] = ""; $a->strings["Add contact"] = "Přidat kontakt"; $a->strings["View Source"] = "Zobrazit zdroj"; @@ -1580,10 +1581,10 @@ $a->strings["Popular Channels (comma separated)"] = "Oblíbené Kanály (odděle $a->strings["IRC settings saved."] = "Nastavení IRC uloženo."; $a->strings["IRC Chatroom"] = "IRC Místnost"; $a->strings["Popular Channels"] = "Oblíbené kanály"; -$a->strings["Fromapp settings updated."] = ""; -$a->strings["FromApp Settings"] = ""; -$a->strings["The application name you would like to show your posts originating from."] = ""; -$a->strings["Use this application name even if another application was used."] = ""; +$a->strings["Fromapp settings updated."] = "Fromapp nastavení aktualizováno."; +$a->strings["FromApp Settings"] = "FromApp nastavení"; +$a->strings["The application name you would like to show your posts originating from."] = "Jméno aplikace, které chcete aby bylo jako zdroj u vašich příspěvků"; +$a->strings["Use this application name even if another application was used."] = "Použij toto jméno aplikace i když byla použita jiná aplikace"; $a->strings["Post to blogger"] = "Poslat na blogger"; $a->strings["Blogger Post Settings"] = "Nastavení příspěvků na Blogger "; $a->strings["Enable Blogger Post Plugin"] = "Povolit Blogger Post Plugin"; @@ -1963,10 +1964,11 @@ $a->strings["Send PM"] = "Poslat soukromou zprávu"; $a->strings["%1\$s poked %2\$s"] = "%1\$s šťouchnul %2\$s"; $a->strings["post/item"] = "příspěvek/položka"; $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "uživatel %1\$s označil %2\$s's %3\$s jako oblíbeného"; -$a->strings["Categories:"] = ""; -$a->strings["Filed under:"] = ""; +$a->strings["Categories:"] = "Kategorie:"; +$a->strings["Filed under:"] = "Vyplněn pod:"; $a->strings["remove"] = "odstranit"; $a->strings["Delete Selected Items"] = "Smazat vybrané položky"; +$a->strings["Follow Thread"] = "Následovat vlákno"; $a->strings["%s likes this."] = "%s se to líbí."; $a->strings["%s doesn't like this."] = "%s se to nelíbí."; $a->strings["%2\$d people like this."] = "%2\$d lidem se to líbí."; From 1e93c85a4964139b9c8011092be9a1d16d510767 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Oct 2012 18:26:53 -0700 Subject: [PATCH 06/74] rev update --- boot.php | 2 +- util/messages.po | 460 ++++++++++++++++++++++++----------------------- 2 files changed, 233 insertions(+), 229 deletions(-) diff --git a/boot.php b/boot.php index 600a02af..63e22d00 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1481' ); +define ( 'FRIENDICA_VERSION', '3.0.1485' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); diff --git a/util/messages.po b/util/messages.po index 09a7f54f..2dafeaf6 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1481\n" +"Project-Id-Version: 3.0.1485\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-29 10:00-0700\n" +"POT-Creation-Date: 2012-10-03 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -36,7 +36,7 @@ msgstr "" #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:55 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:128 ../../mod/photos.php:972 +#: ../../mod/api.php:31 ../../mod/photos.php:128 ../../mod/photos.php:990 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135 #: ../../mod/notifications.php:66 ../../mod/contacts.php:146 #: ../../mod/settings.php:86 ../../mod/settings.php:525 @@ -53,7 +53,7 @@ msgstr "" #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 #: ../../mod/wall_upload.php:64 ../../mod/follow.php:9 #: ../../mod/display.php:141 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:413 ../../mod/delegate.php:6 +#: ../../mod/profiles.php:424 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 @@ -126,10 +126,10 @@ msgid "New photo from this URL" msgstr "" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:455 ../../mod/photos.php:1005 -#: ../../mod/photos.php:1081 ../../mod/photos.php:1344 -#: ../../mod/photos.php:1384 ../../mod/photos.php:1427 -#: ../../mod/photos.php:1459 ../../mod/install.php:246 +#: ../../mod/events.php:455 ../../mod/photos.php:1023 +#: ../../mod/photos.php:1099 ../../mod/photos.php:1362 +#: ../../mod/photos.php:1402 ../../mod/photos.php:1445 +#: ../../mod/photos.php:1477 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 #: ../../mod/content.php:693 ../../mod/contacts.php:348 #: ../../mod/settings.php:543 ../../mod/settings.php:697 @@ -137,7 +137,7 @@ msgstr "" #: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294 #: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:689 #: ../../mod/admin.php:826 ../../mod/admin.php:1025 ../../mod/admin.php:1112 -#: ../../mod/profiles.php:583 ../../mod/invite.php:119 +#: ../../mod/profiles.php:594 ../../mod/invite.php:119 #: ../../addon/fromgplus/fromgplus.php:40 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90 @@ -236,7 +236,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:131 -#: ../../include/nav.php:52 ../../boot.php:1689 +#: ../../include/nav.php:52 ../../boot.php:1700 msgid "Events" msgstr "" @@ -292,7 +292,7 @@ msgstr "" #: ../../mod/events.php:448 ../../mod/directory.php:134 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412 -#: ../../boot.php:1226 +#: ../../boot.php:1236 msgid "Location:" msgstr "" @@ -359,7 +359,7 @@ msgstr "" #: ../../mod/settings.php:963 ../../mod/settings.php:964 #: ../../mod/settings.php:965 ../../mod/settings.php:966 #: ../../mod/settings.php:967 ../../mod/register.php:236 -#: ../../mod/profiles.php:563 +#: ../../mod/profiles.php:574 msgid "Yes" msgstr "" @@ -371,23 +371,23 @@ msgstr "" #: ../../mod/settings.php:963 ../../mod/settings.php:964 #: ../../mod/settings.php:965 ../../mod/settings.php:966 #: ../../mod/settings.php:967 ../../mod/register.php:237 -#: ../../mod/profiles.php:564 +#: ../../mod/profiles.php:575 msgid "No" msgstr "" -#: ../../mod/photos.php:46 ../../boot.php:1682 +#: ../../mod/photos.php:46 ../../boot.php:1693 msgid "Photo Albums" msgstr "" -#: ../../mod/photos.php:54 ../../mod/photos.php:149 ../../mod/photos.php:986 -#: ../../mod/photos.php:1073 ../../mod/photos.php:1088 -#: ../../mod/photos.php:1538 ../../mod/photos.php:1550 +#: ../../mod/photos.php:54 ../../mod/photos.php:149 ../../mod/photos.php:1004 +#: ../../mod/photos.php:1091 ../../mod/photos.php:1106 +#: ../../mod/photos.php:1556 ../../mod/photos.php:1568 #: ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:598 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:61 ../../mod/photos.php:1104 ../../mod/photos.php:1588 +#: ../../mod/photos.php:61 ../../mod/photos.php:1122 ../../mod/photos.php:1606 msgid "Upload New Photos" msgstr "" @@ -399,8 +399,8 @@ msgstr "" msgid "Contact information unavailable" msgstr "" -#: ../../mod/photos.php:149 ../../mod/photos.php:653 ../../mod/photos.php:1073 -#: ../../mod/photos.php:1088 ../../mod/profile_photo.php:74 +#: ../../mod/photos.php:149 ../../mod/photos.php:671 ../../mod/photos.php:1091 +#: ../../mod/photos.php:1106 ../../mod/profile_photo.php:74 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 @@ -414,184 +414,184 @@ msgstr "" msgid "Album not found." msgstr "" -#: ../../mod/photos.php:177 ../../mod/photos.php:1082 +#: ../../mod/photos.php:177 ../../mod/photos.php:1100 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:240 ../../mod/photos.php:1345 +#: ../../mod/photos.php:240 ../../mod/photos.php:1363 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:584 +#: ../../mod/photos.php:602 msgid "was tagged in a" msgstr "" -#: ../../mod/photos.php:584 ../../mod/like.php:145 ../../mod/subthread.php:87 +#: ../../mod/photos.php:602 ../../mod/like.php:145 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1439 -#: ../../include/diaspora.php:1824 ../../include/conversation.php:125 +#: ../../include/diaspora.php:1835 ../../include/conversation.php:125 #: ../../include/conversation.php:253 msgid "photo" msgstr "" -#: ../../mod/photos.php:584 +#: ../../mod/photos.php:602 msgid "by" msgstr "" -#: ../../mod/photos.php:689 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:707 ../../addon/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "" -#: ../../mod/photos.php:697 +#: ../../mod/photos.php:715 msgid "Image file is empty." msgstr "" -#: ../../mod/photos.php:729 ../../mod/profile_photo.php:153 +#: ../../mod/photos.php:747 ../../mod/profile_photo.php:153 #: ../../mod/wall_upload.php:110 msgid "Unable to process image." msgstr "" -#: ../../mod/photos.php:756 ../../mod/profile_photo.php:301 +#: ../../mod/photos.php:774 ../../mod/profile_photo.php:301 #: ../../mod/wall_upload.php:136 msgid "Image upload failed." msgstr "" -#: ../../mod/photos.php:842 ../../mod/community.php:18 +#: ../../mod/photos.php:860 ../../mod/community.php:18 #: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:73 ../../mod/directory.php:31 msgid "Public access denied." msgstr "" -#: ../../mod/photos.php:852 +#: ../../mod/photos.php:870 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:953 +#: ../../mod/photos.php:971 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:1015 +#: ../../mod/photos.php:1033 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/photos.php:1018 +#: ../../mod/photos.php:1036 #, php-format msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/photos.php:1024 +#: ../../mod/photos.php:1042 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:1028 ../../mod/photos.php:1077 +#: ../../mod/photos.php:1046 ../../mod/photos.php:1095 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:1029 +#: ../../mod/photos.php:1047 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:1030 +#: ../../mod/photos.php:1048 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:1032 ../../mod/photos.php:1340 +#: ../../mod/photos.php:1050 ../../mod/photos.php:1358 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:1092 +#: ../../mod/photos.php:1110 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:1098 +#: ../../mod/photos.php:1116 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:1100 +#: ../../mod/photos.php:1118 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:1124 ../../mod/photos.php:1571 +#: ../../mod/photos.php:1142 ../../mod/photos.php:1589 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:1159 +#: ../../mod/photos.php:1177 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:1161 +#: ../../mod/photos.php:1179 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:1217 +#: ../../mod/photos.php:1235 msgid "View photo" msgstr "" -#: ../../mod/photos.php:1217 +#: ../../mod/photos.php:1235 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1218 +#: ../../mod/photos.php:1236 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:1224 ../../mod/content.php:603 +#: ../../mod/photos.php:1242 ../../mod/content.php:603 #: ../../object/Item.php:103 msgid "Private Message" msgstr "" -#: ../../mod/photos.php:1243 +#: ../../mod/photos.php:1261 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1317 +#: ../../mod/photos.php:1335 msgid "Tags: " msgstr "" -#: ../../mod/photos.php:1320 +#: ../../mod/photos.php:1338 msgid "[Remove any tag]" msgstr "" -#: ../../mod/photos.php:1330 +#: ../../mod/photos.php:1348 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:1331 +#: ../../mod/photos.php:1349 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:1333 +#: ../../mod/photos.php:1351 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1336 +#: ../../mod/photos.php:1354 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1338 +#: ../../mod/photos.php:1356 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1342 +#: ../../mod/photos.php:1360 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1362 ../../mod/content.php:667 +#: ../../mod/photos.php:1380 ../../mod/content.php:667 #: ../../object/Item.php:196 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1363 ../../mod/content.php:668 +#: ../../mod/photos.php:1381 ../../mod/content.php:668 #: ../../object/Item.php:197 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1364 ../../include/conversation.php:909 +#: ../../mod/photos.php:1382 ../../include/conversation.php:909 msgid "Share" msgstr "" -#: ../../mod/photos.php:1365 ../../mod/editpost.php:112 +#: ../../mod/photos.php:1383 ../../mod/editpost.php:112 #: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 #: ../../mod/message.php:481 ../../include/conversation.php:573 @@ -599,36 +599,36 @@ msgstr "" msgid "Please wait" msgstr "" -#: ../../mod/photos.php:1381 ../../mod/photos.php:1424 -#: ../../mod/photos.php:1456 ../../mod/content.php:690 +#: ../../mod/photos.php:1399 ../../mod/photos.php:1442 +#: ../../mod/photos.php:1474 ../../mod/content.php:690 #: ../../object/Item.php:555 msgid "This is you" msgstr "" -#: ../../mod/photos.php:1383 ../../mod/photos.php:1426 -#: ../../mod/photos.php:1458 ../../mod/content.php:692 ../../boot.php:574 +#: ../../mod/photos.php:1401 ../../mod/photos.php:1444 +#: ../../mod/photos.php:1476 ../../mod/content.php:692 ../../boot.php:584 #: ../../object/Item.php:557 msgid "Comment" msgstr "" -#: ../../mod/photos.php:1385 ../../mod/editpost.php:133 +#: ../../mod/photos.php:1403 ../../mod/editpost.php:133 #: ../../mod/content.php:702 ../../include/conversation.php:946 #: ../../object/Item.php:567 msgid "Preview" msgstr "" -#: ../../mod/photos.php:1487 ../../mod/content.php:439 +#: ../../mod/photos.php:1505 ../../mod/content.php:439 #: ../../mod/content.php:723 ../../mod/settings.php:606 -#: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:696 +#: ../../mod/group.php:168 ../../mod/admin.php:696 #: ../../include/conversation.php:518 ../../object/Item.php:117 msgid "Delete" msgstr "" -#: ../../mod/photos.php:1577 +#: ../../mod/photos.php:1595 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1586 +#: ../../mod/photos.php:1604 msgid "Recent Photos" msgstr "" @@ -1264,7 +1264,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1164 +#: ../../include/contact_widgets.php:9 ../../boot.php:1174 msgid "Connect" msgstr "" @@ -1272,7 +1272,7 @@ msgstr "" msgid "No matches" msgstr "" -#: ../../mod/lockview.php:39 +#: ../../mod/lockview.php:34 msgid "Remote privacy information not available." msgstr "" @@ -1280,15 +1280,15 @@ msgstr "" msgid "Visible to:" msgstr "" -#: ../../mod/content.php:119 ../../mod/network.php:436 +#: ../../mod/content.php:119 ../../mod/network.php:544 msgid "No such group" msgstr "" -#: ../../mod/content.php:130 ../../mod/network.php:447 +#: ../../mod/content.php:130 ../../mod/network.php:555 msgid "Group is empty" msgstr "" -#: ../../mod/content.php:134 ../../mod/network.php:451 +#: ../../mod/content.php:134 ../../mod/network.php:559 msgid "Group: " msgstr "" @@ -1330,7 +1330,7 @@ msgstr[1] "" #: ../../mod/content.php:589 ../../addon/page/page.php:76 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:195 ../../boot.php:575 +#: ../../include/contact_widgets.php:195 ../../boot.php:585 #: ../../object/Item.php:280 msgid "show more" msgstr "" @@ -1447,7 +1447,7 @@ msgstr "" msgid "Network" msgstr "" -#: ../../mod/notifications.php:85 ../../mod/network.php:300 +#: ../../mod/notifications.php:85 ../../mod/network.php:407 msgid "Personal" msgstr "" @@ -1934,7 +1934,7 @@ msgstr "" #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301 -#: ../../boot.php:788 +#: ../../boot.php:798 msgid "Administrator" msgstr "" @@ -1944,7 +1944,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:925 +#: ../../mod/lostpass.php:83 ../../boot.php:935 msgid "Password Reset" msgstr "" @@ -2537,67 +2537,67 @@ msgstr "" msgid "Select an identity to manage: " msgstr "" -#: ../../mod/network.php:97 +#: ../../mod/network.php:181 msgid "Search Results For:" msgstr "" -#: ../../mod/network.php:137 ../../mod/search.php:16 +#: ../../mod/network.php:221 ../../mod/search.php:16 msgid "Remove term" msgstr "" -#: ../../mod/network.php:146 ../../mod/search.php:13 +#: ../../mod/network.php:230 ../../mod/search.php:13 msgid "Saved Searches" msgstr "" -#: ../../mod/network.php:147 ../../include/group.php:244 +#: ../../mod/network.php:231 ../../include/group.php:275 msgid "add" msgstr "" -#: ../../mod/network.php:287 +#: ../../mod/network.php:394 msgid "Commented Order" msgstr "" -#: ../../mod/network.php:290 +#: ../../mod/network.php:397 msgid "Sort by Comment Date" msgstr "" -#: ../../mod/network.php:293 +#: ../../mod/network.php:400 msgid "Posted Order" msgstr "" -#: ../../mod/network.php:296 +#: ../../mod/network.php:403 msgid "Sort by Post Date" msgstr "" -#: ../../mod/network.php:303 +#: ../../mod/network.php:410 msgid "Posts that mention or involve you" msgstr "" -#: ../../mod/network.php:306 +#: ../../mod/network.php:413 msgid "New" msgstr "" -#: ../../mod/network.php:309 +#: ../../mod/network.php:416 msgid "Activity Stream - by date" msgstr "" -#: ../../mod/network.php:312 +#: ../../mod/network.php:419 msgid "Starred" msgstr "" -#: ../../mod/network.php:315 +#: ../../mod/network.php:422 msgid "Favourite Posts" msgstr "" -#: ../../mod/network.php:318 +#: ../../mod/network.php:425 msgid "Shared Links" msgstr "" -#: ../../mod/network.php:321 +#: ../../mod/network.php:428 msgid "Interesting Links" msgstr "" -#: ../../mod/network.php:388 +#: ../../mod/network.php:496 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2605,23 +2605,23 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../../mod/network.php:391 +#: ../../mod/network.php:499 msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:461 +#: ../../mod/network.php:569 msgid "Contact: " msgstr "" -#: ../../mod/network.php:463 +#: ../../mod/network.php:571 msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:468 +#: ../../mod/network.php:576 msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1696 +#: ../../mod/notes.php:44 ../../boot.php:1707 msgid "Personal Notes" msgstr "" @@ -2748,7 +2748,7 @@ msgstr "" #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 #: ../../view/theme/diabook/theme.php:128 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1672 +#: ../../boot.php:1683 msgid "Profile" msgstr "" @@ -2853,7 +2853,7 @@ msgid "" "hours." msgstr "" -#: ../../mod/newmember.php:66 ../../include/group.php:239 +#: ../../mod/newmember.php:66 ../../include/group.php:270 msgid "Groups" msgstr "" @@ -3057,7 +3057,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:887 +#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:897 msgid "Register" msgstr "" @@ -3070,7 +3070,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:565 -#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1824 +#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1835 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 msgid "status" @@ -3078,7 +3078,7 @@ msgstr "" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1840 +#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1851 #: ../../include/conversation.php:136 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -3100,7 +3100,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 -#: ../../include/nav.php:51 ../../boot.php:1679 +#: ../../include/nav.php:51 ../../boot.php:1690 msgid "Photos" msgstr "" @@ -3975,7 +3975,7 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:22 ../../boot.php:1074 +#: ../../mod/profile.php:22 ../../boot.php:1084 msgid "Requested profile is not available." msgstr "" @@ -4088,8 +4088,8 @@ msgstr "" msgid "Search" msgstr "" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:423 -#: ../../mod/profiles.php:537 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:434 +#: ../../mod/profiles.php:548 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "" @@ -4097,301 +4097,301 @@ msgstr "" msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:160 +#: ../../mod/profiles.php:171 msgid "Marital Status" msgstr "" -#: ../../mod/profiles.php:164 +#: ../../mod/profiles.php:175 msgid "Romantic Partner" msgstr "" -#: ../../mod/profiles.php:168 +#: ../../mod/profiles.php:179 msgid "Likes" msgstr "" -#: ../../mod/profiles.php:172 +#: ../../mod/profiles.php:183 msgid "Dislikes" msgstr "" -#: ../../mod/profiles.php:176 +#: ../../mod/profiles.php:187 msgid "Work/Employment" msgstr "" -#: ../../mod/profiles.php:179 +#: ../../mod/profiles.php:190 msgid "Religion" msgstr "" -#: ../../mod/profiles.php:183 +#: ../../mod/profiles.php:194 msgid "Political Views" msgstr "" -#: ../../mod/profiles.php:187 +#: ../../mod/profiles.php:198 msgid "Gender" msgstr "" -#: ../../mod/profiles.php:191 +#: ../../mod/profiles.php:202 msgid "Sexual Preference" msgstr "" -#: ../../mod/profiles.php:195 +#: ../../mod/profiles.php:206 msgid "Homepage" msgstr "" -#: ../../mod/profiles.php:199 +#: ../../mod/profiles.php:210 msgid "Interests" msgstr "" -#: ../../mod/profiles.php:203 +#: ../../mod/profiles.php:214 msgid "Address" msgstr "" -#: ../../mod/profiles.php:210 ../../addon/dav/common/wdcal_edit.inc.php:183 +#: ../../mod/profiles.php:221 ../../addon/dav/common/wdcal_edit.inc.php:183 msgid "Location" msgstr "" -#: ../../mod/profiles.php:293 +#: ../../mod/profiles.php:304 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:360 +#: ../../mod/profiles.php:371 msgid " and " msgstr "" -#: ../../mod/profiles.php:368 +#: ../../mod/profiles.php:379 msgid "public profile" msgstr "" -#: ../../mod/profiles.php:371 +#: ../../mod/profiles.php:382 #, php-format msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../mod/profiles.php:372 +#: ../../mod/profiles.php:383 #, php-format msgid " - Visit %1$s's %2$s" msgstr "" -#: ../../mod/profiles.php:375 +#: ../../mod/profiles.php:386 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../mod/profiles.php:442 +#: ../../mod/profiles.php:453 msgid "Profile deleted." msgstr "" -#: ../../mod/profiles.php:460 ../../mod/profiles.php:494 +#: ../../mod/profiles.php:471 ../../mod/profiles.php:505 msgid "Profile-" msgstr "" -#: ../../mod/profiles.php:479 ../../mod/profiles.php:521 +#: ../../mod/profiles.php:490 ../../mod/profiles.php:532 msgid "New profile created." msgstr "" -#: ../../mod/profiles.php:500 +#: ../../mod/profiles.php:511 msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/profiles.php:562 +#: ../../mod/profiles.php:573 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:582 +#: ../../mod/profiles.php:593 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:584 +#: ../../mod/profiles.php:595 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:585 +#: ../../mod/profiles.php:596 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:586 +#: ../../mod/profiles.php:597 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:587 +#: ../../mod/profiles.php:598 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:588 +#: ../../mod/profiles.php:599 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:589 +#: ../../mod/profiles.php:600 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:590 +#: ../../mod/profiles.php:601 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:591 +#: ../../mod/profiles.php:602 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:592 +#: ../../mod/profiles.php:603 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:593 +#: ../../mod/profiles.php:604 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:594 +#: ../../mod/profiles.php:605 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:595 +#: ../../mod/profiles.php:606 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:596 +#: ../../mod/profiles.php:607 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:597 +#: ../../mod/profiles.php:608 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:598 +#: ../../mod/profiles.php:609 msgid " Marital Status:" msgstr "" -#: ../../mod/profiles.php:599 +#: ../../mod/profiles.php:610 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:600 +#: ../../mod/profiles.php:611 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:601 +#: ../../mod/profiles.php:612 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:602 ../../include/profile_advanced.php:46 +#: ../../mod/profiles.php:613 ../../include/profile_advanced.php:46 msgid "Sexual Preference:" msgstr "" -#: ../../mod/profiles.php:603 +#: ../../mod/profiles.php:614 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:50 +#: ../../mod/profiles.php:615 ../../include/profile_advanced.php:50 msgid "Hometown:" msgstr "" -#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:54 +#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:54 msgid "Political Views:" msgstr "" -#: ../../mod/profiles.php:606 +#: ../../mod/profiles.php:617 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:607 +#: ../../mod/profiles.php:618 msgid "Public Keywords:" msgstr "" -#: ../../mod/profiles.php:608 +#: ../../mod/profiles.php:619 msgid "Private Keywords:" msgstr "" -#: ../../mod/profiles.php:609 ../../include/profile_advanced.php:62 +#: ../../mod/profiles.php:620 ../../include/profile_advanced.php:62 msgid "Likes:" msgstr "" -#: ../../mod/profiles.php:610 ../../include/profile_advanced.php:64 +#: ../../mod/profiles.php:621 ../../include/profile_advanced.php:64 msgid "Dislikes:" msgstr "" -#: ../../mod/profiles.php:611 +#: ../../mod/profiles.php:622 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:612 +#: ../../mod/profiles.php:623 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "" -#: ../../mod/profiles.php:613 +#: ../../mod/profiles.php:624 msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:625 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:615 +#: ../../mod/profiles.php:626 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:616 +#: ../../mod/profiles.php:627 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:617 +#: ../../mod/profiles.php:628 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:629 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:619 +#: ../../mod/profiles.php:630 msgid "Television" msgstr "" -#: ../../mod/profiles.php:620 +#: ../../mod/profiles.php:631 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:621 +#: ../../mod/profiles.php:632 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:622 +#: ../../mod/profiles.php:633 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:634 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:628 +#: ../../mod/profiles.php:639 msgid "" "This is your public profile.
It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:638 ../../mod/directory.php:111 +#: ../../mod/profiles.php:649 ../../mod/directory.php:111 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:677 +#: ../../mod/profiles.php:688 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:678 ../../boot.php:1192 +#: ../../mod/profiles.php:689 ../../boot.php:1202 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:679 ../../boot.php:1193 +#: ../../mod/profiles.php:690 ../../boot.php:1203 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:690 ../../boot.php:1203 +#: ../../mod/profiles.php:701 ../../boot.php:1213 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:692 ../../boot.php:1206 +#: ../../mod/profiles.php:703 ../../boot.php:1216 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:693 ../../boot.php:1207 +#: ../../mod/profiles.php:704 ../../boot.php:1217 msgid "Edit visibility" msgstr "" @@ -4520,17 +4520,17 @@ msgid "Gender: " msgstr "" #: ../../mod/directory.php:136 ../../include/profile_advanced.php:17 -#: ../../boot.php:1228 +#: ../../boot.php:1238 msgid "Gender:" msgstr "" #: ../../mod/directory.php:138 ../../include/profile_advanced.php:37 -#: ../../boot.php:1231 +#: ../../boot.php:1241 msgid "Status:" msgstr "" #: ../../mod/directory.php:140 ../../include/profile_advanced.php:48 -#: ../../boot.php:1233 +#: ../../boot.php:1243 msgid "Homepage:" msgstr "" @@ -4661,7 +4661,7 @@ msgstr "" msgid "Unable to set contact photo." msgstr "" -#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:608 +#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:619 #: ../../include/conversation.php:171 #, php-format msgid "%1$s is now friends with %2$s" @@ -5300,7 +5300,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:912 +#: ../../include/nav.php:64 ../../boot.php:922 msgid "Login" msgstr "" @@ -7585,7 +7585,7 @@ msgstr "" msgid "(no subject)" msgstr "" -#: ../../include/Scrape.php:576 +#: ../../include/Scrape.php:583 msgid " on Last.fm" msgstr "" @@ -7828,11 +7828,11 @@ msgstr "" msgid "Item filed" msgstr "" -#: ../../include/diaspora.php:691 +#: ../../include/diaspora.php:702 msgid "Sharing notification from Diaspora network" msgstr "" -#: ../../include/diaspora.php:2211 +#: ../../include/diaspora.php:2222 msgid "Attachments:" msgstr "" @@ -7855,31 +7855,31 @@ msgid "" "not what you intended, please create another group with a different name." msgstr "" -#: ../../include/group.php:176 +#: ../../include/group.php:207 msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/group.php:195 +#: ../../include/group.php:226 msgid "Everybody" msgstr "" -#: ../../include/group.php:218 +#: ../../include/group.php:249 msgid "edit" msgstr "" -#: ../../include/group.php:240 +#: ../../include/group.php:271 msgid "Edit group" msgstr "" -#: ../../include/group.php:241 +#: ../../include/group.php:272 msgid "Create a new group" msgstr "" -#: ../../include/group.php:242 +#: ../../include/group.php:273 msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:911 +#: ../../include/nav.php:46 ../../boot.php:921 msgid "Logout" msgstr "" @@ -7887,7 +7887,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1665 +#: ../../include/nav.php:49 ../../boot.php:1676 msgid "Status" msgstr "" @@ -7967,11 +7967,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1186 +#: ../../include/nav.php:138 ../../boot.php:1196 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1186 +#: ../../include/nav.php:138 ../../boot.php:1196 msgid "Manage/edit profiles" msgstr "" @@ -8127,7 +8127,7 @@ msgstr "" msgid "Happy Birthday %s" msgstr "" -#: ../../include/onepoll.php:399 +#: ../../include/onepoll.php:409 msgid "From: " msgstr "" @@ -8488,7 +8488,7 @@ msgstr "" msgid "Welcome back " msgstr "" -#: ../../include/security.php:344 +#: ../../include/security.php:354 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." @@ -8674,100 +8674,104 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../boot.php:573 +#: ../../boot.php:583 msgid "Delete this item?" msgstr "" -#: ../../boot.php:576 +#: ../../boot.php:586 msgid "show fewer" msgstr "" -#: ../../boot.php:783 +#: ../../boot.php:793 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:785 +#: ../../boot.php:795 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:886 +#: ../../boot.php:896 msgid "Create a New Account" msgstr "" -#: ../../boot.php:914 +#: ../../boot.php:924 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:915 +#: ../../boot.php:925 msgid "Password: " msgstr "" -#: ../../boot.php:918 +#: ../../boot.php:928 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:924 +#: ../../boot.php:934 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1035 +#: ../../boot.php:1045 msgid "Requested account is not available." msgstr "" -#: ../../boot.php:1112 +#: ../../boot.php:1122 msgid "Edit profile" msgstr "" -#: ../../boot.php:1178 +#: ../../boot.php:1188 msgid "Message" msgstr "" -#: ../../boot.php:1300 ../../boot.php:1386 +#: ../../boot.php:1310 ../../boot.php:1396 msgid "g A l F d" msgstr "" -#: ../../boot.php:1301 ../../boot.php:1387 +#: ../../boot.php:1311 ../../boot.php:1397 msgid "F d" msgstr "" -#: ../../boot.php:1346 ../../boot.php:1427 +#: ../../boot.php:1356 ../../boot.php:1437 msgid "[today]" msgstr "" -#: ../../boot.php:1358 +#: ../../boot.php:1368 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1359 +#: ../../boot.php:1369 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1420 +#: ../../boot.php:1430 msgid "[No description]" msgstr "" -#: ../../boot.php:1438 +#: ../../boot.php:1448 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1439 +#: ../../boot.php:1449 msgid "Events this week:" msgstr "" -#: ../../boot.php:1668 +#: ../../boot.php:1679 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1675 +#: ../../boot.php:1686 msgid "Profile Details" msgstr "" -#: ../../boot.php:1692 +#: ../../boot.php:1703 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1699 +#: ../../boot.php:1710 msgid "Only You Can See This" msgstr "" + +#: ../../index.php:378 +msgid "toggle mobile" +msgstr "" From ef9eec5561cf2634918f0f6dcfcbe071f99eede3 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 4 Oct 2012 10:33:49 +0200 Subject: [PATCH 07/74] DE: update to the strings --- view/de/messages.po | 460 ++++++++++++++++++++++---------------------- view/de/strings.php | 1 + 2 files changed, 233 insertions(+), 228 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index 20aa52a4..a8e598ce 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-09-29 10:00-0700\n" -"PO-Revision-Date: 2012-10-03 05:50+0000\n" +"POT-Creation-Date: 2012-10-03 10:00-0700\n" +"PO-Revision-Date: 2012-10-04 08:30+0000\n" "Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:55 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:128 ../../mod/photos.php:972 +#: ../../mod/api.php:31 ../../mod/photos.php:128 ../../mod/photos.php:990 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135 #: ../../mod/notifications.php:66 ../../mod/contacts.php:146 #: ../../mod/settings.php:86 ../../mod/settings.php:525 @@ -68,7 +68,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 #: ../../mod/wall_upload.php:64 ../../mod/follow.php:9 #: ../../mod/display.php:141 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:413 ../../mod/delegate.php:6 +#: ../../mod/profiles.php:424 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 @@ -141,10 +141,10 @@ msgid "New photo from this URL" msgstr "Neues Foto von dieser URL" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:455 ../../mod/photos.php:1005 -#: ../../mod/photos.php:1081 ../../mod/photos.php:1344 -#: ../../mod/photos.php:1384 ../../mod/photos.php:1427 -#: ../../mod/photos.php:1459 ../../mod/install.php:246 +#: ../../mod/events.php:455 ../../mod/photos.php:1023 +#: ../../mod/photos.php:1099 ../../mod/photos.php:1362 +#: ../../mod/photos.php:1402 ../../mod/photos.php:1445 +#: ../../mod/photos.php:1477 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 #: ../../mod/content.php:693 ../../mod/contacts.php:348 #: ../../mod/settings.php:543 ../../mod/settings.php:697 @@ -152,7 +152,7 @@ msgstr "Neues Foto von dieser URL" #: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294 #: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:689 #: ../../mod/admin.php:826 ../../mod/admin.php:1025 ../../mod/admin.php:1112 -#: ../../mod/profiles.php:583 ../../mod/invite.php:119 +#: ../../mod/profiles.php:594 ../../mod/invite.php:119 #: ../../addon/fromgplus/fromgplus.php:40 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90 @@ -251,7 +251,7 @@ msgid "link to source" msgstr "Link zum Originalbeitrag" #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:131 -#: ../../include/nav.php:52 ../../boot.php:1689 +#: ../../include/nav.php:52 ../../boot.php:1700 msgid "Events" msgstr "Veranstaltungen" @@ -307,7 +307,7 @@ msgstr "Beschreibung" #: ../../mod/events.php:448 ../../mod/directory.php:134 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412 -#: ../../boot.php:1226 +#: ../../boot.php:1236 msgid "Location:" msgstr "Ort:" @@ -374,7 +374,7 @@ msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontak #: ../../mod/settings.php:963 ../../mod/settings.php:964 #: ../../mod/settings.php:965 ../../mod/settings.php:966 #: ../../mod/settings.php:967 ../../mod/register.php:236 -#: ../../mod/profiles.php:563 +#: ../../mod/profiles.php:574 msgid "Yes" msgstr "Ja" @@ -386,23 +386,23 @@ msgstr "Ja" #: ../../mod/settings.php:963 ../../mod/settings.php:964 #: ../../mod/settings.php:965 ../../mod/settings.php:966 #: ../../mod/settings.php:967 ../../mod/register.php:237 -#: ../../mod/profiles.php:564 +#: ../../mod/profiles.php:575 msgid "No" msgstr "Nein" -#: ../../mod/photos.php:46 ../../boot.php:1682 +#: ../../mod/photos.php:46 ../../boot.php:1693 msgid "Photo Albums" msgstr "Fotoalben" -#: ../../mod/photos.php:54 ../../mod/photos.php:149 ../../mod/photos.php:986 -#: ../../mod/photos.php:1073 ../../mod/photos.php:1088 -#: ../../mod/photos.php:1538 ../../mod/photos.php:1550 +#: ../../mod/photos.php:54 ../../mod/photos.php:149 ../../mod/photos.php:1004 +#: ../../mod/photos.php:1091 ../../mod/photos.php:1106 +#: ../../mod/photos.php:1556 ../../mod/photos.php:1568 #: ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:598 msgid "Contact Photos" msgstr "Kontaktbilder" -#: ../../mod/photos.php:61 ../../mod/photos.php:1104 ../../mod/photos.php:1588 +#: ../../mod/photos.php:61 ../../mod/photos.php:1122 ../../mod/photos.php:1606 msgid "Upload New Photos" msgstr "Weitere Fotos hochladen" @@ -414,8 +414,8 @@ msgstr "jeder" msgid "Contact information unavailable" msgstr "Kontaktinformationen nicht verfügbar" -#: ../../mod/photos.php:149 ../../mod/photos.php:653 ../../mod/photos.php:1073 -#: ../../mod/photos.php:1088 ../../mod/profile_photo.php:74 +#: ../../mod/photos.php:149 ../../mod/photos.php:671 ../../mod/photos.php:1091 +#: ../../mod/photos.php:1106 ../../mod/profile_photo.php:74 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 @@ -429,185 +429,185 @@ msgstr "Profilbilder" msgid "Album not found." msgstr "Album nicht gefunden." -#: ../../mod/photos.php:177 ../../mod/photos.php:1082 +#: ../../mod/photos.php:177 ../../mod/photos.php:1100 msgid "Delete Album" msgstr "Album löschen" -#: ../../mod/photos.php:240 ../../mod/photos.php:1345 +#: ../../mod/photos.php:240 ../../mod/photos.php:1363 msgid "Delete Photo" msgstr "Foto löschen" -#: ../../mod/photos.php:584 +#: ../../mod/photos.php:602 msgid "was tagged in a" msgstr "wurde getaggt in einem" -#: ../../mod/photos.php:584 ../../mod/like.php:145 ../../mod/subthread.php:87 +#: ../../mod/photos.php:602 ../../mod/like.php:145 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1439 -#: ../../include/diaspora.php:1824 ../../include/conversation.php:125 +#: ../../include/diaspora.php:1835 ../../include/conversation.php:125 #: ../../include/conversation.php:253 msgid "photo" msgstr "Foto" -#: ../../mod/photos.php:584 +#: ../../mod/photos.php:602 msgid "by" msgstr "von" -#: ../../mod/photos.php:689 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:707 ../../addon/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "Die Bildgröße übersteigt das Limit von " -#: ../../mod/photos.php:697 +#: ../../mod/photos.php:715 msgid "Image file is empty." msgstr "Bilddatei ist leer." -#: ../../mod/photos.php:729 ../../mod/profile_photo.php:153 +#: ../../mod/photos.php:747 ../../mod/profile_photo.php:153 #: ../../mod/wall_upload.php:110 msgid "Unable to process image." msgstr "Konnte das Bild nicht bearbeiten." -#: ../../mod/photos.php:756 ../../mod/profile_photo.php:301 +#: ../../mod/photos.php:774 ../../mod/profile_photo.php:301 #: ../../mod/wall_upload.php:136 msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." -#: ../../mod/photos.php:842 ../../mod/community.php:18 +#: ../../mod/photos.php:860 ../../mod/community.php:18 #: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:73 ../../mod/directory.php:31 msgid "Public access denied." msgstr "Öffentlicher Zugriff verweigert." -#: ../../mod/photos.php:852 +#: ../../mod/photos.php:870 msgid "No photos selected" msgstr "Keine Bilder ausgewählt" -#: ../../mod/photos.php:953 +#: ../../mod/photos.php:971 msgid "Access to this item is restricted." msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt." -#: ../../mod/photos.php:1015 +#: ../../mod/photos.php:1033 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers." -#: ../../mod/photos.php:1018 +#: ../../mod/photos.php:1036 #, php-format msgid "You have used %1$.2f Mbytes of photo storage." msgstr "Du verwendest %1$.2f Mbyte des Foto-Speichers." -#: ../../mod/photos.php:1024 +#: ../../mod/photos.php:1042 msgid "Upload Photos" msgstr "Bilder hochladen" -#: ../../mod/photos.php:1028 ../../mod/photos.php:1077 +#: ../../mod/photos.php:1046 ../../mod/photos.php:1095 msgid "New album name: " msgstr "Name des neuen Albums: " -#: ../../mod/photos.php:1029 +#: ../../mod/photos.php:1047 msgid "or existing album name: " msgstr "oder existierender Albumname: " -#: ../../mod/photos.php:1030 +#: ../../mod/photos.php:1048 msgid "Do not show a status post for this upload" msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" -#: ../../mod/photos.php:1032 ../../mod/photos.php:1340 +#: ../../mod/photos.php:1050 ../../mod/photos.php:1358 msgid "Permissions" msgstr "Berechtigungen" -#: ../../mod/photos.php:1092 +#: ../../mod/photos.php:1110 msgid "Edit Album" msgstr "Album bearbeiten" -#: ../../mod/photos.php:1098 +#: ../../mod/photos.php:1116 msgid "Show Newest First" msgstr "Zeige neueste zuerst" -#: ../../mod/photos.php:1100 +#: ../../mod/photos.php:1118 msgid "Show Oldest First" msgstr "Zeige älteste zuerst" -#: ../../mod/photos.php:1124 ../../mod/photos.php:1571 +#: ../../mod/photos.php:1142 ../../mod/photos.php:1589 msgid "View Photo" msgstr "Fotos betrachten" -#: ../../mod/photos.php:1159 +#: ../../mod/photos.php:1177 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:1161 +#: ../../mod/photos.php:1179 msgid "Photo not available" msgstr "Foto nicht verfügbar" -#: ../../mod/photos.php:1217 +#: ../../mod/photos.php:1235 msgid "View photo" msgstr "Fotos ansehen" -#: ../../mod/photos.php:1217 +#: ../../mod/photos.php:1235 msgid "Edit photo" msgstr "Foto bearbeiten" -#: ../../mod/photos.php:1218 +#: ../../mod/photos.php:1236 msgid "Use as profile photo" msgstr "Als Profilbild verwenden" -#: ../../mod/photos.php:1224 ../../mod/content.php:603 +#: ../../mod/photos.php:1242 ../../mod/content.php:603 #: ../../object/Item.php:103 msgid "Private Message" msgstr "Private Nachricht" -#: ../../mod/photos.php:1243 +#: ../../mod/photos.php:1261 msgid "View Full Size" msgstr "Betrachte Originalgröße" -#: ../../mod/photos.php:1317 +#: ../../mod/photos.php:1335 msgid "Tags: " msgstr "Tags: " -#: ../../mod/photos.php:1320 +#: ../../mod/photos.php:1338 msgid "[Remove any tag]" msgstr "[Tag entfernen]" -#: ../../mod/photos.php:1330 +#: ../../mod/photos.php:1348 msgid "Rotate CW (right)" msgstr "Drehen US (rechts)" -#: ../../mod/photos.php:1331 +#: ../../mod/photos.php:1349 msgid "Rotate CCW (left)" msgstr "Drehen EUS (links)" -#: ../../mod/photos.php:1333 +#: ../../mod/photos.php:1351 msgid "New album name" msgstr "Name des neuen Albums" -#: ../../mod/photos.php:1336 +#: ../../mod/photos.php:1354 msgid "Caption" msgstr "Bildunterschrift" -#: ../../mod/photos.php:1338 +#: ../../mod/photos.php:1356 msgid "Add a Tag" msgstr "Tag hinzufügen" -#: ../../mod/photos.php:1342 +#: ../../mod/photos.php:1360 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1362 ../../mod/content.php:667 +#: ../../mod/photos.php:1380 ../../mod/content.php:667 #: ../../object/Item.php:196 msgid "I like this (toggle)" msgstr "Ich mag das (toggle)" -#: ../../mod/photos.php:1363 ../../mod/content.php:668 +#: ../../mod/photos.php:1381 ../../mod/content.php:668 #: ../../object/Item.php:197 msgid "I don't like this (toggle)" msgstr "Ich mag das nicht (toggle)" -#: ../../mod/photos.php:1364 ../../include/conversation.php:909 +#: ../../mod/photos.php:1382 ../../include/conversation.php:909 msgid "Share" msgstr "Teilen" -#: ../../mod/photos.php:1365 ../../mod/editpost.php:112 +#: ../../mod/photos.php:1383 ../../mod/editpost.php:112 #: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 #: ../../mod/message.php:481 ../../include/conversation.php:573 @@ -615,36 +615,36 @@ msgstr "Teilen" msgid "Please wait" msgstr "Bitte warten" -#: ../../mod/photos.php:1381 ../../mod/photos.php:1424 -#: ../../mod/photos.php:1456 ../../mod/content.php:690 +#: ../../mod/photos.php:1399 ../../mod/photos.php:1442 +#: ../../mod/photos.php:1474 ../../mod/content.php:690 #: ../../object/Item.php:555 msgid "This is you" msgstr "Das bist du" -#: ../../mod/photos.php:1383 ../../mod/photos.php:1426 -#: ../../mod/photos.php:1458 ../../mod/content.php:692 ../../boot.php:574 +#: ../../mod/photos.php:1401 ../../mod/photos.php:1444 +#: ../../mod/photos.php:1476 ../../mod/content.php:692 ../../boot.php:584 #: ../../object/Item.php:557 msgid "Comment" msgstr "Kommentar" -#: ../../mod/photos.php:1385 ../../mod/editpost.php:133 +#: ../../mod/photos.php:1403 ../../mod/editpost.php:133 #: ../../mod/content.php:702 ../../include/conversation.php:946 #: ../../object/Item.php:567 msgid "Preview" msgstr "Vorschau" -#: ../../mod/photos.php:1487 ../../mod/content.php:439 +#: ../../mod/photos.php:1505 ../../mod/content.php:439 #: ../../mod/content.php:723 ../../mod/settings.php:606 -#: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:696 +#: ../../mod/group.php:168 ../../mod/admin.php:696 #: ../../include/conversation.php:518 ../../object/Item.php:117 msgid "Delete" msgstr "Löschen" -#: ../../mod/photos.php:1577 +#: ../../mod/photos.php:1595 msgid "View Album" msgstr "Album betrachten" -#: ../../mod/photos.php:1586 +#: ../../mod/photos.php:1604 msgid "Recent Photos" msgstr "Neueste Fotos" @@ -1281,7 +1281,7 @@ msgid "is interested in:" msgstr "ist interessiert an:" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1164 +#: ../../include/contact_widgets.php:9 ../../boot.php:1174 msgid "Connect" msgstr "Verbinden" @@ -1289,7 +1289,7 @@ msgstr "Verbinden" msgid "No matches" msgstr "Keine Übereinstimmungen" -#: ../../mod/lockview.php:39 +#: ../../mod/lockview.php:34 msgid "Remote privacy information not available." msgstr "Entfernte Privatsphäreneinstellungen nicht verfügbar." @@ -1297,15 +1297,15 @@ msgstr "Entfernte Privatsphäreneinstellungen nicht verfügbar." msgid "Visible to:" msgstr "Sichtbar für:" -#: ../../mod/content.php:119 ../../mod/network.php:436 +#: ../../mod/content.php:119 ../../mod/network.php:544 msgid "No such group" msgstr "Es gibt keine solche Gruppe" -#: ../../mod/content.php:130 ../../mod/network.php:447 +#: ../../mod/content.php:130 ../../mod/network.php:555 msgid "Group is empty" msgstr "Gruppe ist leer" -#: ../../mod/content.php:134 ../../mod/network.php:451 +#: ../../mod/content.php:134 ../../mod/network.php:559 msgid "Group: " msgstr "Gruppe: " @@ -1347,7 +1347,7 @@ msgstr[1] "Kommentar" #: ../../mod/content.php:589 ../../addon/page/page.php:76 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:195 ../../boot.php:575 +#: ../../include/contact_widgets.php:195 ../../boot.php:585 #: ../../object/Item.php:280 msgid "show more" msgstr "mehr anzeigen" @@ -1464,7 +1464,7 @@ msgstr "System" msgid "Network" msgstr "Netzwerk" -#: ../../mod/notifications.php:85 ../../mod/network.php:300 +#: ../../mod/notifications.php:85 ../../mod/network.php:407 msgid "Personal" msgstr "Persönlich" @@ -1951,7 +1951,7 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten" #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301 -#: ../../boot.php:788 +#: ../../boot.php:798 msgid "Administrator" msgstr "Administrator" @@ -1961,7 +1961,7 @@ msgid "" "Password reset failed." msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert." -#: ../../mod/lostpass.php:83 ../../boot.php:925 +#: ../../mod/lostpass.php:83 ../../boot.php:935 msgid "Password Reset" msgstr "Passwort zurücksetzen" @@ -2555,67 +2555,67 @@ msgstr "Zwischen verschiedenen Identitäten oder Foren wechseln, die deine Zugan msgid "Select an identity to manage: " msgstr "Wähle eine Identität zum Verwalten: " -#: ../../mod/network.php:97 +#: ../../mod/network.php:181 msgid "Search Results For:" msgstr "Suchergebnisse für:" -#: ../../mod/network.php:137 ../../mod/search.php:16 +#: ../../mod/network.php:221 ../../mod/search.php:16 msgid "Remove term" msgstr "Begriff entfernen" -#: ../../mod/network.php:146 ../../mod/search.php:13 +#: ../../mod/network.php:230 ../../mod/search.php:13 msgid "Saved Searches" msgstr "Gespeicherte Suchen" -#: ../../mod/network.php:147 ../../include/group.php:244 +#: ../../mod/network.php:231 ../../include/group.php:275 msgid "add" msgstr "hinzufügen" -#: ../../mod/network.php:287 +#: ../../mod/network.php:394 msgid "Commented Order" msgstr "Neueste Kommentare" -#: ../../mod/network.php:290 +#: ../../mod/network.php:397 msgid "Sort by Comment Date" msgstr "Nach Kommentardatum sortieren" -#: ../../mod/network.php:293 +#: ../../mod/network.php:400 msgid "Posted Order" msgstr "Neueste Beiträge" -#: ../../mod/network.php:296 +#: ../../mod/network.php:403 msgid "Sort by Post Date" msgstr "Nach Beitragsdatum sortieren" -#: ../../mod/network.php:303 +#: ../../mod/network.php:410 msgid "Posts that mention or involve you" msgstr "Beiträge, in denen es um dich geht" -#: ../../mod/network.php:306 +#: ../../mod/network.php:413 msgid "New" msgstr "Neue" -#: ../../mod/network.php:309 +#: ../../mod/network.php:416 msgid "Activity Stream - by date" msgstr "Aktivitäten-Stream - nach Datum" -#: ../../mod/network.php:312 +#: ../../mod/network.php:419 msgid "Starred" msgstr "Markierte" -#: ../../mod/network.php:315 +#: ../../mod/network.php:422 msgid "Favourite Posts" msgstr "Favorisierte Beiträge" -#: ../../mod/network.php:318 +#: ../../mod/network.php:425 msgid "Shared Links" msgstr "Geteilte Links" -#: ../../mod/network.php:321 +#: ../../mod/network.php:428 msgid "Interesting Links" msgstr "Interessante Links" -#: ../../mod/network.php:388 +#: ../../mod/network.php:496 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2623,23 +2623,23 @@ msgid_plural "" msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk." msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken." -#: ../../mod/network.php:391 +#: ../../mod/network.php:499 msgid "Private messages to this group are at risk of public disclosure." msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten." -#: ../../mod/network.php:461 +#: ../../mod/network.php:569 msgid "Contact: " msgstr "Kontakt: " -#: ../../mod/network.php:463 +#: ../../mod/network.php:571 msgid "Private messages to this person are at risk of public disclosure." msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen." -#: ../../mod/network.php:468 +#: ../../mod/network.php:576 msgid "Invalid contact." msgstr "Ungültiger Kontakt." -#: ../../mod/notes.php:44 ../../boot.php:1696 +#: ../../mod/notes.php:44 ../../boot.php:1707 msgid "Personal Notes" msgstr "Persönliche Notizen" @@ -2766,7 +2766,7 @@ msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 #: ../../view/theme/diabook/theme.php:128 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1672 +#: ../../boot.php:1683 msgid "Profile" msgstr "Profil" @@ -2871,7 +2871,7 @@ msgid "" "hours." msgstr "Im seitlichen Bedienfeld der Kontakteseite gibt es diverse Werkzeuge, um neue Freunde zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Freunde vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden." -#: ../../mod/newmember.php:66 ../../include/group.php:239 +#: ../../mod/newmember.php:66 ../../include/group.php:270 msgid "Groups" msgstr "Gruppen" @@ -3075,7 +3075,7 @@ msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstab msgid "Choose a nickname: " msgstr "Spitznamen wählen: " -#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:887 +#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:897 msgid "Register" msgstr "Registrieren" @@ -3088,7 +3088,7 @@ msgstr "Personensuche" #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:565 -#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1824 +#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1835 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 msgid "status" @@ -3096,7 +3096,7 @@ msgstr "Status" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1840 +#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1851 #: ../../include/conversation.php:136 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -3118,7 +3118,7 @@ msgid "Access denied." msgstr "Zugriff verweigert." #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 -#: ../../include/nav.php:51 ../../boot.php:1679 +#: ../../include/nav.php:51 ../../boot.php:1690 msgid "Photos" msgstr "Bilder" @@ -3994,7 +3994,7 @@ msgstr "FTP Nutzername" msgid "FTP Password" msgstr "FTP Passwort" -#: ../../mod/profile.php:22 ../../boot.php:1074 +#: ../../mod/profile.php:22 ../../boot.php:1084 msgid "Requested profile is not available." msgstr "Das angefragte Profil ist nicht vorhanden." @@ -4107,8 +4107,8 @@ msgstr "Keine Applikationen installiert." msgid "Search" msgstr "Suche" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:423 -#: ../../mod/profiles.php:537 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:434 +#: ../../mod/profiles.php:548 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "Profil nicht gefunden." @@ -4116,301 +4116,301 @@ msgstr "Profil nicht gefunden." msgid "Profile Name is required." msgstr "Profilname ist erforderlich." -#: ../../mod/profiles.php:160 +#: ../../mod/profiles.php:171 msgid "Marital Status" msgstr "Familienstand" -#: ../../mod/profiles.php:164 +#: ../../mod/profiles.php:175 msgid "Romantic Partner" msgstr "Romanze" -#: ../../mod/profiles.php:168 +#: ../../mod/profiles.php:179 msgid "Likes" msgstr "Likes" -#: ../../mod/profiles.php:172 +#: ../../mod/profiles.php:183 msgid "Dislikes" msgstr "Dislikes" -#: ../../mod/profiles.php:176 +#: ../../mod/profiles.php:187 msgid "Work/Employment" msgstr "Arbeit / Beschäftigung" -#: ../../mod/profiles.php:179 +#: ../../mod/profiles.php:190 msgid "Religion" msgstr "Religion" -#: ../../mod/profiles.php:183 +#: ../../mod/profiles.php:194 msgid "Political Views" msgstr "Politische Ansichten" -#: ../../mod/profiles.php:187 +#: ../../mod/profiles.php:198 msgid "Gender" msgstr "Geschlecht" -#: ../../mod/profiles.php:191 +#: ../../mod/profiles.php:202 msgid "Sexual Preference" msgstr "Sexuelle Vorlieben" -#: ../../mod/profiles.php:195 +#: ../../mod/profiles.php:206 msgid "Homepage" msgstr "Webseite" -#: ../../mod/profiles.php:199 +#: ../../mod/profiles.php:210 msgid "Interests" msgstr "Interessen" -#: ../../mod/profiles.php:203 +#: ../../mod/profiles.php:214 msgid "Address" msgstr "Adresse" -#: ../../mod/profiles.php:210 ../../addon/dav/common/wdcal_edit.inc.php:183 +#: ../../mod/profiles.php:221 ../../addon/dav/common/wdcal_edit.inc.php:183 msgid "Location" msgstr "Wohnort" -#: ../../mod/profiles.php:293 +#: ../../mod/profiles.php:304 msgid "Profile updated." msgstr "Profil aktualisiert." -#: ../../mod/profiles.php:360 +#: ../../mod/profiles.php:371 msgid " and " msgstr " und " -#: ../../mod/profiles.php:368 +#: ../../mod/profiles.php:379 msgid "public profile" msgstr "öffentliches Profil" -#: ../../mod/profiles.php:371 +#: ../../mod/profiles.php:382 #, php-format msgid "%1$s changed %2$s to “%3$s”" msgstr "%1$s hat %2$s geändert auf “%3$s”" -#: ../../mod/profiles.php:372 +#: ../../mod/profiles.php:383 #, php-format msgid " - Visit %1$s's %2$s" msgstr " – %1$ss %2$s besuchen" -#: ../../mod/profiles.php:375 +#: ../../mod/profiles.php:386 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s." -#: ../../mod/profiles.php:442 +#: ../../mod/profiles.php:453 msgid "Profile deleted." msgstr "Profil gelöscht." -#: ../../mod/profiles.php:460 ../../mod/profiles.php:494 +#: ../../mod/profiles.php:471 ../../mod/profiles.php:505 msgid "Profile-" msgstr "Profil-" -#: ../../mod/profiles.php:479 ../../mod/profiles.php:521 +#: ../../mod/profiles.php:490 ../../mod/profiles.php:532 msgid "New profile created." msgstr "Neues Profil angelegt." -#: ../../mod/profiles.php:500 +#: ../../mod/profiles.php:511 msgid "Profile unavailable to clone." msgstr "Profil nicht zum Duplizieren verfügbar." -#: ../../mod/profiles.php:562 +#: ../../mod/profiles.php:573 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" -#: ../../mod/profiles.php:582 +#: ../../mod/profiles.php:593 msgid "Edit Profile Details" msgstr "Profil bearbeiten" -#: ../../mod/profiles.php:584 +#: ../../mod/profiles.php:595 msgid "View this profile" msgstr "Dieses Profil anzeigen" -#: ../../mod/profiles.php:585 +#: ../../mod/profiles.php:596 msgid "Create a new profile using these settings" msgstr "Neues Profil anlegen und diese Einstellungen verwenden" -#: ../../mod/profiles.php:586 +#: ../../mod/profiles.php:597 msgid "Clone this profile" msgstr "Dieses Profil duplizieren" -#: ../../mod/profiles.php:587 +#: ../../mod/profiles.php:598 msgid "Delete this profile" msgstr "Dieses Profil löschen" -#: ../../mod/profiles.php:588 +#: ../../mod/profiles.php:599 msgid "Profile Name:" msgstr "Profilname:" -#: ../../mod/profiles.php:589 +#: ../../mod/profiles.php:600 msgid "Your Full Name:" msgstr "Dein kompletter Name:" -#: ../../mod/profiles.php:590 +#: ../../mod/profiles.php:601 msgid "Title/Description:" msgstr "Titel/Beschreibung:" -#: ../../mod/profiles.php:591 +#: ../../mod/profiles.php:602 msgid "Your Gender:" msgstr "Dein Geschlecht:" -#: ../../mod/profiles.php:592 +#: ../../mod/profiles.php:603 #, php-format msgid "Birthday (%s):" msgstr "Geburtstag (%s):" -#: ../../mod/profiles.php:593 +#: ../../mod/profiles.php:604 msgid "Street Address:" msgstr "Adresse:" -#: ../../mod/profiles.php:594 +#: ../../mod/profiles.php:605 msgid "Locality/City:" msgstr "Wohnort:" -#: ../../mod/profiles.php:595 +#: ../../mod/profiles.php:606 msgid "Postal/Zip Code:" msgstr "Postleitzahl:" -#: ../../mod/profiles.php:596 +#: ../../mod/profiles.php:607 msgid "Country:" msgstr "Land:" -#: ../../mod/profiles.php:597 +#: ../../mod/profiles.php:608 msgid "Region/State:" msgstr "Region/Bundesstaat:" -#: ../../mod/profiles.php:598 +#: ../../mod/profiles.php:609 msgid " Marital Status:" msgstr " Beziehungsstatus:" -#: ../../mod/profiles.php:599 +#: ../../mod/profiles.php:610 msgid "Who: (if applicable)" msgstr "Wer: (falls anwendbar)" -#: ../../mod/profiles.php:600 +#: ../../mod/profiles.php:611 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" -#: ../../mod/profiles.php:601 +#: ../../mod/profiles.php:612 msgid "Since [date]:" msgstr "Seit [Datum]:" -#: ../../mod/profiles.php:602 ../../include/profile_advanced.php:46 +#: ../../mod/profiles.php:613 ../../include/profile_advanced.php:46 msgid "Sexual Preference:" msgstr "Sexuelle Vorlieben:" -#: ../../mod/profiles.php:603 +#: ../../mod/profiles.php:614 msgid "Homepage URL:" msgstr "Adresse der Homepage:" -#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:50 +#: ../../mod/profiles.php:615 ../../include/profile_advanced.php:50 msgid "Hometown:" msgstr "Heimatort:" -#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:54 +#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:54 msgid "Political Views:" msgstr "Politische Ansichten:" -#: ../../mod/profiles.php:606 +#: ../../mod/profiles.php:617 msgid "Religious Views:" msgstr "Religiöse Ansichten:" -#: ../../mod/profiles.php:607 +#: ../../mod/profiles.php:618 msgid "Public Keywords:" msgstr "Öffentliche Schlüsselwörter:" -#: ../../mod/profiles.php:608 +#: ../../mod/profiles.php:619 msgid "Private Keywords:" msgstr "Private Schlüsselwörter:" -#: ../../mod/profiles.php:609 ../../include/profile_advanced.php:62 +#: ../../mod/profiles.php:620 ../../include/profile_advanced.php:62 msgid "Likes:" msgstr "Likes:" -#: ../../mod/profiles.php:610 ../../include/profile_advanced.php:64 +#: ../../mod/profiles.php:621 ../../include/profile_advanced.php:64 msgid "Dislikes:" msgstr "Dislikes:" -#: ../../mod/profiles.php:611 +#: ../../mod/profiles.php:622 msgid "Example: fishing photography software" msgstr "Beispiel: Fischen Fotografie Software" -#: ../../mod/profiles.php:612 +#: ../../mod/profiles.php:623 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "(Wird verwendet, um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)" -#: ../../mod/profiles.php:613 +#: ../../mod/profiles.php:624 msgid "(Used for searching profiles, never shown to others)" msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:625 msgid "Tell us about yourself..." msgstr "Erzähle uns ein bisschen von dir …" -#: ../../mod/profiles.php:615 +#: ../../mod/profiles.php:626 msgid "Hobbies/Interests" msgstr "Hobbies/Interessen" -#: ../../mod/profiles.php:616 +#: ../../mod/profiles.php:627 msgid "Contact information and Social Networks" msgstr "Kontaktinformationen und Soziale Netzwerke" -#: ../../mod/profiles.php:617 +#: ../../mod/profiles.php:628 msgid "Musical interests" msgstr "Musikalische Interessen" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:629 msgid "Books, literature" msgstr "Literatur/Bücher" -#: ../../mod/profiles.php:619 +#: ../../mod/profiles.php:630 msgid "Television" msgstr "Fernsehen" -#: ../../mod/profiles.php:620 +#: ../../mod/profiles.php:631 msgid "Film/dance/culture/entertainment" msgstr "Filme/Tänze/Kultur/Unterhaltung" -#: ../../mod/profiles.php:621 +#: ../../mod/profiles.php:632 msgid "Love/romance" msgstr "Liebesleben" -#: ../../mod/profiles.php:622 +#: ../../mod/profiles.php:633 msgid "Work/employment" msgstr "Arbeit/Beschäftigung" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:634 msgid "School/education" msgstr "Schule/Ausbildung" -#: ../../mod/profiles.php:628 +#: ../../mod/profiles.php:639 msgid "" "This is your public profile.
It may " "be visible to anybody using the internet." msgstr "Dies ist dein öffentliches Profil.
Es könnte für jeden Nutzer des Internets sichtbar sein." -#: ../../mod/profiles.php:638 ../../mod/directory.php:111 +#: ../../mod/profiles.php:649 ../../mod/directory.php:111 msgid "Age: " msgstr "Alter: " -#: ../../mod/profiles.php:677 +#: ../../mod/profiles.php:688 msgid "Edit/Manage Profiles" msgstr "Verwalte/Editiere Profile" -#: ../../mod/profiles.php:678 ../../boot.php:1192 +#: ../../mod/profiles.php:689 ../../boot.php:1202 msgid "Change profile photo" msgstr "Profilbild ändern" -#: ../../mod/profiles.php:679 ../../boot.php:1193 +#: ../../mod/profiles.php:690 ../../boot.php:1203 msgid "Create New Profile" msgstr "Neues Profil anlegen" -#: ../../mod/profiles.php:690 ../../boot.php:1203 +#: ../../mod/profiles.php:701 ../../boot.php:1213 msgid "Profile Image" msgstr "Profilbild" -#: ../../mod/profiles.php:692 ../../boot.php:1206 +#: ../../mod/profiles.php:703 ../../boot.php:1216 msgid "visible to everybody" msgstr "sichtbar für jeden" -#: ../../mod/profiles.php:693 ../../boot.php:1207 +#: ../../mod/profiles.php:704 ../../boot.php:1217 msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" @@ -4539,17 +4539,17 @@ msgid "Gender: " msgstr "Geschlecht:" #: ../../mod/directory.php:136 ../../include/profile_advanced.php:17 -#: ../../boot.php:1228 +#: ../../boot.php:1238 msgid "Gender:" msgstr "Geschlecht:" #: ../../mod/directory.php:138 ../../include/profile_advanced.php:37 -#: ../../boot.php:1231 +#: ../../boot.php:1241 msgid "Status:" msgstr "Status:" #: ../../mod/directory.php:140 ../../include/profile_advanced.php:48 -#: ../../boot.php:1233 +#: ../../boot.php:1243 msgid "Homepage:" msgstr "Homepage:" @@ -4680,7 +4680,7 @@ msgstr "Kontaktanfrage schlug fehl oder wurde zurückgezogen." msgid "Unable to set contact photo." msgstr "Konnte das Bild des Kontakts nicht speichern." -#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:608 +#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:619 #: ../../include/conversation.php:171 #, php-format msgid "%1$s is now friends with %2$s" @@ -5318,7 +5318,7 @@ msgstr "Aktiviere Planeten Plugin" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:912 +#: ../../include/nav.php:64 ../../boot.php:922 msgid "Login" msgstr "Anmeldung" @@ -7599,7 +7599,7 @@ msgstr "Endet:" msgid "(no subject)" msgstr "(kein Betreff)" -#: ../../include/Scrape.php:576 +#: ../../include/Scrape.php:583 msgid " on Last.fm" msgstr " bei Last.fm" @@ -7842,11 +7842,11 @@ msgstr "Beitrag" msgid "Item filed" msgstr "Beitrag abgelegt" -#: ../../include/diaspora.php:691 +#: ../../include/diaspora.php:702 msgid "Sharing notification from Diaspora network" msgstr "Freigabe-Benachrichtigung von Diaspora" -#: ../../include/diaspora.php:2211 +#: ../../include/diaspora.php:2222 msgid "Attachments:" msgstr "Anhänge:" @@ -7869,31 +7869,31 @@ msgid "" "not what you intended, please create another group with a different name." msgstr "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen könnten auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen." -#: ../../include/group.php:176 +#: ../../include/group.php:207 msgid "Default privacy group for new contacts" msgstr "Voreingestellte Gruppe für neue Kontakte" -#: ../../include/group.php:195 +#: ../../include/group.php:226 msgid "Everybody" msgstr "Alle Kontakte" -#: ../../include/group.php:218 +#: ../../include/group.php:249 msgid "edit" msgstr "bearbeiten" -#: ../../include/group.php:240 +#: ../../include/group.php:271 msgid "Edit group" msgstr "Gruppe bearbeiten" -#: ../../include/group.php:241 +#: ../../include/group.php:272 msgid "Create a new group" msgstr "Neue Gruppe erstellen" -#: ../../include/group.php:242 +#: ../../include/group.php:273 msgid "Contacts not in any group" msgstr "Kontakte in keiner Gruppe" -#: ../../include/nav.php:46 ../../boot.php:911 +#: ../../include/nav.php:46 ../../boot.php:921 msgid "Logout" msgstr "Abmelden" @@ -7901,7 +7901,7 @@ msgstr "Abmelden" msgid "End this session" msgstr "Diese Sitzung beenden" -#: ../../include/nav.php:49 ../../boot.php:1665 +#: ../../include/nav.php:49 ../../boot.php:1676 msgid "Status" msgstr "Status" @@ -7981,11 +7981,11 @@ msgstr "Verwalten" msgid "Manage other pages" msgstr "Andere Seiten verwalten" -#: ../../include/nav.php:138 ../../boot.php:1186 +#: ../../include/nav.php:138 ../../boot.php:1196 msgid "Profiles" msgstr "Profile" -#: ../../include/nav.php:138 ../../boot.php:1186 +#: ../../include/nav.php:138 ../../boot.php:1196 msgid "Manage/edit profiles" msgstr "Profile verwalten/editieren" @@ -8141,7 +8141,7 @@ msgstr "%ss Geburtstag" msgid "Happy Birthday %s" msgstr "Herzlichen Glückwunsch %s" -#: ../../include/onepoll.php:399 +#: ../../include/onepoll.php:409 msgid "From: " msgstr "Von: " @@ -8503,7 +8503,7 @@ msgstr "Bitte lade ein Profilbild hoch." msgid "Welcome back " msgstr "Willkommen zurück " -#: ../../include/security.php:344 +#: ../../include/security.php:354 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." @@ -8689,100 +8689,104 @@ msgstr "Diese Aktion überschreitet die Obergrenze deines Abonnements." msgid "This action is not available under your subscription plan." msgstr "Diese Aktion ist in deinem Abonnement nicht verfügbar." -#: ../../boot.php:573 +#: ../../boot.php:583 msgid "Delete this item?" msgstr "Diesen Beitrag löschen?" -#: ../../boot.php:576 +#: ../../boot.php:586 msgid "show fewer" msgstr "weniger anzeigen" -#: ../../boot.php:783 +#: ../../boot.php:793 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen." -#: ../../boot.php:785 +#: ../../boot.php:795 #, php-format msgid "Update Error at %s" msgstr "Updatefehler bei %s" -#: ../../boot.php:886 +#: ../../boot.php:896 msgid "Create a New Account" msgstr "Neues Konto erstellen" -#: ../../boot.php:914 +#: ../../boot.php:924 msgid "Nickname or Email address: " msgstr "Spitzname oder E-Mail-Adresse: " -#: ../../boot.php:915 +#: ../../boot.php:925 msgid "Password: " msgstr "Passwort: " -#: ../../boot.php:918 +#: ../../boot.php:928 msgid "Or login using OpenID: " msgstr "Oder melde dich mit deiner OpenID an: " -#: ../../boot.php:924 +#: ../../boot.php:934 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: ../../boot.php:1035 +#: ../../boot.php:1045 msgid "Requested account is not available." msgstr "Das angefragte Profil ist nicht vorhanden." -#: ../../boot.php:1112 +#: ../../boot.php:1122 msgid "Edit profile" msgstr "Profil bearbeiten" -#: ../../boot.php:1178 +#: ../../boot.php:1188 msgid "Message" msgstr "Nachricht" -#: ../../boot.php:1300 ../../boot.php:1386 +#: ../../boot.php:1310 ../../boot.php:1396 msgid "g A l F d" msgstr "l, d. F G \\U\\h\\r" -#: ../../boot.php:1301 ../../boot.php:1387 +#: ../../boot.php:1311 ../../boot.php:1397 msgid "F d" msgstr "d. F" -#: ../../boot.php:1346 ../../boot.php:1427 +#: ../../boot.php:1356 ../../boot.php:1437 msgid "[today]" msgstr "[heute]" -#: ../../boot.php:1358 +#: ../../boot.php:1368 msgid "Birthday Reminders" msgstr "Geburtstagserinnerungen" -#: ../../boot.php:1359 +#: ../../boot.php:1369 msgid "Birthdays this week:" msgstr "Geburtstage diese Woche:" -#: ../../boot.php:1420 +#: ../../boot.php:1430 msgid "[No description]" msgstr "[keine Beschreibung]" -#: ../../boot.php:1438 +#: ../../boot.php:1448 msgid "Event Reminders" msgstr "Veranstaltungserinnerungen" -#: ../../boot.php:1439 +#: ../../boot.php:1449 msgid "Events this week:" msgstr "Veranstaltungen diese Woche" -#: ../../boot.php:1668 +#: ../../boot.php:1679 msgid "Status Messages and Posts" msgstr "Statusnachrichten und Beiträge" -#: ../../boot.php:1675 +#: ../../boot.php:1686 msgid "Profile Details" msgstr "Profildetails" -#: ../../boot.php:1692 +#: ../../boot.php:1703 msgid "Events and Calendar" msgstr "Ereignisse und Kalender" -#: ../../boot.php:1699 +#: ../../boot.php:1710 msgid "Only You Can See This" msgstr "Nur du kannst das sehen" + +#: ../../index.php:378 +msgid "toggle mobile" +msgstr "auf/von Mobile Ansicht wechseln" diff --git a/view/de/strings.php b/view/de/strings.php index b172ff9c..326c8b71 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -2006,3 +2006,4 @@ $a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; $a->strings["Profile Details"] = "Profildetails"; $a->strings["Events and Calendar"] = "Ereignisse und Kalender"; $a->strings["Only You Can See This"] = "Nur du kannst das sehen"; +$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln"; From ceb8b8b77f9c68ec2cd8253e67d9c2a27f2b7e0e Mon Sep 17 00:00:00 2001 From: pixelroot Date: Thu, 4 Oct 2012 16:37:02 +0200 Subject: [PATCH 08/74] new file: view/theme/smoothly/file.gif modified: view/theme/smoothly/search_item.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php --- view/theme/smoothly/file.gif | Bin 0 -> 615 bytes view/theme/smoothly/search_item.tpl | 14 ++- view/theme/smoothly/style.css | 164 ++++++++++++++++++++++++---- view/theme/smoothly/theme.php | 2 +- 4 files changed, 157 insertions(+), 23 deletions(-) create mode 100644 view/theme/smoothly/file.gif diff --git a/view/theme/smoothly/file.gif b/view/theme/smoothly/file.gif new file mode 100644 index 0000000000000000000000000000000000000000..7885b998d578d4523103e1f5dfbcd8133a7f0fe7 GIT binary patch literal 615 zcmZ?wbhEHb6krfwIF`)7#xKb(Aj2uD!Xs-asNo`J94_scC*xeG;M1rUF;y*cx?0ps z_2^mZF>^Fx=V~P{*G^rfleShbd#hf~c7uYwhQ)`B%8nbAoir{#Wm{SZR^k3H=J{9Jm=JO-lh4xYs&@q)(f6(7rfdp`gC0M@46J&eJQBta!B9h@CjEU zCtit~bTwx3)z~T5;-_9qoOUf~`t_6<*HdTSNS}2hbM}p#xi@p?-O8VTt6<^nlEt^n zm)@yZcDHury{0wy+t)wn*zmAxdicePqc2w-f4Szw%e5z8tv~f@)0x*>&c5Dp;q9)AZ+BmMxA*e9{a4-{xcdI^ z^$$mHd^mpV!>KzTPv8A?_TH!S_doro4N&~a!pOx?&!EEq1fV!!U_a7O-_+dF+SU>! zFQMYz-Xh@HBp)OYX*7MhPg@W#w~=pBQbN3eZz~TMmqFs9_?SQ)4OK-ssb;;n#j&A* zd-rW?(vFUgwX!ldG1S#kSCW^J(hQGrGYyNp5g8E{5^SNR78+&d5VFtD$HU2(Cq_BY z%_KY^(BH??#leP8tzN;;s4bxJl1t}A1>2$$i-f1=+Y}7fSVT6ZoamP|_An?=&^XL3 nuk6%xBcZXWg@e6|V^=`pp=K5i9uWlt2ZjcQz9KFz76xkoO@B#U literal 0 HcmV?d00001 diff --git a/view/theme/smoothly/search_item.tpl b/view/theme/smoothly/search_item.tpl index 5349c002..6503eb67 100644 --- a/view/theme/smoothly/search_item.tpl +++ b/view/theme/smoothly/search_item.tpl @@ -23,7 +23,6 @@
- {{ if $item.drop.dropping }}{{ endif }}
{{ if $item.drop.pagedrop }}{{ endif }}
@@ -32,6 +31,19 @@
$item.title
$item.body
+ + {{ if $item.has_cats }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name + [$remove] + {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }} + + {{ if $item.has_folders }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name + [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
+ {{ endif }}
$item.name diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 03025acf..4b4c54e0 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -2,7 +2,7 @@ style.css Smoothly - Created by alex@friendica.pixelbits.de on 2012-09-25 + Created by alex@friendica.pixelbits.de on 2012-10-04 ** Colors ** Blue links - #1873a2 @@ -74,7 +74,7 @@ li.widget-list { list-style: none outside none; background: url("arrow.png") no-repeat scroll left center transparent; display: block; - padding: 3px 24px; + /*padding: 3px 24px;*/ } .required { @@ -643,11 +643,11 @@ aside { font-style: bold; } -aside a{ - padding-bottom: 5px; +aside a { + /*padding-bottom: 5px;*/ } -.vcard { +.vcard .title { font-size: 1em; } @@ -657,6 +657,9 @@ aside a{ -webkit-margin-start: 10px; } +.fn { +} + .vcard .fn { font-size: 1.4em; font-weight: bold; @@ -894,11 +897,11 @@ ul .sidebar-group-li .icon { width: 12px; } -.nets-ul { +.nets-ul, .fileas-ul, .categories-ul { list-style-type: none; } -.nets-ul li { +.nets-ul li, .fileas-ul li, .categories-ul li { margin-top: 10px; } @@ -909,6 +912,14 @@ ul .sidebar-group-li .icon { margin-left: 42px; } +.fileas-link, .categories-link { + margin-left: 24px; +} + +.fileas-all, .categories-all { + margin-left: 0px; +} + .widget h3 { background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f0edf0), color-stop(1, #e2e2e2) ); background: -moz-linear-gradient( center top, #f0edf0 5%, #e2e2e2 100% ); @@ -975,15 +986,24 @@ ul .sidebar-group-li .icon { float: left; } +.contact-block-link { + float: left; +} + .contact-block-textdiv { width: 150px; height: 34px; float: left; } +.contact-block-h4, +.contact-block-content { +} + +#contact-block, #contact-block-end { clear: both; -} +} /* ======= */ /* = Jot = */ @@ -1062,6 +1082,8 @@ ul .sidebar-group-li .icon { border-radius: 5px 5px 5px 5px; } +#jot-preview-form {} + #jot-preview-link { float: left; width: 60px; @@ -1176,6 +1198,12 @@ ul .sidebar-group-li .icon { display:block!important; } +#profile-video-wrapper, +#profile-audio-wrapper, +#profile-location-wrapper, +#profile-nolocation-wrapper { +} + #group_allow_wrapper, #group_deny_wrapper, #acl-permit-outer-wrapper { @@ -1217,13 +1245,20 @@ ul .sidebar-group-li .icon { #profile-jot-wrapper { margin-top: -15px; - padding-top: 0px; } -profile-jot-banner-wrapper { - padding: 0px; - margin: 0px; -} +#profile-jot-desc, +#profile-jot-form, +#jot-location, +#jot-coord, +#jot-preview, +#jot-title-wrap, +#jot-category-wrap, +#jot-text-wrap, +#profile-jot-text-loading, +#profile-attach-wrapper, +#profile-link-wrapper, +#profile-jot-banner-wrapper {} .contact-h4 { font-size: 1.2em; @@ -1283,6 +1318,8 @@ profile-jot-banner-wrapper { padding-top: 10px; } +.wall-item-comment-wrapper {} + .wall-item-photo-menu { display: none; } @@ -1582,6 +1619,7 @@ profile-jot-banner-wrapper { float: right; } +#item-delete-selected-end, #item-delete-selected { overflow: auto; margin-top: 20px; @@ -1589,16 +1627,18 @@ profile-jot-banner-wrapper { width: 250px; } +#item-delete-selected-icon {} + code { font-family: Courier, monospace; - white-space: pre; + /*white-space: pre;*/ display: block; overflow: auto; border: 1px solid #444; background: #EEE; color: #444; padding: 10px; - margin-top: 20px; + margin-top: 10px; } blockquote { @@ -1617,6 +1657,8 @@ blockquote { margin-left: 60px; } +#tread-wrapper {} + .tread-wrapper { border: 0px solid #CDCDCD; border-radius: 5px 5px 5px 5px; @@ -1743,13 +1785,13 @@ blockquote { .wall-item-body code { font-family: Courier, monospace; - white-space: pre; + /*white-space: pre;*/ display: block; overflow: auto; border: 1px solid #cccccc; - border-width: 1px 1px 1px 10px; - padding-left: 10px; - margin-top: 20px; + border-width: 1px 1px 1px 3px; + padding-left: 5px; + margin-top: 10px; } /* =========== */ @@ -2097,7 +2139,6 @@ div[id$="wrapper"] br { } select, input { - margin-top: 0px; border: 1px solid #b0b0b0; padding: 2px; border-radius: 3px 3px 3px 3px; @@ -3150,7 +3191,9 @@ margin-left: 0px; /* ========== */ /* = Events = */ /* ========== */ - + +#events-reminder {} + .clear { clear: both; margin-top: 10px; @@ -4111,3 +4154,82 @@ hr.line-dots { background: url("dot.png") repeat-x scroll left center transparent; border: medium none; } + +.body-tag, .filesavetags, .categorytags { + opacity: 0.5; + filter:alpha(opacity=50); +} + +.body-tag:hover, .filesavetags:hover, .categorytags:hover { + opacity: 1.0 !important; + filter:alpha(opacity=100) !important; +} + +.item-select { + opacity: 0.5; + filter:alpha(opacity=10); + float: right; + margin-right: 10px; + +} +.item-select:hover, .checkeditem { + opacity: 1; + filter:alpha(opacity=100); +} + +.filer-icon { + display: block; width: 16px; height: 16px; + background-image: url('file.gif'); +} + +.icon.dim { opacity: 0.3;filter:alpha(opacity=30); } +[class^="comment-edit-bb"] { + list-style: none; + display: none; + margin: 0px 0 -5px 0px; + padding: 0px; + width: 75%; +} + +.body-attach { + margin-top: 10px; +} + +.grey { + color: #888888; +} + +.location, .location-label, .gender-label, .marital-label, .homepage-label { + float: left; + text-align: left; + display: block; +} + +.adr, .x-gender, .marital-text, .homepage-url { + float: left; + display: block; + margin-left: 8px; +} + +#birthday-notice {} +#nav-notifications-template {} +#categories-sidebar {} +#nets-desc {} +#status-tab {} +#page-footer {} +#live-profile {} + +.city-state-zip {} +.country-name {} +.locality {} +.region {} +.postal-code {} +.mpfriend {} +.toplevel_item {} + +.fc-header, +.fc-view, +.fc-view-basicWeek, +.fc-grid, +.fc-border-separate, +.fc-content {} diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index 529a5401..f67e3071 100644 --- a/view/theme/smoothly/theme.php +++ b/view/theme/smoothly/theme.php @@ -3,7 +3,7 @@ /* * Name: Smoothly * Description: Like coffee with milk. Theme works fine with iPad[2]. - * Version: Version 0.9.9 + * Version: Version 0.10.4 * Author: Alex * Maintainer: Alex * Screenshot: Screenshot From d33abe2de9eb8654f86405c7489b82548c241c8b Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 4 Oct 2012 23:19:50 +0100 Subject: [PATCH 09/74] Dispy - selecting any network and then switching back to "all networks" didn't work. Remove nets.tpl to make it use the default one. --- view/theme/dispy/nets.tpl | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 view/theme/dispy/nets.tpl diff --git a/view/theme/dispy/nets.tpl b/view/theme/dispy/nets.tpl deleted file mode 100644 index b0cb8890..00000000 --- a/view/theme/dispy/nets.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
-

$title

-
$desc
- $all -
    - {{ for $nets as $net }} -
  • $net.name
  • - {{ endfor }} -
-
From 5f2826f84e341cec7b0119529c87f48570b9c93e Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Thu, 4 Oct 2012 19:59:30 -0600 Subject: [PATCH 10/74] update themes for new All Networks option --- view/theme/diabook/nets.tpl | 2 +- view/theme/facepark/nets.tpl | 2 +- view/theme/quattro/nets.tpl | 2 +- view/theme/smoothly/nets.tpl | 2 +- view/theme/testbubble/nets.tpl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl index 351e2c3e..faccca39 100644 --- a/view/theme/diabook/nets.tpl +++ b/view/theme/diabook/nets.tpl @@ -5,7 +5,7 @@